Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/01: [SERIAL] Do not return NTSTATUS from an interrupt routine.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=526fc76cacca8d7bdeb3f… commit 526fc76cacca8d7bdeb3f97101fa7972d5576fe7 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jan 14 09:10:22 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Mar 24 09:25:17 2019 +0100 [SERIAL] Do not return NTSTATUS from an interrupt routine. --- drivers/serial/serial/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/serial/serial/misc.c b/drivers/serial/serial/misc.c index 36df0a14e8..8a87d7ceff 100644 --- a/drivers/serial/serial/misc.c +++ b/drivers/serial/serial/misc.c @@ -297,7 +297,7 @@ done: /* We are now ready to handle another IRP, even if this one is not completed */ DeviceExtension->WaitOnMaskIrp = NULL; - return STATUS_SUCCESS; + return TRUE; } return TRUE; }

5 years, 5 months

[reactos] 01/01: [SYSDM] Get a profiles 'State' value and use it to display the profile type.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a4676f19fdaff40cc235… commit 9a4676f19fdaff40cc23532d6e53c531547fe8f2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 24 06:49:27 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 24 06:50:24 2019 +0100 [SYSDM] Get a profiles 'State' value and use it to display the profile type. --- dll/cpl/sysdm/userprofile.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index 6bdcd04e2c..fa59e9e534 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -16,6 +16,7 @@ typedef struct _PROFILEDATA { BOOL bMyProfile; + DWORD dwState; PWSTR pszFullName; } PROFILEDATA, *PPROFILEDATA; @@ -204,9 +205,10 @@ AddUserProfile( WCHAR szNameBuffer[256]; SID_NAME_USE Use; DWORD dwAccountNameSize, dwDomainNameSize; - DWORD dwProfileData; + DWORD dwProfileData, dwSize, dwType, dwState = 0; PWSTR ptr; PSID pSid = NULL; + INT nId, iItem; LV_ITEM lvi; if (!ConvertStringSidToSid(lpProfileSid, @@ -244,6 +246,18 @@ AddUserProfile( } } + /* Get the profile state value */ + dwSize = sizeof(dwState); + if (RegQueryValueExW(hProfileKey, + L"State", + NULL, + &dwType, + (LPBYTE)&dwState, + &dwSize) != ERROR_SUCCESS) + { + dwState = 0; + } + dwProfileData = sizeof(PROFILEDATA) + ((wcslen(szNameBuffer) + 1) * sizeof(WCHAR)); pProfileData = HeapAlloc(GetProcessHeap(), @@ -253,18 +267,32 @@ AddUserProfile( goto done; pProfileData->bMyProfile = EqualSid(pMySid, pSid); + pProfileData->dwState = dwState; ptr = (PWSTR)((ULONG_PTR)pProfileData + sizeof(PROFILEDATA)); pProfileData->pszFullName = ptr; wcscpy(pProfileData->pszFullName, szNameBuffer); + /* Add the profile and set its name */ memset(&lvi, 0x00, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; lvi.pszText = pProfileData->pszFullName; lvi.state = 0; lvi.lParam = (LPARAM)pProfileData; - ListView_InsertItem(hwndListView, &lvi); + iItem = ListView_InsertItem(hwndListView, &lvi); + + /* Set the profile type */ + if (dwState & 0x0001) // PROFILE_MANDATORY + nId = IDS_USERPROFILE_MANDATORY; + else if (dwState & 0x0010) // PROFILE_UPDATE_CENTRAL + nId = IDS_USERPROFILE_ROAMING; + else + nId = IDS_USERPROFILE_LOCAL; + + LoadStringW(hApplet, nId, szAccountName, ARRAYSIZE(szAccountName)); + + ListView_SetItemText(hwndListView, iItem, 2, szAccountName); done: if (pSid != NULL)

5 years, 5 months

[reactos] 02/02: [GDI32] Integrate LpkGetTextExtentExPoint(). (#1362)

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7143e411c46380b4ec73f… commit 7143e411c46380b4ec73f51b481c382504602901 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Fri Feb 15 03:57:35 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 23 23:34:09 2019 +0100 [GDI32] Integrate LpkGetTextExtentExPoint(). (#1362) - Assume that GetTextExtentExPointWPri() uses the same kind of arguments as GetTextExtentExPointW(). - Add GetTextExtentExPointWPri() declaration to undocgdi.h. --- sdk/include/reactos/undocgdi.h | 11 +++++++++++ win32ss/gdi/gdi32/include/gdi32p.h | 15 +++++++++++++++ win32ss/gdi/gdi32/objects/text.c | 15 +++++++++------ win32ss/gdi/gdi32/objects/utils.c | 15 ++++++++++++++- 4 files changed, 49 insertions(+), 7 deletions(-) diff --git a/sdk/include/reactos/undocgdi.h b/sdk/include/reactos/undocgdi.h index 4a0ea8f5d5..9abdbef944 100644 --- a/sdk/include/reactos/undocgdi.h +++ b/sdk/include/reactos/undocgdi.h @@ -30,4 +30,15 @@ BOOL WINAPI GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS); +BOOL +WINAPI +GetTextExtentExPointWPri( + HDC hdc, + LPCWSTR lpwsz, + INT cwc, + INT dxMax, + LPINT pcCh, + LPINT pdxOut, + LPSIZE psize); + #endif \ No newline at end of file diff --git a/win32ss/gdi/gdi32/include/gdi32p.h b/win32ss/gdi/gdi32/include/gdi32p.h index 03ce3afcf8..3574850683 100644 --- a/win32ss/gdi/gdi32/include/gdi32p.h +++ b/win32ss/gdi/gdi32/include/gdi32p.h @@ -51,9 +51,23 @@ typedef DWORD DWORD dwUnused ); +typedef BOOL +(WINAPI* LPKGTEP)( + HDC hdc, + LPCWSTR lpString, + INT cString, + INT nMaxExtent, + LPINT lpnFit, + LPINT lpnDx, + LPSIZE lpSize, + DWORD dwUnused, + int unknown +); + extern HINSTANCE hLpk; extern LPKETO LpkExtTextOut; extern LPKGCP LpkGetCharacterPlacement; +extern LPKGTEP LpkGetTextExtentExPoint; /* DEFINES *******************************************************************/ @@ -67,6 +81,7 @@ extern LPKGCP LpkGetCharacterPlacement; #define LPK_INIT 1 #define LPK_ETO 2 #define LPK_GCP 3 +#define LPK_GTEP 4 /* MACRO ********************************************************************/ diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 9ff4fde9df..e35c7c99e8 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -296,6 +296,9 @@ GetTextExtentExPointW( DPRINT("nMaxExtent is invalid: %d\n", nMaxExtent); } + if (LoadLPK(LPK_GTEP)) + return LpkGetTextExtentExPoint(hdc, lpszString, cchString, nMaxExtent, lpnFit, lpnDx, lpSize, 0, 0); + return NtGdiGetTextExtentExW ( hdc, (LPWSTR)lpszString, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)lpnDx, lpSize, 0 ); } @@ -308,14 +311,14 @@ BOOL WINAPI GetTextExtentExPointWPri( _In_ HDC hdc, - _In_reads_(cwc) LPWSTR lpwsz, - _In_ ULONG cwc, - _In_ ULONG dxMax, - _Out_opt_ ULONG *pcCh, - _Out_writes_to_opt_(cwc, *pcCh) PULONG pdxOut, + _In_reads_(cwc) LPCWSTR lpwsz, + _In_ INT cwc, + _In_ INT dxMax, + _Out_opt_ LPINT pcCh, + _Out_writes_to_opt_(cwc, *pcCh) LPINT pdxOut, _In_ LPSIZE psize) { - return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, dxMax, pcCh, pdxOut, psize, 0); + return NtGdiGetTextExtentExW(hdc, (LPWSTR)lpwsz, cwc, dxMax, (PULONG)pcCh, (PULONG)pdxOut, psize, 0); } /* diff --git a/win32ss/gdi/gdi32/objects/utils.c b/win32ss/gdi/gdi32/objects/utils.c index d594b46cb6..93491d9e00 100644 --- a/win32ss/gdi/gdi32/objects/utils.c +++ b/win32ss/gdi/gdi32/objects/utils.c @@ -4,6 +4,7 @@ HINSTANCE hLpk = NULL; LPKETO LpkExtTextOut = NULL; LPKGCP LpkGetCharacterPlacement = NULL; +LPKGTEP LpkGetTextExtentExPoint = NULL; /** * @name CalculateColorTableSize @@ -417,7 +418,7 @@ EnumLogFontExW2A( LPENUMLOGFONTEXA fontA, CONST ENUMLOGFONTEXW *fontW ) * LPK.DLL loader function * * Returns TRUE if a valid parameter was passed and loading was successful, -* retruns FALSE otherwise. +* returns FALSE otherwise. */ BOOL WINAPI LoadLPK(INT LpkFunctionID) { @@ -455,6 +456,18 @@ BOOL WINAPI LoadLPK(INT LpkFunctionID) return TRUE; + case LPK_GTEP: + if (!LpkGetTextExtentExPoint) // Check if the function is already loaded + LpkGetTextExtentExPoint = (LPKGTEP) GetProcAddress(hLpk, "LpkGetTextExtentExPoint"); + + if (!LpkGetTextExtentExPoint) + { + FreeLibrary(hLpk); + return FALSE; + } + + return TRUE; + default: FreeLibrary(hLpk); return FALSE;

5 years, 5 months

[reactos] 01/02: [LPK] Implement LpkGetTextExtentExPoint(). (#1362)

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=107847935850743aed27c… commit 107847935850743aed27c2e5358e5ab1c0c7023b Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Fri Feb 15 03:54:10 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 23 23:31:02 2019 +0100 [LPK] Implement LpkGetTextExtentExPoint(). (#1362) - Add argument checking. - Use logic from NtGdiGetTextExtentExW(). --- dll/win32/lpk/lpk.c | 99 +++++++++++++++++++++++++++++++++++++++++++++---- dll/win32/lpk/lpk.spec | 2 +- dll/win32/lpk/ros_lpk.h | 6 ++- dll/win32/lpk/stub.c | 9 ----- 4 files changed, 98 insertions(+), 18 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index f78015447d..f3ecaf9499 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -46,7 +46,7 @@ static void PSM_PrepareToDraw(LPCWSTR str, INT count, LPWSTR new_str, LPINT new_ { if (str[i] == PREFIX || (iswspace(str[i]) && str[i] != L' ')) { - if(i < count - 1 && str[i + 1] == PREFIX) + if (i < count - 1 && str[i + 1] == PREFIX) new_str[j++] = str[i++]; else i++; @@ -239,15 +239,15 @@ LpkExtTextOut( (fuOptions & ETO_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, reordered_str, uCount, NULL, &glyphs, &cGlyphs); - if (glyphs) - { - fuOptions |= ETO_GLYPH_INDEX; - uCount = cGlyphs; - } - /* Now display the reordered text if any of the arrays is valid and if BIDI_Reorder succeeded */ if ((glyphs || reordered_str) && bReorder) { + if (glyphs) + { + fuOptions |= ETO_GLYPH_INDEX; + uCount = cGlyphs; + } + bResult = ExtTextOutW(hdc, x, y, fuOptions, lprc, glyphs ? (LPWSTR)glyphs : reordered_str, uCount, lpDx); } @@ -425,3 +425,88 @@ INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, D return size.cx; } + +/* + * @implemented + */ +BOOL +WINAPI +LpkGetTextExtentExPoint( + HDC hdc, + LPCWSTR lpString, + INT cString, + INT nMaxExtent, + LPINT lpnFit, + LPINT lpnDx, + LPSIZE lpSize, + DWORD dwUnused, + int unknown) +{ + SCRIPT_STRING_ANALYSIS ssa; + HRESULT hr; + const SIZE *pSize; + INT i, extent, *Dx; + + UNREFERENCED_PARAMETER(dwUnused); + UNREFERENCED_PARAMETER(unknown); + + if (cString < 0 || !lpSize) + return FALSE; + + if (cString == 0) + { + lpSize->cx = 0; + lpSize->cy = 0; + return TRUE; + } + + /* Check if any processing is required */ + if (ScriptIsComplex(lpString, cString, SIC_COMPLEX) != S_OK) + return GetTextExtentExPointWPri(hdc, lpString, cString, nMaxExtent, lpnFit, lpnDx, lpSize); + + hr = ScriptStringAnalyse(hdc, lpString, cString, 3 * cString / 2 + 16, -1, + SSA_GLYPHS, 0, NULL, NULL, NULL, NULL, NULL, &ssa); + + if (hr != S_OK) + return FALSE; + + pSize = ScriptString_pSize(ssa); + + if (pSize) + *lpSize = *pSize; + else + GetTextExtentExPointWPri(hdc, lpString, cString, 0, NULL, NULL, lpSize); + + /* Use logic from TextIntGetTextExtentPoint */ + if (lpnDx || lpnFit) + { + Dx = HeapAlloc(GetProcessHeap(), 0, cString * sizeof(INT)); + + if (!Dx) + { + ScriptStringFree(&ssa); + return FALSE; + } + + if (lpnFit) + *lpnFit = 0; + + ScriptStringGetLogicalWidths(ssa, Dx); + + for (i = 0, extent = 0; i < cString; i++) + { + extent += Dx[i]; + + if (extent <= nMaxExtent && lpnFit) + *lpnFit = i + 1; + + if (lpnDx) + lpnDx[i] = extent; + } + + HeapFree(GetProcessHeap(), 0, Dx); + } + + ScriptStringFree(&ssa); + return TRUE; +} diff --git a/dll/win32/lpk/lpk.spec b/dll/win32/lpk/lpk.spec index 1ef05e1a74..15a913f643 100644 --- a/dll/win32/lpk/lpk.spec +++ b/dll/win32/lpk/lpk.spec @@ -5,7 +5,7 @@ @ extern LpkEditControl @ stdcall LpkExtTextOut(long long long long ptr wstr long ptr long) @ stdcall LpkGetCharacterPlacement(long wstr long long ptr long long) -@ stdcall LpkGetTextExtentExPoint(long long long long long long long long long) +@ stdcall LpkGetTextExtentExPoint(long wstr long long ptr ptr ptr long long) @ stdcall LpkPSMTextOut(long long long wstr long long) @ stdcall LpkUseGDIWidthCache(long long long long long) @ stdcall ftsWordBreak(long long long long long) diff --git a/dll/win32/lpk/ros_lpk.h b/dll/win32/lpk/ros_lpk.h index 2d2d338080..8ad993f197 100644 --- a/dll/win32/lpk/ros_lpk.h +++ b/dll/win32/lpk/ros_lpk.h @@ -18,6 +18,7 @@ #include <winnls.h> #include <usp10.h> #include <strsafe.h> +#include "undocgdi.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -67,7 +68,6 @@ DWORD WINAPI LpkInitialize(DWORD x1); DWORD WINAPI LpkTabbedTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9,DWORD x10,DWORD x11,DWORD x12); BOOL WINAPI LpkDllInitialize (HANDLE hDll, DWORD dwReason, LPVOID lpReserved); DWORD WINAPI LpkDrawTextEx(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9, DWORD x10); -DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9); DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); @@ -80,6 +80,10 @@ DWORD WINAPI LpkGetCharacterPlacement(HDC hdc, LPCWSTR lpString, INT uCount, INT GCP_RESULTSW *lpResults, DWORD dwFlags, DWORD dwUnused); INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, DWORD dwFlags); + +BOOL WINAPI LpkGetTextExtentExPoint(HDC hdc, LPCWSTR lpString, INT cString, INT nMaxExtent, + LPINT lpnFit, LPINT lpnDx, LPSIZE lpSize, DWORD dwUnused, + int unknown); /* bidi.c */ #define WINE_GCPW_FORCE_LTR 0 diff --git a/dll/win32/lpk/stub.c b/dll/win32/lpk/stub.c index 310c4caf94..d0c11d1e1d 100644 --- a/dll/win32/lpk/stub.c +++ b/dll/win32/lpk/stub.c @@ -40,15 +40,6 @@ DWORD WINAPI LpkDrawTextEx(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6 return 0; } -/* - * @unimplemented - */ -DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9) -{ - UNIMPLEMENTED - return 0; -} - /* * @unimplemented */

5 years, 5 months

[reactos] 01/01: [SYSDM] Update Russian and Ukrainian translations (#1437)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=505d27cbef71b57be0121… commit 505d27cbef71b57be012139c075739936c2004c8 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Sat Mar 23 23:18:42 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 23 22:18:42 2019 +0100 [SYSDM] Update Russian and Ukrainian translations (#1437) --- dll/cpl/sysdm/lang/ru-RU.rc | 4 ++-- dll/cpl/sysdm/lang/uk-UA.rc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 87b7e95fab..521d85c03d 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -312,8 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Обязательный" IDS_USERPROFILE_CONFIRM_DELETE "Вы действительно хотите удалить профиль пользователя %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Подтверждение удаления" - IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" - IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Неизвестный профиль" + IDS_USERPROFILE_ACCOUNT_DELETED "Удалённый профиль" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Панель управления системы" IDS_WARNINITIALSIZE "Введите числовое значение исходного размера файла подкачки." diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 2680bc4de2..5244315769 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -320,8 +320,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Обов'язковий" IDS_USERPROFILE_CONFIRM_DELETE "Ви дійсно хочете видалити профіль %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Підтвердження видалення" - IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" - IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Невідомий профіль" + IDS_USERPROFILE_ACCOUNT_DELETED "Видалений профіль" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Елемент панелі керування" IDS_WARNINITIALSIZE "Введіть числове значення для початкового розміру файлу довантаження."

5 years, 5 months

[reactos] 01/01: [SYSDM] Simplify AddUserProfile() by using fixed size buffers for account and domain names and handle unknown and deleted accounts properly. Also fix fonts for asian languages.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4b638d7c8f99c4d96c7f… commit d4b638d7c8f99c4d96c7fd29dc199dbf275fa5d3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 23 20:57:02 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 23 20:58:03 2019 +0100 [SYSDM] Simplify AddUserProfile() by using fixed size buffers for account and domain names and handle unknown and deleted accounts properly. Also fix fonts for asian languages. --- dll/cpl/sysdm/lang/bg-BG.rc | 2 ++ dll/cpl/sysdm/lang/cs-CZ.rc | 2 ++ dll/cpl/sysdm/lang/da-DK.rc | 2 ++ dll/cpl/sysdm/lang/de-DE.rc | 2 ++ dll/cpl/sysdm/lang/el-GR.rc | 2 ++ dll/cpl/sysdm/lang/en-US.rc | 2 ++ dll/cpl/sysdm/lang/es-ES.rc | 2 ++ dll/cpl/sysdm/lang/fr-FR.rc | 2 ++ dll/cpl/sysdm/lang/he-IL.rc | 2 ++ dll/cpl/sysdm/lang/hu-HU.rc | 2 ++ dll/cpl/sysdm/lang/id-ID.rc | 2 ++ dll/cpl/sysdm/lang/it-IT.rc | 2 ++ dll/cpl/sysdm/lang/ja-JP.rc | 6 +++-- dll/cpl/sysdm/lang/nl-NL.rc | 2 ++ dll/cpl/sysdm/lang/no-NO.rc | 2 ++ dll/cpl/sysdm/lang/pl-PL.rc | 2 ++ dll/cpl/sysdm/lang/ro-RO.rc | 2 ++ dll/cpl/sysdm/lang/ru-RU.rc | 2 ++ dll/cpl/sysdm/lang/sk-SK.rc | 2 ++ dll/cpl/sysdm/lang/sq-AL.rc | 2 ++ dll/cpl/sysdm/lang/sv-SE.rc | 2 ++ dll/cpl/sysdm/lang/tr-TR.rc | 2 ++ dll/cpl/sysdm/lang/uk-UA.rc | 2 ++ dll/cpl/sysdm/lang/zh-CN.rc | 4 ++- dll/cpl/sysdm/lang/zh-TW.rc | 6 +++-- dll/cpl/sysdm/resource.h | 4 ++- dll/cpl/sysdm/userprofile.c | 66 +++++++++++++++++++-------------------------- 27 files changed, 86 insertions(+), 44 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index c25f67c14d..baede2efb2 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Приложение за таблото за управление на уредбата" IDS_WARNINITIALSIZE "Въведете числена стойност за началния размер на страниращия файл." diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 72d1da8bc4..da662b1553 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -317,6 +317,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Systémový aplet kontrolních panelů" IDS_WARNINITIALSIZE "Zadejte číselnou hodnotu pro počáteční velikost stránkovacího souboru." diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 4648fb3b76..1aae2813cc 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 5d2c476410..a1cddac197 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -321,6 +321,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Obligatorisch" IDS_USERPROFILE_CONFIRM_DELETE "Soll das Profil für folgenden Benutzer gelöscht werden: %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Löschen bestätigen" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Konto unbekannt" + IDS_USERPROFILE_ACCOUNT_DELETED "Konto gelöscht" IDS_USERPROFILE_TYPE_TEXT "Soll das servergespeicherte Profil oder die lokal gespeicherte Kopie davon vom Betriebssystem verwendet werden, wenn sich %s am Computer anmeldet?" IDS_MESSAGEBOXTITLE "Systemsteuerungsoption ""System""" IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße der Auslagerungsdatei an." diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index dd802367d0..8b1ac79e06 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index caff09b781..4d75aa16f3 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 9beb41e188..89c773a83b 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -314,6 +314,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Applet de sistema del Panel de control" IDS_WARNINITIALSIZE "Introduzca el tamaño inicial del archivo de paginación." diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index d796e0e972..db30145b1c 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Entrez une valeur numérique pour la taille initiale du fichier d'échange." diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 78e56c22f4..16fd5388f1 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -314,6 +314,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 2d250b5039..99e02ffc9c 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -314,6 +314,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 8183a238d2..d873b96055 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 250ff55d72..33a0fe8bd9 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Applet di sistema del pannello di controllo" IDS_WARNINITIALSIZE "Immettere la dimensione iniziale del file di paging." diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index c39afee09e..5eadab04e6 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -103,7 +103,7 @@ END IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "General" -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 @@ -168,7 +168,7 @@ END IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 9dbdee3c3e..7a39ea7d5b 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index ef3c145d44..6fb3d8a3b0 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index f94c295792..30d148c90a 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -321,6 +321,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System" IDS_WARNINITIALSIZE "Wprowadź wielkość dla początkowego rozmiaru pliku stronicowania." diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index e269094e5e..d08ddee186 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -321,6 +321,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Specificare valori de sistem" IDS_WARNINITIALSIZE "Introduceți o valoare numerică pentru dimensiunea inițială a fișierului de paginare." diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 217886d815..87b7e95fab 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Обязательный" IDS_USERPROFILE_CONFIRM_DELETE "Вы действительно хотите удалить профиль пользователя %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Подтверждение удаления" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Панель управления системы" IDS_WARNINITIALSIZE "Введите числовое значение исходного размера файла подкачки." diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index afb21f9750..6e77a82f65 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -320,6 +320,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index ecaabd00f0..9bf0b6f710 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -312,6 +312,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Sistemi i kontrollit panelit programeve" IDS_WARNINITIALSIZE "Futni një vlerë numerike për madhësinë fillestare e faqeve të dokumentave." diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 5559dd4659..ba6975fd19 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -314,6 +314,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 3ee8505bdc..34373a7d29 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -314,6 +314,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Dizge Denetim Masası Uygulaması" IDS_WARNINITIALSIZE "Sayfalama kütüğünün başlangıç büyüklüğü için bir sayılık değer giriniz." diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index fc856bef26..2680bc4de2 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -320,6 +320,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Обов'язковий" IDS_USERPROFILE_CONFIRM_DELETE "Ви дійсно хочете видалити профіль %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Підтвердження видалення" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Елемент панелі керування" IDS_WARNINITIALSIZE "Введіть числове значення для початкового розміру файлу довантаження." diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index fbe20505f1..31655dc24c 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -171,7 +171,7 @@ END IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" -FONT 8, "MS Shell Dlg" +FONT 9, "宋体" BEGIN LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 @@ -315,6 +315,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index cb3517923e..c47d483a7f 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -106,7 +106,7 @@ END IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "一般" -FONT 8, "新細明體" +FONT 9, "新細明體" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 @@ -171,7 +171,7 @@ END IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" -FONT 8, "MS Shell Dlg" +FONT 9, "新細明體" BEGIN LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 @@ -315,6 +315,8 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_ACCOUNT_UNKNOWN "Account Unknown" + IDS_USERPROFILE_ACCOUNT_DELETED "Account Deleted" IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "系統控制面板小程序" IDS_WARNINITIALSIZE "爲分頁文件的初始大小輸入一個數字值。" diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 6b873702d8..6d9d22aff7 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -38,7 +38,9 @@ #define IDS_USERPROFILE_MANDATORY 79 #define IDS_USERPROFILE_CONFIRM_DELETE 80 #define IDS_USERPROFILE_CONFIRM_DELETE_TITLE 81 -#define IDS_USERPROFILE_TYPE_TEXT 82 +#define IDS_USERPROFILE_ACCOUNT_UNKNOWN 82 +#define IDS_USERPROFILE_ACCOUNT_DELETED 83 +#define IDS_USERPROFILE_TYPE_TEXT 84 #define IDS_MESSAGEBOXTITLE 100 #define IDS_WARNINITIALSIZE 101 diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index 6b6c402b7a..6bdcd04e2c 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -200,8 +200,8 @@ AddUserProfile( _In_ HKEY hProfileKey) { PPROFILEDATA pProfileData = NULL; - PWSTR pszAccountName = NULL; - PWSTR pszDomainName = NULL; + WCHAR szAccountName[128], szDomainName[128]; + WCHAR szNameBuffer[256]; SID_NAME_USE Use; DWORD dwAccountNameSize, dwDomainNameSize; DWORD dwProfileData; @@ -213,43 +213,39 @@ AddUserProfile( &pSid)) return; - dwAccountNameSize = 0; - dwDomainNameSize = 0; - LookupAccountSidW(NULL, - pSid, - NULL, - &dwAccountNameSize, - NULL, - &dwDomainNameSize, - &Use); - - pszDomainName = HeapAlloc(GetProcessHeap(), - 0, - dwDomainNameSize * sizeof(WCHAR)); - if (pszDomainName == NULL) - goto done; - - pszAccountName = HeapAlloc(GetProcessHeap(), - 0, - dwAccountNameSize * sizeof(WCHAR)); - if (pszAccountName == NULL) - goto done; - + dwAccountNameSize = ARRAYSIZE(szAccountName); + dwDomainNameSize = ARRAYSIZE(szDomainName); if (!LookupAccountSidW(NULL, pSid, - pszAccountName, + szAccountName, &dwAccountNameSize, - pszDomainName, + szDomainName, &dwDomainNameSize, &Use)) - goto done; + { + /* Unknown account */ + LoadStringW(hApplet, IDS_USERPROFILE_ACCOUNT_UNKNOWN, szNameBuffer, ARRAYSIZE(szNameBuffer)); + } + else + { + /* Show only the user accounts */ + if (Use != SidTypeUser) + goto done; - /* Show only the user accounts */ - if (Use != SidTypeUser) - goto done; + if (szAccountName[0] == UNICODE_NULL) + { + /* Deleted account */ + LoadStringW(hApplet, IDS_USERPROFILE_ACCOUNT_DELETED, szNameBuffer, ARRAYSIZE(szNameBuffer)); + } + else + { + /* Normal account */ + wsprintf(szNameBuffer, L"%s\\%s", szDomainName, szAccountName); + } + } dwProfileData = sizeof(PROFILEDATA) + - ((wcslen(pszDomainName) + wcslen(pszAccountName) + 2) * sizeof(WCHAR)); + ((wcslen(szNameBuffer) + 1) * sizeof(WCHAR)); pProfileData = HeapAlloc(GetProcessHeap(), 0, dwProfileData); @@ -261,7 +257,7 @@ AddUserProfile( ptr = (PWSTR)((ULONG_PTR)pProfileData + sizeof(PROFILEDATA)); pProfileData->pszFullName = ptr; - wsprintf(pProfileData->pszFullName, L"%s\\%s", pszDomainName, pszAccountName); + wcscpy(pProfileData->pszFullName, szNameBuffer); memset(&lvi, 0x00, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; @@ -271,12 +267,6 @@ AddUserProfile( ListView_InsertItem(hwndListView, &lvi); done: - if (pszDomainName != NULL) - HeapFree(GetProcessHeap(), 0, pszDomainName); - - if (pszAccountName != NULL) - HeapFree(GetProcessHeap(), 0, pszAccountName); - if (pSid != NULL) LocalFree(pSid); }

5 years, 5 months

[reactos] 01/01: [SHELL32] Add line bar to About dialog for consistence

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc99d3ad5ffe06d351024… commit cc99d3ad5ffe06d351024e207d5f0b39ec9ef30d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Mar 23 20:53:01 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 23 19:11:28 2019 +0100 [SHELL32] Add line bar to About dialog for consistence Addendum to f9d2931. CORE-15215 --- dll/win32/shell32/bitmap_res.rc | 1 + dll/win32/shell32/res/bitmaps/line.bmp | Bin 0 -> 6254 bytes dll/win32/shell32/shresdef.h | 1 + dll/win32/shell32/wine/shell32_main.c | 19 ++++++++++++++----- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/bitmap_res.rc b/dll/win32/shell32/bitmap_res.rc index f267eb74b1..80dfa6f0ed 100644 --- a/dll/win32/shell32/bitmap_res.rc +++ b/dll/win32/shell32/bitmap_res.rc @@ -1,4 +1,5 @@ IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp" +IDB_LINEBAR BITMAP "res/bitmaps/line.bmp" IDB_SHELL_IEXPLORE_LG BITMAP "res/bitmaps/204.bmp" IDB_SHELL_IEXPLORE_LG_HOT BITMAP "res/bitmaps/205.bmp" diff --git a/dll/win32/shell32/res/bitmaps/line.bmp b/dll/win32/shell32/res/bitmaps/line.bmp new file mode 100644 index 0000000000..08717d3cbe Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/line.bmp differ diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 0a8cb724ac..9f7d6747cf 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -27,6 +27,7 @@ /* Bitmaps */ #define IDB_REACTOS 131 +#define IDB_LINEBAR 138 #define IDB_SHELL_IEXPLORE_LG 204 #define IDB_SHELL_IEXPLORE_LG_HOT 205 #define IDB_SHELL_IEXPLORE_SM 206 diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 5b9ca5eae8..4ae3ea0d50 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -1132,8 +1132,8 @@ INT_PTR CALLBACK AboutAuthorsDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { static DWORD cxLogoBmp; - static DWORD cyLogoBmp; - static HBITMAP hLogoBmp; + static DWORD cyLogoBmp, cyLineBmp; + static HBITMAP hLogoBmp, hLineBmp; static HWND hWndAuthors; switch(msg) @@ -1153,8 +1153,9 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM // Preload the ROS bitmap hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hLineBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_LINEBAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - if(hLogoBmp) + if(hLogoBmp && hLineBmp) { BITMAP bmpLogo; @@ -1162,6 +1163,9 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM cxLogoBmp = bmpLogo.bmWidth; cyLogoBmp = bmpLogo.bmHeight; + + GetObject( hLineBmp, sizeof(BITMAP), &bmpLogo ); + cyLineBmp = bmpLogo.bmHeight; } // Set App-specific stuff (icon, app name, szOtherStuff string) @@ -1258,20 +1262,25 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM case WM_PAINT: { - if(hLogoBmp) + if(hLogoBmp && hLineBmp) { PAINTSTRUCT ps; HDC hdc; HDC hdcMem; + HGDIOBJ hOldObj; hdc = BeginPaint(hWnd, &ps); hdcMem = CreateCompatibleDC(hdc); if(hdcMem) { - SelectObject(hdcMem, hLogoBmp); + hOldObj = SelectObject(hdcMem, hLogoBmp); BitBlt(hdc, 0, 0, cxLogoBmp, cyLogoBmp, hdcMem, 0, 0, SRCCOPY); + SelectObject(hdcMem, hLineBmp); + BitBlt(hdc, 0, cyLogoBmp, cxLogoBmp, cyLineBmp, hdcMem, 0, 0, SRCCOPY); + + SelectObject(hdcMem, hOldObj); DeleteDC(hdcMem); }

5 years, 5 months

[reactos] 01/01: [SYSDM] Add the 'Change Profile Type' dialog.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea2ca8fa9103c47bcd9ff… commit ea2ca8fa9103c47bcd9ff1c02f6e1ef8bf3d0cfb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 23 18:24:07 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 23 18:49:40 2019 +0100 [SYSDM] Add the 'Change Profile Type' dialog. --- dll/cpl/sysdm/lang/bg-BG.rc | 13 ++++ dll/cpl/sysdm/lang/cs-CZ.rc | 13 ++++ dll/cpl/sysdm/lang/da-DK.rc | 13 ++++ dll/cpl/sysdm/lang/de-DE.rc | 13 ++++ dll/cpl/sysdm/lang/el-GR.rc | 13 ++++ dll/cpl/sysdm/lang/en-US.rc | 13 ++++ dll/cpl/sysdm/lang/es-ES.rc | 13 ++++ dll/cpl/sysdm/lang/fr-FR.rc | 13 ++++ dll/cpl/sysdm/lang/he-IL.rc | 13 ++++ dll/cpl/sysdm/lang/hu-HU.rc | 13 ++++ dll/cpl/sysdm/lang/id-ID.rc | 13 ++++ dll/cpl/sysdm/lang/it-IT.rc | 13 ++++ dll/cpl/sysdm/lang/ja-JP.rc | 13 ++++ dll/cpl/sysdm/lang/nl-NL.rc | 13 ++++ dll/cpl/sysdm/lang/no-NO.rc | 13 ++++ dll/cpl/sysdm/lang/pl-PL.rc | 13 ++++ dll/cpl/sysdm/lang/ro-RO.rc | 13 ++++ dll/cpl/sysdm/lang/ru-RU.rc | 13 ++++ dll/cpl/sysdm/lang/sk-SK.rc | 13 ++++ dll/cpl/sysdm/lang/sq-AL.rc | 13 ++++ dll/cpl/sysdm/lang/sv-SE.rc | 13 ++++ dll/cpl/sysdm/lang/tr-TR.rc | 13 ++++ dll/cpl/sysdm/lang/uk-UA.rc | 13 ++++ dll/cpl/sysdm/lang/zh-CN.rc | 13 ++++ dll/cpl/sysdm/lang/zh-TW.rc | 13 ++++ dll/cpl/sysdm/precomp.h | 1 + dll/cpl/sysdm/resource.h | 38 +++++++----- dll/cpl/sysdm/userprofile.c | 142 +++++++++++++++++++++++++++++++++++++++++++- 28 files changed, 487 insertions(+), 19 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index b8c362698f..c25f67c14d 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Пускане и възстановяване" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Приложение за таблото за управление на уредбата" IDS_WARNINITIALSIZE "Въведете числена стойност за началния размер на страниращия файл." IDS_WARNMAXIMUMSIZE "Въведете числена стойност за върховия размер на страниращия файл." diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index d49c90479d..72d1da8bc4 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -170,6 +170,18 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Spuštění a zotavení" @@ -305,6 +317,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Systémový aplet kontrolních panelů" IDS_WARNINITIALSIZE "Zadejte číselnou hodnotu pro počáteční velikost stránkovacího souboru." IDS_WARNMAXIMUMSIZE "Zadejte číselnou hodnotu pro maximální velikost stránkovacího souboru." diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index f1de9a57c0..4648fb3b76 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Fortryd", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Opstart og Gendannelse" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index e36fe0d2ac..5d2c476410 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -174,6 +174,18 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Profiltyp ändern" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Servergespeichertes Profil", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Lokales Profil", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Starten und Wiederherstellen" @@ -309,6 +321,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Obligatorisch" IDS_USERPROFILE_CONFIRM_DELETE "Soll das Profil für folgenden Benutzer gelöscht werden: %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Löschen bestätigen" + IDS_USERPROFILE_TYPE_TEXT "Soll das servergespeicherte Profil oder die lokal gespeicherte Kopie davon vom Betriebssystem verwendet werden, wenn sich %s am Computer anmeldet?" IDS_MESSAGEBOXTITLE "Systemsteuerungsoption ""System""" IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße der Auslagerungsdatei an." IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße der Auslagerungsdatei an." diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 0ce6b37bfa..dd802367d0 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Άκυρο", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Εκκίνηση και αποκατάσταση" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 40cffc4565..caff09b781 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Startup and Recovery" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 70d8949b35..9beb41e188 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -167,6 +167,18 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inicio y recuperación" @@ -302,6 +314,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Applet de sistema del Panel de control" IDS_WARNINITIALSIZE "Introduzca el tamaño inicial del archivo de paginación." IDS_WARNMAXIMUMSIZE "Introduzca el tamaño máximo del archivo de paginación." diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 77bc345257..d796e0e972 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -146,6 +146,18 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 196, 24, 50, 14 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Profils Utilisateurs" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Entrez une valeur numérique pour la taille initiale du fichier d'échange." IDS_WARNMAXIMUMSIZE "Entrez une valeur numérique pour la taille maximale du fichier d'échange." diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index a239fe0efc..78e56c22f4 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -167,6 +167,18 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "הפעלה ושחזור" @@ -302,6 +314,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 3ac63d7e51..2d250b5039 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -167,6 +167,18 @@ BEGIN PUSHBUTTON "Mégsem", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Indítás és helyreállítás" @@ -302,6 +314,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 2c043e95b3..8183a238d2 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Startup and Recovery" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 56cca496e0..250ff55d72 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Avvio e recupero" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Applet di sistema del pannello di controllo" IDS_WARNINITIALSIZE "Immettere la dimensione iniziale del file di paging." IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging." diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index f903c6d9b5..c39afee09e 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "起動と回復" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index f996b289e8..9dbdee3c3e 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Opstart- en herstelinstellingen" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 00abf6dbf3..ef3c145d44 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Oppstart og gjenoppretting" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 03c5e247ce..f94c295792 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -174,6 +174,18 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Uruchamianie i odzyskiwanie" @@ -309,6 +321,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System" IDS_WARNINITIALSIZE "Wprowadź wielkość dla początkowego rozmiaru pliku stronicowania." IDS_WARNMAXIMUMSIZE "Wprowadź wielkość dla maksymalnego rozmiaru pliku stronicowania." diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 37420a4ace..e269094e5e 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -174,6 +174,18 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Pornire și Recuperare" @@ -309,6 +321,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Specificare valori de sistem" IDS_WARNINITIALSIZE "Introduceți o valoare numerică pentru dimensiunea inițială a fișierului de paginare." IDS_WARNMAXIMUMSIZE "Introduceți o valoare numerică pentru dimensiunea maximă a fișierului de paginare." diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 0fb93e5b31..217886d815 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Загрузка и восстановление" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Обязательный" IDS_USERPROFILE_CONFIRM_DELETE "Вы действительно хотите удалить профиль пользователя %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Подтверждение удаления" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Панель управления системы" IDS_WARNINITIALSIZE "Введите числовое значение исходного размера файла подкачки." IDS_WARNMAXIMUMSIZE "Введите числовое значение для параметра максимальный размер файла подкачки." diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 905a4ded47..afb21f9750 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -173,6 +173,18 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Spúšťanie a obnovovanie" @@ -308,6 +320,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index f187550aac..ecaabd00f0 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -165,6 +165,18 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Fillimi dhe Shërimi" @@ -300,6 +312,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Sistemi i kontrollit panelit programeve" IDS_WARNINITIALSIZE "Futni një vlerë numerike për madhësinë fillestare e faqeve të dokumentave." IDS_WARNMAXIMUMSIZE "Futni një vlerë numerike për madhësinë maksimale e faqeve të dokumentave." diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index a801e2f178..5559dd4659 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -167,6 +167,18 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Start och återställning" @@ -302,6 +314,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index ea5bd2f7c4..3ee8505bdc 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -167,6 +167,18 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Başlangıç ve Kurtarma" @@ -302,6 +314,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Dizge Denetim Masası Uygulaması" IDS_WARNINITIALSIZE "Sayfalama kütüğünün başlangıç büyüklüğü için bir sayılık değer giriniz." IDS_WARNMAXIMUMSIZE "Sayfalama kütüğünün en çok büyüklüğü için bir sayılık değer giriniz." diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 3ab9a3e242..fc856bef26 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -173,6 +173,18 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Завантаження й відновлення" @@ -308,6 +320,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Обов'язковий" IDS_USERPROFILE_CONFIRM_DELETE "Ви дійсно хочете видалити профіль %s?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Підтвердження видалення" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "Елемент панелі керування" IDS_WARNINITIALSIZE "Введіть числове значення для початкового розміру файлу довантаження." IDS_WARNMAXIMUMSIZE "Введіть числове значення для максимального розміру файлу довантаження." diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 24c0b8106c..fbe20505f1 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -168,6 +168,18 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "启动和故障恢复" @@ -303,6 +315,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index b0a96bd2bb..cb3517923e 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -168,6 +168,18 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "啓動和故障恢復" @@ -303,6 +315,7 @@ BEGIN IDS_USERPROFILE_MANDATORY "Mandatory" IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" + IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." IDS_MESSAGEBOXTITLE "系統控制面板小程序" IDS_WARNINITIALSIZE "爲分頁文件的初始大小輸入一個數字值。" IDS_WARNMAXIMUMSIZE "爲分頁文件的最大大小輸入一個數字值。" diff --git a/dll/cpl/sysdm/precomp.h b/dll/cpl/sysdm/precomp.h index 5756e5cc5e..bc27dd9c77 100644 --- a/dll/cpl/sysdm/precomp.h +++ b/dll/cpl/sysdm/precomp.h @@ -13,6 +13,7 @@ #include <winreg.h> #include <wingdi.h> #include <wincon.h> +#include <windowsx.h> #include <tchar.h> #include <shellapi.h> #include <shlobj.h> diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index c920876d11..6b873702d8 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -38,26 +38,27 @@ #define IDS_USERPROFILE_MANDATORY 79 #define IDS_USERPROFILE_CONFIRM_DELETE 80 #define IDS_USERPROFILE_CONFIRM_DELETE_TITLE 81 +#define IDS_USERPROFILE_TYPE_TEXT 82 -#define IDS_MESSAGEBOXTITLE 82 -#define IDS_WARNINITIALSIZE 83 -#define IDS_WARNMAXIMUMSIZE 84 -#define IDS_WARNINITIALRANGE 85 -#define IDS_WARNMAXIMUMRANGE 86 -#define IDS_PAGEFILE_NONE 87 -#define IDS_PAGEFILE_SYSTEM 88 -#define IDS_INFOREBOOT 89 +#define IDS_MESSAGEBOXTITLE 100 +#define IDS_WARNINITIALSIZE 101 +#define IDS_WARNMAXIMUMSIZE 102 +#define IDS_WARNINITIALRANGE 103 +#define IDS_WARNMAXIMUMRANGE 104 +#define IDS_PAGEFILE_NONE 105 +#define IDS_PAGEFILE_SYSTEM 106 +#define IDS_INFOREBOOT 107 -#define IDS_HWPROFILE_CONFIRM_DELETE_TITLE 90 -#define IDS_HWPROFILE_CONFIRM_DELETE 91 -#define IDS_HWPROFILE_ALREADY_IN_USE 92 -#define IDS_HWPROFILE_PROFILE 93 -#define IDS_HWPROFILE_WARNING 94 +#define IDS_HWPROFILE_CONFIRM_DELETE_TITLE 120 +#define IDS_HWPROFILE_CONFIRM_DELETE 121 +#define IDS_HWPROFILE_ALREADY_IN_USE 122 +#define IDS_HWPROFILE_PROFILE 123 +#define IDS_HWPROFILE_WARNING 124 -#define IDS_MEGAHERTZ 95 -#define IDS_GIGAHERTZ 96 +#define IDS_MEGAHERTZ 130 +#define IDS_GIGAHERTZ 131 -#define IDS_UPTIME_FORMAT 97 +#define IDS_UPTIME_FORMAT 140 /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100 @@ -101,6 +102,11 @@ #define IDC_USERPROFILE_COPY 505 #define IDC_USERACCOUNT_LINK 506 +/* Change Profile Type */ +#define IDD_USERPROFILE_TYPE 520 +#define IDC_USERPROFILE_TYPE_TEXT 521 +#define IDC_USERPROFILE_TYPE_ROAMING 522 +#define IDC_USERPROFILE_TYPE_LOCAL 523 /* Environment variables */ #define IDD_ENVIRONMENT_VARIABLES 600 diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index 209d0c5eaa..6b6c402b7a 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -11,6 +11,7 @@ #include "precomp.h" #include <sddl.h> +#include <debug.h> typedef struct _PROFILEDATA { @@ -19,8 +20,130 @@ typedef struct _PROFILEDATA } PROFILEDATA, *PPROFILEDATA; +static +BOOL +OnProfileTypeInit( + HWND hwndDlg, + PPROFILEDATA pProfileData) +{ + PWSTR pszRawBuffer = NULL, pszCookedBuffer = NULL; + INT nLength; + + nLength = LoadStringW(hApplet, IDS_USERPROFILE_TYPE_TEXT, (PWSTR)&pszRawBuffer, 0); + pszRawBuffer = NULL; + if (nLength == 0) + return FALSE; + + pszRawBuffer = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(WCHAR)); + if (pszRawBuffer == NULL) + return FALSE; + + LoadStringW(hApplet, IDS_USERPROFILE_TYPE_TEXT, pszRawBuffer, nLength + 1); + + pszCookedBuffer = HeapAlloc(GetProcessHeap(), 0, (nLength + wcslen(pProfileData->pszFullName) + 1) * sizeof(WCHAR)); + if (pszCookedBuffer == NULL) + goto done; + + swprintf(pszCookedBuffer, pszRawBuffer, pProfileData->pszFullName); + + /* Set the full text */ + SetDlgItemText(hwndDlg, IDC_USERPROFILE_TYPE_TEXT, pszCookedBuffer); + + /* FIXME: Right now, we support local user profiles only! */ + EnableWindow(GetDlgItem(hwndDlg, IDC_USERPROFILE_TYPE_ROAMING), FALSE); + Button_SetCheck(GetDlgItem(hwndDlg, IDC_USERPROFILE_TYPE_LOCAL), BST_CHECKED); + EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + +done: + if (pszCookedBuffer != NULL) + HeapFree(GetProcessHeap(), 0, pszCookedBuffer); + + if (pszRawBuffer != NULL) + HeapFree(GetProcessHeap(), 0, pszRawBuffer); + + return TRUE; +} + + +static +INT_PTR +CALLBACK +UserProfileTypeDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + OnProfileTypeInit(hwndDlg, (PPROFILEDATA)lParam); + return TRUE; + + case WM_DESTROY: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + } + break; + } + + return FALSE; +} + + +static +BOOL +ChangeUserProfileType( + _In_ HWND hwndDlg) +{ + HWND hwndListView; + LVITEM Item; + INT iSelected; + + DPRINT("ChangeUserProfileType(%p)\n", hwndDlg); + + hwndListView = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); + if (hwndListView == NULL) + return FALSE; + + iSelected = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED); + if (iSelected == -1) + return FALSE; + + ZeroMemory(&Item, sizeof(LVITEM)); + Item.mask = LVIF_PARAM; + Item.iItem = iSelected; + Item.iSubItem = 0; + if (!ListView_GetItem(hwndListView, &Item)) + return FALSE; + + if (Item.lParam == 0) + return FALSE; + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_USERPROFILE_TYPE), + hwndDlg, + UserProfileTypeDlgProc, + (LPARAM)Item.lParam) == IDOK) + { + /* FIXME: Update the profile list view */ + return TRUE; + } + + return FALSE; +} + + static VOID -SetListViewColumns(HWND hwndListView) +SetListViewColumns( + _In_ HWND hwndListView) { LV_COLUMN column; RECT rect; @@ -73,7 +196,8 @@ static VOID AddUserProfile( _In_ HWND hwndListView, _In_ LPTSTR lpProfileSid, - _In_ PSID pMySid) + _In_ PSID pMySid, + _In_ HKEY hProfileKey) { PPROFILEDATA pProfileData = NULL; PWSTR pszAccountName = NULL; @@ -202,6 +326,7 @@ AddUserProfiles( _In_ HWND hwndListView) { HKEY hKeyUserProfiles = INVALID_HANDLE_VALUE; + HKEY hProfileKey; DWORD dwIndex; WCHAR szProfileSid[64]; DWORD dwSidLength; @@ -244,7 +369,15 @@ AddUserProfiles( &ftLastWrite)) break; - AddUserProfile(hwndListView, szProfileSid, pTokenUser->User.Sid); + if (RegOpenKeyExW(hKeyUserProfiles, + szProfileSid, + 0, + KEY_READ, + &hProfileKey) == ERROR_SUCCESS) + { + AddUserProfile(hwndListView, szProfileSid, pTokenUser->User.Sid, hProfileKey); + RegCloseKey(hProfileKey); + } } if (ListView_GetItemCount(hwndListView) != 0) @@ -327,6 +460,8 @@ DeleteUserProfile( INT iSelected; PPROFILEDATA pProfileData; + DPRINT("DeleteUserProfile()\n"); + hwndListView = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); if (hwndListView == NULL) return FALSE; @@ -392,6 +527,7 @@ UserProfileDlgProc(HWND hwndDlg, return TRUE; case IDC_USERPROFILE_CHANGE: + ChangeUserProfileType(hwndDlg); break; case IDC_USERPROFILE_DELETE:

5 years, 5 months

[reactos] 01/01: [SHPOLICY] Fix the missing backslash in SHRestricted. CORE-15666 (#1267)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3999e875be6b46b060fbe… commit 3999e875be6b46b060fbed7db2a86310191e9d10 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Sat Mar 23 19:28:39 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 23 18:28:39 2019 +0100 [SHPOLICY] Fix the missing backslash in SHRestricted. CORE-15666 (#1267) Import Wine commit https://source.winehq.org/git/wine.git/?a=commit;h=dbbfa481539acd29de47ff6c… Original patch from Yaroslav Kibysh, reported to Wine and committed there by Fabian Maurer. Thank you all! --- dll/win32/shell32/wine/shpolicy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/shell32/wine/shpolicy.c b/dll/win32/shell32/wine/shpolicy.c index d6f51ede81..97f938aec7 100644 --- a/dll/win32/shell32/wine/shpolicy.c +++ b/dll/win32/shell32/wine/shpolicy.c @@ -856,6 +856,7 @@ DWORD WINAPI SHRestricted (RESTRICTIONS policy) } lstrcpyA(regstr, strRegistryPolicyA); + lstrcatA(regstr, "\\"); lstrcatA(regstr, p->appstr); /* return 0 and don't set the cache if any registry errors occur */

5 years, 5 months

[reactos] 01/01: [WINVER] Fix WINVER theming. CORE-13343 (#1428)

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3747699735bfaf5175e62… commit 3747699735bfaf5175e62425e84d90651897b009 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Tue Mar 19 21:23:32 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 23 17:45:27 2019 +0100 [WINVER] Fix WINVER theming. CORE-13343 (#1428) Use and initialize common controls for theming support, and include a manifest as well. --- base/applications/winver/CMakeLists.txt | 2 +- base/applications/winver/winver.c | 9 +++++++++ base/applications/winver/winver.rc | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/base/applications/winver/CMakeLists.txt b/base/applications/winver/CMakeLists.txt index af0286db2c..ac5b762b83 100644 --- a/base/applications/winver/CMakeLists.txt +++ b/base/applications/winver/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(winver winver.c winver.rc) set_module_type(winver win32gui UNICODE) -add_importlibs(winver shell32 msvcrt kernel32) +add_importlibs(winver shell32 comctl32 msvcrt kernel32) add_cd_file(TARGET winver DESTINATION reactos/system32 FOR all) diff --git a/base/applications/winver/winver.c b/base/applications/winver/winver.c index bbac278274..1e22096c4e 100644 --- a/base/applications/winver/winver.c +++ b/base/applications/winver/winver.c @@ -7,14 +7,23 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <winuser.h> +#include <commctrl.h> #include <shellapi.h> int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) { + INITCOMMONCONTROLSEX iccx; + UNREFERENCED_PARAMETER(hInstance); UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(nCmdShow); + /* Initialize common controls */ + iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccx.dwICC = ICC_STANDARD_CLASSES | ICC_WIN95_CLASSES; + InitCommonControlsEx(&iccx); + return ShellAboutW(NULL, L"ReactOS", NULL, NULL); } diff --git a/base/applications/winver/winver.rc b/base/applications/winver/winver.rc index bc853f8a4b..050ae69437 100644 --- a/base/applications/winver/winver.rc +++ b/base/applications/winver/winver.rc @@ -1,5 +1,10 @@ +#include <windef.h> +#include <winuser.h> + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Version Program" #define REACTOS_STR_INTERNAL_NAME "winver" #define REACTOS_STR_ORIGINAL_FILENAME "winver.exe" #include <reactos/version.rc> + +#include <reactos/manifest_exe.rc>

5 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2019