18 Dec '23
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eef22cc03666b24de5e02…
commit eef22cc03666b24de5e022638125cc06f554b46f
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Mon Nov 20 21:28:25 2023 +0200
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Mon Dec 18 23:14:14 2023 +0200
[ADVAPI32] Unify source for vista registry functions
- In advapi32_vista compile the code from advapi32/reg/reg.c
- Export RegCopyTreeW from advapi32_vista
---
dll/win32/advapi32/reg/reg.c | 199 ++++++++++++++++++++++++++++
dll/win32/advapi32_vista/CMakeLists.txt | 15 ++-
dll/win32/advapi32_vista/DllMain.c | 11 ++
dll/win32/advapi32_vista/RegDeleteTree.c | 102 --------------
dll/win32/advapi32_vista/RegLoadMUIString.c | 195 ---------------------------
dll/win32/advapi32_vista/RegSetKeyValue.c | 25 ----
6 files changed, 219 insertions(+), 328 deletions(-)
diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c
index 1e06f67a919..38a434fddd7 100644
--- a/dll/win32/advapi32/reg/reg.c
+++ b/dll/win32/advapi32/reg/reg.c
@@ -322,6 +322,7 @@ OpenCurrentConfigKey (PHANDLE KeyHandle)
&Attributes);
}
+#ifndef _ADVAPI32_VISTA_
/************************************************************************
* RegDisablePredefinedCache
@@ -444,6 +445,7 @@ RegCloseKey(HKEY hKey)
return ERROR_SUCCESS;
}
+#endif // _ADVAPI32_VISTA_
static NTSTATUS
RegpCopyTree(IN HKEY hKeySrc,
@@ -803,6 +805,7 @@ Cleanup2:
return ERROR_SUCCESS;
}
+#ifndef _ADVAPI32_VISTA_
/************************************************************************
* RegCopyTreeA
@@ -1734,6 +1737,7 @@ Cleanup:
}
#endif
+#endif // _ADVAPI32_VISTA_
/************************************************************************
* RegDeleteTreeW
@@ -1856,6 +1860,7 @@ RegDeleteTreeA(IN HKEY hKey,
return Ret;
}
+#ifndef _ADVAPI32_VISTA_
/************************************************************************
* RegDisableReflectionKey
@@ -2161,6 +2166,7 @@ RegGetValueA(HKEY hKey,
return ret;
}
+#endif // _ADVAPI32_VISTA_
/************************************************************************
* RegSetKeyValueW
@@ -2231,6 +2237,7 @@ Cleanup:
return Ret;
}
+#ifndef _ADVAPI32_VISTA_
/************************************************************************
* RegSetKeyValueA
@@ -5136,4 +5143,196 @@ RegUnLoadKeyW(HKEY hKey,
return ERROR_SUCCESS;
}
+#endif // _ADVAPI32_VISTA_
+
+/******************************************************************************
+ * load_string [Internal]
+ *
+ * This is basically a copy of user32/resource.c's LoadStringW. Necessary to
+ * avoid importing user32, which is higher level than advapi32. Helper for
+ * RegLoadMUIString.
+ */
+static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars)
+{
+ HGLOBAL hMemory;
+ HRSRC hResource;
+ WCHAR* pString;
+ int idxString;
+
+ /* Negative values have to be inverted. */
+ if (HIWORD(resId) == 0xffff)
+ resId = (UINT)(-((INT)resId));
+
+ /* Load the resource into memory and get a pointer to it. */
+ hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING);
+ if (!hResource) return 0;
+ hMemory = LoadResource(hModule, hResource);
+ if (!hMemory) return 0;
+ pString = LockResource(hMemory);
+
+ /* Strings are length-prefixed. Lowest nibble of resId is an index. */
+ idxString = resId & 0xf;
+ while (idxString--) pString += *pString + 1;
+
+ /* If no buffer is given, return length of the string. */
+ if (!pwszBuffer) return *pString;
+
+ /* Else copy over the string, respecting the buffer size. */
+ cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1);
+ if (cMaxChars >= 0)
+ {
+ memcpy(pwszBuffer, pString + 1, cMaxChars * sizeof(WCHAR));
+ pwszBuffer[cMaxChars] = L'\0';
+ }
+
+ return cMaxChars;
+}
+
+/************************************************************************
+ * RegLoadMUIStringW
+ *
+ * @implemented
+ */
+LONG WINAPI
+RegLoadMUIStringW(
+ IN HKEY hKey,
+ IN LPCWSTR pszValue OPTIONAL,
+ OUT LPWSTR pszOutBuf,
+ IN DWORD cbOutBuf,
+ OUT LPDWORD pcbData OPTIONAL,
+ IN DWORD Flags,
+ IN LPCWSTR pszDirectory OPTIONAL)
+{
+ DWORD dwValueType, cbData;
+ LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL;
+ LONG result;
+
+ /* Parameter sanity checks. */
+ if (!hKey || !pszOutBuf)
+ return ERROR_INVALID_PARAMETER;
+
+ if (pszDirectory && *pszDirectory)
+ {
+ FIXME("BaseDir parameter not yet supported!\n");
+ return ERROR_INVALID_PARAMETER;
+ }
+
+ /* Check for value existence and correctness of it's type, allocate a buffer and load it. */
+ result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, NULL, &cbData);
+ if (result != ERROR_SUCCESS) goto cleanup;
+ if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData)
+ {
+ result = ERROR_FILE_NOT_FOUND;
+ goto cleanup;
+ }
+ pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData);
+ if (!pwszTempBuffer)
+ {
+ result = ERROR_NOT_ENOUGH_MEMORY;
+ goto cleanup;
+ }
+ result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData);
+ if (result != ERROR_SUCCESS) goto cleanup;
+
+ /* Expand environment variables, if appropriate, or copy the original string over. */
+ if (dwValueType == REG_EXPAND_SZ)
+ {
+ cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR);
+ if (!cbData) goto cleanup;
+ pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData);
+ if (!pwszExpandedBuffer)
+ {
+ result = ERROR_NOT_ENOUGH_MEMORY;
+ goto cleanup;
+ }
+ ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData);
+ }
+ else
+ {
+ pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData);
+ memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData);
+ }
+
+ /* If the value references a resource based string, parse the value and load the string.
+ * Else just copy over the original value. */
+ result = ERROR_SUCCESS;
+ if (*pwszExpandedBuffer != L'@') /* '@' is the prefix for resource based string entries. */
+ {
+ lstrcpynW(pszOutBuf, pwszExpandedBuffer, cbOutBuf / sizeof(WCHAR));
+ }
+ else
+ {
+ WCHAR* pComma = wcsrchr(pwszExpandedBuffer, L',');
+ UINT uiStringId;
+ HMODULE hModule;
+
+ /* Format of the expanded value is 'path_to_dll,-resId' */
+ if (!pComma || pComma[1] != L'-')
+ {
+ result = ERROR_BADKEY;
+ goto cleanup;
+ }
+
+ uiStringId = _wtoi(pComma + 2);
+ *pComma = L'\0';
+
+ hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, LOAD_LIBRARY_AS_DATAFILE);
+ if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR)))
+ result = ERROR_BADKEY;
+ FreeLibrary(hModule);
+ }
+
+cleanup:
+ HeapFree(GetProcessHeap(), 0, pwszTempBuffer);
+ HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer);
+ return result;
+}
+
+/************************************************************************
+ * RegLoadMUIStringA
+ *
+ * @implemented
+ */
+LONG WINAPI
+RegLoadMUIStringA(
+ IN HKEY hKey,
+ IN LPCSTR pszValue OPTIONAL,
+ OUT LPSTR pszOutBuf,
+ IN DWORD cbOutBuf,
+ OUT LPDWORD pcbData OPTIONAL,
+ IN DWORD Flags,
+ IN LPCSTR pszDirectory OPTIONAL)
+{
+ UNICODE_STRING valueW, baseDirW;
+ WCHAR* pwszBuffer;
+ DWORD cbData = cbOutBuf * sizeof(WCHAR);
+ LONG result;
+
+ valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL;
+ if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) ||
+ !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszDirectory) ||
+ !(pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbData)))
+ {
+ result = ERROR_NOT_ENOUGH_MEMORY;
+ goto cleanup;
+ }
+
+ result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, Flags,
+ baseDirW.Buffer);
+
+ if (result == ERROR_SUCCESS)
+ {
+ cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszOutBuf, cbOutBuf, NULL, NULL);
+ if (pcbData)
+ *pcbData = cbData;
+ }
+
+cleanup:
+ HeapFree(GetProcessHeap(), 0, pwszBuffer);
+ RtlFreeUnicodeString(&baseDirW);
+ RtlFreeUnicodeString(&valueW);
+
+ return result;
+}
+
/* EOF */
diff --git a/dll/win32/advapi32_vista/CMakeLists.txt b/dll/win32/advapi32_vista/CMakeLists.txt
index ab6e406876a..3af7909efb7 100644
--- a/dll/win32/advapi32_vista/CMakeLists.txt
+++ b/dll/win32/advapi32_vista/CMakeLists.txt
@@ -2,19 +2,22 @@
remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
-add_definitions(-D_ADVAPI32_)
+add_definitions(-D_ADVAPI32_ -D_ADVAPI32_VISTA_)
spec2def(advapi32_vista.dll advapi32_vista.spec ADD_IMPORTLIB)
+include_directories(
+ ../advapi32
+ ${CMAKE_CURRENT_BINARY_DIR}/../advapi32
+)
+
list(APPEND SOURCE
DllMain.c
- RegDeleteTree.c
- RegSetKeyValue.c
- RegLoadMUIString.c
+ ../advapi32/reg/reg.c
${CMAKE_CURRENT_BINARY_DIR}/advapi32_vista.def)
add_library(advapi32_vista MODULE ${SOURCE})
set_module_type(advapi32_vista win32dll ENTRYPOINT DllMain 12)
-target_link_libraries(advapi32_vista wine)
+target_link_libraries(advapi32_vista wine ${PSEH_LIB})
add_importlibs(advapi32_vista advapi32 kernel32 ntdll)
-add_dependencies(advapi32_vista psdk)
+add_dependencies(advapi32_vista psdk advapi32)
add_cd_file(TARGET advapi32_vista DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/advapi32_vista/DllMain.c b/dll/win32/advapi32_vista/DllMain.c
index 0902d8455d7..6ed5bb68a67 100644
--- a/dll/win32/advapi32_vista/DllMain.c
+++ b/dll/win32/advapi32_vista/DllMain.c
@@ -1,6 +1,9 @@
#include "advapi32_vista.h"
+BOOL
+RegInitialize(VOID);
+
BOOL
WINAPI
DllMain(HANDLE hDll,
@@ -9,6 +12,14 @@ DllMain(HANDLE hDll,
{
/* For now, there isn't much to do */
if (dwReason == DLL_PROCESS_ATTACH)
+ {
DisableThreadLibraryCalls(hDll);
+
+ if (!RegInitialize())
+ {
+ return FALSE;
+ }
+ }
+
return TRUE;
}
diff --git a/dll/win32/advapi32_vista/RegDeleteTree.c b/dll/win32/advapi32_vista/RegDeleteTree.c
deleted file mode 100644
index 0a9f6192fb7..00000000000
--- a/dll/win32/advapi32_vista/RegDeleteTree.c
+++ /dev/null
@@ -1,102 +0,0 @@
-
-#include "advapi32_vista.h"
-
-/* heap allocation helpers */
-static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
-static inline void *heap_alloc( size_t len )
-{
- return HeapAlloc( GetProcessHeap(), 0, len );
-}
-
-static inline BOOL heap_free( void *mem )
-{
- return HeapFree( GetProcessHeap(), 0, mem );
-}
-
-/* Taken from Wine advapi32/registry.c */
-
-/******************************************************************************
- * RegDeleteTreeW [ADVAPI32.@]
- *
- */
-LSTATUS WINAPI RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey)
-{
- LONG ret;
- DWORD dwMaxSubkeyLen, dwMaxValueLen;
- DWORD dwMaxLen, dwSize;
- WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf;
- HKEY hSubKey = hKey;
-
- if(lpszSubKey)
- {
- ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
- if (ret) return ret;
- }
-
- /* Get highest length for keys, values */
- ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL,
- &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL);
- if (ret) goto cleanup;
-
- dwMaxSubkeyLen++;
- dwMaxValueLen++;
- dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen);
- if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR))
- {
- /* Name too big: alloc a buffer for it */
- if (!(lpszName = heap_alloc( dwMaxLen*sizeof(WCHAR))))
- {
- ret = ERROR_NOT_ENOUGH_MEMORY;
- goto cleanup;
- }
- }
-
-
- /* Recursively delete all the subkeys */
- while (TRUE)
- {
- dwSize = dwMaxLen;
- if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL,
- NULL, NULL, NULL)) break;
-
- ret = RegDeleteTreeW(hSubKey, lpszName);
- if (ret) goto cleanup;
- }
-
- if (lpszSubKey)
- ret = RegDeleteKeyW(hKey, lpszSubKey);
- else
- while (TRUE)
- {
- dwSize = dwMaxLen;
- if (RegEnumValueW(hKey, 0, lpszName, &dwSize,
- NULL, NULL, NULL, NULL)) break;
-
- ret = RegDeleteValueW(hKey, lpszName);
- if (ret) goto cleanup;
- }
-
-cleanup:
- /* Free buffer if allocated */
- if (lpszName != szNameBuf)
- heap_free( lpszName);
- if(lpszSubKey)
- RegCloseKey(hSubKey);
- return ret;
-}
-
-/******************************************************************************
- * RegDeleteTreeA [ADVAPI32.@]
- *
- */
-LSTATUS WINAPI RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey)
-{
- LONG ret;
- UNICODE_STRING lpszSubKeyW;
-
- if (lpszSubKey) RtlCreateUnicodeStringFromAsciiz( &lpszSubKeyW, lpszSubKey);
- else lpszSubKeyW.Buffer = NULL;
- ret = RegDeleteTreeW( hKey, lpszSubKeyW.Buffer);
- RtlFreeUnicodeString( &lpszSubKeyW );
- return ret;
-}
diff --git a/dll/win32/advapi32_vista/RegLoadMUIString.c b/dll/win32/advapi32_vista/RegLoadMUIString.c
deleted file mode 100644
index 8d80949660c..00000000000
--- a/dll/win32/advapi32_vista/RegLoadMUIString.c
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "advapi32_vista.h"
-
-#include <winuser.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(reg);
-
-/******************************************************************************
- * load_string [Internal]
- *
- * This is basically a copy of user32/resource.c's LoadStringW. Necessary to
- * avoid importing user32, which is higher level than advapi32. Helper for
- * RegLoadMUIString.
- */
-static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars)
-{
- HGLOBAL hMemory;
- HRSRC hResource;
- WCHAR *pString;
- int idxString;
-
- /* Negative values have to be inverted. */
- if (HIWORD(resId) == 0xffff)
- resId = (UINT)(-((INT)resId));
-
- /* Load the resource into memory and get a pointer to it. */
- hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING);
- if (!hResource) return 0;
- hMemory = LoadResource(hModule, hResource);
- if (!hMemory) return 0;
- pString = LockResource(hMemory);
-
- /* Strings are length-prefixed. Lowest nibble of resId is an index. */
- idxString = resId & 0xf;
- while (idxString--) pString += *pString + 1;
-
- /* If no buffer is given, return length of the string. */
- if (!pwszBuffer) return *pString;
-
- /* Else copy over the string, respecting the buffer size. */
- cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1);
- if (cMaxChars >= 0)
- {
- memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR));
- pwszBuffer[cMaxChars] = L'\0';
- }
-
- return cMaxChars;
-}
-
-/************************************************************************
- * RegLoadMUIStringW
- *
- * @implemented
- */
-LONG WINAPI
-RegLoadMUIStringW(IN HKEY hKey,
- IN LPCWSTR pszValue OPTIONAL,
- OUT LPWSTR pszOutBuf,
- IN DWORD cbOutBuf,
- OUT LPDWORD pcbData OPTIONAL,
- IN DWORD Flags,
- IN LPCWSTR pszDirectory OPTIONAL)
-{
- DWORD dwValueType, cbData;
- LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL;
- LONG result;
-
- /* Parameter sanity checks. */
- if (!hKey || !pszOutBuf)
- return ERROR_INVALID_PARAMETER;
-
- if (pszDirectory && *pszDirectory)
- {
- FIXME("BaseDir parameter not yet supported!\n");
- return ERROR_INVALID_PARAMETER;
- }
-
- /* Check for value existence and correctness of it's type, allocate a buffer and load it. */
- result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, NULL, &cbData);
- if (result != ERROR_SUCCESS) goto cleanup;
- if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData)
- {
- result = ERROR_FILE_NOT_FOUND;
- goto cleanup;
- }
- pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData);
- if (!pwszTempBuffer)
- {
- result = ERROR_NOT_ENOUGH_MEMORY;
- goto cleanup;
- }
- result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData);
- if (result != ERROR_SUCCESS) goto cleanup;
-
- /* Expand environment variables, if appropriate, or copy the original string over. */
- if (dwValueType == REG_EXPAND_SZ)
- {
- cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR);
- if (!cbData) goto cleanup;
- pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData);
- if (!pwszExpandedBuffer)
- {
- result = ERROR_NOT_ENOUGH_MEMORY;
- goto cleanup;
- }
- ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData);
- }
- else
- {
- pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData);
- memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData);
- }
-
- /* If the value references a resource based string, parse the value and load the string.
- * Else just copy over the original value. */
- result = ERROR_SUCCESS;
- if (*pwszExpandedBuffer != L'@') /* '@' is the prefix for resource based string entries. */
- {
- lstrcpynW(pszOutBuf, pwszExpandedBuffer, cbOutBuf / sizeof(WCHAR));
- }
- else
- {
- WCHAR *pComma = wcsrchr(pwszExpandedBuffer, L',');
- UINT uiStringId;
- HMODULE hModule;
-
- /* Format of the expanded value is 'path_to_dll,-resId' */
- if (!pComma || pComma[1] != L'-')
- {
- result = ERROR_BADKEY;
- goto cleanup;
- }
-
- uiStringId = _wtoi(pComma+2);
- *pComma = L'\0';
-
- hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, LOAD_LIBRARY_AS_DATAFILE);
- if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR)))
- result = ERROR_BADKEY;
- FreeLibrary(hModule);
- }
-
-cleanup:
- HeapFree(GetProcessHeap(), 0, pwszTempBuffer);
- HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer);
- return result;
-}
-
-/************************************************************************
- * RegLoadMUIStringA
- *
- * @implemented
- */
-LONG WINAPI
-RegLoadMUIStringA(IN HKEY hKey,
- IN LPCSTR pszValue OPTIONAL,
- OUT LPSTR pszOutBuf,
- IN DWORD cbOutBuf,
- OUT LPDWORD pcbData OPTIONAL,
- IN DWORD Flags,
- IN LPCSTR pszDirectory OPTIONAL)
-{
- UNICODE_STRING valueW, baseDirW;
- WCHAR *pwszBuffer;
- DWORD cbData = cbOutBuf * sizeof(WCHAR);
- LONG result;
-
- valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL;
- if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) ||
- !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszDirectory) ||
- !(pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbData)))
- {
- result = ERROR_NOT_ENOUGH_MEMORY;
- goto cleanup;
- }
-
- result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, Flags,
- baseDirW.Buffer);
-
- if (result == ERROR_SUCCESS)
- {
- cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszOutBuf, cbOutBuf, NULL, NULL);
- if (pcbData)
- *pcbData = cbData;
- }
-
-cleanup:
- HeapFree(GetProcessHeap(), 0, pwszBuffer);
- RtlFreeUnicodeString(&baseDirW);
- RtlFreeUnicodeString(&valueW);
-
- return result;
-}
diff --git a/dll/win32/advapi32_vista/RegSetKeyValue.c b/dll/win32/advapi32_vista/RegSetKeyValue.c
deleted file mode 100644
index 8701eb87df4..00000000000
--- a/dll/win32/advapi32_vista/RegSetKeyValue.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#include "advapi32_vista.h"
-
-/* Taken from Wine advapi32/registry.c */
-
-/******************************************************************************
- * RegSetKeyValueW [ADVAPI32.@]
- */
-LONG WINAPI RegSetKeyValueW( HKEY hkey, LPCWSTR subkey, LPCWSTR name, DWORD type, const void *data, DWORD len )
-{
- HKEY hsubkey = NULL;
- DWORD ret;
-
- //TRACE("(%p,%s,%s,%d,%p,%d)\n", hkey, debugstr_w(subkey), debugstr_w(name), type, data, len );
-
- if (subkey && subkey[0]) /* need to create the subkey */
- {
- if ((ret = RegCreateKeyW( hkey, subkey, &hsubkey )) != ERROR_SUCCESS) return ret;
- hkey = hsubkey;
- }
-
- ret = RegSetValueExW( hkey, name, 0, type, (const BYTE*)data, len );
- if (hsubkey) RegCloseKey( hsubkey );
- return ret;
-}
1
0
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d28bbf458ac7dcaa4af2c…
commit d28bbf458ac7dcaa4af2c20d6ce2f557dbc61326
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Thu Oct 5 23:00:08 2023 +0300
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Mon Dec 18 23:14:14 2023 +0200
[ADVAPI32] Fix bugs in RegpCopyTree
---
dll/win32/advapi32/reg/reg.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c
index 284731628b1..1e06f67a919 100644
--- a/dll/win32/advapi32/reg/reg.c
+++ b/dll/win32/advapi32/reg/reg.c
@@ -546,6 +546,7 @@ RegpCopyTree(IN HKEY hKeySrc,
if (Buffer != NULL)
{
Info.Buffer = Buffer;
+ BufferSize = BufferSizeRequired;
/* try again */
}
else
@@ -672,6 +673,7 @@ RegpCopyTree(IN HKEY hKeySrc,
if (Buffer != NULL)
{
Info.Buffer = Buffer;
+ BufferSize = BufferSizeRequired;
/* try again */
}
else
1
0
[reactos] 01/01: [MSCTFIME] Implement ImeDestroy and CtfImeDestroyThreadMgr (#6189)
by Katayama Hirofumi MZ 18 Dec '23
by Katayama Hirofumi MZ 18 Dec '23
18 Dec '23
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3288862e1012e2bc0063…
commit a3288862e1012e2bc0063b3cb2a31aca6273b32f
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Dec 18 21:56:21 2023 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Dec 18 21:56:21 2023 +0900
[MSCTFIME] Implement ImeDestroy and CtfImeDestroyThreadMgr (#6189)
- Define ITfSysHookSink interface.
- Add implementation to CicBridge class.
- Implement ImeDestroy and CtfImeDestroyThreadMgr functions.
- Implement CtfImeCreateThreadMgr function.
CORE-19360
---
dll/ime/msctfime/msctfime.cpp | 266 ++++++++++++++++++++++++++++++++++++++++--
dll/ime/msctfime/msctfime.h | 1 +
2 files changed, 260 insertions(+), 7 deletions(-)
diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp
index ae0adad1ad1..d5354b23bdc 100644
--- a/dll/ime/msctfime/msctfime.cpp
+++ b/dll/ime/msctfime/msctfime.cpp
@@ -140,9 +140,40 @@ Inquire(
return S_OK;
}
+DEFINE_GUID(IID_ITfSysHookSink, 0x495388DA, 0x21A5, 0x4852, 0x8B, 0xB1, 0xED, 0x2F, 0x29, 0xDA, 0x8D, 0x60);
+
+struct ITfSysHookSink : IUnknown
+{
+ STDMETHOD(OnPreFocusDIM)(HWND hwnd) = 0;
+ STDMETHOD(OnSysKeyboardProc)(UINT, LONG) = 0;
+ STDMETHOD(OnSysShellProc)(INT, UINT, LONG) = 0;
+};
+
+class TLS;
+
/* FIXME */
-struct CicBridge : IUnknown
+class CicBridge : public ITfSysHookSink
{
+protected:
+ LONG m_cRefs;
+ DWORD m_dwImmxInit;
+ DWORD m_dwUnknown[10];
+
+public:
+ CicBridge();
+ virtual ~CicBridge();
+
+ STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override;
+ STDMETHODIMP_(ULONG) AddRef() override;
+ STDMETHODIMP_(ULONG) Release() override;
+ STDMETHODIMP OnPreFocusDIM(HWND hwnd) override;
+ STDMETHODIMP OnSysKeyboardProc(UINT, LONG) override;
+ STDMETHODIMP OnSysShellProc(INT, UINT, LONG) override;
+
+ HRESULT InitIMMX(TLS *pTLS);
+ BOOL UnInitIMMX(TLS *pTLS);
+ HRESULT ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr);
+ HRESULT DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr);
};
/* FIXME */
@@ -253,6 +284,147 @@ BOOL TLS::InternalDestroyTLS()
return TRUE;
}
+/***********************************************************************
+ * CicBridge
+ */
+
+CicBridge::CicBridge()
+{
+ m_dwImmxInit &= ~1;
+ m_dwUnknown[0] &= ~1;
+ m_dwUnknown[1] &= ~1;
+ m_dwUnknown[9] &= ~1;
+ m_dwUnknown[3] = 0;
+ m_dwUnknown[4] = 0;
+ m_dwUnknown[5] = 0;
+ m_dwUnknown[6] = 0;
+ m_cRefs = 1;
+}
+
+/**
+ * @implemented
+ */
+STDMETHODIMP CicBridge::QueryInterface(REFIID riid, LPVOID* ppvObj)
+{
+ *ppvObj = NULL;
+
+ if (!IsEqualIID(riid, IID_ITfSysHookSink))
+ return E_NOINTERFACE;
+
+ *ppvObj = this;
+ AddRef();
+
+ return S_OK;
+}
+
+/**
+ * @implemented
+ */
+STDMETHODIMP_(ULONG) CicBridge::AddRef()
+{
+ return ::InterlockedIncrement(&m_cRefs);
+}
+
+/**
+ * @implemented
+ */
+STDMETHODIMP_(ULONG) CicBridge::Release()
+{
+ if (::InterlockedDecrement(&m_cRefs) == 0)
+ {
+ delete this;
+ return 0;
+ }
+ return m_cRefs;
+}
+
+/**
+ * @implemented
+ */
+CicBridge::~CicBridge()
+{
+ TLS *pTLS = (TLS *)TlsGetValue(TLS::s_dwTlsIndex);
+ if (!pTLS || !pTLS->m_pThreadMgr)
+ return;
+
+ if (SUCCEEDED(DeactivateIMMX(pTLS, pTLS->m_pThreadMgr)))
+ UnInitIMMX(pTLS);
+}
+
+/**
+ * @unimplemented
+ */
+HRESULT CicBridge::InitIMMX(TLS *pTLS)
+{
+ return E_NOTIMPL;
+}
+
+/**
+ * @unimplemented
+ */
+HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr)
+{
+ return E_NOTIMPL;
+}
+
+/**
+ * @unimplemented
+ */
+HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr)
+{
+ return E_NOTIMPL;
+}
+
+/**
+ * @unimplemented
+ */
+BOOL CicBridge::UnInitIMMX(TLS *pTLS)
+{
+ //FIXME
+
+ if (pTLS->m_pProfile)
+ {
+ pTLS->m_pProfile->Release();
+ pTLS->m_pProfile = NULL;
+ }
+
+ //FIXME
+
+ if (pTLS->m_pThreadMgr)
+ {
+ pTLS->m_pThreadMgr->Release();
+ pTLS->m_pThreadMgr = NULL;
+ }
+
+ m_dwImmxInit &= ~1;
+
+ return TRUE;
+}
+
+/**
+ * @implemented
+ */
+STDMETHODIMP CicBridge::OnPreFocusDIM(HWND hwnd)
+{
+ return S_OK;
+}
+
+/**
+ * @unimplemented
+ */
+STDMETHODIMP CicBridge::OnSysKeyboardProc(UINT, LONG)
+{
+ return E_NOTIMPL;
+}
+
+/**
+ * @implemented
+ */
+STDMETHODIMP CicBridge::OnSysShellProc(INT, UINT, LONG)
+{
+ return S_OK;
+}
+
/***********************************************************************
* ImeInquire (MSCTFIME.@)
*
@@ -377,12 +549,31 @@ ImeConfigure(
return FALSE;
}
+/***********************************************************************
+ * ImeDestroy (MSCTFIME.@)
+ *
+ * @implemented
+ */
EXTERN_C BOOL WINAPI
ImeDestroy(
_In_ UINT uReserved)
{
- FIXME("stub:(%u)\n", uReserved);
- return FALSE;
+ TRACE("(%u)\n", uReserved);
+
+ TLS *pTLS = (TLS *)::TlsGetValue(TLS::s_dwTlsIndex);
+ if (pTLS)
+ return FALSE;
+
+ if (!pTLS->m_pBridge || !pTLS->m_pThreadMgr)
+ return FALSE;
+
+ if (pTLS->m_dwSystemInfoFlags & IME_SYSINFO_WINLOGON)
+ return TRUE;
+
+ if (pTLS->m_pBridge->DeactivateIMMX(pTLS, pTLS->m_pThreadMgr) != S_OK)
+ return FALSE;
+
+ return pTLS->m_pBridge->UnInitIMMX(pTLS);
}
/***********************************************************************
@@ -569,18 +760,79 @@ CtfImeIsGuidMapEnable(
return FALSE;
}
+
+/***********************************************************************
+ * CtfImeCreateThreadMgr (MSCTFIME.@)
+ *
+ * @implemented
+ */
EXTERN_C HRESULT WINAPI
CtfImeCreateThreadMgr(VOID)
{
- FIXME("stub:()\n");
- return E_NOTIMPL;
+ TRACE("()\n");
+
+ TLS *pTLS = TLS::GetTLS();
+ if (!pTLS)
+ return E_OUTOFMEMORY;
+
+ if (!pTLS->m_pBridge)
+ {
+ pTLS->m_pBridge = new CicBridge();
+ if (!pTLS->m_pBridge)
+ return E_OUTOFMEMORY;
+ }
+
+ HRESULT hr = S_OK;
+ if (!g_bWinLogon && !(pTLS->m_dwSystemInfoFlags & IME_SYSINFO_WINLOGON))
+ {
+ hr = pTLS->m_pBridge->InitIMMX(pTLS);
+ if (SUCCEEDED(hr))
+ {
+ if (!pTLS->m_pThreadMgr)
+ return E_OUTOFMEMORY;
+
+ hr = pTLS->m_pBridge->ActivateIMMX(pTLS, pTLS->m_pThreadMgr);
+ if (FAILED(hr))
+ pTLS->m_pBridge->UnInitIMMX(pTLS);
+ }
+ }
+
+ return hr;
}
+
+/***********************************************************************
+ * CtfImeDestroyThreadMgr (MSCTFIME.@)
+ *
+ * @implemented
+ */
EXTERN_C HRESULT WINAPI
CtfImeDestroyThreadMgr(VOID)
{
- FIXME("stub:()\n");
- return E_NOTIMPL;
+ TRACE("()\n");
+
+ TLS *pTLS = (TLS *)::TlsGetValue(TLS::s_dwTlsIndex);
+ if (!pTLS)
+ return E_OUTOFMEMORY;
+
+ if (pTLS->m_pBridge)
+ {
+ pTLS->m_pBridge = new CicBridge();
+ if (!pTLS->m_pBridge)
+ return E_OUTOFMEMORY;
+ }
+
+ if (!pTLS->m_pThreadMgr)
+ return E_OUTOFMEMORY;
+
+ if (pTLS->m_dwSystemInfoFlags & IME_SYSINFO_WINLOGON)
+ return S_OK;
+
+ HRESULT hr = pTLS->m_pBridge->DeactivateIMMX(pTLS, pTLS->m_pThreadMgr);
+ if (hr == S_OK)
+ pTLS->m_pBridge->UnInitIMMX(pTLS);
+
+ return hr;
}
EXTERN_C HRESULT WINAPI
diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h
index 6f99e46a003..e227b5b8d7e 100644
--- a/dll/ime/msctfime/msctfime.h
+++ b/dll/ime/msctfime/msctfime.h
@@ -11,6 +11,7 @@
#define WIN32_NO_STATUS
#define COBJMACROS
+#define INITGUID
#include <windows.h>
#include <imm.h>
1
0
[reactos] 01/01: [UMPNPMGR] Broadcast a WM_DEVICECHANGE message after a device install was queued
by Eric Kohl 18 Dec '23
by Eric Kohl 18 Dec '23
18 Dec '23
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec0a300f2b71e117ecfca…
commit ec0a300f2b71e117ecfcabce6847093bdcbaddba
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Mon Dec 18 11:16:45 2023 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Mon Dec 18 11:17:08 2023 +0100
[UMPNPMGR] Broadcast a WM_DEVICECHANGE message after a device install was queued
---
base/services/umpnpmgr/event.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/base/services/umpnpmgr/event.c b/base/services/umpnpmgr/event.c
index 5340431c005..7f104128f7e 100644
--- a/base/services/umpnpmgr/event.c
+++ b/base/services/umpnpmgr/event.c
@@ -136,6 +136,7 @@ ProcessDeviceInstallEvent(
DeviceInstallParams* Params;
DWORD len;
DWORD DeviceIdLength;
+// DWORD dwRecipient;
DPRINT("ProcessDeviceInstallEvent(%p)\n", PnpEvent);
DPRINT("Device enumerated: %S\n", PnpEvent->InstallDevice.DeviceId);
@@ -156,6 +157,14 @@ ProcessDeviceInstallEvent(
ReleaseMutex(hDeviceInstallListMutex);
SetEvent(hDeviceInstallListNotEmpty);
+
+// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS;
+// BroadcastSystemMessageW(BSF_POSTMESSAGE,
+// &dwRecipient,
+// WM_DEVICECHANGE,
+// DBT_DEVNODES_CHANGED,
+// 0);
+ SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0);
}
}
}
1
0
[reactos] 01/01: [MSCTFIME][IMM32][SDK] Implement CtfImeInquireExW (#6187)
by Katayama Hirofumi MZ 18 Dec '23
by Katayama Hirofumi MZ 18 Dec '23
18 Dec '23
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f8db4ddb6db731a29a3f…
commit 8f8db4ddb6db731a29a3ff576fdd5dd920d44300
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Dec 18 19:11:17 2023 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Dec 18 19:11:17 2023 +0900
[MSCTFIME][IMM32][SDK] Implement CtfImeInquireExW (#6187)
- Use C++.
- Adapt INPUTCONTEXTDX to C++.
- Add some global variables.
- Add DllShutDownInProgress function.
- Add TLS class.
- Modify CtfImeInquireExW prototype.
- Modify Imm32InquireIme for
CtfImeInquireExW.
CORE-19360
---
dll/ime/msctfime/CMakeLists.txt | 2 +-
dll/ime/msctfime/msctfime.c | 414 --------------------
dll/ime/msctfime/msctfime.cpp | 844 ++++++++++++++++++++++++++++++++++++++++
dll/ime/msctfime/msctfime.h | 6 +
dll/win32/imm32/ime.c | 2 +-
sdk/include/ddk/immdev.h | 19 +-
sdk/include/reactos/imetable.h | 2 +-
7 files changed, 858 insertions(+), 431 deletions(-)
diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt
index 3925158f4a3..10f18eab2d0 100644
--- a/dll/ime/msctfime/CMakeLists.txt
+++ b/dll/ime/msctfime/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
spec2def(msctfime.ime msctfime.spec)
list(APPEND SOURCE
- msctfime.c)
+ msctfime.cpp)
file(GLOB msctfime_rc_deps res/*.*)
add_rc_deps(msctfime.rc ${msctfime_rc_deps})
diff --git a/dll/ime/msctfime/msctfime.c b/dll/ime/msctfime/msctfime.c
deleted file mode 100644
index deb6cc92722..00000000000
--- a/dll/ime/msctfime/msctfime.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * PROJECT: ReactOS msctfime.ime
- * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
- * PURPOSE: Supporting IME interface of Text Input Processors (TIPs)
- * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
- */
-
-#include "msctfime.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctfime);
-
-HINSTANCE g_hInst = NULL; /* The instance of this module */
-
-BOOL WINAPI
-ImeInquire(
- _Out_ LPIMEINFO lpIMEInfo,
- _Out_ LPWSTR lpszWndClass,
- _In_ DWORD dwSystemInfoFlags)
-{
- FIXME("stub:(%p, %p, 0x%lX)\n", lpIMEInfo, lpszWndClass, dwSystemInfoFlags);
- return FALSE;
-}
-
-/***********************************************************************
- * ImeConversionList (MSCTFIME.@)
- *
- * MSCTFIME's ImeConversionList does nothing.
- *
- * @implemented
- * @see ImmGetConversionListW
- */
-DWORD WINAPI
-ImeConversionList(
- _In_ HIMC hIMC,
- _In_ LPCWSTR lpSrc,
- _Out_ LPCANDIDATELIST lpDst,
- _In_ DWORD dwBufLen,
- _In_ UINT uFlag)
-{
- TRACE("(%p, %s, %p, 0x%lX, %u)\n", hIMC, debugstr_w(lpSrc), lpDst, dwBufLen, uFlag);
- return 0;
-}
-
-/***********************************************************************
- * ImeRegisterWord (MSCTFIME.@)
- *
- * MSCTFIME's ImeRegisterWord does nothing.
- *
- * @implemented
- * @see ImeUnregisterWord
- */
-BOOL WINAPI
-ImeRegisterWord(
- _In_ LPCWSTR lpszReading,
- _In_ DWORD dwStyle,
- _In_ LPCWSTR lpszString)
-{
- TRACE("(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString));
- return FALSE;
-}
-
-/***********************************************************************
- * ImeUnregisterWord (MSCTFIME.@)
- *
- * MSCTFIME's ImeUnregisterWord does nothing.
- *
- * @implemented
- * @see ImeRegisterWord
- */
-BOOL WINAPI
-ImeUnregisterWord(
- _In_ LPCWSTR lpszReading,
- _In_ DWORD dwStyle,
- _In_ LPCWSTR lpszString)
-{
- TRACE("(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString));
- return FALSE;
-}
-
-/***********************************************************************
- * ImeGetRegisterWordStyle (MSCTFIME.@)
- *
- * MSCTFIME's ImeGetRegisterWordStyle does nothing.
- *
- * @implemented
- * @see ImeRegisterWord
- */
-UINT WINAPI
-ImeGetRegisterWordStyle(
- _In_ UINT nItem,
- _Out_ LPSTYLEBUFW lpStyleBuf)
-{
- TRACE("(%u, %p)\n", nItem, lpStyleBuf);
- return 0;
-}
-
-/***********************************************************************
- * ImeEnumRegisterWord (MSCTFIME.@)
- *
- * MSCTFIME's ImeEnumRegisterWord does nothing.
- *
- * @implemented
- * @see ImeRegisterWord
- */
-UINT WINAPI
-ImeEnumRegisterWord(
- _In_ REGISTERWORDENUMPROCW lpfnEnumProc,
- _In_opt_ LPCWSTR lpszReading,
- _In_ DWORD dwStyle,
- _In_opt_ LPCWSTR lpszString,
- _In_opt_ LPVOID lpData)
-{
- TRACE("(%p, %s, %lu, %s, %p)\n", lpfnEnumProc, debugstr_w(lpszReading),
- dwStyle, debugstr_w(lpszString), lpData);
- return 0;
-}
-
-BOOL WINAPI
-ImeConfigure(
- _In_ HKL hKL,
- _In_ HWND hWnd,
- _In_ DWORD dwMode,
- _Inout_opt_ LPVOID lpData)
-{
- FIXME("stub:(%p, %p, %lu, %p)\n", hKL, hWnd, dwMode, lpData);
- return FALSE;
-}
-
-BOOL WINAPI
-ImeDestroy(
- _In_ UINT uReserved)
-{
- FIXME("stub:(%u)\n", uReserved);
- return FALSE;
-}
-
-/***********************************************************************
- * ImeEscape (MSCTFIME.@)
- *
- * MSCTFIME's ImeEscape does nothing.
- *
- * @implemented
- * @see CtfImeEscapeEx
- */
-LRESULT WINAPI
-ImeEscape(
- _In_ HIMC hIMC,
- _In_ UINT uEscape,
- _Inout_opt_ LPVOID lpData)
-{
- TRACE("(%p, %u, %p)\n", hIMC, uEscape, lpData);
- return 0;
-}
-
-BOOL WINAPI
-ImeProcessKey(
- _In_ HIMC hIMC,
- _In_ UINT uVirKey,
- _In_ LPARAM lParam,
- _In_ CONST LPBYTE lpbKeyState)
-{
- FIXME("stub:(%p, %u, %p, lpbKeyState)\n", hIMC, uVirKey, lParam, lpbKeyState);
- return FALSE;
-}
-
-/***********************************************************************
- * ImeSelect (MSCTFIME.@)
- *
- * MSCTFIME's ImeSelect does nothing.
- *
- * @implemented
- * @see CtfImeSelectEx
- */
-BOOL WINAPI
-ImeSelect(
- _In_ HIMC hIMC,
- _In_ BOOL fSelect)
-{
- TRACE("(%p, %u)\n", hIMC, fSelect);
- return FALSE;
-}
-
-/***********************************************************************
- * ImeSetActiveContext (MSCTFIME.@)
- *
- * MSCTFIME's ImeSetActiveContext does nothing.
- *
- * @implemented
- * @see CtfImeSetActiveContextAlways
- */
-BOOL WINAPI
-ImeSetActiveContext(
- _In_ HIMC hIMC,
- _In_ BOOL fFlag)
-{
- TRACE("(%p, %u)\n", hIMC, fFlag);
- return FALSE;
-}
-
-UINT WINAPI
-ImeToAsciiEx(
- _In_ UINT uVirKey,
- _In_ UINT uScanCode,
- _In_ CONST LPBYTE lpbKeyState,
- _Out_ LPTRANSMSGLIST lpTransMsgList,
- _In_ UINT fuState,
- _In_ HIMC hIMC)
-{
- FIXME("stub:(%u, %u, %p, %p, %u, %p)\n", uVirKey, uScanCode, lpbKeyState, lpTransMsgList,
- fuState, hIMC);
- return 0;
-}
-
-BOOL WINAPI
-NotifyIME(
- _In_ HIMC hIMC,
- _In_ DWORD dwAction,
- _In_ DWORD dwIndex,
- _In_ DWORD_PTR dwValue)
-{
- FIXME("stub:(%p, 0x%lX, 0x%lX, %p)\n", hIMC, dwAction, dwIndex, dwValue);
- return FALSE;
-}
-
-BOOL WINAPI
-ImeSetCompositionString(
- _In_ HIMC hIMC,
- _In_ DWORD dwIndex,
- _In_opt_ LPCVOID lpComp,
- _In_ DWORD dwCompLen,
- _In_opt_ LPCVOID lpRead,
- _In_ DWORD dwReadLen)
-{
- FIXME("stub:(%p, 0x%lX, %p, 0x%lX, %p, 0x%lX)\n", hIMC, dwIndex, lpComp, dwCompLen,
- lpRead, dwReadLen);
- return FALSE;
-}
-
-DWORD WINAPI
-ImeGetImeMenuItems(
- _In_ HIMC hIMC,
- _In_ DWORD dwFlags,
- _In_ DWORD dwType,
- _Inout_opt_ LPIMEMENUITEMINFOW lpImeParentMenu,
- _Inout_opt_ LPIMEMENUITEMINFOW lpImeMenu,
- _In_ DWORD dwSize)
-{
- FIXME("stub:(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", hIMC, dwFlags, dwType, lpImeParentMenu,
- lpImeMenu, dwSize);
- return 0;
-}
-
-BOOL WINAPI
-CtfImeInquireExW(
- _Out_ LPIMEINFO lpIMEInfo,
- _Out_ LPWSTR lpszWndClass,
- _In_ DWORD dwSystemInfoFlags,
- _In_ HKL hKL)
-{
- FIXME("stub:(%p, %p, 0x%lX, %p)\n", lpIMEInfo, lpszWndClass, dwSystemInfoFlags, hKL);
- return FALSE;
-}
-
-BOOL WINAPI
-CtfImeSelectEx(
- _In_ HIMC hIMC,
- _In_ BOOL fSelect,
- _In_ HKL hKL)
-{
- FIXME("stub:(%p, %d, %p)\n", hIMC, fSelect, hKL);
- return FALSE;
-}
-
-LRESULT WINAPI
-CtfImeEscapeEx(
- _In_ HIMC hIMC,
- _In_ UINT uSubFunc,
- _Inout_opt_ LPVOID lpData,
- _In_ HKL hKL)
-{
- FIXME("stub:(%p, %u, %p, %p)\n", hIMC, uSubFunc, lpData, hKL);
- return 0;
-}
-
-HRESULT WINAPI
-CtfImeGetGuidAtom(
- _In_ HIMC hIMC,
- _In_ DWORD dwUnknown,
- _Out_opt_ LPDWORD pdwGuidAtom)
-{
- FIXME("stub:(%p, 0x%lX, %p)\n", hIMC, dwUnknown, pdwGuidAtom);
- return E_FAIL;
-}
-
-BOOL WINAPI
-CtfImeIsGuidMapEnable(
- _In_ HIMC hIMC)
-{
- FIXME("stub:(%p)\n", hIMC);
- return FALSE;
-}
-
-HRESULT WINAPI
-CtfImeCreateThreadMgr(VOID)
-{
- FIXME("stub:()\n");
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI
-CtfImeDestroyThreadMgr(VOID)
-{
- FIXME("stub:()\n");
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI
-CtfImeCreateInputContext(
- _In_ HIMC hIMC)
-{
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI
-CtfImeDestroyInputContext(
- _In_ HIMC hIMC)
-{
- FIXME("stub:(%p)\n", hIMC);
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI
-CtfImeSetActiveContextAlways(
- _In_ HIMC hIMC,
- _In_ BOOL fActive,
- _In_ HWND hWnd,
- _In_ HKL hKL)
-{
- FIXME("stub:(%p, %d, %p, %p)\n", hIMC, fActive, hWnd, hKL);
- return E_NOTIMPL;
-}
-
-HRESULT WINAPI
-CtfImeProcessCicHotkey(
- _In_ HIMC hIMC,
- _In_ UINT vKey,
- _In_ LPARAM lParam)
-{
- FIXME("stub:(%p, %u, %p)\n", hIMC, vKey, lParam);
- return E_NOTIMPL;
-}
-
-LRESULT WINAPI
-CtfImeDispatchDefImeMessage(
- _In_ HWND hWnd,
- _In_ UINT uMsg,
- _In_ WPARAM wParam,
- _In_ LPARAM lParam)
-{
- FIXME("stub:(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam);
- return 0;
-}
-
-BOOL WINAPI
-CtfImeIsIME(
- _In_ HKL hKL)
-{
- FIXME("stub:(%p)\n", hKL);
- return FALSE;
-}
-
-HRESULT WINAPI
-CtfImeThreadDetach(VOID)
-{
- ImeDestroy(0);
- return S_OK;
-}
-
-LRESULT CALLBACK
-UIWndProc(
- _In_ HWND hWnd,
- _In_ UINT uMsg,
- _In_ WPARAM wParam,
- _In_ LPARAM lParam)
-{
- if (uMsg == WM_CREATE)
- {
- FIXME("stub\n");
- return -1;
- }
- return 0;
-}
-
-BOOL WINAPI
-DllMain(
- _In_ HINSTANCE hinstDLL,
- _In_ DWORD dwReason,
- _Inout_opt_ LPVOID lpvReserved)
-{
- switch (dwReason)
- {
- case DLL_PROCESS_ATTACH:
- {
- TRACE("(%p, %lu, %p)\n", hinstDLL, dwReason, lpvReserved);
- g_hInst = hinstDLL;
- break;
- }
- case DLL_PROCESS_DETACH:
- {
- break;
- }
- }
- return TRUE;
-}
diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp
new file mode 100644
index 00000000000..ae0adad1ad1
--- /dev/null
+++ b/dll/ime/msctfime/msctfime.cpp
@@ -0,0 +1,844 @@
+/*
+ * PROJECT: ReactOS msctfime.ime
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
+ * PURPOSE: Supporting IME interface of Text Input Processors (TIPs)
+ * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
+ */
+
+#include "msctfime.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msctfime);
+
+HINSTANCE g_hInst = NULL; /* The instance of this module */
+BOOL g_bWinLogon = FALSE;
+DWORD g_dwOSInfo = 0;
+BOOL gfTFInitLib = FALSE;
+CRITICAL_SECTION g_csLock;
+
+UINT WM_MSIME_SERVICE = 0;
+UINT WM_MSIME_UIREADY = 0;
+UINT WM_MSIME_RECONVERTREQUEST = 0;
+UINT WM_MSIME_RECONVERT = 0;
+UINT WM_MSIME_DOCUMENTFEED = 0;
+UINT WM_MSIME_QUERYPOSITION = 0;
+UINT WM_MSIME_MODEBIAS = 0;
+UINT WM_MSIME_SHOWIMEPAD = 0;
+UINT WM_MSIME_MOUSE = 0;
+UINT WM_MSIME_KEYMAP = 0;
+
+typedef BOOLEAN (WINAPI *FN_DllShutDownInProgress)(VOID);
+
+EXTERN_C BOOLEAN WINAPI
+DllShutDownInProgress(VOID)
+{
+ HMODULE hNTDLL;
+ static FN_DllShutDownInProgress s_fnDllShutDownInProgress = NULL;
+
+ if (s_fnDllShutDownInProgress)
+ return s_fnDllShutDownInProgress();
+
+ hNTDLL = GetSystemModuleHandle(L"ntdll.dll", FALSE);
+ s_fnDllShutDownInProgress =
+ (FN_DllShutDownInProgress)GetProcAddress(hNTDLL, "RtlDllShutdownInProgress");
+ if (!s_fnDllShutDownInProgress)
+ return FALSE;
+
+ return s_fnDllShutDownInProgress();
+}
+
+static BOOL
+IsInteractiveUserLogon(VOID)
+{
+ BOOL bOK, IsMember = FALSE;
+ PSID pSid;
+ SID_IDENTIFIER_AUTHORITY IdentAuth = { SECURITY_NT_AUTHORITY };
+
+ if (!AllocateAndInitializeSid(&IdentAuth, 1, SECURITY_INTERACTIVE_RID,
+ 0, 0, 0, 0, 0, 0, 0, &pSid))
+ {
+ ERR("Error: %ld\n", GetLastError());
+ return FALSE;
+ }
+
+ bOK = CheckTokenMembership(NULL, pSid, &IsMember);
+
+ if (pSid)
+ FreeSid(pSid);
+
+ return bOK && IsMember;
+}
+
+/**
+ * @implemented
+ */
+HRESULT
+Inquire(
+ _Out_ LPIMEINFO lpIMEInfo,
+ _Out_ LPWSTR lpszWndClass,
+ _In_ DWORD dwSystemInfoFlags,
+ _In_ HKL hKL)
+{
+ if (!lpIMEInfo)
+ return E_OUTOFMEMORY;
+
+ StringCchCopyW(lpszWndClass, 64, L"MSCTFIME UI");
+ lpIMEInfo->dwPrivateDataSize = 0;
+
+ switch (LOWORD(hKL)) // Language ID
+ {
+ case MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT): // Japanese
+ {
+ lpIMEInfo->fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_SPECIAL_UI |
+ IME_PROP_AT_CARET | IME_PROP_NEED_ALTKEY |
+ IME_PROP_KBD_CHAR_FIRST;
+ lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA |
+ IME_CMODE_NATIVE;
+ lpIMEInfo->fdwSentenceCaps = IME_SMODE_CONVERSATION | IME_SMODE_PLAURALCLAUSE;
+ lpIMEInfo->fdwSelectCaps = SELECT_CAP_SENTENCE | SELECT_CAP_CONVERSION;
+ lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD |
+ SCS_CAP_COMPSTR;
+ lpIMEInfo->fdwUICaps = UI_CAP_ROT90;
+ break;
+ }
+ case MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT): // Korean
+ {
+ lpIMEInfo->fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_SPECIAL_UI |
+ IME_PROP_AT_CARET | IME_PROP_NEED_ALTKEY |
+ IME_PROP_KBD_CHAR_FIRST;
+ lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE;
+ lpIMEInfo->fdwSentenceCaps = 0;
+ lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_COMPSTR;
+ lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION;
+ lpIMEInfo->fdwUICaps = UI_CAP_ROT90;
+ break;
+ }
+ case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED): // Simplified Chinese
+ case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL): // Traditional Chinese
+ {
+ lpIMEInfo->fdwProperty = IME_PROP_SPECIAL_UI | IME_PROP_AT_CARET |
+ IME_PROP_NEED_ALTKEY | IME_PROP_KBD_CHAR_FIRST;
+ lpIMEInfo->fdwConversionCaps = IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE;
+ lpIMEInfo->fdwSentenceCaps = SELECT_CAP_CONVERSION;
+ lpIMEInfo->fdwSelectCaps = 0;
+ lpIMEInfo->fdwSCSCaps = SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD |
+ SCS_CAP_COMPSTR;
+ lpIMEInfo->fdwUICaps = UI_CAP_ROT90;
+ break;
+ }
+ default: // Otherwise
+ {
+ lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET;
+ lpIMEInfo->fdwConversionCaps = 0;
+ lpIMEInfo->fdwSentenceCaps = 0;
+ lpIMEInfo->fdwSCSCaps = 0;
+ lpIMEInfo->fdwUICaps = 0;
+ lpIMEInfo->fdwSelectCaps = 0;
+ break;
+ }
+ }
+
+ return S_OK;
+}
+
+/* FIXME */
+struct CicBridge : IUnknown
+{
+};
+
+/* FIXME */
+struct CicProfile : IUnknown
+{
+};
+
+class TLS
+{
+public:
+ static DWORD s_dwTlsIndex;
+
+ DWORD m_dwSystemInfoFlags;
+ CicBridge *m_pBridge;
+ CicProfile *m_pProfile;
+ ITfThreadMgr *m_pThreadMgr;
+ DWORD m_dwUnknown2[4];
+ DWORD m_dwNowOpening;
+ DWORD m_NonEAComposition;
+ DWORD m_cWnds;
+
+ /**
+ * @implemented
+ */
+ static BOOL Initialize()
+ {
+ s_dwTlsIndex = ::TlsAlloc();
+ return s_dwTlsIndex != (DWORD)-1;
+ }
+
+ /**
+ * @implemented
+ */
+ static VOID Uninitialize()
+ {
+ if (s_dwTlsIndex != (DWORD)-1)
+ {
+ ::TlsFree(s_dwTlsIndex);
+ s_dwTlsIndex = (DWORD)-1;
+ }
+ }
+
+ /**
+ * @implemented
+ */
+ static TLS* GetTLS()
+ {
+ if (s_dwTlsIndex == (DWORD)-1)
+ return NULL;
+
+ return InternalAllocateTLS();
+ }
+
+ static TLS* InternalAllocateTLS();
+ static BOOL InternalDestroyTLS();
+};
+
+DWORD TLS::s_dwTlsIndex = (DWORD)-1;
+
+/**
+ * @implemented
+ */
+TLS* TLS::InternalAllocateTLS()
+{
+ TLS *pTLS = (TLS *)::TlsGetValue(TLS::s_dwTlsIndex);
+ if (pTLS)
+ return pTLS;
+
+ if (DllShutDownInProgress())
+ return NULL;
+
+ pTLS = (TLS *)cicMemAllocClear(sizeof(TLS));
+ if (!pTLS)
+ return NULL;
+
+ if (!::TlsSetValue(s_dwTlsIndex, pTLS))
+ {
+ cicMemFree(pTLS);
+ return NULL;
+ }
+
+ pTLS->m_dwUnknown2[0] |= 1;
+ pTLS->m_dwUnknown2[2] |= 1;
+ return pTLS;
+}
+
+/**
+ * @implemented
+ */
+BOOL TLS::InternalDestroyTLS()
+{
+ if (s_dwTlsIndex == (DWORD)-1)
+ return FALSE;
+
+ TLS *pTLS = (TLS *)::TlsGetValue(s_dwTlsIndex);
+ if (!pTLS)
+ return FALSE;
+
+ if (pTLS->m_pBridge)
+ pTLS->m_pBridge->Release();
+ if (pTLS->m_pProfile)
+ pTLS->m_pProfile->Release();
+ if (pTLS->m_pThreadMgr)
+ pTLS->m_pThreadMgr->Release();
+
+ cicMemFree(pTLS);
+ ::TlsSetValue(s_dwTlsIndex, NULL);
+ return TRUE;
+}
+
+/***********************************************************************
+ * ImeInquire (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeInquire does nothing.
+ *
+ * @implemented
+ * @see CtfImeInquireExW
+ */
+EXTERN_C
+BOOL WINAPI
+ImeInquire(
+ _Out_ LPIMEINFO lpIMEInfo,
+ _Out_ LPWSTR lpszWndClass,
+ _In_ DWORD dwSystemInfoFlags)
+{
+ TRACE("(%p, %p, 0x%lX)\n", lpIMEInfo, lpszWndClass, dwSystemInfoFlags);
+ return FALSE;
+}
+
+/***********************************************************************
+ * ImeConversionList (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeConversionList does nothing.
+ *
+ * @implemented
+ * @see ImmGetConversionListW
+ */
+EXTERN_C DWORD WINAPI
+ImeConversionList(
+ _In_ HIMC hIMC,
+ _In_ LPCWSTR lpSrc,
+ _Out_ LPCANDIDATELIST lpDst,
+ _In_ DWORD dwBufLen,
+ _In_ UINT uFlag)
+{
+ TRACE("(%p, %s, %p, 0x%lX, %u)\n", hIMC, debugstr_w(lpSrc), lpDst, dwBufLen, uFlag);
+ return 0;
+}
+
+/***********************************************************************
+ * ImeRegisterWord (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeRegisterWord does nothing.
+ *
+ * @implemented
+ * @see ImeUnregisterWord
+ */
+EXTERN_C BOOL WINAPI
+ImeRegisterWord(
+ _In_ LPCWSTR lpszReading,
+ _In_ DWORD dwStyle,
+ _In_ LPCWSTR lpszString)
+{
+ TRACE("(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString));
+ return FALSE;
+}
+
+/***********************************************************************
+ * ImeUnregisterWord (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeUnregisterWord does nothing.
+ *
+ * @implemented
+ * @see ImeRegisterWord
+ */
+EXTERN_C BOOL WINAPI
+ImeUnregisterWord(
+ _In_ LPCWSTR lpszReading,
+ _In_ DWORD dwStyle,
+ _In_ LPCWSTR lpszString)
+{
+ TRACE("(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString));
+ return FALSE;
+}
+
+/***********************************************************************
+ * ImeGetRegisterWordStyle (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeGetRegisterWordStyle does nothing.
+ *
+ * @implemented
+ * @see ImeRegisterWord
+ */
+EXTERN_C UINT WINAPI
+ImeGetRegisterWordStyle(
+ _In_ UINT nItem,
+ _Out_ LPSTYLEBUFW lpStyleBuf)
+{
+ TRACE("(%u, %p)\n", nItem, lpStyleBuf);
+ return 0;
+}
+
+/***********************************************************************
+ * ImeEnumRegisterWord (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeEnumRegisterWord does nothing.
+ *
+ * @implemented
+ * @see ImeRegisterWord
+ */
+EXTERN_C UINT WINAPI
+ImeEnumRegisterWord(
+ _In_ REGISTERWORDENUMPROCW lpfnEnumProc,
+ _In_opt_ LPCWSTR lpszReading,
+ _In_ DWORD dwStyle,
+ _In_opt_ LPCWSTR lpszString,
+ _In_opt_ LPVOID lpData)
+{
+ TRACE("(%p, %s, %lu, %s, %p)\n", lpfnEnumProc, debugstr_w(lpszReading),
+ dwStyle, debugstr_w(lpszString), lpData);
+ return 0;
+}
+
+EXTERN_C BOOL WINAPI
+ImeConfigure(
+ _In_ HKL hKL,
+ _In_ HWND hWnd,
+ _In_ DWORD dwMode,
+ _Inout_opt_ LPVOID lpData)
+{
+ FIXME("stub:(%p, %p, %lu, %p)\n", hKL, hWnd, dwMode, lpData);
+ return FALSE;
+}
+
+EXTERN_C BOOL WINAPI
+ImeDestroy(
+ _In_ UINT uReserved)
+{
+ FIXME("stub:(%u)\n", uReserved);
+ return FALSE;
+}
+
+/***********************************************************************
+ * ImeEscape (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeEscape does nothing.
+ *
+ * @implemented
+ * @see CtfImeEscapeEx
+ */
+EXTERN_C LRESULT WINAPI
+ImeEscape(
+ _In_ HIMC hIMC,
+ _In_ UINT uEscape,
+ _Inout_opt_ LPVOID lpData)
+{
+ TRACE("(%p, %u, %p)\n", hIMC, uEscape, lpData);
+ return 0;
+}
+
+EXTERN_C BOOL WINAPI
+ImeProcessKey(
+ _In_ HIMC hIMC,
+ _In_ UINT uVirKey,
+ _In_ LPARAM lParam,
+ _In_ CONST LPBYTE lpbKeyState)
+{
+ FIXME("stub:(%p, %u, %p, lpbKeyState)\n", hIMC, uVirKey, lParam, lpbKeyState);
+ return FALSE;
+}
+
+/***********************************************************************
+ * ImeSelect (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeSelect does nothing.
+ *
+ * @implemented
+ * @see CtfImeSelectEx
+ */
+EXTERN_C BOOL WINAPI
+ImeSelect(
+ _In_ HIMC hIMC,
+ _In_ BOOL fSelect)
+{
+ TRACE("(%p, %u)\n", hIMC, fSelect);
+ return FALSE;
+}
+
+/***********************************************************************
+ * ImeSetActiveContext (MSCTFIME.@)
+ *
+ * MSCTFIME's ImeSetActiveContext does nothing.
+ *
+ * @implemented
+ * @see CtfImeSetActiveContextAlways
+ */
+EXTERN_C BOOL WINAPI
+ImeSetActiveContext(
+ _In_ HIMC hIMC,
+ _In_ BOOL fFlag)
+{
+ TRACE("(%p, %u)\n", hIMC, fFlag);
+ return FALSE;
+}
+
+EXTERN_C UINT WINAPI
+ImeToAsciiEx(
+ _In_ UINT uVirKey,
+ _In_ UINT uScanCode,
+ _In_ CONST LPBYTE lpbKeyState,
+ _Out_ LPTRANSMSGLIST lpTransMsgList,
+ _In_ UINT fuState,
+ _In_ HIMC hIMC)
+{
+ FIXME("stub:(%u, %u, %p, %p, %u, %p)\n", uVirKey, uScanCode, lpbKeyState, lpTransMsgList,
+ fuState, hIMC);
+ return 0;
+}
+
+EXTERN_C BOOL WINAPI
+NotifyIME(
+ _In_ HIMC hIMC,
+ _In_ DWORD dwAction,
+ _In_ DWORD dwIndex,
+ _In_ DWORD_PTR dwValue)
+{
+ FIXME("stub:(%p, 0x%lX, 0x%lX, %p)\n", hIMC, dwAction, dwIndex, dwValue);
+ return FALSE;
+}
+
+EXTERN_C BOOL WINAPI
+ImeSetCompositionString(
+ _In_ HIMC hIMC,
+ _In_ DWORD dwIndex,
+ _In_opt_ LPCVOID lpComp,
+ _In_ DWORD dwCompLen,
+ _In_opt_ LPCVOID lpRead,
+ _In_ DWORD dwReadLen)
+{
+ FIXME("stub:(%p, 0x%lX, %p, 0x%lX, %p, 0x%lX)\n", hIMC, dwIndex, lpComp, dwCompLen,
+ lpRead, dwReadLen);
+ return FALSE;
+}
+
+EXTERN_C DWORD WINAPI
+ImeGetImeMenuItems(
+ _In_ HIMC hIMC,
+ _In_ DWORD dwFlags,
+ _In_ DWORD dwType,
+ _Inout_opt_ LPIMEMENUITEMINFOW lpImeParentMenu,
+ _Inout_opt_ LPIMEMENUITEMINFOW lpImeMenu,
+ _In_ DWORD dwSize)
+{
+ FIXME("stub:(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", hIMC, dwFlags, dwType, lpImeParentMenu,
+ lpImeMenu, dwSize);
+ return 0;
+}
+
+/***********************************************************************
+ * CtfImeInquireExW (MSCTFIME.@)
+ *
+ * @implemented
+ */
+EXTERN_C HRESULT WINAPI
+CtfImeInquireExW(
+ _Out_ LPIMEINFO lpIMEInfo,
+ _Out_ LPWSTR lpszWndClass,
+ _In_ DWORD dwSystemInfoFlags,
+ _In_ HKL hKL)
+{
+ TRACE("(%p, %p, 0x%lX, %p)\n", lpIMEInfo, lpszWndClass, dwSystemInfoFlags, hKL);
+
+ TLS *pTLS = TLS::GetTLS();
+ if (!pTLS)
+ return E_OUTOFMEMORY;
+
+ if (!IsInteractiveUserLogon())
+ {
+ dwSystemInfoFlags |= IME_SYSINFO_WINLOGON;
+ g_bWinLogon = TRUE;
+ }
+
+ pTLS->m_dwSystemInfoFlags = dwSystemInfoFlags;
+
+ return Inquire(lpIMEInfo, lpszWndClass, dwSystemInfoFlags, hKL);
+}
+
+EXTERN_C BOOL WINAPI
+CtfImeSelectEx(
+ _In_ HIMC hIMC,
+ _In_ BOOL fSelect,
+ _In_ HKL hKL)
+{
+ FIXME("stub:(%p, %d, %p)\n", hIMC, fSelect, hKL);
+ return FALSE;
+}
+
+EXTERN_C LRESULT WINAPI
+CtfImeEscapeEx(
+ _In_ HIMC hIMC,
+ _In_ UINT uSubFunc,
+ _Inout_opt_ LPVOID lpData,
+ _In_ HKL hKL)
+{
+ FIXME("stub:(%p, %u, %p, %p)\n", hIMC, uSubFunc, lpData, hKL);
+ return 0;
+}
+
+EXTERN_C HRESULT WINAPI
+CtfImeGetGuidAtom(
+ _In_ HIMC hIMC,
+ _In_ DWORD dwUnknown,
+ _Out_opt_ LPDWORD pdwGuidAtom)
+{
+ FIXME("stub:(%p, 0x%lX, %p)\n", hIMC, dwUnknown, pdwGuidAtom);
+ return E_FAIL;
+}
+
+EXTERN_C BOOL WINAPI
+CtfImeIsGuidMapEnable(
+ _In_ HIMC hIMC)
+{
+ FIXME("stub:(%p)\n", hIMC);
+ return FALSE;
+}
+
+EXTERN_C HRESULT WINAPI
+CtfImeCreateThreadMgr(VOID)
+{
+ FIXME("stub:()\n");
+ return E_NOTIMPL;
+}
+
+EXTERN_C HRESULT WINAPI
+CtfImeDestroyThreadMgr(VOID)
+{
+ FIXME("stub:()\n");
+ return E_NOTIMPL;
+}
+
+EXTERN_C HRESULT WINAPI
+CtfImeCreateInputContext(
+ _In_ HIMC hIMC)
+{
+ return E_NOTIMPL;
+}
+
+EXTERN_C HRESULT WINAPI
+CtfImeDestroyInputContext(
+ _In_ HIMC hIMC)
+{
+ FIXME("stub:(%p)\n", hIMC);
+ return E_NOTIMPL;
+}
+
+EXTERN_C HRESULT WINAPI
+CtfImeSetActiveContextAlways(
+ _In_ HIMC hIMC,
+ _In_ BOOL fActive,
+ _In_ HWND hWnd,
+ _In_ HKL hKL)
+{
+ FIXME("stub:(%p, %d, %p, %p)\n", hIMC, fActive, hWnd, hKL);
+ return E_NOTIMPL;
+}
+
+EXTERN_C HRESULT WINAPI
+CtfImeProcessCicHotkey(
+ _In_ HIMC hIMC,
+ _In_ UINT vKey,
+ _In_ LPARAM lParam)
+{
+ FIXME("stub:(%p, %u, %p)\n", hIMC, vKey, lParam);
+ return E_NOTIMPL;
+}
+
+EXTERN_C LRESULT WINAPI
+CtfImeDispatchDefImeMessage(
+ _In_ HWND hWnd,
+ _In_ UINT uMsg,
+ _In_ WPARAM wParam,
+ _In_ LPARAM lParam)
+{
+ FIXME("stub:(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam);
+ return 0;
+}
+
+EXTERN_C BOOL WINAPI
+CtfImeIsIME(
+ _In_ HKL hKL)
+{
+ FIXME("stub:(%p)\n", hKL);
+ return FALSE;
+}
+
+/**
+ * @implemented
+ */
+EXTERN_C HRESULT WINAPI
+CtfImeThreadDetach(VOID)
+{
+ ImeDestroy(0);
+ return S_OK;
+}
+
+/**
+ * @unimplemented
+ */
+EXTERN_C LRESULT CALLBACK
+UIWndProc(
+ _In_ HWND hWnd,
+ _In_ UINT uMsg,
+ _In_ WPARAM wParam,
+ _In_ LPARAM lParam)
+{
+ if (uMsg == WM_CREATE)
+ {
+ FIXME("stub\n");
+ return -1;
+ }
+ return 0;
+}
+
+/**
+ * @unimplemented
+ */
+BOOL RegisterImeClass(VOID)
+{
+ WNDCLASSEXW wcx;
+
+ if (!GetClassInfoExW(g_hInst, L"MSCTFIME UI", &wcx))
+ {
+ ZeroMemory(&wcx, sizeof(wcx));
+ wcx.cbSize = sizeof(WNDCLASSEXW);
+ wcx.cbWndExtra = sizeof(DWORD) * 2;
+ wcx.hIcon = LoadIconW(0, (LPCWSTR)IDC_ARROW);
+ wcx.hInstance = g_hInst;
+ wcx.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW);
+ wcx.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
+ wcx.style = CS_IME | CS_GLOBALCLASS;
+ wcx.lpfnWndProc = UIWndProc;
+ wcx.lpszClassName = L"MSCTFIME UI";
+ if (!RegisterClassExW(&wcx))
+ return FALSE;
+ }
+
+ if (!GetClassInfoExW(g_hInst, L"MSCTFIME Composition", &wcx))
+ {
+ ZeroMemory(&wcx, sizeof(wcx));
+ wcx.cbSize = sizeof(WNDCLASSEXW);
+ wcx.cbWndExtra = sizeof(DWORD);
+ wcx.hIcon = NULL;
+ wcx.hInstance = g_hInst;
+ wcx.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_IBEAM);
+ wcx.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
+ wcx.style = CS_IME | CS_HREDRAW | CS_VREDRAW;
+ //wcx.lpfnWndProc = UIComposition::CompWndProc; // FIXME
+ wcx.lpszClassName = L"MSCTFIME Composition";
+ if (!RegisterClassExW(&wcx))
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+/**
+ * @implemented
+ */
+VOID UnregisterImeClass(VOID)
+{
+ WNDCLASSEXW wcx;
+
+ GetClassInfoExW(g_hInst, L"MSCTFIME UI", &wcx);
+ UnregisterClassW(L"MSCTFIME UI", g_hInst);
+ DestroyIcon(wcx.hIcon);
+ DestroyIcon(wcx.hIconSm);
+
+ GetClassInfoExW(g_hInst, L"MSCTFIME Composition", &wcx);
+ UnregisterClassW(L"MSCTFIME Composition", g_hInst);
+ DestroyIcon(wcx.hIcon);
+ DestroyIcon(wcx.hIconSm);
+}
+
+/**
+ * @implemented
+ */
+BOOL RegisterMSIMEMessage(VOID)
+{
+ WM_MSIME_SERVICE = RegisterWindowMessageW(L"MSIMEService");
+ WM_MSIME_UIREADY = RegisterWindowMessageW(L"MSIMEUIReady");
+ WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageW(L"MSIMEReconvertRequest");
+ WM_MSIME_RECONVERT = RegisterWindowMessageW(L"MSIMEReconvert");
+ WM_MSIME_DOCUMENTFEED = RegisterWindowMessageW(L"MSIMEDocumentFeed");
+ WM_MSIME_QUERYPOSITION = RegisterWindowMessageW(L"MSIMEQueryPosition");
+ WM_MSIME_MODEBIAS = RegisterWindowMessageW(L"MSIMEModeBias");
+ WM_MSIME_SHOWIMEPAD = RegisterWindowMessageW(L"MSIMEShowImePad");
+ WM_MSIME_MOUSE = RegisterWindowMessageW(L"MSIMEMouseOperation");
+ WM_MSIME_KEYMAP = RegisterWindowMessageW(L"MSIMEKeyMap");
+ return (WM_MSIME_SERVICE &&
+ WM_MSIME_UIREADY &&
+ WM_MSIME_RECONVERTREQUEST &&
+ WM_MSIME_RECONVERT &&
+ WM_MSIME_DOCUMENTFEED &&
+ WM_MSIME_QUERYPOSITION &&
+ WM_MSIME_MODEBIAS &&
+ WM_MSIME_SHOWIMEPAD &&
+ WM_MSIME_MOUSE &&
+ WM_MSIME_KEYMAP);
+}
+
+/**
+ * @implemented
+ */
+BOOL AttachIME(VOID)
+{
+ return RegisterImeClass() && RegisterMSIMEMessage();
+}
+
+/**
+ * @implemented
+ */
+VOID DetachIME(VOID)
+{
+ UnregisterImeClass();
+}
+
+/**
+ * @unimplemented
+ */
+BOOL ProcessAttach(HINSTANCE hinstDLL)
+{
+ g_hInst = hinstDLL;
+
+ InitializeCriticalSectionAndSpinCount(&g_csLock, 0);
+
+ if (!TLS::Initialize())
+ return FALSE;
+
+ g_dwOSInfo = GetOSInfo();
+
+ // FIXME
+
+ gfTFInitLib = TRUE;
+ return AttachIME();
+}
+
+/**
+ * @unimplemented
+ */
+VOID ProcessDetach(HINSTANCE hinstDLL)
+{
+ // FIXME
+
+ if (gfTFInitLib)
+ DetachIME();
+
+ DeleteCriticalSection(&g_csLock);
+ TLS::InternalDestroyTLS();
+ TLS::Uninitialize();
+
+ // FIXME
+}
+
+/**
+ * @unimplemented
+ */
+EXTERN_C BOOL WINAPI
+DllMain(
+ _In_ HINSTANCE hinstDLL,
+ _In_ DWORD dwReason,
+ _Inout_opt_ LPVOID lpvReserved)
+{
+ switch (dwReason)
+ {
+ case DLL_PROCESS_ATTACH:
+ {
+ TRACE("(%p, %lu, %p)\n", hinstDLL, dwReason, lpvReserved);
+ if (!ProcessAttach(hinstDLL))
+ {
+ ProcessDetach(hinstDLL);
+ return FALSE;
+ }
+ break;
+ }
+ case DLL_PROCESS_DETACH:
+ {
+ ProcessDetach(hinstDLL);
+ break;
+ }
+ case DLL_THREAD_DETACH:
+ {
+ // FIXME
+ CtfImeThreadDetach();
+ TLS::InternalDestroyTLS();
+ break;
+ }
+ }
+ return TRUE;
+}
diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h
index bdabd0f2e31..6f99e46a003 100644
--- a/dll/ime/msctfime/msctfime.h
+++ b/dll/ime/msctfime/msctfime.h
@@ -15,8 +15,14 @@
#include <windows.h>
#include <imm.h>
#include <ddk/immdev.h>
+#include <msctf.h>
+#include <shlwapi.h>
#include <strsafe.h>
+#include <cicero/cicbase.h>
+#include <cicero/osinfo.h>
+#include <cicero/CModulePath.h>
+
#include <wine/debug.h>
#include "resource.h"
diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c
index f198f7112c1..eec3632252a 100644
--- a/dll/win32/imm32/ime.c
+++ b/dll/win32/imm32/ime.c
@@ -67,7 +67,7 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi)
}
else if (IS_CICERO_MODE() && !IS_16BIT_MODE())
{
- if (!pImeDpi->CtfImeInquireExW(pImeInfo, szUIClass, dwSysInfoFlags, pImeDpi->hKL))
+ if (pImeDpi->CtfImeInquireExW(pImeInfo, szUIClass, dwSysInfoFlags, pImeDpi->hKL) != S_OK)
{
ERR("\n");
return FALSE;
diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h
index 7dd67cdb013..5fb513da443 100644
--- a/sdk/include/ddk/immdev.h
+++ b/sdk/include/ddk/immdev.h
@@ -142,25 +142,16 @@ typedef struct INPUTCONTEXTDX
{
INPUTCONTEXT;
#endif
- UINT nVKey;
- BOOL bNeedsTrans;
+ UINT nVKey; // +0x140
+ BOOL bNeedsTrans; // +0x144
DWORD dwUnknown1;
- DWORD dwUIFlags;
+ DWORD dwUIFlags; // +0x14c
DWORD dwUnknown2;
- struct IME_STATE *pState;
- DWORD dwChange;
+ struct IME_STATE *pState; // +0x154
+ DWORD dwChange; // +0x158
DWORD dwUnknown5;
} INPUTCONTEXTDX, *PINPUTCONTEXTDX, *LPINPUTCONTEXTDX;
-#ifndef _WIN64
-C_ASSERT(offsetof(INPUTCONTEXTDX, nVKey) == 0x140);
-C_ASSERT(offsetof(INPUTCONTEXTDX, bNeedsTrans) == 0x144);
-C_ASSERT(offsetof(INPUTCONTEXTDX, dwUIFlags) == 0x14c);
-C_ASSERT(offsetof(INPUTCONTEXTDX, pState) == 0x154);
-C_ASSERT(offsetof(INPUTCONTEXTDX, dwChange) == 0x158);
-C_ASSERT(sizeof(INPUTCONTEXTDX) == 0x160);
-#endif
-
// bits of fdwInit of INPUTCONTEXT
#define INIT_STATUSWNDPOS 0x00000001
#define INIT_CONVERSION 0x00000002
diff --git a/sdk/include/reactos/imetable.h b/sdk/include/reactos/imetable.h
index 88f1f59f485..caf8651e22a 100644
--- a/sdk/include/reactos/imetable.h
+++ b/sdk/include/reactos/imetable.h
@@ -15,7 +15,7 @@ DEFINE_IME_ENTRY(UINT, ImeToAsciiEx, (UINT uVirKey, UINT uScanCode, CONST LPBYTE
DEFINE_IME_ENTRY(BOOL, NotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD_PTR dwValue), FALSE)
DEFINE_IME_ENTRY(BOOL, ImeSetCompositionString, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), FALSE)
DEFINE_IME_ENTRY(DWORD, ImeGetImeMenuItems, (HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize), TRUE)
-DEFINE_IME_ENTRY(BOOL, CtfImeInquireExW, (LPIMEINFO lpIMEInfo, LPVOID lpszWndClass, DWORD dwSystemInfoFlags, HKL hKL), TRUE)
+DEFINE_IME_ENTRY(HRESULT, CtfImeInquireExW, (LPIMEINFO lpIMEInfo, LPVOID lpszWndClass, DWORD dwSystemInfoFlags, HKL hKL), TRUE)
DEFINE_IME_ENTRY(BOOL, CtfImeSelectEx, (HIMC hIMC, BOOL fSelect, HKL hKL), TRUE)
DEFINE_IME_ENTRY(LRESULT, CtfImeEscapeEx, (HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL), TRUE)
DEFINE_IME_ENTRY(HRESULT, CtfImeGetGuidAtom, (HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom), TRUE)
1
0
18 Dec '23
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54adb5e45c5a3539244bf…
commit 54adb5e45c5a3539244bfa2fec7e231380f18145
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Mon Dec 18 09:08:27 2023 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Mon Dec 18 09:08:27 2023 +0100
[REGEDIT] Display REG_RESOURCES_REQUIREMENTS_LIST
---
base/applications/regedit/edit.c | 616 ++++++++++++++++++++++++++++++++
base/applications/regedit/lang/bg-BG.rc | 115 ++++++
base/applications/regedit/lang/cs-CZ.rc | 115 ++++++
base/applications/regedit/lang/de-DE.rc | 115 ++++++
base/applications/regedit/lang/el-GR.rc | 115 ++++++
base/applications/regedit/lang/en-US.rc | 115 ++++++
base/applications/regedit/lang/es-ES.rc | 115 ++++++
base/applications/regedit/lang/fr-FR.rc | 115 ++++++
base/applications/regedit/lang/he-IL.rc | 115 ++++++
base/applications/regedit/lang/hu-HU.rc | 115 ++++++
base/applications/regedit/lang/id-ID.rc | 115 ++++++
base/applications/regedit/lang/it-IT.rc | 115 ++++++
base/applications/regedit/lang/ja-JP.rc | 115 ++++++
base/applications/regedit/lang/ko-KR.rc | 115 ++++++
base/applications/regedit/lang/nl-NL.rc | 115 ++++++
base/applications/regedit/lang/no-NO.rc | 115 ++++++
base/applications/regedit/lang/pl-PL.rc | 115 ++++++
base/applications/regedit/lang/pt-BR.rc | 115 ++++++
base/applications/regedit/lang/pt-PT.rc | 115 ++++++
base/applications/regedit/lang/ro-RO.rc | 115 ++++++
base/applications/regedit/lang/ru-RU.rc | 115 ++++++
base/applications/regedit/lang/sk-SK.rc | 115 ++++++
base/applications/regedit/lang/sl-SI.rc | 115 ++++++
base/applications/regedit/lang/sq-AL.rc | 115 ++++++
base/applications/regedit/lang/sv-SE.rc | 115 ++++++
base/applications/regedit/lang/th-TH.rc | 115 ++++++
base/applications/regedit/lang/tr-TR.rc | 115 ++++++
base/applications/regedit/lang/uk-UA.rc | 115 ++++++
base/applications/regedit/lang/zh-CN.rc | 115 ++++++
base/applications/regedit/lang/zh-HK.rc | 115 ++++++
base/applications/regedit/lang/zh-TW.rc | 115 ++++++
base/applications/regedit/resource.h | 57 +++
32 files changed, 4123 insertions(+)
diff --git a/base/applications/regedit/edit.c b/base/applications/regedit/edit.c
index 8805ccb35e7..ebcf410f67c 100644
--- a/base/applications/regedit/edit.c
+++ b/base/applications/regedit/edit.c
@@ -23,6 +23,118 @@
#define NTOS_MODE_USER
#include <ndk/cmtypes.h>
+#if defined(NT_PROCESSOR_GROUPS)
+
+typedef USHORT IRQ_DEVICE_POLICY, *PIRQ_DEVICE_POLICY;
+
+enum _IRQ_DEVICE_POLICY_USHORT {
+ IrqPolicyMachineDefault = 0,
+ IrqPolicyAllCloseProcessors = 1,
+ IrqPolicyOneCloseProcessor = 2,
+ IrqPolicyAllProcessorsInMachine = 3,
+ IrqPolicyAllProcessorsInGroup = 3,
+ IrqPolicySpecifiedProcessors = 4,
+ IrqPolicySpreadMessagesAcrossAllProcessors = 5};
+
+#else /* defined(NT_PROCESSOR_GROUPS) */
+
+typedef enum _IRQ_DEVICE_POLICY {
+ IrqPolicyMachineDefault = 0,
+ IrqPolicyAllCloseProcessors,
+ IrqPolicyOneCloseProcessor,
+ IrqPolicyAllProcessorsInMachine,
+ IrqPolicySpecifiedProcessors,
+ IrqPolicySpreadMessagesAcrossAllProcessors
+} IRQ_DEVICE_POLICY, *PIRQ_DEVICE_POLICY;
+
+#endif
+
+typedef enum _IRQ_PRIORITY {
+ IrqPriorityUndefined = 0,
+ IrqPriorityLow,
+ IrqPriorityNormal,
+ IrqPriorityHigh
+} IRQ_PRIORITY, *PIRQ_PRIORITY;
+typedef struct _IO_RESOURCE_DESCRIPTOR {
+ UCHAR Option;
+ UCHAR Type;
+ UCHAR ShareDisposition;
+ UCHAR Spare1;
+ USHORT Flags;
+ USHORT Spare2;
+ union {
+ struct {
+ ULONG Length;
+ ULONG Alignment;
+ PHYSICAL_ADDRESS MinimumAddress;
+ PHYSICAL_ADDRESS MaximumAddress;
+ } Port;
+ struct {
+ ULONG Length;
+ ULONG Alignment;
+ PHYSICAL_ADDRESS MinimumAddress;
+ PHYSICAL_ADDRESS MaximumAddress;
+ } Memory;
+ struct {
+ ULONG MinimumVector;
+ ULONG MaximumVector;
+#if defined(NT_PROCESSOR_GROUPS)
+ IRQ_DEVICE_POLICY AffinityPolicy;
+ USHORT Group;
+#else
+ IRQ_DEVICE_POLICY AffinityPolicy;
+#endif
+ IRQ_PRIORITY PriorityPolicy;
+ KAFFINITY TargetedProcessors;
+ } Interrupt;
+ struct {
+ ULONG MinimumChannel;
+ ULONG MaximumChannel;
+ } Dma;
+ struct {
+ ULONG Length;
+ ULONG Alignment;
+ PHYSICAL_ADDRESS MinimumAddress;
+ PHYSICAL_ADDRESS MaximumAddress;
+ } Generic;
+ struct {
+ ULONG Data[3];
+ } DevicePrivate;
+ struct {
+ ULONG Length;
+ ULONG MinBusNumber;
+ ULONG MaxBusNumber;
+ ULONG Reserved;
+ } BusNumber;
+ struct {
+ ULONG Priority;
+ ULONG Reserved1;
+ ULONG Reserved2;
+ } ConfigData;
+ } u;
+} IO_RESOURCE_DESCRIPTOR, *PIO_RESOURCE_DESCRIPTOR;
+
+#define IO_RESOURCE_PREFERRED 0x01
+#define IO_RESOURCE_DEFAULT 0x02
+#define IO_RESOURCE_ALTERNATIVE 0x08
+
+typedef struct _IO_RESOURCE_LIST {
+ USHORT Version;
+ USHORT Revision;
+ ULONG Count;
+ IO_RESOURCE_DESCRIPTOR Descriptors[1];
+} IO_RESOURCE_LIST, *PIO_RESOURCE_LIST;
+
+typedef struct _IO_RESOURCE_REQUIREMENTS_LIST {
+ ULONG ListSize;
+ INTERFACE_TYPE InterfaceType;
+ ULONG BusNumber;
+ ULONG SlotNumber;
+ ULONG Reserved[3];
+ ULONG AlternativeLists;
+ IO_RESOURCE_LIST List[1];
+} IO_RESOURCE_REQUIREMENTS_LIST, *PIO_RESOURCE_REQUIREMENTS_LIST;
+
typedef enum _EDIT_MODE
{
EDIT_MODE_DEC,
@@ -37,6 +149,8 @@ static DWORD dwordValueData;
static PCM_RESOURCE_LIST resourceValueData;
static INT fullResourceIndex = -1;
static DWORD valueDataLen;
+static PIO_RESOURCE_REQUIREMENTS_LIST requirementsValueData;
+static INT requirementsIndex = -1;
static EDIT_MODE dwordEditMode = EDIT_MODE_HEX;
void error(HWND hwnd, INT resId, ...)
@@ -1068,6 +1182,476 @@ static INT_PTR CALLBACK modify_resource_list_dlgproc(HWND hwndDlg, UINT uMsg, WP
return FALSE;
}
+static BOOL
+CreateRequirementsListColumns(HWND hWndListView)
+{
+ WCHAR szText[80];
+ RECT rc;
+ LVCOLUMN lvC;
+
+ ListView_SetExtendedListViewStyle(hWndListView, LVS_EX_FULLROWSELECT);
+
+ GetClientRect(hWndListView, &rc);
+
+ /* Create columns. */
+ lvC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
+ lvC.pszText = szText;
+ lvC.fmt = LVCFMT_LEFT;
+
+ /* Load the column labels from the resource file. */
+ lvC.iSubItem = 0;
+ lvC.cx = (rc.right - rc.left) / 4;
+ LoadStringW(hInst, IDS_REQALTERNATIVELIST, szText, ARRAY_SIZE(szText));
+ if (ListView_InsertColumn(hWndListView, 0, &lvC) == -1)
+ return FALSE;
+
+ lvC.iSubItem = 1;
+ lvC.cx = (rc.right - rc.left) / 4;
+ LoadStringW(hInst, IDS_REQRESOURCELIST, szText, ARRAY_SIZE(szText));
+ if (ListView_InsertColumn(hWndListView, 1, &lvC) == -1)
+ return FALSE;
+
+ lvC.iSubItem = 2;
+ lvC.cx = (rc.right - rc.left) / 4;
+ LoadStringW(hInst, IDS_REQDESCRIPTOR, szText, ARRAY_SIZE(szText));
+ if (ListView_InsertColumn(hWndListView, 2, &lvC) == -1)
+ return FALSE;
+
+ lvC.iSubItem = 3;
+ lvC.cx = (rc.right - rc.left) - (3 * ((rc.right - rc.left) / 4));
+ LoadStringW(hInst, IDS_REQDEVICETYPE, szText, ARRAY_SIZE(szText));
+ if (ListView_InsertColumn(hWndListView, 3, &lvC) == -1)
+ return FALSE;
+
+ return TRUE;
+}
+
+static VOID
+GetResourceType(UCHAR ResourceType,
+ LPWSTR pBuffer,
+ DWORD dwLength)
+{
+ switch (ResourceType)
+ {
+ case CmResourceTypePort:
+ LoadStringW(hInst, IDS_TYPE_PORT, pBuffer, dwLength);
+ break;
+
+ case CmResourceTypeInterrupt:
+ LoadStringW(hInst, IDS_TYPE_INTERRUPT, pBuffer, dwLength);
+ break;
+
+ case CmResourceTypeMemory:
+ LoadStringW(hInst, IDS_TYPE_MEMORY, pBuffer, dwLength);
+ break;
+
+ case CmResourceTypeDma:
+ LoadStringW(hInst, IDS_TYPE_DMA, pBuffer, dwLength);
+ break;
+
+ default:
+ wsprintf(pBuffer, L"Unknown %u", ResourceType);
+ break;
+ }
+}
+
+static VOID
+GetShareDisposition(
+ UCHAR ShareDisposition,
+ LPWSTR pBuffer,
+ DWORD dwLength)
+{
+ switch (ShareDisposition)
+ {
+ case CmResourceShareUndetermined:
+ LoadStringW(hInst, IDS_SHARE_UNDETERMINED, pBuffer, dwLength);
+ break;
+
+ case CmResourceShareDeviceExclusive:
+ LoadStringW(hInst, IDS_SHARE_DEVICE_EXCLUSIVE, pBuffer, dwLength);
+ break;
+
+ case CmResourceShareDriverExclusive:
+ LoadStringW(hInst, IDS_SHARE_DRIVER_EXCLUSIVE, pBuffer, dwLength);
+ break;
+
+ case CmResourceShareShared:
+ LoadStringW(hInst, IDS_SHARE_SHARED, pBuffer, dwLength);
+ break;
+ }
+}
+
+static VOID
+GetPortType(
+ USHORT Flags,
+ LPWSTR pBuffer,
+ DWORD dwLength)
+{
+ if ((Flags & CM_RESOURCE_PORT_IO) == CM_RESOURCE_PORT_IO)
+ {
+ LoadStringW(hInst, IDS_PORT_PORT_IO, pBuffer, dwLength);
+ }
+ else if ((Flags & CM_RESOURCE_PORT_IO) == CM_RESOURCE_PORT_MEMORY)
+ {
+ LoadStringW(hInst, IDS_PORT_MEMORY_IO, pBuffer, dwLength);
+ }
+}
+
+static VOID
+GetMemoryAccess(
+ USHORT Flags,
+ LPWSTR pBuffer,
+ DWORD dwLength)
+{
+ if ((Flags & (CM_RESOURCE_MEMORY_READ_ONLY | CM_RESOURCE_MEMORY_WRITE_ONLY)) == CM_RESOURCE_MEMORY_READ_WRITE)
+ {
+ LoadStringW(hInst, IDS_MEMORY_READ_WRITE, pBuffer, dwLength);
+ }
+ else if ((Flags & (CM_RESOURCE_MEMORY_READ_ONLY | CM_RESOURCE_MEMORY_WRITE_ONLY)) == CM_RESOURCE_MEMORY_READ_ONLY)
+ {
+ LoadStringW(hInst, IDS_MEMORY_READ_ONLY, pBuffer, dwLength);
+ }
+ else if ((Flags & (CM_RESOURCE_MEMORY_READ_ONLY | CM_RESOURCE_MEMORY_WRITE_ONLY)) == CM_RESOURCE_MEMORY_WRITE_ONLY)
+ {
+ LoadStringW(hInst, IDS_MEMORY_WRITE_ONLY, pBuffer, dwLength);
+ }
+}
+
+static VOID
+GetInterruptType(
+ USHORT Flags,
+ LPWSTR pBuffer,
+ DWORD dwLength)
+{
+ if ((Flags & CM_RESOURCE_INTERRUPT_LEVEL_LATCHED_BITS) == CM_RESOURCE_INTERRUPT_LATCHED)
+ {
+ LoadStringW(hInst, IDS_INTERRUPT_EDGE_SENSITIVE, pBuffer, dwLength);
+ }
+ else
+ {
+ LoadStringW(hInst, IDS_INTERRUPT_LEVEL_SENSITIVE, pBuffer, dwLength);
+ }
+}
+
+static VOID
+AddRequirementsToList(HWND hwndDlg, HWND hwnd)
+{
+ PIO_RESOURCE_LIST pResourceList;
+ PIO_RESOURCE_DESCRIPTOR pDescriptor;
+ WCHAR buffer[80];
+ LVITEMW item;
+ ULONG i, j, index;
+ INT iItem;
+
+ index = 0;
+ pResourceList = &requirementsValueData->List[0];
+ for (i = 0; i < requirementsValueData->AlternativeLists; i++)
+ {
+ for (j = 0; j < pResourceList->Count; j++)
+ {
+ pDescriptor = &pResourceList->Descriptors[j];
+
+ wsprintf(buffer, L"%lu", i + 1);
+
+ item.mask = LVIF_TEXT | LVIF_PARAM;
+ item.iItem = index;
+ item.iSubItem = 0;
+ item.state = 0;
+ item.stateMask = 0;
+ item.pszText = buffer;
+ item.cchTextMax = (int)wcslen(item.pszText);
+ item.lParam = (LPARAM)pDescriptor;
+
+ iItem = ListView_InsertItem(hwnd, &item);
+ if (iItem != -1)
+ {
+ wsprintf(buffer, L"%lu", j + 1);
+ ListView_SetItemText(hwnd, iItem, 1, buffer);
+ wsprintf(buffer, L"%lu", 1);
+ ListView_SetItemText(hwnd, iItem, 2, buffer);
+
+ GetResourceType(pDescriptor->Type, buffer, 80);
+ ListView_SetItemText(hwnd, iItem, 3, buffer);
+ }
+
+ index++;
+ }
+
+
+ pResourceList = (PIO_RESOURCE_LIST)(pResourceList->Descriptors + pResourceList->Count);
+ }
+
+ GetInterfaceType(requirementsValueData->InterfaceType, buffer, 80);
+ SetDlgItemTextW(hwndDlg, IDC_REQINTERFACETYPE, buffer);
+ SetDlgItemInt(hwndDlg, IDC_REQBUSNUMBER, (UINT)requirementsValueData->BusNumber, FALSE);
+ SetDlgItemInt(hwndDlg, IDC_REQSLOTNUMBER, (UINT)requirementsValueData->SlotNumber, FALSE);
+}
+
+static INT_PTR CALLBACK show_requirements_port_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ PIO_RESOURCE_DESCRIPTOR pDescriptor;
+ WCHAR Buffer[80];
+
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ pDescriptor = (PIO_RESOURCE_DESCRIPTOR)lParam;
+
+ GetPortType(pDescriptor->Flags, Buffer, 80);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_PORT_TYPE, Buffer);
+
+ wsprintf(Buffer, L"0x%lx", pDescriptor->u.Port.Length);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_PORT_LENGTH, Buffer);
+ wsprintf(Buffer, L"0x%lx", pDescriptor->u.Port.Alignment);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_PORT_ALIGN, Buffer);
+#ifdef _M_AMD64
+ wsprintf(Buffer, L"0x%016I64x", pDescriptor->u.Port.MinimumAddress.QuadPart);
+#else
+ wsprintf(Buffer, L"0x%08lx", pDescriptor->u.Port.MinimumAddress.u.LowPart);
+#endif
+ SetDlgItemTextW(hwndDlg, IDC_REQ_PORT_MIN, Buffer);
+#ifdef _M_AMD64
+ wsprintf(Buffer, L"0x%016I64x", pDescriptor->u.Port.MaximumAddress.QuadPart);
+#else
+ wsprintf(Buffer, L"0x%08lx", pDescriptor->u.Port.MaximumAddress.u.LowPart);
+#endif
+ SetDlgItemTextW(hwndDlg, IDC_REQ_PORT_MAX, Buffer);
+
+ GetShareDisposition(pDescriptor->ShareDisposition, Buffer, 80);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_PORT_SHARE, Buffer);
+
+ EnableWindow(GetDlgItem(hwndDlg, IDC_REQ_PORT_ALTERNATIVE), (pDescriptor->Option & IO_RESOURCE_ALTERNATIVE));
+ EnableWindow(GetDlgItem(hwndDlg, IDC_REQ_PORT_PREFERRED), (pDescriptor->Option & IO_RESOURCE_PREFERRED));
+ return FALSE;
+
+ case WM_COMMAND:
+ switch (LOWORD(wParam))
+ {
+ case IDOK:
+ case IDCANCEL:
+ EndDialog(hwndDlg, IDOK);
+ break;
+ }
+ }
+ return FALSE;
+}
+
+static INT_PTR CALLBACK show_requirements_memory_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ PIO_RESOURCE_DESCRIPTOR pDescriptor;
+ WCHAR Buffer[80];
+
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ pDescriptor = (PIO_RESOURCE_DESCRIPTOR)lParam;
+
+ GetMemoryAccess(pDescriptor->Flags, Buffer, 80);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_MEMORY_ACCESS, Buffer);
+
+ wsprintf(Buffer, L"0x%lx", pDescriptor->u.Memory.Length);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_MEMORY_LENGTH, Buffer);
+ wsprintf(Buffer, L"0x%lx", pDescriptor->u.Memory.Alignment);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_MEMORY_ALIGN, Buffer);
+#ifdef _M_AMD64
+ wsprintf(Buffer, L"0x%016I64x", pDescriptor->u.Memory.MinimumAddress.QuadPart);
+#else
+ wsprintf(Buffer, L"0x%08lx", pDescriptor->u.Memory.MinimumAddress.u.LowPart);
+#endif
+ SetDlgItemTextW(hwndDlg, IDC_REQ_MEMORY_MIN, Buffer);
+#ifdef _M_AMD64
+ wsprintf(Buffer, L"0x%016I64x", pDescriptor->u.Memory.MaximumAddress.QuadPart);
+#else
+ wsprintf(Buffer, L"0x%08lx", pDescriptor->u.Memory.MaximumAddress.u.LowPart);
+#endif
+ SetDlgItemTextW(hwndDlg, IDC_REQ_MEMORY_MAX, Buffer);
+
+ GetShareDisposition(pDescriptor->ShareDisposition, Buffer, 80);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_MEMORY_SHARE, Buffer);
+
+ EnableWindow(GetDlgItem(hwndDlg, IDC_REQ_MEMORY_ALTERNATIVE), (pDescriptor->Option & IO_RESOURCE_ALTERNATIVE));
+ EnableWindow(GetDlgItem(hwndDlg, IDC_REQ_MEMORY_PREFERRED), (pDescriptor->Option & IO_RESOURCE_PREFERRED));
+ return FALSE;
+
+ case WM_COMMAND:
+ switch (LOWORD(wParam))
+ {
+ case IDOK:
+ case IDCANCEL:
+ EndDialog(hwndDlg, IDOK);
+ break;
+ }
+ }
+ return FALSE;
+}
+
+static INT_PTR CALLBACK show_requirements_interrupt_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ PIO_RESOURCE_DESCRIPTOR pDescriptor;
+ WCHAR Buffer[80];
+
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ pDescriptor = (PIO_RESOURCE_DESCRIPTOR)lParam;
+
+ GetInterruptType(pDescriptor->Flags, Buffer, 80);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_INT_TYPE, Buffer);
+
+ wsprintf(Buffer, L"0x%lx", pDescriptor->u.Interrupt.MinimumVector);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_INT_MIN, Buffer);
+ wsprintf(Buffer, L"0x%lx", pDescriptor->u.Interrupt.MaximumVector);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_INT_MAX, Buffer);
+
+ GetShareDisposition(pDescriptor->ShareDisposition, Buffer, 80);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_INT_SHARE, Buffer);
+
+ EnableWindow(GetDlgItem(hwndDlg, IDC_REQ_INT_ALTERNATIVE), (pDescriptor->Option & IO_RESOURCE_ALTERNATIVE));
+ EnableWindow(GetDlgItem(hwndDlg, IDC_REQ_INT_PREFERRED), (pDescriptor->Option & IO_RESOURCE_PREFERRED));
+ return FALSE;
+
+ case WM_COMMAND:
+ switch (LOWORD(wParam))
+ {
+ case IDOK:
+ case IDCANCEL:
+ EndDialog(hwndDlg, IDOK);
+ break;
+ }
+ }
+ return FALSE;
+}
+
+static INT_PTR CALLBACK show_requirements_dma_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ PIO_RESOURCE_DESCRIPTOR pDescriptor;
+ WCHAR Buffer[80];
+
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ pDescriptor = (PIO_RESOURCE_DESCRIPTOR)lParam;
+ wsprintf(Buffer, L"0x%lx", pDescriptor->u.Dma.MinimumChannel);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_DMA_MIN, Buffer);
+ wsprintf(Buffer, L"0x%lx", pDescriptor->u.Dma.MaximumChannel);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_DMA_MAX, Buffer);
+
+ GetShareDisposition(pDescriptor->ShareDisposition, Buffer, 80);
+ SetDlgItemTextW(hwndDlg, IDC_REQ_DMA_SHARE, Buffer);
+
+ EnableWindow(GetDlgItem(hwndDlg, IDC_REQ_DMA_ALTERNATIVE), (pDescriptor->Option & IO_RESOURCE_ALTERNATIVE));
+ EnableWindow(GetDlgItem(hwndDlg, IDC_REQ_DMA_PREFERRED), (pDescriptor->Option & IO_RESOURCE_PREFERRED));
+ return FALSE;
+
+ case WM_COMMAND:
+ switch (LOWORD(wParam))
+ {
+ case IDOK:
+ case IDCANCEL:
+ EndDialog(hwndDlg, IDOK);
+ break;
+ }
+ }
+ return FALSE;
+}
+
+static VOID
+ShowRequirement(HWND hwndDlg)
+{
+ PIO_RESOURCE_DESCRIPTOR pDescriptor;
+ LVITEMW item;
+
+ if (requirementsIndex == -1)
+ return;
+
+ item.mask = LVIF_PARAM;
+ item.iItem = requirementsIndex;
+ item.iSubItem = 0;
+ ListView_GetItem(GetDlgItem(hwndDlg, IDC_REQUIREMENTS_LIST), &item);
+
+ pDescriptor = (PIO_RESOURCE_DESCRIPTOR)item.lParam;
+ if (pDescriptor)
+ {
+ switch (pDescriptor->Type)
+ {
+ case CmResourceTypePort:
+ DialogBoxParamW(0, MAKEINTRESOURCEW(IDD_EDIT_REQUIREMENTS_PORT), hwndDlg, show_requirements_port_dlgproc, (LPARAM)pDescriptor);
+ break;
+ case CmResourceTypeMemory:
+ DialogBoxParamW(0, MAKEINTRESOURCEW(IDD_EDIT_REQUIREMENTS_MEMORY), hwndDlg, show_requirements_memory_dlgproc, (LPARAM)pDescriptor);
+ break;
+ case CmResourceTypeInterrupt:
+ DialogBoxParamW(0, MAKEINTRESOURCEW(IDD_EDIT_REQUIREMENTS_INT), hwndDlg, show_requirements_interrupt_dlgproc, (LPARAM)pDescriptor);
+ break;
+ case CmResourceTypeDma:
+ DialogBoxParamW(0, MAKEINTRESOURCEW(IDD_EDIT_REQUIREMENTS_DMA), hwndDlg, show_requirements_dma_dlgproc, (LPARAM)pDescriptor);
+ break;
+ default:
+ break;
+ }
+ }
+}
+
+static BOOL
+OnRequirementsListNotify(HWND hwndDlg, NMHDR *phdr)
+{
+ LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)phdr;
+
+ switch (phdr->idFrom)
+ {
+ case IDC_REQUIREMENTS_LIST:
+ switch(phdr->code)
+ {
+ case NM_CLICK:
+ requirementsIndex = lpnmlv->iItem;
+ EnableWindow(GetDlgItem(hwndDlg, IDC_SHOW_REQUIREMENT), (lpnmlv->iItem != -1));
+ break;
+
+ case NM_DBLCLK:
+ if (lpnmlv->iItem != -1)
+ {
+ requirementsIndex = lpnmlv->iItem;
+ ShowRequirement(hwndDlg);
+ }
+ break;
+ }
+ break;
+ }
+
+ return FALSE;
+}
+
+static INT_PTR CALLBACK modify_requirements_list_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ UNREFERENCED_PARAMETER(lParam);
+
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ CreateRequirementsListColumns(GetDlgItem(hwndDlg, IDC_REQUIREMENTS_LIST));
+ AddRequirementsToList(hwndDlg, GetDlgItem(hwndDlg, IDC_REQUIREMENTS_LIST));
+ return FALSE;
+
+ case WM_NOTIFY:
+ return OnRequirementsListNotify(hwndDlg, (NMHDR *)lParam);
+
+ case WM_COMMAND:
+ switch (LOWORD(wParam))
+ {
+ case IDC_SHOW_REQUIREMENT:
+ if (requirementsIndex != -1)
+ ShowRequirement(hwndDlg);
+ break;
+ case IDOK:
+ EndDialog(hwndDlg, IDOK);
+ break;
+ case IDCANCEL:
+ EndDialog(hwndDlg, IDCANCEL);
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin)
{
@@ -1309,6 +1893,34 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin)
{
}
}
+ else if (EditBin == FALSE && type == REG_RESOURCE_REQUIREMENTS_LIST)
+ {
+ if (valueDataLen > 0)
+ {
+ requirementsValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen + sizeof(ULONG));
+ if (requirementsValueData == NULL)
+ {
+ error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen);
+ goto done;
+ }
+
+ lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)requirementsValueData, &valueDataLen);
+ if (lRet != ERROR_SUCCESS)
+ {
+ error(hwnd, IDS_BAD_VALUE, valueName);
+ goto done;
+ }
+
+ }
+ else
+ {
+ requirementsValueData = NULL;
+ }
+
+ if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_REQUIREMENTS_LIST), hwnd, modify_requirements_list_dlgproc) == IDOK)
+ {
+ }
+ }
else if ((EditBin != FALSE) || (type == REG_NONE) || (type == REG_BINARY))
{
if(valueDataLen > 0)
@@ -1359,6 +1971,10 @@ done:
HeapFree(GetProcessHeap(), 0, stringValueData);
stringValueData = NULL;
+ if (requirementsValueData)
+ HeapFree(GetProcessHeap(), 0, requirementsValueData);
+ requirementsValueData = NULL;
+
return result;
}
diff --git a/base/applications/regedit/lang/bg-BG.rc b/base/applications/regedit/lang/bg-BG.rc
index 6e7395ce1e2..24378e23f97 100644
--- a/base/applications/regedit/lang/bg-BG.rc
+++ b/base/applications/regedit/lang/bg-BG.rc
@@ -317,6 +317,105 @@ BEGIN
PUSHBUTTON "&Данни...", IDC_SHOW_RESOURCE_DATA, 198, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -537,6 +636,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/cs-CZ.rc b/base/applications/regedit/lang/cs-CZ.rc
index b5c1966561b..76bca127422 100644
--- a/base/applications/regedit/lang/cs-CZ.rc
+++ b/base/applications/regedit/lang/cs-CZ.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/de-DE.rc b/base/applications/regedit/lang/de-DE.rc
index f097213567b..5a89238e82b 100644
--- a/base/applications/regedit/lang/de-DE.rc
+++ b/base/applications/regedit/lang/de-DE.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Daten...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Liste der Anforderungen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Scjnittstellentyp:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Busnummer:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Steckplatznummer:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Anzeigen...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Typ:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Länge:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Ausrichtung:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimale Adresse:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximale Adresse:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Verfügbarkeit:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Option", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternativ", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Bevorzugt", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Zugriff:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Länge:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Ausrichtung:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimale Adresse:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximale Adresse:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Verfügbarkeit:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Option", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternativ", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Bevorzugt", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Typ:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimaler Vektor:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximaler Vektor:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Verfügbarkeit:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Option", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternativ", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Bevorzugt", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimaler Kanal:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximaler Kanal:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Verfügbarkeit:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Option", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternativ", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Bevorzugt", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Liste der Alternativen"
+ IDS_REQRESOURCELIST "Liste der Ressourcen"
+ IDS_REQDESCRIPTOR "Beschreibung"
+ IDS_REQDEVICETYPE "Gerätertyp"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Arbeitsspeicher"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Geräte-exklusiv"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Treiber-exklusiv"
+ IDS_SHARE_SHARED "Gemeinsam benutzt"
+ IDS_SHARE_UNDETERMINED "Unbestimmt"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc
index 72b420111ba..150eb929abd 100644
--- a/base/applications/regedit/lang/el-GR.rc
+++ b/base/applications/regedit/lang/el-GR.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/en-US.rc b/base/applications/regedit/lang/en-US.rc
index 2b3cc3137b5..61a087c897e 100644
--- a/base/applications/regedit/lang/en-US.rc
+++ b/base/applications/regedit/lang/en-US.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/es-ES.rc b/base/applications/regedit/lang/es-ES.rc
index 703f821d72d..1d43b804214 100644
--- a/base/applications/regedit/lang/es-ES.rc
+++ b/base/applications/regedit/lang/es-ES.rc
@@ -315,6 +315,105 @@ BEGIN
PUSHBUTTON "&Datos...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -535,6 +634,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/fr-FR.rc b/base/applications/regedit/lang/fr-FR.rc
index 4c049612b61..37510ab0e02 100644
--- a/base/applications/regedit/lang/fr-FR.rc
+++ b/base/applications/regedit/lang/fr-FR.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Données...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/he-IL.rc b/base/applications/regedit/lang/he-IL.rc
index 1f1e50a0abd..50f2336999e 100644
--- a/base/applications/regedit/lang/he-IL.rc
+++ b/base/applications/regedit/lang/he-IL.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "מידע...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/hu-HU.rc b/base/applications/regedit/lang/hu-HU.rc
index 49a5bf8a5ba..9d95ea180af 100644
--- a/base/applications/regedit/lang/hu-HU.rc
+++ b/base/applications/regedit/lang/hu-HU.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/id-ID.rc b/base/applications/regedit/lang/id-ID.rc
index 0c6c516d995..50de571105b 100644
--- a/base/applications/regedit/lang/id-ID.rc
+++ b/base/applications/regedit/lang/id-ID.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc
index 5394d596765..8d3a613528c 100644
--- a/base/applications/regedit/lang/it-IT.rc
+++ b/base/applications/regedit/lang/it-IT.rc
@@ -320,6 +320,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -540,6 +639,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc
index ecb5d413a28..9a923a86d2e 100644
--- a/base/applications/regedit/lang/ja-JP.rc
+++ b/base/applications/regedit/lang/ja-JP.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "データ(&D)...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "値 %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/ko-KR.rc b/base/applications/regedit/lang/ko-KR.rc
index 08807796261..cc5d1069a94 100644
--- a/base/applications/regedit/lang/ko-KR.rc
+++ b/base/applications/regedit/lang/ko-KR.rc
@@ -314,6 +314,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -534,6 +633,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/nl-NL.rc b/base/applications/regedit/lang/nl-NL.rc
index 96b94f9227e..7c39a9af67d 100644
--- a/base/applications/regedit/lang/nl-NL.rc
+++ b/base/applications/regedit/lang/nl-NL.rc
@@ -206,6 +206,105 @@ BEGIN
END
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* Dialogs */
IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/no-NO.rc b/base/applications/regedit/lang/no-NO.rc
index 94e748de214..af5694c5ae3 100644
--- a/base/applications/regedit/lang/no-NO.rc
+++ b/base/applications/regedit/lang/no-NO.rc
@@ -206,6 +206,105 @@ BEGIN
END
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* Dialogs */
IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/pl-PL.rc b/base/applications/regedit/lang/pl-PL.rc
index 23b94db9ede..e47fb22fdaa 100644
--- a/base/applications/regedit/lang/pl-PL.rc
+++ b/base/applications/regedit/lang/pl-PL.rc
@@ -322,6 +322,105 @@ BEGIN
PUSHBUTTON "&Dane...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -542,6 +641,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/pt-BR.rc b/base/applications/regedit/lang/pt-BR.rc
index eed2f74ffec..81617f2f4c0 100644
--- a/base/applications/regedit/lang/pt-BR.rc
+++ b/base/applications/regedit/lang/pt-BR.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc
index 790ef64cb5a..058bb243fcf 100644
--- a/base/applications/regedit/lang/pt-PT.rc
+++ b/base/applications/regedit/lang/pt-PT.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Dados...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc
index b2869f90871..fa099a8ba39 100644
--- a/base/applications/regedit/lang/ro-RO.rc
+++ b/base/applications/regedit/lang/ro-RO.rc
@@ -322,6 +322,105 @@ BEGIN
PUSHBUTTON "&Date…", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -542,6 +641,22 @@ BEGIN
IDS_VALUE_INDEX "Valoare %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc
index 5e7f89dbca8..dfd0c845a7a 100644
--- a/base/applications/regedit/lang/ru-RU.rc
+++ b/base/applications/regedit/lang/ru-RU.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Данные...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/sk-SK.rc b/base/applications/regedit/lang/sk-SK.rc
index 1b5b3878aeb..cff38f07a3f 100644
--- a/base/applications/regedit/lang/sk-SK.rc
+++ b/base/applications/regedit/lang/sk-SK.rc
@@ -317,6 +317,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -537,6 +636,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc
index 27862c037e2..f8a7b2d81de 100644
--- a/base/applications/regedit/lang/sl-SI.rc
+++ b/base/applications/regedit/lang/sl-SI.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/sq-AL.rc b/base/applications/regedit/lang/sq-AL.rc
index 5890b9771f5..30cef73c34d 100644
--- a/base/applications/regedit/lang/sq-AL.rc
+++ b/base/applications/regedit/lang/sq-AL.rc
@@ -316,6 +316,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -536,6 +635,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/sv-SE.rc b/base/applications/regedit/lang/sv-SE.rc
index 1b573768e40..1d4d48a9901 100644
--- a/base/applications/regedit/lang/sv-SE.rc
+++ b/base/applications/regedit/lang/sv-SE.rc
@@ -312,6 +312,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -532,6 +631,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/th-TH.rc b/base/applications/regedit/lang/th-TH.rc
index 518846fe433..c094f15187f 100644
--- a/base/applications/regedit/lang/th-TH.rc
+++ b/base/applications/regedit/lang/th-TH.rc
@@ -314,6 +314,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -534,6 +633,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/tr-TR.rc b/base/applications/regedit/lang/tr-TR.rc
index d1a63326a99..dcfa434d13f 100644
--- a/base/applications/regedit/lang/tr-TR.rc
+++ b/base/applications/regedit/lang/tr-TR.rc
@@ -314,6 +314,105 @@ BEGIN
PUSHBUTTON "Veri...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -534,6 +633,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/uk-UA.rc b/base/applications/regedit/lang/uk-UA.rc
index dfcd70543e0..3f4970216d7 100644
--- a/base/applications/regedit/lang/uk-UA.rc
+++ b/base/applications/regedit/lang/uk-UA.rc
@@ -314,6 +314,105 @@ BEGIN
PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -534,6 +633,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/zh-CN.rc b/base/applications/regedit/lang/zh-CN.rc
index b3e911b060f..1902f038a8c 100644
--- a/base/applications/regedit/lang/zh-CN.rc
+++ b/base/applications/regedit/lang/zh-CN.rc
@@ -322,6 +322,105 @@ BEGIN
PUSHBUTTON "数据...(&D)", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -542,6 +641,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/zh-HK.rc b/base/applications/regedit/lang/zh-HK.rc
index ccb5f7385f6..64b3a2a5fd2 100644
--- a/base/applications/regedit/lang/zh-HK.rc
+++ b/base/applications/regedit/lang/zh-HK.rc
@@ -320,6 +320,105 @@ BEGIN
PUSHBUTTON "資料(&D)...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -540,6 +639,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/lang/zh-TW.rc b/base/applications/regedit/lang/zh-TW.rc
index 4b4b3a2d1c7..49aa80f1b06 100644
--- a/base/applications/regedit/lang/zh-TW.rc
+++ b/base/applications/regedit/lang/zh-TW.rc
@@ -321,6 +321,105 @@ BEGIN
PUSHBUTTON "資料(&D)...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
END
+IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Requirements List"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66
+ RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8
+ LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8
+ RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8
+ LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8
+ RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8
+ LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8
+ DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14
+ PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED
+END
+
+IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8
+ RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8
+ RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8
+ RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8
+ RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8
+ LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8
+ RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8
+ RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8
+ LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
+IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Port"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8
+ LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8
+ RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8
+ LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8
+ RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8
+ LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8
+ GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39
+ LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED
+ LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED
+ DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14
+END
+
/* String Tables */
STRINGTABLE
@@ -541,6 +640,22 @@ BEGIN
IDS_VALUE_INDEX "Value %d"
END
+STRINGTABLE
+BEGIN
+ IDS_REQALTERNATIVELIST "Alternative List"
+ IDS_REQRESOURCELIST "Resource List"
+ IDS_REQDESCRIPTOR "Descriptor"
+ IDS_REQDEVICETYPE "Device Type"
+ IDS_TYPE_PORT "Port"
+ IDS_TYPE_INTERRUPT "Interrupt"
+ IDS_TYPE_MEMORY "Memory"
+ IDS_TYPE_DMA "DMA"
+ IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive"
+ IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive"
+ IDS_SHARE_SHARED "Shared"
+ IDS_SHARE_UNDETERMINED "Undetermined"
+END
+
/*****************************************************************/
/* Dialogs */
diff --git a/base/applications/regedit/resource.h b/base/applications/regedit/resource.h
index c4cc3955273..eeee3c0f81c 100644
--- a/base/applications/regedit/resource.h
+++ b/base/applications/regedit/resource.h
@@ -257,6 +257,21 @@
#define IDS_UNKNOWN 31608
#define IDS_VALUE_INDEX 31609
+#define IDS_REQALTERNATIVELIST 31610
+#define IDS_REQRESOURCELIST 31611
+#define IDS_REQDESCRIPTOR 31612
+#define IDS_REQDEVICETYPE 31613
+
+#define IDS_TYPE_PORT 31614
+#define IDS_TYPE_INTERRUPT 31615
+#define IDS_TYPE_MEMORY 31616
+#define IDS_TYPE_DMA 31617
+#define IDS_SHARE_DEVICE_EXCLUSIVE 31618
+#define IDS_SHARE_DRIVER_EXCLUSIVE 31619
+#define IDS_SHARE_SHARED 31620
+#define IDS_SHARE_UNDETERMINED 31621
+
+
#define IDD_EDIT_STRING 2000
#define IDC_VALUE_NAME 2001
#define IDC_VALUE_DATA 2002
@@ -304,6 +319,48 @@
#define IDC_REVISION 2035
#define IDC_SHOW_RESOURCE_DATA 2036
+#define IDD_EDIT_REQUIREMENTS_LIST 2037
+#define IDC_REQUIREMENTS_LIST 2038
+#define IDC_REQINTERFACETYPE 2039
+#define IDC_REQBUSNUMBER 2040
+#define IDC_REQSLOTNUMBER 2041
+#define IDC_SHOW_REQUIREMENT 2042
+
+#define IDD_EDIT_REQUIREMENTS_PORT 2043
+#define IDC_REQ_PORT_TYPE 2044
+#define IDC_REQ_PORT_LENGTH 2045
+#define IDC_REQ_PORT_ALIGN 2046
+#define IDC_REQ_PORT_MIN 2047
+#define IDC_REQ_PORT_MAX 2048
+#define IDC_REQ_PORT_SHARE 2049
+#define IDC_REQ_PORT_ALTERNATIVE 2050
+#define IDC_REQ_PORT_PREFERRED 2051
+
+#define IDD_EDIT_REQUIREMENTS_MEMORY 2052
+#define IDC_REQ_MEMORY_ACCESS 2053
+#define IDC_REQ_MEMORY_LENGTH 2054
+#define IDC_REQ_MEMORY_ALIGN 2055
+#define IDC_REQ_MEMORY_MIN 2056
+#define IDC_REQ_MEMORY_MAX 2057
+#define IDC_REQ_MEMORY_SHARE 2058
+#define IDC_REQ_MEMORY_ALTERNATIVE 2059
+#define IDC_REQ_MEMORY_PREFERRED 2060
+
+#define IDD_EDIT_REQUIREMENTS_INT 2061
+#define IDC_REQ_INT_TYPE 2062
+#define IDC_REQ_INT_MIN 2063
+#define IDC_REQ_INT_MAX 2064
+#define IDC_REQ_INT_SHARE 2065
+#define IDC_REQ_INT_ALTERNATIVE 2066
+#define IDC_REQ_INT_PREFERRED 2067
+
+#define IDD_EDIT_REQUIREMENTS_DMA 2068
+#define IDC_REQ_DMA_MIN 2069
+#define IDC_REQ_DMA_MAX 2070
+#define IDC_REQ_DMA_SHARE 2071
+#define IDC_REQ_DMA_ALTERNATIVE 2072
+#define IDC_REQ_DMA_PREFERRED 2073
+
#define ID_FAVORITES_MIN 2100
#define ID_FAVORITES_MAX 2999
1
0
[reactos] 01/01: [SHELL32] *.rc 640x480-ify IDD_FOLDER_OPTIONS_* (#6165) CORE-1762
by Joachim Henze 18 Dec '23
by Joachim Henze 18 Dec '23
18 Dec '23
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1061ed4d2839024f5aa67…
commit 1061ed4d2839024f5aa67f9ccf63eef6640f0d93
Author: Joachim Henze <joachim.henze(a)reactos.org>
AuthorDate: Mon Dec 18 07:05:07 2023 +0100
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Dec 18 07:05:07 2023 +0100
[SHELL32] *.rc 640x480-ify IDD_FOLDER_OPTIONS_* (#6165) CORE-1762
This makes the 3 dlgs fit the screen in y for 640x480 desktop resolution like their MS role-models.
Beside that also fixes:
- the wrong vertical position of IDC_FOLDER_OPTIONS_TASKICON and wrong horizontal position of ICON IDI_SHELL_PROGRAMS_FOLDER2 for all translations
- fix some accelerator collisions for de-DE and place many FIXMEs for other translations that still have some
- improve the distance on the lower end (height) of the 3 groupboxes to look much better than before in IDD_FOLDER_OPTIONS_GENERAL for all langs
- bg-BC.rc in 1st dlg IDD_FOLDER_OPTIONS_GENERAL the text of the radiobuttons was historically shifted to the left (as part of an ancient workaround for the too long strings) and as a consquence the text was at the same area where the icons are. Fixed now.
- en-US: text truncation for IDC_FOLDER_OPTIONS_DOUBLECLICK string (affected also many other langs)
- es-ES: fix text truncation on button IDC_FOLDER_OPTIONS_RESTORE
- id-ID: BS_MULTILINE in IDC_FOLDER_OPTIONS_ULBROWSER and IDC_FOLDER_OPTIONS_ULPOINT. Added missing spacing between IDC_VIEW_APPLY_TO_ALL and IDC_VIEW_RESET_ALL buttons
- it-IT.rc fix text truncation in IDC_FOLDER_OPTIONS_RESTORE
- ro-RO.rc fix text truncation in IDC_FOLDER_OPTIONS_RESTORE
- uk-UA.rc lacked the ICON IDI_SHELL_PROGRAMS_FOLDER2 entirely (as a consequence of a historic workaround)
- fix text truncation for many languages for the radiobuttons in IDD_FOLDER_OPTIONS_GENERAL (1st dlg)
- fix text truncation for all languages for the "Opens with:" text in IDD_FOLDER_OPTIONS_FILETYPES (3rd dlg)
- strip unneeded dummy texts for IDC_FILETYPES_APPNAME
- take over "Free Space" instead of "Size available" for IDS_SHV_COLUMN_DISK_AVAILABLE which was done for en-US.rc some years ago, but was forgotten to do as well for other languages back then
- ... and so on
CORE-1762
---
dll/win32/shell32/lang/bg-BG.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/ca-ES.rc | 66 ++++++++++++++++++------------------
dll/win32/shell32/lang/cs-CZ.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/da-DK.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/de-DE.rc | 56 +++++++++++++++----------------
dll/win32/shell32/lang/el-GR.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/en-GB.rc | 66 ++++++++++++++++++------------------
dll/win32/shell32/lang/en-US.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/es-ES.rc | 62 +++++++++++++++++-----------------
dll/win32/shell32/lang/et-EE.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/eu-ES.rc | 62 +++++++++++++++++-----------------
dll/win32/shell32/lang/fi-FI.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/fr-FR.rc | 68 ++++++++++++++++++-------------------
dll/win32/shell32/lang/he-IL.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/hi-IN.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/hu-HU.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/id-ID.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/it-IT.rc | 60 ++++++++++++++++-----------------
dll/win32/shell32/lang/ja-JP.rc | 52 ++++++++++++++---------------
dll/win32/shell32/lang/ko-KR.rc | 66 ++++++++++++++++++------------------
dll/win32/shell32/lang/nl-NL.rc | 66 ++++++++++++++++++------------------
dll/win32/shell32/lang/no-NO.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/pl-PL.rc | 74 ++++++++++++++++++++---------------------
dll/win32/shell32/lang/pt-BR.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/pt-PT.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/ro-RO.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/ru-RU.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/sk-SK.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/sl-SI.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/sq-AL.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/sv-SE.rc | 60 ++++++++++++++++-----------------
dll/win32/shell32/lang/tr-TR.rc | 66 ++++++++++++++++++------------------
dll/win32/shell32/lang/uk-UA.rc | 66 ++++++++++++++++++------------------
dll/win32/shell32/lang/zh-CN.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/zh-HK.rc | 64 +++++++++++++++++------------------
dll/win32/shell32/lang/zh-TW.rc | 64 +++++++++++++++++------------------
36 files changed, 1149 insertions(+), 1149 deletions(-)
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index ec89bc9b7d5..e2951c20ce0 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Отказ", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Общи"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Задачи", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Показване на общите задачи в папките", IDC_FOLDER_OPTIONS_COMMONTASKS, 20, 25, 210, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Използване на обичайните папки на ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 20, 37, 210, 10
- GROUPBOX "Обзор на папките", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Задачи", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Показване на общите задачи в папките", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Използване на обичайните папки на ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Обзор на папките", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Отваряне на всички папки в &един прозорец", IDC_FOLDER_OPTIONS_SAMEWINDOW, 20, 70, 210, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Отваряне на всяка папка в от&делен прозорец", IDC_FOLDER_OPTIONS_OWNWINDOW, 20, 82, 210, 10
- GROUPBOX "Цъкането действа така:", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Отваряне на всички папки в &един прозорец", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Отваряне на всяка папка в от&делен прозорец", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Цъкането действа така:", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Отваряне с единично цъкане (избор с посочване)", IDC_FOLDER_OPTIONS_SINGLECLICK, 20, 120, 210, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Отваряне с двойно цъкане (избиране с единично)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 20, 156, 170, 10
- AUTORADIOBUTTON "Подчертаване заглавията на значетата съгласно &обзорника ми", IDC_FOLDER_OPTIONS_ULBROWSER, 30, 220, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Подчертаване на заглавията на значетата при &посочване", IDC_FOLDER_OPTIONS_ULPOINT, 30, 144, 220, 10
- PUSHBUTTON "От под&разбираните", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Отваряне с единично цъкане (избор с посочване)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP //FIXME: accelerator collision &O
+ AUTORADIOBUTTON "&Отваряне с двойно цъкане (избиране с единично)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 //FIXME: accelerator collision &O
+ AUTORADIOBUTTON "Подчертаване заглавията на значетата съгласно &обзорника ми", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP //FIXME: Shorten the string to avoid text truncation (recommended), or make it use 2 lines (less recommended) //FIXME: accelerator collision &O
+ AUTORADIOBUTTON "Подчертаване на заглавията на значетата при &посочване", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 //FIXME: Shorten the string to avoid text truncation (recommended), or make it use 2 lines (less recommended)
+ PUSHBUTTON "От под&разбираните", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Изглед"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Изглед на папките", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Можете да прилагате изгледа (от рода на подробен и настелен) на тази папка за всички папки.", -1, 60, 20, 190, 20
- PUSHBUTTON "Прилагане върху ви&чки папки", IDC_VIEW_APPLY_TO_ALL, 20, 50, 115, 14, WS_TABSTOP
- PUSHBUTTON "&Зачистване на всички папки", IDC_VIEW_RESET_ALL, 140, 50, 115, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Можете да прилагате изгледа (от рода на подробен и настелен) на тази папка за всички папки.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Прилагане върху ви&чки папки", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Зачистване на всички папки", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Разширени настройки", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "От под&разбираните", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "От под&разбираните", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Видове файлове"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Вписани &видове файлове:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Нов", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "Из&триване", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Подробности за разширение '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Отваряне с:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Име на приложение", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "Про&мяна...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Раз&ширени", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Нов", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "Из&триване", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Подробности за разширение '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Отваряне с:", -1, 12, 153, 48, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "Про&мяна...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Раз&ширени", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index d07a38aaf10..6f9a9de6417 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
@@ -745,7 +745,7 @@ BEGIN
IDS_SHV_COLUMN_MODIFIED "Modified"
IDS_SHV_COLUMN_ATTRIBUTES "Attributes"
IDS_SHV_COLUMN_DISK_CAPACITY "Size"
- IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
+ IDS_SHV_COLUMN_DISK_AVAILABLE "Free Space"
IDS_SHV_COLUMN_OWNER "Owner"
IDS_SHV_COLUMN_GROUP "Group"
IDS_SHV_COLUMN_FILENAME "Filename"
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index fa1a9a0026e..a5b78258f72 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -413,59 +413,59 @@ BEGIN
PUSHBUTTON "Storno", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Obecné"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Úkoly", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "&Zobrazit běžné operace ve složkách", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Použít klas&ické složky ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Procházení složek", -1, 7, 60, 249, 45, WS_TABSTOP | WS_GROUP
+ GROUPBOX "Úkoly", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "&Zobrazit běžné operace ve složkách", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Použít klas&ické složky ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Procházení složek", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Otevírat každou složku ve stejné&m okně", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Ote&vírat každou složku ve svém vlastním okně", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Klikání na položky", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Otevírat každou složku ve stejné&m okně", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Ote&vírat každou složku ve svém vlastním okně", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Klikání na položky", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "Jedno kliknutí k &otevření položky (vybrat ukázáním)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Dvojkliknutí k otevření položky (vybrat kliknutím)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Podtrhávat názvy ikon podle &nastavení prohlížeče", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Podtrhávat názvy ikon jen &při ukázání na ně", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "O&bnovit výchozí", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "Jedno kliknutí k &otevření položky (vybrat ukázáním)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Dvojkliknutí k otevření položky (vybrat kliknutím)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Podtrhávat názvy ikon podle &nastavení prohlížeče", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Podtrhávat názvy ikon jen &při ukázání na ně", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "O&bnovit výchozí", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Zobrazení"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Zobrazení složky", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Zobrazení použité pro tuto složku (jako třeba Podrobnosti nebo Miniatury) lze použít pro všechny složky.", -1, 60, 20, 180, 20
- PUSHBUTTON "&Použít pro všechny složky", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "Ob&novit všechny složky", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Zobrazení použité pro tuto složku (jako třeba Podrobnosti nebo Miniatury) lze použít pro všechny složky.", -1, 40, 20, 213, 20
+ PUSHBUTTON "&Použít pro všechny složky", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "Ob&novit všechny složky", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Pokročilá nastavení:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Obnovit výchozí", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Obnovit výchozí", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Typy souborů"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registrované &typy souborů:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Nový", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "O&dstranit", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Podrobnosti pro typ souborů '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Otevírat v:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Změnit...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "&Pokročilé", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Nový", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "O&dstranit", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Podrobnosti pro typ souborů '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Otevírat v:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Změnit...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "&Pokročilé", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index 137ff69566e..82875b138a4 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -412,59 +412,59 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index cbd4e640c58..baa34616d46 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Abbrechen", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Allgemein"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Aufgaben", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "&Allgemeine Aufgaben in Ordnern anzeigen", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 150, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "ReactOS Klassisc&he Ansicht verwenden", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 150, 10
- GROUPBOX "Ordner durchsuchen", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Aufgaben", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "&Allgemeine Aufgaben in Ordnern anzeigen", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "ReactOS Klassisc&he Ansicht verwenden", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Ordner durchsuchen", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Jeden Ordner im &selben Fenster öffnen", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 150, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Jeden Ordner im eigenen Fenster öffnen", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 150, 10
- GROUPBOX "Markieren von Elementen", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Jeden Ordner im &selben Fenster öffnen", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Jeden Ordner im eigenen Fenster öffnen", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Markieren von Elementen", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
AUTORADIOBUTTON "&Öffnen durch &einfachen Klick (Markieren durch zeigen)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
AUTORADIOBUTTON "&Öffnen durch &Doppelklick (Markieren durch einfachen Klick)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
AUTORADIOBUTTON "Symbolbeschriftungen wie im Br&owser unterstreichen", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
AUTORADIOBUTTON "Symbolbeschriftungen nur beim Zeigen &unterstreichen", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
- PUSHBUTTON "&Wiederherstellen", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ PUSHBUTTON "&Wiederherstellen", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Ansicht"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Ordneransicht", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Sie können die Ansicht (Details oder Kacheln), die Sie für diesen Ordner verwenden, auf alle Ordner anwenden.", -1, 60, 20, 180, 20
- PUSHBUTTON "Auf a&lle Ordner anwenden", IDC_VIEW_APPLY_TO_ALL, 60, 50, 90, 14, WS_TABSTOP
- PUSHBUTTON "&Alle Ordner zurücksetzen", IDC_VIEW_RESET_ALL, 160, 50, 90, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Sie können die Ansicht (Details oder Kacheln), die Sie für diesen Ordner verwenden, auf alle Ordner anwenden.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Auf &alle Ordner anwenden", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "Alle Ordner &zurücksetzen", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Erweiterte Einstellungen:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Wiederherstellen", IDC_VIEW_RESTORE_DEFAULTS, 191, 235, 65, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "&Wiederherstellen", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Dateitypen"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Registrierte Dateitypen:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Neu", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Löschen", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details zum Dateityp '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Öffnen mit:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Name", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "Än&dern...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "&Erweitert", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Neu", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Löschen", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details zum Dateityp '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Öffnen mit:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "Än&dern...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "&Erweitert", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index 434f3410338..82ce40b3d94 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Άκυρο", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index dadd680dda9..51fe4202a87 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
@@ -745,7 +745,7 @@ BEGIN
IDS_SHV_COLUMN_MODIFIED "Modified"
IDS_SHV_COLUMN_ATTRIBUTES "Attributes"
IDS_SHV_COLUMN_DISK_CAPACITY "Size"
- IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
+ IDS_SHV_COLUMN_DISK_AVAILABLE "Free Space"
IDS_SHV_COLUMN_OWNER "Owner"
IDS_SHV_COLUMN_GROUP "Group"
IDS_SHV_COLUMN_FILENAME "Filename"
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index 212c0b01b72..4f675cb94cd 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index 9579779b21a..d22987a8bec 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -414,59 +414,59 @@ BEGIN
PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 294, 240
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 294, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tareas", -1, 7, 10, 279, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "M&ostrar tareas comunes en las carpetas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 160, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Utilizar las carpetas clá&sicas de ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 160, 10
- GROUPBOX "Examinar carpetas ", -1, 7, 60, 279, 45, WS_TABSTOP
+ GROUPBOX "Tareas", -1, 7, 10, 279, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "M&ostrar tareas comunes en las carpetas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Utilizar las carpetas clá&sicas de ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Examinar carpetas ", -1, 7, 60, 279, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Abrir todas las carpetas en la &misma ventana", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 75, 160, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Abrir cada carpeta en ventanas di&ferentes", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 87, 140, 10
- GROUPBOX "Hacer clic en los elementos tal y como se indica ", -1, 7, 110, 279, 60
+ AUTORADIOBUTTON "Abrir todas las carpetas en la &misma ventana", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Abrir cada carpeta en ventanas di&ferentes", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Hacer clic en los elementos tal y como se indica ", -1, 7, 110, 279, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Un solo clic para abrir elemento (seleccionar al señalar)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 190, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Doble clic para abrir elemento (seleccionar con un clic)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 190, 10
+ AUTORADIOBUTTON "&Un solo clic para abrir elemento (seleccionar al señalar)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Doble clic para abrir elemento (seleccionar con un clic)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
AUTORADIOBUTTON "Subrayar los títulos de iconos que coincidan con el e&xplorador", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 220, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Subrayar &los títulos de iconos cuando yo los señale", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10
- PUSHBUTTON "&Restaurar valores predeterminados", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "Subrayar &los títulos de iconos cuando yo los señale", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restaurar valores predeterminados", IDC_FOLDER_OPTIONS_RESTORE, 157, 178, 130, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 294, 240
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 294, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Ver"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Vistas de carpeta", -1, 7, 10, 279, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Puede aplicar la vista que está usando con esta carpeta para el resto (como Detalles o Mosaicos).", -1, 60, 20, 200, 20
- PUSHBUTTON "A&plicar a todas las carpetas", IDC_VIEW_APPLY_TO_ALL, 60, 50, 100, 14, WS_TABSTOP
- PUSHBUTTON "R&estaurar todas las carpetas", IDC_VIEW_RESET_ALL, 165, 50, 100, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Puede aplicar la vista que está usando con esta carpeta para el resto (como Detalles o Mosaicos).", -1, 40, 20, 243, 20
+ PUSHBUTTON "A&plicar a todas las carpetas", IDC_VIEW_APPLY_TO_ALL, 45, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "R&estaurar todas las carpetas", IDC_VIEW_RESET_ALL, 165, 50, 115, 14, WS_TABSTOP
LTEXT "Configuración avanzada:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Restaurar valores predeterminados", IDC_VIEW_RESTORE_DEFAULTS, 156, 220, 130, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 279, 111
+ PUSHBUTTON "&Restaurar valores predeterminados", IDC_VIEW_RESTORE_DEFAULTS, 157, 204, 130, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 294, 240
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 294, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Tipos de Archivo"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Tipos de archivo registrados:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80
- PUSHBUTTON "&Nueva", IDC_FILETYPES_NEW, 170, 110, 55, 14, WS_TABSTOP
- PUSHBUTTON "Eli&minar", IDC_FILETYPES_DELETE, 230, 110, 55, 14, WS_TABSTOP
- GROUPBOX "Detalles para el tipo de archivo «%s»", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 279, 100
- LTEXT "Se abre con:", -1, 12, 140, 50, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 140, 10, 10
- LTEXT "Aplicación", IDC_FILETYPES_APPNAME, 100, 140, 80, 10
- PUSHBUTTON "Cam&biar...", IDC_FILETYPES_CHANGE, 230, 140, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 165, 220, 40
- PUSHBUTTON "Opciones avanza&das", IDC_FILETYPES_ADVANCED, 190, 213, 90, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 99
+ PUSHBUTTON "&Nueva", IDC_FILETYPES_NEW, 170, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "Eli&minar", IDC_FILETYPES_DELETE, 230, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Detalles para el tipo de archivo «%s»", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 279, 70
+ LTEXT "Se abre con:", -1, 12, 153, 50, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "Cam&biar...", IDC_FILETYPES_CHANGE, 230, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Opciones avanza&das", IDC_FILETYPES_ADVANCED, 200, 188, 80, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index 46c4d4eb804..87be7228dd0 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -412,59 +412,59 @@ BEGIN
PUSHBUTTON "Loobu", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Üldist"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Toimingud", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Näita kaustades tavalisi &toiminguid", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Kasuta ReactOS'i klassikalisi &kaustu", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Kaustade sirvimine", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Toimingud", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Näita kaustades tavalisi &toiminguid", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP //FIXME: accelerator collision &T
+ AUTORADIOBUTTON "Kasuta ReactOS'i klassikalisi &kaustu", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Kaustade sirvimine", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Ava iga kaust &samas aknas", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Ava iga kaust &eraldi aknas", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Üksuste klõpsamine", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Ava iga kaust &samas aknas", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Ava iga kaust &eraldi aknas", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Üksuste klõpsamine", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "Kl&õps avab üksuse (osutamine valib)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Topeltklõps avab &üksuse (klõps valib)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Kriipsuta ikoonitiitlid &brauseri eeskujul alla", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Kriipsuta ikoonitiitlid alla ainult neile &osutamisel", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Taasta vaikesätted", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "Kl&õps avab üksuse (osutamine valib)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Topeltklõps avab &üksuse (klõps valib)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Kriipsuta ikoonitiitlid &brauseri eeskujul alla", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Kriipsuta ikoonitiitlid alla ainult neile &osutamisel", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Taasta vaikesätted", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP //FIXME: accelerator collision &T
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Vaade"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Kaustavaated", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Selle kausta puhul kasutatud vaadet (nt Üksikasjad või Paanid) võid rakendada kõigile kaustadele.", -1, 60, 20, 180, 20
- PUSHBUTTON "&Rakenda kõigile kaustadele", IDC_VIEW_APPLY_TO_ALL, 60, 50, 90, 14, WS_TABSTOP
- PUSHBUTTON "&Lähtesta kõik kaustad", IDC_VIEW_RESET_ALL, 160, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Selle kausta puhul kasutatud vaadet (nt Üksikasjad või Paanid) võid rakendada kõigile kaustadele.", -1, 40, 20, 213, 20
+ PUSHBUTTON "&Rakenda kõigile kaustadele", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Lähtesta kõik kaustad", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Täpsemad sätted:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Taasta vaikesätted", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "&Taasta vaikesätted", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Failitüübid"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registreeritud faili&tüübid:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Uus", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Kustuta", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Failitüübi '%s' üksikasjad", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Avamisprogramm:", -1, 12, 180, 60, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Muuda...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "&Täpsemalt", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Uus", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Kustuta", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Failitüübi '%s' üksikasjad", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Avamisprogramm:", -1, 12, 153, 60, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Muuda...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "&Täpsemalt", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc
index c2497afc8ed..9de9fd60cb5 100644
--- a/dll/win32/shell32/lang/eu-ES.rc
+++ b/dll/win32/shell32/lang/eu-ES.rc
@@ -412,59 +412,59 @@ BEGIN
PUSHBUTTON "Utzi", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 294, 240
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 294, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Orokorra"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Atazak", -1, 7, 10, 279, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "&Erakutsi ataza arruntak karpetetan", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 160, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Erabili &ReactOS-en karpeta klasikoak", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 160, 10
- GROUPBOX "Arakatu karpetak", -1, 7, 60, 279, 45, WS_TABSTOP
+ GROUPBOX "Atazak", -1, 7, 10, 279, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "&Erakutsi ataza arruntak karpetetan", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Erabili &ReactOS-en karpeta klasikoak", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10 //FIXME: accelerator collision &R
+ GROUPBOX "Arakatu karpetak", -1, 7, 60, 279, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "&Ireki karpeta guztiak leiho berean", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 75, 160, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "I&reki karpeta bakoitza bere leihoan", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 87, 140, 10
- GROUPBOX "Elementuetan klik egiteko modua", -1, 7, 110, 279, 60
+ AUTORADIOBUTTON "&Ireki karpeta guztiak leiho berean", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "I&reki karpeta bakoitza bere leihoan", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10 //FIXME: accelerator collision &R
+ GROUPBOX "Elementuetan klik egiteko modua", -1, 7, 110, 279, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Klik bakarra elementu bat irekitzeko (seinalatu hautatzeko)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 190, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Klik &bikoitza elementu bat irekitzeko (klik bakarra hautatzeko)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 190, 10
+ AUTORADIOBUTTON "&Klik bakarra elementu bat irekitzeko (seinalatu hautatzeko)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Klik &bikoitza elementu bat irekitzeko (klik bakarra hautatzeko)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
AUTORADIOBUTTON "Az&pimarratu nire arakatzailearekin bat datozen ikono-tituluak", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 220, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Seinalatzen ditudanean bakarrik azpimarratu ikono-tituluak", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10
- PUSHBUTTON "Berre&zarri lehenetsiak", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Seinalatzen ditudanean bakarrik azpimarratu ikono-tituluak", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "Berre&zarri lehenetsiak", IDC_FOLDER_OPTIONS_RESTORE, 157, 178, 130, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 294, 240
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 294, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Ikusi"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Karpetaren ikuspegiak", -1, 7, 10, 279, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Karpeta honentzat erabiltzen duzun ikuspegia (Xehetasunak edo Lauza moduan, adibidez) karpeta guztiei aplika diezaiekezu.", -1, 60, 20, 200, 20
- PUSHBUTTON "A&plikatu karpeta guztiei", IDC_VIEW_APPLY_TO_ALL, 60, 50, 100, 14, WS_TABSTOP
- PUSHBUTTON "&Berrezarri karpeta guztiak", IDC_VIEW_RESET_ALL, 165, 50, 100, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Karpeta honentzat erabiltzen duzun ikuspegia (Xehetasunak edo Lauza moduan, adibidez) karpeta guztiei aplika diezaiekezu.", -1, 40, 20, 243, 20
+ PUSHBUTTON "A&plikatu karpeta guztiei", IDC_VIEW_APPLY_TO_ALL, 45, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Berrezarri karpeta guztiak", IDC_VIEW_RESET_ALL, 165, 50, 115, 14, WS_TABSTOP
LTEXT "Ezarpen aurreratuak:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Be&rrezarri lehenetsiak", IDC_VIEW_RESTORE_DEFAULTS, 156, 220, 130, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 279, 111
+ PUSHBUTTON "Be&rrezarri lehenetsiak", IDC_VIEW_RESTORE_DEFAULTS, 157, 204, 130, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 294, 240
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 294, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Fitxategi-motak"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Erregistratutako &fitxategi-motak:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80
- PUSHBUTTON "&Berria", IDC_FILETYPES_NEW, 170, 110, 55, 14, WS_TABSTOP
- PUSHBUTTON "Ez&abatu", IDC_FILETYPES_DELETE, 230, 110, 55, 14, WS_TABSTOP
- GROUPBOX "Detalles para el tipo de archivo «%s»", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 130, 279, 100
- LTEXT "Honek irekitzen du:", -1, 12, 140, 50, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 140, 10, 10
- LTEXT "Aplikazioa", IDC_FILETYPES_APPNAME, 100, 140, 80, 10
- PUSHBUTTON "Alda&tu...", IDC_FILETYPES_CHANGE, 230, 140, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 165, 220, 40
- PUSHBUTTON "Au&rreratua", IDC_FILETYPES_ADVANCED, 190, 213, 90, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 99
+ PUSHBUTTON "&Berria", IDC_FILETYPES_NEW, 170, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "Ez&abatu", IDC_FILETYPES_DELETE, 230, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Detalles para el tipo de archivo «%s»", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 279, 70
+ LTEXT "Honek irekitzen du:", -1, 12, 153, 62, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "Alda&tu...", IDC_FILETYPES_CHANGE, 230, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Au&rreratua", IDC_FILETYPES_ADVANCED, 230, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index 38e1bd995db..eea6b5504c1 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index 70f15958b2b..240305a6654 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Annuler", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Général"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tâches", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Afficher les tâches habituelles dans les dossiers", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 205, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Utiliser les dossiers ReactOS class&iques", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 205, 10
- GROUPBOX "Parcourir les dossiers", -1, 7, 60, 249, 45, WS_TABSTOP
- CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 205, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Ouvrir chaque dossier dans sa propre fenêtre", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 205, 10
- GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 110, 249, 99
- CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 205, 20, BS_MULTILINE | WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour le sélectionner)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 180, 205, 20, BS_MULTILINE
- AUTORADIOBUTTON "Toujours souligner les titres des icônes comme dans le navigateur", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 140, 195, 20, BS_MULTILINE | WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", IDC_FOLDER_OPTIONS_ULPOINT, 50, 160, 195, 20, BS_MULTILINE
- PUSHBUTTON "Pa&ramètres par défaut", IDC_FOLDER_OPTIONS_RESTORE, 167, 215, 90, 14, WS_TABSTOP
+ GROUPBOX "Tâches", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Afficher les tâches habituelles dans les dossiers", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Utiliser les dossiers ReactOS class&iques", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Parcourir les dossiers", -1, 7, 55, 249, 40, WS_TABSTOP
+ CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 65, 21, 20
+ AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 65, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Ouvrir chaque dossier dans sa propre fenêtre", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 77, 210, 10
+ GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 100, 249, 95
+ CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 110, 21, 20
+ AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 110, 205, 20, BS_MULTILINE | WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour le sélectionner)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 170, 205, 20, BS_MULTILINE
+ AUTORADIOBUTTON "Toujours souligner les titres des icônes comme dans le navigateur", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 130, 195, 20, BS_MULTILINE | WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", IDC_FOLDER_OPTIONS_ULPOINT, 50, 150, 195, 20, BS_MULTILINE
+ PUSHBUTTON "Pa&ramètres par défaut", IDC_FOLDER_OPTIONS_RESTORE, 167, 199, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Affichage"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Affichage des dossiers", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 12, 20, 20, 20
- LTEXT "Vous pouvez appliquer l'affichage (tel que Détails ou Miniatures) que vous utilisez pour ce dossier à tous les dossiers.", -1, 40, 20, 213, 26
- PUSHBUTTON "Appliquer à tous les dossiers", IDC_VIEW_APPLY_TO_ALL, 15, 50, 116, 14, WS_TABSTOP
- PUSHBUTTON "&Réinitialiser tous les dossiers", IDC_VIEW_RESET_ALL, 135, 50, 114, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Vous pouvez appliquer l'affichage (tel que Détails ou Miniatures) que vous utilisez pour ce dossier à tous les dossiers.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Appliquer à tous les dossiers", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Réinitialiser tous les dossiers", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Paramètres avancés :", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Paramètres par &défaut", IDC_VIEW_RESTORE_DEFAULTS, 175, 215, 82, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Paramètres par &défaut", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Types de fichiers"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Types de fichiers enregistrés :", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Nouveau", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "Supprimer", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Détails concernant l'extension '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Ouvrir avec :", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Nom de l'application", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Modifier...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "A&vancé", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Nouveau", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "Supprimer", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Détails concernant l'extension '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Ouvrir avec :", -1, 12, 153, 48, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Modifier...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "A&vancé", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index eab8a24fa6d..67b4b61d713 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -412,59 +412,59 @@ BEGIN
PUSHBUTTON "ביטול", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "כללי"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "משימות", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "משימות", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "תצוגה"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "אפשרויות מתקדמות:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "סוגי קבצים"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "סוגי קבצים רשומים:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&חדש", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&מחק", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "פרטים עבורת סיומת '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "פתח באמצעות:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&שינוי...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "&מתקדם", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&חדש", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&מחק", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "פרטים עבורת סיומת '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "פתח באמצעות:", -1, 12, 153, 55, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&שינוי...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "&מתקדם", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc
index 0c386a0a6e5..4b30c22e23f 100644
--- a/dll/win32/shell32/lang/hi-IN.rc
+++ b/dll/win32/shell32/lang/hi-IN.rc
@@ -412,59 +412,59 @@ BEGIN
PUSHBUTTON "रद्द करें", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "सामान्य"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "कार्य", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "&फ़ोल्डर में सामान्य कार्यों को दिखाएं", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "रिऐक्ट ओएस &क्लासिक फ़ोल्डरों का उपयोग करें", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "फ़ोल्डर ब्राउज़ करें", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "कार्य", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "&फ़ोल्डर में सामान्य कार्यों को दिखाएं", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "रिऐक्ट ओएस &क्लासिक फ़ोल्डरों का उपयोग करें", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "फ़ोल्डर ब्राउज़ करें", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "&एक ही विंडो में प्रत्येक फ़ोल्डर खोलें", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "प्रत्येक फ़ोल्डर को अपनी &विंडो में खोलें", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "निम्नलिखित में आइटम क्लिक करें", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "&एक ही विंडो में प्रत्येक फ़ोल्डर खोलें", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "प्रत्येक फ़ोल्डर को अपनी &विंडो में खोलें", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "निम्नलिखित में आइटम क्लिक करें", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "एक आइटम खोलने के लिए &सिंगल-क्लिक करें (चयन करने के लिए बिंदु)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&किसी आइटम को खोलने के लिए डबल-क्लिक करें (चयन करने के लिए सिंगल-क्लिक करें)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "मेरे &ब्राउज़र के साथ सुसंगत आइकन टाइटल खांकित करें", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "अंडरलाइन आइकन टाइटल केवल तभी जब मैं उन पर &इंगित करता हूं", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&डिफॉल्ट्स का पुनःस्थापन", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "एक आइटम खोलने के लिए &सिंगल-क्लिक करें (चयन करने के लिए बिंदु)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&किसी आइटम को खोलने के लिए डबल-क्लिक करें (चयन करने के लिए सिंगल-क्लिक करें)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 //FIXME: Shorten the string to avoid text truncation (recommended), or make it use 2 lines (less recommended)
+ AUTORADIOBUTTON "मेरे &ब्राउज़र के साथ सुसंगत आइकन टाइटल खांकित करें", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "अंडरलाइन आइकन टाइटल केवल तभी जब मैं उन पर &इंगित करता हूं", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&डिफॉल्ट्स का पुनःस्थापन", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "व्यू"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "फोल्डर व्यू", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "आप व्यू (जैसे विवरण या टाइल्स) को लागू कर सकते हैं जिसका उपयोग आप इस फ़ोल्डर के लिए सभी फ़ोल्डर्स में कर रहे हैं।", -1, 60, 20, 180, 20
- PUSHBUTTON "&सभी फ़ोल्डरों पर लागू करें", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "सभी फ़ोल्डरों को &रीसेट करें", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "आप व्यू (जैसे विवरण या टाइल्स) को लागू कर सकते हैं जिसका उपयोग आप इस फ़ोल्डर के लिए सभी फ़ोल्डर्स में कर रहे हैं।", -1, 40, 20, 213, 20
+ PUSHBUTTON "&सभी फ़ोल्डरों पर लागू करें", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "सभी फ़ोल्डरों को &रीसेट करें", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "एडवांस सेटिंग:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "डिफॉल्ट्स का पुनःस्थापन", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "डिफॉल्ट्स का पुनःस्थापन", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "फ़ाइल प्रकारों"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "रजिस्टर्ड फ़ाइल &प्रकार:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&नया", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&हटाएं", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "'%s' एक्सटेंशन के लिए डिटेल्स", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "के साथ खुलता है:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "एप्लिकेशन का नाम", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&चेंज...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "&उन्नत", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&नया", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&हटाएं", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "'%s' एक्सटेंशन के लिए डिटेल्स", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "के साथ खुलता है:", -1, 12, 153, 48, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&चेंज...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "&उन्नत", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index 09fbb539cf2..f89e3d3c3ea 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Mégse", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Általános"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Feladatok", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Gyakori műveletek megjelenítése a &mappákban", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 167, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Klasszikus ReactOS mappák használata", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 140, 10
- GROUPBOX "Mappák böngészése", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Feladatok", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Gyakori műveletek megjelenítése a &mappákban", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Klasszikus ReactOS mappák használata", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Mappák böngészése", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Minden mappát &ugyanabban az ablakban nyisson meg", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 187, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Minden mappát a &saját külön ablakában nyisson meg", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 189, 10
- GROUPBOX "Elemekre kattintás", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Minden mappát &ugyanabban az ablakban nyisson meg", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Minden mappát a &saját külön ablakában nyisson meg", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Elemekre kattintás", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "Megnyitás &egy kattintással (kijelölés rámutatással)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 178, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Megnyitás &dupla kattintással (kijelölés egy kattintással)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 195, 10
- AUTORADIOBUTTON "Ikonok címének aláhúzása mint a &böngészőben", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Ikonok címének aláhúzása csak &rámutatáskor", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Alapértelmezések visszaállítása", IDC_FOLDER_OPTIONS_RESTORE, 132, 175, 125, 14, WS_TABSTOP
+ AUTORADIOBUTTON "Megnyitás &egy kattintással (kijelölés rámutatással)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Megnyitás &dupla kattintással (kijelölés egy kattintással)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Ikonok címének aláhúzása mint a &böngészőben", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Ikonok címének aláhúzása csak &rámutatáskor", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Alapértelmezések", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Nézet"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Mappanézetek", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Be tudja állítani a nézetet (mint részletek vagy csempe) erre a mappára vagy az összes mappára.", -1, 56, 20, 197, 20
- PUSHBUTTON "Összes &mappára", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "Összes mappa &visszaállítása", IDC_VIEW_RESET_ALL, 145, 50, 100, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Be tudja állítani a nézetet (mint részletek vagy csempe) erre a mappára vagy az összes mappára.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Összes &mappára", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "Összes mappa &visszaállítása", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Haladó beállítások:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Alapértelmezések", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "&Alapértelmezések", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Fájltípusok"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Regisztrált &fájltípusok:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Hozzáadás", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Törlés", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "'%s' kiterjesztés részletei", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Megnyitás ezzel:", -1, 12, 180, 60, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Alkalmazásnév", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Módosítás...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "&Haladó", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Hozzáadás", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Törlés", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "'%s' kiterjesztés részletei", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Megnyitás ezzel:", -1, 12, 153, 55, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Módosítás...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "&Haladó", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc
index 0c676ace619..598842909af 100644
--- a/dll/win32/shell32/lang/id-ID.rc
+++ b/dll/win32/shell32/lang/id-ID.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Batal", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Umum"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tugas", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Tampilkan tugas umum di &folder", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Gunakan folder kla&sik ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Jelajah folder", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tugas", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Tampilkan tugas umum di &folder", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Gunakan folder kla&sik ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Jelajah folder", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Buka setiap folder di jendela yang sa&ma", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Buka setiap folder di jen&dela sendiri", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Klik item sebagai berikut", -1, 7, 110, 249, 76
+ AUTORADIOBUTTON "Buka setiap folder di jendela yang sa&ma", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP //FIXME: accelerator collision &M
+ AUTORADIOBUTTON "Buka setiap folder di jen&dela sendiri", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Klik item sebagai berikut", -1, 7, 110, 249, 80
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "S&atu klik untuk membuka butir (arahkan untuk pilih)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "D&ua klik untuk membuka butir (satu klik untuk pilih)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 172, 170, 10
- AUTORADIOBUTTON "Garis bawahi judul ikon yang konsisten dengan browser saya", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 203, 16, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Garis bawahi judul ikon hanya ketika saya &mengarahkan ke judul tersebut", IDC_FOLDER_OPTIONS_ULPOINT, 50, 152, 203, 16
- PUSHBUTTON "&Kembalikan asal", IDC_FOLDER_OPTIONS_RESTORE, 167, 190, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "S&atu klik untuk membuka butir (arahkan untuk pilih)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "D&ua klik untuk membuka butir (satu klik untuk pilih)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 172, 210, 10
+ AUTORADIOBUTTON "Garis bawahi judul ikon yang konsisten dengan browser saya", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 20, BS_MULTILINE | WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Garis bawahi judul ikon hanya ketika saya &mengarahkan ke judul tersebut", IDC_FOLDER_OPTIONS_ULPOINT, 50, 152, 200, 20, BS_MULTILINE //FIXME: accelerator collision &M
+ PUSHBUTTON "&Kembalikan asal", IDC_FOLDER_OPTIONS_RESTORE, 167, 194, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Tampilan"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Tampilan folder", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Anda bisa menerapkan (baik Rinci maupun Ubin) yang anda gunakan untuk folder ini ke semua folder.", -1, 60, 20, 180, 20
- PUSHBUTTON "&Terapkan ke Semua Folder", IDC_VIEW_APPLY_TO_ALL, 60, 50, 90, 14, WS_TABSTOP
- PUSHBUTTON "&Reset Semua Folder", IDC_VIEW_RESET_ALL, 150, 50, 75, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Anda bisa menerapkan (baik Rinci maupun Ubin) yang anda gunakan untuk folder ini ke semua folder.", -1, 40, 20, 213, 20
+ PUSHBUTTON "&Terapkan ke Semua Folder", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset Semua Folder", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Pengaturan tingkat lanjut:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Kembalikan asal", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "&Kembalikan asal", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Jenis Berkas"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Jenis berkas &terdaftar:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Baru", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Hapus", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Rincian untuk ekstensi '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Buka dengan:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Ganti...", IDC_FILETYPES_CHANGE, 200, 180, 52, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Tin&gkat Lanjut", IDC_FILETYPES_ADVANCED, 200, 215, 52, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Baru", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Hapus", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Rincian untuk ekstensi '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Buka dengan:", -1, 12, 153, 48, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Ganti...", IDC_FILETYPES_CHANGE, 200, 153, 52, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Tin&gkat Lanjut", IDC_FILETYPES_ADVANCED, 200, 188, 52, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index 34dd9588621..e2562e2f970 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Annulla", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Generale"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Attività", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Mostrare le attività comuni nelle cartelle", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 200, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'ReactOS class&ic' ", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 200, 10
- GROUPBOX "Sfoglia cartelle", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Attività", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Mostrare le attività comuni nelle cartelle", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'ReactOS class&ic' ", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Sfoglia cartelle", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Aprire ogni cartella nella stessa finestra", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 200, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Aprire ogni cartella in una nuova finestra", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 200, 10
- GROUPBOX "Click sugli elementi come segue", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Aprire ogni cartella nella stessa finestra", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Aprire ogni cartella in una nuova finestra", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click sugli elementi come segue", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Click singolo per aprire un elemento (seleziona ed apre)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Doppio click per aprire un elemento (click singolo per selezionare)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10
+ AUTORADIOBUTTON "&Click singolo per aprire un elemento (seleziona ed apre)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Doppio click per aprire un elemento (click singolo per selezionare)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 //FIXME: Shorten the string by >= 2 characters (recommended!), or make it 2 lines (less recommended)
AUTORADIOBUTTON "Sottolinea i titoli delle icone in modo coerente con il &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
AUTORADIOBUTTON "Sottolinea i titoli delle icone solo se &selezionate", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
- PUSHBUTTON "&Ripristina le impostazioni predefinite", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ PUSHBUTTON "&Ripristina come predefinite", IDC_FOLDER_OPTIONS_RESTORE, 157, 178, 100, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Visualizzazione"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Vista delle cartelle", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Potete applicare la modalità di visualizzazione attuale a tutte le cartelle.", -1, 60, 20, 180, 20
- PUSHBUTTON "Applicare a &tutte le cartelle", IDC_VIEW_APPLY_TO_ALL, 40, 50, 100, 14, WS_TABSTOP
- PUSHBUTTON "&Ripristina tutte le cartelle", IDC_VIEW_RESET_ALL, 150, 50, 100, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Potete applicare la modalità di visualizzazione attuale a tutte le cartelle.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Applicare a &tutte le cartelle", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Ripristina tutte le cartelle", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Impostazioni avanzate:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Ripristina come predefinite", IDC_VIEW_RESTORE_DEFAULTS, 160, 210, 100, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Ripristina come predefinite", IDC_VIEW_RESTORE_DEFAULTS, 157, 204, 100, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Tipi dei File"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Tipi di file Registrati:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Nuovo", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Cancella", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Dettagli per l'estensione '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Apri con:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Nome", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Cambia...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "A&vanzate", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Nuovo", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Cancella", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Dettagli per l'estensione '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Apri con:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Cambia...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "A&vanzate", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index dd766f49493..359cbef6f0d 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "キャンセル", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "全般"
FONT 9, "MS UI Gothic", 0, 0, 0x0
BEGIN
- GROUPBOX "タスク", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "フォルダに共通のタスクを表示する(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 210, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "ReactOS クラシック フォルダを使用する(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 210, 10
- GROUPBOX "フォルダの参照", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "タスク", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "フォルダに共通のタスクを表示する(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "ReactOS クラシック フォルダを使用する(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "フォルダの参照", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
AUTORADIOBUTTON "同じウィンドウでフォルダを開く(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
AUTORADIOBUTTON "フォルダごとに異なるウィンドウで開く(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
- GROUPBOX "項目のクリック方法", -1, 7, 110, 249, 60
+ GROUPBOX "項目のクリック方法", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
AUTORADIOBUTTON "シングルクリックで項目を開く(ポイントで選択) (&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
AUTORADIOBUTTON "ダブルクリックで項目を開く(シングルクリックで選択)(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
AUTORADIOBUTTON "ブラウザに合わせてアイコンタイトルに下線を引く(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
AUTORADIOBUTTON "ポイントしたときのみアイコンタイトルに下線を引く(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
- PUSHBUTTON "デフォルトに戻す(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ PUSHBUTTON "デフォルトに戻す(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "表示"
FONT 9, "MS UI Gothic", 0, 0, 0x0
BEGIN
GROUPBOX "フォルダの表示方法", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "このフォルダに使用している表示方法 (詳細表示や並べて表示など) をすべてのフォルダに適用できます。", -1, 60, 20, 180, 20
- PUSHBUTTON "すべてのフォルダに適用(&L)", IDC_VIEW_APPLY_TO_ALL, 50, 50, 95, 14, WS_TABSTOP
- PUSHBUTTON "すべてのフォルダをリセット(&R)", IDC_VIEW_RESET_ALL, 147, 50, 106, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "このフォルダに使用している表示方法 (詳細表示や並べて表示など) をすべてのフォルダに適用できます。", -1, 40, 20, 213, 20
+ PUSHBUTTON "すべてのフォルダに適用(&L)", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "すべてのフォルダをリセット(&R)", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "詳細設定:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "デフォルトに戻す(&D)", IDC_VIEW_RESTORE_DEFAULTS, 168, 210, 88, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "デフォルトに戻す(&D)", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "ファイルの種類"
FONT 9, "MS UI Gothic", 0, 0, 0x0
BEGIN
LTEXT "登録済みのファイルの種類(&T):", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "新規(&N)", IDC_FILETYPES_NEW, 135, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "削除(&D)", IDC_FILETYPES_DELETE, 195, 140, 60, 14, WS_TABSTOP
- GROUPBOX "拡張子 '%s' の詳細", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "開くプログラム:", -1, 12, 180, 80, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "アプリ名", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "変更(&C)...", IDC_FILETYPES_CHANGE, 195, 180, 55, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "詳細設定(&V)", IDC_FILETYPES_ADVANCED, 195, 215, 55, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "新規(&N)", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "削除(&D)", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "拡張子 '%s' の詳細", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "開くプログラム:", -1, 12, 153, 62, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "変更(&C)...", IDC_FILETYPES_CHANGE, 195, 153, 55, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "詳細設定(&V)", IDC_FILETYPES_ADVANCED, 195, 188, 55, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index 8e73955bfce..bf5f519f14a 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -412,59 +412,59 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "일반"
FONT 9, "굴림", 0, 0, 0x1
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 9, "굴림", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 9, "굴림", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
@@ -752,7 +752,7 @@ BEGIN
IDS_SHV_COLUMN_MODIFIED "Modified"
IDS_SHV_COLUMN_ATTRIBUTES "Attributes"
IDS_SHV_COLUMN_DISK_CAPACITY "Size"
- IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
+ IDS_SHV_COLUMN_DISK_AVAILABLE "Free Space"
IDS_SHV_COLUMN_OWNER "Owner"
IDS_SHV_COLUMN_GROUP "Group"
IDS_SHV_COLUMN_FILENAME "Filename"
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index fbfeb6059d0..51ba9458b2a 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
@@ -745,7 +745,7 @@ BEGIN
IDS_SHV_COLUMN_MODIFIED "Modified"
IDS_SHV_COLUMN_ATTRIBUTES "Attributes"
IDS_SHV_COLUMN_DISK_CAPACITY "Size"
- IDS_SHV_COLUMN_DISK_AVAILABLE "Size available"
+ IDS_SHV_COLUMN_DISK_AVAILABLE "Free Space"
IDS_SHV_COLUMN_OWNER "Owner"
IDS_SHV_COLUMN_GROUP "Group"
IDS_SHV_COLUMN_FILENAME "Filename"
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index 5715e235982..08e6a8dd2a2 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Generielt"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Oppgaver", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Vis felles oppgaver i &mapper", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Bruk ReactOS klass&isk mapper", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Utforsk mapper", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Oppgaver", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Vis felles oppgaver i &mapper", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Bruk ReactOS klass&isk mapper", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Utforsk mapper", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Åpne hver mapper i sa&mme vindu", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Åpne hver mapper i sitt egen &vindu", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Klikk enheter som følgende", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Åpne hver mapper i sa&mme vindu", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Åpne hver mapper i sitt egen &vindu", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Klikk enheter som følgende", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Enkelt-klikk for å åpne en enhet (peker for å velge)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 190, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Dobbelt klikk for å åpne enheten (Enkelt-klikk for å velge)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 194, 10
- AUTORADIOBUTTON "Understrek ikon titteler konsekvent med min &utforsker", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 190, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Understrek ikon titteler bare mens jeg &peker på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10
- PUSHBUTTON "&Bruk standard", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Enkelt-klikk for å åpne en enhet (peker for å velge)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Dobbelt klikk for å åpne enheten (Enkelt-klikk for å velge)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Understrek ikon titteler konsekvent med min &utforsker", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Understrek ikon titteler bare mens jeg &peker på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Bruk standard", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Vis"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Mappe visning", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Du kan bruke visning (slik som detalj eller Tiles) som du bruker for denne mappen til alle mappene.", -1, 60, 20, 180, 20
- PUSHBUTTON "Bruk til a&lle mappene", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Gjenopprett alle mapper", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Du kan bruke visning (slik som detalj eller Tiles) som du bruker for denne mappen til alle mappene.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Bruk til a&lle mappene", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Gjenopprett alle mapper", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Avanserte innstillinger:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Gjenopprett &standard", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Bruk &standard", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Filtyper"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registerert fil&typer:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Slett", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Detailjer for '%s' utvidelser", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Åpne med:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Endre...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Av&ansert", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Slett", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Detailjer for '%s' utvidelser", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Åpne med:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Endre...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Av&ansert", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index b845757fde6..0b584a4f8d3 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -414,59 +414,59 @@ BEGIN
PUSHBUTTON "Anuluj", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 231
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Ogólne"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Zadania", -1, 7, 7, 249, 37
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 18, 21, 20
- AUTORADIOBUTTON "Pokaż popularne zadania w &katalogach", IDC_FOLDER_OPTIONS_COMMONTASKS, 41, 18, 180, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Użyj klasycznych katalogów systemu &ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 41, 29, 180, 10
- GROUPBOX "Przeglądanie katalogów", -1, 7, 51, 249, 38, WS_TABSTOP
- CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 63, 21, 20
- AUTORADIOBUTTON "Otwórz każdy katalog w tym &samym oknie", IDC_FOLDER_OPTIONS_SAMEWINDOW, 41, 63, 180, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Otwórz każdy katalog w &osobnym oknie", IDC_FOLDER_OPTIONS_OWNWINDOW, 41, 74, 180, 10
- GROUPBOX "Działanie przycisków myszki", -1, 7, 96, 249, 60
- CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 108, 21, 20
- AUTORADIOBUTTON "&Pojedyncze kliknięcie by otworzyć cel (najechanie by wskazać)", IDC_FOLDER_OPTIONS_SINGLECLICK, 41, 108, 214, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Dwukrotne kliknięcie by otworzyć (pojedyncze by wskazać)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 41, 141, 210, 10
- AUTORADIOBUTTON "Podkreśl tytuły ikon zgodnych z używ&aną przeglądarką", IDC_FOLDER_OPTIONS_ULBROWSER, 54, 119, 189, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Podkreślaj &tytuły ikon tylko po ich wskazaniu", IDC_FOLDER_OPTIONS_ULPOINT, 54, 130, 151, 10
- PUSHBUTTON "Przywróć &domyślne", IDC_FOLDER_OPTIONS_RESTORE, 167, 164, 90, 14, WS_TABSTOP
+ GROUPBOX "Zadania", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Pokaż popularne zadania w &katalogach", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Użyj klasycznych katalogów systemu &ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Przeglądanie katalogów", -1, 7, 60, 249, 40, WS_TABSTOP
+ CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
+ AUTORADIOBUTTON "Otwórz każdy katalog w tym &samym oknie", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Otwórz każdy katalog w &osobnym oknie", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Działanie przycisków myszki", -1, 7, 110, 249, 64
+ CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
+ AUTORADIOBUTTON "&Pojedyncze kliknięcie by otworzyć cel (najechanie by wskazać)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 215, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Dwukrotne kliknięcie by otworzyć (pojedyncze by wskazać)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 //FIXME: accelerator collision &D
+ AUTORADIOBUTTON "Podkreśl tytuły ikon zgodnych z używ&aną przeglądarką", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Podkreślaj &tytuły ikon tylko po ich wskazaniu", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "Przywróć &domyślne", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP //FIXME: accelerator collision &D
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 274, 231
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Widok"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Widoki folderu", -1, 10, 5, 256, 55
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Widok, którego używasz dla tego folderu (taki jak Szczegóły lub Kafelki), możesz zastosować do wszystkich folderów.", -1, 56, 14, 202, 20
- PUSHBUTTON "Zastosuj do w&szystkich folderów", IDC_VIEW_APPLY_TO_ALL, 56, 35, 111, 14, WS_TABSTOP
- PUSHBUTTON "&Resetuj wszystkie foldery", IDC_VIEW_RESET_ALL, 171, 35, 88, 14, WS_TABSTOP
- LTEXT "Ustawienia zaawansowane:", -1, 10, 70, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 1, 80, 256, 120
- PUSHBUTTON "Przywróć &domyślne", IDC_VIEW_RESTORE_DEFAULTS, 196, 210, 70, 14, WS_TABSTOP
+ GROUPBOX "Widoki folderu", -1, 7, 10, 249, 60
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Widok, którego używasz dla tego folderu (taki jak Szczegóły lub Kafelki), możesz zastosować do wszystkich folderów.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Zastosuj do w&szystkich folderów", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Resetuj wszystkie foldery", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
+ LTEXT "Ustawienia zaawansowane:", -1, 7, 80, 100, 10
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Przywróć &domyślne", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Typy plików"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LTEXT "Zarejestrowane &typy plików:", -1, 7, 8, 110, 8
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 18, 251, 115
- PUSHBUTTON "&Nowy", IDC_FILETYPES_NEW, 154, 140, 50, 14, WS_TABSTOP
- PUSHBUTTON "&Usuń", IDC_FILETYPES_DELETE, 208, 140, 50, 14, WS_TABSTOP
- GROUPBOX "Szczegóły dla rozszerzenia '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 165, 251, 80
- LTEXT "Otwierane za pomocą:", -1, 14, 178, 75, 16
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 89, 178, 10, 10
- LTEXT "Nazwa Aplikacji", IDC_FILETYPES_APPNAME, 107, 178, 80, 14
- PUSHBUTTON "Z&mień", IDC_FILETYPES_CHANGE, 191, 175, 60, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 14, 196, 230, 24
- PUSHBUTTON "Zaawa&nsowane", IDC_FILETYPES_ADVANCED, 191, 227, 60, 14, WS_TABSTOP
+ LTEXT "Zarejestrowane &typy plików:", -1, 7, 10, 180, 10
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Nowy", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Usuń", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Szczegóły dla rozszerzenia '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Otwierane za pomocą:", -1, 12, 153, 73, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "Z&mień", IDC_FILETYPES_CHANGE, 191, 153, 60, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Zaawa&nsowane", IDC_FILETYPES_ADVANCED, 191, 188, 60, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index a942e50cfa6..7fb4ef1161a 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Geral"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tarefas", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Exibir tarefas comuns em &pastas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Usar pastas cláss&icas do ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tarefas", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Exibir tarefas comuns em &pastas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP //FIXME: accelerator collision &P
+ AUTORADIOBUTTON "Usar pastas cláss&icas do ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Abrir novas pastas na mes&ma janela", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Abrir novas pastas em &janelas independentes", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Abrir novas pastas na mes&ma janela", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Abrir novas pastas em &janelas independentes", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "Clique único para abrir um item (apontar para &selecionar)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Clique &duplo para abrir um item (clique único para selecionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Sublinhar títulos de ícones somente quando a&pontados", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restaurar Padrões", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "Clique único para abrir um item (apontar para &selecionar)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Clique &duplo para abrir um item (clique único para selecionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Sublinhar títulos de ícones somente quando a&pontados", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 //FIXME: accelerator collision &P
+ PUSHBUTTON "&Restaurar Padrões", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Visualizar"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Visualização de pastas", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Você pode aplicar a visualização (como Detalhes ou Exibição) que você está usando nesta pasta para todas as pastas.", -1, 60, 20, 180, 20
- PUSHBUTTON "Aplicar a &Todas as Pastas", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Resetar Todas as Pastas", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Você pode aplicar a visualização (como Detalhes ou Exibição) que você está usando nesta pasta para todas as pastas.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Aplicar a &Todas as Pastas", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Resetar Todas as Pastas", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Configurações avançadas:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restaurar &Padrões", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restaurar &Padrões", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Tipos de Arquivo"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Tipos de arquivo registrado:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Novo", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Apagar", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Detalhes para extensão '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Abrir com:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "Alt&erar...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "A&vançado", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Novo", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Apagar", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Detalhes para extensão '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Abrir com:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "Alt&erar...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "A&vançado", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index 4144bad9ff4..6ea2041f42c 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 274, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 274, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Geral"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tarefas", -1, 7, 10, 259, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Mostrar tarefas comuns nas &pastas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Utilizar pastas class&icas ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Procurar pasta", -1, 7, 60, 259, 45, WS_TABSTOP
+ GROUPBOX "Tarefas", -1, 7, 10, 259, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Mostrar tarefas comuns nas &pastas", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Utilizar pastas class&icas ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Procurar pasta", -1, 7, 60, 259, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Abrir cada pasta na &mesma janela", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Abrir cada pasta na sua &janela", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Seleccione a seguinte opção", -1, 7, 110, 259, 60
+ AUTORADIOBUTTON "Abrir cada pasta na &mesma janela", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Abrir cada pasta na sua &janela", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Seleccione a seguinte opção", -1, 7, 110, 259, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Clique simples para abrir um item", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Duplo-clique para abrir um item (um clique para seleccionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 225, 10
- AUTORADIOBUTTON "Sublinhar os títulos dos ícones mantendo o aspecto do &navegador", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 215, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Sublinhar os títulos dos ícones apenas quando &aponto para eles", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 215, 10
- PUSHBUTTON "&Restaurar predefinições", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Clique simples para abrir um item", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Duplo-clique para abrir um item (um clique para seleccionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Sublinhar os títulos dos ícones mantendo o aspecto do &navegador", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 215, 10, WS_TABSTOP | WS_GROUP //FIXME: Shorten the string to avoid text truncation (recommended), or make it use 2 lines (less recommended). You can have a look at pt-BR.rc which has a string that fits here.
+ AUTORADIOBUTTON "Sublinhar os títulos dos ícones apenas quando &aponto para eles", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 215, 10 //FIXME: Shorten the string to avoid text truncation (recommended), or make it use 2 lines (less recommended). You can have a look at pt-BR.rc which has a string that fits here.
+ PUSHBUTTON "&Restaurar predefinições", IDC_FOLDER_OPTIONS_RESTORE, 177, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 274, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 274, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Ver"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Vistas das Pastas", -1, 7, 10, 259, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Pode aplicar a todas as pastas, a vista (tal como ""Detalhes"" ou ""Mosaico"") que está a utilizar nesta pasta.", -1, 60, 20, 180, 20
- PUSHBUTTON "Aplicar a t&odas as Pastas", IDC_VIEW_APPLY_TO_ALL, 25, 50, 95, 14, WS_TABSTOP
- PUSHBUTTON "&Reiniciar todas as Pastas", IDC_VIEW_RESET_ALL, 140, 50, 95, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Pode aplicar a todas as pastas, a vista (tal como ""Detalhes"" ou ""Mosaico"") que está a utilizar nesta pasta.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Aplicar a t&odas as Pastas", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reiniciar todas as Pastas", IDC_VIEW_RESET_ALL, 135, 50, 125, 14, WS_TABSTOP
LTEXT "Definições avançadas:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 259, 120
- PUSHBUTTON "Restaurar &predefinições", IDC_VIEW_RESTORE_DEFAULTS, 140, 215, 110, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 259, 111
+ PUSHBUTTON "Restaurar &predefinições", IDC_VIEW_RESTORE_DEFAULTS, 177, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 274, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 274, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Tipos de Ficheiro"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Tipos de ficheiros registados:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 259, 115
- PUSHBUTTON "&Novo...", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Eliminar...", IDC_FILETYPES_DELETE, 200, 140, 65, 14, WS_TABSTOP
- GROUPBOX "Detalhes para a extensão '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 259, 70
- LTEXT "Abre com:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Nome", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Alterar...", IDC_FILETYPES_CHANGE, 200, 180, 60, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "A&vançadas...", IDC_FILETYPES_ADVANCED, 200, 215, 60, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 259, 99
+ PUSHBUTTON "&Novo...", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Eliminar...", IDC_FILETYPES_DELETE, 200, 123, 65, 14, WS_TABSTOP
+ GROUPBOX "Detalhes para a extensão '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 259, 70
+ LTEXT "Abre com:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Alterar...", IDC_FILETYPES_CHANGE, 200, 153, 60, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "A&vançadas...", IDC_FILETYPES_ADVANCED, 200, 188, 60, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index 4514791bb77..32abbe624fb 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -413,59 +413,59 @@ BEGIN
PUSHBUTTON "A&nulează", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Generale"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Activități", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Incl&ude în ferestrele dosarelor și activiățile comune", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 200, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Prefer aspectul &clasic pentru dosare", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 200, 10
- GROUPBOX "Parcurgere dosare", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Activități", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Incl&ude în ferestrele dosarelor și activiățile comune", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Prefer aspectul &clasic pentru dosare", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Parcurgere dosare", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "&Parcurge dosarele în aceiași fereastră", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 200, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "D&eschide fiecare dosar în fereastră proprie", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 200, 10
- GROUPBOX "Interacțiune elemente", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "&Parcurge dosarele în aceiași fereastră", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "D&eschide fiecare dosar în fereastră proprie", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Interacțiune elemente", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "Deschide prin acțiune si&mplă (selecare prin indicare)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Deschide prin acțiune &dublă (selectare prin una simplă)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10
- AUTORADIOBUTTON "Subliniază titlurile la fel ca adresele &web", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Subliniază titlurile doar la pre&zența indicatorului", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restabilește opțiunile implicite", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "Deschide prin acțiune si&mplă (selecare prin indicare)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Deschide prin acțiune &dublă (selectare prin una simplă)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Subliniază titlurile la fel ca adresele &web", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Subliniază titlurile doar la pre&zența indicatorului", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restabilește opțiunile implicite", IDC_FOLDER_OPTIONS_RESTORE, 147, 178, 110, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Afișare"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Afișare dosare", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Puteți aplica afișarea curentă (ce include Detalii sau Pictograme mari) pentru toate dosarele.", -1, 60, 20, 190, 20
- PUSHBUTTON "Apli&că pentru toate", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "Restabilește t&oate", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Puteți aplica afișarea curentă (ce include Detalii sau Pictograme mari) pentru toate dosarele.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apli&că pentru toate", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "Restabilește t&oate", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Opțiuni avansate:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Restabilește opțiunile implicite", IDC_VIEW_RESTORE_DEFAULTS, 130, 215, 126, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "&Restabilește opțiunile implicite", IDC_VIEW_RESTORE_DEFAULTS, 147, 204, 110, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Tipuri de fișier"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Tipurile de fișier înregistrate:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "N&ou…", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Elimină", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Detalii pentru extensia „%s”", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Va fi deschis cu:", -1, 12, 180, 50, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Nume aplicație", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "Spe&cificare ", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "A&vansate…", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "N&ou…", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Elimină", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Detalii pentru extensia „%s”", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Va fi deschis cu:", -1, 12, 153, 55, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "Spe&cificare ", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "A&vansate…", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index f1fa9626798..e449f8ddaa3 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -414,59 +414,59 @@ BEGIN
PUSHBUTTON "Отмена", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Общие"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Задачи", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Отобра&жение списка типичных задач в папках", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Использовать обы&чные папки ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 145, 10
- GROUPBOX "Обзор папок", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Задачи", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Отобра&жение списка типичных задач в папках", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Использовать обы&чные папки ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Обзор папок", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "&Открывать папки в одном и том же окне", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 150, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "О&ткрывать каждую папку в отдельном окне", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 165, 10
- GROUPBOX "Щелчки мышью", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "&Открывать папки в одном и том же окне", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "О&ткрывать каждую папку в отдельном окне", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Щелчки мышью", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "От&крывать одним щелчком, выделять указателем", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 185, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Откр&ывать двойным, а выделять одним щелчком", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 180, 10
- AUTORADIOBUTTON "Подчеркив&ать подписи значков", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Подчеркивать подписи з&начков при наведении", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 175, 10
- PUSHBUTTON "&Восстановить умолчания", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "От&крывать одним щелчком, выделять указателем", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Откр&ывать двойным, а выделять одним щелчком", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Подчеркив&ать подписи значков", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Подчеркивать подписи з&начков при наведении", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Восстановить умолчания", IDC_FOLDER_OPTIONS_RESTORE, 158, 178, 99, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Вид"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Представление папок", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Можно применить вид, выбранный для этой папки, например, ""Таблица"" или ""Плитка"", ко всем папкам.", -1, 60, 20, 180, 20
- PUSHBUTTON "&Применить к папкам", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Сброс вида папок", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Можно применить вид, выбранный для этой папки, например, ""Таблица"" или ""Плитка"", ко всем папкам.", -1, 40, 20, 213, 20
+ PUSHBUTTON "&Применить к папкам", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Сброс вида папок", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Дополнительные параметры:", -1, 7, 80, 105, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Восстановить умолчания", IDC_VIEW_RESTORE_DEFAULTS, 160, 210, 100, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "&Восстановить умолчания", IDC_VIEW_RESTORE_DEFAULTS, 158, 204, 99, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Типы файлов"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Зарегистрированные типы файлов:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Создать", IDC_FILETYPES_NEW, 125, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Удалить", IDC_FILETYPES_DELETE, 185, 140, 70, 14, WS_TABSTOP
- GROUPBOX "Описание расширения '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Открывать с:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Приложение", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Изменить...", IDC_FILETYPES_CHANGE, 185, 180, 65, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "До&полнительно", IDC_FILETYPES_ADVANCED, 185, 215, 65, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Создать", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Удалить", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Описание расширения '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Открывать с:", -1, 12, 153, 48, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Изменить...", IDC_FILETYPES_CHANGE, 185, 153, 65, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "До&полнительно", IDC_FILETYPES_ADVANCED, 185, 188, 65, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index 19c343ac8f6..015b5539a0c 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Zrušiť", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Úlohy", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Úlohy", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Zobraziť"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Typy súborov"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registrované &typy súborov:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Nový", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "O&dstrániť", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Zmeniť...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Nový", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "O&dstrániť", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Zmeniť...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index 30d224df2df..dd7676fa74e 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Tasks", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Tasks", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Browse folders", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Click items as follows", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Click items as follows", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "View"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Folder views", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "You can apply the view (such as Details or Tiles) that you are using for this folder to all folders.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apply to A&ll Folders", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Reset All Folders", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Advanced settings:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Restore &Defaults", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "File Types"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registered file &types:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Opens with:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Appname", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&New", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Delete", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Details for '%s' extension", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Opens with:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Change...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Ad&vanced", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index b08b95e5b4d..c25ed095302 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -412,59 +412,59 @@ BEGIN
PUSHBUTTON "Anulo", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Përgjithshëm"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Detyra", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Trego detyra të përbashkëta në dosjet", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Përdorimi ReactOS dosjet klasike", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Shfleto Dosje", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Detyra", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Trego detyra të përbashkëta në dosjet", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Përdorimi ReactOS dosjet klasike", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Shfleto Dosje", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Hap çdo dosje në të njëtën dritare", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Hap çdo dosje në dritaren e saj", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Klikoni artikuj si më poshtë", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Hap çdo dosje në të njëtën dritare", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Hap çdo dosje në dritaren e saj", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Klikoni artikuj si më poshtë", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "Klikim-njëherësh për të hapur një objekt (pikë për të zgjedhur)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Kliko-dyherë për të hapur një objekt (klikoni-njëerësht për të zgjedhur)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Nënvizo titull ikone në përputhje me shfletuesin tim", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Nënvizo ikonën vetëm në tituj ku unë vë pikë në ta", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Rikthe Parazgjedhjet", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "Klikim-njëherësh për të hapur një objekt (pikë për të zgjedhur)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Kliko-dyherë për të hapur një objekt (klikoni-njëerësht për të zgjedhur)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 //FIXME: Shorten the string to avoid text truncation (recommended), or make it use 2 lines (less recommended)
+ AUTORADIOBUTTON "Nënvizo titull ikone në përputhje me shfletuesin tim", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Nënvizo ikonën vetëm në tituj ku unë vë pikë në ta", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "Kthej Pa&razgjedhjet", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Vëzhgo"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Vëzhgo Dosjen", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Ju mund të aplikoni pamje (të tilla si Detaje ose Pllaka) që Ju jeni duke përdorur për këtë dosje të gjitha dosjet.", -1, 60, 20, 180, 20
- PUSHBUTTON "Apliko për të gjitha Dosjet", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Rivë të gjitha Dosjet", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Ju mund të aplikoni pamje (të tilla si Detaje ose Pllaka) që Ju jeni duke përdorur për këtë dosje të gjitha dosjet.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Apliko për të gjitha Dosjet", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Rivë të gjitha Dosjet", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Cilësime të Avancuar:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Kthej &Parazgjedhje", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Kthej &Parazgjedhje", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Tipe Dokumenti"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Dokumentat e regjistruar dhe lloji:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "E're", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Fshi", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Detaje për '%s' zgjerim", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Hap me:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Emriapp", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Ndrysho...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "Avancuar", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "E're", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Fshi", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Detaje për '%s' zgjerim", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Hap me:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Ndrysho...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "Avancuar", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index 094a3a54483..0d93b973da6 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Allmänt"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Aktiviteter", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "Visa vanliga aktiviteter i &mappar", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 125, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Använd ReactOS klass&iska mappar", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 125, 10
- GROUPBOX "Bläddra mappar", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Aktiviteter", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "Visa vanliga aktiviteter i &mappar", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP //FIXME: accelerator collision &M
+ AUTORADIOBUTTON "Använd ReactOS klass&iska mappar", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Bläddra mappar", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Öppna varje mapp i sa&mma fönster", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Öppna varje mapp i sitt eget &fönster", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Klicka på objekt enligt följande", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Öppna varje mapp i sa&mma fönster", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP //FIXME: accelerator collision &M
+ AUTORADIOBUTTON "Öppna varje mapp i sitt eget &fönster", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Klicka på objekt enligt följande", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Enkelklicka för att öppna (markera genom att peka)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Dubbelklicka för att öppna (markera genom att enkelklicka)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10
+ AUTORADIOBUTTON "&Enkelklicka för att öppna (markera genom att peka)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Dubbelklicka för att öppna (markera genom att enkelklicka)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
AUTORADIOBUTTON "Stryk under ikontitlar som min &webbläsare", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
AUTORADIOBUTTON "Stryk under ikontitlar endast när jag &pekar på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
- PUSHBUTTON "&Återställ standardvärde", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ PUSHBUTTON "&Återställ standardvärde", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Visa"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Mappvyer", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Du kan använda den nuvarande vyn (t.ex. detaljer) som används i den här mappen för alla mappar.", -1, 60, 20, 180, 20
- PUSHBUTTON "Använd för a&lla mappar", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "&Återställ alla mappar", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Du kan använda den nuvarande vyn (t.ex. detaljer) som används i den här mappen för alla mappar.", -1, 40, 20, 213, 20
+ PUSHBUTTON "Använd för a&lla mappar", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Återställ alla mappar", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Avancerade inställningar:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "Återställ &standardvärde", IDC_VIEW_RESTORE_DEFAULTS, 160, 220, 90, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "Återställ &standardvärde", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Filtyper"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Registrerade fil&typer:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Ta bort", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Detaljer för filändelsen '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Öppnas med:", -1, 12, 180, 50, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Programnamn", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Ändra...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "A&vancerat", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Ny", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Ta bort", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Detaljer för filändelsen '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Öppnas med:", -1, 12, 153, 48, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Ändra...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "A&vancerat", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index 9c0189cf446..618e4aa21fb 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -4,7 +4,7 @@
* PURPOSE: Turkish resource file
* TRANSLATORS: Copyright 2006 Fatih Aşıcı <fasici(a)linux-sevenler.org>
* Copyright 2012 Arda Tanrıkulu (ardatan) <ardatanrikulu(a)gmail.com>
- * Copyright 2015-2016, 2020 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net>
+ * Copyright 2015-2020 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net>
*/
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
@@ -414,59 +414,59 @@ BEGIN
PUSHBUTTON "İptal", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Genel"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Görevler", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "&Dizinlerde sık kullanılan görevleri göster", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP | WS_GROUP
- AUTORADIOBUTTON "React&OS klasik dizinlerini kullan", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "Dizinlere gözat", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Görevler", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "&Dizinlerde sık kullanılan görevleri göster", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "React&OS klasik dizinlerini kullan", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Dizinlere gözat", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "&Tüm dizinleri aynı pencerede aç", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP | WS_GROUP
- AUTORADIOBUTTON "Tü&m dizinleri kendi penceresinde aç", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "Aşağıdaki gibi ögelere tıkla", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "&Tüm dizinleri aynı pencerede aç", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Tü&m dizinleri kendi penceresinde aç", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Aşağıdaki gibi ögelere tıkla", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "&Bir öge açmak için tek tıkla (seçmek için üzerine git)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Bi&r ögeyi açmak için çift tıkla (seçmek için tek tıkla)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "T&arayıcımla uyumlu olarak simge etiketlerinin altını çiz", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "&Yalnızca onların üzerine gittiğimde simge etiketlerinin altını çiz", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Varsayılanları Geri Getir", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "&Bir öge açmak için tek tıkla (seçmek için üzerine git)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Bi&r ögeyi açmak için çift tıkla (seçmek için tek tıkla)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "T&arayıcımla uyumlu olarak simge etiketlerinin altını çiz", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "&Yalnızca onların üzerine gittiğimde simge etiketlerinin altını çiz", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 205, 10
+ PUSHBUTTON "&Varsayılanları Geri Getir", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Görünüm"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Dizin görünümleri", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "Bu dizin için kullandığınız görünümü (ayrıntılar ya da döşemeler gibi) tüm dizinlere uygulayabilirsiniz.", -1, 60, 20, 180, 20
- PUSHBUTTON "&Tüm Dizinlere Uygula", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "Tü&m Dizinleri Sıfırla", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Bu dizin için kullandığınız görünümü (ayrıntılar ya da döşemeler gibi) tüm dizinlere uygulayabilirsiniz.", -1, 40, 20, 213, 20
+ PUSHBUTTON "&Tüm Dizinlere Uygula", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "Tü&m Dizinleri Sıfırla", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "Gelişmiş ayarlar:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Varsayılanları Geri Getir", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "&Varsayılanları Geri Getir", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Dosya Türleri"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Kayıtlı dosya türleri:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Yeni", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "&Sil", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX """%s"" uzantısı için ayrıntılar", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Birlikte aç:", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Uygulama adı", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Değiştir...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "&Gelişmiş", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Yeni", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "&Sil", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX """%s"" uzantısı için ayrıntılar", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Birlikte aç:", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Değiştir...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "&Gelişmiş", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 9c069ec6ab9..9ec0332e405 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -395,7 +395,7 @@ CAPTION "Вибір програми"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
- LTEXT "Виберіть програму, за допомогою якої слід відкрити цей файл.", -1, 44, 12, 234, 10
+ LTEXT "Виберіть програму, за допомогою якої слід відкрити цей файл.", -1, 44, 12, 215, 10
LTEXT "Файл: ", 14001, 44, 25, 188, 20
GROUPBOX "&Програми", -1, 7, 42, 249, 187
CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130
@@ -405,59 +405,59 @@ BEGIN
PUSHBUTTON "Скасувати", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Загальні"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Завдання", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "&Показувати список типових завдань у теках", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Використовувати зви&чайні папки ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 149, 10
- GROUPBOX "Огляд папок", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "Завдання", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "&Показувати список типових завдань у теках", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Використовувати зви&чайні папки ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "Огляд папок", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "Відкривати папки в то&му самому вікні", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Відкрива&ти кожну папку в окремому вікні", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 155, 10
- GROUPBOX "Клацання мишею", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "Відкривати папки в то&му самому вікні", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Відкрива&ти кожну папку в окремому вікні", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "Клацання мишею", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "Від&кривати одиночним, виділяти вказівником", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Відкрив&ати подвійним, виділяти одиночним", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "Підкресл&ювати підписи значків", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "Підкр&еслювати лише при наведенні", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "&Стандартно", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "Від&кривати одиночним, виділяти вказівником", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Відкрив&ати подвійним, виділяти одиночним", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "Підкресл&ювати підписи значків", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "Підкр&еслювати лише при наведенні", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "&Стандартно", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Вигляд"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Вигляд тек", -1, 7, 10, 249, 60
- //ICON
- LTEXT "Можна застосувати вигляд, який використовується для цієї теки (наприклад, ""Таблиця"" або ""Плитка""), до всіх тек.", -1, 60, 20, 180, 23
- PUSHBUTTON "&Застосувати до всіх тек", IDC_VIEW_APPLY_TO_ALL, 58, 50, 84, 14, WS_TABSTOP
- PUSHBUTTON "&Скид для всіх тек", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "Можна застосувати вигляд, який використовується для цієї теки (наприклад, ""Таблиця"" або ""Плитка""), до всіх тек.", -1, 40, 20, 213, 20
+ PUSHBUTTON "&Застосувати до всіх тек", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "&Скид для всіх тек", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP //FIXME: accelerator collision &C
LTEXT "Додаткові параметри:", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "&Стандартно", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "&Стандартно", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP //FIXME: accelerator collision &C
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "Типи файлів"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Зареєстровані &типи файлів:", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "&Створити", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "В&идалити", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "Подробиці для розширення '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "Відкривати у:", -1, 12, 180, 48, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "Додаток", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "&Змінити...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "&Додатково", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "&Створити", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "В&идалити", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "Подробиці для розширення '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "Відкривати у:", -1, 12, 153, 48, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "&Змінити...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "&Додатково", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index 6725549476b..cf3f11d898b 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -415,59 +415,59 @@ BEGIN
PUSHBUTTON "取消", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "常规"
FONT 9, "宋体", 0, 0, 0x0
BEGIN
- GROUPBOX "任务", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "在文件夹中显示常见任务(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "使用 ReactOS 经典文件夹(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "浏览文件夹", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "任务", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "在文件夹中显示常见任务(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "使用 ReactOS 经典文件夹(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "浏览文件夹", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "在相同窗口中打开每一个文件夹(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "在相同窗口中打开自己的文件夹(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "点击项目的方式", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "在相同窗口中打开每一个文件夹(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "在相同窗口中打开自己的文件夹(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "点击项目的方式", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "通过单击来打开项目（指向时选择）(&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "通过双击来打开项目（单击时选择）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "在图标标题下添加下划线，和浏览器设置相同(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "仅当我指向图标标题时才添加下划线(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "还原为默认值(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "通过单击来打开项目（指向时选择）(&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "通过双击来打开项目（单击时选择）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "在图标标题下添加下划线，和浏览器设置相同(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "仅当我指向图标标题时才添加下划线(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "还原默认值(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "视图"
FONT 9, "宋体", 0, 0, 0x0
BEGIN
GROUPBOX "视图", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "您可以将用于此文件夹的视图（例如“详细信息”或“平铺”）应用于所有文件夹。", -1, 60, 20, 180, 20
- PUSHBUTTON "应用到所有文件夹(&L)", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "重置所有文件夹(&R)", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "您可以将用于此文件夹的视图（例如“详细信息”或“平铺”）应用于所有文件夹。", -1, 40, 20, 213, 20
+ PUSHBUTTON "应用到所有文件夹(&L)", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "重置所有文件夹(&R)", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "高级设置：", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "还原默认值(&D)", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "还原默认值(&D)", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "文件类型"
FONT 9, "宋体", 0, 0, 0x0
BEGIN
LTEXT "已注册的文件类型(&T)：", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "新建(&N)", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "删除(&D)", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "“%s”扩展的详细信息", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "打开方式：", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "程序名称", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "更改(&C)...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "高级(&V)", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "新建(&N)", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "删除(&D)", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "“%s”扩展的详细信息", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "打开方式：", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "更改(&C)...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "高级(&V)", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc
index a710e37e79a..b18d6ffb86c 100644
--- a/dll/win32/shell32/lang/zh-HK.rc
+++ b/dll/win32/shell32/lang/zh-HK.rc
@@ -413,59 +413,59 @@ BEGIN
PUSHBUTTON "取消", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "一般"
FONT 9, "新細明體", 0, 0, 0x0
BEGIN
- GROUPBOX "任務", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "顯示資料夾的常見工作(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "使用 ReactOS 傳統資料夾(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "瀏覽資料夾", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "任務", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "顯示資料夾的常見工作(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "使用 ReactOS 傳統資料夾(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "瀏覽資料夾", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "在相同視窗中開啟每一個資料夾(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "在相同視窗中開啟自己的資料夾(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "點選項目的方式", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "在相同視窗中開啟每一個資料夾(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "在相同視窗中開啟自己的資料夾(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "點選項目的方式", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "通過按一下來開啟項目（指向時選擇）(&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "通過按兩下來開啟項目（按一下時選擇）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "在圖示標題下新增下劃線，與瀏覽器設定相同(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "只在我指向圖示標題時才新增下劃線(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "還原成預設值(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "通過按一下來開啟項目（指向時選擇）(&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "通過按兩下來開啟項目（按一下時選擇）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "在圖示標題下新增下劃線，與瀏覽器設定相同(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "只在我指向圖示標題時才新增下劃線(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "還原成預設值(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "檢視"
FONT 9, "新細明體", 0, 0, 0x0
BEGIN
GROUPBOX "資料夾檢視", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "您可以將用在這個資料夾的視圖（例如［詳細資料］或［並排］）套用在所有資料夾。", -1, 60, 20, 180, 20
- PUSHBUTTON "套用到所有資料夾(&L)", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "重設所有資料夾(&R)", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "您可以將用在這個資料夾的視圖（例如［詳細資料］或［並排］）套用在所有資料夾。", -1, 40, 20, 213, 20
+ PUSHBUTTON "套用到所有資料夾(&L)", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "重設所有資料夾(&R)", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "進階設定：", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "還原成預設值(&D)", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "還原成預設值(&D)", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "檔案類型"
FONT 9, "新細明體", 0, 0, 0x0
BEGIN
LTEXT "已註冊的檔案類型(&T)：", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "新增(&N)", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "刪除(&D)", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "副檔名「%s」的詳細資訊", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "開啟檔案：", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "應用程式名稱", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "變更(&C)...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "進階(&V)", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "新增(&N)", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "刪除(&D)", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "副檔名「%s」的詳細資訊", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "開啟檔案：", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "變更(&C)...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "進階(&V)", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index 00149e69b09..f4752e1b728 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -414,59 +414,59 @@ BEGIN
PUSHBUTTON "取消", IDCANCEL, 206, 236, 50, 14
END
-IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "一般"
FONT 9, "新細明體", 0, 0, 0x0
BEGIN
- GROUPBOX "任務", -1, 7, 10, 249, 45
- CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20
- AUTORADIOBUTTON "顯示資料夾的常見工作(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "使用 ReactOS 傳統資料夾(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10
- GROUPBOX "瀏覽資料夾", -1, 7, 60, 249, 45, WS_TABSTOP
+ GROUPBOX "任務", -1, 7, 10, 249, 40
+ CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 20, 21, 20
+ AUTORADIOBUTTON "顯示資料夾的常見工作(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 20, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "使用 ReactOS 傳統資料夾(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 32, 210, 10
+ GROUPBOX "瀏覽資料夾", -1, 7, 60, 249, 40, WS_TABSTOP
CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20
- AUTORADIOBUTTON "在相同視窗中開啟每一個資料夾(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "在相同視窗中開啟自己的資料夾(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10
- GROUPBOX "點選項目的方式", -1, 7, 110, 249, 60
+ AUTORADIOBUTTON "在相同視窗中開啟每一個資料夾(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "在相同視窗中開啟自己的資料夾(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 210, 10
+ GROUPBOX "點選項目的方式", -1, 7, 110, 249, 64
CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20
- AUTORADIOBUTTON "通過按一下來開啟項目（指向時選擇）(&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "通過按兩下來開啟項目（按一下時選擇）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10
- AUTORADIOBUTTON "在圖示標題下新增下劃線，和瀏覽器設定相同(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP
- AUTORADIOBUTTON "僅當我指向圖示標題時才新增下劃線(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10
- PUSHBUTTON "還原成預設值(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP
+ AUTORADIOBUTTON "通過按一下來開啟項目（指向時選擇）(&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "通過按兩下來開啟項目（按一下時選擇）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10
+ AUTORADIOBUTTON "在圖示標題下新增下劃線，和瀏覽器設定相同(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP
+ AUTORADIOBUTTON "僅當我指向圖示標題時才新增下劃線(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10
+ PUSHBUTTON "還原成預設值(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 178, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "檢視"
FONT 9, "新細明體", 0, 0, 0x0
BEGIN
GROUPBOX "資料夾檢視", -1, 7, 10, 249, 60
- ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20
- LTEXT "您可以將用於這個資料夾的視圖（例如「詳細資料」或「並排」）應用於所有資料夾。", -1, 60, 20, 180, 20
- PUSHBUTTON "套用到所有資料夾(&L)", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP
- PUSHBUTTON "重設所有資料夾(&R)", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP
+ ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 14, 20, 21, 20
+ LTEXT "您可以將用於這個資料夾的視圖（例如「詳細資料」或「並排」）應用於所有資料夾。", -1, 40, 20, 213, 20
+ PUSHBUTTON "套用到所有資料夾(&L)", IDC_VIEW_APPLY_TO_ALL, 15, 50, 115, 14, WS_TABSTOP
+ PUSHBUTTON "重設所有資料夾(&R)", IDC_VIEW_RESET_ALL, 135, 50, 115, 14, WS_TABSTOP
LTEXT "進階設定：", -1, 7, 80, 100, 10
- CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
- PUSHBUTTON "還原成預設值(&D)", IDC_VIEW_RESTORE_DEFAULTS, 177, 215, 80, 14, WS_TABSTOP
+ CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 111
+ PUSHBUTTON "還原成預設值(&D)", IDC_VIEW_RESTORE_DEFAULTS, 167, 204, 90, 14, WS_TABSTOP
END
-IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256
+IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 220
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
CAPTION "檔案類型"
FONT 9, "新細明體", 0, 0, 0x0
BEGIN
LTEXT "已註冊的檔案類型(&T)：", -1, 7, 10, 180, 10
- CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115
- PUSHBUTTON "新增(&N)", IDC_FILETYPES_NEW, 140, 140, 55, 14, WS_TABSTOP
- PUSHBUTTON "刪除(&D)", IDC_FILETYPES_DELETE, 200, 140, 55, 14, WS_TABSTOP
- GROUPBOX "副檔名「%s」的詳細資訊", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 170, 249, 70
- LTEXT "開啟檔案：", -1, 12, 180, 40, 10
- CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 180, 10, 10
- LTEXT "應用程式名稱", IDC_FILETYPES_APPNAME, 100, 180, 80, 10
- PUSHBUTTON "變更(&C)...", IDC_FILETYPES_CHANGE, 200, 180, 50, 14, WS_TABSTOP
- LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 195, 160, 40
- PUSHBUTTON "進階(&V)", IDC_FILETYPES_ADVANCED, 200, 215, 50, 14, WS_TABSTOP
+ CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 99
+ PUSHBUTTON "新增(&N)", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP
+ PUSHBUTTON "刪除(&D)", IDC_FILETYPES_DELETE, 200, 123, 55, 14, WS_TABSTOP
+ GROUPBOX "副檔名「%s」的詳細資訊", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 143, 249, 70
+ LTEXT "開啟檔案：", -1, 12, 153, 40, 10
+ CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 85, 153, 10, 10
+ LTEXT "", IDC_FILETYPES_APPNAME, 100, 153, 80, 10
+ PUSHBUTTON "變更(&C)...", IDC_FILETYPES_CHANGE, 200, 153, 50, 14, WS_TABSTOP
+ LTEXT "", IDC_FILETYPES_DESCRIPTION, 12, 168, 160, 40
+ PUSHBUTTON "進階(&V)", IDC_FILETYPES_ADVANCED, 200, 188, 50, 14, WS_TABSTOP
END
IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143
1
0
18 Dec '23
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1df5225708cadaaee6c79…
commit 1df5225708cadaaee6c790c67517f441c6ecb8c6
Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org>
AuthorDate: Mon Dec 18 12:04:57 2023 +0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Dec 18 12:04:57 2023 +0700
[NTUSER] menu.c: Don't use RETURN() macro (#6185)
Also remove parentheses around return value.
---
win32ss/user/ntuser/menu.c | 343 ++++++++++++++++++++++-----------------------
1 file changed, 164 insertions(+), 179 deletions(-)
diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c
index b02eb7b88cf..85e9c93ef72 100644
--- a/win32ss/user/ntuser/menu.c
+++ b/win32ss/user/ntuser/menu.c
@@ -5075,7 +5075,7 @@ IntMenuItemInfo(
if (!(MenuItem = MENU_FindItem( &Menu, &Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND) )))
{
EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND);
- return( FALSE);
+ return FALSE;
}
if (SetOrGet)
{
@@ -5085,7 +5085,7 @@ IntMenuItemInfo(
{
Ret = IntGetMenuItemInfo(Menu, MenuItem, ItemInfo);
}
- return( Ret);
+ return Ret;
}
BOOL FASTCALL
@@ -5107,20 +5107,20 @@ UserMenuItemInfo(
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
- return( FALSE);
+ return FALSE;
}
if ( Size != sizeof(MENUITEMINFOW) &&
Size != FIELD_OFFSET(MENUITEMINFOW, hbmpItem) &&
Size != sizeof(ROSMENUITEMINFO) )
{
EngSetLastError(ERROR_INVALID_PARAMETER);
- return( FALSE);
+ return FALSE;
}
Status = MmCopyFromCaller(&ItemInfo, UnsafeItemInfo, Size);
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
- return( FALSE);
+ return FALSE;
}
/* If this is a pre-0x0500 _WIN32_WINNT MENUITEMINFOW, you can't
set/get hbmpItem */
@@ -5128,7 +5128,7 @@ UserMenuItemInfo(
&& 0 != (ItemInfo.fMask & MIIM_BITMAP))
{
EngSetLastError(ERROR_INVALID_PARAMETER);
- return( FALSE);
+ return FALSE;
}
if (!(MenuItem = MENU_FindItem( &Menu, &Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND) )))
@@ -5138,7 +5138,7 @@ UserMenuItemInfo(
return TRUE;
EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND);
- return( FALSE);
+ return FALSE;
}
if (SetOrGet)
@@ -5154,12 +5154,12 @@ UserMenuItemInfo(
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
- return( FALSE);
+ return FALSE;
}
}
}
- return( Ret);
+ return Ret;
}
BOOL FASTCALL
@@ -5177,18 +5177,18 @@ UserMenuInfo(
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
- return( FALSE);
+ return FALSE;
}
if ( Size < sizeof(MENUINFO) || Size > sizeof(ROSMENUINFO) )
{
EngSetLastError(ERROR_INVALID_PARAMETER);
- return( FALSE);
+ return FALSE;
}
Status = MmCopyFromCaller(&MenuInfo, UnsafeMenuInfo, Size);
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
- return( FALSE);
+ return FALSE;
}
if(SetOrGet)
@@ -5206,12 +5206,12 @@ UserMenuInfo(
if (! NT_SUCCESS(Status))
{
SetLastNtError(Status);
- return( FALSE);
+ return FALSE;
}
}
}
- return( Res);
+ return Res;
}
BOOL FASTCALL
@@ -5575,22 +5575,20 @@ NtUserCheckMenuItem(
UINT uCheck)
{
PMENU Menu;
- DECLARE_RETURN(DWORD);
+ DWORD Ret = (DWORD)-1;
TRACE("Enter NtUserCheckMenuItem\n");
UserEnterExclusive();
- if(!(Menu = UserGetMenuObject(hMenu)))
+ Menu = UserGetMenuObject(hMenu);
+ if (Menu)
{
- RETURN( (DWORD)-1);
+ Ret = IntCheckMenuItem(Menu, uIDCheckItem, uCheck);
}
- RETURN( IntCheckMenuItem(Menu, uIDCheckItem, uCheck));
-
-CLEANUP:
- TRACE("Leave NtUserCheckMenuItem, ret=%lu\n",_ret_);
+ TRACE("Leave NtUserCheckMenuItem, ret=%lu\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -5603,22 +5601,20 @@ NtUserDeleteMenu(
UINT uFlags)
{
PMENU Menu;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserDeleteMenu\n");
UserEnterExclusive();
- if(!(Menu = UserGetMenuObject(hMenu)))
+ Menu = UserGetMenuObject(hMenu);
+ if (Menu)
{
- RETURN( FALSE);
+ Ret = IntRemoveMenuItem(Menu, uPosition, uFlags, TRUE);
}
- RETURN( IntRemoveMenuItem(Menu, uPosition, uFlags, TRUE));
-
-CLEANUP:
- TRACE("Leave NtUserDeleteMenu, ret=%i\n",_ret_);
+ TRACE("Leave NtUserDeleteMenu, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -5653,27 +5649,27 @@ NtUserGetSystemMenu(HWND hWnd, BOOL bRevert)
{
PWND Window;
PMENU Menu;
- DECLARE_RETURN(HMENU);
+ HMENU Ret = NULL;
TRACE("Enter NtUserGetSystemMenu\n");
UserEnterExclusive();
if (!(Window = UserGetWindowObject(hWnd)))
{
- RETURN(NULL);
+ goto Exit;
}
if (!(Menu = IntGetSystemMenu(Window, bRevert)))
{
- RETURN(NULL);
+ goto Exit;
}
- RETURN(Menu->head.h);
+ Ret = UserHMGetHandle(Menu);
-CLEANUP:
- TRACE("Leave NtUserGetSystemMenu, ret=%p\n", _ret_);
+Exit:
+ TRACE("Leave NtUserGetSystemMenu, ret=%p\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -5689,14 +5685,13 @@ NtUserSetSystemMenu(HWND hWnd, HMENU hMenu)
BOOL Result = FALSE;
PWND Window;
PMENU Menu;
- DECLARE_RETURN(BOOL);
TRACE("Enter NtUserSetSystemMenu\n");
UserEnterExclusive();
if (!(Window = UserGetWindowObject(hWnd)))
{
- RETURN( FALSE);
+ goto Exit;
}
if (hMenu)
@@ -5706,7 +5701,7 @@ NtUserSetSystemMenu(HWND hWnd, HMENU hMenu)
*/
if (!(Menu = IntGetMenuObject(hMenu)))
{
- RETURN( FALSE);
+ goto Exit;
}
Result = IntSetSystemMenu(Window, Menu);
@@ -5714,12 +5709,10 @@ NtUserSetSystemMenu(HWND hWnd, HMENU hMenu)
else
EngSetLastError(ERROR_INVALID_MENU_HANDLE);
- RETURN( Result);
-
-CLEANUP:
- TRACE("Leave NtUserSetSystemMenu, ret=%i\n",_ret_);
+Exit:
+ TRACE("Leave NtUserSetSystemMenu, ret=%i\n", Result);
UserLeave();
- END_CLEANUP;
+ return Result;
}
/*
@@ -5732,7 +5725,6 @@ NtUserGetTitleBarInfo(
{
PWND WindowObject;
TITLEBARINFO bartitleinfo;
- DECLARE_RETURN(BOOLEAN);
BOOLEAN retValue = TRUE;
TRACE("Enter NtUserGetTitleBarInfo\n");
@@ -5781,12 +5773,9 @@ NtUserGetTitleBarInfo(
}
}
- RETURN( retValue );
-
-CLEANUP:
- TRACE("Leave NtUserGetTitleBarInfo, ret=%u\n",_ret_);
+ TRACE("Leave NtUserGetTitleBarInfo, ret=%u\n", retValue);
UserLeave();
- END_CLEANUP;
+ return retValue;
}
/*
@@ -5818,26 +5807,26 @@ NtUserDestroyMenu(
HMENU hMenu)
{
PMENU Menu;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserDestroyMenu\n");
UserEnterExclusive();
if(!(Menu = UserGetMenuObject(hMenu)))
{
- RETURN( FALSE);
+ goto Exit;
}
if (Menu->head.rpdesk != gptiCurrent->rpdesk)
{
EngSetLastError(ERROR_ACCESS_DENIED);
- RETURN( FALSE);
+ goto Exit;
}
- RETURN( IntDestroyMenuObject(Menu, TRUE));
+ Ret = IntDestroyMenuObject(Menu, TRUE);
-CLEANUP:
- TRACE("Leave NtUserDestroyMenu, ret=%i\n",_ret_);
+Exit:
+ TRACE("Leave NtUserDestroyMenu, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -5850,22 +5839,20 @@ NtUserEnableMenuItem(
UINT uEnable)
{
PMENU Menu;
- DECLARE_RETURN(UINT);
+ UINT Ret = (UINT)-1;
TRACE("Enter NtUserEnableMenuItem\n");
UserEnterExclusive();
- if(!(Menu = UserGetMenuObject(hMenu)))
+ Menu = UserGetMenuObject(hMenu);
+ if (Menu)
{
- RETURN(-1);
+ Ret = IntEnableMenuItem(Menu, uIDEnableItem, uEnable);
}
- RETURN( IntEnableMenuItem(Menu, uIDEnableItem, uEnable));
-
-CLEANUP:
- TRACE("Leave NtUserEnableMenuItem, ret=%u\n",_ret_);
+ TRACE("Leave NtUserEnableMenuItem, ret=%u\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -5911,12 +5898,11 @@ NtUserGetMenuBarInfo(
PWND pWnd;
HMENU hMenu;
MENUBARINFO kmbi;
- BOOL Ret;
+ BOOL Ret = FALSE;
PPOPUPMENU pPopupMenu;
USER_REFERENCE_ENTRY Ref;
NTSTATUS Status = STATUS_SUCCESS;
PMENU Menu = NULL;
- DECLARE_RETURN(BOOL);
TRACE("Enter NtUserGetMenuBarInfo\n");
UserEnterShared();
@@ -5924,7 +5910,7 @@ NtUserGetMenuBarInfo(
if (!(pWnd = UserGetWindowObject(hwnd)))
{
EngSetLastError(ERROR_INVALID_WINDOW_HANDLE);
- RETURN(FALSE);
+ goto Cleanup;
}
UserRefObjectCo(pWnd, &Ref);
@@ -5939,12 +5925,12 @@ NtUserGetMenuBarInfo(
{
case OBJID_CLIENT:
if (!pWnd->pcls->fnid)
- RETURN(FALSE);
+ goto Cleanup;
if (pWnd->pcls->fnid != FNID_MENU)
{
WARN("called on invalid window: %u\n", pWnd->pcls->fnid);
EngSetLastError(ERROR_INVALID_MENU_HANDLE);
- RETURN(FALSE);
+ goto Cleanup;
}
// Windows does this! Wine checks for Atom and uses GetWindowLongPtrW.
hMenu = (HMENU)co_IntSendMessage(hwnd, MN_GETHMENU, 0, 0);
@@ -5958,21 +5944,21 @@ NtUserGetMenuBarInfo(
}
break;
case OBJID_MENU:
- if (pWnd->style & WS_CHILD) RETURN(FALSE);
+ if (pWnd->style & WS_CHILD) goto Cleanup;
hMenu = UlongToHandle(pWnd->IDMenu);
TRACE("GMBI: OBJID_MENU hMenu %p\n",hMenu);
break;
case OBJID_SYSMENU:
- if (!(pWnd->style & WS_SYSMENU)) RETURN(FALSE);
+ if (!(pWnd->style & WS_SYSMENU)) goto Cleanup;
Menu = IntGetSystemMenu(pWnd, FALSE);
hMenu = UserHMGetHandle(Menu);
break;
default:
- RETURN(FALSE);
+ goto Cleanup;
}
if (!hMenu)
- RETURN(FALSE);
+ goto Cleanup;
_SEH2_TRY
{
@@ -5988,15 +5974,18 @@ NtUserGetMenuBarInfo(
if (kmbi.cbSize != sizeof(MENUBARINFO))
{
EngSetLastError(ERROR_INVALID_PARAMETER);
- RETURN(FALSE);
+ goto Cleanup;
}
- if (!Menu) Menu = UserGetMenuObject(hMenu);
if (!Menu)
- RETURN(FALSE);
+ {
+ Menu = UserGetMenuObject(hMenu);
+ if (!Menu)
+ goto Cleanup;
+ }
if ((idItem < 0) || ((ULONG)idItem > Menu->cItems))
- RETURN(FALSE);
+ goto Cleanup;
if (idItem == 0)
{
@@ -6041,16 +6030,17 @@ NtUserGetMenuBarInfo(
if (!NT_SUCCESS(Status))
{
SetLastNtError(Status);
- RETURN(FALSE);
+ Ret = FALSE;
+ goto Cleanup;
}
- RETURN(TRUE);
+ Ret = TRUE;
-CLEANUP:
+Cleanup:
if (pWnd) UserDerefObjectCo(pWnd);
- TRACE("Leave NtUserGetMenuBarInfo, ret=%i\n",_ret_);
+ TRACE("Leave NtUserGetMenuBarInfo, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6064,27 +6054,29 @@ NtUserGetMenuIndex(
PMENU Menu, SubMenu;
PITEM MenuItem;
UINT i;
- DECLARE_RETURN(UINT);
+ UINT Ret = 0xFFFFFFFF;
TRACE("Enter NtUserGetMenuIndex\n");
UserEnterShared();
if ( !(Menu = UserGetMenuObject(hMenu)) ||
!(SubMenu = UserGetMenuObject(hSubMenu)) )
- RETURN(0xFFFFFFFF);
+ goto Exit;
MenuItem = Menu->rgItems;
for (i = 0; i < Menu->cItems; i++, MenuItem++)
{
if (MenuItem->spSubMenu == SubMenu)
- RETURN(MenuItem->wID);
+ {
+ Ret = MenuItem->wID;
+ break;
+ }
}
- RETURN(0xFFFFFFFF);
-CLEANUP:
- TRACE("Leave NtUserGetMenuIndex, ret=%u\n",_ret_);
+Exit:
+ TRACE("Leave NtUserGetMenuIndex, ret=%u\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6103,14 +6095,14 @@ NtUserGetMenuItemRect(
PMENU Menu;
PITEM MenuItem;
NTSTATUS Status = STATUS_SUCCESS;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserGetMenuItemRect\n");
UserEnterShared();
if (!(Menu = UserGetMenuObject(hMenu)))
{
- RETURN(FALSE);
+ goto Exit;
}
if ((MenuItem = MENU_FindItem (&Menu, &uItem, MF_BYPOSITION)))
@@ -6121,16 +6113,16 @@ NtUserGetMenuItemRect(
Rect.bottom = MenuItem->cyItem;
}
else
- RETURN(FALSE);
+ goto Exit;
if(!hWnd)
{
hWnd = Menu->hWnd;
}
- if (lprcItem == NULL) RETURN( FALSE);
+ if (lprcItem == NULL) goto Exit;
- if (!(ReferenceWnd = UserGetWindowObject(hWnd))) RETURN( FALSE);
+ if (!(ReferenceWnd = UserGetWindowObject(hWnd))) goto Exit;
if (Menu->fFlags & MNF_POPUP)
{
@@ -6161,14 +6153,14 @@ NtUserGetMenuItemRect(
if (!NT_SUCCESS(Status))
{
SetLastNtError(Status);
- RETURN(FALSE);
+ goto Exit;
}
- RETURN(TRUE);
+ Ret = TRUE;
-CLEANUP:
- TRACE("Leave NtUserGetMenuItemRect, ret=%i\n",_ret_);
+Exit:
+ TRACE("Leave NtUserGetMenuItemRect, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6183,7 +6175,7 @@ NtUserHiliteMenuItem(
{
PMENU Menu;
PWND Window;
- DECLARE_RETURN(BOOLEAN);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserHiliteMenuItem\n");
UserEnterExclusive();
@@ -6191,21 +6183,21 @@ NtUserHiliteMenuItem(
if(!(Window = UserGetWindowObject(hWnd)))
{
EngSetLastError(ERROR_INVALID_WINDOW_HANDLE);
- RETURN(FALSE);
+ goto Exit;
}
if(!(Menu = UserGetMenuObject(hMenu)))
{
EngSetLastError(ERROR_INVALID_MENU_HANDLE);
- RETURN(FALSE);
+ goto Exit;
}
- RETURN( IntHiliteMenuItem(Window, Menu, uItemHilite, uHilite));
+ Ret = IntHiliteMenuItem(Window, Menu, uItemHilite, uHilite);
-CLEANUP:
- TRACE("Leave NtUserHiliteMenuItem, ret=%u\n",_ret_);
+Exit:
+ TRACE("Leave NtUserHiliteMenuItem, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6224,7 +6216,7 @@ NtUserDrawMenuBarTemp(
PWND Window;
RECT Rect;
NTSTATUS Status = STATUS_SUCCESS;
- DECLARE_RETURN(DWORD);
+ DWORD Ret = 0;
ERR("Enter NtUserDrawMenuBarTemp\n");
UserEnterExclusive();
@@ -6232,13 +6224,13 @@ NtUserDrawMenuBarTemp(
if(!(Window = UserGetWindowObject(hWnd)))
{
EngSetLastError(ERROR_INVALID_WINDOW_HANDLE);
- RETURN(0);
+ goto Exit;
}
if(!(Menu = UserGetMenuObject(hMenu)))
{
EngSetLastError(ERROR_INVALID_MENU_HANDLE);
- RETURN(0);
+ goto Exit;
}
_SEH2_TRY
@@ -6255,15 +6247,15 @@ NtUserDrawMenuBarTemp(
if (Status != STATUS_SUCCESS)
{
SetLastNtError(Status);
- RETURN(0);
+ goto Exit;
}
- RETURN( IntDrawMenuBarTemp(Window, hDC, &Rect, Menu, hFont));
+ Ret = IntDrawMenuBarTemp(Window, hDC, &Rect, Menu, hFont);
-CLEANUP:
- ERR("Leave NtUserDrawMenuBarTemp, ret=%u\n",_ret_);
+Exit:
+ ERR("Leave NtUserDrawMenuBarTemp, ret=%lu\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6280,19 +6272,19 @@ NtUserMenuItemFromPoint(
PWND Window = NULL;
PITEM mi;
ULONG i;
- DECLARE_RETURN(int);
+ int Ret = -1;
TRACE("Enter NtUserMenuItemFromPoint\n");
UserEnterExclusive();
if (!(Menu = UserGetMenuObject(hMenu)))
{
- RETURN( -1);
+ goto Exit;
}
if (!(Window = UserGetWindowObject(Menu->hWnd)))
{
- RETURN( -1);
+ goto Exit;
}
X -= Window->rcWindow.left;
@@ -6316,12 +6308,12 @@ NtUserMenuItemFromPoint(
}
}
- RETURN( (mi ? i : NO_SELECTED_ITEM));
+ Ret = (mi ? i : NO_SELECTED_ITEM);
-CLEANUP:
- TRACE("Leave NtUserMenuItemFromPoint, ret=%i\n",_ret_);
+Exit:
+ TRACE("Leave NtUserMenuItemFromPoint, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
@@ -6370,23 +6362,20 @@ NtUserRemoveMenu(
UINT uFlags)
{
PMENU Menu;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserRemoveMenu\n");
UserEnterExclusive();
- if(!(Menu = UserGetMenuObject(hMenu)))
+ Menu = UserGetMenuObject(hMenu);
+ if (Menu)
{
- RETURN( FALSE);
+ Ret = IntRemoveMenuItem(Menu, uPosition, uFlags, FALSE);
}
- RETURN(IntRemoveMenuItem(Menu, uPosition, uFlags, FALSE));
-
-CLEANUP:
- TRACE("Leave NtUserRemoveMenu, ret=%i\n",_ret_);
+ TRACE("Leave NtUserRemoveMenu, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
-
+ return Ret;
}
/*
@@ -6400,19 +6389,19 @@ NtUserSetMenu(
{
PWND Window;
BOOL Changed;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserSetMenu\n");
UserEnterExclusive();
if (!(Window = UserGetWindowObject(hWnd)))
{
- RETURN( FALSE);
+ goto Exit;
}
if (!IntSetMenu(Window, Menu, &Changed))
{
- RETURN( FALSE);
+ goto Exit;
}
// Not minimized and please repaint!!!
@@ -6424,12 +6413,12 @@ NtUserSetMenu(
UserDerefObjectCo(Window);
}
- RETURN( TRUE);
+ Ret = TRUE;
-CLEANUP:
- TRACE("Leave NtUserSetMenu, ret=%i\n",_ret_);
+Exit:
+ TRACE("Leave NtUserSetMenu, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6441,22 +6430,20 @@ NtUserSetMenuContextHelpId(
DWORD dwContextHelpId)
{
PMENU Menu;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserSetMenuContextHelpId\n");
UserEnterExclusive();
- if(!(Menu = UserGetMenuObject(hMenu)))
+ Menu = UserGetMenuObject(hMenu);
+ if (Menu)
{
- RETURN( FALSE);
+ Ret = IntSetMenuContextHelpId(Menu, dwContextHelpId);
}
- RETURN(IntSetMenuContextHelpId(Menu, dwContextHelpId));
-
-CLEANUP:
- TRACE("Leave NtUserSetMenuContextHelpId, ret=%i\n",_ret_);
+ TRACE("Leave NtUserSetMenuContextHelpId, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6469,22 +6456,20 @@ NtUserSetMenuDefaultItem(
UINT fByPos)
{
PMENU Menu;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserSetMenuDefaultItem\n");
UserEnterExclusive();
- if(!(Menu = UserGetMenuObject(hMenu)))
+ Menu = UserGetMenuObject(hMenu);
+ if (Menu)
{
- RETURN( FALSE);
+ Ret = UserSetMenuDefaultItem(Menu, uItem, fByPos);
}
- RETURN( UserSetMenuDefaultItem(Menu, uItem, fByPos));
-
-CLEANUP:
- TRACE("Leave NtUserSetMenuDefaultItem, ret=%i\n",_ret_);
+ TRACE("Leave NtUserSetMenuDefaultItem, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6495,22 +6480,20 @@ NtUserSetMenuFlagRtoL(
HMENU hMenu)
{
PMENU Menu;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserSetMenuFlagRtoL\n");
UserEnterExclusive();
- if(!(Menu = UserGetMenuObject(hMenu)))
+ Menu = UserGetMenuObject(hMenu);
+ if (Menu)
{
- RETURN( FALSE);
+ Ret = IntSetMenuFlagRtoL(Menu);
}
- RETURN(IntSetMenuFlagRtoL(Menu));
-
-CLEANUP:
- TRACE("Leave NtUserSetMenuFlagRtoL, ret=%i\n",_ret_);
+ TRACE("Leave NtUserSetMenuFlagRtoL, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6522,22 +6505,20 @@ NtUserThunkedMenuInfo(
LPCMENUINFO lpcmi)
{
PMENU Menu;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserThunkedMenuInfo\n");
UserEnterExclusive();
- if (!(Menu = UserGetMenuObject(hMenu)))
+ Menu = UserGetMenuObject(hMenu);
+ if (Menu)
{
- RETURN(FALSE);
+ Ret = UserMenuInfo(Menu, (PROSMENUINFO)lpcmi, TRUE);
}
- RETURN(UserMenuInfo(Menu, (PROSMENUINFO)lpcmi, TRUE));
-
-CLEANUP:
- TRACE("Leave NtUserThunkedMenuInfo, ret=%i\n",_ret_);
+ TRACE("Leave NtUserThunkedMenuInfo, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
@@ -6555,7 +6536,7 @@ NtUserThunkedMenuItemInfo(
PMENU Menu;
NTSTATUS Status;
UNICODE_STRING lstrCaption;
- DECLARE_RETURN(BOOL);
+ BOOL Ret = FALSE;
TRACE("Enter NtUserThunkedMenuItemInfo\n");
UserEnterExclusive();
@@ -6567,7 +6548,7 @@ NtUserThunkedMenuItemInfo(
if (!(Menu = UserGetMenuObject(hMenu)))
{
- RETURN(FALSE);
+ goto Cleanup;
}
/* Check if we got a Caption */
@@ -6581,23 +6562,27 @@ NtUserThunkedMenuItemInfo(
{
ERR("Failed to capture MenuItem Caption (status 0x%08x)\n",Status);
SetLastNtError(Status);
- RETURN(FALSE);
+ goto Cleanup;
}
}
- if (bInsert) RETURN( UserInsertMenuItem(Menu, uItem, fByPosition, lpmii, &lstrCaption));
+ if (bInsert)
+ {
+ Ret = UserInsertMenuItem(Menu, uItem, fByPosition, lpmii, &lstrCaption);
+ goto Cleanup;
+ }
- RETURN( UserMenuItemInfo(Menu, uItem, fByPosition, (PROSMENUITEMINFO)lpmii, TRUE, &lstrCaption));
+ Ret = UserMenuItemInfo(Menu, uItem, fByPosition, (PROSMENUITEMINFO)lpmii, TRUE, &lstrCaption);
-CLEANUP:
+Cleanup:
if (lstrCaption.Buffer)
{
ReleaseCapturedUnicodeString(&lstrCaption, UserMode);
}
- TRACE("Leave NtUserThunkedMenuItemInfo, ret=%i\n",_ret_);
+ TRACE("Leave NtUserThunkedMenuItemInfo, ret=%i\n", Ret);
UserLeave();
- END_CLEANUP;
+ return Ret;
}
/*
1
0
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6274fdde1670dff87fac…
commit b6274fdde1670dff87fac2e6f1971b86d8b27d4f
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Dec 18 12:37:50 2023 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Dec 18 12:37:50 2023 +0900
[SHIMGVW] Unlock file (#6181)
- Add m_pMemStream to PREVIEW_DATA structure.
- Add Preview_pFreeImage helper function.
- Add MemStreamFromFile helper function to make
a memory stream.
- Avoid file locking by using a memory stream and
GdipLoadImageFromStream.
CORE-19183
---
dll/win32/shimgvw/shimgvw.c | 97 ++++++++++++++++++++++++++++++---------------
1 file changed, 66 insertions(+), 31 deletions(-)
diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c
index 0503449d87c..7cedfc1afde 100644
--- a/dll/win32/shimgvw/shimgvw.c
+++ b/dll/win32/shimgvw/shimgvw.c
@@ -105,6 +105,7 @@ typedef struct tagPREVIEW_DATA
INT m_yScrollOffset;
UINT m_nMouseDownMsg;
POINT m_ptOrigin;
+ IStream *m_pMemStream;
} PREVIEW_DATA, *PPREVIEW_DATA;
static inline PPREVIEW_DATA
@@ -328,7 +329,7 @@ Preview_UpdateTitle(PPREVIEW_DATA pData, LPCWSTR FileName)
}
static VOID
-Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName)
+Preview_pFreeImage(PPREVIEW_DATA pData)
{
Anime_FreeInfo(&pData->m_Anime);
@@ -338,6 +339,51 @@ Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName)
g_pImage = NULL;
}
+ if (pData->m_pMemStream)
+ {
+ pData->m_pMemStream->lpVtbl->Release(pData->m_pMemStream);
+ pData->m_pMemStream = NULL;
+ }
+}
+
+IStream* MemStreamFromFile(LPCWSTR pszFileName)
+{
+ HANDLE hFile;
+ DWORD dwFileSize, dwRead;
+ LPBYTE pbMemFile = NULL;
+ IStream *pStream;
+
+ hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL,
+ OPEN_EXISTING, 0, NULL);
+ if (hFile == INVALID_HANDLE_VALUE)
+ return NULL;
+
+ dwFileSize = GetFileSize(hFile, NULL);
+ pbMemFile = QuickAlloc(dwFileSize, FALSE);
+ if (!dwFileSize || (dwFileSize == INVALID_FILE_SIZE) || !pbMemFile)
+ {
+ CloseHandle(hFile);
+ return NULL;
+ }
+
+ if (!ReadFile(hFile, pbMemFile, dwFileSize, &dwRead, NULL) || (dwRead != dwFileSize))
+ {
+ QuickFree(pbMemFile);
+ CloseHandle(hFile);
+ return NULL;
+ }
+
+ CloseHandle(hFile);
+ pStream = SHCreateMemStream(pbMemFile, dwFileSize);
+ QuickFree(pbMemFile);
+ return pStream;
+}
+
+static VOID
+Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName)
+{
+ Preview_pFreeImage(pData);
+
/* check file presence */
if (!szOpenFileName || GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF)
{
@@ -346,11 +392,21 @@ Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName)
return;
}
- /* load now */
- GdipLoadImageFromFile(szOpenFileName, &g_pImage);
+ pData->m_pMemStream = MemStreamFromFile(szOpenFileName);
+ if (!pData->m_pMemStream)
+ {
+ DPRINT1("MemStreamFromFile() failed\n");
+ Preview_UpdateTitle(pData, NULL);
+ return;
+ }
+
+ /* NOTE: GdipLoadImageFromFile locks the file.
+ Avoid file locking by using GdipLoadImageFromStream and memory stream. */
+ GdipLoadImageFromStream(pData->m_pMemStream, &g_pImage);
if (!g_pImage)
{
- DPRINT1("GdipLoadImageFromFile() failed\n");
+ DPRINT1("GdipLoadImageFromStream() failed\n");
+ Preview_pFreeImage(pData);
Preview_UpdateTitle(pData, NULL);
return;
}
@@ -1221,21 +1277,12 @@ Preview_Delete(PPREVIEW_DATA pData)
GetFullPathNameW(g_pCurrentFile->Next->FileName, _countof(szNextFile), szNextFile, NULL);
szNextFile[_countof(szNextFile) - 1] = UNICODE_NULL; /* Avoid buffer overrun */
- /* FIXME: Our GdipLoadImageFromFile locks the image file */
- if (g_pImage)
- {
- GdipDisposeImage(g_pImage);
- g_pImage = NULL;
- }
-
/* Confirm file deletion and delete if allowed */
FileOp.pFrom = szCurFile;
FileOp.fFlags = FOF_ALLOWUNDO;
if (SHFileOperationW(&FileOp) != 0)
{
DPRINT("Preview_Delete: SHFileOperationW() failed or canceled\n");
-
- Preview_pLoadImage(pData, szCurFile);
return;
}
@@ -1254,14 +1301,6 @@ Preview_Edit(HWND hwnd)
if (!g_pCurrentFile)
return;
- /* Avoid file locking */
- /* FIXME: Our GdipLoadImageFromFile locks the image file */
- if (g_pImage)
- {
- GdipDisposeImage(g_pImage);
- g_pImage = NULL;
- }
-
GetFullPathNameW(g_pCurrentFile->FileName, _countof(szPathName), szPathName, NULL);
szPathName[_countof(szPathName) - 1] = UNICODE_NULL; /* Avoid buffer overrun */
@@ -1274,9 +1313,11 @@ Preview_Edit(HWND hwnd)
{
DPRINT1("Preview_Edit: ShellExecuteExW() failed with code %ld\n", GetLastError());
}
-
- // Destroy the window to quit the application
- DestroyWindow(hwnd);
+ else
+ {
+ // Destroy the window to quit the application
+ DestroyWindow(hwnd);
+ }
}
static VOID
@@ -1435,13 +1476,7 @@ Preview_OnDestroy(HWND hwnd)
pFreeFileList(g_pCurrentFile);
g_pCurrentFile = NULL;
- if (g_pImage)
- {
- GdipDisposeImage(g_pImage);
- g_pImage = NULL;
- }
-
- Anime_FreeInfo(&pData->m_Anime);
+ Preview_pFreeImage(pData);
SetWindowLongPtrW(pData->m_hwndZoom, GWLP_USERDATA, 0);
DestroyWindow(pData->m_hwndZoom);
1
0
17 Dec '23
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8f9564c2079203d3e029…
commit e8f9564c2079203d3e0291cbe8889e2a935b7d1b
Author: Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Fri Dec 8 00:18:57 2023 +0100
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Dec 17 22:28:40 2023 +0100
[NTDLL_APITEST] Add test for RtlGetProcessHeaps
---
modules/rostests/apitests/ntdll/CMakeLists.txt | 1 +
.../rostests/apitests/ntdll/RtlGetProcessHeaps.c | 48 ++++++++++++++++++++++
modules/rostests/apitests/ntdll/testlist.c | 2 +
3 files changed, 51 insertions(+)
diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt
index f48d4e53dec..abda236e613 100644
--- a/modules/rostests/apitests/ntdll/CMakeLists.txt
+++ b/modules/rostests/apitests/ntdll/CMakeLists.txt
@@ -79,6 +79,7 @@ list(APPEND SOURCE
RtlGetLengthWithoutTrailingPathSeperators.c
RtlGetLongestNtPathLength.c
RtlGetNtProductType.c
+ RtlGetProcessHeaps.c
RtlGetUnloadEventTrace.c
RtlHandle.c
RtlImageDirectoryEntryToData.c
diff --git a/modules/rostests/apitests/ntdll/RtlGetProcessHeaps.c b/modules/rostests/apitests/ntdll/RtlGetProcessHeaps.c
new file mode 100644
index 00000000000..25b1959a41d
--- /dev/null
+++ b/modules/rostests/apitests/ntdll/RtlGetProcessHeaps.c
@@ -0,0 +1,48 @@
+/*
+ * PROJECT: ReactOS api tests
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
+ * PURPOSE: Test for RtlGetProcessHeaps
+ * COPYRIGHT: Copyright 2023 Mark Jansen <mark.jansen(a)reactos.org>
+ */
+
+#include "precomp.h"
+
+START_TEST(RtlGetProcessHeaps)
+{
+ HANDLE HeapArray[40] = {0};
+ ULONG MaxHeapArraySize = _countof(HeapArray);
+
+ // Can call it with NULL
+ ULONG InitialNumHeaps = RtlGetProcessHeaps(0, NULL);
+ ok(InitialNumHeaps > 0, "Expected at least one heap\n");
+ ok(InitialNumHeaps < MaxHeapArraySize, "Expected less heaps, got %lu\n", InitialNumHeaps);
+
+ // Grab all heaps
+ ULONG NumHeaps = RtlGetProcessHeaps(MaxHeapArraySize, HeapArray);
+ ok_eq_ulong(NumHeaps, InitialNumHeaps);
+ for (ULONG n = 0; n < min(NumHeaps, MaxHeapArraySize); ++n)
+ {
+ ok(HeapArray[n] != NULL, "Heap[%lu] == NULL\n", n);
+ }
+
+ PVOID HeapPtr = RtlCreateHeap(HEAP_GROWABLE, NULL, 0, 0x10000, NULL, NULL);
+
+ memset(HeapArray, 0, sizeof(HeapArray));
+ NumHeaps = RtlGetProcessHeaps(MaxHeapArraySize, HeapArray);
+ ok_eq_ulong(InitialNumHeaps + 1, NumHeaps);
+ if (NumHeaps > 0 && NumHeaps <= MaxHeapArraySize)
+ {
+ // A new heap is added at the end
+ ok_ptr(HeapArray[NumHeaps - 1], HeapPtr);
+ }
+
+ RtlDestroyHeap(HeapPtr);
+
+ // Just ask for one heap, the number of heaps available is returned, but only one heap ptr filled!
+ memset(HeapArray, 0xff, sizeof(HeapArray));
+ NumHeaps = RtlGetProcessHeaps(1, HeapArray);
+ ok_eq_ulong(NumHeaps, InitialNumHeaps);
+
+ ok_ptr(HeapArray[0], RtlGetProcessHeap()); // First item is the process heap
+ ok_ptr(HeapArray[1], INVALID_HANDLE_VALUE); // Next item is not touched!
+}
diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c
index 6d22f349692..a34b06f12d7 100644
--- a/modules/rostests/apitests/ntdll/testlist.c
+++ b/modules/rostests/apitests/ntdll/testlist.c
@@ -76,6 +76,7 @@ extern void func_RtlGetLengthWithoutLastFullDosOrNtPathElement(void);
extern void func_RtlGetLengthWithoutTrailingPathSeperators(void);
extern void func_RtlGetLongestNtPathLength(void);
extern void func_RtlGetNtProductType(void);
+extern void func_RtlGetProcessHeaps(void);
extern void func_RtlGetUnloadEventTrace(void);
extern void func_RtlHandle(void);
extern void func_RtlImageDirectoryEntryToData(void);
@@ -175,6 +176,7 @@ const struct test winetest_testlist[] =
{ "RtlGetLengthWithoutTrailingPathSeperators", func_RtlGetLengthWithoutTrailingPathSeperators },
{ "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength },
{ "RtlGetNtProductType", func_RtlGetNtProductType },
+ { "RtlGetProcessHeaps", func_RtlGetProcessHeaps },
{ "RtlGetUnloadEventTrace", func_RtlGetUnloadEventTrace },
{ "RtlHandle", func_RtlHandle },
{ "RtlImageDirectoryEntryToData", func_RtlImageDirectoryEntryToData },
1
0