Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 01/01: [SDK][INCLUDE] Fix and improve comctl32_undoc.h
by Katayama Hirofumi MZ 13 Feb '20

13 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fc87dacdb653b6475381… commit 9fc87dacdb653b647538180a32002117389b36dc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 13 09:16:59 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Feb 13 09:16:59 2020 +0900 [SDK][INCLUDE] Fix and improve comctl32_undoc.h --- dll/win32/shell32/COpenWithMenu.cpp | 6 +- sdk/include/reactos/comctl32_undoc.h | 124 ++++++++++++++++++++++++++--------- 2 files changed, 95 insertions(+), 35 deletions(-) diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index 6ccc664afc9..e9dd8018e35 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -427,12 +427,12 @@ BOOL COpenWithList::LoadProgIdList(HKEY hKey, LPCWSTR pwszExt) HANDLE COpenWithList::OpenMRUList(HKEY hKey) { - CREATEMRULISTW Info; + MRUINFOW Info; /* Initialize mru list info */ Info.cbSize = sizeof(Info); - Info.nMaxItems = 32; - Info.dwFlags = MRU_STRING; + Info.uMax = 32; + Info.fFlags = MRU_STRING; Info.hKey = hKey; Info.lpszSubKey = L"OpenWithList"; Info.lpfnCompare = NULL; diff --git a/sdk/include/reactos/comctl32_undoc.h b/sdk/include/reactos/comctl32_undoc.h index a9349c6142d..49d68006ab9 100644 --- a/sdk/include/reactos/comctl32_undoc.h +++ b/sdk/include/reactos/comctl32_undoc.h @@ -3,6 +3,7 @@ * * Copyright 2009 Andrew Hill <ash77 at domain reactos.org> * Copyright 2013 Dominik Hornung + * Copyright 2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,61 +23,120 @@ #ifndef __COMCTL32_UNDOC__H #define __COMCTL32_UNDOC__H +/* + * See also: + * https://docs.microsoft.com/en-us/windows/win32/shell/mruinfo + */ + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ -typedef struct tagCREATEMRULISTA +typedef INT (CALLBACK *MRUCMPPROCA)(LPCSTR, LPCSTR); +typedef INT (CALLBACK *MRUCMPPROCW)(LPCWSTR, LPCWSTR); +typedef INT (CALLBACK *MRUBINARYCMPPROC)(LPCVOID, LPCVOID); + +typedef struct _MRUINFOA { DWORD cbSize; - DWORD nMaxItems; - DWORD dwFlags; + DWORD uMax; + DWORD fFlags; HKEY hKey; LPCSTR lpszSubKey; - PROC lpfnCompare; -} CREATEMRULISTA, *LPCREATEMRULISTA; -typedef struct tagCREATEMRULISTW + MRUCMPPROCA lpfnCompare; +} MRUINFOA, *LPMRUINFOA; +typedef struct _MRUINFOW { DWORD cbSize; - DWORD nMaxItems; - DWORD dwFlags; + DWORD uMax; + DWORD fFlags; HKEY hKey; LPCWSTR lpszSubKey; - PROC lpfnCompare; -} CREATEMRULISTW, *LPCREATEMRULISTW; + MRUCMPPROCW lpfnCompare; +} MRUINFOW, *LPMRUINFOW; + +#ifdef UNICODE + #define MRUINFO MRUINFOW + #define LPMRUINFO LPMRUINFOW +#else + #define MRUINFO MRUINFOA + #define LPMRUINFO LPMRUINFOA +#endif -#define MRU_STRING 0x0 -#define MRU_BINARY 0x1 -#define MRU_CACHEWRITE 0x2 +/* MRUINFO.fFlags */ +#define MRU_STRING 0x0 +#define MRU_BINARY 0x1 +#define MRU_CACHEWRITE 0x2 -HANDLE WINAPI CreateMRUListW(LPCREATEMRULISTW); -HANDLE WINAPI CreateMRUListA(LPCREATEMRULISTA); -INT WINAPI AddMRUData(HANDLE,LPCVOID,DWORD); -INT WINAPI FindMRUData(HANDLE,LPCVOID,DWORD,LPINT); -VOID WINAPI FreeMRUList(HANDLE); +#ifndef NO_MRU_IMPORTS -INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString); +HANDLE WINAPI CreateMRUListA(LPMRUINFOA); +HANDLE WINAPI CreateMRUListW(LPMRUINFOW); +HANDLE WINAPI CreateMRUListLazyW(const MRUINFOW *lpcml, DWORD dwParam2, + DWORD dwParam3, DWORD dwParam4); +HANDLE WINAPI CreateMRUListLazyA(const MRUINFOA *lpcml, DWORD dwParam2, + DWORD dwParam3, DWORD dwParam4); +INT WINAPI AddMRUData(HANDLE, LPCVOID, DWORD); INT WINAPI AddMRUStringA(HANDLE hList, LPCSTR lpszString); -BOOL WINAPI DelMRUString(HANDLE hList, INT nItemPos); +INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString); +INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer, + DWORD nBufferSize); +INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, LPVOID lpBuffer, + DWORD nBufferSize); +INT WINAPI FindMRUData(HANDLE,LPCVOID,DWORD,LPINT); INT WINAPI FindMRUStringW(HANDLE hList, LPCWSTR lpszString, LPINT lpRegNum); INT WINAPI FindMRUStringA(HANDLE hList, LPCSTR lpszString, LPINT lpRegNum); -HANDLE WINAPI CreateMRUListLazyW(const CREATEMRULISTW *lpcml, DWORD dwParam2, - DWORD dwParam3, DWORD dwParam4); -HANDLE WINAPI CreateMRUListLazyA(const CREATEMRULISTA *lpcml, DWORD dwParam2, - DWORD dwParam3, DWORD dwParam4); -INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, LPVOID lpBuffer, - DWORD nBufferSize); -INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer, - DWORD nBufferSize); +BOOL WINAPI DelMRUString(HANDLE hList, INT nItemPos); +VOID WINAPI FreeMRUList(HANDLE); #ifdef UNICODE -typedef CREATEMRULISTW CREATEMRULIST, *PCREATEMRULIST; -#define CreateMRUList CreateMRUListW + #define CreateMRUList CreateMRUListW + #define CreateMRUListLazy CreateMRUListLazyW + #define AddMRUString AddMRUStringW + #define EnumMRUList EnumMRUListW + #define FindMRUString FindMRUStringW #else -typedef CREATEMRULISTA CREATEMRULIST, *PCREATEMRULIST; -#define CreateMRUList CreateMRUListA + #define CreateMRUList CreateMRUListA + #define CreateMRUListLazy CreateMRUListLazyA + #define AddMRUString AddMRUStringA + #define EnumMRUList EnumMRUListA + #define FindMRUString FindMRUStringA #endif +#endif /* ndef NO_MRU_IMPORTS */ + +typedef HANDLE (WINAPI *FN_CreateMRUListA)(const MRUINFOA *); +typedef HANDLE (WINAPI *FN_CreateMRUListW)(const MRUINFOW *); +typedef HANDLE (WINAPI *FN_CreateMRUListLazyA)(const MRUINFOA *, DWORD, DWORD, DWORD); +typedef HANDLE (WINAPI *FN_CreateMRUListLazyW)(const MRUINFOW *, DWORD, DWORD, DWORD); +typedef INT (WINAPI *FN_AddMRUStringA)(HANDLE, LPCSTR); +typedef INT (WINAPI *FN_AddMRUStringW)(HANDLE, LPCWSTR); +typedef INT (WINAPI *FN_AddMRUData)(HANDLE, LPCVOID, DWORD); +typedef INT (WINAPI *FN_EnumMRUListA)(HANDLE, INT, LPVOID, DWORD); +typedef INT (WINAPI *FN_EnumMRUListW)(HANDLE, INT, LPVOID, DWORD); +typedef INT (WINAPI *FN_FindMRUData)(HANDLE, LPCVOID, DWORD, LPINT); +typedef INT (WINAPI *FN_FindMRUStringA)(HANDLE, LPCSTR, LPINT); +typedef INT (WINAPI *FN_FindMRUStringW)(HANDLE, LPCWSTR, LPINT); +typedef BOOL (WINAPI *FN_DelMRUString)(HANDLE, INT); +typedef INT (WINAPI *FN_FreeMRUList)(HANDLE); + +#define I_CreateMRUListA 151 +#define I_CreateMRUListW 400 +#define I_CreateMRUListLazyA 157 +#define I_CreateMRUListLazyW 404 +#define I_AddMRUStringA 153 +#define I_AddMRUStringW 401 +#define I_AddMRUData 167 +#define I_EnumMRUListA 154 +#define I_EnumMRUListW 403 +#define I_FindMRUData 169 +#define I_FindMRUStringA 155 +#define I_FindMRUStringW 402 +#define I_DelMRUString 156 +#define I_FreeMRUList 152 + +// #define GET_PROC(hComCtl32, fn) fn = (FN_##fn)GetProcAddress((hComCtl32), I_##fn) + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

[reactos] 01/01: Fix build
by Colin Finck 12 Feb '20

12 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8da7fbc704448a03610a5… commit 8da7fbc704448a03610a5497a88f9dfada8be644 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Feb 12 19:59:23 2020 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Wed Feb 12 19:59:23 2020 +0100 Fix build --- win32ss/printing/base/winspool/precomp.h | 1 + win32ss/printing/base/winspool/utils.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/printing/base/winspool/precomp.h b/win32ss/printing/base/winspool/precomp.h index 2c8fe18bbd9..cae8bd320e8 100644 --- a/win32ss/printing/base/winspool/precomp.h +++ b/win32ss/printing/base/winspool/precomp.h @@ -17,6 +17,7 @@ #include <winspool_c.h> #include <winddiui.h> #include <ndk/rtlfuncs.h> +#include <strsafe.h> #include <spoolss.h> #include <marshalling/marshalling.h> diff --git a/win32ss/printing/base/winspool/utils.c b/win32ss/printing/base/winspool/utils.c index 0ba5e274a5d..ae190ed5108 100644 --- a/win32ss/printing/base/winspool/utils.c +++ b/win32ss/printing/base/winspool/utils.c @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2020 Doug Lyons (douglyons(a)douglyons.com) */ -#include <strsafe.h> +#include "precomp.h" BOOL UnicodeToAnsiInPlace(PWSTR pwszField) {

1 0

[reactos] 01/01: [WINSPOOL] Implement GetPrinterDriverA and a helper function UnicodeToAnsiInPlace (#2317)
by Doug Lyons 12 Feb '20

12 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d90beaeed268639854868… commit d90beaeed26863985486874aaa2a1c3422fd6d9f Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Feb 12 12:52:34 2020 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 12 19:52:34 2020 +0100 [WINSPOOL] Implement GetPrinterDriverA and a helper function UnicodeToAnsiInPlace (#2317) --- win32ss/printing/base/winspool/CMakeLists.txt | 1 + win32ss/printing/base/winspool/precomp.h | 3 + win32ss/printing/base/winspool/printers.c | 229 +++++++++++++++++++++++++- win32ss/printing/base/winspool/utils.c | 55 +++++++ 4 files changed, 284 insertions(+), 4 deletions(-) diff --git a/win32ss/printing/base/winspool/CMakeLists.txt b/win32ss/printing/base/winspool/CMakeLists.txt index 9081819dd24..34c30263522 100644 --- a/win32ss/printing/base/winspool/CMakeLists.txt +++ b/win32ss/printing/base/winspool/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE printers.c printprocessors.c printproviders.c + utils.c ${CMAKE_CURRENT_BINARY_DIR}/winspool_c.c) add_library(winspool MODULE diff --git a/win32ss/printing/base/winspool/precomp.h b/win32ss/printing/base/winspool/precomp.h index 033b38d1b4c..2c8fe18bbd9 100644 --- a/win32ss/printing/base/winspool/precomp.h +++ b/win32ss/printing/base/winspool/precomp.h @@ -40,4 +40,7 @@ SPOOLER_HANDLE, *PSPOOLER_HANDLE; // main.c extern HANDLE hProcessHeap; +// utils.c +extern BOOL UnicodeToAnsiInPlace(PWSTR pwszField); + #endif diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index e8a6da62db7..f6616068442 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -1490,10 +1490,231 @@ Cleanup: BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) -{ - ERR("GetPrinterDriverA(%p, %s, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); - if (pcbNeeded) *pcbNeeded = 0; - return FALSE; +{ + /* + * We are mapping multiple different pointers to the same pDriverInfo pointer here so that + * we can use the same incoming pointer for different Levels + */ + PDRIVER_INFO_1W pdi1w = (PDRIVER_INFO_1W)pDriverInfo; + PDRIVER_INFO_2W pdi2w = (PDRIVER_INFO_2W)pDriverInfo; + PDRIVER_INFO_3W pdi3w = (PDRIVER_INFO_3W)pDriverInfo; + PDRIVER_INFO_4W pdi4w = (PDRIVER_INFO_4W)pDriverInfo; + PDRIVER_INFO_5W pdi5w = (PDRIVER_INFO_5W)pDriverInfo; + PDRIVER_INFO_6W pdi6w = (PDRIVER_INFO_6W)pDriverInfo; + + BOOL bReturnValue = FALSE; + DWORD cch; + PWSTR pwszEnvironment = NULL; + + TRACE("GetPrinterDriverA(%p, %s, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + + // Check for invalid levels here for early error return. Should be 1-6. + if (Level < 1 || Level > 6) + { + SetLastError(ERROR_INVALID_LEVEL); + ERR("Invalid Level!\n"); + goto Exit; + } + + if (pEnvironment) + { + // Convert pEnvironment to a Unicode string pwszEnvironment. + cch = strlen(pEnvironment); + + pwszEnvironment = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); + if (!pwszEnvironment) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + goto Exit; + } + + MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, pwszEnvironment, cch + 1); + } + + bReturnValue = GetPrinterDriverW(hPrinter, pwszEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + TRACE("*pcbNeeded is '%d' and bReturnValue is '%d' and GetLastError is '%ld'.\n", *pcbNeeded, bReturnValue, GetLastError()); + + if (pwszEnvironment) + { + HeapFree(hProcessHeap, 0, pwszEnvironment); + } + + if (!bReturnValue) + { + TRACE("GetPrinterDriverW failed!\n"); + goto Exit; + } + + // Do Unicode to ANSI conversions for strings based on Level + switch (Level) + { + case 1: + { + if (!UnicodeToAnsiInPlace(pdi1w->pName)) + goto Exit; + + break; + } + + case 2: + { + if (!UnicodeToAnsiInPlace(pdi2w->pName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi2w->pEnvironment)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi2w->pDriverPath)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi2w->pDataFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi2w->pConfigFile)) + goto Exit; + + break; + } + + case 3: + { + if (!UnicodeToAnsiInPlace(pdi3w->pName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi3w->pEnvironment)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi3w->pDriverPath)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi3w->pDataFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi3w->pConfigFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi3w->pHelpFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi3w->pDependentFiles)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi3w->pMonitorName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi3w->pDefaultDataType)) + goto Exit; + + break; + } + + case 4: + { + if (!UnicodeToAnsiInPlace(pdi4w->pName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pEnvironment)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pDriverPath)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pDataFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pConfigFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pHelpFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pDependentFiles)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pMonitorName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pDefaultDataType)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi4w->pszzPreviousNames)) + goto Exit; + + break; + } + + case 5: + { + if (!UnicodeToAnsiInPlace(pdi5w->pName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi5w->pEnvironment)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi5w->pDriverPath)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi5w->pDataFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi5w->pConfigFile)) + goto Exit; + + break; + } + + case 6: + { + if (!UnicodeToAnsiInPlace(pdi6w->pName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pEnvironment)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pDriverPath)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pDataFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pConfigFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pHelpFile)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pDependentFiles)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pMonitorName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pDefaultDataType)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pszzPreviousNames)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pszMfgName)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pszOEMUrl)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pszHardwareID)) + goto Exit; + + if (!UnicodeToAnsiInPlace(pdi6w->pszProvider)) + goto Exit; + } + } + + bReturnValue = TRUE; + +Exit: + + return bReturnValue; } BOOL WINAPI diff --git a/win32ss/printing/base/winspool/utils.c b/win32ss/printing/base/winspool/utils.c new file mode 100644 index 00000000000..0ba5e274a5d --- /dev/null +++ b/win32ss/printing/base/winspool/utils.c @@ -0,0 +1,55 @@ +/* +* PROJECT: ReactOS Spooler API +* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) +* PURPOSE: Utility Functions related to Print Processors +* COPYRIGHT: Copyright 2020 Doug Lyons (douglyons(a)douglyons.com) +*/ + +#include <strsafe.h> + +BOOL UnicodeToAnsiInPlace(PWSTR pwszField) +{ + /* + * This converts an incoming Unicode string to an ANSI string. + * It returns FALSE on failure, otherwise it returns TRUE. + * It is only useful for "in-place" conversions where the ANSI string goes + * back into the same place where the Unicode string came into this function. + * It seems that many of the functions involving printing can use this. + */ + + PSTR pszTemp; + DWORD cch; + + /* + * Map the incoming Unicode pwszField string to an ANSI one here so that we can do + * in-place conversion. We read the Unicode input and then we write back the ANSI + * conversion into the same buffer for use with our GetPrinterDriverA function + */ + PSTR pszField = (PSTR)pwszField; + + if (!pwszField) + { + return TRUE; + } + + cch = wcslen(pwszField); + if (cch == 0) + { + return TRUE; + } + + pszTemp = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); + if (!pszField) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("HeapAlloc failed!\n"); + return FALSE; // indicates a failure to be handled by caller + } + + WideCharToMultiByte(CP_ACP, 0, pwszField, -1, pszTemp, cch + 1, NULL, NULL); + StringCchCopyA(pszField, cch + 1, pszTemp); + + HeapFree(hProcessHeap, 0, pszTemp); + + return TRUE; +}

1 0

[reactos] 01/01: [SYSSETUP] Make Workstation default product option (#2332)
by Katayama Hirofumi MZ 12 Feb '20

12 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ef235e7cbad6c948c620… commit 3ef235e7cbad6c948c620c5a82cd959fe03e62ee Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 12 19:29:56 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 12 19:29:56 2020 +0900 [SYSSETUP] Make Workstation default product option (#2332) We set ReactOS Workstation as the default product option. That means we retargeted this project to Windows XP. Unattended Setup is supported. CORE-13795 --- dll/win32/syssetup/lang/bg-BG.rc | 6 +++--- dll/win32/syssetup/lang/cs-CZ.rc | 6 +++--- dll/win32/syssetup/lang/da-DK.rc | 6 +++--- dll/win32/syssetup/lang/de-DE.rc | 6 +++--- dll/win32/syssetup/lang/el-GR.rc | 6 +++--- dll/win32/syssetup/lang/en-US.rc | 6 +++--- dll/win32/syssetup/lang/es-ES.rc | 6 +++--- dll/win32/syssetup/lang/et-EE.rc | 6 +++--- dll/win32/syssetup/lang/fi-FI.rc | 6 +++--- dll/win32/syssetup/lang/fr-FR.rc | 6 +++--- dll/win32/syssetup/lang/he-IL.rc | 6 +++--- dll/win32/syssetup/lang/hi-IN.rc | 6 +++--- dll/win32/syssetup/lang/hu-HU.rc | 6 +++--- dll/win32/syssetup/lang/id-ID.rc | 6 +++--- dll/win32/syssetup/lang/it-IT.rc | 6 +++--- dll/win32/syssetup/lang/ja-JP.rc | 6 +++--- dll/win32/syssetup/lang/lt-LT.rc | 6 +++--- dll/win32/syssetup/lang/nl-NL.rc | 6 +++--- dll/win32/syssetup/lang/no-NO.rc | 6 +++--- dll/win32/syssetup/lang/pl-PL.rc | 6 +++--- dll/win32/syssetup/lang/pt-BR.rc | 6 +++--- dll/win32/syssetup/lang/pt-PT.rc | 6 +++--- dll/win32/syssetup/lang/ro-RO.rc | 6 +++--- dll/win32/syssetup/lang/ru-RU.rc | 6 +++--- dll/win32/syssetup/lang/sk-SK.rc | 6 +++--- dll/win32/syssetup/lang/sq-AL.rc | 6 +++--- dll/win32/syssetup/lang/sv-SE.rc | 6 +++--- dll/win32/syssetup/lang/th-TH.rc | 6 +++--- dll/win32/syssetup/lang/tr-TR.rc | 6 +++--- dll/win32/syssetup/lang/uk-UA.rc | 6 +++--- dll/win32/syssetup/lang/zh-CN.rc | 6 +++--- dll/win32/syssetup/lang/zh-TW.rc | 6 +++--- dll/win32/syssetup/wizard.c | 7 ++++--- 33 files changed, 100 insertions(+), 99 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 7085c419204..81818e58615 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 1b2852bf952..0f6f313dfc2 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -36,7 +36,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -253,8 +253,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 39fd84a4d29..bb8ae55b40d 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -49,7 +49,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -266,8 +266,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 494f16a19df..49311538f63 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 2c049b8e793..da95c35a699 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index 2414e315d11..fa52280a237 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -49,7 +49,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -267,8 +267,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 90abbfed4ef..2e72c99934f 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -255,8 +255,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index f88511359bc..49b7eb6328f 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index a1c5f140666..03c77e75adc 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -49,7 +49,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -266,8 +266,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 04171476ba9..2589e57a737 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index e1076999634..55e3fd67cf4 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index c7d9da274bb..f10a2609bb9 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -255,8 +255,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 362d203bb78..ee1f9bd42b7 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -246,8 +246,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index aef4e7ce0e1..f611941f2d1 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 333044dc9a5..8920cd372ab 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 9984cff78ee..466d0ed94dd 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 0307968d8ba..65da0ae4000 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -49,7 +49,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -266,8 +266,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 01f6bb3b858..89b254054df 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index bd436c889a7..11b507f583a 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 4b8013bd391..3caea4d4cae 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 7b79334b32a..94e78749e12 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index 71b3c00a849..6148b63983a 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -247,8 +247,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 4c8f51e1711..ef846e5f5c4 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -256,8 +256,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 3c2d9d18864..f4195575acc 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -32,7 +32,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -249,8 +249,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 12f30a74604..bd0558c7f9d 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -36,7 +36,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -253,8 +253,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index d34e7d26a9c..4bd954fcf59 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -49,7 +49,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -266,8 +266,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 1cdc8880559..893a9ed8c72 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -49,7 +49,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -266,8 +266,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 1194b0d55cf..5b6ddee906d 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -49,7 +49,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -266,8 +266,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index 7f4a8fd1eca..6cc3224e4e0 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -32,7 +32,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -249,8 +249,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 596e176a786..e2eb75512b8 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -255,8 +255,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index e2efd6d9705..9b76c052180 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -32,7 +32,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -252,8 +252,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 156c9ed33a9..93c7bae0428 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -52,7 +52,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL @@ -274,8 +274,8 @@ STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server (Default)" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." END diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index a6f83bd280f..c5f4ce8174c 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -486,8 +486,8 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONNAME, szText, _countof(szText)); SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_ADDSTRING, 0, (LPARAM)szText); - SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL, PRODUCT_OPTION_SERVER, 0); - OnChooseServer(hwndDlg); + SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL, PRODUCT_OPTION_WORKSTATION, 0); + OnChooseWorkstation(hwndDlg); hIcon = LoadIcon(NULL, IDI_WINLOGO); SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_ICON, STM_SETICON, (WPARAM)hIcon, 0); @@ -525,7 +525,8 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (pSetupData->UnattendSetup) { - pSetupData->ProductOption = PRODUCT_OPTION_SERVER; + pSetupData->ProductOption = PRODUCT_OPTION_WORKSTATION; + OnChooseWorkstation(hwndDlg); DoWriteProductOption(pSetupData->ProductOption); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_LOCALEPAGE); return TRUE;

1 0

[reactos] 01/01: [SHELL32] Use background context if no item selected on File menu
by Katayama Hirofumi MZ 12 Feb '20

12 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cf564c25f532c32f9fae… commit 1cf564c25f532c32f9fae891f17a70e62d5c1c14 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 12 12:14:15 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Feb 12 12:14:15 2020 +0900 [SHELL32] Use background context if no item selected on File menu CORE-9467 --- dll/win32/shell32/CDefView.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 2bbf523fbe7..f2cfcead5f7 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1207,8 +1207,11 @@ HRESULT CDefView::FillFileMenu() DeleteMenu(hFileMenu, i, MF_BYPOSITION); } + m_cidl = m_ListView.GetSelectedCount(); + /* Store the context menu in m_pCM and keep it in order to invoke the selected command later on */ - HRESULT hr = GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IContextMenu, &m_pCM)); + HRESULT hr = GetItemObject((m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND), + IID_PPV_ARG(IContextMenu, &m_pCM)); if (FAILED_UNEXPECTEDLY(hr)) return hr;

1 0

[reactos] 01/01: [ZIPFLDR] Show 'Click Next to extract' on initial status
by Katayama Hirofumi MZ 12 Feb '20

12 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bf9f4b3017da0ea4c63e… commit 0bf9f4b3017da0ea4c63e013534665d1740ff7f6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 12 11:06:54 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Feb 12 11:06:54 2020 +0900 [ZIPFLDR] Show 'Click Next to extract' on initial status --- dll/shellext/zipfldr/CZipExtract.cpp | 3 +++ dll/shellext/zipfldr/lang/de-DE.rc | 3 ++- dll/shellext/zipfldr/lang/en-US.rc | 3 ++- dll/shellext/zipfldr/lang/et-EE.rc | 3 ++- dll/shellext/zipfldr/lang/fr-FR.rc | 3 ++- dll/shellext/zipfldr/lang/hi-IN.rc | 3 ++- dll/shellext/zipfldr/lang/it-IT.rc | 3 ++- dll/shellext/zipfldr/lang/ja-JP.rc | 3 ++- dll/shellext/zipfldr/lang/pl-PL.rc | 3 ++- dll/shellext/zipfldr/lang/ro-RO.rc | 3 ++- dll/shellext/zipfldr/lang/ru-RU.rc | 3 ++- dll/shellext/zipfldr/lang/sv-SE.rc | 3 ++- dll/shellext/zipfldr/lang/zh-CN.rc | 3 ++- dll/shellext/zipfldr/resource.h | 2 ++ 14 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 66ac782e425..f4d76898d76 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -127,6 +127,9 @@ public: ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); SetWizardButtons(0); + CStringW strExtracting(MAKEINTRESOURCEW(IDS_EXTRACTING)); + SetDlgItemTextW(IDC_STATUSTEXT, strExtracting); + if (m_pExtract->m_DirectoryChanged) UpdateDirectory(); diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index 6f50cb7d0d0..4945a2c2369 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Durchsuchen...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Kennwort",IDC_PASSWORD,174,66,54,14 - LTEXT "Extrahieren...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extrahieren..." IDS_WIZ_TITLE "Extrahier-Assistent" IDS_WIZ_DEST_TITLE "Ziel auswählen" diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index a73ad541688..04f25b2659c 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Browse...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14 - LTEXT "Extracting...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extracting..." IDS_WIZ_TITLE "Extraction Wizard" IDS_WIZ_DEST_TITLE "Select a Destination" diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index eb2b0280afb..7904bc15e3b 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Sirvi...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Parool",IDC_PASSWORD,174,66,54,14 - LTEXT "Ekstraktimine...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Ekstraktimine..." IDS_WIZ_TITLE "Ekstraktimise visard" IDS_WIZ_DEST_TITLE "Vali sihtkoht" diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 24decc1fa3c..76c114e2efb 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Parcourir...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Mot de passe",IDC_PASSWORD,174,66,54,14 - LTEXT "Extraction...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extraction..." IDS_WIZ_TITLE "Assistant d'extraction" IDS_WIZ_DEST_TITLE "Choisir une destination" diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc index cf31cce8e32..cf2b6b8b19e 100644 --- a/dll/shellext/zipfldr/lang/hi-IN.rc +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "ब्राउज...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "पासवर्ड",IDC_PASSWORD,174,66,54,14 - LTEXT "निकाला जा रहा है...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -60,6 +60,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extracting..." IDS_WIZ_TITLE "निष्कर्षण विज़ार्ड" IDS_WIZ_DEST_TITLE "एक गंतव्य चुनें" diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index d3572fa0101..00b66381340 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Sfoglia...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14 - LTEXT "Estrazione...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Estrazione..." IDS_WIZ_TITLE "Estrazione Guidata" IDS_WIZ_DEST_TITLE "Seleziona una Destinazione" diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 157e6717dac..8a87f0e825d 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "参照...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "パスワード",IDC_PASSWORD,174,66,54,14 - LTEXT "展開中...",IDC_STATIC,6,114,42,8 + LTEXT "展開するには '次へ' をクリック",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "展開中..." IDS_WIZ_TITLE "展開ウィザード" IDS_WIZ_DEST_TITLE "展開先を選んで下さい" diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index fcdb0436d22..3ac36f3980d 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -15,7 +15,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Przeglądaj...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Hasło",IDC_PASSWORD,174,66,54,14 - LTEXT "Trwa wyodrębnianie...",IDC_STATIC,6,114,82,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -72,6 +72,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extracting..." IDS_WIZ_TITLE "Kreator wyodrębniania" IDS_WIZ_DEST_TITLE "Wybierz miejsce docelowe" diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index cb15956e6cb..288544be28d 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Răsfoiți...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Parolă",IDC_PASSWORD,174,66,54,14 - LTEXT "Extragere...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extragere..." IDS_WIZ_TITLE "Asistent de extracție" IDS_WIZ_DEST_TITLE "Selectați o Destinație" diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index 1791169c937..70fbe45b403 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Обзор...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Пароль",IDC_PASSWORD,174,66,54,14 - LTEXT "Извлечение...",IDC_STATIC,6,114,48,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Извлечение..." IDS_WIZ_TITLE "Мастер извлечения архивов" IDS_WIZ_DEST_TITLE "Укажите путь" diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index 886dddfe8bf..217cb66dbb9 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Bläddra...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Lösenord",IDC_PASSWORD,174,66,54,14 - LTEXT "Extraherar...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extraherar..." IDS_WIZ_TITLE "Extraheringsguiden" IDS_WIZ_DEST_TITLE "Välj ett mål" diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index 6d69c012991..d4439bfa99f 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "浏览...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "密码",IDC_PASSWORD,174,66,54,14 - LTEXT "正在解压...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "正在解压..." IDS_WIZ_TITLE "解压向导" IDS_WIZ_DEST_TITLE "选择一个目标文件夹" diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index b294e823b77..056c726e0f0 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -11,6 +11,7 @@ #define IDC_BROWSE 1002 #define IDC_PASSWORD 1003 #define IDC_PROGRESS 1004 +#define IDC_STATUSTEXT 1005 #define IDD_PROPPAGECOMPLETE 1100 #define IDC_DESTDIR 1101 @@ -40,6 +41,7 @@ #define IDS_NOFILES 111 #define IDS_CANTCREATEZIP 112 #define IDS_CANTREADFILE 113 +#define IDS_EXTRACTING 114 /* Wizard titles */ #define IDS_WIZ_TITLE 8000

1 0

[reactos] 01/01: Shell Folders: Reject invalid characters (#2328)
by Katayama Hirofumi MZ 12 Feb '20

12 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc1519dd87a96d37a1b9c… commit bc1519dd87a96d37a1b9c64efb43901d5c386872 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 12 09:18:24 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 12 09:18:24 2020 +0900 Shell Folders: Reject invalid characters (#2328) Reject invalid input filename characters by using shell32!SHLimitInputEdit function and IItemNameLimits interface. Improve SHLimitInputEdit to sanitize paste. CORE-11701 --- dll/win32/shell32/CDefView.cpp | 4 + dll/win32/shell32/folders/CDesktopFolder.h | 26 ++++++- dll/win32/shell32/folders/CFSFolder.h | 26 ++++++- dll/win32/shell32/folders/CMyDocsFolder.h | 26 ++++++- dll/win32/shell32/shellmenu/CMergedFolder.h | 24 ++++++ dll/win32/shell32/wine/shellord.c | 110 ++++++++++++++++++++++++++-- sdk/include/reactos/undocshell.h | 13 ++++ 7 files changed, 219 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 608ada85bf4..2bbf523fbe7 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1989,9 +1989,13 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl m_pSFParent->GetAttributesOf(1, &pidl, &dwAttr); if (SFGAO_CANRENAME & dwAttr) { + HWND hEdit = reinterpret_cast<HWND>(m_ListView.SendMessage(LVM_GETEDITCONTROL)); + SHLimitInputEdit(hEdit, m_pSFParent); + m_isEditing = TRUE; return FALSE; } + return TRUE; } diff --git a/dll/win32/shell32/folders/CDesktopFolder.h b/dll/win32/shell32/folders/CDesktopFolder.h index 3ac844323aa..eddeb8043bd 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.h +++ b/dll/win32/shell32/folders/CDesktopFolder.h @@ -28,7 +28,8 @@ class CDesktopFolder : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, - public IContextMenuCB + public IContextMenuCB, + public IItemNameLimits { private: /* both paths are parsible from the desktop */ @@ -79,6 +80,28 @@ class CDesktopFolder : // IContextMenuCB virtual HRESULT WINAPI CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam); + /*** IItemNameLimits methods ***/ + + STDMETHODIMP + GetMaxLength(LPCWSTR pszName, int *piMaxNameLen) + { + return E_NOTIMPL; + } + + STDMETHODIMP + GetValidCharacters(LPWSTR *ppwszValidChars, LPWSTR *ppwszInvalidChars) + { + if (ppwszValidChars) + { + *ppwszValidChars = NULL; + } + if (ppwszInvalidChars) + { + SHStrDupW(INVALID_FILETITLE_CHARACTERSW, ppwszInvalidChars); + } + return S_OK; + } + DECLARE_REGISTRY_RESOURCEID(IDR_SHELLDESKTOP) DECLARE_CENTRAL_INSTANCE_NOT_AGGREGATABLE(CDesktopFolder) @@ -90,6 +113,7 @@ class CDesktopFolder : COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IItemNameLimits, IItemNameLimits) END_COM_MAP() }; diff --git a/dll/win32/shell32/folders/CFSFolder.h b/dll/win32/shell32/folders/CFSFolder.h index 6c6f055a3f8..c5f1d1bf2ae 100644 --- a/dll/win32/shell32/folders/CFSFolder.h +++ b/dll/win32/shell32/folders/CFSFolder.h @@ -29,7 +29,8 @@ class CFSFolder : public IShellFolder2, public IPersistFolder3, public IContextMenuCB, - public IShellFolderViewCB + public IShellFolderViewCB, + public IItemNameLimits { private: const CLSID *m_pclsid; @@ -88,6 +89,28 @@ class CFSFolder : // IShellFolderViewCB virtual HRESULT WINAPI MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); + /*** IItemNameLimits methods ***/ + + STDMETHODIMP + GetMaxLength(LPCWSTR pszName, int *piMaxNameLen) + { + return E_NOTIMPL; + } + + STDMETHODIMP + GetValidCharacters(LPWSTR *ppwszValidChars, LPWSTR *ppwszInvalidChars) + { + if (ppwszValidChars) + { + *ppwszValidChars = NULL; + } + if (ppwszInvalidChars) + { + SHStrDupW(INVALID_FILETITLE_CHARACTERSW, ppwszInvalidChars); + } + return S_OK; + } + DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) DECLARE_NOT_AGGREGATABLE(CFSFolder) @@ -101,6 +124,7 @@ class CFSFolder : COM_INTERFACE_ENTRY_IID(IID_IPersistFolder3, IPersistFolder3) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewCB, IShellFolderViewCB) + COM_INTERFACE_ENTRY_IID(IID_IItemNameLimits, IItemNameLimits) END_COM_MAP() protected: diff --git a/dll/win32/shell32/folders/CMyDocsFolder.h b/dll/win32/shell32/folders/CMyDocsFolder.h index 9f89621fae1..6bed840fcbc 100644 --- a/dll/win32/shell32/folders/CMyDocsFolder.h +++ b/dll/win32/shell32/folders/CMyDocsFolder.h @@ -26,7 +26,8 @@ class CMyDocsFolder : public CComCoClass<CMyDocsFolder, &CLSID_MyDocuments>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder2 + public IPersistFolder2, + public IItemNameLimits { private: CComPtr<IShellFolder2> m_pisfInner; @@ -65,6 +66,28 @@ class CMyDocsFolder : // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE * pidl); + /*** IItemNameLimits methods ***/ + + STDMETHODIMP + GetMaxLength(LPCWSTR pszName, int *piMaxNameLen) + { + return E_NOTIMPL; + } + + STDMETHODIMP + GetValidCharacters(LPWSTR *ppwszValidChars, LPWSTR *ppwszInvalidChars) + { + if (ppwszValidChars) + { + *ppwszValidChars = NULL; + } + if (ppwszInvalidChars) + { + SHStrDupW(INVALID_FILETITLE_CHARACTERSW, ppwszInvalidChars); + } + return S_OK; + } + DECLARE_REGISTRY_RESOURCEID(IDR_MYDOCUMENTS) DECLARE_NOT_AGGREGATABLE(CMyDocsFolder) @@ -76,6 +99,7 @@ class CMyDocsFolder : COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IItemNameLimits, IItemNameLimits) END_COM_MAP() }; diff --git a/dll/win32/shell32/shellmenu/CMergedFolder.h b/dll/win32/shell32/shellmenu/CMergedFolder.h index 4bc9ee20278..e76fc98c098 100644 --- a/dll/win32/shell32/shellmenu/CMergedFolder.h +++ b/dll/win32/shell32/shellmenu/CMergedFolder.h @@ -50,6 +50,7 @@ class CMergedFolder : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, + public IItemNameLimits, public IAugmentedShellFolder3 // -- undocumented //public IShellService, // DEPRECATED IE4 interface: https://msdn.microsoft.com/en-us/library/windows/desktop/bb774870%28v=vs.85… //public ITranslateShellChangeNotify,// -- undocumented @@ -84,6 +85,7 @@ public: COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) + COM_INTERFACE_ENTRY_IID(IID_IItemNameLimits, IItemNameLimits) COM_INTERFACE_ENTRY_IID(IID_IAugmentedShellFolder, IAugmentedShellFolder) COM_INTERFACE_ENTRY_IID(IID_IAugmentedShellFolder2, IAugmentedShellFolder2) COM_INTERFACE_ENTRY_IID(IID_IAugmentedShellFolder3, IAugmentedShellFolder3) @@ -196,6 +198,28 @@ public: // IPersistFolder2 virtual HRESULT STDMETHODCALLTYPE GetCurFolder(PIDLIST_ABSOLUTE * pidl); + /*** IItemNameLimits methods ***/ + + STDMETHODIMP + GetMaxLength(LPCWSTR pszName, int *piMaxNameLen) + { + return E_NOTIMPL; + } + + STDMETHODIMP + GetValidCharacters(LPWSTR *ppwszValidChars, LPWSTR *ppwszInvalidChars) + { + if (ppwszValidChars) + { + *ppwszValidChars = NULL; + } + if (ppwszInvalidChars) + { + SHStrDupW(INVALID_FILETITLE_CHARACTERSW, ppwszInvalidChars); + } + return S_OK; + } + // IAugmentedShellFolder2 virtual HRESULT STDMETHODCALLTYPE AddNameSpace(LPGUID lpGuid, IShellFolder * psf, LPCITEMIDLIST pcidl, ULONG dwUnknown); virtual HRESULT STDMETHODCALLTYPE GetNameSpaceID(LPCITEMIDLIST pcidl, LPGUID lpGuid); diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index 404ecc2a98b..9b4c6ab9eba 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -2179,10 +2179,88 @@ UxSubclassInfo_Destroy(UxSubclassInfo *pInfo) HeapFree(GetProcessHeap(), 0, pInfo); } +static BOOL +DoSanitizeText(LPWSTR pszSanitized, LPCWSTR pszInvalidChars, LPCWSTR pszValidChars) +{ + LPWSTR pch1, pch2; + BOOL bFound = FALSE; + + for (pch1 = pch2 = pszSanitized; *pch1; ++pch1) + { + if (pszInvalidChars) + { + if (wcschr(pszInvalidChars, *pch1) != NULL) + { + bFound = TRUE; + continue; + } + } + else if (pszValidChars) + { + if (wcschr(pszValidChars, *pch1) == NULL) + { + bFound = TRUE; + continue; + } + } + + *pch2 = *pch1; + ++pch2; + } + *pch2 = 0; + + return bFound; +} + +static void +DoSanitizeClipboard(HWND hwnd, UxSubclassInfo *pInfo) +{ + HGLOBAL hData; + LPWSTR pszText, pszSanitized; + DWORD cbData; + + if (GetWindowLongPtrW(hwnd, GWL_STYLE) & ES_READONLY) + return; + if (!OpenClipboard(hwnd)) + return; + + hData = GetClipboardData(CF_UNICODETEXT); + pszText = GlobalLock(hData); + if (!pszText) + { + CloseClipboard(); + return; + } + SHStrDupW(pszText, &pszSanitized); + GlobalUnlock(hData); + + if (pszSanitized && + DoSanitizeText(pszSanitized, pInfo->pwszInvalidChars, pInfo->pwszValidChars)) + { + MessageBeep(0xFFFFFFFF); + + /* Update clipboard text */ + cbData = (lstrlenW(pszSanitized) + 1) * sizeof(WCHAR); + hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, cbData); + pszText = GlobalLock(hData); + if (pszText) + { + CopyMemory(pszText, pszSanitized, cbData); + GlobalUnlock(hData); + + SetClipboardData(CF_UNICODETEXT, hData); + } + } + + CoTaskMemFree(pszSanitized); + CloseClipboard(); +} + static LRESULT CALLBACK LimitEditWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { WNDPROC fnWndProc; + WCHAR wch; UxSubclassInfo *pInfo = GetPropW(hwnd, L"UxSubclassInfo"); if (!pInfo) return DefWindowProcW(hwnd, uMsg, wParam, lParam); @@ -2191,8 +2269,22 @@ LimitEditWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { + case WM_KEYDOWN: + if (GetKeyState(VK_SHIFT) < 0 && wParam == VK_INSERT) + DoSanitizeClipboard(hwnd, pInfo); + else if (GetKeyState(VK_CONTROL) < 0 && wParam == L'V') + DoSanitizeClipboard(hwnd, pInfo); + + return CallWindowProcW(fnWndProc, hwnd, uMsg, wParam, lParam); + + case WM_PASTE: + DoSanitizeClipboard(hwnd, pInfo); + return CallWindowProcW(fnWndProc, hwnd, uMsg, wParam, lParam); + case WM_CHAR: - { + if (GetKeyState(VK_CONTROL) < 0 && wParam == L'V') + break; + if (pInfo->pwszInvalidChars) { if (wcschr(pInfo->pwszInvalidChars, (WCHAR)wParam) != NULL) @@ -2210,11 +2302,18 @@ LimitEditWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } } return CallWindowProcW(fnWndProc, hwnd, uMsg, wParam, lParam); - } + + case WM_UNICHAR: + if (wParam == UNICODE_NOCHAR) + return TRUE; + + /* FALL THROUGH */ case WM_IME_CHAR: - { - WCHAR wch = (WCHAR)wParam; + wch = (WCHAR)wParam; + if (GetKeyState(VK_CONTROL) < 0 && wch == L'V') + break; + if (!IsWindowUnicode(hwnd) && HIBYTE(wch) != 0) { CHAR data[] = {HIBYTE(wch), LOBYTE(wch)}; @@ -2238,13 +2337,10 @@ LimitEditWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } } return CallWindowProcW(fnWndProc, hwnd, uMsg, wParam, lParam); - } case WM_NCDESTROY: - { UxSubclassInfo_Destroy(pInfo); return CallWindowProcW(fnWndProc, hwnd, uMsg, wParam, lParam); - } default: return CallWindowProcW(fnWndProc, hwnd, uMsg, wParam, lParam); diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 1757a055734..1927bf26015 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -697,6 +697,19 @@ IStream* WINAPI SHGetViewStream(LPCITEMIDLIST, DWORD, LPCTSTR, LPCTSTR, LPCTSTR) EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey); +/***************************************************************************** + * INVALID_FILETITLE_CHARACTERS + */ + +#define INVALID_FILETITLE_CHARACTERSA "\\/:*?\"<>|" +#define INVALID_FILETITLE_CHARACTERSW L"\\/:*?\"<>|" + +#ifdef UNICODE + #define INVALID_FILETITLE_CHARACTERS INVALID_FILETITLE_CHARACTERSW +#else + #define INVALID_FILETITLE_CHARACTERS INVALID_FILETITLE_CHARACTERSA +#endif + /***************************************************************************** * Shell Link */

1 0

[reactos] 01/01: [SYSSETUP] Plan A: Also write ReportAsWorkstation value (#2326)
by Katayama Hirofumi MZ 12 Feb '20

12 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a7a747d87c861fc8c7c5… commit 0a7a747d87c861fc8c7c5c9545935b2c0b48348a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 12 09:03:14 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 12 09:03:14 2020 +0900 [SYSSETUP] Plan A: Also write ReportAsWorkstation value (#2326) Write the ReportAsWorkstation value of the registry key HKLM\SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version. The reason is shown at CORE-6611. CORE-13795 --- dll/win32/syssetup/wizard.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index ba2403e6667..a6f83bd280f 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -380,11 +380,12 @@ AckPageDlgProc(HWND hwndDlg, static BOOL DoWriteProductOption(PRODUCT_OPTION nOption) { - static const WCHAR s_szProductOptions[] = L"System\\CurrentControlSet\\Control\\ProductOptions"; + static const WCHAR s_szProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions"; + static const WCHAR s_szRosVersion[] = L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"; HKEY hKey; LONG error; LPCWSTR pData; - DWORD cbData; + DWORD cbData, dwValue; error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szProductOptions, 0, KEY_WRITE, &hKey); if (error) @@ -422,6 +423,18 @@ DoWriteProductOption(PRODUCT_OPTION nOption) } RegCloseKey(hKey); + + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szRosVersion, 0, KEY_WRITE, &hKey); + if (error) + return FALSE; + + /* write ReportAsWorkstation value */ + dwValue = (nOption == PRODUCT_OPTION_WORKSTATION); + cbData = sizeof(dwValue); + error = RegSetValueExW(hKey, L"ReportAsWorkstation", 0, REG_DWORD, (BYTE *)&dwValue, cbData); + + RegCloseKey(hKey); + return error == ERROR_SUCCESS; }

1 0

[reactos] 01/01: [SHELL32] DoGetProductType(): Check RegQueryValueExW() dwType (#2331)
by Serge Gautherie 11 Feb '20

11 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f4e8ef25b53d27494efa… commit 9f4e8ef25b53d27494efab569288452fbaa1cdfa Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Feb 11 17:36:12 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 11 17:36:12 2020 +0100 [SHELL32] DoGetProductType(): Check RegQueryValueExW() dwType (#2331) --- dll/win32/shell32/wine/shellpath.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 3c7ee6a3529..b65b37438d5 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -67,11 +67,11 @@ typedef enum _NT_PRODUCT_TYPE static BOOL DoGetProductType(PNT_PRODUCT_TYPE ProductType) { - static const WCHAR ProductOptions[] = L"System\\CurrentControlSet\\Control\\ProductOptions"; + static const WCHAR ProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions"; HKEY hKey; LONG error; WCHAR szValue[32]; - DWORD cbValue; + DWORD cbValue, dwType; static DWORD s_dwProductType = 0; if (s_dwProductType != 0) @@ -87,8 +87,8 @@ DoGetProductType(PNT_PRODUCT_TYPE ProductType) return FALSE; cbValue = sizeof(szValue); - error = RegQueryValueExW(hKey, L"ProductType", NULL, NULL, (LPBYTE)szValue, &cbValue); - if (!error) + error = RegQueryValueExW(hKey, L"ProductType", NULL, &dwType, (LPBYTE)szValue, &cbValue); + if (!error && dwType == REG_SZ) { if (lstrcmpW(szValue, L"WinNT") == 0) *ProductType = NtProductWinNt;

1 0

[reactos] 01/01: [WIN32SS][NTUSER] Fix ScrollWindowEx SW_SCROLLCHILDREN (#2327)
by Katayama Hirofumi MZ 11 Feb '20

11 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9199c90328e051f2f2930… commit 9199c90328e051f2f2930de1f74aff9d38aaa76c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 11 20:59:14 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 11 20:59:14 2020 +0900 [WIN32SS][NTUSER] Fix ScrollWindowEx SW_SCROLLCHILDREN (#2327) Based on the patch of I_Kill_Bugs of JIRA user. CORE-16687, CORE-12114 --- win32ss/user/ntuser/scrollex.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win32ss/user/ntuser/scrollex.c b/win32ss/user/ntuser/scrollex.c index c344cec9475..82f248ec367 100644 --- a/win32ss/user/ntuser/scrollex.c +++ b/win32ss/user/ntuser/scrollex.c @@ -385,6 +385,10 @@ IntScrollWindowEx( rcChild = Child->rcWindow; RECTL_vOffsetRect(&rcChild, -ClientOrigin.x, -ClientOrigin.y); + /* Adjust window positions */ + RECTL_vOffsetRect(&Child->rcWindow, dx, dy); + RECTL_vOffsetRect(&Child->rcClient, dx, dy); + if (!prcScroll || RECTL_bIntersectRect(&rcDummy, &rcChild, &rcScroll)) { UserRefObjectCo(Child, &WndRef);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2020