Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [HDWWIZ] Update Romanian (ro-RO) translation (#6080)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40f17bc9f26560295ad46… commit 40f17bc9f26560295ad46f76e287ea2ec6c49ad9 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Dec 15 12:38:38 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 15 11:38:38 2023 +0100 [HDWWIZ] Update Romanian (ro-RO) translation (#6080) --- dll/cpl/hdwwiz/lang/ro-RO.rc | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/dll/cpl/hdwwiz/lang/ro-RO.rc b/dll/cpl/hdwwiz/lang/ro-RO.rc index 71711116125..4aaa099b39b 100644 --- a/dll/cpl/hdwwiz/lang/ro-RO.rc +++ b/dll/cpl/hdwwiz/lang/ro-RO.rc @@ -11,13 +11,13 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bun venit la adăugarea de dispozitive", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Bun venit la Expertul de Adăugare de dispozitive", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "Acest expert vă va ajuta la:", -1, 114, 40, 182, 8 - LTEXT "1) Instalarea software-ului aferente dispozitivelor pe care le adăugați calculatorului.", -1, 121, 56, 184, 16 - LTEXT "2) Depanarea problemelor pe care le-ați putea întâmpina la instalarea dispozitivelor.", -1, 121, 78, 185, 19 + LTEXT "1) Instalarea componentelor logice aferente dispozitivului pe care le adăugați calculatorului.", -1, 121, 56, 184, 16 + LTEXT "2) Depanarea problemelor pe care le-ați putea întâmpina la instalarea dispozitivului.", -1, 121, 78, 185, 19 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 LTEXT "În cazul în care dispozitivul este însoțit de un CD de instalare, este recomandată închiderea acestui expert și utilizarea CD-ului de instalare.", 503, 150, 106, 155, 50 LTEXT "Pentru a continua, apăsați „Înainte”.", -1, 114, 166, 193, 8 @@ -25,7 +25,7 @@ END IDD_SEARCHPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -34,7 +34,7 @@ END IDD_ISCONNECTEDPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Dispozitivul este conectat la calculator?", -1, 20, 11, 275, 8 @@ -44,49 +44,49 @@ END IDD_PROBELISTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Alegeți din lista de mai jos un dispozitiv instalat, apoi apăsați „Înainte” pentru a-i inspecta proprietățile sau pentru a depana o posibilă problemă.", -1, 21, 8, 275, 22 - LTEXT "Pentru a adăuga un dispozitiv neinclus în listă, alegeți „adaugă un nou dispozitiv”", -1, 21, 32, 275, 24 + LTEXT "Pentru a adăuga un dispozitiv neinclus în listă, alegeți „Adaugă un nou dispozitiv”", -1, 21, 32, 275, 24 LTEXT "&Dispozitive instalate:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Expertul poate încerca detectarea și instalarea automată a dispozitivelor. Altfel, dacă știți exact modelul dispozitivului, îl veți putea manual alege dintr-o listă.", -1, 21, 8, 280, 24 - LTEXT "Ce preferați să facă expertul?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "Să &caute și automat să instaleze driverul necesar (Recomandat)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + LTEXT "Asistentul poate încerca detectarea și instalarea automată a dispozitivului. Altfel, dacă știți exact modelul dispozitivului, îl veți putea manual alege dintr-o listă.", -1, 21, 8, 280, 24 + LTEXT "Ce preferați să facă asistentul?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "Să &caute și automat să instaleze driverului necesar (Recomandat)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "Să instaleze driverul pe care îl voi specifica &manual (Avansat)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "dispozitive detectate:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Dispozitive detectate:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Dacă nu regăsiți categoria pe care o căutați, specificați „afișează toate”.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "Dacă nu regăsiți categoria pe care o căutați, apăsați pe Afișează toate dispozitivele.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Tip&uri obișnuite de dispozitive:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Căutarea dispozitivului poate dura câteva minute.", -1, 21, 8, 275, 15 @@ -98,18 +98,18 @@ END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Încheiere proces de instalare", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "Ați încheiat cu succes adăugarea dispozitivului.", -1, 114, 32, 193, 19 + LTEXT "Ați încheiat cu succes adăugarea dispozitivul.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 LTEXT "Pentru a închide fereastra expertului, apăsați „Sfârșit”.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Încheiere proces de instalare", IDC_FINISHTITLE, 114, 8, 203, 24 @@ -120,10 +120,10 @@ END IDD_HWSTATUSPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Încheire proces de instalare", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Încheiere proces de instalare", IDC_FINISHTITLE, 114, 8, 195, 28 LTEXT "Starea curentă a dispozitivului selectat:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP LTEXT "Pentru a porni un program de depanare pentru rezolvarea posibilelor probleme de instalare, apăsați „Sfârșit”.", -1, 114, 136, 193, 16 @@ -132,25 +132,25 @@ END IDD_NOTCONNECTEDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Adăugarea dispozitivelor nu poate continua", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "Pentru a continua, conectați dispozitivul la calculator.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "În&chide calculatorul când apăs „Sfârșit” pentru a putea deschide calculatorul și conecta dispozitivul.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "De obicei ReactOS poate instala dispozitive în mod automat, imediat după conectarea lor. Dacă ReactOS nu va detecta în mod automat noul dispozitiv, redeschideți acest expert de adăugare a dispozitivelor.", -1, 114, 98, 193, 32 + LTEXT "Adăugarea dispozitivului nu poate continua", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Pentru a continua, conectați dispozitivului la calculator.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "În&chide calculatorul când apăs „Sfârșit” pentru a putea deschide calculatorul și conecta hardware-ul.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "De obicei ReactOS poate instala dispozitive în mod automat, imediat după conectarea lor. Dacă ReactOS nu va detecta în mod automat noul dispozitiv, redeschideți acest expert de adăugare a dispozitivului.", -1, 114, 98, 193, 32 LTEXT "Pentru a închide acest expert, apăsați „Sfârșit”.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN - IDS_CPLNAME "Adăugare dispozitive" + IDS_CPLNAME "Adăugare de dispozitive" IDS_CPLDESCRIPTION "Adaugarea de dispozitive la calculator." - IDS_SEARCHTITLE "Așteptați căutarea de dispozitive…" - IDS_SEARCHTEXT "Expertul caută dispozitive recent conectate, care nu au fost încă instalate." + IDS_SEARCHTITLE "Poate dura ceva timp până când expertul caută…" + IDS_SEARCHTEXT "Asistentul caută dispozitive recent conectate, care nu au fost încă instalate." IDS_ISCONNECTED "Dispozitivul este conectat?" - IDS_PROBELISTTITLE "dispozitive deja instalate în calculator." - IDS_ADDNEWDEVICE "adăugă un nou dispozitiv" - IDS_SELECTWAYTITLE "Acest expert vă poate ajuta la instalarea noilor dispozitive." + IDS_PROBELISTTITLE "Următoarele dispozitive sunt deja instalate în calculator." + IDS_ADDNEWDEVICE "Adăugă un nou dispozitiv hardware" + IDS_SELECTWAYTITLE "Acest expert vă poate ajuta la instalarea altor dispozitive hardware." IDS_HDTYPESTITLE "Alegeți categoria dispozitivului pe care doriți să o instalați." END

10 months, 1 week

[reactos] 01/01: [SHIMGVW] Fix and improve zooming (#6167)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0179741d1a5aa67ee62a… commit f0179741d1a5aa67ee62a0f33b07962b63a5fad1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 15 15:16:50 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 15 15:16:50 2023 +0900 [SHIMGVW] Fix and improve zooming (#6167) - Add WC_ZOOM window class and use it for zooming. - Add ZoomWnd_OnDraw function and use it in ZoomWnd_OnPaint. - Use memory bitmap to reduce flickering. - Make rendering pixel-perfect. CORE-19220 --- dll/win32/shimgvw/shimgvw.c | 360 ++++++++++++++++++++++++-------------------- dll/win32/shimgvw/shimgvw.h | 1 + 2 files changed, 200 insertions(+), 161 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 17dfc369e38..c84314b1828 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -21,16 +21,16 @@ #define SLIDESHOW_TIMER_ID 0xFACE #define SLIDESHOW_TIMER_INTERVAL 5000 /* 5 seconds */ -HINSTANCE g_hInstance = NULL; -HWND g_hMainWnd = NULL; -HWND g_hwndFullscreen = NULL; -SHIMGVW_SETTINGS g_Settings; -SHIMGVW_FILENODE *g_pCurrentFile; -GpImage *g_pImage = NULL; +HINSTANCE g_hInstance = NULL; +HWND g_hMainWnd = NULL; +HWND g_hwndFullscreen = NULL; +SHIMGVW_FILENODE * g_pCurrentFile = NULL; +GpImage * g_pImage = NULL; +SHIMGVW_SETTINGS g_Settings; static const UINT s_ZoomSteps[] = { - 5, 10, 25, 50, 100, 125, 200, 300, 500, 1000 + 5, 10, 25, 50, 100, 200, 300, 500, 1000, 2000, 4000 }; #define MIN_ZOOM s_ZoomSteps[0] @@ -100,7 +100,6 @@ typedef struct tagPREVIEW_DATA HWND m_hwndZoom; HWND m_hwndToolBar; INT m_nZoomPercents; - WNDPROC m_fnPrevProc; ANIME m_Anime; /* Animation */ } PREVIEW_DATA, *PPREVIEW_DATA; @@ -116,30 +115,39 @@ Preview_IsMainWnd(HWND hwnd) return hwnd == g_hMainWnd; } +static VOID +Preview_RestartTimer(HWND hwnd) +{ + if (!Preview_IsMainWnd(hwnd)) + { + KillTimer(hwnd, SLIDESHOW_TIMER_ID); + SetTimer(hwnd, SLIDESHOW_TIMER_ID, SLIDESHOW_TIMER_INTERVAL, NULL); + } +} + static VOID Preview_UpdateZoom(PPREVIEW_DATA pData, UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { BOOL bEnableZoomIn, bEnableZoomOut; HWND hToolBar = pData->m_hwndToolBar; - /* If zoom has not been changed, ignore it */ - if (pData->m_nZoomPercents == NewZoom) - return; - pData->m_nZoomPercents = NewZoom; /* Check if a zoom button of the toolbar must be grayed */ - bEnableZoomIn = (NewZoom < MAX_ZOOM); + bEnableZoomIn = (NewZoom < MAX_ZOOM); bEnableZoomOut = (NewZoom > MIN_ZOOM); /* Update toolbar buttons */ - SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_OUT, bEnableZoomOut); - SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_IN, bEnableZoomIn); - SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); - SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); + PostMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_OUT, bEnableZoomOut); + PostMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_IN, bEnableZoomIn); + PostMessageW(hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); + PostMessageW(hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); /* Redraw the display window */ - InvalidateRect(pData->m_hwndZoom, NULL, FALSE); + InvalidateRect(pData->m_hwndZoom, NULL, TRUE); + + /* Restart timer if necessary */ + Preview_RestartTimer(pData->m_hwnd); } static VOID @@ -389,8 +397,8 @@ static VOID Preview_UpdateUI(PPREVIEW_DATA pData) { BOOL bEnable = (g_pImage != NULL); - SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); - SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); + PostMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); + PostMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); if (!Preview_IsMainWnd(pData->m_hwnd)) Preview_ResetZoom(pData); @@ -530,7 +538,7 @@ pFreeFileList(SHIMGVW_FILENODE *root) } } -static HBRUSH CreateCheckerBoardBrush(HDC hdc) +static HBRUSH CreateCheckerBoardBrush(VOID) { static const CHAR pattern[] = "\x28\x00\x00\x00\x10\x00\x00\x00\x10\x00\x00\x00\x01\x00\x04\x00\x00\x00" @@ -551,59 +559,63 @@ static HBRUSH CreateCheckerBoardBrush(HDC hdc) } static VOID -ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) +ZoomWnd_OnDraw( + PPREVIEW_DATA pData, + HDC hdc, + LPRECT prcPaint, + LPRECT prcClient) { GpGraphics *graphics; - INT ZoomedWidth, ZoomedHeight, x, y; - PAINTSTRUCT ps; - RECT rect, margin; - HDC hdc; + INT ZoomedWidth, ZoomedHeight; + RECT rect, rcClient = *prcClient; + HDC hdcMem; HBRUSH hBrush; HPEN hPen; - HGDIOBJ hbrOld, hPenOld, hFontOld; + HGDIOBJ hbrOld, hbmOld, hPenOld; UINT uFlags; + HBITMAP hbmMem; + SIZE paintSize = { prcPaint->right - prcPaint->left, prcPaint->bottom - prcPaint->top }; + COLORREF color0, color1; + GpImageAttributes *imageAttributes; - hdc = BeginPaint(hwnd, &ps); - if (!hdc) - { - DPRINT1("BeginPaint() failed\n"); - return; - } - - GdipCreateFromHDC(hdc, &graphics); - if (!graphics) - { - DPRINT1("GdipCreateFromHDC() failed\n"); - return; - } - - GetClientRect(hwnd, &rect); + /* We use a memory bitmap to reduce flickering */ + hdcMem = CreateCompatibleDC(hdc); + hbmMem = CreateCompatibleBitmap(hdc, paintSize.cx, paintSize.cy); + hbmOld = SelectObject(hdcMem, hbmMem); + /* Choose colors */ if (Preview_IsMainWnd(pData->m_hwnd)) { - hPen = (HPEN)GetStockObject(BLACK_PEN); - hBrush = (HBRUSH)GetStockObject(WHITE_BRUSH); - SetTextColor(hdc, RGB(0, 0, 0)); /* Black text */ + color0 = GetSysColor(COLOR_WINDOW); + color1 = GetSysColor(COLOR_WINDOWTEXT); } else { - hPen = (HPEN)GetStockObject(WHITE_PEN); - hBrush = (HBRUSH)GetStockObject(BLACK_BRUSH); - SetTextColor(hdc, RGB(255, 255, 255)); /* White text */ + color0 = RGB(0, 0, 0); + color1 = RGB(255, 255, 255); } + hBrush = CreateSolidBrush(color0); + SetBkColor(hdcMem, color0); + + hPen = CreatePen(PS_SOLID, 1, color1); + SetTextColor(hdcMem, color1); + + /* Fill background */ + SetRect(&rect, 0, 0, paintSize.cx, paintSize.cy); + FillRect(hdcMem, &rect, hBrush); + + DeleteObject(hBrush); + if (g_pImage == NULL) { WCHAR szText[128]; LoadStringW(g_hInstance, IDS_NOPREVIEW, szText, _countof(szText)); - FillRect(hdc, &rect, hBrush); - - hFontOld = SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); - SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, szText, -1, &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER | - DT_NOPREFIX); - SelectObject(hdc, hFontOld); + SelectObject(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); + OffsetRect(&rcClient, -prcPaint->left, -prcPaint->top); + DrawTextW(hdcMem, szText, -1, &rcClient, DT_SINGLELINE | DT_CENTER | DT_VCENTER | + DT_NOPREFIX); } else { @@ -612,34 +624,17 @@ ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) GdipGetImageWidth(g_pImage, &ImageWidth); GdipGetImageHeight(g_pImage, &ImageHeight); - ZoomedWidth = (ImageWidth * pData->m_nZoomPercents) / 100; + ZoomedWidth = (ImageWidth * pData->m_nZoomPercents) / 100; ZoomedHeight = (ImageHeight * pData->m_nZoomPercents) / 100; - x = (rect.right - ZoomedWidth) / 2; - y = (rect.bottom - ZoomedHeight) / 2; - - // Fill top part - margin = rect; - margin.bottom = y - 1; - FillRect(hdc, &margin, hBrush); - // Fill bottom part - margin.top = y + ZoomedHeight + 1; - margin.bottom = rect.bottom; - FillRect(hdc, &margin, hBrush); - // Fill left part - margin.top = y - 1; - margin.bottom = y + ZoomedHeight + 1; - margin.right = x - 1; - FillRect(hdc, &margin, hBrush); - // Fill right part - margin.left = x + ZoomedWidth + 1; - margin.right = rect.right; - FillRect(hdc, &margin, hBrush); - - DPRINT("x = %d, y = %d, ImageWidth = %u, ImageHeight = %u\n"); - DPRINT("rect.right = %ld, rect.bottom = %ld\n", rect.right, rect.bottom); - DPRINT("m_nZoomPercents = %d, ZoomedWidth = %d, ZoomedHeight = %d\n", - pData->m_nZoomPercents, ZoomedWidth, ZoomedWidth); + GdipCreateFromHDC(hdcMem, &graphics); + if (!graphics) + { + DPRINT1("error: GdipCreateFromHDC\n"); + return; + } + + GdipGetImageFlags(g_pImage, &uFlags); if (pData->m_nZoomPercents % 100 == 0) { @@ -652,30 +647,61 @@ ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) GdipSetSmoothingMode(graphics, SmoothingModeHighQuality); } - uFlags = 0; - GdipGetImageFlags(g_pImage, &uFlags); + rect.left = (rcClient.right - ZoomedWidth ) / 2; + rect.top = (rcClient.bottom - ZoomedHeight) / 2; + rect.right = rect.left + ZoomedWidth; + rect.bottom = rect.top + ZoomedHeight; + OffsetRect(&rect, -prcPaint->left, -prcPaint->top); - hPenOld = SelectObject(hdc, hPen); + InflateRect(&rect, +1, +1); /* Add Rectangle() pen width */ + + /* Draw a rectangle. Fill by checker board if necessary */ if (uFlags & (ImageFlagsHasAlpha | ImageFlagsHasTranslucent)) - { - HBRUSH hbr = CreateCheckerBoardBrush(hdc); - hbrOld = SelectObject(hdc, hbr); - Rectangle(hdc, x - 1, y - 1, x + ZoomedWidth + 1, y + ZoomedHeight + 1); - SelectObject(hdc, hbrOld); - DeleteObject(hbr); - } + hbrOld = SelectObject(hdcMem, CreateCheckerBoardBrush()); else - { - hbrOld = SelectObject(hdc, GetStockObject(NULL_BRUSH)); - Rectangle(hdc, x - 1, y - 1, x + ZoomedWidth + 1, y + ZoomedHeight + 1); - SelectObject(hdc, hbrOld); - } - SelectObject(hdc, hPenOld); + hbrOld = SelectObject(hdcMem, GetStockBrush(NULL_BRUSH)); + hPenOld = SelectObject(hdcMem, hPen); + Rectangle(hdcMem, rect.left, rect.top, rect.right, rect.bottom); + DeleteObject(SelectObject(hdcMem, hbrOld)); + DeleteObject(SelectObject(hdcMem, hPenOld)); + + InflateRect(&rect, -1, -1); /* Subtract Rectangle() pen width */ + + /* Image attributes are required to draw image correctly */ + GdipCreateImageAttributes(&imageAttributes); + GdipSetImageAttributesWrapMode(imageAttributes, WrapModeTile, + GetBkColor(hdcMem) | 0xFF000000, TRUE); + + /* Draw image. -0.5f is used for interpolation */ + GdipDrawImageRectRect(graphics, g_pImage, + rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + -0.5f, -0.5f, ImageWidth, ImageHeight, + UnitPixel, imageAttributes, NULL, NULL); + + GdipDisposeImageAttributes(imageAttributes); + GdipDeleteGraphics(graphics); + } - GdipDrawImageRectI(graphics, g_pImage, x, y, ZoomedWidth, ZoomedHeight); + BitBlt(hdc, prcPaint->left, prcPaint->top, paintSize.cx, paintSize.cy, hdcMem, 0, 0, SRCCOPY); + DeleteObject(SelectObject(hdcMem, hbmOld)); + DeleteDC(hdcMem); +} + +static VOID +ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) +{ + PAINTSTRUCT ps; + HDC hDC; + RECT rcClient; + + hDC = BeginPaint(hwnd, &ps); + if (hDC) + { + GetClientRect(hwnd, &rcClient); + ZoomWnd_OnDraw(pData, hDC, &ps.rcPaint, &rcClient); + EndPaint(hwnd, &ps); } - GdipDeleteGraphics(graphics); - EndPaint(hwnd, &ps); } static VOID @@ -727,13 +753,12 @@ Preview_CreateToolBar(PPREVIEW_DATA pData) HWND hwndToolBar; HIMAGELIST hImageList, hOldImageList; DWORD style = WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS; - DWORD exstyle = 0; if (!Preview_IsMainWnd(pData->m_hwnd)) return TRUE; /* FIXME */ style |= CCS_BOTTOM; - hwndToolBar = CreateWindowExW(exstyle, TOOLBARCLASSNAMEW, NULL, style, + hwndToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style, 0, 0, 0, 0, pData->m_hwnd, NULL, g_hInstance, NULL); if (!hwndToolBar) return FALSE; @@ -762,12 +787,39 @@ Preview_CreateToolBar(PPREVIEW_DATA pData) return TRUE; } +static VOID +Preview_EndSlideShow(HWND hwnd) +{ + if (Preview_IsMainWnd(hwnd)) + return; + + KillTimer(hwnd, SLIDESHOW_TIMER_ID); + ShowWindow(hwnd, SW_HIDE); + ShowWindow(g_hMainWnd, SW_SHOWNORMAL); + Preview_ResetZoom(Preview_GetData(g_hMainWnd)); +} + +static VOID +ZoomWnd_OnButtonDown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HWND hParent = GetParent(hwnd); + if (!Preview_IsMainWnd(hParent)) + Preview_EndSlideShow(hParent); +} + LRESULT CALLBACK ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PPREVIEW_DATA pData = Preview_GetData(hwnd); switch (uMsg) { + case WM_LBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_RBUTTONDOWN: + { + ZoomWnd_OnButtonDown(hwnd, uMsg, wParam, lParam); + break; + } case WM_PAINT: { ZoomWnd_OnPaint(pData, hwnd); @@ -781,7 +833,7 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } default: { - return CallWindowProcW(pData->m_fnPrevProc, hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); } } return 0; @@ -790,21 +842,29 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static BOOL Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) { + DWORD exstyle = 0; HWND hwndZoom; PPREVIEW_DATA pData = QuickAlloc(sizeof(PREVIEW_DATA), TRUE); pData->m_hwnd = hwnd; SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + DragAcceptFiles(hwnd, TRUE); + if (g_hMainWnd == NULL) + { g_hMainWnd = hwnd; + exstyle |= WS_EX_CLIENTEDGE; + } else if (g_hwndFullscreen == NULL) + { g_hwndFullscreen = hwnd; + } else + { return FALSE; + } - DragAcceptFiles(hwnd, TRUE); - - hwndZoom = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, NULL, WS_CHILD | WS_VISIBLE, + hwndZoom = CreateWindowExW(exstyle, WC_ZOOM, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); if (!hwndZoom) { @@ -814,10 +874,7 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) pData->m_hwndZoom = hwndZoom; SetWindowLongPtrW(hwndZoom, GWLP_USERDATA, (LONG_PTR)pData); - - SetClassLongPtr(pData->m_hwndZoom, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); - pData->m_fnPrevProc = (WNDPROC)SetWindowLongPtrW(pData->m_hwndZoom, - GWLP_WNDPROC, (LPARAM)ZoomWndProc); + Anime_SetTimerWnd(&pData->m_Anime, pData->m_hwndZoom); if (!Preview_CreateToolBar(pData)) { @@ -825,8 +882,6 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) return FALSE; } - Anime_SetTimerWnd(&pData->m_Anime, pData->m_hwndZoom); - if (pCS && pCS->lpCreateParams) { LPCWSTR pszFileName = (LPCWSTR)pCS->lpCreateParams; @@ -867,6 +922,7 @@ Preview_OnMoveSize(HWND hwnd) wp.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(hwnd, &wp); + /* Remember window position and size */ prc = &wp.rcNormalPosition; g_Settings.X = prc->left; g_Settings.Y = prc->top; @@ -906,18 +962,6 @@ Preview_OnSize(HWND hwnd) } } -static VOID -Preview_EndSlideShow(HWND hwnd) -{ - if (Preview_IsMainWnd(hwnd)) - return; - - KillTimer(hwnd, SLIDESHOW_TIMER_ID); - ShowWindow(hwnd, SW_HIDE); - ShowWindow(g_hMainWnd, SW_SHOWNORMAL); - Preview_ResetZoom(Preview_GetData(g_hMainWnd)); -} - static VOID Preview_Delete(PPREVIEW_DATA pData) { @@ -995,37 +1039,35 @@ Preview_Edit(HWND hwnd) } static VOID -Preview_StartSlideShow(PPREVIEW_DATA pData) +Preview_ToggleSlideShow(PPREVIEW_DATA pData) { - HWND hwnd = g_hwndFullscreen; - DWORD style = WS_POPUP | WS_CLIPSIBLINGS, exstyle = WS_EX_TOPMOST; - - ShowWindow(pData->m_hwnd, SW_HIDE); - - if (!IsWindow(hwnd)) + if (!IsWindow(g_hwndFullscreen)) { + DWORD style = WS_POPUP | WS_CLIPSIBLINGS, exstyle = WS_EX_TOPMOST; WCHAR szTitle[256]; LoadStringW(g_hInstance, IDS_APPTITLE, szTitle, _countof(szTitle)); - hwnd = CreateWindowExW(exstyle, WC_PREVIEW, szTitle, style, - 0, 0, 0, 0, NULL, NULL, g_hInstance, NULL); + g_hwndFullscreen = CreateWindowExW(exstyle, WC_PREVIEW, szTitle, style, + 0, 0, 0, 0, NULL, NULL, g_hInstance, NULL); } - ShowWindow(hwnd, SW_SHOWMAXIMIZED); - UpdateWindow(hwnd); - - SetTimer(hwnd, SLIDESHOW_TIMER_ID, SLIDESHOW_TIMER_INTERVAL, NULL); + if (IsWindowVisible(g_hwndFullscreen)) + { + ShowWindow(g_hwndFullscreen, SW_HIDE); + ShowWindow(g_hMainWnd, SW_SHOWNORMAL); + KillTimer(g_hwndFullscreen, SLIDESHOW_TIMER_ID); + } + else + { + ShowWindow(g_hMainWnd, SW_HIDE); + ShowWindow(g_hwndFullscreen, SW_SHOWMAXIMIZED); + Preview_RestartTimer(g_hwndFullscreen); + } } static VOID Preview_GoNextPic(PPREVIEW_DATA pData, BOOL bNext) { - HWND hwnd = pData->m_hwnd; - if (!Preview_IsMainWnd(hwnd)) - { - KillTimer(hwnd, SLIDESHOW_TIMER_ID); - SetTimer(hwnd, SLIDESHOW_TIMER_ID, SLIDESHOW_TIMER_INTERVAL, NULL); - } - + Preview_RestartTimer(pData->m_hwnd); if (g_pCurrentFile) { if (bNext) @@ -1061,10 +1103,7 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) break; case IDC_SLIDE_SHOW: - if (Preview_IsMainWnd(hwnd)) - Preview_StartSlideShow(pData); - else - Preview_EndSlideShow(hwnd); + Preview_ToggleSlideShow(pData); break; case IDC_ZOOM_IN: @@ -1162,7 +1201,6 @@ Preview_OnDestroy(HWND hwnd) Anime_FreeInfo(&pData->m_Anime); - SetWindowLongPtrW(pData->m_hwndZoom, GWLP_WNDPROC, (LPARAM)pData->m_fnPrevProc); SetWindowLongPtrW(pData->m_hwndZoom, GWLP_USERDATA, 0); DestroyWindow(pData->m_hwndZoom); pData->m_hwndZoom = NULL; @@ -1170,6 +1208,7 @@ Preview_OnDestroy(HWND hwnd) DestroyWindow(pData->m_hwndToolBar); pData->m_hwndToolBar = NULL; + SetWindowLongPtrW(pData->m_hwnd, GWLP_USERDATA, 0); QuickFree(pData); PostQuitMessage(0); @@ -1190,13 +1229,6 @@ Preview_OnDropFiles(HWND hwnd, HDROP hDrop) DragFinish(hDrop); } -static VOID -Preview_OnButtonDown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - if (!Preview_IsMainWnd(hwnd)) - Preview_EndSlideShow(hwnd); -} - LRESULT CALLBACK PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1245,11 +1277,11 @@ PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Preview_OnDropFiles(hwnd, (HDROP)wParam); break; } - case WM_LBUTTONDOWN: - case WM_MBUTTONDOWN: - case WM_RBUTTONDOWN: + case WM_SYSCOLORCHANGE: { - Preview_OnButtonDown(hwnd, uMsg, wParam, lParam); + PPREVIEW_DATA pData = Preview_GetData(hwnd); + InvalidateRect(pData->m_hwnd, NULL, TRUE); + InvalidateRect(pData->m_hwndZoom, NULL, TRUE); break; } case WM_DESTROY: @@ -1311,7 +1343,13 @@ ImageView_Main(HWND hwnd, LPCWSTR szFileName) WndClass.style = CS_HREDRAW | CS_VREDRAW; WndClass.hIcon = LoadIconW(g_hInstance, MAKEINTRESOURCEW(IDI_APP_ICON)); WndClass.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); - WndClass.hbrBackground = NULL; /* less flicker */ + WndClass.hbrBackground = (HBRUSH)UlongToHandle(COLOR_3DFACE + 1); + if (!RegisterClassW(&WndClass)) + return -1; + WndClass.lpszClassName = WC_ZOOM; + WndClass.lpfnWndProc = ZoomWndProc; + WndClass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + WndClass.hbrBackground = GetStockBrush(NULL_BRUSH); /* less flicker */ if (!RegisterClassW(&WndClass)) return -1; diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index cebbaea06b3..0506c2a6af2 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -49,6 +49,7 @@ typedef struct tagSHIMGVW_FILENODE } SHIMGVW_FILENODE; #define WC_PREVIEW L"ShImgVw:CPreviewWnd" +#define WC_ZOOM L"ShImgVw:CZoomWnd" /* Animation */ typedef struct tagANIME

10 months, 1 week

[reactos] 01/01: [USER32] GetNextDlgGroupItem(): Remove WineSync copy-pasta (#6162)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae534e8cee73c1b938c69… commit ae534e8cee73c1b938c69f129d455dd77bfc55f8 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Dec 14 15:41:58 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 14 14:41:58 2023 +0000 [USER32] GetNextDlgGroupItem(): Remove WineSync copy-pasta (#6162) Improve WineSync. Addendum to 61fb8a2 (r19831). --- win32ss/user/user32/windows/dialog.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 842aeb5b0a3..0fb12e55e28 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -2296,25 +2296,18 @@ GetNextDlgGroupItem( { if (!IsChild (hDlg, hCtl)) return 0; /* Make sure hwndCtrl is a top-level child */ - } else { /* No ctrl specified -> start from the beginning */ if (!(hCtl = GetWindow( hDlg, GW_CHILD ))) return 0; - /* MSDN is wrong. fPrevious does not result in the last child */ - - /* No ctrl specified -> start from the beginning */ - if (!(hCtl = GetWindow( hDlg, GW_CHILD ))) return 0; - - /* MSDN is wrong. fPrevious does not result in the last child */ + /* MSDN is wrong. bPrevious does not result in the last child */ /* Maybe that first one is valid. If so then we don't want to skip it*/ if ((GetWindowLongPtrW( hCtl, GWL_STYLE ) & (WS_VISIBLE|WS_DISABLED)) == WS_VISIBLE) { return hCtl; } - } /* Always go forward around the group and list of controls; for the

10 months, 1 week

[reactos] 01/01: [NTUSER] window.c: Don't use RETURN() macro (#6150)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f5fd1d09e1fe5f7a5319… commit 3f5fd1d09e1fe5f7a5319d78b9bfcc16a08eaf0b Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Dec 14 21:36:38 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 14 14:36:38 2023 +0000 [NTUSER] window.c: Don't use RETURN() macro (#6150) --- win32ss/user/ntuser/window.c | 245 +++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 135 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 27881a1cdf9..9472a67af23 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -1168,7 +1168,7 @@ co_IntSetParent(PWND Wnd, PWND WndNewParent) if (Wnd == Wnd->head.rpdesk->spwndMessage) { EngSetLastError(ERROR_ACCESS_DENIED); - return( NULL); + return NULL; } /* Some applications try to set a child as a parent */ @@ -1300,14 +1300,14 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) if (IntIsBroadcastHwnd(hWndChild) || IntIsBroadcastHwnd(hWndNewParent)) { EngSetLastError(ERROR_INVALID_PARAMETER); - return( NULL); + return NULL; } if (hWndChild == IntGetDesktopWindow()) { ERR("UserSetParent Access Denied!\n"); EngSetLastError(ERROR_ACCESS_DENIED); - return( NULL); + return NULL; } if (hWndNewParent) @@ -1315,21 +1315,21 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) if (!(WndParent = UserGetWindowObject(hWndNewParent))) { ERR("UserSetParent Bad New Parent!\n"); - return( NULL); + return NULL; } } else { if (!(WndParent = UserGetWindowObject(IntGetDesktopWindow()))) { - return( NULL); + return NULL; } } if (!(Wnd = UserGetWindowObject(hWndChild))) { ERR("UserSetParent Bad Child!\n"); - return( NULL); + return NULL; } UserRefObjectCo(Wnd, &Ref); @@ -1346,7 +1346,7 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) UserDereferenceObject(WndOldParent); } - return( hWndOldParent); + return hWndOldParent; } /* Unlink the window from siblings. Children and parent are kept in place. */ @@ -3037,28 +3037,23 @@ BOOLEAN APIENTRY NtUserDestroyWindow(HWND Wnd) { PWND Window; - DECLARE_RETURN(BOOLEAN); - BOOLEAN ret; + BOOLEAN ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserDestroyWindow\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(Wnd))) + Window = UserGetWindowObject(Wnd); + if (Window) { - RETURN(FALSE); + UserRefObjectCo(Window, &Ref); // FIXME: Dunno if win should be reffed during destroy... + ret = co_UserDestroyWindow(Window); + UserDerefObjectCo(Window); // FIXME: Dunno if win should be reffed during destroy... } - UserRefObjectCo(Window, &Ref); // FIXME: Dunno if win should be reffed during destroy... - ret = co_UserDestroyWindow(Window); - UserDerefObjectCo(Window); // FIXME: Dunno if win should be reffed during destroy... - - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserDestroyWindow, ret=%u\n", _ret_); + TRACE("Leave NtUserDestroyWindow, ret=%u\n", ret); UserLeave(); - END_CLEANUP; + return ret; } @@ -3156,7 +3151,6 @@ NtUserFindWindowEx(HWND hwndParent, HWND Desktop, Ret = NULL; BOOL DoMessageWnd = FALSE; RTL_ATOM ClassAtom = (RTL_ATOM)0; - DECLARE_RETURN(HWND); TRACE("Enter NtUserFindWindowEx\n"); UserEnterShared(); @@ -3202,7 +3196,7 @@ NtUserFindWindowEx(HWND hwndParent, _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN(NULL)); + _SEH2_YIELD(goto Exit); } _SEH2_END; @@ -3212,12 +3206,12 @@ NtUserFindWindowEx(HWND hwndParent, !IS_ATOM(ClassName.Buffer)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(NULL); + goto Exit; } else if (ClassAtom == (RTL_ATOM)0) { /* LastError code was set by IntGetAtomFromStringOrAtom */ - RETURN(NULL); + goto Exit; } } } @@ -3236,13 +3230,13 @@ NtUserFindWindowEx(HWND hwndParent, if(!(Parent = UserGetWindowObject(hwndParent))) { - RETURN( NULL); + goto Exit; } ChildAfter = NULL; if(hwndChildAfter && !(ChildAfter = UserGetWindowObject(hwndChildAfter))) { - RETURN( NULL); + goto Exit; } _SEH2_TRY @@ -3334,12 +3328,10 @@ NtUserFindWindowEx(HWND hwndParent, } _SEH2_END; - RETURN( Ret); - -CLEANUP: - TRACE("Leave NtUserFindWindowEx, ret %p\n", _ret_); +Exit: + TRACE("Leave NtUserFindWindowEx, ret %p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } @@ -3418,25 +3410,23 @@ HWND APIENTRY NtUserGetAncestor(HWND hWnd, UINT Type) { PWND Window, Ancestor; - DECLARE_RETURN(HWND); + HWND Ret = NULL; TRACE("Enter NtUserGetAncestor\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd))) + Window = UserGetWindowObject(hWnd); + if (Window) { - RETURN(NULL); - } + Ancestor = UserGetAncestor(Window, Type); + /* fixme: can UserGetAncestor ever return NULL for a valid window? */ - Ancestor = UserGetAncestor(Window, Type); - /* faxme: can UserGetAncestor ever return NULL for a valid window? */ - - RETURN(Ancestor ? Ancestor->head.h : NULL); + Ret = (Ancestor ? UserHMGetHandle(Ancestor) : NULL); + } -CLEANUP: - TRACE("Leave NtUserGetAncestor, ret=%p\n", _ret_); + TRACE("Leave NtUserGetAncestor, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } //// @@ -3483,14 +3473,14 @@ NtUserGetComboBoxInfo( PPROCESSINFO ppi; BOOL NotSameppi = FALSE; BOOL Ret = TRUE; - DECLARE_RETURN(BOOL); TRACE("Enter NtUserGetComboBoxInfo\n"); UserEnterShared(); if (!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( FALSE ); + Ret = FALSE; + goto Exit; } _SEH2_TRY { @@ -3499,20 +3489,23 @@ NtUserGetComboBoxInfo( _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN(FALSE)); + Ret = FALSE; + _SEH2_YIELD(goto Exit); } _SEH2_END; if (pcbi->cbSize < sizeof(COMBOBOXINFO)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(FALSE); + Ret = FALSE; + goto Exit; } // Pass the user pointer, it was already probed. if ((Wnd->pcls->atomClassName != gpsi->atomSysClass[ICLS_COMBOBOX]) && Wnd->fnid != FNID_COMBOBOX) { - RETURN( (BOOL) co_IntSendMessage( Wnd->head.h, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi)); + Ret = (BOOL)co_IntSendMessage(UserHMGetHandle(Wnd), CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi); + goto Exit; } ppi = PsGetCurrentProcessWin32Process(); @@ -3543,13 +3536,11 @@ NtUserGetComboBoxInfo( } _SEH2_END; - RETURN( Ret); - -CLEANUP: +Exit: if (NotSameppi) KeDetachProcess(); - TRACE("Leave NtUserGetComboBoxInfo, ret=%i\n",_ret_); + TRACE("Leave NtUserGetComboBoxInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } //// @@ -3592,19 +3583,19 @@ NtUserGetListBoxInfo( PPROCESSINFO ppi; BOOL NotSameppi = FALSE; DWORD Ret = 0; - DECLARE_RETURN(DWORD); TRACE("Enter NtUserGetListBoxInfo\n"); UserEnterShared(); if (!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( 0 ); + goto Exit; } if ((Wnd->pcls->atomClassName != gpsi->atomSysClass[ICLS_LISTBOX]) && Wnd->fnid != FNID_LISTBOX) { - RETURN( (DWORD) co_IntSendMessage( Wnd->head.h, LB_GETLISTBOXINFO, 0, 0 )); + Ret = (DWORD)co_IntSendMessage(UserHMGetHandle(Wnd), LB_GETLISTBOXINFO, 0, 0); + goto Exit; } // wine lisbox:test_GetListBoxInfo lb_getlistboxinfo = 0, should not send a message! @@ -3628,13 +3619,11 @@ NtUserGetListBoxInfo( } _SEH2_END; - RETURN( Ret); - -CLEANUP: +Exit: if (NotSameppi) KeDetachProcess(); - TRACE("Leave NtUserGetListBoxInfo, ret=%lu\n", _ret_); + TRACE("Leave NtUserGetListBoxInfo, ret=%lu\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -3657,7 +3646,7 @@ CLEANUP: HWND APIENTRY NtUserSetParent(HWND hWndChild, HWND hWndNewParent) { - DECLARE_RETURN(HWND); + HWND Ret; TRACE("Enter NtUserSetParent\n"); UserEnterExclusive(); @@ -3674,12 +3663,11 @@ NtUserSetParent(HWND hWndChild, HWND hWndNewParent) hWndNewParent = IntGetMessageWindow(); } - RETURN( co_UserSetParent(hWndChild, hWndNewParent)); + Ret = co_UserSetParent(hWndChild, hWndNewParent); -CLEANUP: - TRACE("Leave NtUserSetParent, ret=%p\n", _ret_); + TRACE("Leave NtUserSetParent, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -3704,13 +3692,13 @@ HWND FASTCALL UserGetShellWindow(VOID) if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - return( (HWND)0); + return NULL; } Ret = (HWND)WinStaObject->ShellWindow; ObDereferenceObject(WinStaObject); - return( Ret); + return Ret; } /* @@ -3727,7 +3715,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) { PWINSTATION_OBJECT WinStaObject; PWND WndShell, WndListView; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; USER_REFERENCE_ENTRY Ref; NTSTATUS Status; PTHREADINFO ti; @@ -3737,12 +3725,12 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) if (!(WndShell = UserGetWindowObject(hwndShell))) { - RETURN(FALSE); + goto Exit; } if (!(WndListView = UserGetWindowObject(hwndListView))) { - RETURN(FALSE); + goto Exit; } Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, @@ -3754,7 +3742,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); + goto Exit; } /* @@ -3763,7 +3751,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) if (WinStaObject->ShellWindow) { ObDereferenceObject(WinStaObject); - RETURN( FALSE); + goto Exit; } /* @@ -3782,14 +3770,14 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) if (WndListView->ExStyle & WS_EX_TOPMOST) { ObDereferenceObject(WinStaObject); - RETURN( FALSE); + goto Exit; } } if (WndShell->ExStyle & WS_EX_TOPMOST) { ObDereferenceObject(WinStaObject); - RETURN( FALSE); + goto Exit; } UserRefObjectCo(WndShell, &Ref); @@ -3813,12 +3801,12 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) UserDerefObjectCo(WndShell); ObDereferenceObject(WinStaObject); - RETURN( TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserSetShellWindowEx, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserSetShellWindowEx, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } // Fixes wine Win test_window_styles and todo tests... @@ -3843,7 +3831,7 @@ co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULO if (!(Window = UserGetWindowObject(hWnd))) { - return( 0); + return 0; } if ((INT)Index >= 0) @@ -3851,7 +3839,7 @@ co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULO if ((Index + Size) > Window->cbwndExtra) { EngSetLastError(ERROR_INVALID_INDEX); - return( 0); + return 0; } #ifdef _WIN64 @@ -3986,7 +3974,7 @@ co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULO Window->fnid & FNID_FREED) { EngSetLastError(ERROR_ACCESS_DENIED); - return( 0); + return 0; } OldValue = (LONG_PTR)IntSetWindowProc(Window, (WNDPROC)NewValue, @@ -4025,7 +4013,7 @@ co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULO } } - return( OldValue); + return OldValue; } LONG FASTCALL @@ -4131,7 +4119,7 @@ NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue) { PWND Window; WORD OldValue; - DECLARE_RETURN(WORD); + WORD Ret = 0; TRACE("Enter NtUserSetWindowWord\n"); UserEnterExclusive(); @@ -4139,12 +4127,12 @@ NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue) if (hWnd == IntGetDesktopWindow()) { EngSetLastError(STATUS_ACCESS_DENIED); - RETURN( 0); + goto Exit; } if (!(Window = UserGetWindowObject(hWnd))) { - RETURN( 0); + goto Exit; } switch (Index) @@ -4152,30 +4140,32 @@ NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue) case GWL_ID: case GWL_HINSTANCE: case GWL_HWNDPARENT: - RETURN( (WORD)co_UserSetWindowLong(UserHMGetHandle(Window), Index, (UINT)NewValue, TRUE)); + Ret = (WORD)co_UserSetWindowLong(UserHMGetHandle(Window), Index, (UINT)NewValue, TRUE); + goto Exit; + default: if (Index < 0) { EngSetLastError(ERROR_INVALID_INDEX); - RETURN( 0); + goto Exit; } } if ((ULONG)Index > (Window->cbwndExtra - sizeof(WORD))) { EngSetLastError(ERROR_INVALID_INDEX); - RETURN( 0); + goto Exit; } OldValue = *((WORD *)((PCHAR)(Window + 1) + Index)); *((WORD *)((PCHAR)(Window + 1) + Index)) = NewValue; - RETURN( OldValue); + Ret = OldValue; -CLEANUP: - TRACE("Leave NtUserSetWindowWord, ret=%u\n", _ret_); +Exit: + TRACE("Leave NtUserSetWindowWord, ret=%u\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -4202,17 +4192,16 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) #define GWLP_CONSOLE_LEADER_PID 0 #define GWLP_CONSOLE_LEADER_TID 4 - DWORD_PTR Result; + DWORD_PTR Result = 0; PWND pWnd, pwndActive; PTHREADINFO pti, ptiActive; - DECLARE_RETURN(UINT); TRACE("Enter NtUserQueryWindow\n"); UserEnterShared(); if (!(pWnd = UserGetWindowObject(hWnd))) { - RETURN( 0); + goto Exit; } switch(Index) @@ -4270,19 +4259,14 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) case QUERY_WINDOW_DEFAULT_IME: /* default IME window */ if (pWnd->head.pti->spwndDefaultIme) Result = (DWORD_PTR)UserHMGetHandle(pWnd->head.pti->spwndDefaultIme); - else - Result = 0; break; case QUERY_WINDOW_DEFAULT_ICONTEXT: /* default input context handle */ if (pWnd->head.pti->spDefaultImc) Result = (DWORD_PTR)UserHMGetHandle(pWnd->head.pti->spDefaultImc); - else - Result = 0; break; case QUERY_WINDOW_ACTIVE_IME: - Result = 0; if (gpqForeground && gpqForeground->spwndActive) { pwndActive = gpqForeground->spwndActive; @@ -4295,18 +4279,12 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) } } break; - - default: - Result = 0; - break; } - RETURN( Result); - -CLEANUP: - TRACE("Leave NtUserQueryWindow, ret=%u\n", _ret_); +Exit: + TRACE("Leave NtUserQueryWindow, ret=%u\n", Result); UserLeave(); - END_CLEANUP; + return Result; } /* @@ -4317,8 +4295,7 @@ NtUserRegisterWindowMessage(PUNICODE_STRING MessageNameUnsafe) { UNICODE_STRING SafeMessageName; NTSTATUS Status; - UINT Ret; - DECLARE_RETURN(UINT); + UINT Ret = 0; TRACE("Enter NtUserRegisterWindowMessage\n"); UserEnterExclusive(); @@ -4326,25 +4303,24 @@ NtUserRegisterWindowMessage(PUNICODE_STRING MessageNameUnsafe) if(MessageNameUnsafe == NULL) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( 0); + goto Exit; } Status = IntSafeCopyUnicodeStringTerminateNULL(&SafeMessageName, MessageNameUnsafe); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( 0); + goto Exit; } Ret = (UINT)IntAddAtom(SafeMessageName.Buffer); if (SafeMessageName.Buffer) ExFreePoolWithTag(SafeMessageName.Buffer, TAG_STRING); - RETURN( Ret); -CLEANUP: - TRACE("Leave NtUserRegisterWindowMessage, ret=%u\n", _ret_); +Exit: + TRACE("Leave NtUserRegisterWindowMessage, ret=%u\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -4355,20 +4331,20 @@ NtUserSetWindowFNID(HWND hWnd, WORD fnID) { PWND Wnd; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserSetWindowFNID\n"); UserEnterExclusive(); if (!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( FALSE); + goto Exit; } if (Wnd->head.pti->ppi != PsGetCurrentProcessWin32Process()) { EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( FALSE); + goto Exit; } // From user land we only set these. @@ -4379,17 +4355,17 @@ NtUserSetWindowFNID(HWND hWnd, Wnd->fnid != 0) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( FALSE); + goto Exit; } } Wnd->fnid |= fnID; - RETURN( TRUE); + Ret = TRUE; -CLEANUP: +Exit: TRACE("Leave NtUserSetWindowFNID\n"); UserLeave(); - END_CLEANUP; + return Ret; } BOOL APIENTRY @@ -4612,8 +4588,7 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) { PWND Wnd; NTSTATUS Status; - INT Result; - DECLARE_RETURN(INT); + INT Result = 0; TRACE("Enter NtUserInternalGetWindowText\n"); UserEnterShared(); @@ -4621,12 +4596,12 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) if(lpString && (nMaxCount <= 1)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( 0); + goto Exit; } if(!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( 0); + goto Exit; } Result = Wnd->strName.Length / sizeof(WCHAR); @@ -4643,7 +4618,8 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( 0); + Result = 0; + goto Exit; } Buffer += Copy; } @@ -4652,18 +4628,17 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( 0); + Result = 0; + goto Exit; } Result = Copy; } - RETURN( Result); - -CLEANUP: - TRACE("Leave NtUserInternalGetWindowText, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserInternalGetWindowText, ret=%i\n", Result); UserLeave(); - END_CLEANUP; + return Result; } /*

10 months, 1 week

[reactos] 01/01: [SHELL32] 640x480-ify four dialogs (#6004)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d387c799ed1669052483d… commit d387c799ed1669052483dc67affeaca5c139ff74 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Dec 14 14:54:11 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 14 13:54:11 2023 +0000 [SHELL32] 640x480-ify four dialogs (#6004) IDD_DRIVE_PROPERTIES IDD_DRIVE_TOOLS IDD_DRIVE_HARDWARE IDD_FOLDER_CUSTOMIZE Afterwards all 4 dialogs do display fine even with 640x480 screen resolution. Same as their MS role-models do. I also fixed some accelerator collisions FCIDM_SHVIEW_CUT and synced some forgotten syncs for IDM_CUT accel. I also moved checkboxes further to the left in the checkdisk dialog, as it was done for en-US and some other languages before, but it was forgotten in other languages (AUTOCHECKBOX.*14000 and AUTOCHECKBOX.*14001) the french accelerator-changes were Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- dll/win32/shell32/lang/bg-BG.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/ca-ES.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/cs-CZ.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/da-DK.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/de-DE.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/el-GR.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/en-GB.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/en-US.rc | 26 ++++++++++++------------- dll/win32/shell32/lang/es-ES.rc | 34 ++++++++++++++++----------------- dll/win32/shell32/lang/et-EE.rc | 26 ++++++++++++------------- dll/win32/shell32/lang/eu-ES.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/fi-FI.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/fr-FR.rc | 36 +++++++++++++++++------------------ dll/win32/shell32/lang/he-IL.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/hi-IN.rc | 26 ++++++++++++------------- dll/win32/shell32/lang/hu-HU.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/id-ID.rc | 26 ++++++++++++------------- dll/win32/shell32/lang/it-IT.rc | 42 ++++++++++++++++++++--------------------- dll/win32/shell32/lang/ja-JP.rc | 26 ++++++++++++------------- dll/win32/shell32/lang/ko-KR.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/nl-NL.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/no-NO.rc | 38 ++++++++++++++++++------------------- dll/win32/shell32/lang/pl-PL.rc | 26 ++++++++++++------------- dll/win32/shell32/lang/pt-BR.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/pt-PT.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/ro-RO.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/ru-RU.rc | 26 ++++++++++++------------- dll/win32/shell32/lang/sk-SK.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/sl-SI.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/sq-AL.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/sv-SE.rc | 28 +++++++++++++-------------- dll/win32/shell32/lang/tr-TR.rc | 26 ++++++++++++------------- dll/win32/shell32/lang/uk-UA.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/zh-CN.rc | 30 ++++++++++++++--------------- dll/win32/shell32/lang/zh-HK.rc | 32 +++++++++++++++---------------- dll/win32/shell32/lang/zh-TW.rc | 32 +++++++++++++++---------------- 36 files changed, 530 insertions(+), 530 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 01e2c9c0023..ec89bc9b7d5 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Общи" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Устройство %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Почистване на &диска", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Уплътняване на устройството за спестяване на място", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Индексиращата услуга да индексира диска за по- бързо търсене", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Уплътняване на устройството за спестяване на място", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Индексиращата услуга да индексира диска за по- бързо търсене", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Средства" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Запаси веднага", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 130 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Оборудване" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -617,8 +617,8 @@ BEGIN DEFPUSHBUTTON "Начало", IDOK, 63, 95, 60, 14 GROUPBOX "Настройки за проверката", -1, 7, 6, 229, 50 PUSHBUTTON "Отказ", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "Самопоправяне на системните грешки на файловете", 14000, 16, 15, 210, 10 - AUTOCHECKBOX "Об&хождане и опит за възстановяване на лошите сектори", 14001, 16, 30, 210, 10 + AUTOCHECKBOX "Самопоправяне на системните грешки на файловете", 14000, 12, 15, 210, 10 + AUTOCHECKBOX "Об&хождане и опит за възстановяване на лошите сектори", 14001, 12, 30, 210, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 42, 60, 170, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 5f2aaa48cc7..d07a38aaf10 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -64,7 +64,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "C&ut", IDM_CUT + MENUITEM "Cu&t", IDM_CUT MENUITEM "&Copy", IDM_COPY MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 2692c9f3dba..fa1a9a0026e 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -304,7 +304,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Obecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -333,11 +333,11 @@ BEGIN CTEXT "Disk %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Vyčištění &disku", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Šetřit místo na disku jeho kompresí", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Povolit indexování disku pro rychlejší vyhledávání", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Šetřit místo na disku jeho kompresí", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Povolit indexování disku pro rychlejší vyhledávání", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Nástroje" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -356,7 +356,7 @@ BEGIN PUSHBUTTON "Zálohovat...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -626,7 +626,7 @@ BEGIN GROUPBOX "Možnosti kontroly disku", -1, 7, 6, 179, 40 PUSHBUTTON "Storno", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automaticky opravovat chyby", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Vyhledat a pokusit se obnovit vadné sektory", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Vyhledat a pokusit se obnovit vadné sektory", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -709,7 +709,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -718,16 +718,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 2a372d00943..137ff69566e 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -303,7 +303,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -332,11 +332,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -355,7 +355,7 @@ BEGIN PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -625,7 +625,7 @@ BEGIN GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -708,7 +708,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -717,16 +717,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index cfe026ee4c9..cbd4e640c58 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Laufwerk %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Bereinigen", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Jetzt &sichern...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -617,8 +617,8 @@ BEGIN DEFPUSHBUTTON "&Starten", IDOK, 63, 95, 60, 14 GROUPBOX "Optionen für die Datenträgerprüfung", -1, 7, 6, 179, 40 PUSHBUTTON "S&chließen", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "&Dateisystemfehler automatisch korrigieren", 14000, 16, 15, 165, 10 - AUTOCHECKBOX "&Fehlerhafte Sektoren suchen/wiederherstellen", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Dateisystemfehler automatisch korrigieren", 14000, 12, 15, 165, 10 + AUTOCHECKBOX "&Fehlerhafte Sektoren suchen/wiederherstellen", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -702,7 +702,7 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Anpassen" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -711,16 +711,16 @@ BEGIN LTEXT "Diesen Ordner optimieren für:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "&Vorlage für alle Unterordner übernehmen", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Ordnerbilder", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Ordnerbilder", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Wählen Sie eine Datei aus, die auf diesem Ordnersymbol angezeigt wird.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "&Datei auswählen...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Wiederherstellen", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "&Datei auswählen...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Wiederherstellen", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Vorschau:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Ordnersymbole", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Sie können das Ordnersymbol ändern. Wenn Sie das Symbol ändern, wird keine Vorschau der Ordnerinhalte mehr angezeigt.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Anderes &Symbol...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Ordnersymbole", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Sie können das Ordnersymbol ändern. Wenn Sie das Symbol ändern, wird keine Vorschau der Ordnerinhalte mehr angezeigt.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Anderes &Symbol...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index a191eb18ce0..434f3410338 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 130, 65, 95, 60, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Γενικά" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Δίσκος %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Εκκαθάριση δίσκου", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Συμπίεση δίσκου για εξοικονόμηση χώρου", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Δημιουργία ευρετηρίου για γρηγορότερη αναζήτηση", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Συμπίεση δίσκου για εξοικονόμηση χώρου", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Δημιουργία ευρετηρίου για γρηγορότερη αναζήτηση", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Εργαλεία" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Αντίγραφα ασφαλείας...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Υλικό" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index c4df603d9b2..dadd680dda9 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -64,7 +64,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "C&ut", IDM_CUT + MENUITEM "Cu&t", IDM_CUT MENUITEM "&Copy", IDM_COPY MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customise" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index dc666d4a21b..212c0b01b72 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 9b80b3afc66..9579779b21a 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -56,11 +56,11 @@ BEGIN MENUITEM "&Deshacer\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR MENUITEM "Cor&tar\tCtrl+X", FCIDM_SHVIEW_CUT - MENUITEM "&Copiar\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Copiar\tCtrl+C", FCIDM_SHVIEW_COPY //FIXME: accelerator collision &C MENUITEM "&Pegar\tCtrl+V", FCIDM_SHVIEW_INSERT MENUITEM "Pegar &acceso directo", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Copiar a &carpeta...", FCIDM_SHVIEW_COPYTO + MENUITEM "Copiar a &carpeta...", FCIDM_SHVIEW_COPYTO //FIXME: accelerator collision &C MENUITEM "Mo&ver a carpeta...", FCIDM_SHVIEW_MOVETO MENUITEM SEPARATOR MENUITEM "Seleccionar t&odo\tCtrl+E", FCIDM_SHVIEW_SELECTALL @@ -305,7 +305,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -334,11 +334,11 @@ BEGIN CTEXT "Unidad %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Liberar espacio en disco", 14010, 143, 159, 88, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Permitir al servidor de indexación indizar el disco para acelerar la búsqueda", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Permitir al servidor de indexación indizar el disco para acelerar la búsqueda", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Herramientas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -357,7 +357,7 @@ BEGIN PUSHBUTTON "Realizar copia de seguridad ahora...", 14002, 90, 170, 130, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -626,8 +626,8 @@ BEGIN DEFPUSHBUTTON "Iniciar", IDOK, 63, 95, 60, 14 GROUPBOX "Opciones de comprobación de disco ", -1, 7, 6, 225, 50 PUSHBUTTON "Cancelar", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "Reparar &automáticamente errores en el sistema de archivos", 14000, 16, 15, 200, 10 - AUTOCHECKBOX "&Examinar e intentar recuperar los sectores defectuosos", 14001, 16, 30, 200, 10 + AUTOCHECKBOX "Reparar &automáticamente errores en el sistema de archivos", 14000, 12, 15, 200, 10 + AUTOCHECKBOX "&Examinar e intentar recuperar los sectores defectuosos", 14001, 12, 30, 200, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 225, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -710,7 +710,7 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Personalizar" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -719,16 +719,16 @@ BEGIN LTEXT "&Usar esta carpeta como plantilla:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Aplicar esta plantilla a todas las &sub carpetas", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Carpeta de imágenes", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Carpeta de imágenes", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Para ver miniaturas, guarde una imagen en esta carpeta para recordar su contenido.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Seleccionar &imagen...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restaurar por defecto", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Seleccionar &imagen...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restaurar por defecto", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Previsualizar:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Íconos de carpeta", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Para todas las vistas excepto miniaturas, usted puede cambiar el ícono por defecto de ""carpeta"" con otro ícono.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "&Cambiar ícono...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Íconos de carpeta", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Para todas las vistas excepto miniaturas, usted puede cambiar el ícono por defecto de ""carpeta"" con otro ícono.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "&Cambiar ícono...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 54c32a62264..46c4d4eb804 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -303,7 +303,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Üldist" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -332,11 +332,11 @@ BEGIN CTEXT "Draiv %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Kettapuhastus", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Tihenda draiv kettaruumi säästmiseks", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Luba indekseerimisteenusel ketas failiotsinguks indekseerida", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Tihenda draiv kettaruumi säästmiseks", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Luba indekseerimisteenusel ketas failiotsinguks indekseerida", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tööriistad" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -355,7 +355,7 @@ BEGIN PUSHBUTTON "Varunda kohe...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Riistvara" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -708,7 +708,7 @@ BEGIN PUSHBUTTON "Loobu", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Kohanda" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -717,16 +717,16 @@ BEGIN LTEXT "Kasuta seda &kausta kui mallina:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Rakenda seda malli ka &alamkaustadele", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Kausta pildid", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Kausta pildid", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Pispildi vaatega saad panna pildi kaustale sisude meeldetuletuseks.,", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Vali &pilt...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Taasta vaikesätted", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Vali &pilt...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Taasta vaikesätted", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Eelvaade:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Kausta ikoonid", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Kõigil v.a. pisipildi vaatel saad muuta standartse ""kausta"" ikooni teiseks ikooniks.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Muuda &ikooni...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Kausta ikoonid", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Kõigil v.a. pisipildi vaatel saad muuta standartse ""kausta"" ikooni teiseks ikooniks.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Muuda &ikooni...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index ac771fca25f..c2497afc8ed 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -303,7 +303,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Orokorra" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -332,11 +332,11 @@ BEGIN CTEXT "%c: unitatea", 14009, 95, 162, 50, 10 PUSHBUTTON "&Garbitu diskoa", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "&Konprimatu unitatea diskoan leku gehiago egiteko", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "&Fitxategiak bizkor bilatzeko, eman baimena Indexatze-zerbitzuari disko hau indexatzeko", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "&Konprimatu unitatea diskoan leku gehiago egiteko", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "&Fitxategiak bizkor bilatzeko, eman baimena Indexatze-zerbitzuari disko hau indexatzeko", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tresnak" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -355,7 +355,7 @@ BEGIN PUSHBUTTON "&Egin babeskopia orain...", 14002, 90, 170, 130, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardwarea" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -624,8 +624,8 @@ BEGIN DEFPUSHBUTTON "&Hasi", IDOK, 63, 95, 60, 14 GROUPBOX "Aztertu disko-aukerak ", -1, 7, 6, 225, 50 PUSHBUTTON "Utzi", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "&Konpondu automatikoki fitxategi-sistemaren erroreak", 14000, 16, 15, 200, 10 - AUTOCHECKBOX "&Bilatu eta saiatu berreskuratzen sektore txarrak", 14001, 16, 30, 200, 10 + AUTOCHECKBOX "&Konpondu automatikoki fitxategi-sistemaren erroreak", 14000, 12, 15, 200, 10 + AUTOCHECKBOX "&Bilatu eta saiatu berreskuratzen sektore txarrak", 14001, 12, 30, 200, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 225, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -708,7 +708,7 @@ BEGIN PUSHBUTTON "Utzi", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Pertsonalizatu" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -717,16 +717,16 @@ BEGIN LTEXT "E&rabili karpeta-mota hau txantiloi gisa:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "&Azpikarpetei ere aplikatu txantiloi hau", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Karpeten irudiak", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Karpeten irudiak", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Koadro txikien ikuspegirako, irudi bat jar dezakezu karpetan edukiaz gogoratzeko.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "A&ukeratu irudia...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Berrezarri lehenetsia", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "A&ukeratu irudia...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Berrezarri lehenetsia", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Aurrebista:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Karpeten ikonoak", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Koadro txikien ikuspegia ez beste guztietan, karpetaren ikono estandarra beste batekin ordez dezakezu.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Al&datu ikonoa...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Karpeten ikonoak", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Koadro txikien ikuspegia ez beste guztietan, karpetaren ikono estandarra beste batekin ordez dezakezu.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Al&datu ikonoa...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 5da33435d2e..38e1bd995db 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 02c79aa67c6..70f15958b2b 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -36,7 +36,7 @@ BEGIN END MENUITEM "Rafraîchir", FCIDM_SHVIEW_REFRESH MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "Coller", FCIDM_SHVIEW_INSERT + MENUITEM "Coll&er", FCIDM_SHVIEW_INSERT MENUITEM "Coller comme un lien", FCIDM_SHVIEW_INSERTLINK END END @@ -48,10 +48,10 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ouper\tCtrl+X", FCIDM_SHVIEW_CUT MENUITEM "&Copier\tCtrl+C", FCIDM_SHVIEW_COPY - MENUITEM "Co&ller\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Coll&er\tCtrl+V", FCIDM_SHVIEW_INSERT MENUITEM "Créer un &lien", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Copier vers le &dossier...", FCIDM_SHVIEW_COPYTO + MENUITEM "Co&pier vers le &dossier...", FCIDM_SHVIEW_COPYTO MENUITEM "&Déplacer vers le dossier...", FCIDM_SHVIEW_MOVETO MENUITEM SEPARATOR MENUITEM "&Tout sélectionner\tCtrl+A", FCIDM_SHVIEW_SELECTALL @@ -66,7 +66,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ouper", IDM_CUT MENUITEM "&Copier", IDM_COPY - MENUITEM "Coller", IDM_INSERT + MENUITEM "Coll&er", IDM_INSERT MENUITEM SEPARATOR MENUITEM "Créer un &lien", IDM_CREATELINK MENUITEM "&Supprimer", IDM_DELETE @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Lecteur %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Nettoyage de &disque", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Autoriser l'indexation de ce disque pour la recherche rapide", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Autoriser l'indexation de ce disque pour la recherche rapide", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Outils" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Sauvegarder maintenant...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Matériel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Options de vérification du disque", -1, 7, 6, 229, 40 PUSHBUTTON "Annuler", IDCANCEL, 178, 95, 60, 14 AUTOCHECKBOX "&Réparer automatiquement les erreurs du système de fichiers", 14000, 12, 20, 215, 10 - AUTOCHECKBOX "Re&chercher et tenter une récupération des secteurs défectueux", 14001, 16, 30, 215, 10 + AUTOCHECKBOX "Re&chercher et tenter une récupération des secteurs défectueux", 14001, 12, 30, 215, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 229, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Personnaliser" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Utiliser ce dossier comme modèle :", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Appliquer ce modèle aux sous-dossiers", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Images de dossier", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Images de dossier", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Pour la vue des miniatures, vous pouvez mettre une image sur ce dossier pour vous souvenir de son contenu.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choisir une image...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Par défaut", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choisir une image...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Par défaut", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Aperçu :", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Icônes de dossier", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Pour toutes les vues autres que Miniature, vous pouvez changer l'icône standard du ""dossier"".", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Modifier l'&icône...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Icônes de dossier", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Pour toutes les vues autres que Miniature, vous pouvez changer l'icône standard du ""dossier"".", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Modifier l'&icône...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 5498554e711..eab8a24fa6d 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -303,7 +303,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "כללי" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -332,11 +332,11 @@ BEGIN CTEXT "כונן %c", 14009, 95, 162, 50, 10 PUSHBUTTON "ניקוי הדיסק", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "דחוס כונן זה כדי לחסוך בשטח דיסק", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "אפשר סידור תוכן באינדקס עבור קבצים בכונן זה בנוסף למאפייני קובץ", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "דחוס כונן זה כדי לחסוך בשטח דיסק", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "אפשר סידור תוכן באינדקס עבור קבצים בכונן זה בנוסף למאפייני קובץ", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "כלים" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -355,7 +355,7 @@ BEGIN PUSHBUTTON "גבה כעת...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "חומרה" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -625,7 +625,7 @@ BEGIN GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "ביטול", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -708,7 +708,7 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "התאמה אישית" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -717,16 +717,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "תמונות תיקיה", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "תמונות תיקיה", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "בחירת &תמונה...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "שחזור ברירת מחדשל", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "בחירת &תמונה...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "שחזור ברירת מחדשל", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "תצוגה מקדימה:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "&שינוי סמל...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "&שינוי סמל...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 1e22c50b0d8..0c386a0a6e5 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -303,7 +303,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "सामान्य" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -332,11 +332,11 @@ BEGIN CTEXT "ड्राइव %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&डिस्क की सफाई", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "डिस्क के स्पेस को सहेजने के लिए ड्राइव को संक्षिप्त करें", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "तेजी से फ़ाइल खोज के लिए इस डिस्क को इंडेक्स करने के लिए इंडेक्सिंग सर्विस को अनुमति दें", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "डिस्क के स्पेस को सहेजने के लिए ड्राइव को संक्षिप्त करें", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "तेजी से फ़ाइल खोज के लिए इस डिस्क को इंडेक्स करने के लिए इंडेक्सिंग सर्विस को अनुमति दें", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "टूल्ज़" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -355,7 +355,7 @@ BEGIN PUSHBUTTON "बैकअप अब करो...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "हार्डवेयर" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -708,7 +708,7 @@ BEGIN PUSHBUTTON "रद्द करें", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "अनुकूलित करें" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -717,16 +717,16 @@ BEGIN LTEXT "टेम्पलेट के रूप में इस &फ़ोल्डर प्रकार का उपयोग करें:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "इस टेम्पलेट को सभी &सबफ़ोल्डर्स पर भी लागू करें", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "फ़ोल्डर तस्वीरें", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "फ़ोल्डर तस्वीरें", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "थंबनेल दृश्य के लिए, आप सामग्री की याद दिलाने के लिए इस फ़ोल्डर में एक तस्वीर डाल सकते हैं।", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "&चित्र चुनें...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&पहले जैसा कर दो", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "&चित्र चुनें...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&पहले जैसा कर दो", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "प्रीव्यू:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "फ़ोल्डर आइकन", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "थंबनेल को छोड़कर सभी व्यूज़ के लिए, आप मानक "" फ़ोल्डर "" आइकन को दूसरे आइकन में बदल सकते हैं।", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "&आइकॉन बदलें...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "फ़ोल्डर आइकन", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "थंबनेल को छोड़कर सभी व्यूज़ के लिए, आप मानक "" फ़ोल्डर "" आइकन को दूसरे आइकन में बदल सकते हैं।", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "&आइकॉन बदलें...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 28c4cbe7cb9..09fbb539cf2 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Általános" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "%c meghajtó", 14009, 95, 162, 50, 10 PUSHBUTTON "&Lemeztisztítás", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Meghajtó tömörítése helymegtakarításhoz", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Lemez indexelése a gyors fájlkereséshez", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Meghajtó tömörítése helymegtakarításhoz", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Lemez indexelése a gyors fájlkereséshez", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Eszközök" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Biztonsági mentés...", 14002, 120, 170, 100, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardver" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -617,8 +617,8 @@ BEGIN DEFPUSHBUTTON "Indítás", IDOK, 63, 95, 60, 14 GROUPBOX "Lemezellenőrzés beállításai", -1, 7, 6, 179, 40 PUSHBUTTON "Mégse", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "Fájlrendszer hibáinak automatikus javítása", 14000, 16, 17, 155, 10 - AUTOCHECKBOX "&Szektorhibák keresése és kísérlet a javításukra.", 14001, 16, 30, 163, 10 + AUTOCHECKBOX "Fájlrendszer hibáinak automatikus javítása", 14000, 12, 15, 155, 10 + AUTOCHECKBOX "&Szektorhibák keresése és kísérlet a javításukra.", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -700,7 +700,7 @@ BEGIN PUSHBUTTON "Mégse", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Testreszabás" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -709,16 +709,16 @@ BEGIN LTEXT "Az alábbi mappatípus legyen a &sablon:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Sablon &alkalmazása az összes almappára", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Mappa képei", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Mappa képei", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Miniatűr nézethez egy képet rakhat a mappára hogy emlékeztesse annak tartalmára.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Kép &választása...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Alapértelmezett", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Kép &választása...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Alapértelmezett", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Előnézet:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Mappaikonok", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Nem miniatűr nézethez lecserélheti a hagyományos ""mappa"" ikont egy másik ikonra.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "&Ikoncsere...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Mappaikonok", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Nem miniatűr nézethez lecserélheti a hagyományos ""mappa"" ikont egy másik ikonra.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "&Ikoncsere...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 661dac1ccd0..0c676ace619 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Umum" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Pembersihan disk", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "kompres drive untuk menyimpan ruang disk", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Izinkan Layanan Pengindeksan untuk mengindeks disk ini agar lebih cepat mencari berkas", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "kompres drive untuk menyimpan ruang disk", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Izinkan Layanan Pengindeksan untuk mengindeks disk ini agar lebih cepat mencari berkas", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Alat" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Cadangkan Sekarang...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Perangkat Keras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -698,7 +698,7 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Sesuaikan" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -707,16 +707,16 @@ BEGIN LTEXT "Gunakan jenis &folder ini sebagai template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Juga terapkan ke semua &subfolder", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Gambar folder", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Gambar folder", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Untuk tampilan Gambar Kecil, Anda dapat meletakkan gambar di folder ini untuk mengingatkan Anda tentang konten.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "&Pilih Gambar...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Kembalikan asal", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "&Pilih Gambar...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Kembalikan asal", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Pratinjau:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Ikon folder", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Untuk semua tampilan kecuali Gambar Kecil, Anda dapat mengubah ikon ""folder"" standar menjadi ikon lain.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Ganti &Ikon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Ikon folder", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Untuk semua tampilan kecuali Gambar Kecil, Anda dapat mengubah ikon ""folder"" standar menjadi ikon lain.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Ganti &Ikon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 32189f8de8e..34dd9588621 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -2,12 +2,12 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MENU_001 MENUEX BEGIN - MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON - MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON //FIXME: accelerator collision &I + MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON //FIXME: accelerator collision &I MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW MENUITEM "", -1, MFT_SEPARATOR - POPUP "Disponi &Icone", FCIDM_SHVIEW_ARRANGE + POPUP "Disponi &Icone", FCIDM_SHVIEW_ARRANGE //FIXME: accelerator collision &I BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Disponi Automaticamente", FCIDM_SHVIEW_AUTOARRANGE @@ -22,8 +22,8 @@ BEGIN BEGIN POPUP "&Visualizza", FCIDM_SHVIEW_VIEW BEGIN - MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON - MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON //FIXME: accelerator collision &I + MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON //FIXME: accelerator collision &I MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW END @@ -68,8 +68,8 @@ BEGIN MENUITEM "&Copia", IDM_COPY MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR - MENUITEM "&Crea Collegamento", IDM_CREATELINK - MENUITEM "&Cancella", IDM_DELETE + MENUITEM "&Crea Collegamento", IDM_CREATELINK //FIXME: accelerator collision &C + MENUITEM "&Cancella", IDM_DELETE //FIXME: accelerator collision &C MENUITEM "&Rinomina", IDM_RENAME MENUITEM SEPARATOR MENUITEM "&Proprietà", IDM_PROPERTIES @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Disco %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Pulitura &disco", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Indicizza il disco per ricerche più rapide dei file", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Indicizza il disco per ricerche più rapide dei file", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Strumenti" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Salvataggio...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Opzioni per la verifica del disco", -1, 7, 6, 179, 40 PUSHBUTTON "Annulla", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Correggi automaticamente gli errori", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Cerca i settori difettosi e tenta di correggerli", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Cerca i settori difettosi e tenta di correggerli", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 13dc215929b..b6dce2c0418 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "全般" FONT 9, "MS UI Gothic", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "ドライブ %c", 14009, 95, 162, 50, 10 PUSHBUTTON "ディスクのクリーンアップ", 14010, 143, 159, 88, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "ドライブを圧縮してディスク領域を確保する", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "このディスクにインデックスを付けてファイル検索を速くする", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "ドライブを圧縮してディスク領域を確保する", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "このディスクにインデックスを付けてファイル検索を速くする", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ツール" FONT 9, "MS UI Gothic", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "すぐにバックアップ...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ハードウェア" FONT 9, "MS UI Gothic", 0, 0, 0x0 @@ -698,7 +698,7 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "カスタマイズ" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 9, "MS UI Gothic" @@ -707,16 +707,16 @@ BEGIN LTEXT "このフォルダをテンプレートとして使う(&F):", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "すべてのサブフォルダにも適用(&S)", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "フォルダ画像", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "フォルダ画像", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "サムネイルビューではこのフォルダに中身を思わせる画像を置けます。", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "画像を選ぶ(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "既定に戻す(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "画像を選ぶ(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "既定に戻す(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "プレビュー:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "フォルダのアイコン", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "サムネイル以外のすべてのビューについて、標準の「フォルダ」アイコンを別のアイコンに変更可能です。", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "アイコン変更(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "フォルダのアイコン", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "サムネイル以外のすべてのビューについて、標準の「フォルダ」アイコンを別のアイコンに変更可能です。", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "アイコン変更(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index fdbc263ae98..8e73955bfce 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -71,7 +71,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "잘라내기(&U)", IDM_CUT + MENUITEM "잘라내기(&T)", IDM_CUT MENUITEM "복사(&C)", IDM_COPY MENUITEM "붙여넣기", IDM_INSERT MENUITEM SEPARATOR @@ -303,7 +303,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "일반" FONT 9, "굴림", 0, 0, 0x1 @@ -332,11 +332,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "도구" FONT 9, "굴림", 0, 0, 0x1 @@ -355,7 +355,7 @@ BEGIN PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "하드웨어" FONT 9, "굴림", 0, 0, 0x1 @@ -625,7 +625,7 @@ BEGIN GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -708,7 +708,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 9, "굴림" @@ -717,16 +717,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index fca4d439f46..fbfeb6059d0 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -64,7 +64,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "C&ut", IDM_CUT + MENUITEM "Cu&t", IDM_CUT MENUITEM "&Copy", IDM_COPY MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 07aaf2547e6..5715e235982 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -2,8 +2,8 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL MENU_001 MENUEX BEGIN - MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON //FIXME: accelerator collision &S + MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON //FIXME: accelerator collision &S MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW MENUITEM "", -1, MFT_SEPARATOR @@ -64,7 +64,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "Klipp &ut", IDM_CUT + MENUITEM "Klipp &ut", IDM_CUT //FIXME: Please double-check this accelerator! Is it &U or &T ? MENUITEM "&Kopier", IDM_COPY MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR @@ -120,9 +120,9 @@ CAPTION "Meldings" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Ja", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ja til &alt", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ja til &alt", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP //FIXME: accelerator collision &A PUSHBUTTON "&Nei", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Avbry&t", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbry&t", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP //FIXME: accelerator collision &A ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16 LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0 END @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generielt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Stasjon %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Diskoppryding", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Komprimer denne stasjonen for å frigjøre diskplass", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Indekser denne stasjonen for raskere søking", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Komprimer denne stasjonen for å frigjøre diskplass", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Indekser denne stasjonen for raskere søking", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Verktøy" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Ta sikkerhetskopi...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Maskinvare" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Alternativer for diskkontroll", -1, 7, 6, 179, 40 PUSHBUTTON "Avbryt", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Reparer feil i filsysten automatisk", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Søk etter og forsøk å reparere skadet sektorer", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Søk etter og forsøk å reparere skadet sektorer", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index d984aef5ce2..b845757fde6 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -305,7 +305,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ogólne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -334,11 +334,11 @@ BEGIN CTEXT "Napęd %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Oczyszczanie &dysku", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Kompresuj dysk, aby zaoszczędzić miejsce na dysku", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Zezwalaj na indeksowanie tego dysku, aby przyspieszyć\nwyszukiwanie plików", 14012, 8, 214, 230, 17, WS_DISABLED | BS_MULTILINE + CHECKBOX "Kompresuj dysk, aby zaoszczędzić miejsce na dysku", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Zezwalaj na indeksowanie tego dysku, aby przyspieszyć\nwyszukiwanie plików", 14012, 8, 204, 230, 17, WS_DISABLED | BS_MULTILINE END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Narzędzia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -357,7 +357,7 @@ BEGIN PUSHBUTTON "Wykonaj kopię zapasową...", 14002, 130, 171, 100, 14, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sprzęt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -710,7 +710,7 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Dostosowywanie" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -719,16 +719,16 @@ BEGIN LTEXT "&Użyj tego typu folderu jako szablonu:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Z&astosuj ten szablon także do wszystkich podfolderów", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Obrazy folderów", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Obrazy folderów", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Dla widoku miniatur możesz umieścić na tym folderze obraz, który będzie przypominał o zawartości folderu.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "&Wybierz obraz...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Przywróć domyślny", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "&Wybierz obraz...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Przywróć domyślny", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Podgląd:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Ikony folderów", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Dla wszystkich widoków z wyjątkiem widoku miniatur możesz zmienić standardową ikonę ""folderu"" na inną.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Z&mień ikonę...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Ikony folderów", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Dla wszystkich widoków z wyjątkiem widoku miniatur możesz zmienić standardową ikonę ""folderu"" na inną.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Z&mień ikonę...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index d610d4a66f1..a942e50cfa6 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Limpeza de &Disco", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Comprimir drive para ganhar espaço em disco", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Permitir Serviço de Indexação para indexar este disco para rápida busca de arquivos", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Comprimir drive para ganhar espaço em disco", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Permitir Serviço de Indexação para indexar este disco para rápida busca de arquivos", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ferramentas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Fazer Backup Agora...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Opções de verificação de disco", -1, 7, 6, 179, 40 PUSHBUTTON "Cancelar", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Corrigir erros do sistema automaticamente", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Realizar varredura e tentar recuperar bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Realizar varredura e tentar recuperar bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 9100e619ede..4144bad9ff4 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Disco %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Limpeza do &disco", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Comprimir unidade para libertar espaço no disco", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Permitir indexar este disco para acelerar a procura de ficheiros", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Comprimir unidade para libertar espaço no disco", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Permitir indexar este disco para acelerar a procura de ficheiros", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ferramentas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Criar cópia de Segurança...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Opções verificação do disco", -1, 7, 6, 179, 40 PUSHBUTTON "Cancelar", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Corrigir erros do sistema de ficheiros automaticamente", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Procurar e tentar recuperar sectores danificados", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Procurar e tentar recuperar sectores danificados", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "&Cancelar", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Personalizar" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Utilizar esta pasta como modelo:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Aplicar este modelo a todas as &subpastas", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Imagens", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Imagens", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Para a exibição de miniaturas, pode colocar uma imagem nesta pasta para lembrá-lo do conteúdo.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Escolha uma imagem", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Predefinição", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Escolha uma imagem", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Predefinição", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Visualizar:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Icones", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Para todas as vistas, excepto miniaturas, pode alterar o ícone padrão 'pasta' para outro ícone.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Alterar &icone.", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Icones", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Para todas as vistas, excepto miniaturas, pode alterar o ícone padrão 'pasta' para outro ícone.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Alterar &icone.", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index a07c7852b90..4514791bb77 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -304,7 +304,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -333,11 +333,11 @@ BEGIN CTEXT "Partiție %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Curățare &disc…", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "&Comprimă volumul pentru a economisi spațiu", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Permite „Serviciu de inde&xare” pentru accelerarea căutărilor", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "&Comprimă volumul pentru a economisi spațiu", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Permite „Serviciu de inde&xare” pentru accelerarea căutărilor", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Instrumente" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -356,7 +356,7 @@ BEGIN PUSHBUTTON "&Creare rezervă…", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Componente fizice" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -626,7 +626,7 @@ BEGIN GROUPBOX "Opțiuni de verificare", -1, 7, 6, 179, 40 PUSHBUTTON "A&nulează", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "&Repară erorile în mod automat", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Analizează și repară înregistrările eronate", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Analizează și repară înregistrările eronate", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -709,7 +709,7 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Particularizare" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -718,16 +718,16 @@ BEGIN LTEXT "&Utilizați acest tip de dosar ca șablon:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Aplică acest șa&blon pentru toate subdosarele sale", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Dosar de imagini", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Dosar de imagini", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Pentru aspect cu miniaturi puteți amplasa o imagine pe acest dosar care să vă amintească de conținutul său.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Spe&cificare imagine…", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restabilește implicite", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Spe&cificare imagine…", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restabilește implicite", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Previzualizare:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Pictograme de dosar", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Pentru alte aspecte în afara miniaturilor, puteți schimba pictograma „dosar” cu altceva.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Schi&mbare pictogramă…", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Pictograme de dosar", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Pentru alte aspecte în afara miniaturilor, puteți schimba pictograma „dosar” cu altceva.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Schi&mbare pictogramă…", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 1b61f02a500..f1fa9626798 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -305,7 +305,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Общие" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -334,11 +334,11 @@ BEGIN CTEXT "Диск %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Очистка &диска", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "&Сжимать для экономии места", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Разрешить &индексирование диска для быстрого поиска", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "&Сжимать для экономии места", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Разрешить &индексирование диска для быстрого поиска", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Сервис" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -357,7 +357,7 @@ BEGIN PUSHBUTTON "Выполнить &архивацию...", 14002, 110, 170, 120, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Оборудование" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -710,7 +710,7 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Настройка" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -719,16 +719,16 @@ BEGIN LTEXT "Использовать этот тип в качестве &шаблона:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Также применять его ко всем &подпапкам", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Картинка для папки", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Картинка для папки", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "В режиме просмотра эскизов можно разместить картинку для этой папки, которая напомнит о её содержимом.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Выбрать &картинку...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Восстановить по умолчанию", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Выбрать &картинку...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Восстановить по умолчанию", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Просмотр:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Значок для папки", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Для всех режимов просмотра, кроме эскизов, можно заменить стандартный значок папки на другой.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Сменить &значок...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Значок для папки", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Для всех режимов просмотра, кроме эскизов, можно заменить стандартный значок папки на другой.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Сменить &значок...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index bcc4af294ce..19c343ac8f6 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Všeobecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Jednotka %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Čistenie &disku", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Ušetriť miesto na disku &kompresiou jednotky", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "&Povoliť indexovanie pre tento disk, a zrýchliť tak hľadanie súborov", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Ušetriť miesto na disku &kompresiou jednotky", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "&Povoliť indexovanie pre tento disk, a zrýchliť tak hľadanie súborov", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Nástroje" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "&Zálohovať...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardvér" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -617,8 +617,8 @@ BEGIN DEFPUSHBUTTON "&Spustiť", IDOK, 63, 95, 60, 14 GROUPBOX "Možnosti kontroly disku", -1, 7, 6, 179, 40 PUSHBUTTON "Zrušiť", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "&Automaticky opraviť chyby v systéme súborov", 14000, 16, 15, 165, 10 - AUTOCHECKBOX "Vy&hľadať a pokúsiť sa obnoviť chybné sektory", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Automaticky opraviť chyby v systéme súborov", 14000, 12, 15, 165, 10 + AUTOCHECKBOX "Vy&hľadať a pokúsiť sa obnoviť chybné sektory", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index d8ae90a55af..30d224df2df 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -64,7 +64,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "C&ut", IDM_CUT + MENUITEM "Cu&t", IDM_CUT MENUITEM "&Copy", IDM_COPY MENUITEM "Paste", IDM_INSERT MENUITEM SEPARATOR @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 43140f7679b..b08b95e5b4d 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -303,7 +303,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Përgjithshme" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -332,11 +332,11 @@ BEGIN CTEXT "Drive %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Pastrim &Disku", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Kompres drivin për të kursyer hapësirë në disk", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Lejo Shërbimet e Indeksimi për indeksim të këtij disku për dokumentat të shpejtë në kërkim", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Kompres drivin për të kursyer hapësirë në disk", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Lejo Shërbimet e Indeksimi për indeksim të këtij disku për dokumentat të shpejtë në kërkim", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Vegla" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -355,7 +355,7 @@ BEGIN PUSHBUTTON "Rezerv Tani...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pajisje" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -625,7 +625,7 @@ BEGIN GROUPBOX "Opsione kontrollo diskun", -1, 7, 6, 179, 40 PUSHBUTTON "Anulo", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Rregullo dokumentet e sistemit automatikisht", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Skano për shërim dhe përpjekje të sektorëve të këqij", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Skano për shërim dhe përpjekje të sektorëve të këqij", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -708,7 +708,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -717,16 +717,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e00a5433304..094a3a54483 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allmänt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Enhet %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Diskrensning", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Komprimera enhet för att spara diskutrymme", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Tillåt indexeringstjänsten att indexera den här disken för snabb filsökning", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Komprimera enhet för att spara diskutrymme", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Tillåt indexeringstjänsten att indexera den här disken för snabb filsökning", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Verktyg" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Säkerhetskopiera nu...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hårdvara" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -618,7 +618,7 @@ BEGIN GROUPBOX "Alternativ för diskkontroll", -1, 7, 6, 179, 40 PUSHBUTTON "Avbryt", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Laga filsystemsfel automatiskt", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Sök och försök laga trasiga sektorer", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "&Sök och försök laga trasiga sektorer", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Customize" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Folder icons", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 351e8146f4c..9c0189cf446 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -305,7 +305,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Genel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -334,11 +334,11 @@ BEGIN CTEXT "Sürücü %c", 14009, 95, 162, 50, 10 PUSHBUTTON "&Disk Temizleme", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Di&sk alanını arttırmak için sürücüyü sıkıştır", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "&Hızlı dosya araması için, Dizinleme Hizmeti'ni etkinleştir.", 14012, 8, 214, 222, 25, WS_DISABLED + CHECKBOX "Di&sk alanını arttırmak için sürücüyü sıkıştır", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "&Hızlı dosya araması için, Dizinleme Hizmeti'ni etkinleştir.", 14012, 8, 204, 222, 25, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Araçlar" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -357,7 +357,7 @@ BEGIN PUSHBUTTON "Şimdi &Yedekle...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Donanım" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -627,7 +627,7 @@ BEGIN GROUPBOX "Diski denetleme seçenekleri", -1, 7, 6, 179, 40 PUSHBUTTON "İptal", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "&Dosya sistemi hatalarını otomatik düzelt", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "B&ozuk bölümleri tara ve kurtarmaya çalış", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "B&ozuk bölümleri tara ve kurtarmaya çalış", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -719,16 +719,16 @@ BEGIN LTEXT "&Bu dizini bir şablon olarak kullan:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Bu şablonu tüm &alt dizinlere de uygula", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Dizin resimleri", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Dizin resimleri", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Küçük Resimler görünümü için, içerikleri hatırlamanız için bu dizin üzerine bir resim yerleştirebilirsiniz.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "&Resim Seç...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Varsayılanı Geri Getir", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "&Resim Seç...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "&Varsayılanı Geri Getir", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Önizleme:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Dizin Simgeleri", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Küçük Resimler görünümü dışında, tüm görünümler için standart ""dizin"" simgesini başka bir simgeyle değiştirebilirsiniz.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "&Simge Değiştir...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Dizin Simgeleri", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Küçük Resimler görünümü dışında, tüm görünümler için standart ""dizin"" simgesini başka bir simgeyle değiştirebilirsiniz.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "&Simge Değiştir...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 09997ef3c96..9c069ec6ab9 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -296,7 +296,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Загальні" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -325,11 +325,11 @@ BEGIN CTEXT "Диск %c", 14009, 95, 162, 50, 10 PUSHBUTTON "Очищення &диску", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Стискати диск для заощадження місця", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "Дозволити індексування диску для прискорення пошуку", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "Стискати диск для заощадження місця", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "Дозволити індексування диску для прискорення пошуку", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Сервіс" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -348,7 +348,7 @@ BEGIN PUSHBUTTON "Виконати архівацію...", 14002, 125, 170, 100, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Обладнання" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -617,8 +617,8 @@ BEGIN DEFPUSHBUTTON "Почати", IDOK, 63, 95, 60, 14 GROUPBOX "Опції перевірки диску", -1, 7, 6, 179, 40 PUSHBUTTON "Скасувати", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "Виправити помилки файлової системи", 14000, 16, 15, 165, 10 - AUTOCHECKBOX "&Спробувати відновити погані сектори", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "Виправити помилки файлової системи", 14000, 12, 15, 165, 10 + AUTOCHECKBOX "&Спробувати відновити погані сектори", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -701,7 +701,7 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "Налаштувати" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" @@ -710,16 +710,16 @@ BEGIN LTEXT "Використовувати цей &тип папки як шаблон:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "&Застосувати цей шаблон до всіх вкладених папок", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Картинки папки", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "Картинки папки", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "Для перегляду ескізів ви можете помістити зображення в цю папку, щоб нагадати вам про вміст.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Вибрати з&ображення...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "З&а замовчування", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "Вибрати з&ображення...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "З&а замовчування", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "Перегляд:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Значки папки", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "Для всіх видів, окрім мініатюр, можна змінити стандартний ""значок папки"" на інший.", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Змінити &значок...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "Значки папки", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "Для всіх видів, окрім мініатюр, можна змінити стандартний ""значок папки"" на інший.", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "Змінити &значок...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 0d77cd64138..6725549476b 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -74,7 +74,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "剪切(&U)", IDM_CUT + MENUITEM "剪切(&T)", IDM_CUT MENUITEM "复制(&C)", IDM_COPY MENUITEM "粘贴", IDM_INSERT MENUITEM SEPARATOR @@ -306,7 +306,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" FONT 9, "宋体", 0, 0, 0x0 @@ -335,11 +335,11 @@ BEGIN CTEXT "磁盘 %c", 14009, 95, 162, 50, 10 PUSHBUTTON "磁盘清理(&D)", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "压缩磁盘以节约磁盘空间", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "允许索引服务编制该磁盘的索引以便快速搜索文件", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "压缩磁盘以节约磁盘空间", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "允许索引服务编制该磁盘的索引以便快速搜索文件", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "工具" FONT 9, "宋体", 0, 0, 0x0 @@ -358,7 +358,7 @@ BEGIN PUSHBUTTON "开始备份...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "硬件" FONT 9, "宋体", 0, 0, 0x0 @@ -628,7 +628,7 @@ BEGIN GROUPBOX "请检查磁盘选项", -1, 7, 6, 179, 40 PUSHBUTTON "取消", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "自动修复文件系统错误", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "扫描并试图恢复坏扇区(&S)", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "扫描并试图恢复坏扇区(&S)", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -709,7 +709,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "自定义" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 9, "宋体" @@ -718,16 +718,16 @@ BEGIN LTEXT "将此文件夹类型设置成模板(&F)：", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "将此模板应用到所有子文件夹(&S)", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "文件夹图片", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "文件夹图片", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "对于缩略图视图，您可以在此文件夹上放置图片以提醒您内容。", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "更改图片(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "恢复默认(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "更改图片(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "恢复默认(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "预览：", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "文件夹图标", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "对于除缩略图以外的所有视图，您可以将标准“文件夹”图标更改为另一个图标。", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "更改图标(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "文件夹图标", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "对于除缩略图以外的所有视图，您可以将标准“文件夹”图标更改为另一个图标。", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "更改图标(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index 3bd063da9f1..a710e37e79a 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -54,7 +54,7 @@ MENU_003 MENU BEGIN MENUITEM "復原(&U)\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR - MENUITEM "剪下(&U)\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "剪下(&T)\tCtrl+X", FCIDM_SHVIEW_CUT MENUITEM "複製(&C)\tCtrl+C", FCIDM_SHVIEW_COPY MENUITEM "貼上(&P)\tCtrl+V", FCIDM_SHVIEW_INSERT MENUITEM "貼上捷徑(&S)", FCIDM_SHVIEW_INSERTLINK @@ -72,7 +72,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "剪下(&U)", IDM_CUT + MENUITEM "剪下(&T)", IDM_CUT MENUITEM "複製(&C)", IDM_COPY MENUITEM "貼上", IDM_INSERT MENUITEM SEPARATOR @@ -304,7 +304,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "一般" FONT 9, "新細明體", 0, 0, 0x0 @@ -333,11 +333,11 @@ BEGIN CTEXT "磁碟機 %c", 14009, 95, 162, 50, 10 PUSHBUTTON "磁碟清理(&D)", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "壓縮磁碟機來節省磁碟空間", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "允許建立索引以便快速搜尋", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "壓縮磁碟機來節省磁碟空間", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "允許建立索引以便快速搜尋", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "工具" FONT 9, "新細明體", 0, 0, 0x0 @@ -356,7 +356,7 @@ BEGIN PUSHBUTTON "立即備份...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "硬件" FONT 9, "新細明體", 0, 0, 0x0 @@ -626,7 +626,7 @@ BEGIN GROUPBOX "檢查磁碟選項", -1, 7, 6, 179, 40 PUSHBUTTON "取消", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "自動修復檔案系統錯誤", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "嘗試掃描並修復壞磁區(&S)", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "嘗試掃描並修復壞磁區(&S)", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -707,7 +707,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "自訂" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 9, "新細明體" @@ -716,16 +716,16 @@ BEGIN LTEXT "將這個資料夾類型設定成範本(&F)：", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "將這個範本套用到所有子資料夾(&S)", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "資料夾圖片", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "資料夾圖片", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "對於縮圖檢視，您可以在這個資料夾上放置圖片以提醒您內容。", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "選擇圖片(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "還原成預設值(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "選擇圖片(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "還原成預設值(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "檢視:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "資料夾圖示", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "對於除縮圖以外的所有檢視，您可以將標準［資料夾］圖示更改為另一個圖示。", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "變更圖示(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "資料夾圖示", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "對於除縮圖以外的所有檢視，您可以將標準［資料夾］圖示更改為另一個圖示。", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "變更圖示(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 6f3f37c48eb..00149e69b09 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -55,7 +55,7 @@ MENU_003 MENU BEGIN MENUITEM "復原(&U)\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR - MENUITEM "剪下(&U)\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "剪下(&T)\tCtrl+X", FCIDM_SHVIEW_CUT MENUITEM "複製(&C)\tCtrl+C", FCIDM_SHVIEW_COPY MENUITEM "貼上(&P)\tCtrl+V", FCIDM_SHVIEW_INSERT MENUITEM "貼上捷徑(&S)", FCIDM_SHVIEW_INSERTLINK @@ -73,7 +73,7 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "剪下(&U)", IDM_CUT + MENUITEM "剪下(&T)", IDM_CUT MENUITEM "複製(&C)", IDM_COPY MENUITEM "貼上", IDM_INSERT MENUITEM SEPARATOR @@ -305,7 +305,7 @@ BEGIN EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END -IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "一般" FONT 9, "新細明體", 0, 0, 0x0 @@ -334,11 +334,11 @@ BEGIN CTEXT "磁碟機 %c", 14009, 95, 162, 50, 10 PUSHBUTTON "磁碟清理(&D)", 14010, 160, 159, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "壓縮磁碟機來節省磁碟空間", 14011, 8, 200, 222, 10, WS_DISABLED - CHECKBOX "允許建立索引以便快速搜尋", 14012, 8, 214, 222, 10, WS_DISABLED + CHECKBOX "壓縮磁碟機來節省磁碟空間", 14011, 8, 190, 222, 10, WS_DISABLED + CHECKBOX "允許建立索引以便快速搜尋", 14012, 8, 204, 222, 10, WS_DISABLED END -IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "工具" FONT 9, "新細明體", 0, 0, 0x0 @@ -357,7 +357,7 @@ BEGIN PUSHBUTTON "現在備份...", 14002, 130, 170, 90, 15, WS_TABSTOP END -IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 +IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "硬體" FONT 9, "新細明體", 0, 0, 0x0 @@ -627,7 +627,7 @@ BEGIN GROUPBOX "檢查磁碟選項", -1, 7, 6, 179, 40 PUSHBUTTON "取消", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "自動修復檔案系統錯誤", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "嘗試掃描和修復壞磁區(&S)", 14001, 16, 30, 165, 10 + AUTOCHECKBOX "嘗試掃描和修復壞磁區(&S)", 14001, 12, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -708,7 +708,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 160, 40, 60, 14 END -IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 220 CAPTION "自訂" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 9, "新細明體" @@ -717,16 +717,16 @@ BEGIN LTEXT "將這個資料夾類型設定成範本(&F)：", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "將這個範本套用到所有子資料夾(&S)", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "資料夾圖片", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + GROUPBOX "資料夾圖片", IDC_STATIC, 5, 75, 230, 85, WS_TABSTOP LTEXT "對於縮圖檢視，您可以在這個資料夾上放置圖片以提醒您內容。", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "選擇圖片(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "還原成預設值(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + PUSHBUTTON "選擇圖片(&P)...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 120, 115, 15 + PUSHBUTTON "還原成預設值(&R)", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 139, 115, 15 LTEXT "檢視:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "資料夾圖示", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "對於除縮圖以外的所有檢視，您可以將標準「資料夾」圖示更改為另一個圖示。", IDC_STATIC, 15, 180, 210, 25 - ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "變更圖示(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + GROUPBOX "資料夾圖示", IDC_STATIC, 5, 165, 230, 50, WS_TABSTOP + LTEXT "對於除縮圖以外的所有檢視，您可以將標準「資料夾」圖示更改為另一個圖示。", IDC_STATIC, 15, 175, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 194, 32, 30 + PUSHBUTTON "變更圖示(&I)...", IDC_FOLDERCUST_CHANGE_ICON, 15, 195, 75, 15 END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140

10 months, 1 week

[reactos] 01/01: [NTOSKRNL] Remove remnant internal/arm/asmmacro.S (#6052)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1244659d4c1658d71f4a7… commit 1244659d4c1658d71f4a75df1129899c33dc276b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Dec 14 14:48:31 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 14 13:48:31 2023 +0000 [NTOSKRNL] Remove remnant internal/arm/asmmacro.S (#6052) Addendum to 6212c82 (r67715). --- ntoskrnl/include/internal/arm/asmmacro.S | 142 ------------------------------- 1 file changed, 142 deletions(-) diff --git a/ntoskrnl/include/internal/arm/asmmacro.S b/ntoskrnl/include/internal/arm/asmmacro.S deleted file mode 100644 index e077f8fe87e..00000000000 --- a/ntoskrnl/include/internal/arm/asmmacro.S +++ /dev/null @@ -1,142 +0,0 @@ - -#ifdef _MSC_VER - -#else - -.macro TRAP_PROLOG Abort - // Fixup lr -.if \Abort - sub lr, lr, #8 -.else - sub lr, lr, #4 -.endif - - // Save the bottom 4 registers - stmdb sp, {r0-r3} - - // Save the abort lr, sp, spsr, cpsr - mov r0, lr - mov r1, sp - mrs r2, cpsr - mrs r3, spsr - - // Switch to SVC mode - bic r2, r2, #CPSR_MODES - orr r2, r2, #CPSR_SVC_MODE - msr cpsr_c, r2 - - // Save the SVC sp before we modify it - mov r2, sp - - // Make space for the trap frame - sub sp, sp, #TrapFrameLength - - // Save abt32 state - str r0, [sp, #TrPc] - str lr, [sp, #TrSvcLr] - str r2, [sp, #TrSvcSp] - - // Restore the saved SPSR - msr spsr_all, r3 - - // Restore our 4 registers - ldmdb r1, {r0-r3} - - // Build trap frame - // FIXME: Change to stmdb later - str r0, [sp, #TrR0] - str r1, [sp, #TrR1] - str r2, [sp, #TrR2] - str r3, [sp, #TrR3] - str r4, [sp, #TrR4] - str r5, [sp, #TrR5] - str r6, [sp, #TrR6] - str r7, [sp, #TrR7] - str r8, [sp, #TrR8] - str r9, [sp, #TrR9] - str r10, [sp, #TrR10] - str r11, [sp, #TrR11] - str r12, [sp, #TrR12] - mov r12, sp - add r12, r12, #TrUserSp - stm r12, {sp, lr}^ - mrs r0, spsr_all - str r0, [sp, #TrSpsr] - ldr r0, =0xBADB0D00 - str r0, [sp, #TrDbgArgMark] -.endm - -.macro SYSCALL_PROLOG - // Make space for the trap frame - sub sp, sp, #TrapFrameLength - - // Build trap frame - // FIXME: Change to stmdb later - str r0, [sp, #TrR0] - str r1, [sp, #TrR1] - str r2, [sp, #TrR2] - str r3, [sp, #TrR3] - str r4, [sp, #TrR4] - str r5, [sp, #TrR5] - str r6, [sp, #TrR6] - str r7, [sp, #TrR7] - str r8, [sp, #TrR8] - str r9, [sp, #TrR9] - str r10, [sp, #TrR10] - str r11, [sp, #TrR11] - str r12, [sp, #TrR12] - mov r12, sp - add r12, r12, #TrUserSp - stm r12, {sp, lr}^ - str sp, [sp, #TrSvcSp] - str lr, [sp, #TrPc] - mrs r0, spsr_all - str r0, [sp, #TrSpsr] - ldr r0, =0xBADB0D00 - str r0, [sp, #TrDbgArgMark] -.endm - -.macro TRAP_EPILOG SystemCall - // ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00) - ldr r0, [sp, #TrDbgArgMark] - ldr r1, =0xBADB0D00 - cmp r0, r1 - bne 1f - - // Get the SPSR and restore it - ldr r0, [sp, #TrSpsr] - msr spsr_all, r0 - - // Restore the registers - // FIXME: Use LDMIA later - mov r0, sp - add r0, r0, #TrUserSp - ldm r0, {sp, lr}^ - ldr r0, [sp, #TrR0] - ldr r1, [sp, #TrR1] - ldr r2, [sp, #TrR2] - ldr r3, [sp, #TrR3] - ldr r4, [sp, #TrR4] - ldr r5, [sp, #TrR5] - ldr r6, [sp, #TrR6] - ldr r7, [sp, #TrR7] - ldr r8, [sp, #TrR8] - ldr r9, [sp, #TrR9] - ldr r10, [sp, #TrR10] - ldr r11, [sp, #TrR11] - ldr r12, [sp, #TrR12] - - // Restore program execution state -.if \SystemCall - ldr lr, [sp, #TrPc] - add sp, sp, #TrapFrameLength - movs pc, lr -.else - add sp, sp, #TrSvcSp - ldmia sp, {sp, lr, pc}^ -.endif -1: - b . -.endm - -#endif

10 months, 1 week

[reactos] 01/01: [SHIMGVW] Initial implementation of Slide Show (#6163)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=946b906ec887a3ec276e0… commit 946b906ec887a3ec276e0a1b49ac3258d65f3a67 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 14 17:38:08 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 14 17:38:08 2023 +0900 [SHIMGVW] Initial implementation of Slide Show (#6163) Add Slide Show feature. - Add Preview_StartSlideShow and Preview_EndSlideShow functions. - Add g_hMainWnd and g_hwndFullscreen global variables. - Modify ZoomWnd_OnPaint to display Slide Show correctly. - Add a timer to proceed Slide Show. CORE-19358 --- dll/win32/shimgvw/resource.h | 1 + dll/win32/shimgvw/shimgvw.c | 276 ++++++++++++++++++++++++++++++++----------- dll/win32/shimgvw/shimgvw.rc | 1 + 3 files changed, 212 insertions(+), 66 deletions(-) diff --git a/dll/win32/shimgvw/resource.h b/dll/win32/shimgvw/resource.h index 7c005cc6760..68f91679139 100644 --- a/dll/win32/shimgvw/resource.h +++ b/dll/win32/shimgvw/resource.h @@ -40,6 +40,7 @@ #define IDC_SAVEAS (IDC_TOOL_BASE + 11) #define IDC_MODIFY (IDC_TOOL_BASE + 12) #define IDC_HELP_TOC (IDC_TOOL_BASE + 13) +#define IDC_ENDSLIDESHOW (IDC_TOOL_BASE + 14) #define TBICON_PREV_PIC 0 #define TBICON_NEXT_PIC 1 diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index cf62ba202ee..17dfc369e38 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -17,28 +17,25 @@ #define TB_IMAGE_WIDTH 16 #define TB_IMAGE_HEIGHT 16 -HINSTANCE g_hInstance; +/* Slide show timer */ +#define SLIDESHOW_TIMER_ID 0xFACE +#define SLIDESHOW_TIMER_INTERVAL 5000 /* 5 seconds */ + +HINSTANCE g_hInstance = NULL; +HWND g_hMainWnd = NULL; +HWND g_hwndFullscreen = NULL; SHIMGVW_SETTINGS g_Settings; SHIMGVW_FILENODE *g_pCurrentFile; GpImage *g_pImage = NULL; -/* zooming */ -static UINT s_nZoomPercents = 100; - static const UINT s_ZoomSteps[] = { - 10, 25, 50, 100, 200, 400, 800, 1600 + 5, 10, 25, 50, 100, 125, 200, 300, 500, 1000 }; #define MIN_ZOOM s_ZoomSteps[0] #define MAX_ZOOM s_ZoomSteps[_countof(s_ZoomSteps) - 1] -/* ToolBar Buttons */ -typedef struct { - DWORD idb; /* Index to bitmap */ - DWORD ids; /* Index to tooltip */ -} TB_BUTTON_CONFIG; - /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ #define DEFINE_BTN_INFO(_name) \ { TBICON_##_name, IDC_##_name, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } @@ -70,6 +67,13 @@ static const TBBUTTON s_Buttons[] = DEFINE_BTN_INFO(HELP_TOC) }; +/* ToolBar Button configuration */ +typedef struct +{ + DWORD idb; /* Index to bitmap */ + DWORD ids; /* Index to tooltip */ +} TB_BUTTON_CONFIG; + #define DEFINE_BTN_CONFIG(_name) { IDB_##_name, IDS_TOOLTIP_##_name } static const TB_BUTTON_CONFIG s_ButtonConfig[] = @@ -100,11 +104,18 @@ typedef struct tagPREVIEW_DATA ANIME m_Anime; /* Animation */ } PREVIEW_DATA, *PPREVIEW_DATA; -PPREVIEW_DATA Preview_GetData(HWND hwnd) +static inline PPREVIEW_DATA +Preview_GetData(HWND hwnd) { return (PPREVIEW_DATA)GetWindowLongPtrW(hwnd, GWLP_USERDATA); } +static inline BOOL +Preview_IsMainWnd(HWND hwnd) +{ + return hwnd == g_hMainWnd; +} + static VOID Preview_UpdateZoom(PPREVIEW_DATA pData, UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { @@ -144,7 +155,7 @@ Preview_ZoomInOrOut(PPREVIEW_DATA pData, BOOL bZoomIn) /* find next step */ for (i = 0; i < _countof(s_ZoomSteps); ++i) { - if (s_nZoomPercents < s_ZoomSteps[i]) + if (pData->m_nZoomPercents < s_ZoomSteps[i]) break; } NewZoom = ((i >= _countof(s_ZoomSteps)) ? MAX_ZOOM : s_ZoomSteps[i]); @@ -155,7 +166,7 @@ Preview_ZoomInOrOut(PPREVIEW_DATA pData, BOOL bZoomIn) for (i = _countof(s_ZoomSteps); i > 0; ) { --i; - if (s_ZoomSteps[i] < s_nZoomPercents) + if (s_ZoomSteps[i] < pData->m_nZoomPercents) break; } NewZoom = ((i < 0) ? MIN_ZOOM : s_ZoomSteps[i]); @@ -380,6 +391,10 @@ Preview_UpdateUI(PPREVIEW_DATA pData) BOOL bEnable = (g_pImage != NULL); SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); + + if (!Preview_IsMainWnd(pData->m_hwnd)) + Preview_ResetZoom(pData); + InvalidateRect(pData->m_hwndZoom, NULL, FALSE); } @@ -536,19 +551,17 @@ static HBRUSH CreateCheckerBoardBrush(HDC hdc) } static VOID -ZoomWnd_OnPaint(HWND hwnd) +ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) { GpGraphics *graphics; - UINT ImageWidth, ImageHeight; INT ZoomedWidth, ZoomedHeight, x, y; PAINTSTRUCT ps; RECT rect, margin; HDC hdc; - HBRUSH white; - HGDIOBJ hbrOld; + HBRUSH hBrush; + HPEN hPen; + HGDIOBJ hbrOld, hPenOld, hFontOld; UINT uFlags; - WCHAR szText[128]; - HGDIOBJ hFontOld; hdc = BeginPaint(hwnd, &ps); if (!hdc) @@ -565,29 +578,42 @@ ZoomWnd_OnPaint(HWND hwnd) } GetClientRect(hwnd, &rect); - white = GetStockObject(WHITE_BRUSH); - if (g_pImage == NULL) + if (Preview_IsMainWnd(pData->m_hwnd)) { - FillRect(hdc, &rect, white); + hPen = (HPEN)GetStockObject(BLACK_PEN); + hBrush = (HBRUSH)GetStockObject(WHITE_BRUSH); + SetTextColor(hdc, RGB(0, 0, 0)); /* Black text */ + } + else + { + hPen = (HPEN)GetStockObject(WHITE_PEN); + hBrush = (HBRUSH)GetStockObject(BLACK_BRUSH); + SetTextColor(hdc, RGB(255, 255, 255)); /* White text */ + } + if (g_pImage == NULL) + { + WCHAR szText[128]; LoadStringW(g_hInstance, IDS_NOPREVIEW, szText, _countof(szText)); - SetTextColor(hdc, RGB(0, 0, 0)); - SetBkMode(hdc, TRANSPARENT); + FillRect(hdc, &rect, hBrush); hFontOld = SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); + SetBkMode(hdc, TRANSPARENT); DrawTextW(hdc, szText, -1, &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER | DT_NOPREFIX); SelectObject(hdc, hFontOld); } else { + UINT ImageWidth, ImageHeight; + GdipGetImageWidth(g_pImage, &ImageWidth); GdipGetImageHeight(g_pImage, &ImageHeight); - ZoomedWidth = (ImageWidth * s_nZoomPercents) / 100; - ZoomedHeight = (ImageHeight * s_nZoomPercents) / 100; + ZoomedWidth = (ImageWidth * pData->m_nZoomPercents) / 100; + ZoomedHeight = (ImageHeight * pData->m_nZoomPercents) / 100; x = (rect.right - ZoomedWidth) / 2; y = (rect.bottom - ZoomedHeight) / 2; @@ -595,27 +621,27 @@ ZoomWnd_OnPaint(HWND hwnd) // Fill top part margin = rect; margin.bottom = y - 1; - FillRect(hdc, &margin, white); + FillRect(hdc, &margin, hBrush); // Fill bottom part margin.top = y + ZoomedHeight + 1; margin.bottom = rect.bottom; - FillRect(hdc, &margin, white); + FillRect(hdc, &margin, hBrush); // Fill left part margin.top = y - 1; margin.bottom = y + ZoomedHeight + 1; margin.right = x - 1; - FillRect(hdc, &margin, white); + FillRect(hdc, &margin, hBrush); // Fill right part margin.left = x + ZoomedWidth + 1; margin.right = rect.right; - FillRect(hdc, &margin, white); + FillRect(hdc, &margin, hBrush); DPRINT("x = %d, y = %d, ImageWidth = %u, ImageHeight = %u\n"); DPRINT("rect.right = %ld, rect.bottom = %ld\n", rect.right, rect.bottom); - DPRINT("s_nZoomPercents = %d, ZoomedWidth = %d, ZoomedHeight = %d\n", - s_nZoomPercents, ZoomedWidth, ZoomedWidth); + DPRINT("m_nZoomPercents = %d, ZoomedWidth = %d, ZoomedHeight = %d\n", + pData->m_nZoomPercents, ZoomedWidth, ZoomedWidth); - if (s_nZoomPercents % 100 == 0) + if (pData->m_nZoomPercents % 100 == 0) { GdipSetInterpolationMode(graphics, InterpolationModeNearestNeighbor); GdipSetSmoothingMode(graphics, SmoothingModeNone); @@ -629,6 +655,7 @@ ZoomWnd_OnPaint(HWND hwnd) uFlags = 0; GdipGetImageFlags(g_pImage, &uFlags); + hPenOld = SelectObject(hdc, hPen); if (uFlags & (ImageFlagsHasAlpha | ImageFlagsHasTranslucent)) { HBRUSH hbr = CreateCheckerBoardBrush(hdc); @@ -643,6 +670,7 @@ ZoomWnd_OnPaint(HWND hwnd) Rectangle(hdc, x - 1, y - 1, x + ZoomedWidth + 1, y + ZoomedHeight + 1); SelectObject(hdc, hbrOld); } + SelectObject(hdc, hPenOld); GdipDrawImageRectI(graphics, g_pImage, x, y, ZoomedWidth, ZoomedHeight); } @@ -698,9 +726,14 @@ Preview_CreateToolBar(PPREVIEW_DATA pData) { HWND hwndToolBar; HIMAGELIST hImageList, hOldImageList; - const DWORD style = WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS; + DWORD style = WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS; + DWORD exstyle = 0; + + if (!Preview_IsMainWnd(pData->m_hwnd)) + return TRUE; /* FIXME */ - hwndToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style, + style |= CCS_BOTTOM; + hwndToolBar = CreateWindowExW(exstyle, TOOLBARCLASSNAMEW, NULL, style, 0, 0, 0, 0, pData->m_hwnd, NULL, g_hInstance, NULL); if (!hwndToolBar) return FALSE; @@ -732,12 +765,12 @@ Preview_CreateToolBar(PPREVIEW_DATA pData) LRESULT CALLBACK ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - PPREVIEW_DATA pData = (PPREVIEW_DATA)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + PPREVIEW_DATA pData = Preview_GetData(hwnd); switch (uMsg) { case WM_PAINT: { - ZoomWnd_OnPaint(hwnd); + ZoomWnd_OnPaint(pData, hwnd); break; } case WM_TIMER: @@ -762,6 +795,13 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) pData->m_hwnd = hwnd; SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + if (g_hMainWnd == NULL) + g_hMainWnd = hwnd; + else if (g_hwndFullscreen == NULL) + g_hwndFullscreen = hwnd; + else + return FALSE; + DragAcceptFiles(hwnd, TRUE); hwndZoom = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, NULL, WS_CHILD | WS_VISIBLE, @@ -776,7 +816,7 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) SetWindowLongPtrW(hwndZoom, GWLP_USERDATA, (LONG_PTR)pData); SetClassLongPtr(pData->m_hwndZoom, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); - pData->m_fnPrevProc = (WNDPROC)SetWindowLongPtr(pData->m_hwndZoom, + pData->m_fnPrevProc = (WNDPROC)SetWindowLongPtrW(pData->m_hwndZoom, GWLP_WNDPROC, (LPARAM)ZoomWndProc); if (!Preview_CreateToolBar(pData)) @@ -821,7 +861,7 @@ Preview_OnMoveSize(HWND hwnd) WINDOWPLACEMENT wp; RECT *prc; - if (IsIconic(hwnd)) + if (IsIconic(hwnd) || !Preview_IsMainWnd(hwnd)) return; wp.length = sizeof(WINDOWPLACEMENT); @@ -836,22 +876,46 @@ Preview_OnMoveSize(HWND hwnd) } static VOID -Preview_OnSize(HWND hwnd, UINT state, INT cx, INT cy) +Preview_OnSize(HWND hwnd) { - RECT rc; + RECT rc, rcClient; PPREVIEW_DATA pData = Preview_GetData(hwnd); HWND hToolBar = pData->m_hwndToolBar; + INT cx, cy; - SendMessageW(hToolBar, TB_AUTOSIZE, 0, 0); + /* We want 32-bit values. Don't use WM_SIZE lParam */ + GetClientRect(hwnd, &rcClient); + cx = rcClient.right; + cy = rcClient.bottom; - GetWindowRect(hToolBar, &rc); + if (Preview_IsMainWnd(pData->m_hwnd)) + { + SendMessageW(hToolBar, TB_AUTOSIZE, 0, 0); + GetWindowRect(hToolBar, &rc); - MoveWindow(pData->m_hwndZoom, 0, 0, cx, cy - (rc.bottom - rc.top), TRUE); + MoveWindow(pData->m_hwndZoom, 0, 0, cx, cy - (rc.bottom - rc.top), TRUE); - if (!IsIconic(hwnd)) /* Is it not minimized? */ - Preview_ResetZoom(pData); + if (!IsIconic(hwnd)) /* Is it not minimized? */ + Preview_ResetZoom(pData); - Preview_OnMoveSize(hwnd); + Preview_OnMoveSize(hwnd); + } + else + { + MoveWindow(pData->m_hwndZoom, 0, 0, cx, cy, TRUE); + } +} + +static VOID +Preview_EndSlideShow(HWND hwnd) +{ + if (Preview_IsMainWnd(hwnd)) + return; + + KillTimer(hwnd, SLIDESHOW_TIMER_ID); + ShowWindow(hwnd, SW_HIDE); + ShowWindow(g_hMainWnd, SW_SHOWNORMAL); + Preview_ResetZoom(Preview_GetData(g_hMainWnd)); } static VOID @@ -930,6 +994,49 @@ Preview_Edit(HWND hwnd) DestroyWindow(hwnd); } +static VOID +Preview_StartSlideShow(PPREVIEW_DATA pData) +{ + HWND hwnd = g_hwndFullscreen; + DWORD style = WS_POPUP | WS_CLIPSIBLINGS, exstyle = WS_EX_TOPMOST; + + ShowWindow(pData->m_hwnd, SW_HIDE); + + if (!IsWindow(hwnd)) + { + WCHAR szTitle[256]; + LoadStringW(g_hInstance, IDS_APPTITLE, szTitle, _countof(szTitle)); + hwnd = CreateWindowExW(exstyle, WC_PREVIEW, szTitle, style, + 0, 0, 0, 0, NULL, NULL, g_hInstance, NULL); + } + + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + UpdateWindow(hwnd); + + SetTimer(hwnd, SLIDESHOW_TIMER_ID, SLIDESHOW_TIMER_INTERVAL, NULL); +} + +static VOID +Preview_GoNextPic(PPREVIEW_DATA pData, BOOL bNext) +{ + HWND hwnd = pData->m_hwnd; + if (!Preview_IsMainWnd(hwnd)) + { + KillTimer(hwnd, SLIDESHOW_TIMER_ID); + SetTimer(hwnd, SLIDESHOW_TIMER_ID, SLIDESHOW_TIMER_INTERVAL, NULL); + } + + if (g_pCurrentFile) + { + if (bNext) + g_pCurrentFile = g_pCurrentFile->Next; + else + g_pCurrentFile = g_pCurrentFile->Prev; + Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateUI(pData); + } +} + static VOID Preview_OnCommand(HWND hwnd, UINT nCommandID) { @@ -938,21 +1045,11 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) switch (nCommandID) { case IDC_PREV_PIC: - if (g_pCurrentFile) - { - g_pCurrentFile = g_pCurrentFile->Prev; - Preview_pLoadImageFromNode(pData, g_pCurrentFile); - Preview_UpdateUI(pData); - } + Preview_GoNextPic(pData, FALSE); break; case IDC_NEXT_PIC: - if (g_pCurrentFile) - { - g_pCurrentFile = g_pCurrentFile->Next; - Preview_pLoadImageFromNode(pData, g_pCurrentFile); - Preview_UpdateUI(pData); - } + Preview_GoNextPic(pData, TRUE); break; case IDC_BEST_FIT: @@ -964,7 +1061,10 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) break; case IDC_SLIDE_SHOW: - DPRINT1("IDC_SLIDE_SHOW unimplemented\n"); + if (Preview_IsMainWnd(hwnd)) + Preview_StartSlideShow(pData); + else + Preview_EndSlideShow(hwnd); break; case IDC_ZOOM_IN: @@ -975,6 +1075,20 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) Preview_ZoomInOrOut(pData, FALSE); break; + case IDC_ENDSLIDESHOW: + Preview_EndSlideShow(hwnd); + break; + + default: + break; + } + + if (!Preview_IsMainWnd(hwnd)) + return; + + // The following commands are for main window only: + switch (nCommandID) + { case IDC_SAVEAS: Preview_pSaveImageAs(pData); break; @@ -987,7 +1101,7 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) if (g_pImage) { GdipImageRotateFlip(g_pImage, Rotate270FlipNone); - InvalidateRect(hwnd, NULL, FALSE); + Preview_UpdateUI(pData); } break; @@ -995,7 +1109,7 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) if (g_pImage) { GdipImageRotateFlip(g_pImage, Rotate90FlipNone); - InvalidateRect(hwnd, NULL, FALSE); + Preview_UpdateUI(pData); } break; @@ -1008,6 +1122,9 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) Preview_Edit(hwnd); Preview_UpdateUI(pData); break; + + default: + break; } } @@ -1032,6 +1149,8 @@ Preview_OnDestroy(HWND hwnd) { PPREVIEW_DATA pData = Preview_GetData(hwnd); + KillTimer(hwnd, SLIDESHOW_TIMER_ID); + pFreeFileList(g_pCurrentFile); g_pCurrentFile = NULL; @@ -1043,8 +1162,8 @@ Preview_OnDestroy(HWND hwnd) Anime_FreeInfo(&pData->m_Anime); - SetWindowLongPtr(pData->m_hwndZoom, GWLP_WNDPROC, (LPARAM)pData->m_fnPrevProc); - SetWindowLongPtr(pData->m_hwndZoom, GWLP_USERDATA, 0); + SetWindowLongPtrW(pData->m_hwndZoom, GWLP_WNDPROC, (LPARAM)pData->m_fnPrevProc); + SetWindowLongPtrW(pData->m_hwndZoom, GWLP_USERDATA, 0); DestroyWindow(pData->m_hwndZoom); pData->m_hwndZoom = NULL; @@ -1071,6 +1190,13 @@ Preview_OnDropFiles(HWND hwnd, HDROP hDrop) DragFinish(hDrop); } +static VOID +Preview_OnButtonDown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (!Preview_IsMainWnd(hwnd)) + Preview_EndSlideShow(hwnd); +} + LRESULT CALLBACK PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1111,7 +1237,7 @@ PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case WM_SIZE: { - Preview_OnSize(hwnd, (UINT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + Preview_OnSize(hwnd); break; } case WM_DROPFILES: @@ -1119,11 +1245,27 @@ PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Preview_OnDropFiles(hwnd, (HDROP)wParam); break; } + case WM_LBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_RBUTTONDOWN: + { + Preview_OnButtonDown(hwnd, uMsg, wParam, lParam); + break; + } case WM_DESTROY: { Preview_OnDestroy(hwnd); break; } + case WM_TIMER: + { + if (wParam == SLIDESHOW_TIMER_ID) + { + PPREVIEW_DATA pData = Preview_GetData(hwnd); + Preview_GoNextPic(pData, TRUE); + } + break; + } default: { return DefWindowProcW(hwnd, uMsg, wParam, lParam); @@ -1194,6 +1336,8 @@ ImageView_Main(HWND hwnd, LPCWSTR szFileName) /* Message Loop */ while (GetMessageW(&msg, NULL, 0, 0) > 0) { + if (g_hwndFullscreen && TranslateAcceleratorW(g_hwndFullscreen, hAccel, &msg)) + continue; if (TranslateAcceleratorW(hMainWnd, hAccel, &msg)) continue; diff --git a/dll/win32/shimgvw/shimgvw.rc b/dll/win32/shimgvw/shimgvw.rc index b7b0b093da1..58684a5d95b 100644 --- a/dll/win32/shimgvw/shimgvw.rc +++ b/dll/win32/shimgvw/shimgvw.rc @@ -50,6 +50,7 @@ BEGIN "S", IDC_SAVEAS, VIRTKEY, CONTROL "E", IDC_MODIFY, VIRTKEY, CONTROL VK_F1, IDC_HELP_TOC, VIRTKEY + VK_ESCAPE, IDC_ENDSLIDESHOW, VIRTKEY END /* UTF-8 */

10 months, 1 week

[reactos] 01/01: [CTFMON][SDK] Add ctfmon.exe (#6149)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=079b36542c87b5f64eb54… commit 079b36542c87b5f64eb549d1d3836297b61ea6c2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 13 21:37:15 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 13 21:37:15 2023 +0900 [CTFMON][SDK] Add ctfmon.exe (#6149) ctfmon.exe will be a replacement of our kbswitch.exe in the future. That is the front-end of Language Bar. It is needed to support TIPs. - Add ctfmon.exe at base/applications/ctfmon. - Add <cicero/cicbase.h>, <cicero/CModulePath.h>, and <cicero/osinfo.h> headers and use them. CORE-19362 --- base/applications/CMakeLists.txt | 1 + base/applications/ctfmon/CLoaderWnd.cpp | 100 ++++++++ base/applications/ctfmon/CLoaderWnd.h | 26 +++ base/applications/ctfmon/CMakeLists.txt | 14 ++ base/applications/ctfmon/CRegWatcher.cpp | 339 +++++++++++++++++++++++++++ base/applications/ctfmon/CRegWatcher.h | 45 ++++ base/applications/ctfmon/ctfmon.cpp | 378 +++++++++++++++++++++++++++++++ base/applications/ctfmon/ctfmon.rc | 19 ++ base/applications/ctfmon/precomp.h | 49 ++++ base/applications/ctfmon/res/ctfmon.ico | Bin 0 -> 22486 bytes base/applications/ctfmon/resource.h | 4 + sdk/include/reactos/cicero/CModulePath.h | 90 ++++++++ sdk/include/reactos/cicero/cicbase.h | 44 ++++ sdk/include/reactos/cicero/osinfo.h | 47 ++++ 14 files changed, 1156 insertions(+) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 7679233e5f2..dccaaa80438 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -6,6 +6,7 @@ add_subdirectory(charmap) add_subdirectory(clipbrd) add_subdirectory(cmdutils) add_subdirectory(control) +add_subdirectory(ctfmon) add_subdirectory(drwtsn32) add_subdirectory(dxdiag) add_subdirectory(extrac32) diff --git a/base/applications/ctfmon/CLoaderWnd.cpp b/base/applications/ctfmon/CLoaderWnd.cpp new file mode 100644 index 00000000000..400941be008 --- /dev/null +++ b/base/applications/ctfmon/CLoaderWnd.cpp @@ -0,0 +1,100 @@ +/* + * PROJECT: ReactOS CTF Monitor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Cicero TIP Bar loader window + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" +#include "CLoaderWnd.h" +#include "CRegWatcher.h" + +BOOL CLoaderWnd::s_bUninitedSystem = FALSE; +BOOL CLoaderWnd::s_bWndClassRegistered = FALSE; + +BOOL CLoaderWnd::Init() +{ + if (s_bWndClassRegistered) + return TRUE; // Already registered + + // Register a window class + WNDCLASSEXW wc; + ZeroMemory(&wc, sizeof(wc)); + wc.cbSize = sizeof(wc); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.hInstance = g_hInst; + wc.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wc.lpfnWndProc = WindowProc; + wc.lpszClassName = L"CiCTipBarClass"; + if (!::RegisterClassExW(&wc)) + return FALSE; + + s_bWndClassRegistered = TRUE; // Remember + return TRUE; +} + +HWND CLoaderWnd::CreateWnd() +{ + m_hWnd = ::CreateWindowExW(0, L"CiCTipBarClass", NULL, WS_DISABLED, + 0, 0, 0, 0, NULL, NULL, g_hInst, NULL); + return m_hWnd; +} + +LRESULT CALLBACK +CLoaderWnd::WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + break; + + case WM_DESTROY: + ::PostQuitMessage(0); + break; + + case WM_QUERYENDSESSION: + // NOTE: We don't support Win95/98/Me +#ifdef SUPPORT_WIN9X + if (!(g_dwOsInfo & OSINFO_NT) && (!g_fWinLogon || (lParam & ENDSESSION_LOGOFF))) + { + ClosePopupTipbar(); + TF_UninitSystem(); + CLoaderWnd::s_bUninitedSystem = TRUE; + } +#endif + return TRUE; + + case WM_ENDSESSION: + if (wParam) // The session is being ended? + { + if (!s_bUninitedSystem) + { + // Un-initialize now + UninitApp(); + TF_UninitSystem(); + s_bUninitedSystem = TRUE; + } + } + else if (s_bUninitedSystem) // Once un-initialized? + { + // Re-initialize + TF_InitSystem(); + if (!g_bOnWow64) + GetPopupTipbar(hwnd, !!g_fWinLogon); + + s_bUninitedSystem = FALSE; + } + break; + + case WM_SYSCOLORCHANGE: + case WM_DISPLAYCHANGE: + if (!g_bOnWow64) // Is the system x86/x64 native? + CRegWatcher::StartSysColorChangeTimer(); + break; + + default: + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + + return 0; +} diff --git a/base/applications/ctfmon/CLoaderWnd.h b/base/applications/ctfmon/CLoaderWnd.h new file mode 100644 index 00000000000..9127a40155e --- /dev/null +++ b/base/applications/ctfmon/CLoaderWnd.h @@ -0,0 +1,26 @@ +/* + * PROJECT: ReactOS CTF Monitor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Cicero TIP Bar loader window + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +class CLoaderWnd +{ +public: + HWND m_hWnd; + static BOOL s_bUninitedSystem; + static BOOL s_bWndClassRegistered; + + CLoaderWnd() : m_hWnd(NULL) { } + ~CLoaderWnd() { } + + BOOL Init(); + HWND CreateWnd(); + +protected: + static LRESULT CALLBACK + WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +}; diff --git a/base/applications/ctfmon/CMakeLists.txt b/base/applications/ctfmon/CMakeLists.txt new file mode 100644 index 00000000000..f88d8f5ad1a --- /dev/null +++ b/base/applications/ctfmon/CMakeLists.txt @@ -0,0 +1,14 @@ + +list(APPEND SOURCE + ctfmon.cpp + CLoaderWnd.cpp + CRegWatcher.cpp) + +add_rc_deps(ctfmon.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/ctfmon.ico) +add_executable(ctfmon ${SOURCE} ctfmon.rc) +set_module_type(ctfmon win32gui UNICODE) +add_dependencies(ctfmon msctf) +target_link_libraries(ctfmon uuid) +add_importlibs(ctfmon msctf advapi32 shell32 user32 msvcrt kernel32) +add_pch(ctfmon precomp.h SOURCE) +add_cd_file(TARGET ctfmon DESTINATION reactos/system32 FOR all) diff --git a/base/applications/ctfmon/CRegWatcher.cpp b/base/applications/ctfmon/CRegWatcher.cpp new file mode 100644 index 00000000000..7782b5c096d --- /dev/null +++ b/base/applications/ctfmon/CRegWatcher.cpp @@ -0,0 +1,339 @@ +/* + * PROJECT: ReactOS CTF Monitor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Registry watcher + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" +#include "CRegWatcher.h" + +// The event handles to use in watching +HANDLE CRegWatcher::s_ahWatchEvents[WATCHENTRY_MAX] = { NULL }; + +// The registry entries to watch +WATCHENTRY CRegWatcher::s_WatchEntries[WATCHENTRY_MAX] = +{ + { HKEY_CURRENT_USER, L"Keyboard Layout\\Toggle" }, // WI_TOGGLE + { HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\CTF\\TIP" }, // WI_MACHINE_TIF + { HKEY_CURRENT_USER, L"Keyboard Layout\\Preload" }, // WI_PRELOAD + { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run" }, // WI_RUN + { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\TIP" }, // WI_USER_TIF + { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech" }, // WI_USER_SPEECH + { HKEY_CURRENT_USER, L"Control Panel\\Appearance" }, // WI_APPEARANCE + { HKEY_CURRENT_USER, L"Control Panel\\Colors" }, // WI_COLORS + { HKEY_CURRENT_USER, L"Control Panel\\Desktop\\WindowMetrics" }, // WI_WINDOW_METRICS + { HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech" }, // WI_MACHINE_SPEECH + { HKEY_CURRENT_USER, L"Keyboard Layout" }, // WI_KEYBOARD_LAYOUT + { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\Assemblies" }, // WI_ASSEMBLIES +}; + +// The timer IDs: For delaying ignitions +UINT CRegWatcher::s_nSysColorTimerId = 0; +UINT CRegWatcher::s_nKbdToggleTimerId = 0; +UINT CRegWatcher::s_nRegImxTimerId = 0; + +// %WINDIR%/IME/sptip.dll!TF_CreateLangProfileUtil +typedef HRESULT (WINAPI* FN_TF_CreateLangProfileUtil)(ITfFnLangProfileUtil**); + +BOOL +CRegWatcher::Init() +{ + // NOTE: We don't support Win95/98/Me +#ifdef SUPPORT_WIN9X + if (!(g_dwOsInfo & OSINFO_NT)) + s_WatchEntries[WI_RUN].hRootKey = HKEY_LOCAL_MACHINE; +#endif + + // Create some nameless events and initialize them + for (SIZE_T iEvent = 0; iEvent < _countof(s_ahWatchEvents); ++iEvent) + { + s_ahWatchEvents[iEvent] = ::CreateEventW(NULL, TRUE, FALSE, NULL); + InitEvent(iEvent, FALSE); + } + + // Internat.exe is an enemy of ctfmon.exe + KillInternat(); + + UpdateSpTip(); + + return TRUE; +} + +VOID +CRegWatcher::Uninit() +{ + for (SIZE_T iEvent = 0; iEvent < _countof(s_ahWatchEvents); ++iEvent) + { + // Close the key + WATCHENTRY& entry = s_WatchEntries[iEvent]; + if (entry.hKey) + { + ::RegCloseKey(entry.hKey); + entry.hKey = NULL; + } + + // Close the event handle + HANDLE& hEvent = s_ahWatchEvents[iEvent]; + if (hEvent) + { + ::CloseHandle(hEvent); + hEvent = NULL; + } + } +} + +BOOL +CRegWatcher::InitEvent( + _In_ SIZE_T iEvent, + _In_ BOOL bResetEvent) +{ + // Reset the signal status + if (bResetEvent) + ::ResetEvent(s_ahWatchEvents[iEvent]); + + // Close once to re-open + WATCHENTRY& entry = s_WatchEntries[iEvent]; + if (entry.hKey) + { + ::RegCloseKey(entry.hKey); + entry.hKey = NULL; + } + + // Open or create a registry key to watch registry key + LSTATUS error; + error = ::RegOpenKeyExW(entry.hRootKey, entry.pszSubKey, 0, KEY_READ, &entry.hKey); + if (error != ERROR_SUCCESS) + { + error = ::RegCreateKeyExW(entry.hRootKey, entry.pszSubKey, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &entry.hKey, NULL); + if (error != ERROR_SUCCESS) + return FALSE; + } + + // Start registry watching + error = RegNotifyChangeKeyValue(entry.hKey, + TRUE, + REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_NAME, + s_ahWatchEvents[iEvent], + TRUE); + return error == ERROR_SUCCESS; +} + +VOID +CRegWatcher::UpdateSpTip() +{ + // Post message 0x8002 to "SapiTipWorkerClass" windows + ::EnumWindows(EnumWndProc, 0); + + // Clear "ProfileInitialized" value + HKEY hKey; + LSTATUS error = ::RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\Sapilayr", + 0, KEY_WRITE, &hKey); + if (error == ERROR_SUCCESS) + { + DWORD dwValue = 0, cbValue = sizeof(dwValue); + ::RegSetValueExW(hKey, L"ProfileInitialized", NULL, REG_DWORD, (LPBYTE)&dwValue, cbValue); + ::RegCloseKey(hKey); + } + + // Get %WINDIR%/IME/sptip.dll!TF_CreateLangProfileUtil function + HINSTANCE hSPTIP = LoadSystemLibrary(L"IME\\sptip.dll", TRUE); + FN_TF_CreateLangProfileUtil fnTF_CreateLangProfileUtil = + (FN_TF_CreateLangProfileUtil)::GetProcAddress(hSPTIP, "TF_CreateLangProfileUtil"); + if (fnTF_CreateLangProfileUtil) + { + // Call it + ITfFnLangProfileUtil *pProfileUtil = NULL; + HRESULT hr = fnTF_CreateLangProfileUtil(&pProfileUtil); + if ((hr == S_OK) && pProfileUtil) // Success! + { + // Register profile + hr = pProfileUtil->RegisterActiveProfiles(); + if (hr == S_OK) + TF_InvalidAssemblyListCacheIfExist(); // Invalidate the assembly list cache + + pProfileUtil->Release(); + } + } + + if (hSPTIP) + ::FreeLibrary(hSPTIP); +} + +VOID +CRegWatcher::KillInternat() +{ + HKEY hKey; + WATCHENTRY& entry = s_WatchEntries[WI_RUN]; + + // Delete internat.exe from registry "Run" key + LSTATUS error = ::RegOpenKeyExW(entry.hRootKey, entry.pszSubKey, 0, KEY_ALL_ACCESS, &hKey); + if (error == ERROR_SUCCESS) + { + ::RegDeleteValueW(hKey, L"internat.exe"); + ::RegCloseKey(hKey); + } + + // Kill the "Indicator" window (that internat.exe creates) + HWND hwndInternat = ::FindWindowW(L"Indicator", NULL); + if (hwndInternat) + ::PostMessageW(hwndInternat, WM_CLOSE, 0, 0); +} + +// Post message 0x8002 to every "SapiTipWorkerClass" window. +// Called from CRegWatcher::UpdateSpTip +BOOL CALLBACK +CRegWatcher::EnumWndProc( + _In_ HWND hWnd, + _In_ LPARAM lParam) +{ + WCHAR ClassName[MAX_PATH]; + + UNREFERENCED_PARAMETER(lParam); + + if (::GetClassNameW(hWnd, ClassName, _countof(ClassName)) && + _wcsicmp(ClassName, L"SapiTipWorkerClass") == 0) + { + PostMessageW(hWnd, 0x8002, 0, 0); // FIXME: Magic number + } + + return TRUE; +} + +VOID CALLBACK +CRegWatcher::SysColorTimerProc( + _In_ HWND hwnd, + _In_ UINT uMsg, + _In_ UINT_PTR idEvent, + _In_ DWORD dwTime) +{ + UNREFERENCED_PARAMETER(hwnd); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(idEvent); + UNREFERENCED_PARAMETER(dwTime); + + // Cancel the timer + if (s_nSysColorTimerId) + { + ::KillTimer(NULL, s_nSysColorTimerId); + s_nSysColorTimerId = 0; + } + + TF_PostAllThreadMsg(15, 16); +} + +VOID +CRegWatcher::StartSysColorChangeTimer() +{ + // Call SysColorTimerProc 0.5 seconds later (Delayed) + if (s_nSysColorTimerId) + { + ::KillTimer(NULL, s_nSysColorTimerId); + s_nSysColorTimerId = 0; + } + s_nSysColorTimerId = ::SetTimer(NULL, 0, 500, SysColorTimerProc); +} + +VOID CALLBACK +CRegWatcher::RegImxTimerProc( + _In_ HWND hwnd, + _In_ UINT uMsg, + _In_ UINT_PTR idEvent, + _In_ DWORD dwTime) +{ + UNREFERENCED_PARAMETER(hwnd); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(idEvent); + UNREFERENCED_PARAMETER(dwTime); + + // Cancel the timer + if (s_nRegImxTimerId) + { + ::KillTimer(NULL, s_nRegImxTimerId); + s_nRegImxTimerId = 0; + } + + TF_InvalidAssemblyListCache(); + TF_PostAllThreadMsg(12, 16); +} + +VOID CALLBACK +CRegWatcher::KbdToggleTimerProc( + _In_ HWND hwnd, + _In_ UINT uMsg, + _In_ UINT_PTR idEvent, + _In_ DWORD dwTime) +{ + UNREFERENCED_PARAMETER(hwnd); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(idEvent); + UNREFERENCED_PARAMETER(dwTime); + + // Cancel the timer + if (s_nKbdToggleTimerId) + { + ::KillTimer(NULL, s_nKbdToggleTimerId); + s_nKbdToggleTimerId = 0; + } + + TF_PostAllThreadMsg(11, 16); +} + +VOID +CRegWatcher::OnEvent( + _In_ SIZE_T iEvent) +{ + InitEvent(iEvent, TRUE); + + switch (iEvent) + { + case WI_TOGGLE: + { + // Call KbdToggleTimerProc 0.5 seconds later (Delayed) + if (s_nKbdToggleTimerId) + { + ::KillTimer(NULL, s_nKbdToggleTimerId); + s_nKbdToggleTimerId = 0; + } + s_nKbdToggleTimerId = ::SetTimer(NULL, 0, 500, KbdToggleTimerProc); + break; + } + case WI_MACHINE_TIF: + case WI_PRELOAD: + case WI_USER_TIF: + case WI_MACHINE_SPEECH: + case WI_KEYBOARD_LAYOUT: + case WI_ASSEMBLIES: + { + if (iEvent == WI_MACHINE_SPEECH) + UpdateSpTip(); + + // Call RegImxTimerProc 0.2 seconds later (Delayed) + if (s_nRegImxTimerId) + { + ::KillTimer(NULL, s_nRegImxTimerId); + s_nRegImxTimerId = 0; + } + s_nRegImxTimerId = ::SetTimer(NULL, 0, 200, RegImxTimerProc); + break; + } + case WI_RUN: // The "Run" key is changed + { + KillInternat(); // Deny internat.exe the right to live + break; + } + case WI_USER_SPEECH: + case WI_APPEARANCE: + case WI_COLORS: + case WI_WINDOW_METRICS: + { + StartSysColorChangeTimer(); + break; + } + default: + { + break; + } + } +} diff --git a/base/applications/ctfmon/CRegWatcher.h b/base/applications/ctfmon/CRegWatcher.h new file mode 100644 index 00000000000..1f75cb7fb4b --- /dev/null +++ b/base/applications/ctfmon/CRegWatcher.h @@ -0,0 +1,45 @@ +/* + * PROJECT: ReactOS CTF Monitor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Registry watcher + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +struct WATCHENTRY +{ + HKEY hRootKey; + LPCWSTR pszSubKey; + HKEY hKey; +}; + +#define WATCHENTRY_MAX 12 + +struct CRegWatcher +{ + static HANDLE s_ahWatchEvents[WATCHENTRY_MAX]; + static WATCHENTRY s_WatchEntries[WATCHENTRY_MAX]; + static UINT s_nSysColorTimerId, s_nKbdToggleTimerId, s_nRegImxTimerId; + + static BOOL Init(); + static VOID Uninit(); + static BOOL InitEvent(_In_ SIZE_T iEvent, _In_ BOOL bResetEvent); + static VOID UpdateSpTip(); + static VOID KillInternat(); + static VOID StartSysColorChangeTimer(); + static VOID OnEvent(_In_ SIZE_T iEvent); + +protected: + static BOOL CALLBACK + EnumWndProc(_In_ HWND hWnd, _In_ LPARAM lParam); + + static VOID CALLBACK + SysColorTimerProc(_In_ HWND hWnd, _In_ UINT uMsg, _In_ UINT_PTR idEvent, _In_ DWORD dwTime); + + static VOID CALLBACK + KbdToggleTimerProc(_In_ HWND hWnd, _In_ UINT uMsg, _In_ UINT_PTR idEvent, _In_ DWORD dwTime); + + static VOID CALLBACK + RegImxTimerProc(_In_ HWND hWnd, _In_ UINT uMsg, _In_ UINT_PTR idEvent, _In_ DWORD dwTime); +}; diff --git a/base/applications/ctfmon/ctfmon.cpp b/base/applications/ctfmon/ctfmon.cpp new file mode 100644 index 00000000000..ebeae0fd933 --- /dev/null +++ b/base/applications/ctfmon/ctfmon.cpp @@ -0,0 +1,378 @@ +/* + * PROJECT: ReactOS CTF Monitor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing Language Bar front-end + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" +#include "CRegWatcher.h" +#include "CLoaderWnd.h" + +// ntdll!NtQueryInformationProcess +typedef NTSTATUS (WINAPI *FN_NtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); +FN_NtQueryInformationProcess g_fnNtQueryInformationProcess = NULL; + +// kernel32!SetProcessShutdownParameters +typedef BOOL (WINAPI *FN_SetProcessShutdownParameters)(DWORD, DWORD); +FN_SetProcessShutdownParameters g_fnSetProcessShutdownParameters = NULL; + +// kernel32!GetSystemWow64DirectoryW +typedef UINT (WINAPI *FN_GetSystemWow64DirectoryW)(LPWSTR, UINT); +FN_GetSystemWow64DirectoryW g_fnGetSystemWow64DirectoryW = NULL; + +HINSTANCE g_hInst = NULL; // The application instance +HINSTANCE g_hKernel32 = NULL; // The "kernel32.dll" instance +UINT g_uACP = CP_ACP; // The active codepage +BOOL g_fWinLogon = FALSE; // Is it a log-on process? +HANDLE g_hCicMutex = NULL; // The Cicero mutex +BOOL g_bOnWow64 = FALSE; // Is the app running on WoW64? +BOOL g_fNoRunKey = FALSE; // Don't write registry key "Run"? +BOOL g_fJustRunKey = FALSE; // Just write registry key "Run"? +DWORD g_dwOsInfo = 0; // The OS version info. See GetOSInfo +CLoaderWnd* g_pLoaderWnd = NULL; // TIP Bar loader window + +// Is the current process on WoW64? +static BOOL +IsWow64(VOID) +{ + HMODULE hNTDLL = GetSystemModuleHandle(L"ntdll.dll", FALSE); + if (!hNTDLL) + return FALSE; + + g_fnNtQueryInformationProcess = + (FN_NtQueryInformationProcess)::GetProcAddress(hNTDLL, "NtQueryInformationProcess"); + if (!g_fnNtQueryInformationProcess) + return FALSE; + + ULONG_PTR Value = 0; + NTSTATUS Status = g_fnNtQueryInformationProcess(::GetCurrentProcess(), ProcessWow64Information, + &Value, sizeof(Value), NULL); + if (!NT_SUCCESS(Status)) + return FALSE; + + return !!Value; +} + +static VOID +ParseCommandLine( + _In_ LPCWSTR pszCmdLine) +{ + g_fNoRunKey = g_fJustRunKey = FALSE; + + for (LPCWSTR pch = pszCmdLine; *pch; ++pch) + { + // Skip space + while (*pch == L' ') + ++pch; + + if (*pch == UNICODE_NULL) + return; + + if ((*pch == L'-') || (*pch == L'/')) + { + ++pch; + switch (*pch) + { + case L'N': case L'n': // Found "/N" option + g_fNoRunKey = TRUE; + break; + + case L'R': case L'r': // Found "/R" option + g_fJustRunKey = TRUE; + break; + + case UNICODE_NULL: + return; + + default: + break; + } + } + } +} + +static VOID +WriteRegRun(VOID) +{ + if (g_fNoRunKey) // If "/N" option is specified + return; // Don't write + + // Open "Run" key + HKEY hKey; + LSTATUS error = ::RegCreateKeyW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", + &hKey); + if (error != ERROR_SUCCESS) + return; + + // Write the module path + CModulePath ModPath; + if (ModPath.Init(L"ctfmon.exe", FALSE)) + { + DWORD cbData = (ModPath.m_cchPath + 1) * sizeof(WCHAR); + ::RegSetValueExW(hKey, L"ctfmon.exe", 0, REG_SZ, (BYTE*)ModPath.m_szPath, cbData); + } + + ::RegCloseKey(hKey); +} + +static HRESULT +GetGlobalCompartment( + _In_ REFGUID guid, + _Inout_ ITfCompartment **ppComp) +{ + *ppComp = NULL; + + ITfCompartmentMgr *pCompMgr = NULL; + HRESULT hr = TF_GetGlobalCompartment(&pCompMgr); + if (FAILED(hr)) + return hr; + + if (!pCompMgr) + return E_FAIL; + + hr = pCompMgr->GetCompartment(guid, ppComp); + pCompMgr->Release(); + return hr; +} + +static HRESULT +SetGlobalCompartmentDWORD( + _In_ REFGUID guid, + _In_ DWORD dwValue) +{ + HRESULT hr; + VARIANT vari; + ITfCompartment *pComp; + + hr = GetGlobalCompartment(guid, &pComp); + if (FAILED(hr)) + return hr; + + V_VT(&vari) = VT_I4; + V_I4(&vari) = dwValue; + hr = pComp->SetValue(0, &vari); + + pComp->Release(); + return hr; +} + +static BOOL +CheckX64System( + _In_ LPWSTR lpCmdLine) +{ + // Is the system x64? + SYSTEM_INFO SystemInfo; + ::GetSystemInfo(&SystemInfo); + if (SystemInfo.wProcessorArchitecture != PROCESSOR_ARCHITECTURE_IA64 || + SystemInfo.wProcessorArchitecture != PROCESSOR_ARCHITECTURE_AMD64) + { + return FALSE; + } + + // Get GetSystemWow64DirectoryW function + g_hKernel32 = GetSystemModuleHandle(L"kernel32.dll", FALSE); + g_fnGetSystemWow64DirectoryW = + (FN_GetSystemWow64DirectoryW)::GetProcAddress(g_hKernel32, "GetSystemWow64DirectoryW"); + if (!g_fnGetSystemWow64DirectoryW) + return FALSE; + + // Build WoW64 ctfmon.exe pathname + WCHAR szPath[MAX_PATH]; + UINT cchPath = g_fnGetSystemWow64DirectoryW(szPath, _countof(szPath)); + if (!cchPath && FAILED(StringCchCatW(szPath, _countof(szPath), L"\\ctfmon.exe"))) + return FALSE; + + // Create a WoW64 ctfmon.exe process + PROCESS_INFORMATION pi; + STARTUPINFOW si = { sizeof(si) }; + si.wShowWindow = SW_SHOWMINNOACTIVE; + if (!::CreateProcessW(szPath, lpCmdLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + return FALSE; + + ::CloseHandle(pi.hThread); + ::CloseHandle(pi.hProcess); + return TRUE; +} + +static BOOL +InitApp( + _In_ HINSTANCE hInstance, + _In_ LPWSTR lpCmdLine) +{ + g_hInst = hInstance; // Save the instance handle + + g_uACP = ::GetACP(); // Save the active codepage + g_bOnWow64 = IsWow64(); // Is the current process on WoW64? + g_dwOsInfo = GetOSInfo(); // Get OS info + + // Create a mutex for Cicero + g_hCicMutex = TF_CreateCicLoadMutex(&g_fWinLogon); + if (!g_hCicMutex) + return FALSE; + + // Write to "Run" registry key for starting up + WriteRegRun(); + + // Call SetProcessShutdownParameters if possible + if (g_dwOsInfo & OSINFO_NT) + { + g_hKernel32 = GetSystemModuleHandle(L"kernel32.dll", FALSE); + g_fnSetProcessShutdownParameters = + (FN_SetProcessShutdownParameters) + ::GetProcAddress(g_hKernel32, "SetProcessShutdownParameters"); + if (g_fnSetProcessShutdownParameters) + g_fnSetProcessShutdownParameters(0xF0, SHUTDOWN_NORETRY); + } + + // Start text framework + TF_InitSystem(); + + // Start watching registry if x86/x64 native + if (!g_bOnWow64) + CRegWatcher::Init(); + + // Create TIP Bar loader window + g_pLoaderWnd = new CLoaderWnd(); + if (!g_pLoaderWnd || !g_pLoaderWnd->Init()) + return FALSE; + + if (g_pLoaderWnd->CreateWnd()) + { + // Go to the bottom of the hell + ::SetWindowPos(g_pLoaderWnd->m_hWnd, HWND_BOTTOM, 0, 0, 0, 0, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); + } + + // Display TIP Bar Popup if x86/x64 native + if (!g_bOnWow64) + GetPopupTipbar(g_pLoaderWnd->m_hWnd, g_fWinLogon); + + // Do x64 stuffs + CheckX64System(lpCmdLine); + + return TRUE; +} + +VOID +UninitApp(VOID) +{ + // Close TIP Bar Popup + ClosePopupTipbar(); + + // Close the mutex + ::CloseHandle(g_hCicMutex); + g_hCicMutex = NULL; + + // Quit watching registry if x86/x64 native + if (!g_bOnWow64) + CRegWatcher::Uninit(); +} + +static INT +DoMainLoop(VOID) +{ + MSG msg; + + if (g_bOnWow64) // Is the current process on WoW64? + { + // Just a simple message loop + while (::GetMessageW(&msg, NULL, 0, 0)) + { + ::TranslateMessage(&msg); + ::DispatchMessageW(&msg); + } + return (INT)msg.wParam; + } + + // Open the existing event by the name + HANDLE hSwitchEvent = ::OpenEventW(SYNCHRONIZE, FALSE, L"WinSta0_DesktopSwitch"); + + // The target events to watch + HANDLE ahEvents[WATCHENTRY_MAX + 1]; + + // Borrow some handles from CRegWatcher + CopyMemory(ahEvents, CRegWatcher::s_ahWatchEvents, WATCHENTRY_MAX * sizeof(HANDLE)); + + ahEvents[WI_DESKTOP_SWITCH] = hSwitchEvent; // Add it + + // Another message loop + for (;;) + { + // Wait for target signal + DWORD dwWait = ::MsgWaitForMultipleObjects(_countof(ahEvents), ahEvents, 0, INFINITE, + QS_ALLINPUT); + if (dwWait == (WAIT_OBJECT_0 + _countof(ahEvents))) // Is input available? + { + // Do the events + while (::PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_QUIT) + goto Quit; + + ::TranslateMessage(&msg); + ::DispatchMessageW(&msg); + } + } + else if (dwWait == (WAIT_OBJECT_0 + WI_DESKTOP_SWITCH)) // Desktop switch? + { + SetGlobalCompartmentDWORD(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0); + ::ResetEvent(hSwitchEvent); + } + else // Do the other events + { + CRegWatcher::OnEvent(dwWait - WAIT_OBJECT_0); + } + } + +Quit: + ::CloseHandle(hSwitchEvent); + + return (INT)msg.wParam; +} + +// The main function for Unicode Win32 +EXTERN_C INT WINAPI +wWinMain( + HINSTANCE hInstance, + HINSTANCE hPrevInst, + LPWSTR lpCmdLine, + INT nCmdShow) +{ + UNREFERENCED_PARAMETER(hPrevInst); + UNREFERENCED_PARAMETER(nCmdShow); + + // Parse command line + ParseCommandLine(lpCmdLine); + + if (g_fJustRunKey) // If "/R" option is specified + { + // Just write registry and exit + WriteRegRun(); + return 1; + } + + // Initialize the application + if (!InitApp(hInstance, lpCmdLine)) + return 0; + + // The main loop + INT ret = DoMainLoop(); + + // Clean up the loader + if (g_pLoaderWnd) + { + delete g_pLoaderWnd; + g_pLoaderWnd = NULL; + } + + // Un-initialize app and text framework + if (!CLoaderWnd::s_bUninitedSystem) + { + UninitApp(); + TF_UninitSystem(); + } + + return ret; +} diff --git a/base/applications/ctfmon/ctfmon.rc b/base/applications/ctfmon/ctfmon.rc new file mode 100644 index 00000000000..fe628048326 --- /dev/null +++ b/base/applications/ctfmon/ctfmon.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS CTF Monitor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing Language Bar front-end + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS CTF Monitor" +#define REACTOS_STR_INTERNAL_NAME "ctfmon" +#define REACTOS_STR_ORIGINAL_FILENAME "ctfmon.exe" +#include <reactos/version.rc> + +IDI_MAIN ICON "res/ctfmon.ico" diff --git a/base/applications/ctfmon/precomp.h b/base/applications/ctfmon/precomp.h new file mode 100644 index 00000000000..636739eb9e1 --- /dev/null +++ b/base/applications/ctfmon/precomp.h @@ -0,0 +1,49 @@ +/* + * PROJECT: ReactOS CTF Monitor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing Language Bar front-end + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/pstypes.h> +#include <shellapi.h> +#include <shlwapi.h> +#include <stdlib.h> +#include <strsafe.h> +#include <msctf.h> +#include <ctfutb.h> +#include <ctffunc.h> + +#include <cicero/cicbase.h> +#include <cicero/osinfo.h> +#include <cicero/CModulePath.h> + +#include "resource.h" + +extern HINSTANCE g_hInst; +extern BOOL g_bOnWow64; +extern BOOL g_fWinLogon; +extern DWORD g_dwOsInfo; + +VOID UninitApp(VOID); + +typedef enum WATCH_INDEX +{ + WI_TOGGLE = 0, + WI_MACHINE_TIF = 1, + WI_PRELOAD = 2, + WI_RUN = 3, + WI_USER_TIF = 4, + WI_USER_SPEECH = 5, + WI_APPEARANCE = 6, + WI_COLORS = 7, + WI_WINDOW_METRICS = 8, + WI_MACHINE_SPEECH = 9, + WI_KEYBOARD_LAYOUT = 10, + WI_ASSEMBLIES = 11, + WI_DESKTOP_SWITCH = 12, +} WATCH_INDEX; diff --git a/base/applications/ctfmon/res/ctfmon.ico b/base/applications/ctfmon/res/ctfmon.ico new file mode 100644 index 00000000000..5d7c7626fbf Binary files /dev/null and b/base/applications/ctfmon/res/ctfmon.ico differ diff --git a/base/applications/ctfmon/resource.h b/base/applications/ctfmon/resource.h new file mode 100644 index 00000000000..79f0b3152af --- /dev/null +++ b/base/applications/ctfmon/resource.h @@ -0,0 +1,4 @@ +#pragma once + +/* Icons */ +#define IDI_MAIN 100 diff --git a/sdk/include/reactos/cicero/CModulePath.h b/sdk/include/reactos/cicero/CModulePath.h new file mode 100644 index 00000000000..2418b157cdd --- /dev/null +++ b/sdk/include/reactos/cicero/CModulePath.h @@ -0,0 +1,90 @@ +/* + * PROJECT: ReactOS Cicero + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Manipulate module path + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +struct CModulePath +{ + WCHAR m_szPath[MAX_PATH]; + SIZE_T m_cchPath; + + CModulePath() + { + m_szPath[0] = UNICODE_NULL; + m_cchPath = 0; + } + + BOOL Init(_In_ LPCWSTR pszFileName, _In_ BOOL bSysWinDir); +}; + +// Get an instance handle that is already loaded +static inline HINSTANCE +GetSystemModuleHandle( + _In_ LPCWSTR pszFileName, + _In_ BOOL bSysWinDir) +{ + CModulePath ModPath; + if (!ModPath.Init(pszFileName, bSysWinDir)) + return NULL; + return GetModuleHandleW(ModPath.m_szPath); +} + +// Load a system library +static inline HINSTANCE +LoadSystemLibrary( + _In_ LPCWSTR pszFileName, + _In_ BOOL bSysWinDir) +{ + CModulePath ModPath; + if (!ModPath.Init(pszFileName, bSysWinDir)) + return NULL; + return ::LoadLibraryW(ModPath.m_szPath); +} + +/******************************************************************************/ + +inline BOOL +CModulePath::Init( + _In_ LPCWSTR pszFileName, + _In_ BOOL bSysWinDir) +{ + SIZE_T cchPath; + if (bSysWinDir) + { + // Usually C:\Windows or C:\ReactOS + cchPath = ::GetSystemWindowsDirectory(m_szPath, _countof(m_szPath)); + } + else + { + // Usually C:\Windows\system32 or C:\ReactOS\system32 + cchPath = ::GetSystemDirectoryW(m_szPath, _countof(m_szPath)); + } + + m_szPath[_countof(m_szPath) - 1] = UNICODE_NULL; // Avoid buffer overrun + + if ((cchPath == 0) || (cchPath > _countof(m_szPath) - 2)) + goto Failure; + + // Add backslash if necessary + if ((cchPath > 0) && (m_szPath[cchPath - 1] != L'\\')) + { + m_szPath[cchPath + 0] = L'\\'; + m_szPath[cchPath + 1] = UNICODE_NULL; + } + + // Append pszFileName + if (FAILED(StringCchCatW(m_szPath, _countof(m_szPath), pszFileName))) + goto Failure; + + m_cchPath = wcslen(m_szPath); + return TRUE; + +Failure: + m_szPath[0] = UNICODE_NULL; + m_cchPath = 0; + return FALSE; +} diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h new file mode 100644 index 00000000000..9048dcb865a --- /dev/null +++ b/sdk/include/reactos/cicero/cicbase.h @@ -0,0 +1,44 @@ +/* + * PROJECT: ReactOS Cicero + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Cicero base + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +static inline LPVOID cicMemAllocClear(SIZE_T size) +{ + return LocalAlloc(LMEM_ZEROINIT, size); +} + +static inline void cicMemFree(LPVOID ptr) +{ + if (ptr) + LocalFree(ptr); +} + +#ifdef __cplusplus +inline void* __cdecl operator new(size_t size) noexcept +{ + return cicMemAllocClear(size); +} + +inline void __cdecl operator delete(void* ptr) noexcept +{ + cicMemFree(ptr); +} + +inline void __cdecl operator delete(void* ptr, size_t size) noexcept +{ + cicMemFree(ptr); +} +#endif // __cplusplus + +// FIXME: Use msutb.dll and header +static inline void ClosePopupTipbar(void) +{ +} + +// FIXME: Use msutb.dll and header +static inline void GetPopupTipbar(HWND hwnd, BOOL fWinLogon) +{ +} diff --git a/sdk/include/reactos/cicero/osinfo.h b/sdk/include/reactos/cicero/osinfo.h new file mode 100644 index 00000000000..b260000dfbc --- /dev/null +++ b/sdk/include/reactos/cicero/osinfo.h @@ -0,0 +1,47 @@ +/* + * PROJECT: ReactOS Cicero + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Getting OS information + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +/* The flags of GetOSInfo() */ +#define OSINFO_NT 0x01 +#define OSINFO_CJK 0x10 +#define OSINFO_IMM 0x20 +#define OSINFO_DBCS 0x40 + +static inline DWORD +GetOSInfo(VOID) +{ + DWORD dwOsInfo = 0; + + /* Check OS version info */ + OSVERSIONINFOW VerInfo = { sizeof(VerInfo) }; + GetVersionExW(&VerInfo); + if (VerInfo.dwPlatformId == DLLVER_PLATFORM_NT) + dwOsInfo |= OSINFO_NT; + + /* Check codepage */ + switch (GetACP()) + { + case 932: /* Japanese (Japan) */ + case 936: /* Chinese (PRC, Singapore) */ + case 949: /* Korean (Korea) */ + case 950: /* Chinese (Taiwan, Hong Kong) */ + dwOsInfo |= OSINFO_CJK; + break; + } + + if (GetSystemMetrics(SM_IMMENABLED)) + dwOsInfo |= OSINFO_IMM; + + if (GetSystemMetrics(SM_DBCSENABLED)) + dwOsInfo |= OSINFO_DBCS; + + /* I'm not interested in other flags */ + + return dwOsInfo; +}

10 months, 1 week

[reactos] 01/01: [MSCTF] Add ADD_IMPORTLIB to CMakeLists.txt spec2def

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a19ba4760e17209985945… commit a19ba4760e1720998594582600bfec5ccdb6d146 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 13 11:10:06 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Dec 13 11:10:06 2023 +0900 [MSCTF] Add ADD_IMPORTLIB to CMakeLists.txt spec2def CORE-19361 --- dll/win32/msctf/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt index d7ae222c8da..863559f5270 100644 --- a/dll/win32/msctf/CMakeLists.txt +++ b/dll/win32/msctf/CMakeLists.txt @@ -4,7 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -spec2def(msctf.dll msctf.spec) +spec2def(msctf.dll msctf.spec ADD_IMPORTLIB) list(APPEND SOURCE categorymgr.c

10 months, 1 week

[reactos] 01/01: [MSCTF][SDK][UUID] Strengthen msctf.idl and msctf.spec (#6158)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfd5d37fe6223351d3606… commit bfd5d37fe6223351d36066c28cf06e45664a021f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 13 07:37:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 13 07:37:45 2023 +0900 [MSCTF][SDK][UUID] Strengthen msctf.idl and msctf.spec (#6158) - Add some function prototypes to sdk/include/psdk/msctf.idl. - Modify dll/win32/msctf/msctf.spec. - Modify uuid. CORE-19362 --- dll/win32/msctf/msctf.spec | 10 ++++++---- sdk/include/psdk/msctf.idl | 20 +++++++++++++------- sdk/lib/uuid/CMakeLists.txt | 2 +- sdk/lib/uuid/msctf_g.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 12 deletions(-) diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index c3d909ccf5d..779ef12c79f 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -9,14 +9,14 @@ @ stub TF_CheckThreadInputIdle @ stub TF_ClearLangBarAddIns @ stub TF_CreateCategoryMgr -@ stub TF_CreateCicLoadMutex +@ stdcall -stub TF_CreateCicLoadMutex(ptr) @ stub TF_CreateDisplayAttributeMgr @ stdcall TF_CreateInputProcessorProfiles(ptr) @ stdcall TF_CreateLangBarItemMgr(ptr) @ stdcall TF_CreateLangBarMgr(ptr) @ stdcall TF_CreateThreadMgr(ptr) @ stub TF_DllDetachInOther -@ stub TF_GetGlobalCompartment +@ stdcall -stub TF_GetGlobalCompartment(ptr) @ stub TF_GetInputScope @ stub TF_GetLangIcon @ stub TF_GetMlngHKL @@ -25,10 +25,12 @@ @ stdcall TF_GetThreadMgr(ptr) @ stub TF_InatExtractIcon @ stdcall TF_InitMlngInfo() -@ stub TF_InitSystem -@ stub TF_InvalidAssemblyListCache +@ stdcall -stub TF_InitSystem() +@ stdcall -stub TF_UninitSystem() +@ stdcall -stub TF_InvalidAssemblyListCache() @ stdcall TF_InvalidAssemblyListCacheIfExist() @ stub TF_IsCtfmonRunning @ stub TF_IsInMarshaling @ stub TF_MlngInfoCount @ stub TF_RunInputCPL +@ stdcall -stub TF_PostAllThreadMsg(long long) diff --git a/sdk/include/psdk/msctf.idl b/sdk/include/psdk/msctf.idl index 5ef33119fd8..ea487273a5b 100644 --- a/sdk/include/psdk/msctf.idl +++ b/sdk/include/psdk/msctf.idl @@ -28,15 +28,21 @@ cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_IT cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") -cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") -cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") -cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);") -cpp_quote("HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm);") -cpp_quote("HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim);") -cpp_quote("HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(void);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_InitSystem(VOID);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_UninitSystem(VOID);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_GetGlobalCompartment(_Out_ ITfCompartmentMgr **ppCompMgr);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_PostAllThreadMsg(DWORD dwUnknown1, DWORD dwUnknown2);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateThreadMgr(_Out_ ITfThreadMgr **pptim);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_GetThreadMgr(_Out_ ITfThreadMgr **pptim);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateInputProcessorProfiles(_Out_ ITfInputProcessorProfiles **ppipr);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateLangBarMgr(_Out_ ITfLangBarMgr **pppbm);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_CreateLangBarItemMgr(_Out_ ITfLangBarItemMgr **pplbim);") +cpp_quote("EXTERN_C HANDLE WINAPI TF_CreateCicLoadMutex(_Out_ LPBOOL pfWinLogon);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_InvalidAssemblyListCache(VOID);") +cpp_quote("EXTERN_C HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(VOID);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") -cpp_quote("DEFINE_GUID(GUID_PROP_ATTRIBUTE,0x34b45670,0x7526,0x11d2,0xa1,0x47,0x00,0x10,0x5a,0x27,0x99,0xb5);") +cpp_quote("EXTERN_C const GUID GUID_PROP_ATTRIBUTE;") cpp_quote("EXTERN_C const GUID GUID_PROP_LANGID;") cpp_quote("EXTERN_C const GUID GUID_PROP_READING;") cpp_quote("EXTERN_C const GUID GUID_PROP_COMPOSING;") diff --git a/sdk/lib/uuid/CMakeLists.txt b/sdk/lib/uuid/CMakeLists.txt index 9ebde406866..c988e1c9764 100644 --- a/sdk/lib/uuid/CMakeLists.txt +++ b/sdk/lib/uuid/CMakeLists.txt @@ -205,7 +205,7 @@ list(APPEND SOURCE # hnclsid.c ieguids.c # iid.c -# msctf_g.c + msctf_g.c # ncclsid.c # ndisguid.c netfwv6clsid.c diff --git a/sdk/lib/uuid/msctf_g.c b/sdk/lib/uuid/msctf_g.c new file mode 100644 index 00000000000..59e36f2d496 --- /dev/null +++ b/sdk/lib/uuid/msctf_g.c @@ -0,0 +1,44 @@ + +#include <initguid.h> + +DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_DISABLED, 0x71A5B253, 0x1951, 0x466B, 0x9F, 0xBC, 0x9C, 0x88, 0x08, 0xFA, 0x84, 0xF2); +DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_OPENCLOSE, 0x58273AAD, 0x01BB, 0x4164, 0x95, 0xC6, 0x75, 0x5B, 0xA0, 0xB5, 0x16, 0x2D); +DEFINE_GUID(GUID_COMPARTMENT_HANDWRITING_OPENCLOSE, 0xF9AE2C6B, 0x1866, 0x4361, 0xAF, 0x72, 0x7A, 0xA3, 0x09, 0x48, 0x89, 0x0E); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_DISABLED, 0x56C5C607, 0x0703, 0x4E59, 0x8E, 0x52, 0xCB, 0xC8, 0x4E, 0x8B, 0xBE, 0x35); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0x544D6A63, 0xE2E8, 0x4752, 0xBB, 0xD1, 0x00, 0x09, 0x60, 0xBC, 0xA0, 0x83); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_GLOBALSTATE, 0x2A54FE8E, 0x0D08, 0x460C, 0xA7, 0x5D, 0x87, 0x03, 0x5F, 0xF4, 0x36, 0xC5); +DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575F3783, 0x70C8, 0x47C8, 0xAE, 0x5D, 0x91, 0xA0, 0x1A, 0x1F, 0x75, 0x92); +DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xD7487DBF, 0x804E, 0x41C5, 0x89, 0x4D, 0xAD, 0x96, 0xFD, 0x4E, 0xEA, 0x13); +DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148CA3EC, 0x0366, 0x401C, 0x8D, 0x75, 0xED, 0x97, 0x8D, 0x85, 0xFB, 0xC9); + +DEFINE_GUID(GUID_PROP_TEXTOWNER, 0xF1E2D520, 0x0969, 0x11D3, 0x8D, 0xF0, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); +DEFINE_GUID(GUID_PROP_ATTRIBUTE, 0x34B45670, 0x7526, 0x11D2, 0xA1, 0x47, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); +DEFINE_GUID(GUID_PROP_LANGID, 0x3280CE20, 0x8032, 0x11D2, 0xB6, 0x03, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); +DEFINE_GUID(GUID_PROP_READING, 0x5463F7C0, 0x8E31, 0x11D2, 0xBF, 0x46, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); +DEFINE_GUID(GUID_PROP_COMPOSING, 0xE12AC060, 0xAF15, 0x11D2, 0xAF, 0xC5, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); + +DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745C63, 0xB2F0, 0x4784, 0x8B, 0x67, 0x5E, 0x12, 0xC8, 0x70, 0x1A, 0x31); +DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1, 0x8355, 0x426B, 0xA1, 0x61, 0x25, 0x98, 0x08, 0xF2, 0x6B, 0x14); +DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ECB87, 0xC2F2, 0x4ABE, 0x90, 0x5B, 0xC8, 0xB3, 0x8A, 0xDD, 0x2C, 0x43); +DEFINE_GUID(GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80, 0x1647, 0x40F7, 0x9B, 0x21, 0xB9, 0x3B, 0x81, 0xAA, 0xBC, 0x1B); + +DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529A9E6B, 0x6587, 0x4F23, 0xAB, 0x9E, 0x9C, 0x7D, 0x68, 0x3E, 0x3C, 0x50); +DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33C53A50, 0xF456, 0x4884, 0xB0, 0x49, 0x85, 0xFD, 0x64, 0x3E, 0xCF, 0xED); +DEFINE_GUID(CLSID_TF_LangBarMgr, 0xEBB08C45, 0x6C4A, 0x4FDC, 0xAE, 0x53, 0x4E, 0xB8, 0xC4, 0xC7, 0xDB, 0x8E); +DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1, 0x438D, 0x4B41, 0x93, 0x25, 0x86, 0x95, 0x23, 0xE2, 0xD6, 0xC7); +DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3CE74DE4, 0x53D3, 0x4D74, 0x8B, 0x83, 0x43, 0x1B, 0x38, 0x28, 0xBA, 0x53); + +DEFINE_GUID(IID_IEnumTfContexts, 0x8F1A7EA6, 0x1654, 0x4502, 0xA8, 0x6E, 0xB2, 0x90, 0x23, 0x44, 0xD5, 0x07); +DEFINE_GUID(IID_IEnumTfDocumentMgrs, 0xAA80E808, 0x2021, 0x11D2, 0x93, 0xE0, 0x00, 0x60, 0xB0, 0x67, 0xB8, 0x6E); +DEFINE_GUID(IID_IEnumTfLanguageProfiles, 0x3D61BF11, 0xAC5F, 0x42C8, 0xA4, 0xCB, 0x93, 0x1B, 0xCC, 0x28, 0xC7, 0x44); +DEFINE_GUID(IID_ITfCompartmentMgr, 0x7DCF57AC, 0x18AD, 0x438B, 0x82, 0x4D, 0x97, 0x9B, 0xFF, 0xB7, 0x4B, 0x7C); +DEFINE_GUID(IID_ITfCompositionView, 0xD7540241, 0xF9A1, 0x4364, 0xBE, 0xFC, 0xDB, 0xCD, 0x2C, 0x43, 0x95, 0xB7); +DEFINE_GUID(IID_ITfContext, 0xAA80E7FD, 0x2021, 0x11D2, 0x93, 0xE0, 0x00, 0x60, 0xB0, 0x67, 0xB8, 0x6E); +DEFINE_GUID(IID_ITfDocumentMgr, 0xAA80E7F4, 0x2021, 0x11D2, 0x93, 0xE0, 0x00, 0x60, 0xB0, 0x67, 0xB8, 0x6E); +DEFINE_GUID(IID_ITfEditSession, 0xAA80E803, 0x2021, 0x11D2, 0x93, 0xE0, 0x00, 0x60, 0xB0, 0x67, 0xB8, 0x6E); +DEFINE_GUID(IID_ITfKeyEventSink, 0xAA80E7F5, 0x2021, 0x11D2, 0x93, 0xE0, 0x00, 0x60, 0xB0, 0x67, 0xB8, 0x6E); +DEFINE_GUID(IID_ITfPersistentPropertyLoaderACP, 0x4EF89150, 0x0807, 0x11D3, 0x8D, 0xF0, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); +DEFINE_GUID(IID_ITfProperty, 0xE2449660, 0x9542, 0x11D2, 0xBF, 0x46, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); +DEFINE_GUID(IID_ITfRange, 0xAA80E7FF, 0x2021, 0x11D2, 0x93, 0xE0, 0x00, 0x60, 0xB0, 0x67, 0xB8, 0x6E); +DEFINE_GUID(IID_ITfRangeACP, 0x057A6296, 0x029B, 0x4154, 0xB7, 0x9A, 0x0D, 0x46, 0x1D, 0x4E, 0xA9, 0x4C); +DEFINE_GUID(IID_ITfReadOnlyProperty, 0x17D49A3D, 0xF8B8, 0x4B2F, 0xB2, 0x54, 0x52, 0x31, 0x9D, 0xD6, 0x4C, 0x53);

10 months, 1 week

← Newer
1
...
13
14
15
16
17
18
19
...
28
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 December 2023