Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

01/01: [INCLUDE] Add <winxx.h> and <msgdump.h> (#1015)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df5bee6509f32313f9479… commit df5bee6509f32313f947969e4c1e79482231fbfc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 7 22:28:59 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 7 22:28:59 2018 +0900 [INCLUDE] Add <winxx.h> and <msgdump.h> (#1015) File "sdk/include/reactos/msgdump.h" I added helps us dump Win32API message info. Use freely. --- sdk/include/reactos/msgdump.h | 1792 +++++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/winxx.h | 540 +++++++++++++ 2 files changed, 2332 insertions(+) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h new file mode 100644 index 0000000000..620f931ade --- /dev/null +++ b/sdk/include/reactos/msgdump.h @@ -0,0 +1,1792 @@ +/* + * PROJECT: ReactOS header files + * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0.html) + * PURPOSE: Win32API message dumping + * COPYRIGHT: Copyright 2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#ifndef _INC_MSGDUMP +#define _INC_MSGDUMP + +/* + * NOTE: MS_msgdump function in this file provides Win32API message dump feature. + * NOTE: This header file takes time to compile. + * You might indirectly use MS_msgdump function. + */ +#pragma once + +#include "winxx.h" /* An unofficial extension of <windowsx.h>. */ +#include <strsafe.h> + +#ifndef MSGDUMP_PRINTF + #error Please define MSGDUMP_PRINTF macro before #include "msgdump.h". +#endif + +#ifndef MSGDUMP_API + #define MSGDUMP_API WINAPI +#endif + +#ifndef MSGDUMP_PREFIX + #define MSGDUMP_PREFIX "" +#endif + +/* MD_msgdump function */ +static __inline LRESULT MSGDUMP_API +MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +/*---- The below codes are boring details of MD_msgdump implementation. ----*/ + +#define MSGDUMP_MAX_RECT_TEXT 64 + +static __inline const char * MSGDUMP_API +MD_rect_text(char *buf, size_t bufsize, const RECT *prc) +{ + if (prc == NULL) + { + StringCbCopyA(buf, bufsize, "(null)"); + } + else + { + StringCbPrintfA(buf, bufsize, "(%ld, %ld, %ld, %ld)", + prc->left, prc->top, prc->right, prc->bottom); + } + return buf; +} + +static __inline LRESULT MSGDUMP_API +MD_OnUnknown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + MSGDUMP_PRINTF("%sWM_%u(hwnd:%p, wParam:%p, lParam:%p)\n", + MSGDUMP_PREFIX, uMsg, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; +} + +static __inline LRESULT MSGDUMP_API +MD_OnUser(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + MSGDUMP_PRINTF("%sWM_USER+%u(hwnd:%p, wParam:%p, lParam:%p)\n", + MSGDUMP_PREFIX, uMsg - WM_USER, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; +} + +static __inline LRESULT MSGDUMP_API +MD_OnApp(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + MSGDUMP_PRINTF("%sWM_APP+%u(hwnd:%p, wParam:%p, lParam:%p)\n", + MSGDUMP_PREFIX, uMsg - WM_APP, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; +} + +static __inline LRESULT MSGDUMP_API +MD_OnNull(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_NULL(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline BOOL MSGDUMP_API +MD_OnCreate(HWND hwnd, LPCREATESTRUCT lpCreateStruct) +{ + MSGDUMP_PRINTF("%sWM_CREATE(hwnd:%p, lpCreateStruct:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpCreateStruct); + return TRUE; +} + +static __inline void MSGDUMP_API +MD_OnDestroy(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_DESTROY(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnMove(HWND hwnd, int x, int y) +{ + MSGDUMP_PRINTF("%sWM_MOVE(hwnd:%p, x:%d, y:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y); +} + +static __inline void MSGDUMP_API +MD_OnSize(HWND hwnd, UINT state, int cx, int cy) +{ + MSGDUMP_PRINTF("%sWM_SIZE(hwnd:%p, state:%u, cx:%d, cy:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, state, cx, cy); +} + +static __inline void MSGDUMP_API +MD_OnActivate(HWND hwnd, UINT state, HWND hwndActDeact, BOOL fMinimized) +{ + MSGDUMP_PRINTF("%sWM_ACTIVATE(hwnd:%p, state:%u, hwndActDeact:%p, fMinimized:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, state, (void *)hwndActDeact, fMinimized); +} + +static __inline void MSGDUMP_API +MD_OnSetFocus(HWND hwnd, HWND hwndOldFocus) +{ + MSGDUMP_PRINTF("%sWM_SETFOCUS(hwnd:%p, hwndOldFocus:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndOldFocus); +} + +static __inline void MSGDUMP_API +MD_OnKillFocus(HWND hwnd, HWND hwndNewFocus) +{ + MSGDUMP_PRINTF("%sWM_KILLFOCUS(hwnd:%p, hwndNewFocus:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndNewFocus); +} + +static __inline void MSGDUMP_API +MD_OnEnable(HWND hwnd, BOOL fEnable) +{ + MSGDUMP_PRINTF("%sWM_ENABLE(hwnd:%p, fEnable:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, fEnable); +} + +static __inline void MSGDUMP_API +MD_OnSetRedraw(HWND hwnd, BOOL fRedraw) +{ + MSGDUMP_PRINTF("%sWM_SETREDRAW(hwnd:%p, fRedraw:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, fRedraw); +} + +static __inline void MSGDUMP_API +MD_OnSetText(HWND hwnd, LPCTSTR lpszText) +{ +#ifdef UNICODE + MSGDUMP_PRINTF("%sWM_SETTEXT(hwnd:%p, lpszText:%ls)\n", + MSGDUMP_PREFIX, (void *)hwnd, lpszText); +#else + MSGDUMP_PRINTF("%sWM_SETTEXT(hwnd:%p, lpszText:%s)\n", + MSGDUMP_PREFIX, (void *)hwnd, lpszText); +#endif +} + +static __inline INT MSGDUMP_API +MD_OnGetText(HWND hwnd, int cchTextMax, LPTSTR lpszText) +{ + MSGDUMP_PRINTF("%sWM_GETTEXT(hwnd:%p, cchTextMax:%d, lpszText:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, cchTextMax, (void *)lpszText); + return 0; +} + +static __inline INT MSGDUMP_API +MD_OnGetTextLength(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_GETTEXTLENGTH(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnPaint(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_PAINT(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnClose(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_CLOSE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline BOOL MSGDUMP_API +MD_OnQueryEndSession(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_QUERYENDSESSION(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return FALSE; +} + +static __inline BOOL MSGDUMP_API +MD_OnQueryOpen(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_QUERYOPEN(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_OnEndSession(HWND hwnd, BOOL fEnding) +{ + MSGDUMP_PRINTF("%sWM_ENDSESSION(hwnd:%p, fEnding:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, fEnding); +} + +static __inline void MSGDUMP_API +MD_OnQuit(HWND hwnd, int exitCode) +{ + MSGDUMP_PRINTF("%sWM_QUIT(hwnd:%p, exitCode:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, exitCode); +} + +static __inline BOOL MSGDUMP_API +MD_OnEraseBkgnd(HWND hwnd, HDC hdc) +{ + MSGDUMP_PRINTF("%sWM_ERASEBKGND(hwnd:%p, hdc:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hdc); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_OnSysColorChange(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_SYSCOLORCHANGE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnShowWindow(HWND hwnd, BOOL fShow, UINT status) +{ + MSGDUMP_PRINTF("%sWM_SHOWWINDOW(hwnd:%p, fShow:%d, status:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, fShow, status); +} + +static __inline void MSGDUMP_API +MD_OnWinIniChange(HWND hwnd, LPCTSTR lpszSectionName) +{ +#ifdef UNICODE + MSGDUMP_PRINTF("%sWM_WININICHANGE(hwnd:%p, lpszSectionName:%ls)\n", + MSGDUMP_PREFIX, (void *)hwnd, lpszSectionName); +#else + MSGDUMP_PRINTF("%sWM_WININICHANGE(hwnd:%p, lpszSectionName:%s)\n", + MSGDUMP_PREFIX, (void *)hwnd, lpszSectionName); +#endif +} + +static __inline void MSGDUMP_API +MD_OnSettingChange(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + MSGDUMP_PRINTF("%sWM_SETTINGCHANGE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnDevModeChange(HWND hwnd, LPCTSTR lpszDeviceName) +{ +#ifdef UNICODE + MSGDUMP_PRINTF("%sWM_DEVMODECHANGE(hwnd:%p, lpszDeviceName:%ls)\n", + MSGDUMP_PREFIX, (void *)hwnd, lpszDeviceName); +#else + MSGDUMP_PRINTF("%sWM_DEVMODECHANGE(hwnd:%p, lpszDeviceName:%s)\n", + MSGDUMP_PREFIX, (void *)hwnd, lpszDeviceName); +#endif +} + +static __inline void MSGDUMP_API +MD_OnActivateApp(HWND hwnd, BOOL fActivate, DWORD dwThreadId) +{ + MSGDUMP_PRINTF("%sWM_ACTIVATEAPP(hwnd:%p, fActivate:%d, dwThreadId:0x%08lX)\n", + MSGDUMP_PREFIX, (void *)hwnd, fActivate, dwThreadId); +} + +static __inline void MSGDUMP_API +MD_OnFontChange(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_FONTCHANGE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnTimeChange(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_TIMECHANGE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnCancelMode(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_CANCELMODE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline BOOL MSGDUMP_API +MD_OnSetCursor(HWND hwnd, HWND hwndCursor, UINT codeHitTest, UINT msg) +{ + MSGDUMP_PRINTF("%sWM_SETCURSOR(hwnd:%p, hwndCursor:%p, codeHitTest:%u, msg:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndCursor, codeHitTest, msg); + return FALSE; +} + +static __inline int MSGDUMP_API +MD_OnMouseActivate(HWND hwnd, HWND hwndTopLevel, UINT codeHitTest, UINT msg) +{ + MSGDUMP_PRINTF("%sWM_MOUSEACTIVATE(hwnd:%p, hwndTopLevel:%p, codeHitTest:%u, msg:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndTopLevel, codeHitTest, msg); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnChildActivate(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_CHILDACTIVATE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnQueueSync(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_QUEUESYNC(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnGetMinMaxInfo(HWND hwnd, LPMINMAXINFO lpMinMaxInfo) +{ + MSGDUMP_PRINTF("%sWM_GETMINMAXINFO(hwnd:%p, lpMinMaxInfo:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpMinMaxInfo); +} + +static __inline BOOL MSGDUMP_API +MD_OnIconEraseBkgnd(HWND hwnd, HDC hdc) +{ + MSGDUMP_PRINTF("%sWM_ICONERASEBKGND(hwnd:%p, hdc:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hdc); + return FALSE; +} + +static __inline HWND MSGDUMP_API +MD_OnNextDlgCtl(HWND hwnd, HWND hwndSetFocus, BOOL fNext) +{ + MSGDUMP_PRINTF("%sWM_NEXTDLGCTL(hwnd:%p, hwndSetFocus:%p, fNext:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndSetFocus, fNext); + return NULL; +} + +static __inline void MSGDUMP_API +MD_OnSpoolerStatus(HWND hwnd, UINT status, int cJobInQueue) +{ + MSGDUMP_PRINTF("%sWM_SPOOLERSTATUS(hwnd:%p, status:%u, cJobInQueue:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, status, cJobInQueue); +} + +static __inline void MSGDUMP_API +MD_OnDrawItem(HWND hwnd, const DRAWITEMSTRUCT * lpDrawItem) +{ + MSGDUMP_PRINTF("%sWM_DRAWITEM(hwnd:%p, lpDrawItem:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpDrawItem); +} + +static __inline void MSGDUMP_API +MD_OnMeasureItem(HWND hwnd, MEASUREITEMSTRUCT * lpMeasureItem) +{ + MSGDUMP_PRINTF("%sWM_MEASUREITEM(hwnd:%p, lpMeasureItem:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpMeasureItem); +} + +static __inline void MSGDUMP_API +MD_OnDeleteItem(HWND hwnd, const DELETEITEMSTRUCT * lpDeleteItem) +{ + MSGDUMP_PRINTF("%sWM_DELETEITEM(hwnd:%p, lpDeleteItem:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpDeleteItem); +} + +static __inline int MSGDUMP_API +MD_OnVkeyToItem(HWND hwnd, UINT vk, HWND hwndListbox, int iCaret) +{ + MSGDUMP_PRINTF("%sWM_VKEYTOITEM(hwnd:%p, vk:%u, hwndListbox:%p, iCaret:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, vk, (void *)hwndListbox, iCaret); + return 0; +} + +static __inline int MSGDUMP_API +MD_OnCharToItem(HWND hwnd, UINT ch, HWND hwndListbox, int iCaret) +{ + MSGDUMP_PRINTF("%sWM_CHARTOITEM(hwnd:%p, ch:%u, hwndListbox:%p, iCaret:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, ch, (void *)hwndListbox, iCaret); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnSetFont(HWND hwnd, HFONT hfont, BOOL fRedraw) +{ + MSGDUMP_PRINTF("%sWM_SETFONT(hwnd:%p, hfont:%p, fRedraw:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hfont, fRedraw); +} + +static __inline HFONT MSGDUMP_API +MD_OnGetFont(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_GETFONT(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return NULL; +} + +static __inline HICON MSGDUMP_API +MD_OnQueryDragIcon(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_QUERYDRAGICON(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return NULL; +} + +static __inline int MSGDUMP_API +MD_OnCompareItem(HWND hwnd, const COMPAREITEMSTRUCT * lpCompareItem) +{ + MSGDUMP_PRINTF("%sWM_COMPAREITEM(hwnd:%p, lpCompareItem:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpCompareItem); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnCompacting(HWND hwnd, UINT compactRatio) +{ + MSGDUMP_PRINTF("%sWM_COMPACTING(hwnd:%p, compactRatio:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, compactRatio); +} + +static __inline void MSGDUMP_API +MD_OnCommNotify(HWND hwnd, int cid, UINT flags) +{ + MSGDUMP_PRINTF("%sWM_COMMNOTIFY(hwnd:%p, cid:%d, flags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, cid, flags); +} + +static __inline BOOL MSGDUMP_API +MD_OnWindowPosChanging(HWND hwnd, LPWINDOWPOS lpwpos) +{ + MSGDUMP_PRINTF("%sWM_WINDOWPOSCHANGING(hwnd:%p, lpwpos:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpwpos); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_OnWindowPosChanged(HWND hwnd, const LPWINDOWPOS lpwpos) +{ + MSGDUMP_PRINTF("%sWM_WINDOWPOSCHANGED(hwnd:%p, lpwpos:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpwpos); +} + +static __inline void MSGDUMP_API +MD_OnPower(HWND hwnd, int code) +{ + MSGDUMP_PRINTF("%sWM_POWER(hwnd:%p, code:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, code); +} + +static __inline BOOL MSGDUMP_API +MD_OnCopyData(HWND hwnd, HWND hwndFrom, PCOPYDATASTRUCT pcds) +{ + MSGDUMP_PRINTF("%sWM_COPYDATA(hwnd:%p, hwndFrom:%p, pcds:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndFrom, (void *)pcds); + return FALSE; +} + +static __inline LRESULT MSGDUMP_API +MD_OnNotify(HWND hwnd, int idFrom, LPNMHDR pnmhdr) +{ + MSGDUMP_PRINTF("%sWM_NOTIFY(hwnd:%p, idFrom:%d, pnmhdr:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, idFrom, (void *)pnmhdr); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnContextMenu(HWND hwnd, HWND hwndContext, UINT xPos, UINT yPos) +{ + MSGDUMP_PRINTF("%sWM_CONTEXTMENU(hwnd:%p, hwndContext:%p, xPos:%u, yPos:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndContext, xPos, yPos); +} + +static __inline void MSGDUMP_API +MD_OnDisplayChange(HWND hwnd, UINT bitsPerPixel, UINT cxScreen, UINT cyScreen) +{ + MSGDUMP_PRINTF("%sWM_DISPLAYCHANGE(hwnd:%p, bitsPerPixel:%u, cxScreen:%u, cyScreen:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, bitsPerPixel, cxScreen, cyScreen); +} + +static __inline BOOL MSGDUMP_API +MD_OnNCCreate(HWND hwnd, LPCREATESTRUCT lpCreateStruct) +{ + MSGDUMP_PRINTF("%sWM_NCCREATE(hwnd:%p, lpCreateStruct:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpCreateStruct); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_OnNCDestroy(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_NCDESTROY(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline UINT MSGDUMP_API +MD_OnNCCalcSize(HWND hwnd, BOOL fCalcValidRects, NCCALCSIZE_PARAMS * lpcsp) +{ + MSGDUMP_PRINTF("%sWM_NCCALCSIZE(hwnd:%p, fCalcValidRects:%d, lpcsp:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, fCalcValidRects, (void *)lpcsp); + return 0; +} + +static __inline UINT MSGDUMP_API +MD_OnNCHitTest(HWND hwnd, int x, int y) +{ + MSGDUMP_PRINTF("%sWM_NCHITTEST(hwnd:%p, x:%d, y:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnNCPaint(HWND hwnd, HRGN hrgn) +{ + MSGDUMP_PRINTF("%sWM_NCPAINT(hwnd:%p, hrgn:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hrgn); +} + +static __inline BOOL MSGDUMP_API +MD_OnNCActivate(HWND hwnd, BOOL fActive, HWND hwndActDeact, BOOL fMinimized) +{ + MSGDUMP_PRINTF("%sWM_NCACTIVATE(hwnd:%p, fActive:%d, hwndActDeact:%p, fMinimized:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, fActive, (void *)hwndActDeact, fMinimized); + return FALSE; +} + +static __inline UINT MSGDUMP_API +MD_OnGetDlgCode(HWND hwnd, LPMSG lpmsg) +{ + MSGDUMP_PRINTF("%sWM_GETDLGCODE(hwnd:%p, lpmsg:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpmsg); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnNCMouseMove(HWND hwnd, int x, int y, UINT codeHitTest) +{ + MSGDUMP_PRINTF("%sWM_NCMOUSEMOVE(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); +} + +static __inline void MSGDUMP_API +MD_OnNCLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) +{ + if (fDoubleClick) + { + MSGDUMP_PRINTF("%sWM_NCLBUTTONDBLCLK(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); + } + else + { + MSGDUMP_PRINTF("%sWM_NCLBUTTONDOWN(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); + } +} + +static __inline void MSGDUMP_API +MD_OnNCLButtonUp(HWND hwnd, int x, int y, UINT codeHitTest) +{ + MSGDUMP_PRINTF("%sWM_NCLBUTTONUP(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); +} + +static __inline void MSGDUMP_API +MD_OnNCRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) +{ + if (fDoubleClick) + { + MSGDUMP_PRINTF("%sWM_NCRBUTTONDBLCLK(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); + } + else + { + MSGDUMP_PRINTF("%sWM_NCRBUTTONDOWN(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); + } +} + +static __inline void MSGDUMP_API +MD_OnNCRButtonUp(HWND hwnd, int x, int y, UINT codeHitTest) +{ + MSGDUMP_PRINTF("%sWM_NCRBUTTONUP(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); +} + +static __inline void MSGDUMP_API +MD_OnNCMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) +{ + if (fDoubleClick) + { + MSGDUMP_PRINTF("%sWM_NCMBUTTONDBLCLK(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); + } + else + { + MSGDUMP_PRINTF("%sWM_NCMBUTTONDOWN(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); + } +} + +static __inline void MSGDUMP_API +MD_OnNCMButtonUp(HWND hwnd, int x, int y, UINT codeHitTest) +{ + MSGDUMP_PRINTF("%sWM_NCMBUTTONUP(hwnd:%p, x:%d, y:%d, codeHitTest:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, codeHitTest); +} + +static __inline void MSGDUMP_API +MD_OnKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) +{ + if (fDown) + { + MSGDUMP_PRINTF("%sWM_KEYDOWN(hwnd:%p, vk:%u, cRepeat:%d, flags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, vk, cRepeat, flags); + } + else + { + MSGDUMP_PRINTF("%sWM_KEYUP(hwnd:%p, vk:%u, cRepeat:%d, flags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, vk, cRepeat, flags); + } +} + +static __inline void MSGDUMP_API +MD_OnChar(HWND hwnd, TCHAR ch, int cRepeat) +{ + MSGDUMP_PRINTF("%sWM_CHAR(hwnd:%p, ch:%u, cRepeat:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, ch, cRepeat); +} + +static __inline void MSGDUMP_API +MD_OnDeadChar(HWND hwnd, TCHAR ch, int cRepeat) +{ + MSGDUMP_PRINTF("%sWM_DEADCHAR(hwnd:%p, ch:%u, cRepeat:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, ch, cRepeat); +} + +static __inline void MSGDUMP_API +MD_OnSysKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) +{ + if (fDown) + { + MSGDUMP_PRINTF("%sWM_SYSKEYDOWN(hwnd:%p, vk:%u, cRepeat:%d, flags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, vk, cRepeat, flags); + } + else + { + MSGDUMP_PRINTF("%sWM_SYSKEYUP(hwnd:%p, vk:%u, cRepeat:%d, flags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, vk, cRepeat, flags); + } +} + +static __inline void MSGDUMP_API +MD_OnSysChar(HWND hwnd, TCHAR ch, int cRepeat) +{ + MSGDUMP_PRINTF("%sWM_SYSCHAR(hwnd:%p, ch:%u, cRepeat:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, ch, cRepeat); +} + +static __inline void MSGDUMP_API +MD_OnSysDeadChar(HWND hwnd, TCHAR ch, int cRepeat) +{ + MSGDUMP_PRINTF("%sWM_SYSDEADCHAR(hwnd:%p, ch:%u, cRepeat:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, ch, cRepeat); +} + +static __inline BOOL MSGDUMP_API +MD_OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) +{ + MSGDUMP_PRINTF("%sWM_INITDIALOG(hwnd:%p, hwndFocus:%p, lParam:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndFocus, (void *)lParam); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + MSGDUMP_PRINTF("%sWM_COMMAND(hwnd:%p, id:%d, hwndCtl:%p, codeNotify:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, id, (void *)hwndCtl, codeNotify); +} + +static __inline void MSGDUMP_API +MD_OnSysCommand(HWND hwnd, UINT cmd, int x, int y) +{ + MSGDUMP_PRINTF("%sWM_SYSCOMMAND(hwnd:%p, cmd:%u, x:%d, y:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, cmd, x, y); +} + +static __inline void MSGDUMP_API +MD_OnTimer(HWND hwnd, UINT id) +{ + MSGDUMP_PRINTF("%sWM_TIMER(hwnd:%p, id:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, id); +} + +static __inline void MSGDUMP_API +MD_OnHScroll(HWND hwnd, HWND hwndCtl, UINT code, int pos) +{ + MSGDUMP_PRINTF("%sWM_HSCROLL(hwnd:%p, hwndCtl:%p, code:%u, pos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndCtl, code, pos); +} + +static __inline void MSGDUMP_API +MD_OnVScroll(HWND hwnd, HWND hwndCtl, UINT code, int pos) +{ + MSGDUMP_PRINTF("%sWM_VSCROLL(hwnd:%p, hwndCtl:%p, code:%u, pos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndCtl, code, pos); +} + +static __inline void MSGDUMP_API +MD_OnInitMenu(HWND hwnd, HMENU hMenu) +{ + MSGDUMP_PRINTF("%sWM_INITMENU(hwnd:%p, hMenu:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hMenu); +} + +static __inline void MSGDUMP_API +MD_OnInitMenuPopup(HWND hwnd, HMENU hMenu, UINT item, BOOL fSystemMenu) +{ + MSGDUMP_PRINTF("%sWM_INITMENUPOPUP(hwnd:%p, hMenu:%p, item:%u, fSystemMenu:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hMenu, item, fSystemMenu); +} + +static __inline void MSGDUMP_API +MD_OnMenuSelect(HWND hwnd, HMENU hmenu, int item, HMENU hmenuPopup, UINT flags) +{ + MSGDUMP_PRINTF("%sWM_MENUSELECT(hwnd:%p, hmenu:%p, item:%d, hmenuPopup:%p, flags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hmenu, item, (void *)hmenuPopup, flags); +} + +static __inline DWORD MSGDUMP_API +MD_OnMenuChar(HWND hwnd, UINT ch, UINT flags, HMENU hmenu) +{ + MSGDUMP_PRINTF("%sWM_MENUCHAR(hwnd:%p, ch:%u, flags:%u, hmenu:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, ch, flags, (void *)hmenu); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnEnterIdle(HWND hwnd, UINT source, HWND hwndSource) +{ + MSGDUMP_PRINTF("%sWM_ENTERIDLE(hwnd:%p, source:%u, hwndSource:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, source, (void *)hwndSource); +} + +static __inline HBRUSH MSGDUMP_API +MD_OnCtlColor(HWND hwnd, HDC hdc, HWND hwndChild, int type) +{ + MSGDUMP_PRINTF("%sWM_CTLCOLOR(hwnd:%p, hdc:%p, hwndChild:%p, type:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hdc, (void *)hwndChild, type); + return NULL; +} + +static __inline void MSGDUMP_API +MD_OnMouseMove(HWND hwnd, int x, int y, UINT keyFlags) +{ + MSGDUMP_PRINTF("%sWM_MOUSEMOVE(hwnd:%p, x:%d, y:%d, keyFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, keyFlags); +} + +static __inline void MSGDUMP_API +MD_OnLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) +{ + if (fDoubleClick) + { + MSGDUMP_PRINTF("%sWM_LBUTTONDBLCLK(hwnd:%p, x:%d, y:%d, keyFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, keyFlags); + } + else + { + MSGDUMP_PRINTF("%sWM_LBUTTONDOWN(hwnd:%p, x:%d, y:%d, keyFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, keyFlags); + } +} + +static __inline void MSGDUMP_API +MD_OnLButtonUp(HWND hwnd, int x, int y, UINT keyFlags) +{ + MSGDUMP_PRINTF("%sWM_LBUTTONUP(hwnd:%p, x:%d, y:%d, keyFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, keyFlags); +} + +static __inline void MSGDUMP_API +MD_OnRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) +{ + if (fDoubleClick) + { + MSGDUMP_PRINTF("%sWM_RBUTTONDBLCLK(hwnd:%p, x:%d, y:%d, keyFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, keyFlags); + } + else + { + MSGDUMP_PRINTF("%sWM_RBUTTONDOWN(hwnd:%p, x:%d, y:%d, keyFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, keyFlags); + } +} + +static __inline void MSGDUMP_API +MD_OnRButtonUp(HWND hwnd, int x, int y, UINT flags) +{ + MSGDUMP_PRINTF("%sWM_RBUTTONUP(hwnd:%p, x:%d, y:%d, flags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, flags); +} + +static __inline void MSGDUMP_API +MD_OnMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) +{ + if (fDoubleClick) + { + MSGDUMP_PRINTF("%sWM_MBUTTONDBLCLK(hwnd:%p, x:%d, y:%d, keyFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, keyFlags); + } + else + { + MSGDUMP_PRINTF("%sWM_MBUTTONDOWN(hwnd:%p, x:%d, y:%d, keyFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, keyFlags); + } +} + +static __inline void MSGDUMP_API +MD_OnMButtonUp(HWND hwnd, int x, int y, UINT flags) +{ + MSGDUMP_PRINTF("%sWM_MBUTTONUP(hwnd:%p, x:%d, y:%d, flags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, x, y, flags); +} + +static __inline void MSGDUMP_API +MD_OnMouseWheel(HWND hwnd, int xPos, int yPos, int zDelta, UINT fwKeys) +{ + MSGDUMP_PRINTF("%sWM_MOUSEWHEEL(hwnd:%p, xPos:%d, yPos:%d, zDelta:%d, fwKeys:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, xPos, yPos, zDelta, fwKeys); +} + +static __inline void MSGDUMP_API +MD_OnParentNotify(HWND hwnd, UINT msg, HWND hwndChild, int idChild) +{ + MSGDUMP_PRINTF("%sWM_PARENTNOTIFY(hwnd:%p, msg:%u, hwndChild:%p, idChild:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, msg, (void *)hwndChild, idChild); +} + +static __inline BOOL MSGDUMP_API +MD_OnDeviceChange(HWND hwnd, UINT uEvent, DWORD dwEventData) +{ + MSGDUMP_PRINTF("%sWM_DEVICECHANGE(hwnd:%p, uEvent:%u, dwEventData:0x%08lX)\n", + MSGDUMP_PREFIX, (void *)hwnd, uEvent, dwEventData); + return FALSE; +} + +static __inline HWND MSGDUMP_API +MD_MDICreate(HWND hwnd, const LPMDICREATESTRUCT lpmcs) +{ + MSGDUMP_PRINTF("%sWM_MDICREATE(hwnd:%p, lpmcs:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpmcs); + return NULL; +} + +static __inline void MSGDUMP_API +MD_MDIDestroy(HWND hwnd, HWND hwndDestroy) +{ + MSGDUMP_PRINTF("%sWM_MDIDESTROY(hwnd:%p, hwndDestroy:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndDestroy); +} + +static __inline void MSGDUMP_API +MD_MDIActivate(HWND hwnd, BOOL fActive, HWND hwndActivate, HWND hwndDeactivate) +{ + MSGDUMP_PRINTF("%sWM_MDIACTIVATE(hwnd:%p, fActive:%d, hwndActivate:%p, hwndDeactivate:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, fActive, (void *)hwndActivate, (void *)hwndDeactivate); +} + +static __inline void MSGDUMP_API +MD_MDIRestore(HWND hwnd, HWND hwndRestore) +{ + MSGDUMP_PRINTF("%sWM_MDIRESTORE(hwnd:%p, hwndRestore:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndRestore); +} + +static __inline HWND MSGDUMP_API +MD_MDINext(HWND hwnd, HWND hwndCur, BOOL fPrev) +{ + MSGDUMP_PRINTF("%sWM_MDINEXT(hwnd:%p, hwndCur:%p, fPrev:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndCur, fPrev); + return NULL; +} + +static __inline void MSGDUMP_API +MD_MDIMaximize(HWND hwnd, HWND hwndMaximize) +{ + MSGDUMP_PRINTF("%sWM_MDIMAXIMIZE(hwnd:%p, hwndMaximize:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndMaximize); +} + +static __inline BOOL MSGDUMP_API +MD_MDITile(HWND hwnd, UINT cmd) +{ + MSGDUMP_PRINTF("%sWM_MDITILE(hwnd:%p, cmd:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, cmd); + return FALSE; +} + +static __inline BOOL MSGDUMP_API +MD_MDICascade(HWND hwnd, UINT cmd) +{ + MSGDUMP_PRINTF("%sWM_MDICASCADE(hwnd:%p, cmd:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, cmd); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_MDIIconArrange(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_MDIICONARRANGE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline HWND MSGDUMP_API +MD_MDIGetActive(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_MDIGETACTIVE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return NULL; +} + +static __inline HMENU MSGDUMP_API +MD_MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU hmenuFrame, HMENU hmenuWindow) +{ + MSGDUMP_PRINTF("%sWM_MDISETMENU(hwnd:%p, fRefresh:%d, hmenuFrame:%p, hmenuWindow:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, fRefresh, (void *)hmenuFrame, (void *)hmenuWindow); + return NULL; +} + +static __inline void MSGDUMP_API +MD_OnDropFiles(HWND hwnd, HDROP hdrop) +{ + MSGDUMP_PRINTF("%sWM_DROPFILES(hwnd:%p, hdrop:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hdrop); +} + +static __inline void MSGDUMP_API +MD_OnCut(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_CUT(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnCopy(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_COPY(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnPaste(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_PASTE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnClear(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_CLEAR(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnUndo(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_UNDO(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline HANDLE MSGDUMP_API +MD_OnRenderFormat(HWND hwnd, UINT fmt) +{ + MSGDUMP_PRINTF("%sWM_RENDERFORMAT(hwnd:%p, fmt:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, fmt); + return NULL; +} + +static __inline void MSGDUMP_API +MD_OnRenderAllFormats(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_RENDERALLFORMATS(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnDestroyClipboard(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_DESTROYCLIPBOARD(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnDrawClipboard(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_DRAWCLIPBOARD(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnPaintClipboard(HWND hwnd, HWND hwndCBViewer, const LPPAINTSTRUCT lpPaintStruct) +{ + MSGDUMP_PRINTF("%sWM_PAINTCLIPBOARD(hwnd:%p, hwndCBViewer:%p, lpPaintStruct:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndCBViewer, (void *)lpPaintStruct); +} + +static __inline void MSGDUMP_API +MD_OnVScrollClipboard(HWND hwnd, HWND hwndCBViewer, UINT code, int pos) +{ + MSGDUMP_PRINTF("%sWM_VSCROLLCLIPBOARD(hwnd:%p, hwndCBViewer:%p, code:%u, pos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndCBViewer, code, pos); +} + +static __inline void MSGDUMP_API +MD_OnSizeClipboard(HWND hwnd, HWND hwndCBViewer, const LPRECT lprc) +{ + char buf[MSGDUMP_MAX_RECT_TEXT]; + MSGDUMP_PRINTF("%sWM_SIZECLIPBOARD(hwnd:%p, hwndCBViewer:%p, lprc:%s)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndCBViewer, + MD_rect_text(buf, sizeof(buf), lprc)); +} + +static __inline void MSGDUMP_API +MD_OnAskCBFormatName(HWND hwnd, int cchMax, LPTSTR rgchName) +{ + MSGDUMP_PRINTF("%sWM_ASKCBFORMATNAME(hwnd:%p, cchMax:%d, rgchName:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, cchMax, (void *)rgchName); +} + +static __inline void MSGDUMP_API +MD_OnChangeCBChain(HWND hwnd, HWND hwndRemove, HWND hwndNext) +{ + MSGDUMP_PRINTF("%sWM_CHANGECBCHAIN(hwnd:%p, hwndRemove:%p, hwndNext:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndRemove, (void *)hwndNext); +} + +static __inline void MSGDUMP_API +MD_OnHScrollClipboard(HWND hwnd, HWND hwndCBViewer, UINT code, int pos) +{ + MSGDUMP_PRINTF("%sWM_HSCROLLCLIPBOARD(hwnd:%p, hwndCBViewer:%p, code:%u, pos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndCBViewer, code, pos); +} + +static __inline BOOL MSGDUMP_API +MD_OnQueryNewPalette(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_QUERYNEWPALETTE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return FALSE; +} + +static __inline void MSGDUMP_API +MD_OnPaletteIsChanging(HWND hwnd, HWND hwndPaletteChange) +{ + MSGDUMP_PRINTF("%sWM_PALETTEISCHANGING(hwnd:%p, hwndPaletteChange:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndPaletteChange); +} + +static __inline void MSGDUMP_API +MD_OnPaletteChanged(HWND hwnd, HWND hwndPaletteChange) +{ + MSGDUMP_PRINTF("%sWM_PALETTECHANGED(hwnd:%p, hwndPaletteChange:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndPaletteChange); +} + +static __inline void MSGDUMP_API +MD_OnHotKey(HWND hwnd, int idHotKey, UINT fuModifiers, UINT vk) +{ + MSGDUMP_PRINTF("%sWM_HOTKEY(hwnd:%p, idHotKey:%d, fuModifiers:%u, vk:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, idHotKey, fuModifiers, vk); +} + +static __inline INT MSGDUMP_API +MD_OnSetHotKey(HWND hwnd, INT nCode, UINT nOptions) +{ + MSGDUMP_PRINTF("%sWM_SETHOTKEY(hwnd:%p, nCode:%d, nOptions:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, nCode, nOptions); + return 0; +} + +static __inline INT MSGDUMP_API +MD_OnGetHotKey(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_GETHOTKEY(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnPaintIcon(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_PAINTICON(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline LRESULT MSGDUMP_API +MD_OnGetObject(HWND hwnd, WPARAM wParam, DWORD dwObjId) +{ + MSGDUMP_PRINTF("%sWM_GETOBJECT(hwnd:%p, wParam:%p, dwObjId:0x%08lX)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)wParam, dwObjId); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnCancelJournal(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_CANCELJOURNAL(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnInputLangChangeRequest(HWND hwnd, BOOL bFlag, HKL hKL) +{ + MSGDUMP_PRINTF("%sWM_INPUTLANGCHANGEREQUEST(hwnd:%p, bFlag:%d, hKL:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, bFlag, (void *)hKL); +} + +static __inline void MSGDUMP_API +MD_OnInputLangChange(HWND hwnd, DWORD dwCharSet, HKL hKL) +{ + MSGDUMP_PRINTF("%sWM_INPUTLANGCHANGE(hwnd:%p, dwCharSet:0x%08lX, hKL:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, dwCharSet, (void *)hKL); +} + +static __inline void MSGDUMP_API +MD_OnTCard(HWND hwnd, UINT idAction, DWORD dwActionData) +{ + MSGDUMP_PRINTF("%sWM_TCARD(hwnd:%p, idAction:%u, dwActionData:0x%08lX)\n", + MSGDUMP_PREFIX, (void *)hwnd, idAction, dwActionData); +} + +static __inline void MSGDUMP_API +MD_OnHelp(HWND hwnd, LPHELPINFO lpHelpInfo) +{ + MSGDUMP_PRINTF("%sWM_HELP(hwnd:%p, lpHelpInfo:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)lpHelpInfo); +} + +static __inline void MSGDUMP_API +MD_OnUserChanged(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_USERCHANGED(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline INT MSGDUMP_API +MD_OnNotifyFormat(HWND hwnd, HWND hwndTarget, INT nCommand) +{ + MSGDUMP_PRINTF("%sWM_NOTIFYFORMAT(hwnd:%p, hwndTarget:%p, nCommand:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndTarget, nCommand); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnStyleChanging(HWND hwnd, UINT nStyleType, LPSTYLESTRUCT lpStyleStruct) +{ + MSGDUMP_PRINTF("%sWM_STYLECHANGING(hwnd:%p, nStyleType:%u, lpStyleStruct:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, nStyleType, (void *)lpStyleStruct); +} + +static __inline void MSGDUMP_API +MD_OnStyleChanged(HWND hwnd, UINT nStyleType, const STYLESTRUCT *lpStyleStruct) +{ + MSGDUMP_PRINTF("%sWM_STYLECHANGED(hwnd:%p, nStyleType:%u, lpStyleStruct:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, nStyleType, (void *)lpStyleStruct); +} + +static __inline HICON MSGDUMP_API +MD_OnGetIcon(HWND hwnd, UINT nType, LPARAM dpi) +{ + MSGDUMP_PRINTF("%sWM_GETICON(hwnd:%p, nType:%u, dpi:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, nType, (void *)dpi); + return NULL; +} + +static __inline HICON MSGDUMP_API +MD_OnSetIcon(HWND hwnd, UINT nType, HICON hIcon) +{ + MSGDUMP_PRINTF("%sWM_SETICON(hwnd:%p, nType:%u, hIcon:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, nType, (void *)hIcon); + return NULL; +} + +static __inline void MSGDUMP_API +MD_OnSyncPaint(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_SYNCPAINT(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnNCXButtonDown(HWND hwnd, BOOL fDoubleClick, UINT nHitTest, WORD fwButton, + INT xPos, INT yPos) +{ + if (fDoubleClick) + { + MSGDUMP_PRINTF("%sWM_NCXBUTTONDBLCLK(hwnd:%p, nHitTest:%u, fwButton:%u, xPos:%d, yPos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, nHitTest, fwButton, xPos, yPos); + } + else + { + MSGDUMP_PRINTF("%sWM_NCXBUTTONDOWN(hwnd:%p, nHitTest:%u, fwButton:%u, xPos:%d, yPos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, nHitTest, fwButton, xPos, yPos); + } +} + +static __inline void MSGDUMP_API +MD_OnNCXButtonUp(HWND hwnd, UINT nHitTest, WORD fwButton, INT xPos, INT yPos) +{ + MSGDUMP_PRINTF("%sWM_NCXBUTTONUP(hwnd:%p, nHitTest:%u, fwButton:%u, xPos:%d, yPos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, nHitTest, fwButton, xPos, yPos); +} + +static __inline void MSGDUMP_API +MD_OnImeStartComposition(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_IME_STARTCOMPOSITION(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnImeEndComposition(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_IME_ENDCOMPOSITION(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnImeComposition(HWND hwnd, WORD wChar, DWORD lAttribute) +{ + MSGDUMP_PRINTF("%sWM_IME_COMPOSITION(hwnd:%p, wChar:%u, lAttribute:0x%08lX)\n", + MSGDUMP_PREFIX, (void *)hwnd, wChar, lAttribute); +} + +static __inline void MSGDUMP_API +MD_OnMenuRButtonUp(HWND hwnd, UINT nPos, HMENU hMenu) +{ + MSGDUMP_PRINTF("%sWM_MENURBUTTONUP(hwnd:%p, nPos:%u, hMenu:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, nPos, (void *)hMenu); +} + +static __inline UINT MSGDUMP_API +MD_OnMenuDrag(HWND hwnd, UINT nPos, HMENU hMenu) +{ + MSGDUMP_PRINTF("%sWM_MENUDRAG(hwnd:%p, nPos:%u, hMenu:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, nPos, (void *)hMenu); + return 0; +} + +static __inline UINT MSGDUMP_API +MD_OnMenuGetObject(HWND hwnd, MENUGETOBJECTINFO *pmgoi) +{ + MSGDUMP_PRINTF("%sWM_MENUGETOBJECT(hwnd:%p, pmgoi:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)pmgoi); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnUninitMenuPopup(HWND hwnd, HMENU hMenu, UINT nFlags) +{ + MSGDUMP_PRINTF("%sWM_UNINITMENUPOPUP(hwnd:%p, hMenu:%p, nFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hMenu, nFlags); +} + +static __inline void MSGDUMP_API +MD_OnMenuCommand(HWND hwnd, UINT nPos, HMENU hMenu) +{ + MSGDUMP_PRINTF("%sWM_MENUCOMMAND(hwnd:%p, nPos:%u, hMenu:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, nPos, (void *)hMenu); +} + +static __inline void MSGDUMP_API +MD_OnChangeUIState(HWND hwnd, UINT nAction, UINT nUIElement) +{ + MSGDUMP_PRINTF("%sWM_CHANGEUISTATE(hwnd:%p, nAction:%u, nUIElement:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, nAction, nUIElement); +} + +static __inline void MSGDUMP_API +MD_OnUpdateUIState(HWND hwnd, UINT nAction, UINT nUIElement) +{ + MSGDUMP_PRINTF("%sWM_UPDATEUISTATE(hwnd:%p, nAction:%u, nUIElement:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, nAction, nUIElement); +} + +static __inline UINT MSGDUMP_API +MD_OnQueryUIState(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_QUERYUISTATE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnXButtonDown(HWND hwnd, BOOL fDoubleClick, WORD fwKeys, WORD fwButton, INT xPos, INT yPos) +{ + if (fDoubleClick) + { + MSGDUMP_PRINTF("%sWM_XBUTTONDBLCLK(hwnd:%p, fwKeys:%u, fwButton:%u, xPos:%d, yPos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, fwKeys, fwButton, xPos, yPos); + } + else + { + MSGDUMP_PRINTF("%sWM_XBUTTONDOWN(hwnd:%p, fwKeys:%u, fwButton:%u, xPos:%d, yPos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, fwKeys, fwButton, xPos, yPos); + } +} + +static __inline void MSGDUMP_API +MD_OnXButtonUp(HWND hwnd, WORD fwKeys, WORD fwButton, INT xPos, INT yPos) +{ + MSGDUMP_PRINTF("%sWM_XBUTTONUP(hwnd:%p, fwKeys:%u, fwButton:%u, xPos:%d, yPos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, fwKeys, fwButton, xPos, yPos); +} + +static __inline void MSGDUMP_API +MD_OnEnterMenuLoop(HWND hwnd, BOOL bIsTrackPopupMenu) +{ + MSGDUMP_PRINTF("%sWM_ENTERMENULOOP(hwnd:%p, bIsTrackPopupMenu:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, bIsTrackPopupMenu); +} + +static __inline void MSGDUMP_API +MD_OnExitMenuLoop(HWND hwnd, BOOL bIsTrackPopupMenu) +{ + MSGDUMP_PRINTF("%sWM_EXITMENULOOP(hwnd:%p, bIsTrackPopupMenu:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, bIsTrackPopupMenu); +} + +static __inline void MSGDUMP_API +MD_OnNextMenu(HWND hwnd, INT nCode, LPMDINEXTMENU lpMDINextMenu) +{ + MSGDUMP_PRINTF("%sWM_NEXTMENU(hwnd:%p, nCode:%d, lpMDINextMenu:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, nCode, (void *)lpMDINextMenu); +} + +static __inline void MSGDUMP_API +MD_OnSizing(HWND hwnd, UINT nSide, LPRECT lpRect) +{ + char buf[MSGDUMP_MAX_RECT_TEXT]; + MSGDUMP_PRINTF("%sWM_SIZING(hwnd:%p, nSide:%u, lpRect:%s)\n", + MSGDUMP_PREFIX, (void *)hwnd, nSide, MD_rect_text(buf, sizeof(buf), lpRect)); +} + +static __inline void MSGDUMP_API +MD_OnCaptureChanged(HWND hwnd, HWND hwndNewCapture) +{ + MSGDUMP_PRINTF("%sWM_CAPTURECHANGED(hwnd:%p, hwndNewCapture:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndNewCapture); +} + +static __inline void MSGDUMP_API +MD_OnMoving(HWND hwnd, UINT nSide, LPRECT lpRect) +{ + char buf[MSGDUMP_MAX_RECT_TEXT]; + MSGDUMP_PRINTF("%sWM_MOVING(hwnd:%p, nSide:%u, lpRect:%s)\n", + MSGDUMP_PREFIX, (void *)hwnd, nSide, MD_rect_text(buf, sizeof(buf), lpRect)); +} + +static __inline LRESULT MSGDUMP_API +MD_OnPowerBroadcast(HWND hwnd, UINT nPowerEvent, UINT nEventData) +{ + MSGDUMP_PRINTF("%sWM_POWERBROADCAST(hwnd:%p, nPowerEvent:%u, nEventData:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, nPowerEvent, nEventData); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnEnterSizeMove(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_ENTERSIZEMOVE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnExitSizeMove(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_EXITSIZEMOVE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline HMENU MSGDUMP_API +MD_MDIRefreshMenu(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_MDIREFRESHMENU(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); + return NULL; +} + +static __inline BOOL MSGDUMP_API +MD_OnImeSetContext(HWND hwnd, BOOL fActive, DWORD dwShow) +{ + MSGDUMP_PRINTF("%sWM_IME_SETCONTEXT(hwnd:%p, fActive:%d, dwShow:0x%08lX)\n", + MSGDUMP_PREFIX, (void *)hwnd, fActive, dwShow); + return FALSE; +} + +static __inline LRESULT MSGDUMP_API +MD_OnImeNotify(HWND hwnd, WPARAM wSubMessage, LPARAM lParam) +{ + MSGDUMP_PRINTF("%sWM_IME_NOTIFY(hwnd:%p, wSubMessage:%p, lParam:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)wSubMessage, (void *)lParam); + return 0; +} + +static __inline LRESULT MSGDUMP_API +MD_OnImeControl(HWND hwnd, WPARAM wSubMessage, LPVOID lpData) +{ + MSGDUMP_PRINTF("%sWM_IME_CONTROL(hwnd:%p, wSubMessage:%p, lpData:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)wSubMessage, (void *)lpData); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnImeCompositionFull(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_IME_COMPOSITIONFULL(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnImeSelect(HWND hwnd, BOOL fSelect, HKL hKL) +{ + MSGDUMP_PRINTF("%sWM_IME_SELECT(hwnd:%p, fSelect:%d, hKL:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, fSelect, (void *)hKL); +} + +static __inline void MSGDUMP_API +MD_OnImeChar(HWND hwnd, WORD wCharCode, LONG lKeyData) +{ + MSGDUMP_PRINTF("%sWM_IME_CHAR(hwnd:%p, wCharCode:%u, lKeyData:%ld)\n", + MSGDUMP_PREFIX, (void *)hwnd, wCharCode, lKeyData); +} + +static __inline LRESULT MSGDUMP_API +MD_OnImeRequest(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + MSGDUMP_PRINTF("%sWM_IME_REQUEST(hwnd:%p, wParam:%p, lParam:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; +} + +static __inline void MSGDUMP_API +MD_OnImeKey(HWND hwnd, BOOL fDown, UINT nVirtKey, LONG lKeyData) +{ + if (fDown) + { + MSGDUMP_PRINTF("%sWM_IME_KEYDOWN(hwnd:%p, nVirtKey:%u, lKeyData:%ld)\n", + MSGDUMP_PREFIX, (void *)hwnd, nVirtKey, lKeyData); + } + else + { + MSGDUMP_PRINTF("%sWM_IME_KEYUP(hwnd:%p, nVirtKey:%u, lKeyData:%ld)\n", + MSGDUMP_PREFIX, (void *)hwnd, nVirtKey, lKeyData); + } +} + +static __inline void MSGDUMP_API +MD_OnMouseHover(HWND hwnd, UINT nFlags, INT xPos, INT yPos) +{ + MSGDUMP_PRINTF("%sWM_MOUSEHOVER(hwnd:%p, nFlags:%u, xPos:%d, yPos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, nFlags, xPos, yPos); +} + +static __inline void MSGDUMP_API +MD_OnMouseLeave(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_MOUSELEAVE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnNCMouseHover(HWND hwnd, UINT nHitTest, INT xPos, INT yPos) +{ + MSGDUMP_PRINTF("%sWM_NCMOUSEHOVER(hwnd:%p, nHitTest:%u, xPos:%d, yPos:%d)\n", + MSGDUMP_PREFIX, (void *)hwnd, nHitTest, xPos, yPos); +} + +static __inline void MSGDUMP_API +MD_OnNCMouseLeave(HWND hwnd) +{ + MSGDUMP_PRINTF("%sWM_NCMOUSELEAVE(hwnd:%p)\n", + MSGDUMP_PREFIX, (void *)hwnd); +} + +static __inline void MSGDUMP_API +MD_OnPrint(HWND hwnd, HDC hDC, UINT uFlags) +{ + MSGDUMP_PRINTF("%sWM_PRINT(hwnd:%p, hDC:%p, uFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hDC, uFlags); +} + +static __inline void MSGDUMP_API +MD_OnPrintClient(HWND hwnd, HDC hDC, UINT uFlags) +{ + MSGDUMP_PRINTF("%sWM_PRINTCLIENT(hwnd:%p, hDC:%p, uFlags:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hDC, uFlags); +} + +static __inline BOOL MSGDUMP_API +MD_OnAppCommand(HWND hwnd, HWND hwndTarget, UINT cmd, UINT nDevice, UINT nKey) +{ + MSGDUMP_PRINTF("%sWM_APPCOMMAND(hwnd:%p, hwndTarget:%p, cmd:%u, nDevice:%u, nKey:%u)\n", + MSGDUMP_PREFIX, (void *)hwnd, (void *)hwndTarget, cmd, nDevice, nKey); + return FALSE; +} + +static __inline LRESULT MSGDUMP_API +MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_NULL, MD_OnNull); + HANDLE_MSG(hwnd, WM_CREATE, MD_OnCreate); + HANDLE_MSG(hwnd, WM_DESTROY, MD_OnDestroy); + HANDLE_MSG(hwnd, WM_MOVE, MD_OnMove); + HANDLE_MSG(hwnd, WM_SIZE, MD_OnSize); + HANDLE_MSG(hwnd, WM_ACTIVATE, MD_OnActivate); + HANDLE_MSG(hwnd, WM_SETFOCUS, MD_OnSetFocus); + HANDLE_MSG(hwnd, WM_KILLFOCUS, MD_OnKillFocus); + HANDLE_MSG(hwnd, WM_ENABLE, MD_OnEnable); + HANDLE_MSG(hwnd, WM_SETREDRAW, MD_OnSetRedraw); + HANDLE_MSG(hwnd, WM_SETTEXT, MD_OnSetText); + HANDLE_MSG(hwnd, WM_GETTEXT, MD_OnGetText); + HANDLE_MSG(hwnd, WM_GETTEXTLENGTH, MD_OnGetTextLength); + HANDLE_MSG(hwnd, WM_PAINT, MD_OnPaint); + HANDLE_MSG(hwnd, WM_CLOSE, MD_OnClose); +#ifndef _WIN32_WCE + HANDLE_MSG(hwnd, WM_QUERYENDSESSION, MD_OnQueryEndSession); + HANDLE_MSG(hwnd, WM_QUERYOPEN, MD_OnQueryOpen); + HANDLE_MSG(hwnd, WM_ENDSESSION, MD_OnEndSession); +#endif + HANDLE_MSG(hwnd, WM_QUIT, MD_OnQuit); + HANDLE_MSG(hwnd, WM_ERASEBKGND, MD_OnEraseBkgnd); + HANDLE_MSG(hwnd, WM_SYSCOLORCHANGE, MD_OnSysColorChange); + HANDLE_MSG(hwnd, WM_SHOWWINDOW, MD_OnShowWindow); + HANDLE_MSG(hwnd, WM_WININICHANGE, MD_OnWinIniChange); + /*HANDLE_MSG(hwnd, WM_SETTINGCHANGE, MD_OnSettingChange);*/ + /* WM_SETTINGCHANGE duplicates WM_WININICHANGE */ + HANDLE_MSG(hwnd, WM_DEVMODECHANGE, MD_OnDevModeChange); + HANDLE_MSG(hwnd, WM_ACTIVATEAPP, MD_OnActivateApp); + HANDLE_MSG(hwnd, WM_FONTCHANGE, MD_OnFontChange); + HANDLE_MSG(hwnd, WM_TIMECHANGE, MD_OnTimeChange); + HANDLE_MSG(hwnd, WM_CANCELMODE, MD_OnCancelMode); + HANDLE_MSG(hwnd, WM_SETCURSOR, MD_OnSetCursor); + HANDLE_MSG(hwnd, WM_MOUSEACTIVATE, MD_OnMouseActivate); + HANDLE_MSG(hwnd, WM_CHILDACTIVATE, MD_OnChildActivate); + HANDLE_MSG(hwnd, WM_QUEUESYNC, MD_OnQueueSync); + HANDLE_MSG(hwnd, WM_GETMINMAXINFO, MD_OnGetMinMaxInfo); + HANDLE_MSG(hwnd, WM_PAINTICON, MD_OnPaintIcon); + HANDLE_MSG(hwnd, WM_ICONERASEBKGND, MD_OnIconEraseBkgnd); + HANDLE_MSG(hwnd, WM_NEXTDLGCTL, MD_OnNextDlgCtl); + HANDLE_MSG(hwnd, WM_SPOOLERSTATUS, MD_OnSpoolerStatus); + HANDLE_MSG(hwnd, WM_DRAWITEM, MD_OnDrawItem); + HANDLE_MSG(hwnd, WM_MEASUREITEM, MD_OnMeasureItem); + HANDLE_MSG(hwnd, WM_DELETEITEM, MD_OnDeleteItem); + HANDLE_MSG(hwnd, WM_VKEYTOITEM, MD_OnVkeyToItem); + HANDLE_MSG(hwnd, WM_CHARTOITEM, MD_OnCharToItem); + HANDLE_MSG(hwnd, WM_SETFONT, MD_OnSetFont); + HANDLE_MSG(hwnd, WM_GETFONT, MD_OnGetFont); + HANDLE_MSG(hwnd, WM_SETHOTKEY, MD_OnSetHotKey); + HANDLE_MSG(hwnd, WM_GETHOTKEY, MD_OnGetHotKey); + HANDLE_MSG(hwnd, WM_QUERYDRAGICON, MD_OnQueryDragIcon); + HANDLE_MSG(hwnd, WM_COMPAREITEM, MD_OnCompareItem); +#if WINVER >= 0x0500 +# ifndef _WIN32_WCE + HANDLE_MSG(hwnd, WM_GETOBJECT, MD_OnGetObject); +# endif +#endif + HANDLE_MSG(hwnd, WM_COMPACTING, MD_OnCompacting); + HANDLE_MSG(hwnd, WM_COMMNOTIFY, MD_OnCommNotify); + HANDLE_MSG(hwnd, WM_WINDOWPOSCHANGING, MD_OnWindowPosChanging); + HANDLE_MSG(hwnd, WM_WINDOWPOSCHANGED, MD_OnWindowPosChanged); + HANDLE_MSG(hwnd, WM_POWER, MD_OnPower); + HANDLE_MSG(hwnd, WM_COPYDATA, MD_OnCopyData); + HANDLE_MSG(hwnd, WM_CANCELJOURNAL, MD_OnCancelJournal); +#if WINVER >= 0x0400 + HANDLE_MSG(hwnd, WM_NOTIFY, MD_OnNotify); + HANDLE_MSG(hwnd, WM_INPUTLANGCHANGEREQUEST, MD_OnInputLangChangeRequest); + HANDLE_MSG(hwnd, WM_INPUTLANGCHANGE, MD_OnInputLangChange); + HANDLE_MSG(hwnd, WM_TCARD, MD_OnTCard); + HANDLE_MSG(hwnd, WM_HELP, MD_OnHelp); + HANDLE_MSG(hwnd, WM_USERCHANGED, MD_OnUserChanged); + HANDLE_MSG(hwnd, WM_NOTIFYFORMAT, MD_OnNotifyFormat); + HANDLE_MSG(hwnd, WM_CONTEXTMENU, MD_OnContextMenu); + HANDLE_MSG(hwnd, WM_STYLECHANGING, MD_OnStyleChanging); + HANDLE_MSG(hwnd, WM_STYLECHANGED, MD_OnStyleChanged); + HANDLE_MSG(hwnd, WM_DISPLAYCHANGE, MD_OnDisplayChange); + HANDLE_MSG(hwnd, WM_GETICON, MD_OnGetIcon); + HANDLE_MSG(hwnd, WM_SETICON, MD_OnSetIcon); +#endif + HANDLE_MSG(hwnd, WM_NCCREATE, MD_OnNCCreate); + HANDLE_MSG(hwnd, WM_NCDESTROY, MD_OnNCDestroy); + HANDLE_MSG(hwnd, WM_NCCALCSIZE, MD_OnNCCalcSize); + HANDLE_MSG(hwnd, WM_NCHITTEST, MD_OnNCHitTest); + HANDLE_MSG(hwnd, WM_NCPAINT, MD_OnNCPaint); + HANDLE_MSG(hwnd, WM_NCACTIVATE, MD_OnNCActivate); + HANDLE_MSG(hwnd, WM_GETDLGCODE, MD_OnGetDlgCode); +#ifndef _WIN32_WCE + HANDLE_MSG(hwnd, WM_SYNCPAINT, MD_OnSyncPaint); +#endif + HANDLE_MSG(hwnd, WM_NCMOUSEMOVE, MD_OnNCMouseMove); + HANDLE_MSG(hwnd, WM_NCLBUTTONDOWN, MD_OnNCLButtonDown); + HANDLE_MSG(hwnd, WM_NCLBUTTONUP, MD_OnNCLButtonUp); + HANDLE_MSG(hwnd, WM_NCLBUTTONDBLCLK, MD_OnNCLButtonDown); + HANDLE_MSG(hwnd, WM_NCRBUTTONDOWN, MD_OnNCRButtonDown); + HANDLE_MSG(hwnd, WM_NCRBUTTONUP, MD_OnNCRButtonUp); + HANDLE_MSG(hwnd, WM_NCRBUTTONDBLCLK, MD_OnNCRButtonDown); + HANDLE_MSG(hwnd, WM_NCMBUTTONDOWN, MD_OnNCMButtonDown); + HANDLE_MSG(hwnd, WM_NCMBUTTONUP, MD_OnNCMButtonUp); + HANDLE_MSG(hwnd, WM_NCMBUTTONDBLCLK, MD_OnNCMButtonDown); +#if _WIN32_WINNT >= 0x0500 + HANDLE_MSG(hwnd, WM_NCXBUTTONDOWN, MD_OnNCXButtonDown); + HANDLE_MSG(hwnd, WM_NCXBUTTONUP, MD_OnNCXButtonUp); + HANDLE_MSG(hwnd, WM_NCXBUTTONDBLCLK, MD_OnNCXButtonDown); +#endif + HANDLE_MSG(hwnd, WM_KEYDOWN, MD_OnKey); + HANDLE_MSG(hwnd, WM_KEYUP, MD_OnKey); + HANDLE_MSG(hwnd, WM_CHAR, MD_OnChar); + HANDLE_MSG(hwnd, WM_DEADCHAR, MD_OnDeadChar); + HANDLE_MSG(hwnd, WM_SYSKEYDOWN, MD_OnSysKey); + HANDLE_MSG(hwnd, WM_SYSKEYUP, MD_OnSysKey); + HANDLE_MSG(hwnd, WM_SYSCHAR, MD_OnSysChar); + HANDLE_MSG(hwnd, WM_SYSDEADCHAR, MD_OnSysDeadChar); +#if WINVER >= 0x0400 + HANDLE_MSG(hwnd, WM_IME_STARTCOMPOSITION, MD_OnImeStartComposition); + HANDLE_MSG(hwnd, WM_IME_ENDCOMPOSITION, MD_OnImeEndComposition); + HANDLE_MSG(hwnd, WM_IME_COMPOSITION, MD_OnImeComposition); +#endif + HANDLE_MSG(hwnd, WM_INITDIALOG, MD_OnInitDialog); + HANDLE_MSG(hwnd, WM_COMMAND, MD_OnCommand); + HANDLE_MSG(hwnd, WM_SYSCOMMAND, MD_OnSysCommand); + HANDLE_MSG(hwnd, WM_TIMER, MD_OnTimer); + HANDLE_MSG(hwnd, WM_HSCROLL, MD_OnHScroll); + HANDLE_MSG(hwnd, WM_VSCROLL, MD_OnVScroll); + HANDLE_MSG(hwnd, WM_INITMENU, MD_OnInitMenu); + HANDLE_MSG(hwnd, WM_INITMENUPOPUP, MD_OnInitMenuPopup); + HANDLE_MSG(hwnd, WM_MENUSELECT, MD_OnMenuSelect); + HANDLE_MSG(hwnd, WM_MENUCHAR, MD_OnMenuChar); + HANDLE_MSG(hwnd, WM_ENTERIDLE, MD_OnEnterIdle); +#if WINVER >= 0x0500 +# ifndef _WIN32_WCE + HANDLE_MSG(hwnd, WM_MENURBUTTONUP, MD_OnMenuRButtonUp); + HANDLE_MSG(hwnd, WM_MENUDRAG, MD_OnMenuDrag); + HANDLE_MSG(hwnd, WM_MENUGETOBJECT, MD_OnMenuGetObject); + HANDLE_MSG(hwnd, WM_UNINITMENUPOPUP, MD_OnUninitMenuPopup); + HANDLE_MSG(hwnd, WM_MENUCOMMAND, MD_OnMenuCommand); +# ifndef _WIN32_WCE +# if _WIN32_WINNT >= 0x0500 + HANDLE_MSG(hwnd, WM_CHANGEUISTATE, MD_OnChangeUIState); + HANDLE_MSG(hwnd, WM_UPDATEUISTATE, MD_OnUpdateUIState); + HANDLE_MSG(hwnd, WM_QUERYUISTATE, MD_OnQueryUIState); +# endif +# endif +# endif +#endif + HANDLE_MSG(hwnd, WM_CTLCOLORMSGBOX, MD_OnCtlColor); + HANDLE_MSG(hwnd, WM_CTLCOLOREDIT, MD_OnCtlColor); + HANDLE_MSG(hwnd, WM_CTLCOLORLISTBOX, MD_OnCtlColor); + HANDLE_MSG(hwnd, WM_CTLCOLORBTN, MD_OnCtlColor); + HANDLE_MSG(hwnd, WM_CTLCOLORDLG, MD_OnCtlColor); + HANDLE_MSG(hwnd, WM_CTLCOLORSCROLLBAR, MD_OnCtlColor); + HANDLE_MSG(hwnd, WM_CTLCOLORSTATIC, MD_OnCtlColor); + HANDLE_MSG(hwnd, WM_MOUSEMOVE, MD_OnMouseMove); + HANDLE_MSG(hwnd, WM_LBUTTONDOWN, MD_OnLButtonDown); + HANDLE_MSG(hwnd, WM_LBUTTONUP, MD_OnLButtonUp); + HANDLE_MSG(hwnd, WM_LBUTTONDBLCLK, MD_OnLButtonDown); + HANDLE_MSG(hwnd, WM_RBUTTONDOWN, MD_OnRButtonDown); + HANDLE_MSG(hwnd, WM_RBUTTONUP, MD_OnRButtonUp); + HANDLE_MSG(hwnd, WM_RBUTTONDBLCLK, MD_OnRButtonDown); + HANDLE_MSG(hwnd, WM_MBUTTONDOWN, MD_OnMButtonDown); + HANDLE_MSG(hwnd, WM_MBUTTONUP, MD_OnMButtonUp); + HANDLE_MSG(hwnd, WM_MBUTTONDBLCLK, MD_OnMButtonDown); +#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400) + HANDLE_MSG(hwnd, WM_MOUSEWHEEL, MD_OnMouseWheel); +#endif +#if _WIN32_WINNT >= 0x0500 + HANDLE_MSG(hwnd, WM_XBUTTONDOWN, MD_OnXButtonDown); + HANDLE_MSG(hwnd, WM_XBUTTONUP, MD_OnXButtonUp); + HANDLE_MSG(hwnd, WM_XBUTTONDBLCLK, MD_OnXButtonDown); +#endif + HANDLE_MSG(hwnd, WM_PARENTNOTIFY, MD_OnParentNotify); + HANDLE_MSG(hwnd, WM_ENTERMENULOOP, MD_OnEnterMenuLoop); + HANDLE_MSG(hwnd, WM_EXITMENULOOP, MD_OnExitMenuLoop); +#if WINVER >= 0x0400 + HANDLE_MSG(hwnd, WM_NEXTMENU, MD_OnNextMenu); + HANDLE_MSG(hwnd, WM_SIZING, MD_OnSizing); + HANDLE_MSG(hwnd, WM_CAPTURECHANGED, MD_OnCaptureChanged); + HANDLE_MSG(hwnd, WM_MOVING, MD_OnMoving); + HANDLE_MSG(hwnd, WM_POWERBROADCAST, MD_OnPowerBroadcast); + HANDLE_MSG(hwnd, WM_DEVICECHANGE, MD_OnDeviceChange); +#endif + HANDLE_MSG(hwnd, WM_MDICREATE, MD_MDICreate); + HANDLE_MSG(hwnd, WM_MDIDESTROY, MD_MDIDestroy); + HANDLE_MSG(hwnd, WM_MDIACTIVATE, MD_MDIActivate); + HANDLE_MSG(hwnd, WM_MDIRESTORE, MD_MDIRestore); + HANDLE_MSG(hwnd, WM_MDINEXT, MD_MDINext); + HANDLE_MSG(hwnd, WM_MDIMAXIMIZE, MD_MDIMaximize); + HANDLE_MSG(hwnd, WM_MDITILE, MD_MDITile); + HANDLE_MSG(hwnd, WM_MDICASCADE, MD_MDICascade); + HANDLE_MSG(hwnd, WM_MDIICONARRANGE, MD_MDIIconArrange); + HANDLE_MSG(hwnd, WM_MDIGETACTIVE, MD_MDIGetActive); + HANDLE_MSG(hwnd, WM_MDISETMENU, MD_MDISetMenu); + HANDLE_MSG(hwnd, WM_ENTERSIZEMOVE, MD_OnEnterSizeMove); + HANDLE_MSG(hwnd, WM_EXITSIZEMOVE, MD_OnExitSizeMove); + HANDLE_MSG(hwnd, WM_DROPFILES, MD_OnDropFiles); + HANDLE_MSG(hwnd, WM_MDIREFRESHMENU, MD_MDIRefreshMenu); +#if WINVER >= 0x0400 + HANDLE_MSG(hwnd, WM_IME_SETCONTEXT, MD_OnImeSetContext); + HANDLE_MSG(hwnd, WM_IME_NOTIFY, MD_OnImeNotify); + HANDLE_MSG(hwnd, WM_IME_CONTROL, MD_OnImeControl); + HANDLE_MSG(hwnd, WM_IME_COMPOSITIONFULL, MD_OnImeCompositionFull); + HANDLE_MSG(hwnd, WM_IME_SELECT, MD_OnImeSelect); + HANDLE_MSG(hwnd, WM_IME_CHAR, MD_OnImeChar); +#endif +#if WINVER >= 0x0500 + HANDLE_MSG(hwnd, WM_IME_REQUEST, MD_OnImeRequest); +#endif +#if WINVER >= 0x0400 + HANDLE_MSG(hwnd, WM_IME_KEYDOWN, MD_OnImeKey); + HANDLE_MSG(hwnd, WM_IME_KEYUP, MD_OnImeKey); +#endif +#if (_WIN32_WINNT >= 0x0400) || (WINVER >= 0x0500) + HANDLE_MSG(hwnd, WM_MOUSEHOVER, MD_OnMouseHover); + HANDLE_MSG(hwnd, WM_MOUSELEAVE, MD_OnMouseLeave); +#endif +#if WINVER >= 0x0500 + HANDLE_MSG(hwnd, WM_NCMOUSEHOVER, MD_OnNCMouseHover); + HANDLE_MSG(hwnd, WM_NCMOUSELEAVE, MD_OnNCMouseLeave); +#endif + HANDLE_MSG(hwnd, WM_CUT, MD_OnCut); + HANDLE_MSG(hwnd, WM_COPY, MD_OnCopy); + HANDLE_MSG(hwnd, WM_PASTE, MD_OnPaste); + HANDLE_MSG(hwnd, WM_CLEAR, MD_OnClear); + HANDLE_MSG(hwnd, WM_UNDO, MD_OnUndo); + HANDLE_MSG(hwnd, WM_RENDERFORMAT, MD_OnRenderFormat); + HANDLE_MSG(hwnd, WM_RENDERALLFORMATS, MD_OnRenderAllFormats); + HANDLE_MSG(hwnd, WM_DESTROYCLIPBOARD, MD_OnDestroyClipboard); + HANDLE_MSG(hwnd, WM_DRAWCLIPBOARD, MD_OnDrawClipboard); + HANDLE_MSG(hwnd, WM_PAINTCLIPBOARD, MD_OnPaintClipboard); + HANDLE_MSG(hwnd, WM_VSCROLLCLIPBOARD, MD_OnVScrollClipboard); + HANDLE_MSG(hwnd, WM_SIZECLIPBOARD, MD_OnSizeClipboard); + HANDLE_MSG(hwnd, WM_ASKCBFORMATNAME, MD_OnAskCBFormatName); + HANDLE_MSG(hwnd, WM_CHANGECBCHAIN, MD_OnChangeCBChain); + HANDLE_MSG(hwnd, WM_HSCROLLCLIPBOARD, MD_OnHScrollClipboard); + HANDLE_MSG(hwnd, WM_QUERYNEWPALETTE, MD_OnQueryNewPalette); + HANDLE_MSG(hwnd, WM_PALETTEISCHANGING, MD_OnPaletteIsChanging); + HANDLE_MSG(hwnd, WM_PALETTECHANGED, MD_OnPaletteChanged); + HANDLE_MSG(hwnd, WM_HOTKEY, MD_OnHotKey); +#if WINVER >= 0x0400 + HANDLE_MSG(hwnd, WM_PRINT, MD_OnPrint); + HANDLE_MSG(hwnd, WM_PRINTCLIENT, MD_OnPrintClient); +#endif +#if _WIN32_WINNT >= 0x0500 + HANDLE_MSG(hwnd, WM_APPCOMMAND, MD_OnAppCommand); +#endif + default: + { + if (WM_USER <= uMsg && uMsg <= 0x7FFF) + { + return MD_OnUser(hwnd, uMsg, wParam, lParam); + } + if (WM_APP <= uMsg && uMsg <= 0xBFFF) + { + return MD_OnApp(hwnd, uMsg, wParam, lParam); + } + return MD_OnUnknown(hwnd, uMsg, wParam, lParam); + } + } + return 0; +} + +#endif diff --git a/sdk/include/reactos/winxx.h b/sdk/include/reactos/winxx.h new file mode 100644 index 0000000000..650d37cce5 --- /dev/null +++ b/sdk/include/reactos/winxx.h @@ -0,0 +1,540 @@ +/* + * PROJECT: ReactOS header files + * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0.html) + * PURPOSE: An unofficial extension of <windowsx.h> + * COPYRIGHT: Copyright 2017-2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifndef _INC_WINXX +#define _INC_WINXX + +#pragma once + +#ifndef _INC_WINDOWS + #include <windows.h> +#endif +#ifndef _INC_WINDOWSX + #include <windowsx.h> +#endif +#ifndef _INC_COMMCTRL + #include <commctrl.h> +#endif + +/* additional message crackers */ + +/* void Cls_OnNull(HWND hwnd) */ +#ifndef HANDLE_WM_NULL +#define HANDLE_WM_NULL(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_NULL(hwnd, compactRatio, fn) \ + (void)((fn)((hwnd), WM_NULL, 0, 0L), 0L) +#endif + +/* INT Cls_OnSetHotKey(HWND hwnd, INT nCode, UINT nOptions) */ +#ifndef HANDLE_WM_SETHOTKEY +#define HANDLE_WM_SETHOTKEY(hwnd, wParam, lParam, fn) \ + (LRESULT)(INT)(fn)((hwnd), (INT)LOWORD(wParam), (UINT)HIWORD(wParam)) +#define FORWARD_WM_SETHOTKEY(hwnd, nCode, nOptions, fn) \ + (INT)(fn)((hwnd), WM_SETHOTKEY, MAKEWPARAM((nCode), (nOptions))) +#endif + +/* INT Cls_OnGetHotKey(HWND hwnd) */ +#ifndef HANDLE_WM_GETHOTKEY +#define HANDLE_WM_GETHOTKEY(hwnd, wParam, lParam, fn) \ + (LRESULT)(INT)(fn)((hwnd)) +#define FORWARD_WM_GETHOTKEY(hwnd, fn) \ + (INT)(fn)((hwnd), WM_GETHOTKEY, 0, 0L) +#endif + +/* void Cls_OnPaintIcon(HWND hwnd) */ +#ifndef HANDLE_WM_PAINTICON +#define HANDLE_WM_PAINTICON(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_PAINTICON(hwnd, fn) \ + (void)((fn)((hwnd), WM_PAINTICON, 0, 0L), 0L) +#endif + +/* LRESULT Cls_OnGetObject(HWND hwnd, WPARAM wParam, DWORD dwObjId) */ +#ifndef HANDLE_WM_GETOBJECT +#define HANDLE_WM_GETOBJECT(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (WPARAM)(wParam), (DWORD)(lParam)) +#define FORWARD_WM_GETOBJECT(hwnd, wParam, dwObjId, fn) \ + (fn)((hwnd), WM_GETOBJECT, (WPARAM)(wParam), (LPARAM)(DWORD)(dwObjId)) +#endif + +/* void Cls_OnCancelJournal(HWND hwnd) */ +#ifndef HANDLE_WM_CANCELJOURNAL +#define HANDLE_WM_CANCELJOURNAL(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_CANCELJOURNAL(hwnd, fn) \ + (void)((fn)((hwnd), WM_PAINTICON, 0, 0L), 0L) +#endif + +/* void Cls_OnInputLangChangeRequest(HWND hwnd, BOOL bFlag, HKL hKL) */ +#ifndef HANDLE_WM_INPUTLANGCHANGEREQUEST +#define HANDLE_WM_INPUTLANGCHANGEREQUEST(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (BOOL)(wParam), (HKL)(lParam)), 0L) +#define FORWARD_WM_INPUTLANGCHANGEREQUEST(hwnd, bFlag, hKL, fn) \ + (void)((fn)((hwnd), WM_INPUTLANGCHANGEREQUEST, (WPARAM)(BOOL)(bFlag), \ + (LPARAM)(HKL)(hKL)), 0L) +#endif + +/* void Cls_OnInputLangChange(HWND hwnd, DWORD dwCharSet, HKL hKL) */ +#ifndef HANDLE_WM_INPUTLANGCHANGE +#define HANDLE_WM_INPUTLANGCHANGE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (DWORD)(wParam), (HKL)(lParam)), 0L) +#define FORWARD_WM_INPUTLANGCHANGE(hwnd, dwCharSet, hKL, fn) \ + (void)((fn)((hwnd), WM_INPUTLANGCHANGE, (WPARAM)(DWORD)(dwCharSet), \ + (LPARAM)(HKL)(hKL)), 0L) +#endif + +/* void Cls_OnTCard(HWND hwnd, UINT idAction, DWORD dwActionData) */ +#ifndef HANDLE_WM_TCARD +#define HANDLE_WM_TCARD(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (DWORD)(lParam)), 0L) +#define FORWARD_WM_TCARD(hwnd, idAction, dwActionData, fn) \ + (void)((fn)((hwnd), WM_TCARD, (DWORD)(wParam), (DWORD)(lParam)), 0L) +#endif + +/* void Cls_OnHelp(HWND hwnd, LPHELPINFO lpHelpInfo) */ +#ifndef HANDLE_WM_HELP +#define HANDLE_WM_HELP(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (LPHELPINFO)(lParam)), 0L) +#define FORWARD_WM_HELP(hwnd, lpHelpInfo, fn) \ + (void)((fn)((hwnd), WM_HELP, 0, (LPARAM)(LPHELPINFO)(lpHelpInfo)), 0L) +#endif + +/* void Cls_OnUserChanged(HWND hwnd) */ +#ifndef HANDLE_WM_USERCHANGED +#define HANDLE_WM_USERCHANGED(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_USERCHANGED(hwnd, fn) \ + (void)((fn)((hwnd), WM_USERCHANGED, 0, 0L), 0L) +#endif + +/* INT Cls_OnNotifyFormat(HWND hwnd, HWND hwndTarget, INT nCommand) */ +#ifndef HANDLE_WM_NOTIFYFORMAT +#define HANDLE_WM_NOTIFYFORMAT(hwnd, wParam, lParam, fn) \ + (LRESULT)(INT)(fn)((hwnd), (HWND)(wParam), (INT)(lParam)) +#define FORWARD_WM_NOTIFYFORMAT(hwnd, hwndTarget, nCommand, fn) \ + (INT)(fn)((hwnd), WM_NOTIFYFORMAT, (WPARAM)(HWND)(hwndTarget), \ + (LPARAM)(INT)(nCommand)) +#endif + +/* void Cls_OnStyleChanging(HWND hwnd, UINT nStyleType, LPSTYLESTRUCT lpStyleStruct) */ +#ifndef HANDLE_WM_STYLECHANGING +#define HANDLE_WM_STYLECHANGING(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (LPSTYLESTRUCT)(lParam)), 0L) +#define FORWARD_WM_STYLECHANGING(hwnd, nStyleType, lpStyleStruct, fn) \ + (void)((fn)((hwnd), WM_STYLECHANGING, (WPARAM)(UINT)(nStyleType), \ + (LPARAM)(LPSTYLESTRUCT)(lpStyleStruct)), 0L) +#endif + +/* void Cls_OnStyleChanged(HWND hwnd, UINT nStyleType, const STYLESTRUCT *lpStyleStruct) */ +#ifndef HANDLE_WM_STYLECHANGED +#define HANDLE_WM_STYLECHANGED(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (const STYLESTRUCT *)(lParam)), 0L) +#define FORWARD_WM_STYLECHANGED(hwnd, nStyleType, lpStyleStruct, fn) \ + (void)((fn)((hwnd), WM_STYLECHANGED, (WPARAM)(UINT)(nStyleType), \ + (LPARAM)(const STYLESTRUCT *)(lpStyleStruct)), 0L) +#endif + +/* HICON Cls_OnGetIcon(HWND hwnd, UINT nType, LPARAM dpi) */ +#ifndef HANDLE_WM_GETICON +#define HANDLE_WM_GETICON(hwnd, wParam, lParam, fn) \ + (LRESULT)(HICON)(fn)((hwnd), (INT)(wParam), (LPARAM)(lParam)) +#define FORWARD_WM_GETICON(hwnd, nType, dpi, fn) \ + (HICON)(fn)((hwnd), WM_GETICON, (WPARAM)(UINT)(nType), (LPARAM)(dpi)) +#endif + +/* HICON Cls_OnSetIcon(HWND hwnd, UINT nType, HICON hIcon) */ +#ifndef HANDLE_WM_SETICON +#define HANDLE_WM_SETICON(hwnd, wParam, lParam, fn) \ + (LRESULT)(HICON)(fn)((hwnd), (INT)(wParam), (HICON)(lParam)) +#define FORWARD_WM_SETICON(hwnd, nType, hIcon, fn) \ + (HICON)(fn)((hwnd), WM_SETICON, (WPARAM)(UINT)(nType), (LPARAM)(HICON)(hIcon)) +#endif + +/* void Cls_OnSyncPaint(HWND hwnd) */ +#ifndef HANDLE_WM_SYNCPAINT +#define HANDLE_WM_SYNCPAINT(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_SYNCPAINT(hwnd, fn) \ + (void)((fn)((hwnd), WM_SYNCPAINT, 0, 0L), 0L) +#endif + +/* void Cls_OnNCXButtonDown(HWND hwnd, BOOL fDoubleClick, UINT nHitTest, + WORD fwButton, INT xPos, INT yPos) */ +#ifndef HANDLE_WM_NCXBUTTONDOWN +#define HANDLE_WM_NCXBUTTONDOWN(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), FALSE, GET_NCHITTEST_WPARAM(wParam), GET_XBUTTON_WPARAM(wParam), \ + GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), TRUE) +#define HANDLE_WM_NCXBUTTONDBLCLK(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), TRUE, GET_NCHITTEST_WPARAM(wParam), GET_XBUTTON_WPARAM(wParam), \ + GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), TRUE) +#define FORWARD_WM_NCXBUTTONDOWN(hwnd, fDoubleClick, nHitTest, fwButton, xPos, yPos, fn) \ + (void)((fn)((hwnd), ((fDoubleClick) ? WM_NCXBUTTONDBLCLK : WM_NCXBUTTONDOWN), \ + MAKEWPARAM((nHitTest), (fwButton)), MAKELPARAM((xPos), (yPos))), 0L) +#endif + +/* void Cls_OnNCXButtonUp(HWND hwnd, UINT nHitTest, WORD fwButton, INT xPos, INT yPos) */ +#ifndef HANDLE_WM_NCXBUTTONUP +#define HANDLE_WM_NCXBUTTONUP(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), GET_NCHITTEST_WPARAM(wParam), GET_XBUTTON_WPARAM(wParam), \ + GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), TRUE) +#define FORWARD_WM_NCXBUTTONUP(hwnd, nHitTest, fwButton, xPos, yPos, fn) \ + (void)((fn)((hwnd), WM_NCXBUTTONUP, MAKEWPARAM((nHitTest), (fwButton)), \ + MAKELPARAM((xPos), (yPos))), 0L) +#endif + +/* void Cls_OnImeStartComposition(HWND hwnd) */ +#ifndef HANDLE_WM_IME_STARTCOMPOSITION +#define HANDLE_WM_IME_STARTCOMPOSITION(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_IME_STARTCOMPOSITION(hwnd, fn) \ + (void)((fn)((hwnd), WM_IME_STARTCOMPOSITION, 0, 0L), 0L) +#endif + +/* void Cls_OnImeEndComposition(HWND hwnd) */ +#ifndef HANDLE_WM_IME_ENDCOMPOSITION +#define HANDLE_WM_IME_ENDCOMPOSITION(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_IME_ENDCOMPOSITION(hwnd, fn) \ + (void)((fn)((hwnd), WM_IME_ENDCOMPOSITION, 0, 0L), 0L) +#endif + +/* void Cls_OnImeComposition(HWND hwnd, WORD wChar, DWORD lAttribute) */ +#ifndef HANDLE_WM_IME_COMPOSITION +#define HANDLE_WM_IME_COMPOSITION(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (WORD)(wParam), (DWORD)(lParam)), 0L) +#define FORWARD_WM_IME_COMPOSITION(hwnd, wChar, lAttribute, fn) \ + (void)((fn)((hwnd), WM_IME_COMPOSITION, (WPARAM)(WORD)(wChar), (DWORD)(lAttribute)), 0L) +#endif + +/* void Cls_OnMenuRButtonUp(HWND hwnd, UINT nPos, HMENU hMenu) */ +#ifndef HANDLE_WM_MENURBUTTONUP +#define HANDLE_WM_MENURBUTTONUP(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (HMENU)(lParam)), 0L) +#define FORWARD_WM_MENURBUTTONUP(hwnd, nPos, hMenu, fn) \ + (void)((fn)((hwnd), WM_MENURBUTTONUP, (WPARAM)(UINT)(nPos), (LPARAM)(HMENU)(hMenu)), 0L) +#endif + +/* UINT Cls_OnMenuDrag(HWND hwnd, UINT nPos, HMENU hMenu) */ +#ifndef HANDLE_WM_MENUDRAG +#define HANDLE_WM_MENUDRAG(hwnd, wParam, lParam, fn) \ + (LRESULT)(UINT)(fn)((hwnd), (UINT)(wParam), (HMENU)(lParam)) +#define FORWARD_WM_MENUDRAG(hwnd, nPos, hMenu, fn) \ + (UINT)(fn)((hwnd), WM_MENUDRAG, (WPARAM)(UINT)(nPos), (LPARAM)(HMENU)(hMenu)) +#endif + +/* UINT Cls_OnMenuGetObject(HWND hwnd, MENUGETOBJECTINFO *pmgoi) */ +#ifndef HANDLE_WM_MENUGETOBJECT +#define HANDLE_WM_MENUGETOBJECT(hwnd, wParam, lParam, fn) \ + (LRESULT)(UINT)(fn)((hwnd), (MENUGETOBJECTINFO *)(lParam)) +#define FORWARD_WM_MENUGETOBJECT(hwnd, pmgoi, fn) \ + (UINT)(fn)((hwnd), WM_MENUGETOBJECT, 0, (LPARAM)(MENUGETOBJECTINFO *)(pmgoi)) +#endif + +/* void Cls_OnUninitMenuPopup(HWND hwnd, HMENU hMenu, UINT nFlags) */ +#ifndef HANDLE_WM_UNINITMENUPOPUP +#define HANDLE_WM_UNINITMENUPOPUP(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (HMENU)(wParam), (UINT)(lParam)), 0L) +#define FORWARD_WM_UNINITMENUPOPUP(hwnd, hMenu, nFlags, fn) \ + (void)((fn)((hwnd), WM_UNINITMENUPOPUP, (WPARAM)(HMENU)(hMenu), \ + (LPARAM)(UINT)(nFlags)), 0L) +#endif + +/* void Cls_OnMenuCommand(HWND hwnd, UINT nPos, HMENU hMenu) */ +#ifndef HANDLE_WM_MENUCOMMAND +#define HANDLE_WM_MENUCOMMAND(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (HMENU)(lParam)), 0L) +#define FORWARD_WM_MENUCOMMAND(hwnd, nPos, hMenu, fn) \ + (void)((fn)((hwnd), WM_MENURBUTTONUP, (WPARAM)(UINT)(nPos), \ + (LPARAM)(HMENU)(hMenu)), 0L) +#endif + +/* void Cls_OnChangeUIState(HWND hwnd, UINT nAction, UINT nUIElement) */ +#ifndef HANDLE_WM_CHANGEUISTATE +#define HANDLE_WM_CHANGEUISTATE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)LOWORD(wParam), (UINT)HIWORD(wParam)), 0L) +#define FORWARD_WM_CHANGEUISTATE(hwnd, nAction, nUIElement, fn) \ + (void)((fn)((hwnd), WM_CHANGEUISTATE, MAKEWPARAM((nAction), (nUIElement)), 0L), 0L) +#endif + +/* void Cls_OnUpdateUIState(HWND hwnd, UINT nAction, UINT nUIElement) */ +#ifndef HANDLE_WM_UPDATEUISTATE +#define HANDLE_WM_UPDATEUISTATE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)LOWORD(wParam), (UINT)HIWORD(wParam)), 0L) +#define FORWARD_WM_UPDATEUISTATE(hwnd, nAction, nUIElement, fn) \ + (void)((fn)((hwnd), WM_UPDATEUISTATE, MAKEWPARAM((nAction), (nUIElement)), 0L), 0L) +#endif + +/* UINT Cls_OnQueryUIState(HWND hwnd) */ +#ifndef HANDLE_WM_QUERYUISTATE +#define HANDLE_WM_QUERYUISTATE(hwnd, wParam, lParam, fn) \ + (LRESULT)(UINT)(fn)((hwnd)) +#define FORWARD_WM_QUERYUISTATE(hwnd, fn) \ + (UINT)(fn)((hwnd), WM_QUERYUISTATE, 0, 0L) +#endif + +/* void Cls_OnXButtonDown(HWND hwnd, BOOL fDoubleClick, WORD fwKeys, + WORD fwButton, INT xPos, INT yPos) */ +#ifndef HANDLE_WM_XBUTTONDOWN +#define HANDLE_WM_XBUTTONDOWN(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), FALSE, GET_KEYSTATE_WPARAM(wParam), GET_XBUTTON_WPARAM(wParam), \ + GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), TRUE) +#define HANDLE_WM_XBUTTONDBLCLK(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), TRUE, GET_KEYSTATE_WPARAM(wParam), GET_XBUTTON_WPARAM(wParam), \ + GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), TRUE) +#define FORWARD_WM_XBUTTONDOWN(hwnd, fDoubleClick, fwKeys, fwButton, xPos, yPos, fn) \ + (void)((fn)((hwnd), ((fDoubleClick) ? WM_XBUTTONDBLCLK : WM_XBUTTONDOWN), \ + MAKEWPARAM((fwKeys), (fwButton)), MAKELPARAM((xPos), (yPos))), 0L) +#endif + +/* void Cls_OnXButtonUp(HWND hwnd, WORD fwKeys, WORD fwButton, INT xPos, INT yPos) */ +#ifndef HANDLE_WM_XBUTTONUP +#define HANDLE_WM_XBUTTONUP(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), GET_KEYSTATE_WPARAM(wParam), GET_XBUTTON_WPARAM(wParam), \ + GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), TRUE) +#define FORWARD_WM_XBUTTONUP(hwnd, fDoubleClick, fwKeys, fwButton, xPos, yPos, fn) \ + (void)((fn)((hwnd), WM_XBUTTONUP, MAKEWPARAM((fwKeys), (fwButton)), \ + MAKELPARAM((xPos), (yPos))), 0L) +#endif + +/* void Cls_OnEnterMenuLoop(HWND hwnd, BOOL bIsTrackPopupMenu) */ +#ifndef HANDLE_WM_ENTERMENULOOP +#define HANDLE_WM_ENTERMENULOOP(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (BOOL)(wParam)), 0L) +#define FORWARD_WM_ENTERMENULOOP(hwnd, bIsTrackPopupMenu, fn) \ + (void)((fn)((hwnd), WM_ENTERMENULOOP, (BOOL)(bIsTrackPopupMenu), 0L), 0L) +#endif + +/* void Cls_OnExitMenuLoop(HWND hwnd, BOOL bIsTrackPopupMenu) */ +#ifndef HANDLE_WM_EXITMENULOOP +#define HANDLE_WM_EXITMENULOOP(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (BOOL)(wParam)), 0L) +#define FORWARD_WM_EXITMENULOOP(hwnd, bIsTrackPopupMenu, fn) \ + (void)((fn)((hwnd), WM_EXITMENULOOP, (BOOL)(bIsTrackPopupMenu), 0L), 0L) +#endif + +/* void Cls_OnNextMenu(HWND hwnd, INT nCode, LPMDINEXTMENU lpMDINextMenu) */ +#ifndef HANDLE_WM_NEXTMENU +#define HANDLE_WM_NEXTMENU(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (INT)(wParam), (LPMDINEXTMENU)(lParam)), 0L) +#define FORWARD_WM_NEXTMENU(hwnd, nCode, lpMDINextMenu, fn) \ + (void)((fn)((hwnd), WM_NEXTMENU, (WPARAM)(INT)(nCode), \ + (LPARAM)(LPMDINEXTMENU)(lpMDINextMenu)), 0L) +#endif + +/* void Cls_OnSizing(HWND hwnd, UINT nSide, LPRECT lpRect) */ +#ifndef HANDLE_WM_SIZING +#define HANDLE_WM_SIZING(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (LPRECT)(lParam)), 0L) +#define FORWARD_WM_SIZING(hwnd, nSide, lpRect, fn) \ + (void)((fn)((hwnd), WM_SIZING, (WPARAM)(UINT)(nSide), (LPARAM)(LPRECT)(lpRect)), 0L) +#endif + +/* void Cls_OnCaptureChanged(HWND hwnd, HWND hwndNewCapture) */ +#ifndef HANDLE_WM_CAPTURECHANGED +#define HANDLE_WM_CAPTURECHANGED(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (HWND)(lParam)), 0L) +#define FORWARD_WM_CAPTURECHANGED(hwnd, hwndNewCapture, fn) \ + (void)((fn)((hwnd), WM_CAPTURECHANGED, 0, (LPARAM)(HWND)(hwndNewCapture)), 0L) +#endif + +/* void Cls_OnMoving(HWND hwnd, UINT nSide, LPRECT lpRect) */ +#ifndef HANDLE_WM_MOVING +#define HANDLE_WM_MOVING(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), (LPRECT)(lParam)), 0L) +#define FORWARD_WM_MOVING(hwnd, nSide, lpRect, fn) \ + (void)((fn)((hwnd), WM_MOVING, (WPARAM)(UINT)(nSide), (LPARAM)(LPRECT)(lpRect)), 0L) +#endif + +/* LRESULT Cls_OnPowerBroadcast(HWND hwnd, UINT nPowerEvent, UINT nEventData) */ +#ifndef HANDLE_WM_POWERBROADCAST +#define HANDLE_WM_POWERBROADCAST(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (UINT)(wParam), (UINT)(lParam)) +#define FORWARD_WM_POWERBROADCAST(hwnd, nPowerEvent, nEventData, fn) \ + (LRESULT)(fn)((hwnd), WM_POWERBROADCAST, (WPARAM)(UINT)(nPowerEvent), \ + (LPARAM)(UINT)(nEventData)) +#endif + +/* HMENU Cls_MDIRefreshMenu(HWND hwnd) */ +#ifndef HANDLE_WM_MDIREFRESHMENU +#define HANDLE_WM_MDIREFRESHMENU(hwnd, wParam, lParam, fn) \ + (LRESULT)(HMENU)(fn)((hwnd)) +#define FORWARD_WM_MDIREFRESHMENU(hwnd, fn) \ + (HMENU)(fn)((hwnd), WM_MDIREFRESHMENU, 0, 0L) +#endif + +/* BOOL Cls_OnImeSetContext(HWND hwnd, BOOL fActive, DWORD dwShow) */ +#ifndef HANDLE_WM_IME_SETCONTEXT +#define HANDLE_WM_IME_SETCONTEXT(hwnd, wParam, lParam, fn) \ + (LRESULT)(BOOL)(fn)((hwnd), (BOOL)(wParam), (DWORD)(lParam)) +#define FORWARD_WM_IME_SETCONTEXT(hwnd, fActive, dwShow, fn) \ + (BOOL)(fn)((hwnd), WM_IME_SETCONTEXT, (WPARAM)(BOOL)(fActive), (LPARAM)(DWORD)(dwShow)) +#endif + +/* LRESULT Cls_OnImeNotify(HWND hwnd, WPARAM wSubMessage, LPARAM lParam) */ +#ifndef HANDLE_WM_IME_NOTIFY +#define HANDLE_WM_IME_NOTIFY(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (WPARAM)(wParam), (LPARAM)(lParam)) +#define FORWARD_WM_IME_NOTIFY(hwnd, wSubMessage, lParam, fn) \ + (LRESULT)(fn)((hwnd), WM_IME_NOTIFY, (WPARAM)(wSubMessage), (LPARAM)(lParam)) +#endif + +/* LRESULT Cls_OnImeControl(HWND hwnd, WPARAM wSubMessage, LPVOID lpData) */ +#ifndef HANDLE_WM_IME_CONTROL +#define HANDLE_WM_IME_CONTROL(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (WPARAM)(wParam), (LPVOID)(lParam)) +#define FORWARD_WM_IME_CONTROL(hwnd, wSubMessage, lpData, fn) \ + (LRESULT)(fn)((hwnd), WM_IME_CONTROL, (WPARAM)(wSubMessage), (LPARAM)(LPVOID)(lpData)) +#endif + +/* void Cls_OnImeCompositionFull(HWND hwnd) */ +#ifndef HANDLE_WM_IME_COMPOSITIONFULL +#define HANDLE_WM_IME_COMPOSITIONFULL(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_IME_COMPOSITIONFULL(hwnd, compactRatio, fn) \ + (void)((fn)((hwnd), WM_IME_COMPOSITIONFULL, 0, 0L), 0L) +#endif + +/* void Cls_OnImeSelect(HWND hwnd, BOOL fSelect, HKL hKL) */ +#ifndef HANDLE_WM_IME_SELECT +#define HANDLE_WM_IME_SELECT(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (BOOL)(wParam), (HKL)(lParam)), 0L) +#define FORWARD_WM_IME_SELECT(hwnd, fSelect, hKL, fn) \ + (void)((fn)((hwnd), WM_IME_SELECT, (WPARAM)(BOOL)(fSelect), (LPARAM)(HKL)(hKL)), 0L) +#endif + +/* void Cls_OnImeChar(HWND hwnd, WORD wCharCode, LONG lKeyData) */ +#ifndef HANDLE_WM_IME_CHAR +#define HANDLE_WM_IME_CHAR(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (WORD)(wParam), (LONG)(lParam)), 0L) +#define FORWARD_WM_IME_CHAR(hwnd, wCharCode, lKeyData, fn) \ + (void)((fn)((hwnd), WM_IME_CHAR, (WPARAM)(WORD)(wCharCode), (LPARAM)(LONG)(lKeyData)), 0L) +#endif + +/* LRESULT Cls_OnImeRequest(HWND hwnd, WPARAM wParam, LPARAM lParam) */ +#ifndef HANDLE_WM_IME_REQUEST +#define HANDLE_WM_IME_REQUEST(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (WPARAM)(wParam), (LPARAM)(lParam)) +#define FORWARD_WM_IME_REQUEST(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), WM_IME_REQUEST, (WPARAM)(wParam), (LPARAM)(lParam)) +#endif + +/* void Cls_OnImeKey(HWND hwnd, BOOL fDown, UINT nVirtKey, LONG lKeyData) */ +#ifndef HANDLE_WM_IME_KEYDOWN +#define HANDLE_WM_IME_KEYDOWN(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), TRUE, (WORD)(wParam), (LONG)(lParam)), 0L) +#define FORWARD_WM_IME_KEYDOWN(hwnd, fDown, nVirtKey, lKeyData, fn) \ + (void)((fn)((hwnd), ((BOOL)(fDown) ? WM_IME_KEYDOWN : WM_IME_KEYUP), \ + (WPARAM)(UINT)(nVirtKey), (LPARAM)(LONG)(lKeyData)), 0L) +#define HANDLE_WM_IME_KEYUP(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), FALSE, (WORD)(wParam), (LONG)(lParam)), 0L) +#define FORWARD_WM_IME_KEYUP(hwnd, fDown, nVirtKey, lKeyData, fn) \ + (void)((fn)((hwnd), ((BOOL)(fDown) ? WM_IME_KEYDOWN : WM_IME_KEYUP), \ + (WPARAM)(UINT)(nVirtKey), (LPARAM)(LONG)(lKeyData)), 0L) +#endif + +/* void Cls_OnMouseHover(HWND hwnd, UINT nFlags, INT xPos, INT yPos) */ +#ifndef HANDLE_WM_MOUSEHOVER +#define HANDLE_WM_MOUSEHOVER(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (UINT)(wParam), GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), 0L) +#define FORWARD_WM_MOUSEHOVER(hwnd, nFlags, xPos, yPos, fn) \ + (void)((fn)((hwnd), WM_MOUSEHOVER, (WPARAM)(UINT)(nFlags), \ + MAKELPARAM((xPos), (yPos))), 0L) +#endif + +/* void Cls_OnMouseLeave(HWND hwnd) */ +#ifndef HANDLE_WM_MOUSELEAVE +#define HANDLE_WM_MOUSELEAVE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_MOUSELEAVE(hwnd, fn) \ + (void)((fn)((hwnd), WM_MOUSELEAVE, 0, 0L), 0L) +#endif + +/* void Cls_OnNCMouseHover(HWND hwnd, UINT nHitTest, INT xPos, INT yPos) */ +#ifndef HANDLE_WM_NCMOUSEHOVER +#define HANDLE_WM_NCMOUSEHOVER(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (INT)(wParam), GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), 0L) +#define FORWARD_WM_NCMOUSEHOVER(hwnd, nHitTest, xPos, yPos, fn) \ + (void)((fn)((hwnd), WM_NCMOUSEHOVER, (WPARAM)(UINT)(nHitTest), \ + MAKELPARAM((xPos), (yPos))), 0L) +#endif + +/* void Cls_OnNCMouseLeave(HWND hwnd) */ +#ifndef HANDLE_WM_NCMOUSELEAVE +#define HANDLE_WM_NCMOUSELEAVE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_NCMOUSELEAVE(hwnd, fn) \ + (void)((fn)((hwnd), WM_NCMOUSELEAVE, 0, 0L), 0L) +#endif + +/* void Cls_OnPrint(HWND hwnd, HDC hDC, UINT uFlags) */ +#ifndef HANDLE_WM_PRINT +#define HANDLE_WM_PRINT(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (HDC)(wParam), (UINT)(lParam)), 0L) +#define FORWARD_WM_PRINT(hwnd, hDC, uFlags, fn) \ + (void)((fn)((hwnd), WM_PRINT, (WPARAM)(HDC)(hDC), (LPARAM)(uFlags)), 0L) +#endif + +/* void Cls_OnPrintClient(HWND hwnd, HDC hDC, UINT uFlags) */ +#ifndef HANDLE_WM_PRINTCLIENT +#define HANDLE_WM_PRINTCLIENT(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd), (HDC)(wParam), (UINT)(lParam)), 0L) +#define FORWARD_WM_PRINTCLIENT(hwnd, hDC, uFlags, fn) \ + (void)((fn)((hwnd), WM_PRINTCLIENT, (WPARAM)(HDC)(hDC), (LPARAM)(uFlags)), 0L) +#endif + +/* BOOL Cls_OnAppCommand(HWND hwnd, HWND hwndTarget, UINT cmd, UINT nDevice, UINT nKey) */ +#ifndef HANDLE_WM_APPCOMMAND +#define HANDLE_WM_APPCOMMAND(hwnd, wParam, lParam, fn) \ + (LRESULT)(BOOL)(fn)((hwnd), (HWND)(wParam), GET_APPCOMMAND_LPARAM(lParam), \ + GET_DEVICE_LPARAM(lParam), GET_KEYSTATE_LPARAM(lParam)) +#define FORWARD_WM_APPCOMMAND(hwnd, hwndTarget, cmd, nDevice, nKey, fn) \ + (BOOL)(fn)((hwnd), WM_APPCOMMAND, (WPARAM)(hwndTarget), \ + MAKELPARAM((nKey), ((WORD)(cmd)) | (UINT)(nDevice))) +#endif + +/* void Cls_OnEnterSizeMove(HWND hwnd) */ +#ifndef HANDLE_WM_ENTERSIZEMOVE +#define HANDLE_WM_ENTERSIZEMOVE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_ENTERSIZEMOVE(hwnd, fn) \ + (void)((fn)((hwnd), WM_ENTERSIZEMOVE, 0, 0L), 0L) +#endif + +/* void Cls_OnExitSizeMove(HWND hwnd) */ +#ifndef HANDLE_WM_EXITSIZEMOVE +#define HANDLE_WM_EXITSIZEMOVE(hwnd, wParam, lParam, fn) \ + ((fn)((hwnd)), 0L) +#define FORWARD_WM_EXITSIZEMOVE(hwnd, fn) \ + (void)((fn)((hwnd), WM_EXITSIZEMOVE, 0, 0L), 0L) +#endif + +/* HICON Cls_OnQueryDragIcon(HWND hwnd) */ +#undef HANDLE_WM_QUERYDRAGICON +#define HANDLE_WM_QUERYDRAGICON(hwnd, wParam, lParam, fn) \ + (LRESULT)(DWORD)(UINT)(UINT_PTR)(fn)(hwnd) +#undef FORWARD_WM_QUERYDRAGICON +#define FORWARD_WM_QUERYDRAGICON(hwnd, fn) \ + (HICON)(UINT_PTR)(UINT)(DWORD)(fn)((hwnd), WM_QUERYDRAGICON, 0L, 0L) + +/* HWND Cls_MDICreate(HWND hwnd, const LPMDICREATESTRUCT lpmcs) */ +#undef HANDLE_WM_MDICREATE +#define HANDLE_WM_MDICREATE(hwnd, wParam, lParam, fn) \ + (LRESULT)(DWORD)(UINT)(UINT_PTR)(fn)((hwnd), (LPMDICREATESTRUCT)(lParam)) +#undef FORWARD_WM_MDICREATE +#define FORWARD_WM_MDICREATE(hwnd, lpmcs, fn) \ + (HWND)(UINT_PTR)(fn)((hwnd), WM_MDICREATE, 0L, (LPARAM)(LPMDICREATESTRUCT)(lpmcs)) + +/* BOOL Cls_OnNCActivate(HWND hwnd, BOOL fActive, HWND hwndActDeact, BOOL fMinimized) */ +#undef HANDLE_WM_NCACTIVATE +#define HANDLE_WM_NCACTIVATE(hwnd, wParam, lParam, fn) \ + (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (BOOL)(wParam), 0L, 0L) +#undef FORWARD_WM_NCACTIVATE +#define FORWARD_WM_NCACTIVATE(hwnd, fActive, hwndActDeact, fMinimized, fn) \ + (BOOL)(DWORD)(fn)((hwnd), WM_NCACTIVATE, (WPARAM)(BOOL)(fActive), 0L) + +#endif

6 years, 1 month

01/01: [SHELL32] Fix CORE-15295, wrong edit width in IDD_FILE_PROPERTIES for all langs

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04e1263921c0a4ee9b5ec… commit 04e1263921c0a4ee9b5ec10bb02884146fcca47a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Nov 7 01:40:53 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Nov 7 01:40:53 2018 +0100 [SHELL32] Fix CORE-15295, wrong edit width in IDD_FILE_PROPERTIES for all langs --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index d92e908455..c51abaae11 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -260,7 +260,7 @@ BEGIN LTEXT "Отваряне с:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "C&hange...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Местоположение:", 14008, 8, 75, 61, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 70c550ec67..3ea4937062 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 9dd457b67b..64af9cb69d 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -265,7 +265,7 @@ BEGIN LTEXT "Otevírat v:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Změnit...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Umístění:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 4aaf1f3997..ff7c561956 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -265,7 +265,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index c5051027dd..384e0d54bc 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Öffnen mit:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Ändern...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Pfad:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 9fad4f6752..4ab460fcf4 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Ανοίγει με:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Θέση:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 7580deaa7a..3740ad025c 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 0af93f1f2c..54d508cb35 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -260,7 +260,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index a9af601531..7f0fbe07b5 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -267,7 +267,7 @@ BEGIN LTEXT "Se abre con:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Cambiar...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Ubicación:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index e55068ef9d..76d562323e 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -267,7 +267,7 @@ BEGIN LTEXT "Ava programmiga:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Muuda...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Asukoht:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index c26f324d1c..e87eda964d 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index d3de987465..9dbfbb1b9f 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Changer...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Localisation :", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 8904340619..f99fb8203a 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "נפתח באמצעות:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "שי&נוי...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "מיקום:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 41f67c32a7..4934e978b3 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index a86e349621..bbbf2c6ed4 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Apri con:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Modifica...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Posizione:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index dd7b0a7e14..6f0129b1c5 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "実行プログラム:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "変更(&C)...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "場所:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index fa24d55a30..67e88701b8 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 387541fa42..2947cfeb97 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 5f70d98772..472e8cb53d 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Åpne med:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Lokalisjon:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 08131b2619..32376d0aa5 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -265,7 +265,7 @@ BEGIN LTEXT "Otwierany za pomocą:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Zmień...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Lokalizacja:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index fd9d8bfa82..c350d0eef4 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Abre com:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Modificar...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Local:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 67787e74fa..4af373ceeb 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Abre com::", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Localização:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index e72c04b345..31971c0bff 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -261,7 +261,7 @@ BEGIN LTEXT "Va fi deschis cu:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "Spe&cificare…", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Locație:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index b34cf139a3..aa5b2ff15c 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -266,7 +266,7 @@ BEGIN LTEXT "Приложение:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Изменить...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Размещение:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 345315be8f..23c3e2ca30 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Otvoriť programom:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Umiestnenie:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 0d9f4c8f43..363635bb2b 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 0ff880ccb5..593c10c701 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -263,7 +263,7 @@ BEGIN LTEXT "Hap me:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Ndrysho...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Vendndodhje:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 7eff83fef4..6e8b254961 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Öppna med:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Ändra...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Plats:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 5c992270b9..5208a824c8 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -261,7 +261,7 @@ BEGIN LTEXT "Birlikte Açılır:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Değiştir...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Konum:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 96fd94e59c..02e7dc25fc 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -259,7 +259,7 @@ BEGIN LTEXT "Додаток:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Розташування:", 14008, 8, 75, 50, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 00c6a6ab9d..68bdb542f5 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -269,7 +269,7 @@ BEGIN LTEXT "打开方式:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "更改...(&C)", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "地点:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index bdb8fe1e20..2b4800b8c8 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -267,7 +267,7 @@ BEGIN LTEXT "Opens with:", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - EDITTEXT 14007, 58, 53, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14007, 58, 53, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Location:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP

6 years, 1 month

01/01: [NETSHELL] Add missing interface stubs to CNetworkConnections (aka CConnectionFolder).

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f26513f942138bd3374bd… commit f26513f942138bd3374bda6503621ac40bcd54e0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Nov 6 22:23:08 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Nov 6 22:23:45 2018 +0100 [NETSHELL] Add missing interface stubs to CNetworkConnections (aka CConnectionFolder). --- dll/shellext/netshell/shfldr_netconnect.cpp | 70 ++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 12 deletions(-) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index e168e132fa..d293edb73e 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -28,7 +28,10 @@ class CNetworkConnections final : public IPersistFolder2, + public IShellExtInit, public IShellFolder2, + public IOleCommandTarget, + public IShellFolderViewCB, public IShellExecuteHookW { public: @@ -39,6 +42,11 @@ class CNetworkConnections final : virtual ULONG WINAPI AddRef(); virtual ULONG WINAPI Release(); + // IPersistFolder2 + virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl); + // IShellFolder virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); @@ -51,7 +59,7 @@ class CNetworkConnections final : virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); - /* IShellFolder2 */ + // IShellFolder2 virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); @@ -60,10 +68,15 @@ class CNetworkConnections final : virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); - // IPersistFolder2 - virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); - virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); - virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl); + // IShellExtInit + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); + + // IOleCommandTarget + virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); + + // IShellFolderViewCB + virtual HRESULT WINAPI MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); // IShellExecuteHookW virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOW pei); @@ -181,6 +194,18 @@ HRESULT WINAPI CNetworkConnections::QueryInterface(REFIID riid, LPVOID *ppvObj) { *ppvObj = static_cast<IShellFolder2*>(this); } + else if (IsEqualIID(riid, IID_IShellExtInit)) + { + *ppvObj = static_cast<IShellExtInit*>(this); + } + else if (IsEqualIID(riid, IID_IOleCommandTarget)) + { + *ppvObj = static_cast<IOleCommandTarget*>(this); + } + else if (IsEqualIID(riid, IID_IShellFolderViewCB)) + { + *ppvObj = static_cast<IShellFolderViewCB*>(this); + } else if (IsEqualIID(riid, IID_IShellExecuteHookW)) { *ppvObj = static_cast<IShellExecuteHookW*>(this); @@ -192,12 +217,6 @@ HRESULT WINAPI CNetworkConnections::QueryInterface(REFIID riid, LPVOID *ppvObj) return S_OK; } - /* TODO: - * IID_IShellExtInit - * IID_IOleCommandTarget - * IID_IShellFolderViewCB - */ - return E_NOINTERFACE; } @@ -831,7 +850,10 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu( _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_GRAYED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); + if (pProperties->Status == NCS_CONNECTED) + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); + else + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_DEFAULT); NcFreeNetconProperties(pProperties); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } @@ -1163,6 +1185,30 @@ HRESULT WINAPI CNetworkConnections::Execute(LPSHELLEXECUTEINFOW pei) return S_OK; } +HRESULT WINAPI CNetworkConnections::Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) +{ + FIXME("CNetworkConnections::Initialize()\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI CNetworkConnections::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + FIXME("CNetworkConnections::Exec()\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI CNetworkConnections::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) +{ + FIXME("CNetworkConnections::QueryStatus()\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI CNetworkConnections::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + FIXME("CNetworkConnections::MessageSFVCB()\n"); + return E_NOTIMPL; +} + HRESULT WINAPI CNetConUiObject::GetInfoFlags(DWORD *pdwFlags) { *pdwFlags = 0;

6 years, 1 month

13/13: [REACTOS] Add features/usability additions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbc4bb2d087310237d3f2… commit bbc4bb2d087310237d3f21c3c56a73e72a5f17dc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 28 23:47:25 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:09:16 2018 +0100 [REACTOS] Add features/usability additions. - Interface the TreeList code and populate it with the list of discovered disks and partitions. Code is adapted from USETUP. Also display the names of the disks. - Display some installation settings summary, before doing the installation proper. - Force the user to select a checkbox when (s)he acknowledges that ReactOS is alpha-quality software and may break on his/her computer or corrupt his/her data. - Improve wizard pages transitions and buttons enabling/disabling. - Press Shift-F10 to start a command-line (as in the 2nd-stage setup in syssetup.dll). - Use some explicit UNICODE functions/macros. --- base/setup/reactos/CMakeLists.txt | 2 +- base/setup/reactos/drivepage.c | 687 +++++++++++++++++++++++++++++++++----- base/setup/reactos/reactos.c | 507 +++++++++++++++++++++++----- base/setup/reactos/reactos.h | 31 +- 4 files changed, 1045 insertions(+), 182 deletions(-) diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt index 8c58f9e360..75418ede51 100644 --- a/base/setup/reactos/CMakeLists.txt +++ b/base/setup/reactos/CMakeLists.txt @@ -20,5 +20,5 @@ add_executable(reactos ${SOURCE} reactos.rc) set_module_type(reactos win32gui UNICODE) add_pch(reactos reactos.h SOURCE) target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib) -add_importlibs(reactos advapi32 gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll) +add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd) diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index cf79aa3847..1da5771c47 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -25,17 +25,23 @@ */ #include "reactos.h" +#include <shlwapi.h> + +// #include <ntdddisk.h> +#include <ntddstor.h> +#include <ntddscsi.h> + #include "resource.h" /* GLOBALS ******************************************************************/ #define IDS_LIST_COLUMN_FIRST IDS_PARTITION_NAME -#define IDS_LIST_COLUMN_LAST IDS_PARTITION_TYPE +#define IDS_LIST_COLUMN_LAST IDS_PARTITION_STATUS #define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1) -static const UINT column_ids[MAX_LIST_COLUMNS] = {IDS_LIST_COLUMN_FIRST, IDS_LIST_COLUMN_FIRST + 1, IDS_LIST_COLUMN_FIRST + 2}; -static const INT column_widths[MAX_LIST_COLUMNS] = {200, 150, 150}; -static const INT column_alignment[MAX_LIST_COLUMNS] = {LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT}; +static const UINT column_ids[MAX_LIST_COLUMNS] = {IDS_LIST_COLUMN_FIRST, IDS_LIST_COLUMN_FIRST + 1, IDS_LIST_COLUMN_FIRST + 2, IDS_LIST_COLUMN_FIRST + 3}; +static const INT column_widths[MAX_LIST_COLUMNS] = {200, 90, 60, 60}; +static const INT column_alignment[MAX_LIST_COLUMNS] = {LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_RIGHT, LVCFMT_RIGHT}; /* FUNCTIONS ****************************************************************/ @@ -59,23 +65,19 @@ MoreOptDlgProc(HWND hwndDlg, SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); - SendMessageW(GetDlgItem(hwndDlg, IDC_PATH), - WM_SETTEXT, - (WPARAM)0, - (LPARAM)pSetupData->USetupData.InstallationDirectory); + SetDlgItemTextW(hwndDlg, IDC_PATH, + pSetupData->USetupData.InstallationDirectory); break; } case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDOK: { - SendMessageW(GetDlgItem(hwndDlg, IDC_PATH), - WM_GETTEXT, - (WPARAM)ARRAYSIZE(pSetupData->USetupData.InstallationDirectory), - (LPARAM)pSetupData->USetupData.InstallationDirectory); - + GetDlgItemTextW(hwndDlg, IDC_PATH, + pSetupData->USetupData.InstallationDirectory, + ARRAYSIZE(pSetupData->USetupData.InstallationDirectory)); EndDialog(hwndDlg, IDOK); return TRUE; } @@ -100,9 +102,10 @@ PartitionDlgProc(HWND hwndDlg, { case WM_INITDIALOG: break; + case WM_COMMAND: { - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDOK: EndDialog(hwndDlg, IDOK); @@ -118,38 +121,469 @@ PartitionDlgProc(HWND hwndDlg, BOOL -CreateListViewColumns( +CreateTreeListColumns( IN HINSTANCE hInstance, - IN HWND hWndListView, + IN HWND hWndTreeList, IN const UINT* pIDs, IN const INT* pColsWidth, IN const INT* pColsAlign, IN UINT nNumOfColumns) { UINT i; - LVCOLUMN lvC; + TLCOLUMN tlC; WCHAR szText[50]; /* Create the columns */ - lvC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; - lvC.pszText = szText; + tlC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; + tlC.pszText = szText; /* Load the column labels from the resource file */ for (i = 0; i < nNumOfColumns; i++) { - lvC.iSubItem = i; - lvC.cx = pColsWidth[i]; - lvC.fmt = pColsAlign[i]; + tlC.iSubItem = i; + tlC.cx = pColsWidth[i]; + tlC.fmt = pColsAlign[i]; LoadStringW(hInstance, pIDs[i], szText, ARRAYSIZE(szText)); - if (ListView_InsertColumn(hWndListView, i, &lvC) == -1) + if (TreeList_InsertColumn(hWndTreeList, i, &tlC) == -1) return FALSE; } return TRUE; } +// unused +VOID +DisplayStuffUsingWin32Setup(HWND hwndDlg) +{ + HDEVINFO h; + HWND hList; + SP_DEVINFO_DATA DevInfoData; + DWORD i; + + h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT); + if (h == INVALID_HANDLE_VALUE) + return; + + hList = GetDlgItem(hwndDlg, IDC_PARTITION); + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + for (i=0; SetupDiEnumDeviceInfo(h, i, &DevInfoData); i++) + { + DWORD DataT; + LPTSTR buffer = NULL; + DWORD buffersize = 0; + + while (!SetupDiGetDeviceRegistryProperty(h, + &DevInfoData, + SPDRP_DEVICEDESC, + &DataT, + (PBYTE)buffer, + buffersize, + &buffersize)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (buffer) LocalFree(buffer); + buffer = LocalAlloc(LPTR, buffersize * 2); + } + else + { + return; + } + } + if (buffer) + { + SendMessageW(hList, LB_ADDSTRING, (WPARAM)0, (LPARAM)buffer); + LocalFree(buffer); + } + } + SetupDiDestroyDeviceInfoList(h); +} + + +HTLITEM +TreeListAddItem(IN HWND hTreeList, + IN HTLITEM hParent, + IN LPWSTR lpText, + IN INT iImage, + IN INT iSelectedImage, + IN LPARAM lParam) +{ + TL_INSERTSTRUCTW Insert; + + ZeroMemory(&Insert, sizeof(Insert)); + + Insert.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + Insert.hInsertAfter = TVI_LAST; + Insert.hParent = hParent; + Insert.item.pszText = lpText; + Insert.item.iImage = iImage; + Insert.item.iSelectedImage = iSelectedImage; + Insert.item.lParam = lParam; + + // Insert.item.mask |= TVIF_STATE; + // Insert.item.stateMask = TVIS_OVERLAYMASK; + // Insert.item.state = INDEXTOOVERLAYMASK(1); + + return TreeList_InsertItem(hTreeList, &Insert); +} + + +VOID +GetPartTypeStringFromPartitionType( + IN UCHAR partitionType, + OUT PCHAR strPartType, + IN ULONG cchPartType) +{ + /* Determine partition type */ + + if (IsContainerPartition(partitionType)) + { + StringCchCopyA(strPartType, cchPartType, "Extended Partition" /* MUIGetString(STRING_EXTENDED_PARTITION) */); + } + else if (partitionType == PARTITION_ENTRY_UNUSED) + { + StringCchCopyA(strPartType, cchPartType, "Unused" /* MUIGetString(STRING_FORMATUNUSED) */); + } + else + { + UINT i; + + /* Do the table lookup */ + for (i = 0; i < ARRAYSIZE(PartitionTypes); i++) + { + if (partitionType == PartitionTypes[i].Type) + { + StringCchCopyA(strPartType, cchPartType, PartitionTypes[i].Description); + return; + } + } + + /* We are here because the partition type is unknown */ + StringCchCopyA(strPartType, cchPartType, "Unknown" /* MUIGetString(STRING_FORMATUNKNOWN) */); + } +} + +static +HTLITEM +PrintPartitionData( + IN HWND hWndList, + IN PPARTLIST List, + IN HTLITEM htiParent, + IN PDISKENTRY DiskEntry, + IN PPARTENTRY PartEntry) +{ + LARGE_INTEGER PartSize; + HTLITEM htiPart; + CHAR PartTypeString[32]; + PCHAR PartType = PartTypeString; + WCHAR LineBuffer[128]; + + /* Volume name */ + if (PartEntry->IsPartitioned == FALSE) + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // MUIGetString(STRING_UNPSPACE), + L"Unpartitioned space"); + } + else + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // MUIGetString(STRING_HDDINFOUNK5), + L"%s (%c%c)", + *PartEntry->VolumeLabel ? PartEntry->VolumeLabel : L"Partition", + (PartEntry->DriveLetter == 0) ? L'-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? L'-' : L':'); + } + + htiPart = TreeListAddItem(hWndList, htiParent, LineBuffer, + 1, 1, + (LPARAM)PartEntry); + + /* Determine partition type */ + *LineBuffer = 0; + if (PartEntry->IsPartitioned) + { + PartTypeString[0] = '\0'; + if (PartEntry->New == TRUE) + { + PartType = "New (Unformatted)"; // MUIGetString(STRING_UNFORMATTED); + } + else if (PartEntry->IsPartitioned == TRUE) + { + GetPartTypeStringFromPartitionType(PartEntry->PartitionType, + PartTypeString, + ARRAYSIZE(PartTypeString)); + PartType = PartTypeString; + } + + if (strcmp(PartType, "Unknown" /* MUIGetString(STRING_FORMATUNKNOWN) */) == 0) + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // MUIGetString(STRING_HDDINFOUNK5), + L"Type 0x%02x", + PartEntry->PartitionType); + } + else + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + L"%S", + PartType); + } + } + TreeList_SetItemText(hWndList, htiPart, 1, LineBuffer); + + /* Format the disk size in KBs, MBs, etc... */ + PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + if (StrFormatByteSizeW(PartSize.QuadPart, LineBuffer, ARRAYSIZE(LineBuffer)) == NULL) + { + /* We failed for whatever reason, do the hardcoded way */ + PWCHAR Unit; + +#if 0 + if (PartSize.QuadPart >= 10 * GB) /* 10 GB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB); + // Unit = MUIGetString(STRING_GB); + Unit = L"GB"; + } + else +#endif + if (PartSize.QuadPart >= 10 * MB) /* 10 MB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB); + // Unit = MUIGetString(STRING_MB); + Unit = L"MB"; + } + else + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB); + // Unit = MUIGetString(STRING_KB); + Unit = L"KB"; + } + + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + L"%6lu %s", + PartSize.u.LowPart, + Unit); + } + TreeList_SetItemText(hWndList, htiPart, 2, LineBuffer); + + /* Volume status */ + *LineBuffer = 0; + if (PartEntry->IsPartitioned) + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // MUIGetString(STRING_HDDINFOUNK5), + PartEntry->BootIndicator ? L"Active" : L""); + } + TreeList_SetItemText(hWndList, htiPart, 3, LineBuffer); + + return htiPart; +} + +static +VOID +PrintDiskData( + IN HWND hWndList, + IN PPARTLIST List, + IN PDISKENTRY DiskEntry) +{ + BOOL Success; + HANDLE hDevice; + PCHAR DiskName = NULL; + ULONG Length = 0; + PPARTENTRY PrimaryPartEntry, LogicalPartEntry; + PLIST_ENTRY PrimaryEntry, LogicalEntry; + ULARGE_INTEGER DiskSize; + HTLITEM htiDisk, htiPart; + WCHAR LineBuffer[128]; + UCHAR outBuf[512]; + + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // L"\\Device\\Harddisk%lu\\Partition%lu", + L"\\\\.\\PhysicalDrive%lu", + DiskEntry->DiskNumber); + + hDevice = CreateFileW( + LineBuffer, // device interface name + GENERIC_READ /*| GENERIC_WRITE*/, // dwDesiredAccess + FILE_SHARE_READ | FILE_SHARE_WRITE, // dwShareMode + NULL, // lpSecurityAttributes + OPEN_EXISTING, // dwCreationDistribution + 0, // dwFlagsAndAttributes + NULL // hTemplateFile + ); + if (hDevice != INVALID_HANDLE_VALUE) + { + STORAGE_PROPERTY_QUERY Query; + + Query.PropertyId = StorageDeviceProperty; + Query.QueryType = PropertyStandardQuery; + + Success = DeviceIoControl(hDevice, + IOCTL_STORAGE_QUERY_PROPERTY, + &Query, + sizeof(Query), + &outBuf, + sizeof(outBuf), + &Length, + NULL); + if (Success) + { + PSTORAGE_DEVICE_DESCRIPTOR devDesc = (PSTORAGE_DEVICE_DESCRIPTOR)outBuf; + if (devDesc->ProductIdOffset) + { + DiskName = (PCHAR)&outBuf[devDesc->ProductIdOffset]; + Length -= devDesc->ProductIdOffset; + DiskName[min(Length, strlen(DiskName))] = 0; + // ( i = devDesc->ProductIdOffset; p[i] != 0 && i < Length; i++ ) + } + } + + CloseHandle(hDevice); + } + + if (DiskName && *DiskName) + { + if (DiskEntry->DriverName.Length > 0) + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // MUIGetString(STRING_HDINFOPARTSELECT_1), + L"Harddisk %lu (%S) (Port=%hu, Bus=%hu, Id=%hu) on %wZ", + DiskEntry->DiskNumber, + DiskName, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + &DiskEntry->DriverName); + } + else + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // MUIGetString(STRING_HDINFOPARTSELECT_2), + L"Harddisk %lu (%S) (Port=%hu, Bus=%hu, Id=%hu)", + DiskEntry->DiskNumber, + DiskName, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id); + } + } + else + { + if (DiskEntry->DriverName.Length > 0) + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // MUIGetString(STRING_HDINFOPARTSELECT_1), + L"Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ", + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + &DiskEntry->DriverName); + } + else + { + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + // MUIGetString(STRING_HDINFOPARTSELECT_2), + L"Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)", + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id); + } + } + + htiDisk = TreeListAddItem(hWndList, NULL, LineBuffer, + 0, 0, + (LPARAM)DiskEntry); + + /* Disk type (MBR or GPT) */ + TreeList_SetItemText(hWndList, htiDisk, 1, DiskEntry->NoMbr ? L"GPT" : L"MBR"); + + /* Format the disk size in KBs, MBs, etc... */ + DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + if (StrFormatByteSizeW(DiskSize.QuadPart, LineBuffer, ARRAYSIZE(LineBuffer)) == NULL) + { + /* We failed for whatever reason, do the hardcoded way */ + PWCHAR Unit; + + if (DiskSize.QuadPart >= 10 * GB) /* 10 GB */ + { + DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, GB); + // Unit = MUIGetString(STRING_GB); + Unit = L"GB"; + } + else + { + DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, MB); + if (DiskSize.QuadPart == 0) + DiskSize.QuadPart = 1; + // Unit = MUIGetString(STRING_MB); + Unit = L"MB"; + } + + StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer), + L"%6lu %s", + DiskSize.u.LowPart, + Unit); + } + TreeList_SetItemText(hWndList, htiDisk, 2, LineBuffer); + + + /* Print partition lines */ + for (PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink; + PrimaryEntry != &DiskEntry->PrimaryPartListHead; + PrimaryEntry = PrimaryEntry->Flink) + { + PrimaryPartEntry = CONTAINING_RECORD(PrimaryEntry, PARTENTRY, ListEntry); + + htiPart = PrintPartitionData(hWndList, List, htiDisk, + DiskEntry, PrimaryPartEntry); + + if (IsContainerPartition(PrimaryPartEntry->PartitionType)) + { + for (LogicalEntry = DiskEntry->LogicalPartListHead.Flink; + LogicalEntry != &DiskEntry->LogicalPartListHead; + LogicalEntry = LogicalEntry->Flink) + { + LogicalPartEntry = CONTAINING_RECORD(LogicalEntry, PARTENTRY, ListEntry); + + PrintPartitionData(hWndList, List, htiPart, + DiskEntry, LogicalPartEntry); + } + + /* Expand the extended partition node */ + TreeList_Expand(hWndList, htiPart, TVE_EXPAND); + } + } + + /* Expand the disk node */ + TreeList_Expand(hWndList, htiDisk, TVE_EXPAND); +} + +VOID +DrawPartitionList( + IN HWND hWndList, + IN PPARTLIST List) +{ + PLIST_ENTRY Entry; + PDISKENTRY DiskEntry; + + for (Entry = List->DiskListHead.Flink; + Entry != &List->DiskListHead; + Entry = Entry->Flink) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + + /* Print disk entry */ + PrintDiskData(hWndList, List, DiskEntry); + } +} + + INT_PTR CALLBACK @@ -160,12 +594,8 @@ DriveDlgProc( LPARAM lParam) { PSETUPDATA pSetupData; -#if 1 - HDEVINFO h; HWND hList; - SP_DEVINFO_DATA DevInfoData; - DWORD i; -#endif + HIMAGELIST hSmall; /* Retrieve pointer to the global setup data */ pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); @@ -178,70 +608,70 @@ DriveDlgProc( pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); - CreateListViewColumns(pSetupData->hInstance, - GetDlgItem(hwndDlg, IDC_PARTITION), + /* + * Keep the "Next" button disabled. It will be enabled only + * when the user selects a valid partition. + */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + + hList = GetDlgItem(hwndDlg, IDC_PARTITION); + + TreeList_SetExtendedStyleEx(hList, TVS_EX_FULLROWMARK, TVS_EX_FULLROWMARK); + // TreeList_SetExtendedStyleEx(hList, TVS_EX_FULLROWITEMS, TVS_EX_FULLROWITEMS); + + CreateTreeListColumns(pSetupData->hInstance, + hList, column_ids, column_widths, column_alignment, MAX_LIST_COLUMNS); -#if 1 - h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT); - if (h != INVALID_HANDLE_VALUE) - { - hList =GetDlgItem(hwndDlg, IDC_PARTITION); - DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - for (i=0; SetupDiEnumDeviceInfo(h, i, &DevInfoData); i++) - { - DWORD DataT; - LPTSTR buffer = NULL; - DWORD buffersize = 0; - - while (!SetupDiGetDeviceRegistryProperty(h, - &DevInfoData, - SPDRP_DEVICEDESC, - &DataT, - (PBYTE)buffer, - buffersize, - &buffersize)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - if (buffer) LocalFree(buffer); - buffer = LocalAlloc(LPTR, buffersize * 2); - } - else - break; - } - if (buffer) - { - SendMessageW(hList, LB_ADDSTRING, (WPARAM) 0, (LPARAM) buffer); - LocalFree(buffer); - } - } - SetupDiDestroyDeviceInfoList(h); - } -#endif + /* Create the ImageList */ + hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + ILC_COLOR32 | ILC_MASK, // ILC_COLOR24 + 1, 1); + + /* Add event type icons to the ImageList */ + ImageList_AddIcon(hSmall, LoadIconW(pSetupData->hInstance, MAKEINTRESOURCEW(IDI_DISKDRIVE))); + ImageList_AddIcon(hSmall, LoadIconW(pSetupData->hInstance, MAKEINTRESOURCEW(IDI_PARTITION))); + + /* Assign the ImageList to the List View */ + TreeList_SetImageList(hList, hSmall, TVSIL_NORMAL); + + // DisplayStuffUsingWin32Setup(hwndDlg); + DrawPartitionList(hList, pSetupData->PartitionList); + break; + } + + case WM_DESTROY: + { + hList = GetDlgItem(hwndDlg, IDC_PARTITION); + hSmall = TreeList_GetImageList(hList, TVSIL_NORMAL); + TreeList_SetImageList(hList, NULL, TVSIL_NORMAL); + ImageList_Destroy(hSmall); + return TRUE; } - break; case WM_COMMAND: { - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_PARTMOREOPTS: - DialogBoxParam(pSetupData->hInstance, - MAKEINTRESOURCE(IDD_BOOTOPTIONS), - hwndDlg, - MoreOptDlgProc, - (LPARAM)pSetupData); + DialogBoxParamW(pSetupData->hInstance, + MAKEINTRESOURCEW(IDD_BOOTOPTIONS), + hwndDlg, + MoreOptDlgProc, + (LPARAM)pSetupData); break; + case IDC_PARTCREATE: - DialogBox(pSetupData->hInstance, - MAKEINTRESOURCE(IDD_PARTITION), - hwndDlg, - PartitionDlgProc); + DialogBoxW(pSetupData->hInstance, + MAKEINTRESOURCEW(IDD_PARTITION), + hwndDlg, + PartitionDlgProc); break; + case IDC_PARTDELETE: break; } @@ -252,11 +682,83 @@ DriveDlgProc( { LPNMHDR lpnm = (LPNMHDR)lParam; + // On Vista+ we can use TVN_ITEMCHANGED instead, with NMTVITEMCHANGE* pointer + if (lpnm->idFrom == IDC_PARTITION && lpnm->code == TVN_SELCHANGED) + { + LPNMTREEVIEW pnmv = (LPNMTREEVIEW)lParam; + + // if (pnmv->uChanged & TVIF_STATE) /* The state has changed */ + if (pnmv->itemNew.mask & TVIF_STATE) + { + /* The item has been (de)selected */ + // if (pnmv->uNewState & TVIS_SELECTED) + if (pnmv->itemNew.state & TVIS_SELECTED) + { + HTLITEM hParentItem = TreeList_GetParent(lpnm->hwndFrom, pnmv->itemNew.hItem); + /* May or may not be a PPARTENTRY: this is a PPARTENTRY only when hParentItem != NULL */ + PPARTENTRY PartEntry = (PPARTENTRY)pnmv->itemNew.lParam; + + if (!hParentItem || !PartEntry) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_PARTCREATE), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_PARTDELETE), FALSE); + goto DisableWizNext; + } + else // if (hParentItem && PartEntry) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_PARTCREATE), !PartEntry->IsPartitioned); + EnableWindow(GetDlgItem(hwndDlg, IDC_PARTDELETE), PartEntry->IsPartitioned); + + if (PartEntry->IsPartitioned && + !IsContainerPartition(PartEntry->PartitionType) /* alternatively: PartEntry->PartitionNumber != 0 */ && + // !PartEntry->New && + (PartEntry->FormatState == Preformatted /* || PartEntry->FormatState == Formatted */)) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + } + else + { + goto DisableWizNext; + } + } + } + else + { +DisableWizNext: + /* + * Keep the "Next" button disabled. It will be enabled only + * when the user selects a valid partition. + */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + } + + break; + } + switch (lpnm->code) - { + { +#if 0 case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + { + /* + * Keep the "Next" button disabled. It will be enabled only + * when the user selects a valid partition. + */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); break; + } +#endif + + case PSN_QUERYINITIALFOCUS: + { + /* Give the focus on and select the first item */ + hList = GetDlgItem(hwndDlg, IDC_PARTITION); + // TreeList_SetFocusItem(hList, 1, 1); + TreeList_SelectItem(hList, 1); + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)hList); + return TRUE; + } case PSN_QUERYCANCEL: { @@ -274,6 +776,28 @@ DriveDlgProc( return TRUE; } + case PSN_WIZNEXT: /* Set the selected data */ + { + NTSTATUS Status; + + /****/ + // FIXME: This is my test disk encoding! + DISKENTRY DiskEntry; + PARTENTRY PartEntry; + DiskEntry.DiskNumber = 0; + DiskEntry.BiosDiskNumber = 0; + PartEntry.PartitionNumber = 1; // 4; + /****/ + + Status = InitDestinationPaths(&pSetupData->USetupData, + NULL, // pSetupData->USetupData.InstallationDirectory, + &DiskEntry, &PartEntry); + // TODO: Check Status + UNREFERENCED_PARAMETER(Status); + + break; + } + default: break; } @@ -282,7 +806,6 @@ DriveDlgProc( default: break; - } return FALSE; diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 230eafa38c..55b18a227e 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -124,15 +124,15 @@ StartDlgProc( pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); - /* Center the wizard window */ - CenterWindow(GetParent(hwndDlg)); - /* Set title font */ SendDlgItemMessage(hwndDlg, IDC_STARTTITLE, WM_SETFONT, (WPARAM)pSetupData->hTitleFont, (LPARAM)TRUE); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); break; } @@ -212,6 +212,13 @@ TypeDlgProc( PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); break; + case PSN_QUERYINITIALFOCUS: + { + /* Focus on "Install ReactOS" */ + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)GetDlgItem(hwndDlg, IDC_INSTALL)); + return TRUE; + } + case PSN_QUERYCANCEL: { if (MessageBoxW(GetParent(hwndDlg), @@ -230,23 +237,40 @@ TypeDlgProc( case PSN_WIZNEXT: /* Set the selected data */ { - pSetupData->RepairUpdateFlag = - !(SendMessageW(GetDlgItem(hwndDlg, IDC_INSTALL), - BM_GETCHECK, - 0, 0) == BST_CHECKED); - /* - * Display the existing NT installations page only - * if we have more than one available NT installations. + * Go update only if we have available NT installations + * and we choose to do so. */ if (pSetupData->NtOsInstallsList && - GetNumberOfListEntries(pSetupData->NtOsInstallsList) > 1) + GetNumberOfListEntries(pSetupData->NtOsInstallsList) != 0 && + IsDlgButtonChecked(hwndDlg, IDC_UPDATE) == BST_CHECKED) { - /* Actually the best would be to dynamically insert the page only when needed */ - SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, IDD_UPDATEREPAIRPAGE); + pSetupData->RepairUpdateFlag = TRUE; + + /* + * Display the existing NT installations page only + * if we have more than one available NT installations. + */ + if (GetNumberOfListEntries(pSetupData->NtOsInstallsList) > 1) + { + /* pSetupData->CurrentInstallation will be set from within IDD_UPDATEREPAIRPAGE */ + + /* Actually the best would be to dynamically insert the page only when needed */ + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, IDD_UPDATEREPAIRPAGE); + } + else + { + /* Retrieve the current installation */ + pSetupData->CurrentInstallation = + (PNTOS_INSTALLATION)GetListEntryData(GetCurrentListEntry(pSetupData->NtOsInstallsList)); + + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, IDD_DEVICEPAGE); + } } else { + pSetupData->CurrentInstallation = NULL; + pSetupData->RepairUpdateFlag = FALSE; SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, IDD_DEVICEPAGE); } @@ -268,6 +292,39 @@ TypeDlgProc( +BOOL +CreateListViewColumns( + IN HINSTANCE hInstance, + IN HWND hWndListView, + IN const UINT* pIDs, + IN const INT* pColsWidth, + IN const INT* pColsAlign, + IN UINT nNumOfColumns) +{ + UINT i; + LVCOLUMN lvC; + WCHAR szText[50]; + + /* Create the columns */ + lvC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; + lvC.pszText = szText; + + /* Load the column labels from the resource file */ + for (i = 0; i < nNumOfColumns; i++) + { + lvC.iSubItem = i; + lvC.cx = pColsWidth[i]; + lvC.fmt = pColsAlign[i]; + + LoadStringW(hInstance, pIDs[i], szText, ARRAYSIZE(szText)); + + if (ListView_InsertColumn(hWndListView, i, &lvC) == -1) + return FALSE; + } + + return TRUE; +} + typedef VOID (NTAPI *PGET_ENTRY_DESCRIPTION)( IN PGENERIC_LIST_ENTRY Entry, @@ -312,19 +369,17 @@ InitGenericComboList( SendMessageW(hWndList, CB_SETCURSEL, CurrentEntryIndex, 0); } -INT +PVOID GetSelectedComboListItem( IN HWND hWndList) { - LRESULT Index; + INT Index; - Index = SendMessageW(hWndList, CB_GETCURSEL, 0, 0); + Index = ComboBox_GetCurSel(hWndList); if (Index == CB_ERR) - return CB_ERR; + return NULL; - // TODO: Update List->CurrentEntry? - // return SendMessageW(hWndList, CB_GETITEMDATA, (WPARAM)Index, 0); - return Index; + return (PVOID)ComboBox_GetItemData(hWndList, Index); } typedef VOID @@ -366,9 +421,28 @@ InitGenericListView( CurrentEntryIndex = lvItem.iItem; } - SendMessageW(hWndList, LVM_ENSUREVISIBLE, CurrentEntryIndex, FALSE); - ListView_SetItemState(hWndList, CurrentEntryIndex, LVIS_SELECTED, LVIS_SELECTED); - ListView_SetItemState(hWndList, CurrentEntryIndex, LVIS_FOCUSED, LVIS_FOCUSED); + ListView_EnsureVisible(hWndList, CurrentEntryIndex, FALSE); + ListView_SetItemState(hWndList, CurrentEntryIndex, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); +} + +PVOID +GetSelectedListViewItem( + IN HWND hWndList) +{ + INT Index; + LVITEM item; + + Index = ListView_GetSelectionMark(hWndList); + if (Index == LB_ERR) + return NULL; + + item.mask = LVIF_PARAM; + item.iItem = Index; + ListView_GetItem(hWndList, &item); + + return (PVOID)item.lParam; } @@ -399,7 +473,7 @@ AddNTOSInstallationItem( { /* We have retrieved a partition that is mounted */ StringCchPrintfW(Buffer, cchBufferSize, - L"%C:%s", + L"%c:%s", PartEntry->DriveLetter, NtOsInstall->PathComponent); } @@ -471,8 +545,16 @@ UpgradeRepairDlgProc( pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); + /* + * Keep the "Next" button disabled. It will be enabled only + * when the user selects an installation to upgrade. + */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + hList = GetDlgItem(hwndDlg, IDC_NTOSLIST); + ListView_SetExtendedListViewStyleEx(hList, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); + CreateListViewColumns(pSetupData->hInstance, hList, column_ids, @@ -494,7 +576,6 @@ UpgradeRepairDlgProc( ListView_SetImageList(hList, hSmall, LVSIL_SMALL); InitGenericListView(hList, pSetupData->NtOsInstallsList, AddNTOSInstallationItem); - break; } @@ -507,15 +588,70 @@ UpgradeRepairDlgProc( return TRUE; } + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SKIPUPGRADE: + { + /* Skip the upgrade and do the usual new-installation workflow */ + pSetupData->CurrentInstallation = NULL; + pSetupData->RepairUpdateFlag = FALSE; + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_DEVICEPAGE); + return TRUE; + } + } + break; + case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; + if (lpnm->idFrom == IDC_NTOSLIST && lpnm->code == LVN_ITEMCHANGED) + { + LPNMLISTVIEW pnmv = (LPNMLISTVIEW)lParam; + + if (pnmv->uChanged & LVIF_STATE) /* The state has changed */ + { + /* The item has been (de)selected */ + if (pnmv->uNewState & (LVIS_FOCUSED | LVIS_SELECTED)) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + } + else + { + /* + * Keep the "Next" button disabled. It will be enabled only + * when the user selects an installation to upgrade. + */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + } + + break; + } + switch (lpnm->code) { +#if 0 case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + { + /* + * Keep the "Next" button disabled. It will be enabled only + * when the user selects an installation to upgrade. + */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); break; + } +#endif + + case PSN_QUERYINITIALFOCUS: + { + /* Give the focus on and select the first item */ + hList = GetDlgItem(hwndDlg, IDC_NTOSLIST); + ListView_SetItemState(hList, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)hList); + return TRUE; + } case PSN_QUERYCANCEL: { @@ -534,11 +670,31 @@ UpgradeRepairDlgProc( } case PSN_WIZNEXT: /* Set the selected data */ - pSetupData->RepairUpdateFlag = - !(SendMessageW(GetDlgItem(hwndDlg, IDC_INSTALL), - BM_GETCHECK, - 0, 0) == BST_CHECKED); + { + /* + * Go update only if we have available NT installations + * and we choose to do so. + */ + if (!pSetupData->NtOsInstallsList || + GetNumberOfListEntries(pSetupData->NtOsInstallsList) == 0) + { + pSetupData->CurrentInstallation = NULL; + pSetupData->RepairUpdateFlag = FALSE; + break; + } + + hList = GetDlgItem(hwndDlg, IDC_NTOSLIST); + SetCurrentListEntry(pSetupData->NtOsInstallsList, + GetSelectedListViewItem(hList)); + + /* Retrieve the current installation */ + pSetupData->CurrentInstallation = + (PNTOS_INSTALLATION)GetListEntryData(GetCurrentListEntry(pSetupData->NtOsInstallsList)); + + /* We perform an upgrade */ + pSetupData->RepairUpdateFlag = TRUE; return TRUE; + } default: break; @@ -599,6 +755,13 @@ DeviceDlgProc( PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); break; + case PSN_QUERYINITIALFOCUS: + { + /* Focus on "Computer" list */ + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)GetDlgItem(hwndDlg, IDC_COMPUTER)); + return TRUE; + } + case PSN_QUERYCANCEL: { if (MessageBoxW(GetParent(hwndDlg), @@ -618,13 +781,20 @@ DeviceDlgProc( case PSN_WIZNEXT: /* Set the selected data */ { hList = GetDlgItem(hwndDlg, IDC_COMPUTER); - pSetupData->SelectedComputer = GetSelectedComboListItem(hList); + SetCurrentListEntry(pSetupData->USetupData.ComputerList, + GetSelectedComboListItem(hList)); hList = GetDlgItem(hwndDlg, IDC_DISPLAY); - pSetupData->SelectedDisplay = GetSelectedComboListItem(hList); + SetCurrentListEntry(pSetupData->USetupData.DisplayList, + GetSelectedComboListItem(hList)); hList = GetDlgItem(hwndDlg, IDC_KEYBOARD); - pSetupData->SelectedKeyboard = GetSelectedComboListItem(hList); + SetCurrentListEntry(pSetupData->USetupData.KeyboardList, + GetSelectedComboListItem(hList)); + + // hList = GetDlgItem(hwndDlg, IDC_KEYBOARD_LAYOUT); + // SetCurrentListEntry(pSetupData->USetupData.LayoutList, + // GetSelectedComboListItem(hList)); return TRUE; } @@ -649,6 +819,8 @@ SummaryDlgProc( IN WPARAM wParam, IN LPARAM lParam) { + static WCHAR szOrgWizNextBtnText[260]; // TODO: Make it dynamic + PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ @@ -657,10 +829,24 @@ SummaryDlgProc( switch (uMsg) { case WM_INITDIALOG: + { /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); break; + } + + case WM_COMMAND: + { + if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDC_CONFIRM_INSTALL) + { + if (IsDlgButtonChecked(hwndDlg, IDC_CONFIRM_INSTALL) == BST_CHECKED) + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + else + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + break; + } case WM_NOTIFY: { @@ -669,8 +855,92 @@ SummaryDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + { + WCHAR CurrentItemText[256]; + + /* Show the current selected settings */ + + // FIXME! Localize + if (pSetupData->RepairUpdateFlag) + { + StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText), + L"Upgrading/Repairing \"%s\" from \"%s\"", + pSetupData->CurrentInstallation->InstallationName, + pSetupData->CurrentInstallation->VendorName); + } + else + { + StringCchCopyW(CurrentItemText, ARRAYSIZE(CurrentItemText), + L"New ReactOS installation"); + } + SetDlgItemTextW(hwndDlg, IDC_INSTALLTYPE, CurrentItemText); + + SetDlgItemTextW(hwndDlg, IDC_INSTALLSOURCE, L"n/a"); + SetDlgItemTextW(hwndDlg, IDC_ARCHITECTURE, L"n/a"); + + GetSettingDescription(GetCurrentListEntry(pSetupData->USetupData.ComputerList), + CurrentItemText, + ARRAYSIZE(CurrentItemText)); + SetDlgItemTextW(hwndDlg, IDC_COMPUTER, CurrentItemText); + + GetSettingDescription(GetCurrentListEntry(pSetupData->USetupData.DisplayList), + CurrentItemText, + ARRAYSIZE(CurrentItemText)); + SetDlgItemTextW(hwndDlg, IDC_DISPLAY, CurrentItemText); + + GetSettingDescription(GetCurrentListEntry(pSetupData->USetupData.KeyboardList), + CurrentItemText, + ARRAYSIZE(CurrentItemText)); + SetDlgItemTextW(hwndDlg, IDC_KEYBOARD, CurrentItemText); + + if (L'C') // FIXME! + { + StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText), + L"%c: \x2014 %wZ", + L'C', // FIXME! + &pSetupData->USetupData.DestinationRootPath); + } + else + { + StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText), + L"%wZ", + &pSetupData->USetupData.DestinationRootPath); + } + SetDlgItemTextW(hwndDlg, IDC_DESTDRIVE, CurrentItemText); + + SetDlgItemTextW(hwndDlg, IDC_PATH, + /*pSetupData->USetupData.InstallationDirectory*/ + pSetupData->USetupData.InstallPath.Buffer); + + + /* Change the "Next" button text to "Install" */ + // PropSheet_SetNextText(GetParent(hwndDlg), ...); + GetDlgItemTextW(GetParent(hwndDlg), ID_WIZNEXT, + szOrgWizNextBtnText, ARRAYSIZE(szOrgWizNextBtnText)); + SetDlgItemTextW(GetParent(hwndDlg), ID_WIZNEXT, L"Install"); // FIXME: Localize! + + /* + * Keep the "Next" button disabled. It will be enabled only + * when the user clicks on the installation approval checkbox. + */ + CheckDlgButton(hwndDlg, IDC_CONFIRM_INSTALL, BST_UNCHECKED); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); break; + } + + case PSN_QUERYINITIALFOCUS: + { + /* Focus on the confirmation check-box */ + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)GetDlgItem(hwndDlg, IDC_CONFIRM_INSTALL)); + return TRUE; + } + + case PSN_KILLACTIVE: + { + /* Restore the original "Next" button text */ + SetDlgItemTextW(GetParent(hwndDlg), ID_WIZNEXT, szOrgWizNextBtnText); + break; + } case PSN_QUERYCANCEL: { @@ -691,8 +961,8 @@ SummaryDlgProc( default: break; } + break; } - break; default: break; @@ -832,13 +1102,18 @@ PrepareAndDoCopyThread( /* Retrieve pointer to the global setup data */ pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); + /* Get the progress handle */ + hWndProgress = GetDlgItem(hwndDlg, IDC_PROCESSPROGRESS); + + + /* + * Preparation of the list of files to be copied + */ + /* Set status text */ SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Preparing the list of files to be copied, please wait..."); SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); - /* Get the progress handle */ - hWndProgress = GetDlgItem(hwndDlg, IDC_PROCESSPROGRESS); - /* Set progress marquee style */ dwStyle = GetWindowLongPtrW(hWndProgress, GWL_STYLE); SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle | PBS_MARQUEE); @@ -876,8 +1151,14 @@ PrepareAndDoCopyThread( /* Restore progress style */ SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle); + + /* + * Perform the file copy + */ + /* Set status text */ SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Copying the files..."); + SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); /* Create context for the copy process */ CopyContext.pSetupData = pSetupData; @@ -932,16 +1213,6 @@ ProcessDlgProc( { case WM_INITDIALOG: { - NTSTATUS Status; - /****/ - // FIXME: This is my disk encoding! - DISKENTRY DiskEntry; - PARTENTRY PartEntry; - DiskEntry.DiskNumber = 1; - DiskEntry.BiosDiskNumber = 1; - PartEntry.PartitionNumber = 4; - /****/ - /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); @@ -950,10 +1221,6 @@ ProcessDlgProc( SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L""); SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); - Status = InitDestinationPaths(&pSetupData->USetupData, NULL /*InstallDir*/, &DiskEntry, &PartEntry); - // TODO: Check Status - UNREFERENCED_PARAMETER(Status); - break; } @@ -1069,11 +1336,11 @@ RestartDlgProc( SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); /* Set title font */ - /*SendDlgItemMessage(hwndDlg, - IDC_STARTTITLE, - WM_SETFONT, - (WPARAM)hTitleFont, - (LPARAM)TRUE);*/ + SendDlgItemMessage(hwndDlg, + IDC_FINISHTITLE, + WM_SETFONT, + (WPARAM)pSetupData->hTitleFont, + (LPARAM)TRUE); break; case WM_TIMER: @@ -1104,12 +1371,18 @@ RestartDlgProc( switch (lpnm->code) { - case PSN_SETACTIVE: // Only "Finish" for closing the App + case PSN_SETACTIVE: + { + /* Only "Finish" for closing the wizard */ + ShowWindow(GetDlgItem(GetParent(hwndDlg), IDCANCEL), SW_HIDE); PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + + /* Set up the reboot progress bar */ SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 300)); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETPOS, 0, 0); SetTimer(hwndDlg, 1, 50, NULL); break; + } default: break; @@ -1509,6 +1782,55 @@ Quit: return Success; } +/* Copied from HotkeyThread() in dll/win32/syssetup/install.c */ +static DWORD CALLBACK +HotkeyThread(LPVOID Parameter) +{ + ATOM hotkey; + MSG msg; + + DPRINT("HotkeyThread start\n"); + + hotkey = GlobalAddAtomW(L"Setup Shift+F10 Hotkey"); + + if (!RegisterHotKey(NULL, hotkey, MOD_SHIFT, VK_F10)) + DPRINT1("RegisterHotKey failed with %lu\n", GetLastError()); + + while (GetMessageW(&msg, NULL, 0, 0)) + { + if (msg.hwnd == NULL && msg.message == WM_HOTKEY && msg.wParam == hotkey) + { + STARTUPINFOW si = { sizeof(si) }; + PROCESS_INFORMATION pi; + + if (CreateProcessW(L"cmd.exe", + NULL, + NULL, + NULL, + FALSE, + CREATE_NEW_CONSOLE, + NULL, + NULL, + &si, + &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + else + { + DPRINT1("Failed to launch command prompt: %lu\n", GetLastError()); + } + } + } + + UnregisterHotKey(NULL, hotkey); + GlobalDeleteAtom(hotkey); + + DPRINT("HotkeyThread terminate\n"); + return 0; +} + int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, @@ -1516,6 +1838,7 @@ _tWinMain(HINSTANCE hInst, int nCmdShow) { ULONG Error; + HANDLE hHotkeyThread; INITCOMMONCONTROLSEX iccx; PROPSHEETHEADER psh; HPROPSHEETPAGE ahpsp[8]; @@ -1556,6 +1879,8 @@ _tWinMain(HINSTANCE hInst, if (!LoadSetupData(&SetupData)) goto Quit; + hHotkeyThread = CreateThread(NULL, 0, HotkeyThread, NULL, 0, NULL); + CheckUnattendedSetup(&SetupData.USetupData); SetupData.bUnattend = IsUnattendedSetup; // FIXME :-) @@ -1570,6 +1895,10 @@ _tWinMain(HINSTANCE hInst, iccx.dwICC = ICC_LISTVIEW_CLASSES | ICC_TREEVIEW_CLASSES | ICC_PROGRESS_CLASS; InitCommonControlsEx(&iccx); + /* Register the TreeList control */ + // RegisterTreeListClass(hInst); + TreeListRegister(hInst); + /* Create title font */ SetupData.hTitleFont = CreateTitleFont(); @@ -1582,74 +1911,74 @@ _tWinMain(HINSTANCE hInst, psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = StartDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_STARTPAGE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_STARTPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the install type selection page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_TYPETITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_TYPESUBTITLE); + psp.pszHeaderTitle = MAKEINTRESOURCEW(IDS_TYPETITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_TYPESUBTITLE); psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = TypeDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_TYPEPAGE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_TYPEPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the upgrade/repair selection page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_TYPETITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_TYPESUBTITLE); + psp.pszHeaderTitle = MAKEINTRESOURCEW(IDS_TYPETITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_TYPESUBTITLE); psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = UpgradeRepairDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_UPDATEREPAIRPAGE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_UPDATEREPAIRPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the device settings page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DEVICETITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_DEVICESUBTITLE); + psp.pszHeaderTitle = MAKEINTRESOURCEW(IDS_DEVICETITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_DEVICESUBTITLE); psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = DeviceDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_DEVICEPAGE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_DEVICEPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the install device settings page / boot method / install directory */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DRIVETITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_DRIVESUBTITLE); + psp.pszHeaderTitle = MAKEINTRESOURCEW(IDS_DRIVETITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_DRIVESUBTITLE); psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = DriveDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_DRIVEPAGE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_DRIVEPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the summary page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SUMMARYTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_SUMMARYSUBTITLE); + psp.pszHeaderTitle = MAKEINTRESOURCEW(IDS_SUMMARYTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_SUMMARYSUBTITLE); psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = SummaryDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_SUMMARYPAGE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_SUMMARYPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); } /* Create the installation progress page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_PROCESSTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_PROCESSSUBTITLE); + psp.pszHeaderTitle = MAKEINTRESOURCEW(IDS_PROCESSTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_PROCESSSUBTITLE); psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = ProcessDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_PROCESSPAGE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_PROCESSPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the finish-and-reboot page */ @@ -1658,7 +1987,7 @@ _tWinMain(HINSTANCE hInst, psp.hInstance = hInst; psp.lParam = (LPARAM)&SetupData; psp.pfnDlgProc = RestartDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_RESTARTPAGE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_RESTARTPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the property sheet */ @@ -1669,16 +1998,12 @@ _tWinMain(HINSTANCE hInst, psh.nPages = nPages; psh.nStartPage = 0; psh.phpage = ahpsp; - psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); - psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_WATERMARK); + psh.pszbmHeader = MAKEINTRESOURCEW(IDB_HEADER); /* Display the wizard */ PropertySheet(&psh); - if (SetupData.hTitleFont) - DeleteObject(SetupData.hTitleFont); - -Quit: /* Wait for any pending installation */ WaitForSingleObject(SetupData.hInstallThread, INFINITE); CloseHandle(SetupData.hInstallThread); @@ -1686,6 +2011,20 @@ Quit: CloseHandle(SetupData.hHaltInstallEvent); SetupData.hHaltInstallEvent = NULL; + if (SetupData.hTitleFont) + DeleteObject(SetupData.hTitleFont); + + /* Unregister the TreeList control */ + // UnregisterTreeListClass(hInst); + TreeListUnregister(hInst); + + if (hHotkeyThread) + { + PostThreadMessageW(GetThreadId(hHotkeyThread), WM_QUIT, 0, 0); + CloseHandle(hHotkeyThread); + } + +Quit: /* Setup has finished */ FinishSetup(&SetupData.USetupData); diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index ded1d85f74..23e23afa13 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -43,6 +43,19 @@ #include <strsafe.h> #include <commctrl.h> +#include <windowsx.h> + +/* These are public names and values determined from MFC, and compatible with Windows */ +// Property Sheet control id's (determined with Spy++) +#define IDC_TAB_CONTROL 0x3020 +#define ID_APPLY_NOW 0x3021 +#define ID_WIZBACK 0x3023 +#define ID_WIZNEXT 0x3024 +#define ID_WIZFINISH 0x3025 + + +#include "treelist.h" + /**/#include <setupapi.h>/**/ #include <devguid.h> @@ -123,17 +136,13 @@ typedef struct _SETUPDATA /* Settings */ LONG DestPartSize; // if partition doesn't exist, size of partition - LONG FSType; // file system type on partition - LONG FormatPart; // type of format the partition + LONG FSType; // file system type on partition + LONG FormatPart; // type of format the partition LONG SelectedLangId; // selected language (table index) - LONG SelectedKBLayout; // selected keyboard layout (table index) - LONG SelectedComputer; // selected computer type (table index) - LONG SelectedDisplay; // selected display type (table index) - LONG SelectedKeyboard; // selected keyboard type (table index) /* txtsetup.sif data */ - // LONG DefaultLang; // default language (table index) + // LONG DefaultLang; // default language (table index) // LONG DefaultKBLayout; // default keyboard layout (table index) PCWSTR SelectedLanguageId; WCHAR DefaultLanguage[20]; // Copy of string inside LanguageList @@ -147,14 +156,6 @@ extern BOOLEAN IsUnattendedSetup; extern SETUPDATA SetupData; -typedef struct _IMGINFO -{ - HBITMAP hBitmap; - INT cxSource; - INT cySource; -} IMGINFO, *PIMGINFO; - - /* * Attempts to convert a pure NT file path into a corresponding Win32 path. * Adapted from GetInstallSourceWin32() in dll/win32/syssetup/wizard.c

6 years, 1 month

12/13: [REACTOS] Add two icons (drive and partition) for the drive list.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5318432454fdd8c75f48… commit a5318432454fdd8c75f48eb1065a51c54ddd9aa9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 28 23:05:43 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:09:15 2018 +0100 [REACTOS] Add two icons (drive and partition) for the drive list. --- base/setup/reactos/reactos.rc | 12 +++++++----- base/setup/reactos/res/README.txt | 24 ++++++++++++++++++++++++ base/setup/reactos/res/drive_disk.ico | Bin 0 -> 15086 bytes base/setup/reactos/res/partition.ico | Bin 0 -> 5430 bytes base/setup/reactos/resource.h | 2 ++ 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/base/setup/reactos/reactos.rc b/base/setup/reactos/reactos.rc index 2b794d83a6..b1fdf6f33d 100644 --- a/base/setup/reactos/reactos.rc +++ b/base/setup/reactos/reactos.rc @@ -12,13 +12,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Icons */ -IDI_MAIN ICON "res/setup.ico" -IDI_ROSICON ICON "res/roslogo.ico" -IDI_WINICON ICON "res/winlogo.ico" +IDI_MAIN ICON "res/setup.ico" +IDI_ROSICON ICON "res/roslogo.ico" +IDI_WINICON ICON "res/winlogo.ico" +IDI_DISKDRIVE ICON "res/drive_disk.ico" +IDI_PARTITION ICON "res/partition.ico" /* Bitmaps */ -IDB_WATERMARK BITMAP "res/watermark.bmp" -IDB_HEADER BITMAP "res/header.bmp" +IDB_WATERMARK BITMAP "res/watermark.bmp" +IDB_HEADER BITMAP "res/header.bmp" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "reactos.exe.manifest" diff --git a/base/setup/reactos/res/README.txt b/base/setup/reactos/res/README.txt index 54c0b111c4..163a4ca97f 100644 --- a/base/setup/reactos/res/README.txt +++ b/base/setup/reactos/res/README.txt @@ -1,9 +1,33 @@ +drive_disk.ico +-------------- +From the GNOME-Colors project, +by Victor Castillejo (perfectska04). +Distributed under the terms of GNU GPL v2. + + +partition.ico +------------- +Farm-Fresh Icon Set +FatCow Web Hosting - http://www.fatcow.com/ + +Terms of Use +============ +These icon sets are licensed under a Creative Commons Attribution 3.0 License. +This means you can freely use these icons for any purpose, private and commercial, +including online services, templates, themes and software. However, you should +include a link to this page (http://www.fatcow.com/free-icons) in your credits +(software or website). The icons may not be resold, sub-licensed, rented, transferred +or otherwise made available for use. Please link to this page on fatcow.com if you +would like to spread the word. + + roslogo.ico ----------- (C) 2018 ReactOS Team & Contributors Distributed under CC-BY-SA 4.0 International License Terms. + winlogo.ico ----------- Adapted from the WinTango IconPack, by 'heebijeebi' diff --git a/base/setup/reactos/res/drive_disk.ico b/base/setup/reactos/res/drive_disk.ico new file mode 100644 index 0000000000..b9ddff5d52 Binary files /dev/null and b/base/setup/reactos/res/drive_disk.ico differ diff --git a/base/setup/reactos/res/partition.ico b/base/setup/reactos/res/partition.ico new file mode 100644 index 0000000000..181a6b5528 Binary files /dev/null and b/base/setup/reactos/res/partition.ico differ diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index 5d2037ea7c..11d855ce49 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -8,6 +8,8 @@ #define IDI_MAIN 3000 #define IDI_ROSICON 3001 #define IDI_WINICON 3002 +#define IDI_DISKDRIVE 3003 +#define IDI_PARTITION 3004 #define IDC_STATIC -1

6 years, 1 month

11/13: [REACTOS] Update translations and add dialog controls for Setup Summary dialog.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b1e7b182a6ebfffa699c… commit 6b1e7b182a6ebfffa699c71b3bbab84dd7c4897e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 28 22:53:47 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:09:15 2018 +0100 [REACTOS] Update translations and add dialog controls for Setup Summary dialog. --- base/setup/reactos/lang/bg-BG.rc | 46 ++++++++++++----- base/setup/reactos/lang/cs-CZ.rc | 42 +++++++++++----- base/setup/reactos/lang/de-DE.rc | 42 +++++++++++----- base/setup/reactos/lang/el-GR.rc | 46 ++++++++++++----- base/setup/reactos/lang/en-US.rc | 40 +++++++++++---- base/setup/reactos/lang/es-ES.rc | 42 +++++++++++----- base/setup/reactos/lang/et-EE.rc | 42 +++++++++++----- base/setup/reactos/lang/fi-FI.rc | 42 +++++++++++----- base/setup/reactos/lang/fr-FR.rc | 46 ++++++++++++----- base/setup/reactos/lang/he-IL.rc | 44 ++++++++++++----- base/setup/reactos/lang/hu-HU.rc | 54 +++++++++++++------- base/setup/reactos/lang/it-IT.rc | 40 +++++++++++---- base/setup/reactos/lang/ja-JP.rc | 44 ++++++++++++----- base/setup/reactos/lang/ms-MY.rc | 44 ++++++++++++----- base/setup/reactos/lang/no-NO.rc | 44 ++++++++++++----- base/setup/reactos/lang/pl-PL.rc | 44 ++++++++++++----- base/setup/reactos/lang/pt-BR.rc | 42 +++++++++++----- base/setup/reactos/lang/ro-RO.rc | 40 +++++++++++---- base/setup/reactos/lang/ru-RU.rc | 42 +++++++++++----- base/setup/reactos/lang/sk-SK.rc | 42 +++++++++++----- base/setup/reactos/lang/sq-AL.rc | 42 +++++++++++----- base/setup/reactos/lang/tr-TR.rc | 38 ++++++++++---- base/setup/reactos/lang/uk-UA.rc | 42 +++++++++++----- base/setup/reactos/lang/vi-VN.rc | 40 +++++++++++---- base/setup/reactos/lang/zh-CN.rc | 42 +++++++++++----- base/setup/reactos/lang/zh-TW.rc | 42 +++++++++++----- base/setup/reactos/resource.h | 104 ++++++++++++++++++++++----------------- 27 files changed, 875 insertions(+), 343 deletions(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index 0dfb5d6e67..41d203e678 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Съветникът за настройка на РеактОС ви приветства!", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Съветникът за настройка на РеактОС ви приветства", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Все още не можете да сложите РеактОС направо от този КД! Презапуснете компютъра с този КД, за да сложите РеактОС.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Натиснете „Приключване“ за изход от настройването.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Слагане на РеактОС", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Слагане на РеактОС", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Поправка или осъвременяване на сложен РеактОС", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Натиснете „Напред“ за настройка на устройствата.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Създаване", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "Из&триване", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -93,10 +93,28 @@ END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Слагане на РеактОС" +CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Натиснете „Напред“ за за начало на слагането.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Завършване настройката на РеактОС" +CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Първата степен от настройването на РеактОС приключи успешно.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Когато натиснете „Край”, компютърът ви ще се презапусне.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Списък на възможностите за слагане за проверка преди прилагане върху устройството за слагане" IDS_ABORTSETUP "РеактОС не е напълно сложен на компютъра ви. Ако излезете от настройването сега, ще трябва да пуснете настройването отново, за да сложите Реактос. Наистина ли излизате?" IDS_ABORTSETUP2 "Прекъсване на слагането?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "Настройка на РеактОС" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index 044a6d9029..a40c426f78 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -11,7 +11,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Vítejte v průvodci instalace systému ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Vítejte v průvodci instalace systému ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Systém ReactOS zatím nelze nainstalovat přímo z tohoto CD! Pro instalaci restartuje počítač z tohoto CD.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Klepnutím na Dokončit ukončíte instalaci.", IDC_STATIC, 115, 169, 195, 17 END @@ -21,10 +21,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Nainstalovat systém ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Instalovat novou kopii systému ReactOS. Tato možnost odstraní Vaše soubory, nastavení a programy. Můžete provést úpravu disků a oddílů.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Nainstalovat systém ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Instalovat novou kopii systému ReactOS. Tato možnost odstraní Vaše soubory, nastavení a programy. Můžete provést úpravu disků a oddílů.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Opravit nebo aktualizovat již nainstalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Aktualizovat nebo opravit kopii systémy ReactOS. Tato možnost zachová Vaše soubory, nastavení a programy. Tato možnost je dostupná pouze pokud je již na Vašem počítači systém ReactOS nainstalován.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Aktualizovat nebo opravit kopii systémy ReactOS. Tato možnost zachová Vaše soubory, nastavení a programy. Tato možnost je dostupná pouze pokud je již na Vašem počítači systém ReactOS nainstalován.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 7, 128, 297, 8 END @@ -36,7 +36,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -58,12 +58,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Smazat", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -102,7 +102,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Klepnutím na Další zahájíte instalační proces.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -117,9 +135,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Dokončení instalace systému ReactOS" +CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "První část instalace systému ReactOS byla úspěšně dokončena.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Po klepnutí na Dokončit bude počítač restartován.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -142,7 +161,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Výpis voleb instalace k ověření před tím, než začne instalace" IDS_ABORTSETUP "Systém ReactOS není na tomto počítači kompletně nainstalovaný. Pokud nyní ukončíte instalaci, bude ji pro nainstalování systému ReactOS nutné provést znova. Opravdu ukončit?" IDS_ABORTSETUP2 "Přerušit instalaci?" - IDS_NO_TXTSETUP_SIF "Soubor 'txtsetup.sif' nenalezen.\nInstalace nemůže pokračovat.." + IDS_NO_TXTSETUP_SIF "Soubor 'txtsetup.sif' nenalezen.\nInstalace nemůže pokračovat." IDS_CAPTION "Instalace systému ReactOS" END @@ -156,6 +175,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index d6deb52614..1e245c3573 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Willkommen beim ReactOS-Setup-Assistenten.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Willkommen beim ReactOS-Setup-Assistenten", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "ReactOS kann noch nicht direkt von dieser CD installiert werden! Bitte starten Sie Ihren Computer mit dieser CD um ReactOS zu installieren.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Klicken Sie auf Beenden um das Setup zu verlassen.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installiere ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Installiert eine neue Kopie von ReactOS. Diese Option behält nicht Ihre Dateien, Einstellungen und Programme bei. Sie können Änderungen an Festplatten und Partitionen durchführen.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Installiere ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Installiert eine neue Kopie von ReactOS. Diese Option behält nicht Ihre Dateien, Einstellungen und Programme bei. Sie können Änderungen an Festplatten und Partitionen durchführen.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Aktualisiere oder repariere ein installiertes ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Aktualisieren oder reparieren einer installierten Kopie von ReactOS. Diese Option behält Ihre Dateien, Einstellungen und Programme bei. Diese Option ist nur verfügbar, wenn ReactOS bereits auf diesem Computer installiert ist.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Aktualisieren oder reparieren einer installierten Kopie von ReactOS. Diese Option behält Ihre Dateien, Einstellungen und Programme bei. Diese Option ist nur verfügbar, wenn ReactOS bereits auf diesem Computer installiert ist.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Löschen", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Klicken Sie auf Weiter um die Installation zu starten.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Vervollständige ReactOS-Setup" +CAPTION "ReactOS-Setup" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Sie haben die erste Stufe des ReactOS-Setup erfolgreich abgeschlossen.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index 5131e5acba..81d3bff8b8 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Καλώς ήλθατε στον οδηγό εγκατάστασης του ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Καλώς ήλθατε στον οδηγό εγκατάστασης του ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Δε μπορείτε να εγκαταστήσετε το ReactOS απευθείας από αυτό το CD ακόμα! Παρακαλούμε επανεκκινήστε τον υπολογιστή σας από αυτό το CD για να μπορέσετε να εγκαταστήσετε το ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Πατήστε Ολοκλήρωση για να βγείτε από την Εγκατάσταση.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Πατήστε Επόμενο για να ρυθμίσετε τις συσκευές.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Διαγραφή", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -93,10 +93,28 @@ END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ολοκληρώνεται η εγκατάσταση του ReactOS" +CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Ολοκληρώσατε επιτυχώς το πρώτο στάδιο της εγκατάστασης του ReactOS.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Όταν πατήσετε Ολοκλήρωση, θα γίνει επανεκκίνηση του υπολογιστή σας.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index 1009cf9206..68ee6cac5a 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "You cannot install ReactOS directly from this CD yet! Please restart your computer from this CD in order to install ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Update or repair ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Click Next to continue.", IDC_STATIC, 7, 128, 297, 8 END @@ -30,7 +30,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14 PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 14 -/* LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8 */ + // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 128, 303, 8 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -114,6 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Completing ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 115, 80, 195, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index 604b5f7665..0f4bd8dfa0 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bienvenido al Asistente de Instalación de ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Bienvenido al Asistente de Instalación de ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "¡Aún no puede instalar ReactOS directamente desde este CD! Por favor, reinicie su equipo desde este CD para instalar ReactOS.", IDC_STATIC, 115, 40, 200, 100 LTEXT "Pulse Finalizar para salir del instalador.", IDC_STATIC, 115, 169, 195, 17 END @@ -23,10 +23,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Instala una nueva copia de ReactOS. Esta opción no proteje sus archivos, programas y ajustes. Usted puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Instala una nueva copia de ReactOS. Esta opción no proteje sus archivos, programas y ajustes. Usted puede realizar cambios a su disco duro y particiones.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Actualizar o reparar una instalación existente de ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción proteje sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en esta computadora.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Actualiza o repara una instalación existente de ReactOS. Esta opción proteje sus archivos, programas y ajustes. Esta opción sólo está disponible si ha instalado ReactOS previamente en esta computadora.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7, 128, 297, 8 END @@ -38,7 +38,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -60,12 +60,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -104,7 +104,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Presione Siguiente para comenzar con el proceso de instalación.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -119,9 +137,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completando la instalación de ReactOS" +CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "La primera parte de la instalación de ReactOS se ha completado satisfactoriamente.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Cuando presione Finalizar, su equipo será reiniciado.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -144,7 +163,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su verificación antes de aplicarlas al dispositivo instalado" IDS_ABORTSETUP "ReactOS no está completamente instalado en su equipo. Si sale de la instalación ahora, tendrá que ejecutar el instalador otra vez para instalar ReactOS. ¿Realmente quiere salir?" IDS_ABORTSETUP2 "¿Abortar instalación?" - IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'\nLa instalación no puede continuar." + IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'.\nLa instalación no puede continuar." IDS_CAPTION "Instalación de ReactOS" END @@ -158,6 +177,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Nombre" - IDS_PARTITION_SIZE "Tamaño" IDS_PARTITION_TYPE "Tipo" + IDS_PARTITION_SIZE "Tamaño" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index 9eca1f8a9f..6b5f49b483 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Tere tulemast ReactOSi paigaldamisprogrammi.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Tere tulemast ReactOSi paigaldamisprogrammi", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Selle CD pealt ei saa praegu veel ReactOSi paigaldada! ReactOSi paigaldamiseks on tarvis arvuti taaskäivitada selle CD-ga.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Vajuta lõpeta, et installeerimine lõpetada.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOSi paigaldamine" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installeeri ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Installeeri ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Paranda või uuenda installeeritud ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 7, 128, 297, 8 END @@ -30,7 +30,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOSi paigaldamine" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOSi paigaldamine" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Vajuta Järgmine, et paigaldamist alustada.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOSi paigaldamise lõpetamine" +CAPTION "ReactOSi paigaldamine" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "ReactOSi paigaldamise esimene järk on edukalt lõpetatud.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Seadete kontrollimine enne paigaldamise alustamist" IDS_ABORTSETUP "ReactOS ei ole veel täielikult paigaldatud. Kas tõesti lahkuda?" IDS_ABORTSETUP2 "Katkestada paigaldamine?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "ReactOSi paigaldamine" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 6c55eb004e..52e199f3b0 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Asennus" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Et voi asentaa ReactOS:ä suoraan tältä CDlevyltä! Käynnistä tietokoneesi tältä CD levyltä asentaaksesi ReactOS:ä.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 END @@ -30,7 +30,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completing ReactOS Setup" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index d27d347114..cb6c0bf736 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bienvenue dans l'assistant d'installation de ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Bienvenue dans l'assistant d'installation de ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Vous ne pouvez pas encore installer ReactOS directement depuis ce CD ! Veuillez redémarrer votre ordinateur depuis ce CD pour pouvoir installer ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Cliquez sur Terminer pour quitter l'installation.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 1280, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -93,10 +93,28 @@ END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completing ReactOS Setup" +CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "Installation de ReactOS" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index f0666ccdfa..809ee4b34a 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ברוכים הבאים לאשף ההתקנה של ReactOS/", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "ברוכים הבאים לאשף ההתקנה של ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "עדיין אי אפשר להתקין את ReactOS ישירות מהתקליטור הזה! נא אתחל מחדש מחשבך מהדיסק כדי להתקין את ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "לחץ על סיום כדי לסיים את ההתקנה.", IDC_STATIC, 115, 169, 195, 17 END @@ -17,22 +17,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "התקנת ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "התקנת ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "תיקון או עדכון גרסה קיימת", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "לחץ על הבא כדי להגדיר את ההתקנים", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "צור", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "מחק", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "לחץ על הבא כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "לחץ על הבא כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "לחץ על הבא כדי להתחיל בתהליך ההתקנה.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -113,9 +131,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "השלמת התקנת ReactOS" +CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -138,7 +157,7 @@ BEGIN IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "התקנת ReactOS" END @@ -152,6 +171,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 388f86c41e..7b2a1c55e3 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -7,37 +7,37 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Welcome to the ReactOS Setup Wizard", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Nem tudod feltelepíteni a ReactOS rendszert így! Kérlek indítsd újra a számítógépet ezzel a CD-vel, hogy feltudjad telepíteni a ReactOS rendszert.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10 @@ -51,15 +51,15 @@ END IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -95,15 +95,33 @@ END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 @@ -113,9 +131,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completing ReactOS Setup" +CAPTION "ReactOS telepítõ" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -138,7 +157,7 @@ BEGIN IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END @@ -152,6 +171,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index 6849d89fa7..0badfc0746 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Benvenuto al wizard di installazione di ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Benvenuto al wizard di installazione di ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Non è ancora possibile installare ReactOS direttamente da questo CD! E' necessario riavviare il computer da questo CD per procedere alla installazione di ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Cliccare Fine per uscire.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installa ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Installa una nuova coppia di ReactOS. Questo opzione non mantiene i tuoi file, le impostazioni e i programmi. E' possibile fare degli cambiamenti sul disco e partizioni.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Installa ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Installa una nuova coppia di ReactOS. Questo opzione non mantiene i tuoi file, le impostazioni e i programmi. E' possibile fare degli cambiamenti sul disco e partizioni.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Aggiorna o ripara una installazione precedente di ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Aggiorna o ripara una coppia già installata di ReactOS. Questo opzione mantiene i tuoi file, le impostazioni e i programmi. Questo opzione è disponibile solo se ReactOS è già installato su questo computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Aggiorna o ripara una coppia già installata di ReactOS. Questo opzione mantiene i tuoi file, le impostazioni e i programmi. Questo opzione è disponibile solo se ReactOS è già installato su questo computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 7, 128, 297, 8 END @@ -30,7 +30,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Crea", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completamento della installazione di ReactOS" +CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "La prima fase è stata completata in modo regolare.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Quando verrà premuto fine il computer si riavvierà.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Nome" - IDS_PARTITION_SIZE "Dimensione" IDS_PARTITION_TYPE "Tipo" + IDS_PARTITION_SIZE "Dimensione" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index b1a740631e..e90ab15e4c 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "ReactOS セットアップウィザードへようこそ。", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "ReactOS セットアップウィザードへようこそ", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "このCDからまだ直接ReactOSをインストールできません。ReactOSをインストールするために、このCDからコンピュータを再起動して下さい。", IDC_STATIC, 115, 40, 195, 100 LTEXT "完了をクリックしてセットアップを終了して下さい。", IDC_STATIC, 115, 169, 195, 17 END @@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - AUTORADIOBUTTON "ReactOSをインストールする", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "ReactOSを新しくインストールします。このオプションは、あなたのファイル、設定、プログラムを維持しません。あなたはディスクとパーティションに変更を加えることができます。", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "ReactOSをインストールする", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "ReactOSを新しくインストールします。このオプションは、あなたのファイル、設定、プログラムを維持しません。あなたはディスクとパーティションに変更を加えることができます。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "ReactOSを更新または修正する", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "インストールされたReactOSを更新または修正します。このオプションはあなたのファイル、設定、プログラムを保持します。このオプションは、このコンピュータですでにReactOSがインストール済みのときのみ利用できます。", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "インストールされたReactOSを更新または修正します。このオプションはあなたのファイル、設定、プログラムを保持します。このオプションは、このコンピュータですでにReactOSがインストール済みのときのみ利用できます。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "次へをクリックすると続行します", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS セットアップ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "作成(&C)", IDC_PARTCREATE, 7, 122, 50, 14 PUSHBUTTON "削除(&D)", IDC_PARTDELETE, 63, 122, 50, 14 PUSHBUTTON "ドライバ(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED PUSHBUTTON "上級者向け(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 14 -/* LTEXT "次へをクリックすれば、要約をチェックできます。", IDC_STATIC, 7, 128, 277, 8 */ + // LTEXT "次へをクリックすれば、要約をチェックできます。", IDC_STATIC, 7, 128, 277, 8 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "次へをクリックすると、インストールの処理を開始します。", IDC_STATIC, 7, 128, 303, 8 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS セットアップの完了" +CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "ReactOS セットアップの最初の段階が正しく完了しました。", IDC_STATIC, 115, 50, 195, 10 LTEXT "完了をクリックすると、あなたのコンピュータは再起動されます。", IDC_STATIC, 115, 80, 195, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "インストールするデバイスを適用する前にチェックするインストールプロパティをリストアップします" IDS_ABORTSETUP "ReactOSはあなたのコンピュータへのインストールが完了していません。もしセットアップをここで中断すれば、ReactOSをインストールするために、セットアップを再起動する必要があります。本当に中断しますか?" IDS_ABORTSETUP2 "インストールを中断しますか?" - IDS_NO_TXTSETUP_SIF "'txtsetup.sif'が見つかりません。\nセットアップは続行できません" + IDS_NO_TXTSETUP_SIF "'txtsetup.sif'が見つかりません。\nセットアップは続行できません。" IDS_CAPTION "ReactOS セットアップ" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "名前" - IDS_PARTITION_SIZE "サイズ" IDS_PARTITION_TYPE "種類" + IDS_PARTITION_SIZE "サイズ" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index e4d22c7561..afed079f8f 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Selamat datang ke Pendeta Persediaan ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Selamat datang ke Pendeta Persediaan ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Anda tidak boleh memasang ReactOS terus dari CD ini lagi! Sila mula semula komputer anda dari CD ini untuk memasang ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Klik Selesai untuk keluar persediaan.", IDC_STATIC, 115, 169, 195, 17 END @@ -17,22 +17,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Pasang ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Pasang ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Membaiki atau mengemaskini ReactOS yang dipasang", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Klik Seterusnya untuk memasang peranti.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Klik Seterusnya untuk memulakan proses pemasangan.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -113,9 +131,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Melengkapkan persediaan ReactOS" +CAPTION "ReactOS Persediaan" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Anda telah berjaya melengkapkan tahap pertama persediaan ReactOS.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Apabila anda klik Selesai, komputer akan dimulakan semula.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -138,7 +157,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Senarai pemasangan sifat-sifat untuk menyemak sebelum digunakan untuk pemasangan peranti" IDS_ABORTSETUP "ReactOS tidak benar-benar dipasang pada komputer anda. Jika anda berhenti persediaan sekarang, anda akan perlu untuk menjalankan persediaan untuk memasang ReactOS lagi. Benar-benar berhenti?" IDS_ABORTSETUP2 "Henti paksa pemasangan?" - IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari 'txtsetup.sif'\nPersediaan tidak dapat meneruskan" + IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari 'txtsetup.sif'.\nPersediaan tidak dapat meneruskan." IDS_CAPTION "ReactOS Persediaan" END @@ -152,6 +171,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 9213e76e5c..45c6f94d8a 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Velkommen til ReactOS installering veiviseren.", IDC_STARTTITLE, 115, 8, 220, 24 + LTEXT "Velkommen til ReactOS installering veiviseren", IDC_STARTTITLE, 115, 8, 220, 24 LTEXT "Du kan ennå ikke installere ReactOS direkte fra denne CD-en! Vennligst start datamaskinen på nytt og start fra denne platen for å installere ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Trykk på Fullført for å avslutte installeringen.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Installere ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Installere ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Reparere eller oppdatere en installert ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Trykk på Neste for installere enhetene.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Opprett", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Slett", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Fullfører ReactOS installering" +CAPTION "ReactOS installering" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Du har nå fullført første steget av ReactOS installering.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Når du trykker Fullført, vil din datamaskin starte på nytt.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Sjekk listen av installasjon egenskapene før du fortsetter installasjon av enhetene" IDS_ABORTSETUP "ReactOS er ikke fullstendig installert på datamaskinen. Hvis du avslutter nå, trenger du å kjøre installeringen på nytt for å installere ReactOS. Vil du virkelig avslutte?" IDS_ABORTSETUP2 "Avbryt installasjonen?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "ReactOS installering" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index 6b11b5f35c..ace7cad24b 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -16,7 +16,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Witaj w Kreatorze instalacji ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Witaj w Kreatorze instalacji ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Obecnie nie możesz zainstalować ReactOS bezpośrednio! Uruchom ponownie komputer z tej płyty, aby zainstalować ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Naciśnij przycisk aby zakończyć pracę Instalatora.", IDC_STATIC, 115, 169, 195, 17 END @@ -26,22 +26,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Zainstaluj ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Zainstaluj nową kopię ReactOS. Ta opcja nie zachowa plików, ustawień i programów. Możesz dokonać zmian w dyskach i partycjach.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Zainstaluj ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Zainstaluj nową kopię ReactOS. Ta opcja nie zachowa plików, ustawień i programów. Możesz dokonać zmian w dyskach i partycjach.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Napraw lub zaktualizuj zainstalowany wcześniej ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Zaktualizuj lub napraw istniejącą kopię systemu ReactOS. Ta opcja zachowa pliki, ustawienia i programy. Jest dostępna, jeżeli ReactOS znajduje się już na tym komputerze.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Zaktualizuj lub napraw istniejącą kopię systemu ReactOS. Ta opcja zachowa pliki, ustawienia i programy. Jest dostępna, jeżeli ReactOS znajduje się już na tym komputerze.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Naciśnij Dalej, aby zmienić ustawienia sprzętu.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -63,12 +63,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Stwórz", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Usuń", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "S&terownik", IDC_DEVICEDRIVER, 169, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 225, 122, 86, 15 - LTEXT "Naciśnij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Naciśnij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -107,7 +107,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kliknij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -122,9 +140,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kończenie instalacji ReactOS" +CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Pierwszy etap instalacji ReactOS został pomyślnie zakończony.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Po kliknięciu na Zakończ ten komputer zostanie uruchomiony ponownie.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -147,7 +166,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Sprawdź ustawienia instalacji przed dokonaniem zmian na dysku" IDS_ABORTSETUP "Instalacja ReactOS nie została ukończona na tym komputerze. Jeśli teraz zakończysz instalację, będziesz musiał uruchomić Instalator ponownie, aby zainstalować ReactOS. Na pewno zakończyć?" IDS_ABORTSETUP2 "Przerwać instalację?" - IDS_NO_TXTSETUP_SIF "Nie można znaleźć 'txtsetup.sif'\nInstalator nie może kontynuować." + IDS_NO_TXTSETUP_SIF "Nie można znaleźć 'txtsetup.sif'.\nInstalator nie może kontynuować." IDS_CAPTION "Instalator ReactOS" END @@ -161,6 +180,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Nazwa" - IDS_PARTITION_SIZE "Rozmiar" IDS_PARTITION_TYPE "Rodzaj" + IDS_PARTITION_SIZE "Rozmiar" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index 8a812f59dc..5a53820e07 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bem-vindo(a) ao Assistente de Instalação do ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Bem-vindo(a) ao Assistente de Instalação do ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Você não pode instalar o ReactOS diretamente deste CD! Por favor reinicie seu computador a partir deste CD para instalar o ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Clique em Finalizar para sair da Instalação.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Reparar ou atualizar uma instalação do ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Clique em Próximo para configurar os dispositivos.", IDC_STATIC, 7, 128, 297, 8 END @@ -30,7 +30,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Clique em Próximo para iniciar o processo de instalação.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Finalizando Instalação do ReactOS" +CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "A primeira etapa de Instalação do ReactOS foi efetuada com sucesso.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Clique em Finalizar para reiniciar o computador.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Listar propriedades da instalação para verificação antes de aplicá-las na instalação dos despositivos" IDS_ABORTSETUP "ReactOS não está totalmente instalado em seu computador. Se você sair da Instalação agora, você precisará executar o Instalador novamente para instalar o ReactOS. Tem certeza que deseja sair?" IDS_ABORTSETUP2 "Abortar instalação?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "Instalação do ReactOS" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index 14dff513b9..199885911e 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -24,22 +24,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Instalează ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Instalarea unei noi copii a ReactOS. Fișierele, configurațiile și programele existente nu vor fi păstrate. Sunt posibile ajustări asupra discurilor și partițiilor.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Instalează ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Instalarea unei noi copii a ReactOS. Fișierele, configurațiile și programele existente nu vor fi păstrate. Sunt posibile ajustări asupra discurilor și partițiilor.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Repară sau actualizează ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Repararea sau actualizarea ReactOS. Această opțiune menține fișierele, configurațiile și programele existente. Opțiune validă doar dacă ReactOS e deja instalat în calculator.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Repararea sau actualizarea ReactOS. Această opțiune menține fișierele, configurațiile și programele existente. Opțiune validă doar dacă ReactOS e deja instalat în calculator.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Apăsați pe „Înainte” pentru configurarea de dispozitive.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -61,12 +61,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Crează", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "Șt&erge", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "Mo&dul pilot", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "Opțiuni a&vansate…", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Apăsați pe „Înainte” pentru a verifica sumarul.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Apăsați pe „Înainte” pentru a verifica sumarul.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -105,7 +105,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Apăsați „Înainte” pentru a continua procesul de instalare.", IDC_STATIC, 10, 180, 277, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -123,6 +141,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Ați dus la bun sfârșit prima etapă de instalare a ReactOS", IDC_STATIC, 20, 50, 277, 10 LTEXT "Când veți apăsa „Sfârșit”, calculatorul va reporni.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -145,7 +164,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Lista cu opțiuni de instalare ce necesită verificare înainte de a continua instalarea." IDS_ABORTSETUP "ReactOS încă nu este complet instalat în calculator. Daca întrerupeți procesul de instalare, pentru a instala va fi necesară repetarea pașilor parcurși până acum. Sigur doriți asta?" IDS_ABORTSETUP2 "Abandonați instalarea?" - IDS_NO_TXTSETUP_SIF "Fișierulu „txtsetup.sif” nu poate fi găsit!\nInstalarea nu poate continua." + IDS_NO_TXTSETUP_SIF "Fișierulu „txtsetup.sif” nu poate fi găsit.\nInstalarea nu poate continua." IDS_CAPTION "Asistentul de instalare ReactOS" END @@ -159,6 +178,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Nume" - IDS_PARTITION_SIZE "Dimensiune" IDS_PARTITION_TYPE "Tip" + IDS_PARTITION_SIZE "Dimensiune" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index d70e9973d7..5077e4999a 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Вас приветствует программа установки ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Вас приветствует программа установки ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Установку ReactOS можно производить только загрузившись с этого диска! После перезапуска компьютера выберите загрузку с CD и начните установку ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Нажмите кнопку ""Завершить"" для выхода.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Установка ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Установить новую копию системы ReactOS. Эта опция НЕ сохраняет файлы, настройки и программы. Вы можете изменять диски и разделы.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Установка ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Установить новую копию системы ReactOS. Эта опция НЕ сохраняет файлы, настройки и программы. Вы можете изменять диски и разделы.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Восстановить или изменить установленный ранее ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Обновить или восстановить установленную копию системы ReactOS. Эта опция СОХРАНЯЕТ файлы, настройки и программы. Доступно только при наличии уже установленной на компьютере системы ReactOS.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Обновить или восстановить установленную копию системы ReactOS. Эта опция СОХРАНЯЕТ файлы, настройки и программы. Доступно только при наличии уже установленной на компьютере системы ReactOS.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Для установки устройств нажмите ""Далее"".", IDC_STATIC, 7, 128, 297, 8 END @@ -30,7 +30,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Создать", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Удалить", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 162, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 176, 122, 122, 15 - LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -111,9 +129,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Завершение установки ReactOS" +CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Первый этап установки ReactOS закончен.", IDC_STATIC, 20, 50, 277, 10 LTEXT "После нажатия клавиши ""Завершить"" ваш компьютер будет перезагружен.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Проверьте список параметров перед началом установки" IDS_ABORTSETUP "ReactOS установлен на компьютер не полностью. Если вы закроете программу установки сейчас, в дальнейшем вам придется повторить установку ReactOS. Вы уверены, что необходимо прервать установку?" IDS_ABORTSETUP2 "Прервать установку?" - IDS_NO_TXTSETUP_SIF "Не удалось найти файл 'txtsetup.sif'\nПродолжение установки невозможно." + IDS_NO_TXTSETUP_SIF "Не удалось найти файл 'txtsetup.sif'.\nПродолжение установки невозможно." IDS_CAPTION "Установка ReactOS" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Имя" - IDS_PARTITION_SIZE "Размер" IDS_PARTITION_TYPE "Тип" + IDS_PARTITION_SIZE "Размер" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index 20849ddecd..b7621907fb 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -10,7 +10,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Inštalácia systému ReactOS" //ReactOS Setup FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Víta Vás sprievodca inštaláciou systému ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Víta Vás sprievodca inštaláciou systému ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Systém ReactOS sa z tohto CD nedá nainštalovať ihneď! Reštartujte, prosím, počítač a inštalačné CD nechajte vložené, aby sa mohol systém ReactOS nainštalovať.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Inštaláciu ukončíte kliknutím na tlačidlo Dokončiť.", IDC_STATIC, 115, 169, 195, 17 END @@ -20,10 +20,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Inštalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Nainštalovať systém ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Nainštalovať systém ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Opraviť alebo aktualizovať nainštalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8 END @@ -35,7 +35,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -57,12 +57,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Inštalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Vytvoriť", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "O&dstrániť", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "Rozšírené &možnosti...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -101,7 +101,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Inštalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kliknutím na tlačidlo Ďalej spustíte inštalačný proces.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -116,9 +134,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completing ReactOS Setup" +CAPTION "Inštalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Kliknutím na tlačidlo Dokončiť reštartujete počítač.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -141,7 +160,7 @@ BEGIN IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Naozaj skončiť?" IDS_ABORTSETUP2 "Prerušiť inštaláciu?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END @@ -155,6 +174,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index c1f718e6ff..4060a0090f 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Mirë se vini në instalimin e ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Mirë se vini në instalimin e ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Ju nuk mund të instaloni ReactOS direkt nga ky CD! Ju lutem rinisni kompjuterin tuaj nga CD'ja në mënyrë që të instaloni ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Kliko Finish për të dalë nga instalimi.", IDC_STATIC, 115, 169, 195, 17 END @@ -17,10 +17,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "InstalO ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "InstalO ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Riparo ose apdejto ReactOS'in e instaluar", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Kliko vazhdo për të konfiguruar pajisjet.", IDC_STATIC, 7, 128, 297, 8 END @@ -32,7 +32,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Krijo", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Fshi", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kliko vazhdo për të filluar instalimin.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -113,9 +131,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kompletimi i instalimit te ReactOS" +CAPTION "Instalimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Ju keni kompletuar me sukses fazën e parë të instalimit të ReactOS.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Kur te klikoni mbarim, kompjuteri juaj do riniset.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -138,7 +157,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Listo të dhënat e instalimit për të kontrolluar para së të aplikohen për pajisjet e instalimit/kompjuterit" IDS_ABORTSETUP "ReactOS nuk është instaluar plotësisht në kompjuterin tuaj. Nëse ju dilni nga instalimi tani, do ju duhet të filloni instalimin përsëri për të instalumar ReactOS. Doni ta mbyllni?" IDS_ABORTSETUP2 "Ndërpritni Instalimin?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "ReactOS Setup" END @@ -152,6 +171,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 29153a11e8..f77e115180 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -17,10 +17,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "ReactOS'u Yükleme", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "ReactOS'un yeni bir kopyasını yükle. Bu seçenek, kütüklerinizi, ayarlarınızı ve izlencelerinizi korumaz. Disklere ve bölümlere değişiklikler yapabilirsiniz.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "ReactOS'u Yükleme", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "ReactOS'un yeni bir kopyasını yükle. Bu seçenek, kütüklerinizi, ayarlarınızı ve izlencelerinizi korumaz. Disklere ve bölümlere değişiklikler yapabilirsiniz.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Kurulu ReactOS'u Onarma ya da Yükseltme", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "ReactOS'un kurulu bir kopyasını şimdikileştir ya da onar. Bu seçenek, kütüklerinizi, ayarlarınızı ve izlencelerinizi korur. Bu seçenek yalnızca ReactOS bu bilgisayarda önceden kuruluysa kullanılabilir.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "ReactOS'un kurulu bir kopyasını şimdikileştir ya da onar. Bu seçenek, kütüklerinizi, ayarlarınızı ve izlencelerinizi korur. Bu seçenek yalnızca ReactOS bu bilgisayarda önceden kuruluysa kullanılabilir.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Aygıtları kurmak için İleri'ye tıklayınız.", IDC_STATIC, 7, 128, 297, 8 END @@ -32,7 +32,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Oluştur...", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Sil", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "G&elişmiş Seçenekler...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Kurulum özetini gözden geçirmek için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Kurulum özetini gözden geçirmek için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kurulumu işlemini başlatmak için İleri'ye tıklayınız.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -113,9 +131,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kurulumunun Bitirilmesi" +CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "ReactOS kurulumunun ilk aşamasını başarıyla bitirdiniz.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Bitir'e tıkladığınızda bilgisayarınız yeniden başlatılacaktır.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -152,6 +171,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Ad" - IDS_PARTITION_SIZE "Boyut" IDS_PARTITION_TYPE "Tür" + IDS_PARTITION_SIZE "Boyut" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index ddcefcbcfe..371a2e6170 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Вас вітає програма встановлення ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Вас вітає програма встановлення ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Ви не можете встановити ReactOS прямо з цього CD! Будь ласка перезапустіть Ваш комп’ютер з цього CD для того, щоб встановити ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Натисніть кнопку Завершити для виходу.", IDC_STATIC, 115, 169, 195, 17 END @@ -23,10 +23,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Встановлення ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Встановлення ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Відновити або змінити встановлений раніше ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 7, 128, 297, 8 END @@ -38,7 +38,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -60,12 +60,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Створити", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "&Видалити", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "&Додаткові Опції...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "Для початку встановлення натисніть Далі", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "Для початку встановлення натисніть Далі", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 172, 90 @@ -104,7 +104,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Для початку встановлення натисніть Далі.", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -119,9 +137,10 @@ END IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Завершення встановлення ReactOS" +CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Перший етап встановлення ReactOS завершено.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Після натискання клавіші Завершити ваш комп'ютер буде перезавантажений.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -144,7 +163,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Перевірте список властивостей встановлення, перш ніж почати встановлення системи" IDS_ABORTSETUP "ReactOS встановлений на комп'ютер не повністю. Якщо ви закриєте програму встановлення зараз, в подальшому вам доведеться повторити встановлення ReactOS. Ви впевнені, що необхідно перервати встановлення?" IDS_ABORTSETUP2 "Перервати встановлення?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "Встановлення ReactOS" END @@ -158,6 +177,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" IDS_PARTITION_TYPE "Type" + IDS_PARTITION_SIZE "Size" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index 6738ad0e42..c125df0d2a 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Cài đặt ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Chào mừng đến với Trình hướng dẫn thiết lập ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Chào mừng đến với Trình hướng dẫn thiết lập ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Bạn chưa thể cài đặt ReactOS trực tiếp tư đĩa CD này được! Xin hãy khởi động lại máy tính của bạn từ đĩa CD trên để cài đặt ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Ấn Hoàn tất để thoát trình Thiết lập.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,10 +15,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Cài đặt ReactOS" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Cài đặt ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Cài đặt một bản sao mới của ReactOS. Tùy chọn này sẽ không giữ lại các thư mục,tập tin và chương trình của bạn. Bạn có thể thực hiện những thay đổi cho các ổ đĩa và những phần phân chia trong ổ đĩa.", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "Cài đặt ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "Cài đặt một bản sao mới của ReactOS. Tùy chọn này sẽ không giữ lại các thư mục,tập tin và chương trình của bạn. Bạn có thể thực hiện những thay đổi cho các ổ đĩa và những phần phân chia trong ổ đĩa.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "Cập nhật hay sửa chữa ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Cập nhật hay sửa chữa một bản sao đã cài đặt của ReactOS. Tùy chọn này sẽ giữ lại các tập tin, cài đặt và chương trình của bạn. Tùy chọn này chỉ dùng được nếu ReactOS đã được cài đặt trên máy tinh này.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Cập nhật hay sửa chữa một bản sao đã cài đặt của ReactOS. Tùy chọn này sẽ giữ lại các tập tin, cài đặt và chương trình của bạn. Tùy chọn này chỉ dùng được nếu ReactOS đã được cài đặt trên máy tinh này.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "Ấn Tiếp để tiếp tục.", IDC_STATIC, 7, 128, 297, 8 END @@ -30,7 +30,7 @@ BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Cài đặt ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "&Tạo", IDC_PARTCREATE, 7, 122, 50, 14 PUSHBUTTON "&Xóa", IDC_PARTDELETE, 63, 122, 50, 14 PUSHBUTTON "P&hần mềm", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED PUSHBUTTON "&Tùy chọn nâng cao...", IDC_PARTMOREOPTS, 230, 122, 80, 14 -/* LTEXT "Ấn Tiếp để kiểm tra phần tóm lượct.", IDC_STATIC, 7, 128, 277, 8 */ + // LTEXT "Ấn Tiếp để kiểm tra phần tóm lượct.", IDC_STATIC, 7, 128, 277, 8 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Cài đặt ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ấn Tiếp để băt đầu quá trình cài đặt.", IDC_STATIC, 7, 128, 303, 8 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -114,6 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Đang hoàn tất cài đặt Reactos" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Bạn đã hoàn thành giai đoạn đầu của việc thiết lập ReactOS.", IDC_STATIC, 115, 50, 195, 10 LTEXT "bạn Khi bạn ấn Hoàn tất,máy tính của bạn sẽ khởi động lại.", IDC_STATIC, 115, 80, 195, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "Liệt kê các thuộc tính đã lựa chọn nhằm kiểm lại trước khi áp dụng vào thiết bị được chọn" IDS_ABORTSETUP "ReactOS vẵn chưa được hoàn tất cài đặt trên máy tính của bạn. Nếu bây giờ bạn hủy trình Thiết lập, lần tới ban sẽ cần phải chạy lại trình Thiết lập để cài đặt ReactOS. Bạn thực sự muốn bỏ?" IDS_ABORTSETUP2 "Hủy bỏ trình Thiết lập?" - IDS_NO_TXTSETUP_SIF "Không thể tìm được tập tin 'txtsetup.sif'\ntrình Thiết lập không thể tiếp tục" + IDS_NO_TXTSETUP_SIF "Không thể tìm được tập tin 'txtsetup.sif'.\nTrình Thiết lập không thể tiếp tục" IDS_CAPTION "Cài đặt ReactOS" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "Tên" - IDS_PARTITION_SIZE "Kích cỡ" IDS_PARTITION_TYPE "Loại định dạng" + IDS_PARTITION_SIZE "Kích cỡ" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index adf33cdfb0..3b681a49aa 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - LTEXT "欢迎使用 ReactOS 安装程序。", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "欢迎使用 ReactOS 安装程序", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "您不能直接从此 CD 安装 ReactOS！请重新启动并从 CD 引导您的电脑以便安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 LTEXT "点击完成退出安装。", IDC_STATIC, 115, 169, 195, 17 END @@ -15,22 +15,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - AUTORADIOBUTTON "安装 ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "安装 ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "修复或更新已安装的 ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "点击下一步安装设备。", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS 安装程序" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -52,12 +52,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "删除(&D)", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "驱动器(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "高级选项(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "点击下一步检查安装概要。", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "点击下一步检查安装概要。", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -96,7 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - LTEXT "点击下一步开始安装过程。", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -114,6 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序完成" FONT 9, "宋体" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "您成功完成 ReactOS 第一阶段安装过程。", IDC_STATIC, 20, 50, 277, 10 LTEXT "点击完成后，您的电脑将会重新启动。", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -136,7 +155,7 @@ BEGIN IDS_SUMMARYSUBTITLE "安装程序将会执行的内容，以供参考" IDS_ABORTSETUP "ReactOS 未在您的电脑上安装完成。如果您现在退出安装程序，您需要再次运行安装程序来安装 ReactOS。确定退出？" IDS_ABORTSETUP2 "终止安装？" - IDS_NO_TXTSETUP_SIF "无法找到 'txtsetup.sif'\n安装程序无法继续。" + IDS_NO_TXTSETUP_SIF "无法找到 'txtsetup.sif'。\n安装程序无法继续。" IDS_CAPTION "ReactOS 安装程序" END @@ -150,6 +169,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "名称" - IDS_PARTITION_SIZE "大小" IDS_PARTITION_TYPE "类型" + IDS_PARTITION_SIZE "大小" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index c5e511dc0f..5f6ede0e50 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝" FONT 9, "新細明體" BEGIN - LTEXT "歡迎使用 ReactOS 安裝嚮導。", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "歡迎使用 ReactOS 安裝嚮導", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "您不能直接從此CD安裝 ReactOS！請重新啟動並從CD引導您的電腦以便安裝 ReactOS。", IDC_STATIC, 115, 40, 195, 100 LTEXT "點選完成退出安裝。", IDC_STATIC, 115, 169, 195, 17 END @@ -17,22 +17,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝" FONT 9, "新細明體" BEGIN - AUTORADIOBUTTON "安裝 ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "安裝 ReactOS 的新副本。此選項沒有儲存你的檔案、設定和程式。你可以對磁碟和分區進行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25 + AUTORADIOBUTTON "安裝 ReactOS", IDC_INSTALL, 7, 7, 277, 10, WS_GROUP | WS_TABSTOP + LTEXT "安裝 ReactOS 的新副本。此選項沒有儲存你的檔案、設定和程式。你可以對磁碟和分區進行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "修復或更新已安裝的 ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "更新或修復 ReactOS 安裝的副本。此選項會儲存您的檔案、設定和程式。如果 ReactOS 已經安裝在此計算機上, 此選項才能使用的。", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "更新或修復 ReactOS 安裝的副本。此選項會儲存您的檔案、設定和程式。如果 ReactOS 已經安裝在此計算機上, 此選項才能使用的。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP LTEXT "點選下一步安裝裝置。", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS 安裝" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 128, 222, 16 + LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -54,12 +54,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝" FONT 9, "新細明體" BEGIN - CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 + CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112 PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15 PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "驅動器(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "高階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -98,7 +98,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝" FONT 9, "新細明體" BEGIN - LTEXT "點選下一步開始安裝過程。", IDC_STATIC, 7, 180, 303, 20 + LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP + AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE + LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -116,6 +134,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝完成" FONT 9, "新細明體" BEGIN + LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "您成功完成 ReactOS 第一階段安裝過程。", IDC_STATIC, 20, 50, 277, 10 LTEXT "點選完成後，您的電腦將會重新啟動。", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -138,7 +157,7 @@ BEGIN IDS_SUMMARYSUBTITLE "正是安裝前列出安裝屬性以供檢查" IDS_ABORTSETUP "ReactOS 未在您的電腦上安裝完成。如果您現在退出安裝程式，您需要在一次運行安裝程式來安裝 ReactOS。確定退出？" IDS_ABORTSETUP2 "終止安裝？" - IDS_NO_TXTSETUP_SIF "無法找到 'txtsetup.sif'\n安裝程式無法繼續。" + IDS_NO_TXTSETUP_SIF "無法找到 'txtsetup.sif'。\n安裝程式無法繼續。" IDS_CAPTION "ReactOS 安裝" END @@ -152,6 +171,7 @@ END STRINGTABLE BEGIN IDS_PARTITION_NAME "名稱" - IDS_PARTITION_SIZE "大小" IDS_PARTITION_TYPE "類型" + IDS_PARTITION_SIZE "大小" + IDS_PARTITION_STATUS "Status" END diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index 0cfb9897ae..5d2037ea7c 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -16,50 +16,61 @@ #define IDD_STARTPAGE 2000 #define IDC_STARTTITLE 2001 -#define IDD_TYPEPAGE 2005 -#define IDC_INSTALL 2006 -#define IDC_INSTALLTEXT 2007 -#define IDC_UPDATE 2008 -#define IDC_UPDATETEXT 2009 - -#define IDD_UPDATEREPAIRPAGE 2060 -#define IDC_NTOSLIST 2061 -#define IDC_SKIPUPGRADE 2062 - -#define IDD_DEVICEPAGE 2011 -#define IDC_COMPUTER 2014 -#define IDC_DISPLAY 2015 -#define IDC_KEYBOARD 2016 -#define IDC_KEYLAYOUT 2017 - -#define IDD_DRIVEPAGE 2018 -#define IDC_PARTITION 2021 -#define IDC_PARTCREATE 2022 -#define IDC_PARTDELETE 2023 -#define IDC_INSTFREELDR 2024 -#define IDC_INSTVBRONLY 2025 -#define IDC_NOINSTFREELDR 2026 -#define IDC_PATH 2027 - -#define IDD_PROCESSPAGE 2028 -#define IDC_ACTIVITY 2031 -#define IDC_ITEM 2032 -#define IDC_PROCESSPROGRESS 2033 - -#define IDD_RESTARTPAGE 2034 -#define IDC_RESTART_PROGRESS 2038 -#define IDC_PARTMOREOPTS 2042 - -#define IDD_BOOTOPTIONS 2043 - -#define IDD_PARTITION 2044 -#define IDC_UPDOWN1 2045 -#define IDC_PARTSIZE 2046 -#define IDC_UNIT 2047 -#define IDC_FSTYPE 2048 - -#define IDD_SUMMARYPAGE 2049 -#define IDC_DEVICEDRIVER 2052 +#define IDD_TYPEPAGE 2010 +#define IDC_INSTALL 2011 +#define IDC_INSTALLTEXT 2012 +#define IDC_UPDATE 2013 +#define IDC_UPDATETEXT 2014 + +#define IDD_UPDATEREPAIRPAGE 2020 +#define IDC_NTOSLIST 2021 +#define IDC_SKIPUPGRADE 2022 + +#define IDD_DEVICEPAGE 2030 +#define IDC_COMPUTER 2031 +#define IDC_DISPLAY 2032 +#define IDC_KEYBOARD 2033 +#define IDC_KEYLAYOUT 2034 + +#define IDD_DRIVEPAGE 2040 +#define IDC_PARTITION 2041 +#define IDC_PARTCREATE 2042 +#define IDC_PARTDELETE 2043 +#define IDC_DEVICEDRIVER 2044 + +#define IDD_SUMMARYPAGE 2050 +#define IDC_INSTALLTYPE 2051 +#define IDC_INSTALLSOURCE 2052 +#define IDC_ARCHITECTURE 2053 +// #define IDC_COMPUTER 2031 +// #define IDC_DISPLAY 2032 +// #define IDC_KEYBOARD 2033 +#define IDC_DESTDRIVE 2054 +// #define IDC_PATH 2071 +#define IDC_CONFIRM_INSTALL 2055 + +#define IDD_PROCESSPAGE 2060 +#define IDC_ACTIVITY 2061 +#define IDC_ITEM 2062 +#define IDC_PROCESSPROGRESS 2063 + +#define IDD_RESTARTPAGE 2070 +#define IDC_FINISHTITLE 2071 +#define IDC_RESTART_PROGRESS 2072 +#define IDC_PARTMOREOPTS 2073 + +#define IDD_BOOTOPTIONS 2080 +#define IDC_PATH 2081 +#define IDC_INSTFREELDR 2082 +#define IDC_INSTVBRONLY 2083 +#define IDC_NOINSTFREELDR 2084 + +#define IDD_PARTITION 2090 +#define IDC_UPDOWN1 2091 +#define IDC_PARTSIZE 2092 +#define IDC_UNIT 2093 +#define IDC_FSTYPE 2094 + /* Strings */ #define IDS_TYPETITLE 5007 @@ -84,5 +95,6 @@ #define IDS_INSTALLATION_VENDOR 5102 #define IDS_PARTITION_NAME 5200 -#define IDS_PARTITION_SIZE 5201 -#define IDS_PARTITION_TYPE 5202 +#define IDS_PARTITION_TYPE 5201 +#define IDS_PARTITION_SIZE 5202 +#define IDS_PARTITION_STATUS 5203

6 years, 1 month

10/13: [REACTOS] Add a TreeList control (TreeView with columns).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fdfb411b69932e765ed8… commit 2fdfb411b69932e765ed8b64646cae76f3e3193f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 28 22:10:51 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:09:14 2018 +0100 [REACTOS] Add a TreeList control (TreeView with columns). Add the TreeList control from Anton Zechner and Sébastien Kirche from https://github.com/sebkirche/treelist (under GPL-3.0+) as a *TEMPORARY* solution until a better-suited control for ReactOS is developed. - Compilation fixes for the TreeList control. --- base/setup/reactos/CMakeLists.txt | 1 + base/setup/reactos/treelist.c | 13733 ++++++++++++++++++++++++++++++++++++ base/setup/reactos/treelist.h | 493 ++ 3 files changed, 14227 insertions(+) diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt index 39225e758e..8c58f9e360 100644 --- a/base/setup/reactos/CMakeLists.txt +++ b/base/setup/reactos/CMakeLists.txt @@ -11,6 +11,7 @@ list(APPEND SOURCE spapisup/infsupp.c drivepage.c reactos.c + treelist.c reactos.h) file(GLOB reactos_rc_deps res/*.*) diff --git a/base/setup/reactos/treelist.c b/base/setup/reactos/treelist.c new file mode 100644 index 0000000000..1681b6189a --- /dev/null +++ b/base/setup/reactos/treelist.c @@ -0,0 +1,13733 @@ +/* + * PROJECT: ReactOS GUI first stage setup application + * LICENSE: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later) + * PURPOSE: Implements a TreeList control: a tree window with columns. + * COPYRIGHT: Copyright (C) Anton Zechner (az_software(a)inode.at) 2007 + * Copyright (C) S�bastien Kirche (sebastien.kirche(a)free.fr) 2014 + * + * NOTE: Taken from the TreeList code found at https://github.com/sebkirche/treelist + */ + +//***************************************************************************** +//* +//* +//* TreeListWnd.cpp +//* +//* +//***************************************************************************** +// +// This code creates a tree window with a list +// +// +// Copyright (C) Anton Zechner (az_software(a)inode.at) 2007 +// Copyright (C) S�bastien Kirche (sebastien.kirche(a)free.fr) 2014 +// +// TreeListWnd is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) +// Sourcecode which use TreeListWnd must be published. Commercial users +// must published their code too, or make an licence agreement with me. +// +// +// TreeListWnd wird unter GNU GENERAL PUBLIC LICENSE (GPL) vertreiben. +// Sourcecode welcher TreeListWnd verwendet muss ver�ffendlicht werden. +// Komerzielle Nutzer m�ssen ihren Code ebenfalls ver�ffentlichen, oder +// eine Nutzungsvereinbarung mit mir treffen. +// +// +// Version: 2.04 +// +#ifdef UNICODE +#ifndef _UNICODE +#define _UNICODE +#endif +#endif + +#if 0 + #include <stdio.h> + #include <windows.h> + #include <string.h> + #include <malloc.h> + #include <tchar.h> +#else + #include "reactos.h" +#endif + +#define new(TYPE, numElems) \ + HeapAlloc(GetProcessHeap(), 0, (numElems) * sizeof(TYPE)) +#define delete(ptr) \ + HeapFree(GetProcessHeap(), 0, (ptr)) + + +#include "treelist.h" + +#ifndef GWLP_USERDATA +#define GWLP_USERDATA GWL_USERDATA +#endif +#ifndef GWLP_WNDPROC +#define GWLP_WNDPROC GWL_WNDPROC +#endif +#ifndef _WIN64 +#ifndef SetWindowLongPtr +#define SetWindowLongPtr SetWindowLong +#endif +#ifndef GetWindowLongPtr +#define GetWindowLongPtr GetWindowLong +#endif +#ifndef DWORD_PTR +#define DWORD_PTR DWORD +#endif +#ifndef LONG_PTR +#define LONG_PTR LONG +#endif +#endif +#ifdef UNICODE +#define str_len (unsigned)wcslen +#define str_cmp wcscmp +#define str_ncpy wcsncpy +#define str_ncmp wcsncmp +#define str_icmp _wcsicmp +#else +#define str_len (unsigned)strlen +#define str_cmp strcmp +#define str_ncpy strncpy +#define str_ncmp strncmp +#define str_icmp _stricmp +#endif +#ifndef WM_MOUSEWHEEL +#define WM_MOUSEWHEEL 0x020A +#endif +#ifndef WHEEL_DELTA +#define WHEEL_DELTA 120 +#endif +#ifndef MAX_COLUMNS +#define MAX_COLUMNS 32 +#endif +#define MAX_COLORS 16 +#define EN_SETTEXT 0x1000 +#define EN_RETURN 0x1578 +#define EN_ESCAPE 0x1579 +#define ID_TOOLTIPCHECK 0x3912 +#define SORT_NOUPDATE 1234567 +#define VK_ISACHAR 0x01000000 +#define FIRST_LINE 0xFFFFFFFE +#define FROM_HEADER 0x88776655 +#define I_CCB I_CHILDRENCALLBACK +#define U(h) ((unsigned)(h)) +#define THEMEIMGLIST ((HIMAGELIST)1) +#define GetHandle(h) ((TreeListData*)GetWindowLongPtr(h,0)) +#define TVIF_ALL (TVIF_CHILDREN|TVIF_HANDLE|TVIF_IMAGE|TVIF_PARAM|TVIF_SELECTEDIMAGE|TVIF_STATE|TVIF_TEXT) +#define UNLOCK(d) ReleaseSemaphore(d->hSem,1,NULL) +#define LOCK(d) WaitForSingleObject(d->hSem,INFINITE) +#define TVIS_EDIT(m) ((1<<m)&((1<<TVAX_EDIT)|(1<<TVAX_COMBO)|(1<<TVAX_STEPED)|(1<<TVAX_CHECKED))) +#define TVIS_BASEFLAGS (TVIS_EXPANDED|TVIS_EXPANDEDONCE|TVIS_EXPANDPARTIAL|TVIS_SELECTED) +#define TVIS_TRACKED (TVIX_TRACKED<<16) +#define TVIS_BKCOLOR (TVIX_BKCOLOR<<16) +#undef TVIS_FOCUSED +#define TVIS_FOCUSED (TVIX_FOCUSED<<16) +#define TVIS_TEXTCOLOR (TVIX_TEXTCOLOR<<16) +#define TVC_ONLYFOCUS TVIF_ONLYFOCUS +#define TVC_UNSELECT 0x4000 +#define TVC_DESELECT 0x8000 +#define DEFAULT_IDENT 19 +#define DEFAULT_SHIFT 7 +#ifndef BPBF_COMPATIBLEBITMAP +#define BPBF_COMPATIBLEBITMAP 0 +#endif +#ifndef TVP_GLYPH +#define TVP_GLYPH 2 +#endif +#ifndef GLPS_CLOSED +#define GLPS_CLOSED 1 +#endif +#ifndef GLPS_OPENED +#define GLPS_OPENED 2 +#endif +#ifndef BP_CHECKBOX +#define BP_CHECKBOX 3 +#endif +#ifndef CBS_UNCHECKEDNORMAL +#define CBS_UNCHECKEDNORMAL 1 +#endif +#ifndef CBS_CHECKEDNORMAL +#define CBS_CHECKEDNORMAL 5 +#endif + + +#define TVAX_NONE (TVAE_NONE >>TVAE_MODEPOS)// No automatic edit +#define TVAX_EDIT (TVAE_EDIT >>TVAE_MODEPOS)// automatic edit with edit +#define TVAX_COMBO (TVAE_COMBO >>TVAE_MODEPOS)// automatic edit with ComboBox +#define TVAX_CBLIST (TVAE_CBLIST >>TVAE_MODEPOS)// automatic edit with ComboListBox +#define TVAX_STEP (TVAE_STEP >>TVAE_MODEPOS)// Einzelnes Weiterschalten mit Enter +#define TVAX_STEPED (TVAE_STEPED >>TVAE_MODEPOS)// Einzelnes Weiterschalten mit Enter und Edit +#define TVAX_CHECK (TVAE_CHECK >>TVAE_MODEPOS)// automatic edit with CheckBox +#define TVAX_CHECKED (TVAE_CHECKED>>TVAE_MODEPOS)// automatic edit with CheckBox and Edit + +#define TVIX_VARBUTTON 0x01 // buttons are not permanent +#define TVIX_HASBUTTON 0x02 // entry has button +#define TVIX_HASIMAGE 0x04 // entry has icon +#define TVIX_TRACKED 0x08 // entry under the cursor +#define TVIX_TEXTCOLOR 0x10 // entry has its own text color +#define TVIX_BKCOLOR 0x20 // entry has its own backround color +#define TVIX_FOCUSED 0x40 // entry has the focus + +typedef struct { + LPARAM lParam; // LPARAM argument for the item + LPTSTR pText; // pointer to the item text + UINT uState; // item state + int iImage; // item image index + int iSelectedImage; // item selected image index + unsigned uShowPos; // Ist die Position in der Sichtbarliste (0=unsichtbar) + unsigned uFirstChild; // Ist die Nummer des ersten Kind-Eintrages (0=keines) + unsigned uLastChild; // Ist die Nummer des letzten Kind-Eintrages (0=keines) + unsigned uPrevItem; // Ist die Nummer des vorherigen Eintrages (0=keines) + unsigned uNextItem; // Ist die Nummer des n�chsten Eintrages (0=keines) + unsigned uParent; // Ist die Nummer des Elterneintrages (0=Root) + unsigned uLevel; // Ist die Ebene des Eintrages (0=Root) + int iTextPixels; // Ist die Breites des Textes in Pixel + WORD uTextSize; // L�nge des Textes in Zeichen + BYTE bCallback; // Sind Bits f�r Callbacks + BYTE bFlags; // Diverse Flags + COLORREF uColorText; // Spezielle Textfarbe + COLORREF uColorBk; // Spezielle Hintergrundfarbe +} BaseItem; + +typedef struct { + LPTSTR pText; // Zeiger auf Tree-Text + UINT uState; // Zustand des Eintrages + int iImage; // Ist die Nummer des an zu zeigenden Icons + int iTextPixels; // Ist die Breites des Textes in Pixel + WORD uTextSize; // L�nge des Textes in Zeichen + BYTE bCallback; // Sind Bits f�r Callbacks + BYTE bFlags; // Diverse Flags + COLORREF uColorText; // Spezielle Textfarbe + COLORREF uColorBk; // Spezielle Hintergrundfarbe +} ExtraItem; + +typedef struct { + void *pCbData; // Data for autoedit + INT iCbIcon; // Starting offset for in icon list for autoedit + short sSize; // width of the column + short sReal; // real width of the column + short sMin; // minimum width + short sFixed; // fixed width + BYTE bMinEx; // the width cannot be less than min width + BYTE bWeight; // weight for variable columns + BYTE bNext; // Ist die Spalte die nach der eigenen sichtbar ist (gespeicherte Reihenfolge) + BYTE bIndex; // Ist die Spalte in der diese Reihe sichtbar ist (sichtbarer Index) + BYTE bAlign; // Text alignment + BYTE bEdit; // Automaisches Editiern einer Spalte (siehe TVAE_???>>7) + BYTE bFlags; // Automaisches Editiern einer Spalte (siehe TVAE_???) + BYTE bEnable; // Automaisches einer mit Statebits aktivieren + BYTE bCbSize; // Maximum number of entries in the data list + BYTE bCbChar; // separator for the data list + BYTE bMark; // is column marked ? + BYTE bDummy[32 - 23 - sizeof(void *)]; // padding bytes - 32 bytes alignment +} ColumnData; + +typedef struct { + HWND hWnd; // handle of the control + HANDLE hSem; // access semaphore + LPVOID hTheme; // Handle f�r benutztes Thema (TREELIST) + LPVOID hThemeBt; // Handle f�r benutztes Thema (BUTTON) + WNDPROC pProcId3; // Fenster Funktion f�r ID3 Fenster + HIMAGELIST hStates; // Handle der Icon-Liste f�r States und Overlay + HIMAGELIST hImages; // Handle der Icon-Liste + HIMAGELIST hChecks; // Handle der Icon-Liste f�r die Checkboxen in den Spalten + HIMAGELIST hSubImg; // Handle der Icon-Liste f�r die Spalten + HIMAGELIST hHeadImg; // Handle for header images + HFONT hFontN; // Normal font + HFONT hFontB; // Bold fonts + HFONT hFontL; // Last used font + HFONT hFontT; // Tooltip font + HWND hEdit; // Handle des Edit-Fensters + HWND hHeader; // Handle des Header Fensters + HWND hToolTip; // Handle des Tooltip-Fensters + WNDPROC pToolProc; // Alte Fensterfunktion des Tooltips + COLORREF uColors[MAX_COLORS]; // 0=Hintergrundfarbe 1=Abwechselnte Farbe 2=Farbe f�r Trennlinien 3=Textfarbe + int iFontHeight; // Ist die H�he des Fonts + int iFontLine; // Ist die Position der Linie beim unterstreichen + int iFontOff; // Ist die Position um der ein Text horizontal verschoben wird + int iStatesMode; // Die hStates Image-Liste wurde f�r die Checkboxen erzeugt + int iStatesXsize; // Breite der States und Overlay Icons + int iStatesYsize; // H�he der States und Overlay Icons + int iChecksMode; // Die hChecks Image-Liste wurde f�r die Checkboxen erzeugt + int iChecksXsize; // Breite der States und Overlay Icons + int iChecksYsize; // H�he der States und Overlay Icons + int iImagesXsize; // Breite der Icons + int iImagesYsize; // H�he der Icons + int iSubImgMode; // Die SubImg Image-Liste ist nicht die hImages Liste + int iSubImgXsize; // Breite der Icons + int iSubImgYsize; // H�he der Icons + int iRowHeight; // Ist die H�he einer Zeile + int iAllWeight; // Das Gewicht aller variablen Spalten + int iVarSize; // Ist die Breite aller variablen Spalten + int iFixSize; // Ist die Breite aller fixen Spalten + int iIndent; // Einr�ckung der Kindereint�ge + int iShift; // Einr�ckung der vertikalen Linien + int iAutoAdd; // Offset zum Open-Icon f�r TVS_EX_AUTOEXPANDICON + int iMaxSizeX; // Die Gr��e des breitesten sichtbaren Eintrages + unsigned uItemPosCount; // Anzahl der sichtbaren Eintr�ge + unsigned *pItemPos; // Liste mit den Offsets der sichtbaren Eintr�ge + BaseItem **pTreeItems; // Zeiger auf Item Zeiger + ExtraItem **pExtraItems[MAX_COLUMNS - 1]; // Zeiger auf die Spalteneintr�ge + unsigned uTreeItemsMax; // Gr��e der Liste mit den vorhanden Eintr�ge (alociert um 1 gr��er) + unsigned uTreeItemsCount; // Anzahl der vorhanden Eintr�ge + unsigned uNextSeachPos; // N�chste Position zum suchen von freien Eintr�gen + unsigned uUserDataSize; // Ist die Gr��e der Userdaten in einem Eintrag + unsigned uFirstChild; // Ist die Nummer des ersten Kind-Eintrages (0=keines) + unsigned uLastChild; // Ist die Nummer des letzten Kind-Eintrages (0=keines) + unsigned uSingleSel; // Ist die Nummer des gew�hlten Eintrages (bei Checkboxen) + unsigned uScrollX; // Aktuelle X-Scroll-Position + unsigned uScrollY; // Aktuelle Y-Scroll-Position + unsigned uSizeX; // Aktuelle X-Fenster-Gr��e + unsigned uSizeY; // Aktuelle Y-Fenster-Gr��e + unsigned uSizeYsub; // Aktuelle Y-Fenster-Gr��e ohne Header + unsigned uStyle; // Ist der aktuele Style des Fensters + unsigned uStyleEx; // Erweiterte Sytle-Flags (siehe TVS_EX_???) + unsigned uStartPixel; // Ist die Y-Koordinate bei der der erste Eintrag beginnt + unsigned uMaxEnties; // Anzahl der sichtbaren Eintr�ge (inkl. halbsichtbare) + unsigned uPageEnties; // Anzahl der sichtbaren Eintr�ge (ohne halbsichtbare) + unsigned uColumnCount; // Anzahl der Spalten + unsigned uColumnCountVar; // Anzahl der variabeln Spalten + unsigned uSelectedCount; // Anzahl der ausgew�hlten Eintr�ge + unsigned uSelectedBase; // Ist der Eintrag ab dem gew�hlt wurde + unsigned uSelectedItem; // Ist der Eintrag der gerade gew�hlt ist + unsigned uSelectedSub; // Ist die Spalte die gerade gew�hlt ist + unsigned uFocusItem; // Ist der Eintrag der einen leeren Focus hat + unsigned uFocusSub; // Ist die Spalte die einen leeren Focus hat + unsigned uToolTipItem; // Ist der ToolTip-Eintrag der gerade gew�hlt ist + unsigned uToolTipShow; // Ist die Zeitverz�gerung in 500 ms Schritten f�r das Tooltip + unsigned uToolTipSub; // Ist die ToolTip-Spalte die gerade gew�hlt ist + POINT sToolTipPos; // Ist die globale Koordinate des ToolTips + unsigned uEditMode; // Ist der Modus des Editfensters (0=Edit 1=ComboBox 2=ComboBox fix) + unsigned uEditItem; // Ist der Eintrag der gerade editiert wird + unsigned uEditSub; // Ist die Spalte die gerade editiert wird + unsigned uOldXPage; // Alte Werte f�r X-Scroll-Bar + unsigned uOldXCount; // * + unsigned uOldYPage; // Alte Werte f�r Y-Scroll-Bar + unsigned uOldYCount; // * + unsigned uTrippleB; // Bereite des "..." Strings f�r den fetten Fonts + unsigned uTrippleN; // Bereite des "..." Strings f�r den normalen Fonts + unsigned uTrackedItem; // Ist der Eintrag der unterstrichen werden soll + unsigned uTrackedSub; // Ist die Spalte des Eintrages der unterstrichen werden soll + unsigned uInsertMark; // Ist der Eintrag mit der Einf�gemarke + unsigned uMarkedCols; // Anzahl der markierten Spalten + unsigned uDragFlags; // Welche Maustasten sind an + unsigned uDragItem; // Eintrag f�r Dragoperation + unsigned uDragSub; // Untereintrag f�r Dragoperation + unsigned uLastSel; // Letzte Textauswahl beim Editieren + unsigned uLastMove; // Letzte Cursorposition bei WM_MOUSEMOVE + unsigned uButtonPos; // Wo wurde eine Maustaste wurde zuletzt gedr�ckt + unsigned uButtonLast; // Wann wurde eine Maustaste wurde zuletzt gedr�ckt + unsigned uToolTipSize; // Textspeichergr��e f�r Tooltip + LPTSTR pToolTipText; // Textspeicher f�r Tooltip + TCHAR cTempText1 [260]; // Erster Textpuffer f�r Callbacks + TCHAR cTempText2 [260]; // Zeiter Textpuffer f�r Callbacks + ColumnData aColumn [MAX_COLUMNS]; // Daten der Spalten + int aColumnXpos [MAX_COLUMNS + 2]; // Array mit den Positionen der Spalten + BYTE aColumnPos [MAX_COLUMNS + 2]; // Array mit Anzeigepositionen der Spalten + char cColorChanged[MAX_COLORS ]; // Welche Farbe wurden ver�ndert + char cColumnStart; // Wurde das Autoeditiren mit einer WM_CHAR Eingabe gestartet + char cFixedHeight; // Ist eine fixe H�he eingestellt + char cLockChanges; // Sperren von Fenster�nderungen + char cHasRootRow; // Wird gesetzt wenn eine Root-Spalte eingef�gt wird + char cKeyIgnore; // Die n�chste Taste nicht f�r Sucher verwenden + char cClickFlag; // Merker f�r LBUTTON-DOWN bei Multiselect + char cClickEdit; // Merker f�r LBUTTON-DOWN bei Edit-Click + char cIsEnabled; // Ist das Fenster freigegeben + char cHasFocus; // Hat das Fenster den Focus + char cReSelect; // Soll die Auswahl neu selektiert werden + char cGlyphOk; // Die Schaltf�che �ber Themen zeichnen + char cEditCb; // Muss das Edit-Fenster einen Callback aufrufen + char cButtonFlag; // Welche Maustaste wurde zuletzt gedr�ckt +} TreeListData; + +typedef HRESULT(WINAPI *SetWindowThemeT)(HWND, LPCWSTR, LPCWSTR); +typedef HRESULT(WINAPI *EndBufferedPtT)(HANDLE, BOOL); +typedef HANDLE(WINAPI *BeginBufferedPnT)(HDC, RECT *, DWORD, LPVOID, HDC *); +typedef HRESULT(WINAPI *BufferedPtInitT)(VOID); +typedef HRESULT(WINAPI *BufferedPtInitT)(VOID); +typedef LPVOID (WINAPI *OpenThemeDataT)(HWND hwnd, LPCWSTR pszClassList); +typedef HRESULT(WINAPI *CloseThemeDataT)(LPVOID); +typedef HRESULT(WINAPI *DrawThemeBackgT)(LPVOID, HDC, int, int, const RECT *, const RECT *); +typedef HRESULT(WINAPI *GetThemeBackgRcT)(LPVOID, HDC, int, int, LPCRECT, LPRECT); +typedef BOOL (WINAPI *IsAppThemedT)(); +typedef BOOL (WINAPI *IsThemeActiveT)(); + +static HMODULE hUxThemeDll = NULL; +static SetWindowThemeT pSetWindowTheme = NULL; +static EndBufferedPtT pEndBufferedPt = NULL; +static BeginBufferedPnT pBeginBufferedPt = NULL; +static BufferedPtInitT pBufferedPtInit = NULL; +static BufferedPtInitT pBufferedPtExit = NULL; +static OpenThemeDataT pOpenThemeData = NULL; +static CloseThemeDataT pCloseThemeData = NULL; +static DrawThemeBackgT pDrawThemeBackg = NULL; +static GetThemeBackgRcT pGetThemeBackgRc = NULL; +static IsAppThemedT pIsAppThemed = NULL; +static IsThemeActiveT pIsThemeActive = NULL; +static HPEN hPatternPen = NULL; +static HFONT hDefaultFontN = NULL; +static HFONT hDefaultFontB = NULL; +static LONG lWindowCount = -1; +#ifndef __REACTOS__ +static RECT sToolRect = { -2, 0, 2, 64}; +#endif +static TCHAR cKeyData[16]; +static unsigned uKeyLast; +static unsigned uKeyPos; +static void TreeListDraw(HWND hWnd, HDC hDc, RECT *pRect); +static LRESULT CALLBACK TreeListProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +static int TreeListSelectItem(TreeListData *pData, unsigned uItem, unsigned uSubItem, int iMode); +static int TreeListGetItemRect(TreeListData *pData, unsigned uItem, unsigned uFlags, RECT *pRect); +static int TreeListStartNotifyEdit(TreeListData *pData, unsigned uItem, unsigned uSub, WPARAM wParam, LPARAM lParam); +static int TreeListStartAutoEdit(TreeListData *pData, unsigned uColumn, WPARAM wParam, LPARAM lParam); +static int TreeListEndLabelEdit(TreeListData *pData, int iMode); +static BOOL bDrawWithTheme = FALSE; + +//***************************************************************************** +//* +//* TreeListRegister +//* +//***************************************************************************** +// Registiert das TreeList Fenster. +// Ergibt 1 wenn das Fenster erfolgreich registiert wurde. +int TreeListRegister(HINSTANCE hInstance) { + + static int iIsRegistered = FALSE; + WNDCLASSEX sClass; + + OutputDebugString(TEXT("TreeListRegister() - before checking\n")); + + if(iIsRegistered) + return TRUE; + + OutputDebugString(TEXT("TreeListRegister() - before registration\n")); + + memset(&sClass, 0, sizeof(sClass)); + sClass.cbSize = sizeof(sClass); + sClass.style = CS_DBLCLKS | CS_GLOBALCLASS; + sClass.lpfnWndProc = TreeListProc; + sClass.cbClsExtra = 0; + sClass.cbWndExtra = sizeof(TreeListData *); + sClass.hInstance = hInstance; + sClass.hIcon = NULL; + sClass.hCursor = LoadCursor(NULL, IDC_ARROW); + sClass.hbrBackground = NULL; + sClass.lpszMenuName = NULL; + sClass.hIconSm = NULL; + sClass.lpszClassName = _T(TVC_CLASSNAME); + + if(!RegisterClassEx(&sClass)) + return 0; + + OutputDebugString(TEXT("TreeListRegister() - registration done\n")); + iIsRegistered = TRUE; + + return TRUE; +} + +BOOL TreeListUnregister(HINSTANCE hInstance){ + return UnregisterClass(_T(TVC_CLASSNAME),hInstance); +} + +//***************************************************************************** +//* +//* GlobalInit +//* +//***************************************************************************** +static void GlobalInit() { + + LOGBRUSH sLog; + long lCount; + + + + lCount = InterlockedIncrement(&lWindowCount); + if(lCount > 0) + return; + + sLog.lbColor = GetSysColor(COLOR_BTNSHADOW); + sLog.lbStyle = PS_SOLID; + sLog.lbHatch = 0; + hPatternPen = ExtCreatePen(PS_COSMETIC | PS_ALTERNATE, 1, &sLog, 0, NULL); + + if(!hPatternPen) { + hPatternPen = CreatePen(PS_DOT, 1, RGB(0, 0, 0)); + } + + + if(!hUxThemeDll) { + hUxThemeDll = LoadLibrary(_T("UxTheme.dll")); + if(hUxThemeDll) { + pSetWindowTheme = (SetWindowThemeT)GetProcAddress(hUxThemeDll, "SetWindowTheme"); + pEndBufferedPt = (EndBufferedPtT)GetProcAddress(hUxThemeDll, "EndBufferedPaint"); + pBeginBufferedPt = (BeginBufferedPnT)GetProcAddress(hUxThemeDll, "BeginBufferedPaint"); + pBufferedPtInit = (BufferedPtInitT)GetProcAddress(hUxThemeDll, "BufferedPaintInit"); + pBufferedPtExit = (BufferedPtInitT)GetProcAddress(hUxThemeDll, "BufferedPaintUnInit"); + pOpenThemeData = (OpenThemeDataT)GetProcAddress(hUxThemeDll, "OpenThemeData"); + pCloseThemeData = (CloseThemeDataT)GetProcAddress(hUxThemeDll, "CloseThemeData"); + pDrawThemeBackg = (DrawThemeBackgT)GetProcAddress(hUxThemeDll, "DrawThemeBackground"); + pGetThemeBackgRc = (GetThemeBackgRcT)GetProcAddress(hUxThemeDll, "GetThemeBackgroundContentRect"); + pIsAppThemed = (IsAppThemedT)GetProcAddress(hUxThemeDll, "IsAppThemed"); + pIsThemeActive = (IsThemeActiveT)GetProcAddress(hUxThemeDll, "IsThemeActive"); + + if(pIsAppThemed && pIsThemeActive) + bDrawWithTheme = pIsAppThemed() && pIsThemeActive(); + } + } + + if(pBufferedPtInit) { + pBufferedPtInit(); + } + +} + + +//***************************************************************************** +//* +//* GlobalDeinit +//* +//***************************************************************************** +static void GlobalDeinit() { + + int lCount; + + lCount = InterlockedDecrement(&lWindowCount); + if(lCount >= 0) + return; + + if(hDefaultFontN) { + DeleteObject(hDefaultFontN); + hDefaultFontN = NULL; + } + + if(hDefaultFontB) { + DeleteObject(hDefaultFontB); + hDefaultFontB = NULL; + } + + if(hPatternPen) { + DeleteObject(hPatternPen); + hPatternPen = NULL; + } + + if(pBufferedPtExit) { + pBufferedPtExit(); + } + +} + + +//***************************************************************************** +//* +//* SendNotify +//* +//***************************************************************************** +// Sendet eine WM_NOTIFY Nachricht and das Elternfenster +// pData : Zeiger auf die Fensterdaten +// pNotify : Zeiger auf die Notify-Daten +// Ergibt den R�ckgabewert der WM_NOTIFY Nachrich +static LRESULT SendNotify(TreeListData *pData, NMHDR *pNotify) { + + pNotify->hwndFrom = pData->hWnd; + pNotify->idFrom = GetWindowLong(pNotify->hwndFrom, GWL_ID); + + return SendMessage(GetParent(pNotify->hwndFrom), WM_NOTIFY, pNotify->idFrom, (LPARAM)pNotify); +} + + +//***************************************************************************** +//* +//* CallbackEntry +//* +//***************************************************************************** +// Sendet eine WM_NOTIFY Nachricht and das Elternfenster um Daten zuholen +// pData : Zeiger auf die Fensterdaten +// pEntry : Zeiger auf den Eintrag +// uItem : Nummer des Eintrages +// uFlags : Welche Daten sollen abgefragt werden +// Ergibt den R�ckgabewert der WM_NOTIFY Nachrich +static void CallbackEntry(TreeListData *pData, BaseItem *pEntry, unsigned uItem, unsigned uFlags, int *iImage, unsigned *uTextSize, LPCTSTR *pText) { + + NMTVDISPINFO sInfo; + + sInfo.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | uFlags; + sInfo.item.lParam = pEntry->lParam; + sInfo.item.hItem = (HTREEITEM)uItem; + sInfo.item.state = pEntry->uState; + sInfo.item.stateMask = 0xFFFFFFFF; + sInfo.item.iImage = I_IMAGECALLBACK; + sInfo.item.iSelectedImage = I_IMAGECALLBACK; + sInfo.item.cChildren = I_CHILDRENCALLBACK; + + if(uFlags & TVIF_TEXT) { + if(*uTextSize) { + pData->cTempText2[sizeof(pData->cTempText2) / sizeof(TCHAR) - 1] = 0; + pData->cTempText2[0] = 0; + sInfo.item.pszText = pData->cTempText2; + sInfo.item.cchTextMax = sizeof(pData->cTempText2) / sizeof(TCHAR) - 1; + } else { + pData->cTempText1[sizeof(pData->cTempText1) / sizeof(TCHAR) - 1] = 0; + pData->cTempText1[0] = 0; + sInfo.item.pszText = pData->cTempText1; + sInfo.item.cchTextMax = sizeof(pData->cTempText1) / sizeof(TCHAR) - 1; + } + } else { + sInfo.item.pszText = 0; + sInfo.item.cchTextMax = 0; + } + + sInfo.hdr.hwndFrom = pData->hWnd; + sInfo.hdr.idFrom = GetWindowLong(pData->hWnd, GWL_ID); + sInfo.hdr.code = TVN_GETDISPINFO; + + UNLOCK(pData); + SendMessage(GetParent(sInfo.hdr.hwndFrom), WM_NOTIFY, sInfo.hdr.idFrom, (LPARAM)&sInfo); + LOCK(pData); + + if(uFlags & TVIF_IMAGE) { + if(!(pEntry->uState & TVIS_SELECTED)) + *iImage = sInfo.item.iImage; + } else + if(uFlags & TVIF_SELECTEDIMAGE) { + if(pEntry->uState & TVIS_SELECTED) + *iImage = sInfo.item.iSelectedImage; + } + + if(uFlags & TVIF_CHILDREN) { + switch(sInfo.item.cChildren) { + case 0: + pEntry->bFlags &= ~TVIX_HASBUTTON; + pEntry->bFlags |= TVIX_VARBUTTON; + break; + + case 1: + pEntry->bFlags &= ~TVIX_VARBUTTON; + pEntry->bFlags |= TVIX_HASBUTTON; + break; + + default + : + pEntry->bFlags |= TVIX_VARBUTTON; + + if(pEntry->uFirstChild) + pEntry->bFlags |= TVIX_HASBUTTON; + else + pEntry->bFlags &= ~TVIX_HASBUTTON; + } + } + + if(uFlags & TVIF_TEXT) { + *pText = sInfo.item.pszText; + *uTextSize = str_len(sInfo.item.pszText); + pEntry->iTextPixels = 0; + } + +} + +//***************************************************************************** +//* +//* CallbackExtra +//* +//***************************************************************************** +// Sendet eine WM_NOTIFY Nachricht and das Elternfenster um Daten zuholen +// pData : Zeiger auf die Fensterdaten +// pEntry : Zeiger auf den Eintrag +// uItem : Nummer des Eintrages +// uFlags : Welche Daten sollen abgefragt werden +// Ergibt den R�ckgabewert der WM_NOTIFY Nachrich +static void CallbackExtra(TreeListData *pData, BaseItem *pEntry, ExtraItem *pExtra, unsigned uItem, unsigned uSub, unsigned uFlags, int *iImage, unsigned *uTextSize, LPCTSTR *pText) { + + NMTVDISPINFO sInfo; + + sInfo.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | uFlags; + sInfo.item.lParam = pEntry->lParam; + sInfo.item.hItem = (HTREEITEM)uItem; + sInfo.item.state = pExtra->uState; + sInfo.item.state |= (pEntry->uState & TVIS_BASEFLAGS); + sInfo.item.stateMask = 0xFFFFFFFF; + sInfo.item.iImage = I_IMAGECALLBACK; + sInfo.item.iSelectedImage = I_IMAGECALLBACK; + sInfo.item.cChildren = uSub; + + if(uFlags & TVIF_TEXT) { + pData->cTempText1[sizeof(pData->cTempText1) / sizeof(TCHAR) - 1] = 0; + pData->cTempText1[0] = 0; + sInfo.item.pszText = pData->cTempText1; + sInfo.item.cchTextMax = sizeof(pData->cTempText1) / sizeof(TCHAR) - 1; + } else { + sInfo.item.pszText = 0; + sInfo.item.cchTextMax = 0; + } + + sInfo.hdr.hwndFrom = pData->hWnd; + sInfo.hdr.idFrom = GetWindowLong(pData->hWnd, GWL_ID); + sInfo.hdr.code = TVN_GETDISPINFO; + + UNLOCK(pData); + SendMessage(GetParent(sInfo.hdr.hwndFrom), WM_NOTIFY, sInfo.hdr.idFrom, (LPARAM)&sInfo); + LOCK(pData); + + + if(uFlags & TVIF_IMAGE) + *iImage = sInfo.item.iImage; + if(uFlags & TVIF_TEXT) { + *pText = sInfo.item.pszText; + *uTextSize = str_len(sInfo.item.pszText); + } + +} + +//***************************************************************************** +//* +//* EditProc +//* +//***************************************************************************** +// Ist die Fensterfunktion f�r das Edit Fenster +static LRESULT CALLBACK EditProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + + TreeListData *pData; + WNDPROC pProc; + DWORD dwStop; + DWORD dwStart; + DWORD dwCount; + LRESULT lResult; + HWND hParent; + HWND hCombo; + int iDelta; + int iState; + int iPos; + int iId; + + + hParent = GetParent(hWnd); + iId = GetWindowLong(hWnd, GWL_ID); + + if(iId == 3) { + hCombo = hWnd; + pData = GetHandle(hParent); + pProc = pData->pProcId3; + } else { + hCombo = hParent; + hParent = GetParent(hParent); + pData = GetHandle(hParent); + pProc = (WNDPROC)GetWindowLongPtr(hWnd, GWLP_USERDATA); + } + + if(uMsg == WM_KEYDOWN) { + if(wParam == VK_RETURN) { + SendMessage(hParent, WM_COMMAND, MAKELONG(3, EN_RETURN), (LPARAM)hWnd); + return 0; + } + + if(wParam == VK_ESCAPE) { + SendMessage(hParent, WM_COMMAND, MAKELONG(3, EN_ESCAPE), (LPARAM)hWnd); + return 0; + } + + if((pData->uStyleEx & TVS_EX_STEPOUT) && !(GetAsyncKeyState(VK_SHIFT) & 0x8000)) { + switch(wParam) { // Aus Fenster springen + + case VK_UP: + if(pData->uEditMode) + break; + PostMessage(hParent, WM_COMMAND, MAKELONG(3, EN_RETURN), (LPARAM)hWnd); + PostMessage(hParent, WM_KEYDOWN, VK_UP , 0x00500001); + PostMessage(hParent, WM_KEYUP , VK_UP , 0x00500001); + return 0; + + case VK_DOWN: + if(pData->uEditMode) + break; + PostMessage(hParent, WM_COMMAND, MAKELONG(3, EN_RETURN), (LPARAM)hWnd); + PostMessage(hParent, WM_KEYDOWN, VK_DOWN, 0x00500001); + PostMessage(hParent, WM_KEYUP , VK_DOWN, 0x00500001); + return 0; + + case VK_LEFT: + if(pData->uEditMode && iId == 3) + break; + SendMessage(hWnd, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwStop); + if(dwStart || dwStop) + break; + PostMessage(hParent, WM_COMMAND, MAKELONG(3, EN_RETURN), (LPARAM)hWnd); + PostMessage(hParent, WM_KEYDOWN, VK_LEFT, 0x00500001); + PostMessage(hParent, WM_KEYUP , VK_LEFT, 0x00500001); + return 0; + + case VK_RIGHT: + if(pData->uEditMode && iId == 3) + break; + SendMessage(hWnd, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwStop); + dwCount = (DWORD)SendMessage(hWnd, EM_LINELENGTH, 0, 0); + if(dwCount > dwStart) + break; + if(dwCount > dwStop) + break; + + PostMessage(hParent, WM_COMMAND, MAKELONG(3, EN_RETURN), (LPARAM)hWnd); + PostMessage(hParent, WM_KEYDOWN, VK_RIGHT, 0x00500001); + PostMessage(hParent, WM_KEYUP , VK_RIGHT, 0x00500001); + return 0; + } + } + + if(wParam == VK_DOWN && pData->uEditMode) { + if(!SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0)) { + SendMessage(hCombo, CB_SHOWDROPDOWN, 1, 0); + return 0; + } + } + } else + if(uMsg == WM_CHAR) { + if(wParam == VK_RETURN) { + return 0; + } + + if(wParam == VK_ESCAPE) { + return 0; + } + } else + if(uMsg == WM_COMMAND) { + if(wParam == MAKELONG(3, EN_ESCAPE) || wParam == MAKELONG(3, EN_RETURN)) { + SendMessage(hParent, WM_COMMAND, wParam, (LPARAM)hWnd); + return 0; + } + } else + if(uMsg == WM_MOUSEWHEEL) { + iState = (int)CallWindowProc(pProc, hWnd, CB_GETDROPPEDSTATE, 0, 0); + if(iState) { + iDelta = (short)HIWORD(wParam); + iDelta /= WHEEL_DELTA; + iPos = (int)CallWindowProc(pProc, hWnd, CB_GETTOPINDEX, 0, 0); + iPos -= iDelta; + CallWindowProc(pProc, hWnd, CB_SETTOPINDEX, iPos, 0); + return 0; + } + } else + if(uMsg == WM_GETDLGCODE) { // Welche Tasten werden im Dialog benutzt + return DLGC_WANTALLKEYS; + } else + if(uMsg == WM_SETTEXT) { + lResult = CallWindowProc(pProc, hWnd, uMsg, wParam, lParam);; + SendMessage(hParent, WM_COMMAND, MAKELONG(3, EN_SETTEXT), (LPARAM)hWnd); + return lResult; + } + + return CallWindowProc(pProc, hWnd, uMsg, wParam, lParam); +} + +//***************************************************************************** +//* +//* ToolProc +//* +//***************************************************************************** +// Ist die Fensterfunktion f�r das ToolTip Fenster +static LRESULT CALLBACK ToolProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + + TreeListData *pData; + POINT sPoint; + UINT uPos; + + if(uMsg == WM_SETFOCUS) { + SetFocus((HWND)lParam); + return 0; + } + + pData = (TreeListData *)GetWindowLongPtr(hWnd, GWLP_USERDATA); + + if(uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST) { // Mausklicks auf Tooltip zum Elternfenster + sPoint.x = LOWORD(lParam); + sPoint.y = HIWORD(lParam); + + ClientToScreen(hWnd , &sPoint); + ScreenToClient(pData->hWnd, &sPoint); + + uPos = MAKELONG(sPoint.x, sPoint.y); + + return TreeListProc(pData->hWnd, uMsg, wParam, uPos); + } + + return CallWindowProc(pData->pToolProc, hWnd, uMsg, wParam, lParam); +} + +//***************************************************************************** +//* +//* ChangeColSize +//* +//***************************************************************************** +// �ndert die Gr��e der variablen Spalten +// pData : Zeiger auf die Fensterdaten +// iDelta : Ist die Gr��en�nderung in Pixel +static void ChangeColSize(TreeListData *pData, int iDelta) { + + unsigned uPos; + HDITEM sItem; + RECT sRect; + TV_COLSIZE sNotify; + int iWeight; + int iValue; + int iPoint; + int iStart; + int iSize; + int iRest; + int iOff; + int iNum; + int iCnt; + int iAll; + int iVar; + int iFix; + + sItem.mask = HDI_WIDTH; + iAll = pData->iAllWeight; + iCnt = pData->uColumnCountVar; + + if(iCnt <= 1) { // Nur eine variable Spalte + for(uPos = 0; uPos < pData->uColumnCount; uPos++) { + iWeight = pData->aColumn[uPos].bWeight; + if(!iWeight) + continue; + + iValue = pData->aColumn[uPos].sSize; + iValue += iDelta; + sItem.cxy = iValue; + + pData->aColumn[uPos].sSize = (short)iValue; + pData->iVarSize = iValue; + + if(sItem.cxy < pData->aColumn[uPos].sMin) { + sItem.cxy = pData->aColumn[uPos].sMin; + } + + if(pData->aColumn[uPos].sReal != sItem.cxy) { // �ndert sich die Breite + pData->aColumn[uPos].sReal = (short)sItem.cxy; + Header_SetItem(pData->hHeader, uPos, &sItem); + + if(pData->uStyleEx & TVS_EX_HEADERCHGNOTIFY) { + sNotify.hdr.code = TVN_COLUMNCHANGED; + sNotify.uColumn = uPos; + sNotify.uIndex = pData->aColumn[uPos].bIndex; + sNotify.uPosX = pData->aColumnXpos[uPos]; + sNotify.iSize = sItem.cxy; + + UNLOCK(pData); + SendNotify(pData, &sNotify.hdr); + LOCK(pData); + } + } + + break; + } + + return; + } + + if(iDelta > 0) + iStart = (pData->uSizeX) % iAll; + else + iStart = (pData->uSizeX - iDelta) % iAll; + + iOff = 0; + + for(uPos = 0;; uPos++) { // Suchen die Anfangsspalte + iWeight = pData->aColumn[uPos].bWeight; + if(!iWeight) + continue; + + iOff += iWeight; + if(iOff > iStart) + break; + } + + + iPoint = 0; + iSize = iDelta / iAll; + iRest = iDelta % iAll; + iNum = iRest; + iOff -= iStart; + + iWeight = iOff; + iValue = pData->aColumn[uPos].sSize; + iValue += iSize * iWeight; + iPoint += iRest * iWeight; + iValue += iPoint / iAll; + iNum -= iPoint / iAll; + iPoint %= iAll; + + pData->aColumn[uPos].sSize = (short)iValue; + + + if(iWeight >= pData->aColumn[uPos].bWeight) { // Wurde die ganze Spalte berechnet + iCnt--; + iOff = 0; + } + + while(iCnt > 0) { + uPos++; + + if(uPos >= pData->uColumnCount) + uPos = 0; + iWeight = pData->aColumn[uPos].bWeight; + if(!iWeight) + continue; + + iValue = pData->aColumn[uPos].sSize; + + iCnt--; + if(iCnt) { + iValue += iSize * iWeight; + iPoint += iRest * iWeight; + iValue += iPoint / iAll; + iNum -= iPoint / iAll; + iPoint %= iAll; + } else { + iWeight -= iOff; + iValue += iSize * iWeight; + iValue += iNum; + } + + pData->aColumn[uPos].sSize = (short)iValue; + } + + iVar = 0; + iFix = 0; + iCnt = pData->uColumnCountVar; + + for(uPos = 0; iCnt > 0; uPos++) { // Ausgeben der neuen Breiten + iWeight = pData->aColumn[uPos].bWeight; + if(!iWeight) { + iFix += pData->aColumn[uPos].sSize; + continue; + } + + iVar += pData->aColumn[uPos].sSize; + sItem.cxy = pData->aColumn[uPos].sSize; + + if(sItem.cxy < pData->aColumn[uPos].sMin) { + sItem.cxy = pData->aColumn[uPos].sMin; + } + + if(pData->aColumn[uPos].sReal != sItem.cxy) { // �ndert sich die Breite + pData->aColumn[uPos].sReal = (short)sItem.cxy; + Header_SetItem(pData->hHeader, uPos, &sItem); + + if(pData->uStyleEx & TVS_EX_HEADERCHGNOTIFY) { + sNotify.hdr.code = TVN_COLUMNCHANGED; + sNotify.uColumn = uPos; + sNotify.uIndex = pData->aColumn[uPos].bIndex; + sNotify.uPosX = pData->aColumnXpos[uPos]; + sNotify.iSize = sItem.cxy; + + UNLOCK(pData); + SendNotify(pData, &sNotify.hdr); + LOCK(pData); + } + } + + iCnt--; + } + + pData->iFixSize = iFix; + pData->iVarSize = iVar; + + if(iDelta > 0) { + GetClientRect(pData->hHeader, &sRect); + InvalidateRect(pData->hHeader, NULL, FALSE); + } + +} + +//***************************************************************************** +//* +//* CreateToolTip +//* +//***************************************************************************** +// Erzeugt ein ToolTip Fenster +// pData : Zeiger auf die Fensterdaten +static void CreateToolTip(TreeListData *pData) { + + TOOLINFO sInfo; + + if(pData->hToolTip) + return; + + pData->hToolTip = CreateWindow(TOOLTIPS_CLASS, NULL, WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, pData->hWnd, NULL, NULL, NULL); + pData->pToolProc = (WNDPROC)GetWindowLongPtr(pData->hToolTip, GWLP_WNDPROC); + + sInfo.cbSize = sizeof(TOOLINFO); + sInfo.uFlags = TTF_ABSOLUTE | TTF_TRACK | TTF_IDISHWND; + sInfo.hwnd = pData->hWnd; + sInfo.hinst = NULL; + sInfo.uId = (LPARAM)(pData->hWnd); + sInfo.lpszText = LPSTR_TEXTCALLBACK; + + GetClientRect(pData->hWnd, &sInfo.rect); + SendMessage(pData->hToolTip, TTM_ADDTOOL, 0, (LPARAM)&sInfo); + SendMessage(pData->hToolTip, TTM_SETMAXTIPWIDTH, 0, 10000); + SetWindowLong(pData->hToolTip, GWL_ID, 2); + SetWindowLongPtr(pData->hToolTip, GWLP_USERDATA, (LPARAM)pData); + SetWindowLongPtr(pData->hToolTip, GWLP_WNDPROC , (LPARAM)ToolProc); +} + +//***************************************************************************** +//* +//* CreateStateImageList +//* +//***************************************************************************** +// Erzeugt eine Image-Liste mit zwei Checkboxen +// pData : Zeiger auf die Fensterdaten +// iMode : Welche Imageliste soll erzeugt werden (0=hStates 1=hChecks) +static void CreateStateImageList(TreeListData *pData, int iMode) { + + BITMAPINFO sInfo; + BYTE aMem[0x1000]; + HDC hDcSrc; + HDC hDc; + HBITMAP hBmp; + HBITMAP hBmpNew; + RECT sRect; + int iBits; + + if(pOpenThemeData) { // �ber Thema zeichnen + if(!pData->hThemeBt) { + pData->hThemeBt = pOpenThemeData(pData->hWnd, L"BUTTON"); + } + + if(pData->hThemeBt) { + if(iMode) { + if(pData->hChecks && pData->hChecks != THEMEIMGLIST) { + ImageList_Destroy(pData->hChecks); + } + + pData->hChecks = THEMEIMGLIST; + pData->iChecksXsize = 16; + pData->iChecksYsize = 16; + pData->iChecksMode = 1; + } else { + if(pData->hStates && pData->hStates != THEMEIMGLIST) { + ImageList_Destroy(pData->hStates); + } + + pData->hStates = THEMEIMGLIST; + pData->iStatesXsize = 16; + pData->iStatesYsize = 16; + pData->iStatesMode = 1; + } + + return; + } + } + + if(iMode) { + if(pData->hChecks && pData->hChecks != THEMEIMGLIST) + return; + } else { + if(pData->hStates && pData->hStates != THEMEIMGLIST) + return; + } + + hDcSrc = GetDC(NULL); + hDc = CreateCompatibleDC(NULL); + hBmp = CreateCompatibleBitmap(hDcSrc, 16 * 3, 16); + + SelectObject(hDc, hBmp); + SelectObject(hDc, GetStockObject(NULL_PEN)); + SetBkMode(hDc, OPAQUE); + SetBkColor(hDc, GetSysColor(COLOR_WINDOW)); + SelectObject(hDc, GetSysColorBrush(COLOR_HIGHLIGHT)); + Rectangle(hDc, -1, -1, 16 * 3 + 2, 16 + 2); + + sRect.top = 8 - 6; + sRect.bottom = 8 + 7; + sRect.left = 16 * 1 + 8 - 7; + sRect.right = 16 * 1 + 8 + 6; + + DrawFrameControl(hDc, &sRect, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_FLAT); + + sRect.left = 16 * 2 + 8 - 7; + sRect.right = 16 * 2 + 8 + 6; + + DrawFrameControl(hDc, &sRect, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_CHECKED | DFCS_FLAT); + + iBits = GetDeviceCaps(hDc, BITSPIXEL); + + sInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + sInfo.bmiHeader.biWidth = 16 * 3; + sInfo.bmiHeader.biHeight = 16; + sInfo.bmiHeader.biPlanes = 1; + sInfo.bmiHeader.biBitCount = (WORD)iBits; + sInfo.bmiHeader.biCompression = BI_RGB; + sInfo.bmiHeader.biSizeImage = 0; + sInfo.bmiHeader.biXPelsPerMeter = 0; + sInfo.bmiHeader.biYPelsPerMeter = 0; + sInfo.bmiHeader.biClrUsed = (iBits > 8) ? 0 : 1 << iBits;; + sInfo.bmiHeader.biClrImportant = (iBits > 8) ? 0 : 1 << iBits;; + + GetDIBits(hDc, hBmp, 0, 0 , NULL, &sInfo, (iBits > 8) ? DIB_RGB_COLORS : DIB_PAL_COLORS); + GetDIBits(hDc, hBmp, 0, 16, aMem, &sInfo, (iBits > 8) ? DIB_RGB_COLORS : DIB_PAL_COLORS); + + hBmpNew = CreateCompatibleBitmap(hDc, 16 * 3, 16); + + SetDIBits(hDc, hBmpNew, 0, 16, aMem, &sInfo, (iBits > 8) ? DIB_RGB_COLORS : DIB_PAL_COLORS); + + if(iMode == 0) { + pData->hStates = ImageList_Create(16, 16, ILC_COLORDDB | ILC_MASK, 3, 14); + pData->iStatesXsize = 16; + pData->iStatesYsize = 16; + pData->iStatesMode = 1; + + ImageList_AddMasked(pData->hStates, hBmpNew, GetSysColor(COLOR_HIGHLIGHT)); + } else { + pData->hChecks = ImageList_Create(16, 16, ILC_COLORDDB | ILC_MASK, 3, 14); + pData->iChecksXsize = 16; + pData->iChecksYsize = 16; + pData->iChecksMode = 1; + + ImageList_AddMasked(pData->hChecks, hBmpNew, GetSysColor(COLOR_HIGHLIGHT)); + } + + DeleteObject(hBmpNew); + DeleteObject(hBmp); + DeleteDC(hDc); + ReleaseDC(NULL, hDcSrc); +} + +//***************************************************************************** +//* +//* CreateDragImage +//* +//***************************************************************************** +// Erzeugt eine Image-Liste mit zwei Checkboxen +// pData : Zeiger auf die Fensterdaten +// uSub : Ist die Spalte f�r die das Drag-Image erzeugt werden soll +// Ergibt ein Handle mit der Imageliste oder NULL bei einem Fehler +static HIMAGELIST CreateDragImage(TreeListData *pData, unsigned uItem, unsigned uSub) { + + ExtraItem *pExtra; + BaseItem *pEntry; + HIMAGELIST hList; + BITMAPINFO sInfo; + BYTE *pMem; + HDC hDcSrc; + HDC hDc; + HBITMAP hBmp; + HBITMAP hBmpNew; + RECT sRect; + unsigned uTSize; + int iAdd; + int iBits; + int iWidth; + int iHeigh; + int iImage; + int iYpos; + LPCTSTR pText; + + if(uItem > pData->uTreeItemsMax) + return NULL; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + + iHeigh = pData->iFontHeight; + + if(uSub) { // Image f�r Extraeintrag erzeugen + if(uSub >= pData->uColumnCount) + return 0; + + pExtra = pData->pExtraItems[uSub - 1][uItem]; + if(!pExtra) { + pText = _T("????"); + uTSize = 4; + iImage = -1; + iWidth = pData->iFontHeight * 4; + } else { + pText = pExtra->pText; + uTSize = pExtra->uTextSize; + iImage = pExtra->iImage; + iWidth = pExtra->iTextPixels; + + if(pExtra->bCallback & (TVIF_IMAGE | TVIF_TEXT)) { + CallbackExtra(pData, pEntry, pExtra, uItem, uSub, pExtra->bCallback, &iImage, &uTSize, &pText); + } + } + } else { // Image f�r Haupteintrag erzeugen + pText = pEntry->pText; + uTSize = pEntry->uTextSize; + iImage = pEntry->iImage; + iWidth = pEntry->iTextPixels; + + if(pEntry->bCallback & (TVIF_IMAGE | TVIF_TEXT)) { + CallbackEntry(pData, pEntry, uItem, pEntry->bCallback, &iImage, &uTSize, &pText); + } + } + + if(pData->hImages && iImage >= 0) { // Gr��en f�r Images anpassen + if(iHeigh < pData->iImagesYsize) + iHeigh = pData->iImagesYsize; + iAdd = pData->iImagesXsize + 2; + iWidth += iAdd; + } else { + iAdd = 0; + iImage = 1; + } + + if(iWidth > 240) + iWidth = 240; + if(iHeigh > 32) + iHeigh = 32; + + pMem = new(BYTE, iHeigh * (iWidth + 4) * 4 + 1024); + if(!pMem) + return NULL; + + hDcSrc = GetDC(NULL); + hDc = CreateCompatibleDC(NULL); + hBmp = CreateCompatibleBitmap(hDcSrc, iWidth, iHeigh); + + SelectObject(hDc, hBmp); + SelectObject(hDc, GetStockObject(NULL_PEN)); + SelectObject(hDc, (pEntry->uState & TVIS_BOLD) ? pData->hFontB : pData->hFontN); + SetTextColor(hDc, pData->uColors[TVC_TEXT]); + SetBkColor(hDc, RGB(123, 77, 91)); + + sRect.top = 0; + sRect.bottom = iHeigh; + sRect.left = 0; + sRect.right = iWidth; + iYpos = (iHeigh - pData->iFontHeight) / 2; + + ExtTextOut(hDc, iAdd, iYpos, ETO_OPAQUE | ETO_CLIPPED, &sRect, pText, uTSize, NULL); + + if(iImage >= 0) { + SetBkColor(hDc, GetSysColor(COLOR_WINDOW)); + ImageList_Draw(pData->hImages, iImage, hDc, 0, 0, ILD_TRANSPARENT); + } + + iBits = GetDeviceCaps(hDc, BITSPIXEL); + + sInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + sInfo.bmiHeader.biWidth = iWidth; + sInfo.bmiHeader.biHeight = iHeigh; + sInfo.bmiHeader.biPlanes = 1; + sInfo.bmiHeader.biBitCount = (WORD)iBits; + sInfo.bmiHeader.biCompression = BI_RGB; + sInfo.bmiHeader.biSizeImage = 0; + sInfo.bmiHeader.biXPelsPerMeter = 0; + sInfo.bmiHeader.biYPelsPerMeter = 0; + sInfo.bmiHeader.biClrUsed = (iBits > 8) ? 0 : 1 << iBits;; + sInfo.bmiHeader.biClrImportant = (iBits > 8) ? 0 : 1 << iBits;; + + GetDIBits(hDc, hBmp, 0, 0 , NULL, &sInfo, (iBits > 8) ? DIB_RGB_COLORS : DIB_PAL_COLORS); + GetDIBits(hDc, hBmp, 0, iHeigh, pMem, &sInfo, (iBits > 8) ? DIB_RGB_COLORS : DIB_PAL_COLORS); + + hBmpNew = CreateCompatibleBitmap(hDc, iWidth, iHeigh); + + SetDIBits(hDc, hBmpNew, 0, iHeigh, pMem, &sInfo, (iBits > 8) ? DIB_RGB_COLORS : DIB_PAL_COLORS); + + hList = ImageList_Create(iWidth, iHeigh, ILC_COLORDDB | ILC_MASK, 1, 0); + + ImageList_AddMasked(hList, hBmpNew, RGB(123, 77, 91)); + + DeleteObject(hBmpNew); + DeleteObject(hBmp); + DeleteDC(hDc); + ReleaseDC(NULL, hDcSrc); + + delete(pMem); + + return hList; +} + + +//***************************************************************************** +//* +//* UpdateColorsList +//* +//***************************************************************************** +// Aktualisiert alle Farben +// pData : Zeiger auf die Fensterdaten +static void UpdateColorsList(TreeListData *pData) { + + unsigned uColOdd; + unsigned uColor; + int iDiff; + int iSum; + + if(!pData->cColorChanged[TVC_BK ]) + pData->uColors[TVC_BK ] = GetSysColor(COLOR_WINDOW); + if(!pData->cColorChanged[TVC_BOX ]) + pData->uColors[TVC_BOX ] = GetSysColor(COLOR_BTNSHADOW); + if(!pData->cColorChanged[TVC_EVEN ]) + pData->uColors[TVC_EVEN ] = GetSysColor(COLOR_WINDOW); + if(!pData->cColorChanged[TVC_TEXT ]) + pData->uColors[TVC_TEXT ] = GetSysColor(COLOR_WINDOWTEXT); + if(!pData->cColorChanged[TVC_LINE ]) + pData->uColors[TVC_LINE ] = GetSysColor(COLOR_WINDOWTEXT); + if(!pData->cColorChanged[TVC_FRAME ]) + pData->uColors[TVC_FRAME ] = GetSysColor(COLOR_3DFACE); + if(!pData->cColorChanged[TVC_TRACK ]) + pData->uColors[TVC_TRACK ] = GetSysColor(COLOR_WINDOWTEXT) ^ RGB(0, 0, 255); + if(!pData->cColorChanged[TVC_INSERT ]) + pData->uColors[TVC_INSERT ] = GetSysColor(COLOR_INFOBK); + if(!pData->cColorChanged[TVC_ODD ]) + pData->uColors[TVC_ODD ] = GetSysColor(COLOR_INFOBK); + if(!pData->cColorChanged[TVC_BOXBG ]) + pData->uColors[TVC_BOXBG ] = GetSysColor(COLOR_WINDOW); + if(!pData->cColorChanged[TVC_COLBK ]) + pData->uColors[TVC_COLBK ] = GetSysColor(COLOR_WINDOW); + if(!pData->cColorChanged[TVC_COLODD ]) + pData->uColors[TVC_COLODD ] = GetSysColor(COLOR_BTNSHADOW); + if(!pData->cColorChanged[TVC_COLEVEN]) + pData->uColors[TVC_COLEVEN] = GetSysColor(COLOR_WINDOW); + if(!pData->cColorChanged[TVC_GRAYED ]) + pData->uColors[TVC_GRAYED ] = GetSysColor(COLOR_SCROLLBAR); + + + if(pData->hTheme && !pData->cColorChanged[TVC_BOXBG] && !pData->cColorChanged[TVC_BOX] && !pData->cColorChanged[TVC_LINE]) { + pData->cGlyphOk = 1; + } else { + pData->cGlyphOk = 0; + } + + + if(!pData->cColorChanged[TVC_GRAYED]) { + pData->uColors[TVC_GRAYED] = (GetSysColor(COLOR_SCROLLBAR) & 0x00FEFEFE) >> 1; + pData->uColors[TVC_GRAYED] += (GetSysColor(COLOR_WINDOW) & 0x00FEFEFE) >> 1; + } + + if(!pData->cColorChanged[TVC_ODD]) { + uColOdd = pData->uColors[TVC_ODD]; + iDiff = ((uColOdd) & 0xFF) - ((pData->uColors[TVC_EVEN]) & 0xFF); + iSum = iDiff * iDiff; + iDiff = ((uColOdd >> 8) & 0xFF) - ((pData->uColors[TVC_EVEN] >> 8) & 0xFF); + iSum += iDiff * iDiff; + iDiff = ((uColOdd >> 16) & 0xFF) - ((pData->uColors[TVC_EVEN] >> 16) & 0xFF); + iSum += iDiff * iDiff; + + if(iSum < 64) { // Ist die alternierente Farbe fast gleich ? + uColOdd = pData->uColors[TVC_EVEN] & 0x0000FFFF; + uColOdd |= ((pData->uColors[TVC_EVEN] & 0x00FF0000) - 0x00080000) & 0x00FF0000; + } + + pData->uColors[TVC_ODD] = uColOdd; + } + + if(!pData->cColorChanged[TVC_COLBK]) { + uColor = GetSysColor(COLOR_WINDOW); + if(uColor & 0x00F00000) + uColor -= 0x00100000; + if(uColor & 0x0000F000) + uColor -= 0x00001000; + if(uColor & 0x000000F0) + uColor -= 0x00000010; + + pData->uColors[TVC_COLBK] = uColor; + } + + if(!pData->cColorChanged[TVC_COLODD]) { + uColor = pData->uColors[TVC_ODD]; + if(uColor & 0x00F00000) + uColor -= 0x00100000; + if(uColor & 0x0000F000) + uColor -= 0x00001000; + if(uColor & 0x000000F0) + uColor -= 0x00000010; + + pData->uColors[TVC_COLODD] = uColor; + } + + if(!pData->cColorChanged[TVC_COLEVEN]) { + uColor = GetSysColor(COLOR_WINDOW); + if(uColor & 0x00F00000) + uColor -= 0x00100000; + if(uColor & 0x0000F000) + uColor -= 0x00001000; + if(uColor & 0x000000F0) + uColor -= 0x00000010; + + pData->uColors[TVC_COLEVEN] = uColor; + } + + if(!pData->cColorChanged[TVC_MARKODD ]) + pData->uColors[TVC_MARKODD ] = ((pData->uColors[TVC_ODD ] >> 3) & 0x1F1F1F) * 7; + if(!pData->cColorChanged[TVC_MARKODD ]) + pData->uColors[TVC_MARKODD ] += ((GetSysColor(COLOR_HIGHLIGHT) >> 3) & 0x1F1F1F) * 1; + if(!pData->cColorChanged[TVC_MARKEVEN]) + pData->uColors[TVC_MARKEVEN] = ((pData->uColors[TVC_EVEN ] >> 3) & 0x1F1F1F) * 7; + if(!pData->cColorChanged[TVC_MARKEVEN]) + pData->uColors[TVC_MARKEVEN] += ((GetSysColor(COLOR_HIGHLIGHT) >> 3) & 0x1F1F1F) * 1; +} + +//***************************************************************************** +//* +//* UpdateHeight +//* +//***************************************************************************** +// Checks if the row height has changed +// pData : pointer to the window data +// Returns 1 if changed or 0 else. +static int UpdateHeight(TreeListData *pData) { + + int iHeight; + RECT sRect; + + if(pData->cFixedHeight) + return 0; + + iHeight = 10; + + if(pData->hChecks) + if(iHeight < pData->iChecksYsize + 2) + iHeight = pData->iChecksYsize + 2; + if(pData->hStates) + if(iHeight < pData->iStatesYsize + 2) + iHeight = pData->iStatesYsize + 2; + if(iHeight < pData->iSubImgYsize + 2) + iHeight = pData->iSubImgYsize + 2; + if(iHeight < pData->iImagesYsize + 2) + iHeight = pData->iImagesYsize + 2; + if(iHeight < pData->iFontHeight + 2) + iHeight = pData->iFontHeight + 2; + if(pData->uStyleEx & TVS_EX_ITEMLINES) + iHeight++; + if(pData->uStyle & TVS_NONEVENHEIGHT && (iHeight & 1)) + iHeight++; + if(pData->iRowHeight == iHeight) + return 0; + + pData->iRowHeight = iHeight; + + if(pData->uSizeY > pData->uStartPixel) { + pData->uMaxEnties = pData->uSizeY; + pData->uMaxEnties -= pData->uStartPixel; + } else { + pData->uMaxEnties = 0; + } + + pData->uPageEnties = pData->uMaxEnties; + pData->uMaxEnties += pData->iRowHeight - 1; + pData->uMaxEnties /= pData->iRowHeight; + pData->uPageEnties /= pData->iRowHeight; + + GetClientRect(pData->hWnd, &sRect); + InvalidateRect(pData->hWnd, &sRect, FALSE); + + return 1; +} + +//***************************************************************************** +//* +//* UpdateRect +//* +//***************************************************************************** +// Zeichnet einen Eintrag neu +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages +// uSub : Ist die Spaltennummer +// Ergibt 1 wenn der Eintrag sichtbar war +static int UpdateRect(TreeListData *pData, unsigned uItem, unsigned uSub) { + + BaseItem *pEntry; + RECT sRect; + UINT uNext; + UINT uPos; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry || !pEntry->uShowPos) + return 0; // Ist der Eintrag aufgeklappt + + uPos = pEntry->uShowPos - pData->uScrollY - 1; + if(uPos >= pData->uMaxEnties) + return 0; // Eintrag im Fenster sichtbar + + uNext = pData->aColumn[uSub].bNext; + sRect.left = pData->aColumnXpos[uSub ]; + sRect.left -= pData->uScrollX; + sRect.right = pData->aColumnXpos[uNext]; + sRect.right -= pData->uScrollX; + sRect.top = pData->uStartPixel; + sRect.top += pData->iRowHeight * uPos; + sRect.bottom = pData->iRowHeight + sRect.top; + + InvalidateRect(pData->hWnd, &sRect, FALSE); + + return 1; +} + +//***************************************************************************** +//* +//* UpdateColRect +//* +//***************************************************************************** +// Zeichnet einen ganze Spalte neu +// pData : Zeiger auf die Fensterdaten +// uColumn : Die nummer der Spalte +// Ergibt 1 wenn der Eintrag sichtbar war +static int UpdateColRect(TreeListData *pData, unsigned uColumn) { + + RECT sRect; + UINT uNext; + + if(uColumn >= pData->uColumnCount) + return 0; + + sRect.left = pData->aColumnXpos[uColumn]; + sRect.left -= pData->uScrollX; + if(sRect.left > (int)pData->uSizeX) + return 0; + + uNext = pData->aColumn[uColumn].bNext; + + sRect.right = pData->aColumnXpos[uNext]; + sRect.right -= pData->uScrollX; + if(sRect.right < 0) + return 0; + + sRect.top = 0; + sRect.bottom = pData->uSizeY; + + InvalidateRect(pData->hWnd, &sRect, FALSE); + + return 1; +} + +//***************************************************************************** +//* +//* UpdateRow +//* +//***************************************************************************** +// Zeichnet einen Eintrag �ber die ganze Zeile neu +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages +// Ergibt 1 wenn der Eintrag sichtbar war +static int UpdateRow(TreeListData *pData, unsigned uItem) { + + BaseItem *pEntry; + RECT sRect; + unsigned uPos; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry || !pEntry->uShowPos) + return 0; // Ist der Eintrag aufgeklappt + + uPos = pEntry->uShowPos - pData->uScrollY - 1; + if(uPos >= pData->uMaxEnties) + return 0; // Eintrag im Fenster sichtbar + + sRect.left = 0; + sRect.right = pData->uSizeX; + sRect.top = pData->uStartPixel; + sRect.top += pData->iRowHeight * uPos; + sRect.bottom = pData->iRowHeight + sRect.top; + InvalidateRect(pData->hWnd, &sRect, FALSE); + + return 1; +} + +//***************************************************************************** +//* +//* UpdateView +//* +//***************************************************************************** +// Redraw the whole window +// pData : Zeiger auf die Fensterdaten +// Ergibt 1 wenn der Eintrag sichtbar war +static void UpdateView(TreeListData *pData) { + + RECT sRect; + + GetClientRect(pData->hWnd, &sRect); + sRect.top = pData->uStartPixel; + InvalidateRect(pData->hWnd, &sRect, FALSE); + + if(pData->hHeader && ((pData->uStyleEx & TVS_EX_HIDEHEADERS) == 0)){ + GetClientRect(pData->hHeader, &sRect); + InvalidateRect(pData->hHeader, &sRect, FALSE); + } +} + +//***************************************************************************** +//* +//* UpdateScrollX +//* +//***************************************************************************** +// Aktualisiert die X-Scroolbar +// pData : Zeiger auf die Fensterdaten +// Ergibt 1 wenn der sich Einstellungen ver�ndert haben +static void UpdateScrollX(TreeListData *pData) { + + SCROLLINFO sInfo; + unsigned uSize; + unsigned uCols; + + uCols = pData->uColumnCount; + if(uCols) + uSize = pData->aColumnXpos[uCols] - 1; + else + uSize = pData->iMaxSizeX - 1; + + + if(pData->uOldXCount == uSize) + if(pData->uOldXPage == pData->uSizeX) { + return; + } + + pData->uOldXPage = pData->uSizeX; + pData->uOldXCount = uSize; + + UNLOCK(pData); + + sInfo.cbSize = sizeof(SCROLLINFO); + sInfo.fMask = SIF_ALL; + sInfo.nMin = 0; + sInfo.nMax = uSize; + sInfo.nPage = pData->uSizeX; + sInfo.nPos = pData->uScrollX; + sInfo.nTrackPos = 0; + + if(pData->uStyle & TVS_NOSCROLL) { + sInfo.nMax = 0; + } else + if(pData->uStyleEx & TVS_EX_AUTOHSCROLL) { + sInfo.nMax = 0; + } else + if(sInfo.nMax > 0) { + sInfo.nMax--; + } + + + if((int)sInfo.nPage >= sInfo.nMax && pData->uScrollX > 0) { + sInfo.nPos = 0; + pData->uScrollX = 0; + + UpdateView(pData); + + if(pData->hHeader) { + MoveWindow(pData->hHeader, 0, 0, pData->uSizeX, pData->uStartPixel, TRUE); + } + } + + SetScrollInfo(pData->hWnd, SB_HORZ, &sInfo, TRUE); + + LOCK(pData); +} + +//***************************************************************************** +//* +//* UpdateScrollY +//* +//***************************************************************************** +// Aktualisiert die Y-Scroolbar +// pData : Zeiger auf die Fensterdaten +// Ergibt 1 wenn der sich Einstellungen ver�ndert haben +static void UpdateScrollY(TreeListData *pData) { + + SCROLLINFO sInfo; + + if(pData->uOldYCount == pData->uItemPosCount) + if(pData->uOldYPage == pData->uPageEnties) { + return; + } + + pData->uOldYPage = pData->uPageEnties; + pData->uOldYCount = pData->uItemPosCount; + + UNLOCK(pData); + + sInfo.cbSize = sizeof(SCROLLINFO); + sInfo.fMask = SIF_ALL; + sInfo.nMin = 0; + sInfo.nMax = pData->uItemPosCount; + sInfo.nPage = pData->uPageEnties; + sInfo.nPos = pData->uScrollY; + sInfo.nTrackPos = 0; + + if(pData->uStyle & TVS_NOSCROLL) { + sInfo.nMax = 0; + } + + if((int)sInfo.nPage >= sInfo.nMax && pData->uScrollY > 0) { + sInfo.nPos = 0; + pData->uScrollY = 0; + + UpdateView(pData); + } + + SetScrollInfo(pData->hWnd, SB_VERT, &sInfo, TRUE); + + LOCK(pData); +} + +//***************************************************************************** +//* +//* UpdateToolTip +//* +//***************************************************************************** +// Aktualisiert den Text f�r das Tootip +// pData : Zeiger auf Fensterdaten +// uItem : Item auf den der Mauszeiger zeigt +// uFlags : Flags vom HitTest +static void UpdateToolTip(TreeListData *pData, unsigned uItem, unsigned uFlags) { + + TCHAR cTemp[INFOTIPSIZE]; +#ifndef __REACTOS__ + HWND hToolTip; +#endif + NMTVGETINFOTIP sToolNv; + NMTREEVIEW sNotify; + TOOLINFO sInfo; + ExtraItem *pExtra; + BaseItem *pEntry; + LPCTSTR pText; + RECT sRect; + unsigned uSize; + unsigned uCol; + unsigned uLen; + LRESULT lRet; + int iTemp; + // Tooltip ausbelnden + if(!uItem || (uItem == pData->uEditItem && TVHT_SUBTOCOL(uFlags) == pData->uEditSub)) { + if(pData->uToolTipItem) + goto ExitTip; + return; + } + + pEntry = pData->pTreeItems[uItem]; + + if(uFlags & TVHT_ONITEM) { + if(pData->uToolTipItem != uItem || pData->uToolTipSub != 0) { + if(!pData->pTreeItems[uItem]) { // Existiert der Eintag noch ? + goto ExitTip; + } + + TreeListGetItemRect(pData, uItem, TVIR_GETCOLUMN | TVIR_TEXT, &sRect); + + if(sRect.right > (int)pData->uSizeX) { + sRect.right = pData->uSizeX; + } + + lRet = 0; + + if(pData->uStyleEx & TVS_EX_TOOLTIPNOTIFY) { // Tooltip-Daten via speziellem Notify holen + sNotify.hdr.code = TVN_ITEMTOOLTIP; + sNotify.action = 0; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = pEntry->uState; + sNotify.itemNew.lParam = pEntry->lParam; + sNotify.itemNew.pszText = pEntry->pText; + sNotify.itemNew.cchTextMax = pEntry->uTextSize; + sNotify.itemNew.cChildren = 0; + sNotify.itemOld.mask = 0; + sNotify.ptDrag.x = sRect.left; + sNotify.ptDrag.y = sRect.top; + + UNLOCK(pData); + lRet = SendNotify(pData, &sNotify.hdr); + LOCK(pData); + + if(lRet) + goto UserTip; + } else + if(pData->uStyle & TVS_INFOTIP) { // Tooltip-Daten via normalem Notify holen + sToolNv.hdr.code = TVN_GETINFOTIP; + sToolNv.cchTextMax = INFOTIPSIZE; + sToolNv.hItem = (HTREEITEM)uItem; + sToolNv.lParam = pEntry->lParam; + sToolNv.pszText = cTemp; + + str_ncpy(cTemp, pEntry->pText, INFOTIPSIZE); + cTemp[INFOTIPSIZE - 1] = 0; + + UNLOCK(pData); + lRet = SendNotify(pData, &sNotify.hdr); + LOCK(pData); + + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.pszText = sToolNv.pszText; + sNotify.itemNew.cchTextMax = str_len(sToolNv.pszText); + sNotify.itemNew.cChildren = 0; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = pEntry->uState; + sNotify.itemNew.lParam = pEntry->lParam; + sNotify.ptDrag.x = sRect.left; + sNotify.ptDrag.y = sRect.top; + + goto UserTip; + } + // Passt der Text in die Spalte + if(sRect.right - sRect.left <= pEntry->iTextPixels + 4) { + pText = pEntry->pText; + uSize = pEntry->uTextSize; + + if(pEntry->bCallback & TVIF_TEXT) { + CallbackEntry(pData, pEntry, uItem, TVIF_TEXT, &iTemp, &uSize, &pText); + } + + if(!pText || *pText == 0) + goto ExitTip; + + uLen = str_len(pText) + 1; + if(uLen >= pData->uToolTipSize) { // Tooltipspeicher vergr��ern + delete(pData->pToolTipText); + pData->uToolTipSize = (uLen + 255)&~0xFF; + pData->pToolTipText = new(TCHAR, pData->uToolTipSize + 4); + } + + memcpy(pData->pToolTipText, pText, uLen * sizeof(TCHAR)); + pData->hFontT = (pEntry->uState & TVIS_BOLD) ? pData->hFontB : pData->hFontN; + +#ifndef __REACTOS__ + hToolTip = pData->hToolTip; +#endif + pData->sToolTipPos.x = sRect.left; + pData->sToolTipPos.y = sRect.top; + + ClientToScreen(pData->hWnd, &pData->sToolTipPos); + + UNLOCK(pData); + + sInfo.cbSize = sizeof(sInfo); + sInfo.hwnd = pData->hWnd; + sInfo.uId = (UINT_PTR)pData->hWnd; + + if(pData->uToolTipItem) { + SendMessage(pData->hToolTip, TTM_TRACKACTIVATE, 0, (LPARAM)&sInfo); + pData->uToolTipItem = 0; + } + + SendMessage(pData->hToolTip, TTM_TRACKPOSITION, 0, MAKELONG(pData->sToolTipPos.x, pData->sToolTipPos.y)); + SendMessage(pData->hToolTip, TTM_TRACKACTIVATE, 1, (LPARAM)&sInfo); + + LOCK(pData); + + pData->uToolTipItem = uItem; + pData->uToolTipShow = 0; + pData->uToolTipSub = 0; + + SetTimer(pData->hWnd, ID_TOOLTIPCHECK, 1500, NULL); + } else { + if(pData->uToolTipItem) + goto ExitTip; + } + } + + return; + } + + if(uFlags & (TVHT_ONSUBICON | TVHT_ONSUBLABEL)) { + if(pData->uToolTipItem != uItem || TVHT_SUBTOCOL(uFlags) != pData->uToolTipSub) { + lRet = 0; + uCol = TVHT_SUBTOCOL(uFlags); + pExtra = pData->pExtraItems[uCol - 1][uItem]; + + if(pData->uStyleEx & TVS_EX_TOOLTIPNOTIFY) { // Tooltip-Daten via Notify holen + TreeListGetItemRect(pData, uItem, TVIR_GETCOLUMN | TVIR_TEXT | TVIR_COLTOSUB(uCol), &sRect); + + if(sRect.right > (int)pData->uSizeX) { + sRect.right = pData->uSizeX; + } + + if(pExtra) { + sNotify.itemNew.state = pExtra->uState; + sNotify.itemNew.pszText = pExtra->pText; + sNotify.itemNew.cchTextMax = pExtra->uTextSize; + } else { + sNotify.itemNew.state = 0; + sNotify.itemNew.cchTextMax = 0; + sNotify.itemNew.pszText = _T(""); + } + + sNotify.hdr.code = TVN_ITEMTOOLTIP; + sNotify.action = 0; + sNotify.itemNew.lParam = pEntry->lParam; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.cChildren = uCol; + sNotify.itemOld.mask = 0; + sNotify.ptDrag.x = sRect.left; + sNotify.ptDrag.y = sRect.top; + + UNLOCK(pData); + lRet = SendNotify(pData, &sNotify.hdr); + LOCK(pData); + + if(lRet) + goto UserTip; + } + + if(pExtra) { // Tooltip auf Unterspalte ? + TreeListGetItemRect(pData, uItem, TVIR_GETCOLUMN | TVIR_TEXT | TVIR_COLTOSUB(uCol), &sRect); + + if(sRect.right > (int)pData->uSizeX) { + sRect.right = pData->uSizeX; + } + + if(sRect.right - sRect.left <= pExtra->iTextPixels + 4) { + pText = pExtra->pText; + uSize = pExtra->uTextSize; + + if(pExtra->bCallback & TVIF_TEXT) { + CallbackExtra(pData, pEntry, pExtra, uItem, uCol, TVIF_TEXT, &iTemp, &uSize, &pText); + } + + if(!pText || *pText == 0) + goto ExitTip; + + uLen = str_len(pText) + 1; + if(uLen >= pData->uToolTipSize) { // Tooltipspeicher vergr��ern + delete(pData->pToolTipText); + pData->uToolTipSize = (uLen + 255)&~0xFF; + pData->pToolTipText = new(TCHAR, pData->uToolTipSize + 4); + } + + memcpy(pData->pToolTipText, pText, uLen * sizeof(TCHAR)); + pData->hFontT = (pExtra->uState & TVIS_BOLD) ? pData->hFontB : pData->hFontN; + + pData->sToolTipPos.x = sRect.left; + pData->sToolTipPos.y = sRect.top; +#ifndef __REACTOS__ + hToolTip = pData->hToolTip; +#endif + + ClientToScreen(pData->hWnd, &pData->sToolTipPos); + + UNLOCK(pData); + + sInfo.cbSize = sizeof(sInfo); + sInfo.hwnd = pData->hWnd; + sInfo.uId = (UINT_PTR)pData->hWnd; + + if(pData->uToolTipItem) { + SendMessage(pData->hToolTip, TTM_TRACKACTIVATE, 0, (LPARAM)&sInfo); + pData->uToolTipItem = 0; + } + + SendMessage(pData->hToolTip, TTM_TRACKPOSITION, 0, MAKELONG(pData->sToolTipPos.x, pData->sToolTipPos.y)); + SendMessage(pData->hToolTip, TTM_TRACKACTIVATE, 1, (LPARAM)&sInfo); + + LOCK(pData); + + pData->uToolTipItem = uItem; + pData->uToolTipSub = uCol; + pData->uToolTipShow = 0; + + SetTimer(pData->hWnd, ID_TOOLTIPCHECK, 1500, NULL); + } else { + if(pData->uToolTipItem) + goto ExitTip; + } + } else { + if(pData->uToolTipItem) + goto ExitTip; + } + } + + return; + } + +ExitTip: + + if(pData->uToolTipItem) { // Tooltip ausblenden + UNLOCK(pData); + + sInfo.cbSize = sizeof(sInfo); + sInfo.hwnd = pData->hWnd; + sInfo.uId = (UINT_PTR)pData->hWnd; + + SendMessage(pData->hToolTip, TTM_TRACKACTIVATE, 0, (LPARAM)&sInfo); + + LOCK(pData); + + pData->uToolTipItem = 0; + pData->uToolTipSub = 0; + pData->uToolTipShow = 0; + + KillTimer(pData->hWnd, ID_TOOLTIPCHECK); + } + + return; + +UserTip: + + pText = sNotify.itemNew.pszText; // Soll ein User-Tooltip angezeigt werden + uSize = sNotify.itemNew.cchTextMax; + sRect.left = sNotify.ptDrag.x; + sRect.top = sNotify.ptDrag.y; + + if(!pText || *pText == 0) + goto ExitTip; + + uLen = str_len(pText) + 1; + if(uLen >= pData->uToolTipSize) { // Tooltipspeicher vergr��ern + + delete(pData->pToolTipText); + pData->uToolTipSize = (uLen + 255)&~0xFF; + pData->pToolTipText = new(TCHAR, pData->uToolTipSize + 4); + } + + memcpy(pData->pToolTipText, pText, uLen * sizeof(TCHAR)); + pData->hFontT = (pEntry->uState & TVIS_BOLD) ? pData->hFontB : pData->hFontN; + + ClientToScreen(pData->hWnd, &sNotify.ptDrag); + pData->sToolTipPos = sNotify.ptDrag; +#ifndef __REACTOS__ + hToolTip = pData->hToolTip; +#endif + // Tooltip verz�gert anzeigen + if((sNotify.itemNew.mask & TVIF_TOOLTIPTIME) && sNotify.itemNew.lParam > 0) { + pData->uToolTipShow = (unsigned)(sNotify.itemNew.lParam + 499) / 500; + pData->uToolTipSub = sNotify.itemNew.cChildren; + pData->uToolTipItem = uItem; + + SetTimer(pData->hWnd, ID_TOOLTIPCHECK, 500, NULL); + + return; + } + + UNLOCK(pData); + + sInfo.cbSize = sizeof(sInfo); + sInfo.hwnd = pData->hWnd; + sInfo.uId = (UINT_PTR)pData->hWnd; + + if(pData->uToolTipItem) { // Tooltip Fenster aktivieren + SendMessage(pData->hToolTip, TTM_TRACKACTIVATE, 0, (LPARAM)&sInfo); + pData->uToolTipItem = 0; + } + + SendMessage(pData->hToolTip, TTM_TRACKPOSITION, 0, MAKELONG(sNotify.ptDrag.x, sNotify.ptDrag.y)); + SendMessage(pData->hToolTip, TTM_TRACKACTIVATE, 1, (LPARAM)&sInfo); + + LOCK(pData); + + pData->uToolTipShow = 0; + pData->uToolTipItem = uItem; + pData->uToolTipSub = sNotify.itemNew.cChildren; + + SetTimer(pData->hWnd, ID_TOOLTIPCHECK, 1500, NULL); +} + +//***************************************************************************** +//* +//* CreateFontset +//* +//***************************************************************************** +// Create the font set (normal, bold, etc...) from the given HFONT +static int CreateFontset(TreeListData *pData, HFONT hFont){ + LOGFONT sLog; + HFONT hBold; + int iRet = 0; + + if(GetObject(hFont, sizeof(sLog), &sLog)){ + sLog.lfWeight = FW_BOLD; + if((hBold = CreateFontIndirect(&sLog))){ + pData->hFontN = hFont; //store the given font + if(pData->hFontB != hDefaultFontB){ + //if the current bold is not the default bold, free it + DeleteObject(pData->hFontB); + } + pData->hFontB = hBold; //store the created bold + iRet = 1; + } + } + return iRet; +} + +//***************************************************************************** +//* +//* UpdateFont +//* +//***************************************************************************** +// Erzeugt einen den fetten Font f�r das Fenster +// pData : Zeiger auf die Fensterdaten +// iRedraw : Soll das Fenster neugezeichnet werden +// Ergibt 1 wenn der Font ver�ndert wurde +static int UpdateFont(TreeListData *pData) { + + int iPos; + int iRet; + HDC hDc; + LOGFONT sLog; + SIZE sSize; + TEXTMETRIC sMetrics; + BaseItem *pEntry; + BaseItem **pList; + ExtraItem *pExtra; + ExtraItem **pItems; + unsigned uSub; + + if(!hDefaultFontN) { // Den Standard-Font erzeugen + SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(sLog), &sLog, 0); + sLog.lfWeight = FW_NORMAL; + hDefaultFontN = CreateFontIndirect(&sLog); + sLog.lfWeight = FW_BOLD; + hDefaultFontB = CreateFontIndirect(&sLog); + } + + + if(!pData->hFontN) + pData->hFontN = hDefaultFontN; + if(!pData->hFontB) + pData->hFontB = hDefaultFontB; + +/* + if(pData->hFontN == hDefaultFontN) { // Ist der Standard-Font eingestellt + pData->hFontB = hDefaultFontB; + } else { + pData->hFontB = pData->hFontN; + } +*/ + + if(pData->hFontN != pData->hFontL) { + pData->hFontL = pData->hFontN; + + hDc = GetDC(NULL); + SelectObject(hDc, pData->hFontN); + GetTextMetrics(hDc, &sMetrics); + pData->iFontHeight = sMetrics.tmHeight; + pData->iFontLine = sMetrics.tmAscent + 1; + pData->iFontOff = (sMetrics.tmPitchAndFamily & TMPF_FIXED_PITCH) ? 0 : -1; + ReleaseDC(NULL, hDc); + + pList = pData->pTreeItems; + iPos = pData->uTreeItemsMax; + + for(; iPos >= 0; iPos--) { // Alle Textbreiten zur�cksetzen + pEntry = pList[iPos]; + if(!pEntry) + continue; + + pEntry->iTextPixels = 0; + } + + + for(uSub = 1; uSub < pData->uColumnCount; uSub++) { + iPos = pData->uTreeItemsMax; + pItems = pData->pExtraItems[uSub - 1]; + + for(; iPos >= 0; iPos--) { + pExtra = pItems[iPos]; + if(!pExtra) + continue; + + pExtra->iTextPixels = 0; + } + } + + iRet = 1; + } else { + iRet = 0; + } + + // compute Width of "..." text + hDc = GetDC(NULL); + SelectObject(hDc, pData->hFontN); + GetTextExtentExPoint(hDc, _T("..."), 3, 256, NULL, NULL, &sSize); + pData->uTrippleN = sSize.cx; + SelectObject(hDc, pData->hFontB); + GetTextExtentExPoint(hDc, _T("..."), 3, 256, NULL, NULL, &sSize); + pData->uTrippleB = sSize.cx; + ReleaseDC(NULL, hDc); + + return iRet; +} + + +//***************************************************************************** +//* +//* UpdateItems +//* +//***************************************************************************** +// Berechnet die Positionen der Zeilen f�r die sichtbaren Eintr�ge +// pData : Zeiger auf die Fensterdaten +// uItem : Ist der Eintrag ab dem begonnen wird +static void UpdateItems(TreeListData *pData, unsigned uItem) { + + unsigned uPos; + unsigned uOld; + unsigned uNum; + unsigned uTemp; + unsigned uStart; + unsigned *pLines; + BaseItem **pItems; + BaseItem *pEntry; + BaseItem *pTemp; + RECT sRect; + + uOld = pData->uItemPosCount; + pLines = pData->pItemPos; + pItems = pData->pTreeItems; + + if(!uItem) { // Am Anfang beginnen + uItem = pData->uFirstChild; + if(!uItem) { // Leere Liste + if(!uOld) + return; + + for(uNum = 0; uNum < uOld; uNum++) { // Die alten Eintr�ge zur�cksetzen + uTemp = pLines[uNum]; + if(!uTemp) + continue; + pLines[uNum] = 0; + pTemp = pItems[uTemp]; + if(!pTemp) + continue; + pTemp->uShowPos = 0; + } + + pData->uItemPosCount = 0; + + GetClientRect(pData->hWnd, &sRect); + InvalidateRect(pData->hWnd, &sRect, TRUE); + + memset(pLines, 0, sizeof(unsigned)*uOld); + return; + } + + for(uNum = 0; uNum < uOld; uNum++) { // Die alten Eintr�ge zur�cksetzen + uTemp = pLines[uNum]; + if(!uTemp) + continue; + pLines[uNum] = 0; + pTemp = pItems[uTemp]; + if(!pTemp) + continue; + pTemp->uShowPos = 0; + } + + pEntry = pItems[uItem]; + pEntry->uShowPos = 1; + pLines[0] = uItem; + uPos = 1; + uStart = 0; + } else { // Bei einem Eintrag beginnen + pEntry = pItems[uItem]; + uPos = pEntry->uShowPos; + if(uPos) + uStart = uPos - 1; + else + uStart = 0; + + for(uNum = uPos; uNum < uOld; uNum++) { // Die alten Eintr�ge zur�cksetzen + uTemp = pLines[uNum]; + if(!uTemp) + continue; + pLines[uNum] = 0; + pTemp = pItems[uTemp]; + if(!pTemp) + continue; + pTemp->uShowPos = 0; + } + } + + for(;;) { // Die Zeilen neu zuordnen + if(pEntry->uFirstChild && (pEntry->uState & TVIS_EXPANDED)) { + uItem = pEntry->uFirstChild; + } else + if(pEntry->uNextItem) { + uItem = pEntry->uNextItem; + } else { + for(;;) { + uItem = pEntry->uParent; + if(!uItem) + break; + + pEntry = pItems[uItem]; + if(pEntry->uNextItem) { // Gibt es etwas in der gleichen Ebene + uItem = pEntry->uNextItem; + break; + } + } + + if(!uItem) + break; + } + + pEntry = pItems[uItem]; + + if(pLines[uPos] != uItem) { + pLines[uPos] = uItem; + } else { + if(uStart == uPos) + uStart++; + } + + uPos++; + pEntry->uShowPos = uPos; + } + + pData->uItemPosCount = uPos; + + if(uStart > pData->uScrollY) // Neu zu zeichnenten Bereich bestimmen + uStart -= pData->uScrollY; + else + uStart = 0; + + GetClientRect(pData->hWnd, &sRect); + + sRect.top = pData->uStartPixel + pData->iRowHeight * uStart; + + if(sRect.top <= sRect.bottom) { + InvalidateRect(pData->hWnd, &sRect, FALSE); + } + + if(uOld != uPos) + UpdateScrollY(pData); +} + +//***************************************************************************** +//* +//* UpdateColumns +//* +//***************************************************************************** +// Pr�ft ob es Ver�nderungen in Spaltenbreiten gab +// pData : Zeiger auf die Fensterdaten +// Ergibt die Breite ab der die Spalten ver�ndert wurden oder 0x10000 +static int UpdateColumns(TreeListData *pData) { +#ifndef __REACTOS__ + HWND hHeader; +#endif + UINT uNext; + UINT uCol; + UINT uSub; + int iSize; + int iNum; + int iNow; + int iOld; + int iRet; + +#ifndef __REACTOS__ + hHeader = pData->hHeader; +#endif + pData->aColumnXpos[0] = 0; + + iRet = 0x10000; + iOld = 0; + iNow = 0; + + for(uCol = 0; uCol < pData->uColumnCount;) { // Suche die erste ge�nderte Spalte + uSub = pData->aColumnPos[uCol]; + iSize = pData->aColumn[uSub].sReal; + uSub = pData->aColumn[uSub].bNext; + iOld = iNow; + iNow += iSize; + uCol += 1; + + if(uCol == 1) + iNow -= 1; + if(iNow < iOld) + iNow = iOld; + if(uSub == pData->uColumnCount) + if(iNow >= (int)pData->uSizeX - 1) { + iNow++; + } + + iNum = pData->aColumnXpos[uSub]; + + if(iNum == iNow) + continue; + if(iNum == 0) + iNum = iOld; + if(iNum >= iNow) { + iRet = iOld; + } else { + iRet = iOld; + + if(pData->uSelectedItem) { // Problem bei ausgew�hlten leeren Eintr�gen + uNext = pData->aColumn[pData->uSelectedSub].bNext; + if(uNext == uSub) { + UpdateRect(pData, pData->uSelectedItem, pData->uSelectedSub); + } + } + + if(pData->uTrackedItem) { + uNext = pData->aColumn[pData->uTrackedSub].bNext; + if(uNext == uSub) { + UpdateRect(pData, pData->uTrackedItem, pData->uTrackedSub); + } + } + } + + pData->aColumnXpos[uSub] = iNow; + break; + } + + while(uCol < pData->uColumnCount) { // Restliche Spalten berechen + iOld = iNow; + uSub = pData->aColumnPos[uCol]; + iNow += pData->aColumn[uSub].sReal; + uSub = pData->aColumn[uSub].bNext; + uCol += 1; + + if(uCol == pData->uColumnCount) + if(iNow >= (int)pData->uSizeX - 1) { + iNow++; + } + + pData->aColumnXpos[uSub] = iNow; + } + + pData->aColumnXpos[pData->uColumnCount + 1] = pData->uSizeX + 1; + + return iRet; +} + +//***************************************************************************** +//* +//* TreeListSetOrderArray +//* +//***************************************************************************** +// Stellt die anzeige Reihenfolge der Spalten ein +// pData : Zeiger auf die Fensterdaten +// uItems : Ist die Nummer des Eintrages +// pArray : Zeiger auf die Eintr�ge. Null steht f�r die Standartreihenfolge. +// z.B. {0,2,1} meint die sichtbare Reihenfolge Col0,Col2,Col1 +// Der erste Eintrag muss 0 immer sein. +// Ergibt 1 = Ok +// 0 = Fehler +static int TreeListSetOrderArray(TreeListData *pData, unsigned uItems, unsigned *pArray) { + + BYTE aFlags[MAX_COLUMNS + 1]; + UINT aArray[MAX_COLUMNS + 1]; + TV_COLSIZE sNotify; + UINT uDiff; + UINT uCol; + UINT uSub; + + if(!pArray) { // Spezialreihenfolge setzen + if(uItems == FROM_HEADER) { // Array aus Header holen + if(!Header_GetOrderArray(pData->hHeader, pData->uColumnCount, aArray)) { + return 0; + } + + if(aArray[0] != 0) { + return 0; + } + } else { + for(uCol = pData->uColumnCount; uCol > 0; uCol++) { // Standartreihenfolge + uCol--; + aArray[uCol] = uCol; + } + } + + uItems = pData->uColumnCount; + pArray = aArray; + } else { // Pr�fe Array + if(pData->uColumnCount != uItems || uItems == 0 || *pArray) { + return 0; + } + } + + memset(aFlags, 0, sizeof(aFlags) - 1); + + for(uCol = 0, uDiff = 0; uCol < uItems; uCol++) { // Die Eintr�ge pr�fen + uSub = pArray[uCol]; + if(uSub >= uItems) + return 0; + if(aFlags[uSub]) + return 0; + + aFlags[uSub] = (BYTE)uCol; + + uDiff |= uCol ^ pData->aColumnPos[uSub]; + } + + if(uDiff == 0) { // Alles blieb gleich + return 1; + } + + aFlags[0 ] = 0; + aFlags[uItems] = (BYTE)uItems; + + for(uCol = 1; uCol < uItems; uCol++) { // Die Eintr�ge anpassen + pData->aColumnPos[uCol] = (BYTE)pArray[uCol]; + } + + for(uCol = 0; uCol < uItems; uCol++) { + uSub = aFlags[uCol]; + pData->aColumn[uCol].bIndex = (BYTE)uSub; + pData->aColumn[uCol].bNext = pData->aColumnPos[uSub + 1]; + } + + Header_SetOrderArray(pData->hHeader, uItems, pArray); + UpdateColumns(pData); + UpdateView(pData); + + if(pData->uStyleEx & TVS_EX_HEADERCHGNOTIFY) { // Alle Spalten haben sich ver�ndert + UNLOCK(pData); + + for(uCol = 0; uCol < uItems; uCol++) { + sNotify.hdr.code = TVN_COLUMNCHANGED; + sNotify.uColumn = uCol; + sNotify.uIndex = pData->aColumn[uCol].bIndex; + sNotify.uPosX = pData->aColumnXpos[uCol]; + sNotify.iSize = pData->aColumn[uCol].sReal; + + SendNotify(pData, &sNotify.hdr); + } + + LOCK(pData); + } + + return 1; +} + +//***************************************************************************** +//* +//* TreeListToggleItem +//* +//***************************************************************************** +// Klappt bei einem Eintrag die Kinder um, und schickt alle Notify-Nachrichten. +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages +// uAddFlags : Sind die State-Flags die hinzugef�gt werden sollen +// Bits 0..3 entahlen das Kommando, bei automatisch ermitteln +// Ergibt -1 = Fehler +// 0 = Ausgef�hrt +// 1 = Abbruch +static int TreeListToggleItem(TreeListData *pData, unsigned uItem, unsigned uAddFlags) { + + NMTREEVIEW sNotify; + BaseItem **pList; + BaseItem *pEntry; + BaseItem *pTemp; + unsigned uAction; + unsigned uLevel; + unsigned uNext; + LRESULT lRet; + BOOL bDo; + + if(uItem > pData->uTreeItemsMax) + return 0; + + pList = pData->pTreeItems; + pEntry = pList[uItem]; + if(!pEntry) + return -1; + + uAction = uAddFlags & 0x0F; + if(!uAction) { + uAction = ((pEntry->uState ^ TVIS_EXPANDED) & (TVIS_EXPANDED | TVIS_EXPANDPARTIAL)) ? TVE_EXPAND : TVE_COLLAPSE; + } + + sNotify.action = uAction; + sNotify.hdr.code = TVN_ITEMEXPANDING; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = pEntry->uState; + sNotify.itemNew.lParam = pEntry->lParam; + sNotify.itemNew.pszText = (LPTSTR) - 1; + sNotify.itemNew.cchTextMax = -1; + sNotify.itemOld.mask = 0; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + UNLOCK(pData); + + lRet = SendNotify(pData, &sNotify.hdr); + + LOCK(pData); + + pList = pData->pTreeItems; + pEntry = pList[uItem]; + + if(pEntry == 0) + return -1; // Eintrag inzischen gel�scht ? + if(lRet != 0) + return 1; // User-Abbruch ? + + if(uAction == TVE_EXPAND) { // Aufklappen + if(pEntry->uState & TVIS_EXPANDED) { + bDo = FALSE; // Nur von + auf - + } else { + pEntry->uState |= TVIS_EXPANDED; // Kinder Aufklappen + bDo = TRUE; + } + } else { // Zuklappen + pEntry->uState &= ~TVIS_EXPANDED; + bDo = TRUE; + } + + pEntry->uState &= ~TVIS_EXPANDPARTIAL; + pEntry->uState |= uAddFlags&~0x0F; + + if(pEntry->uShowPos && bDo) { + if(pEntry->uState & TVIS_EXPANDED) { // Kinderfenster aktuallisieren + uLevel = 0; + uNext = pEntry->uFirstChild; + + while(uNext) { + pTemp = pList[uNext]; + pTemp->uShowPos = 0; + + if(pTemp->uFirstChild) { + uNext = pTemp->uFirstChild; + uLevel++; + continue; + } + + if(pTemp->uNextItem) { + uNext = pTemp->uNextItem; + continue; + } + + if(uLevel == 0) + break; + + uNext = pList[pTemp->uParent]->uNextItem; + uLevel--; + } + } + + UpdateItems(pData, uItem); + } + + sNotify.action = uAction; + sNotify.hdr.code = TVN_ITEMEXPANDED; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = pEntry->uState; + sNotify.itemNew.lParam = pEntry->lParam; + sNotify.itemNew.pszText = (LPTSTR) - 1; + sNotify.itemNew.cchTextMax = -1; + sNotify.itemOld.mask = 0; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + UNLOCK(pData); + + SendNotify(pData, &sNotify.hdr); + + LOCK(pData); + + pList = pData->pTreeItems; + pEntry = pData->pTreeItems[uItem]; + + if(!pEntry) + return -1; // Eintrag inzischen gel�scht ? + + if(uAction == TVE_EXPAND) { // ONCE setzen nach Expandieren + pEntry->uState |= TVIS_EXPANDEDONCE; + } + + if(pData->uSelectedItem && bDo) { // Ist der ausgew�hlten Eintrag sichtbar ? + pEntry = pList[pData->uSelectedItem]; + if(!pEntry) { + pData->uSelectedItem = 0; + pData->uSelectedSub = 0; + } else + if(!pEntry->uShowPos) { + while(!pEntry->uShowPos) { + uItem = pEntry->uParent; + pEntry = pList[uItem]; + } + + TreeListSelectItem(pData, uItem, pData->uSelectedSub, TVC_UNKNOWN); + } + } + + if(bDo == FALSE) { // Nur von + auf - + UpdateRect(pData, uItem, 0); + } + + return 0; +} + +//***************************************************************************** +//* +//* TreeListGetItemRect +//* +//***************************************************************************** +// Holt das Rechteck eines Eintrages +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages +// uFlags : Bit 0 : 0=volle Zeile 1=nur Text +// Bit 7 : 1=nur Spalte +// Bit 24.. : Spaltennummer +// Ergibt 1 wenn der Eintrag sichtbar war +static int TreeListGetItemRect(TreeListData *pData, unsigned uItem, unsigned uFlags, RECT *pRect) { + + ExtraItem *pExtra; + BaseItem *pEntry; + unsigned uNext; + unsigned uPos; + unsigned uSub; + + if(uItem > pData->uTreeItemsMax) { + memset(pRect, 0, sizeof(RECT)); + return 0; + } + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry->uShowPos) { // Ist der Eintrag aufgeklappt + memset(pRect, 0, sizeof(RECT)); + return 0; + } + + uPos = pEntry->uShowPos - pData->uScrollY - 1; + if(uPos >= pData->uMaxEnties) { // Eintrag im Fenster sichtbar + memset(pRect, 0, sizeof(RECT)); + return 0; + } + + pRect->top = pData->uStartPixel; + pRect->top += pData->iRowHeight * uPos; + pRect->bottom = pData->iRowHeight + pRect->top; + + if((uFlags & 0xFC) == TVIR_GETCOLUMN) { // Nur Spalten + uSub = uFlags >> 24; + if(uSub >= pData->uColumnCount) + uSub = 0; + + uNext = pData->aColumn[uSub].bNext; + pRect->left = pData->aColumnXpos[uSub]; + pRect->left -= pData->uScrollX; + pRect->right = pData->aColumnXpos[uNext]; + pRect->right -= pData->uScrollX; + } else { + uSub = 0; + pRect->left = 0; + pRect->left -= pData->uScrollX; + pRect->right = pData->uSizeX; + } + + if(uFlags & TVIR_TEXT) { // Nur Text ausgeben + if(uSub > 0) { + pExtra = pData ->pExtraItems[uSub - 1][uItem]; + + if(pData->aColumn[uSub].bEdit == TVAX_CHECK) { + pRect->left += pData->iChecksXsize; + if(pRect->left > pRect->right) + pRect->left = pRect->right; + } else + if(pExtra && pExtra->bFlags & TVIX_HASIMAGE) { + pRect->left += pData->iImagesXsize; + if(pRect->left > pRect->right) + pRect->left = pRect->right; + } + } else { + if(pData->cHasRootRow) { // Root-Linien ausgleichen + pRect->left += pData->iIndent; + } + + pRect->left += pData->iIndent * pEntry->uLevel; + + if(pData->hStates) { + pRect->left += pData->iStatesXsize; + } + + if(!(pData->uStyle & TVS_HASLINES)) { + pRect->left -= 1; + } + + if(pData->uStyleEx & TVS_EX_ITEMLINES) { + pRect->left += 1; + if(pEntry->bFlags & TVIX_HASIMAGE) + pRect->left++; + } + + if(pEntry->bFlags & TVIX_HASIMAGE) { + pRect->left += pData->iImagesXsize; + } + + if(pRect->left > pRect->right) { + pRect->left = pRect->right; + } + } + } + + return 1; +} + +//***************************************************************************** +//* +//* TreeListEnsureVisible +//* +//***************************************************************************** +// Macht einen Eintrag sichtbar +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages +// uSub : Untereintrag der sichtbar sein soll +// 0xFFFFFFFF nur Zeile +// FIRST_LINE als oberster Eintrag +// Ergibt 1 wenn nur zum Eintrag gescrollt wurde bzw. 0 wenn aufgeklapt wurde +static int TreeListEnsureVisible(TreeListData *pData, unsigned uItem, unsigned uSub) { + + BaseItem *pEntry; + BaseItem *pTemp; + unsigned uTemp; + unsigned uNext; + unsigned uPos; + int iNum; + int iAnf; + int iOff; + int iEnd; + int iMax; + int iRet; + + if(uItem > pData->uTreeItemsMax) + return -1; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return -1; + + uPos = pEntry->uShowPos; + if(!uPos) { // Zweige aufklappen wenn Eintrag zugeklappt + + iRet = 0; + + for(pTemp = pEntry;;) { + uTemp = pTemp->uParent; + pTemp = pData->pTreeItems[uTemp]; + if(!pTemp) + break; + if((pTemp->uState & TVIS_EXPANDED) == 0) { + if(TreeListToggleItem(pData, uTemp, 0)) + return 0; + } + } + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + + uPos = pEntry->uShowPos; + if(!uPos) + return 0; + } else { // Nur Scrollen + iRet = 1; + } + + uPos--; + if(uPos < pData->uScrollY) { // Vor erster Zeile + pData->uScrollY = uPos; + SetScrollPos(pData->hWnd, SB_VERT, uPos, TRUE); + UpdateView(pData); + } else + if(uSub == FIRST_LINE) { // Als ersten Eintrag + if(uPos != pData->uScrollY) { + pData->uScrollY = uPos; + SetScrollPos(pData->hWnd, SB_VERT, uPos, TRUE); + UpdateView(pData); + } + + return iRet; + } else + if(uPos >= pData->uScrollY + pData->uPageEnties) { // Nach letzter Zeile + iOff = uPos - (pData->uPageEnties - 1); + iMax = pData->uItemPosCount; + iMax -= pData->uPageEnties - 1; + + if(iOff >= iMax) + iOff = iMax; + if(iOff < 0) + iOff = 0; + if(iOff != (int)pData->uScrollY) { + pData->uScrollY = iOff; + SetScrollPos(pData->hWnd, SB_VERT, iOff, TRUE); + UpdateView(pData); + } + } + + if(uSub < pData->uColumnCount) { // Horizontal einrichten + uNext = pData->aColumn[uSub].bNext; + iNum = pData->uSizeX; + iOff = pData->uScrollX; + iAnf = pData->aColumnXpos[uSub ]; + iEnd = pData->aColumnXpos[uNext]; + + if(iOff + iNum < iAnf) + iOff = iAnf; + if(iOff >= iEnd) + iOff = iAnf; + if(iOff + iNum < iEnd) + iOff = iEnd - iNum; + if(iOff > iAnf) + iOff = iAnf; + + iMax = pData->aColumnXpos[pData->uColumnCount]; + iMax -= pData->uSizeX / 2; + + if(iOff > iMax) + iOff = iMax; + if(iOff < 0) + iOff = 0; + if(iOff != (int)pData->uScrollX) { + pData->uScrollX = iOff; + SetScrollPos(pData->hWnd, SB_HORZ, iOff, TRUE); + UpdateView(pData); + MoveWindow(pData->hHeader, -iOff, 0, iNum + iOff, pData->uStartPixel, TRUE); + } + } + return iRet; +} + +//***************************************************************************** +//* +//* TreeListIsVisible +//* +//***************************************************************************** +// Pr�ft ob ein Eintrag sichtbar ist +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages +// uSub : Untereintrag der gepr�ft werden soll +// 0xFFFFFFFF nur Zeile pr�fen +// Ergibt den Zustand des Eintrages: +// -1 = Unbekannter Eintrag +// 0 = Eintrag ist zugeklappt +// 1 = Eintrag ist aufgeklappt aber nicht sichtbar +// 2 = Eintrag ist aufgeklappt und teilweise sichtbar +// 3 = Eintrag ist aufgeklappt und Spalte ist nur teilweise sichtbar +// 4 = Eintrag ist aufgeklappt und ganz sichtbar +static int TreeListIsVisible(TreeListData *pData, unsigned uItem, unsigned uSub) { + + BaseItem *pEntry; + unsigned uNext; + unsigned uPos; + int iNum; + int iAnf; + int iOff; + int iEnd; + + if(uItem > pData->uTreeItemsMax) + return -1; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return -1; + + uPos = pEntry->uShowPos; + if(!uPos) { // Ist der Eintrag zugeklappt + return 0; + } + + uPos--; + if(uPos < pData->uScrollY) { // Vor erster Zeile + + return 1; + } + + if(uPos >= pData->uScrollY + pData->uMaxEnties) { // Nach letzter Zeile + return 1; + } + + if(uPos == pData->uScrollY + pData->uPageEnties) { // Auf halbsichtbarer Zeile + if(uSub < pData->uColumnCount) { + uNext = pData->aColumn[uSub].bNext; + iNum = pData->uSizeX; + iOff = pData->uScrollX; + iAnf = pData->aColumnXpos[uSub ]; + iEnd = pData->aColumnXpos[uNext]; + + if(iOff + iNum < iAnf) + return 1; + if(iOff >= iEnd) + return 1; + } + + return 2; + } + + if(uSub < pData->uColumnCount) { // Spalte pr�fen + uNext = pData->aColumn[uSub].bNext; + iNum = pData->uSizeX; + iOff = pData->uScrollX; + iAnf = pData->aColumnXpos[uSub ]; + iEnd = pData->aColumnXpos[uNext]; + + if(iOff + iNum < iAnf) + return 1; + if(iOff >= iEnd) + return 1; + if(iOff + iNum < iEnd) + return 3; + if(iOff > iAnf) + return 3; + } + + return 4; +} + +//***************************************************************************** +//* +//* TreeListDeleteItem +//* +//***************************************************************************** +// L�scht einen Eintrag aus dem Fenster +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages der gel�scht werden soll +// iMode : Wie soll der Eintrag gel�scht werden +// 0 = Eintrag l�schen und nicht neu zeichnen +// 1 = Eintrag l�schen und neu zeichnen +// 2 = Nur Kindereintr�ge l�schen und neu zeichnen +// Ergibt 1 wenn der Eintrag gel�scht wurde. +static int TreeListDeleteItem(TreeListData *pData, unsigned uItem, int iMode) { + + NMTREEVIEW sNotify; + ExtraItem **pList; + ExtraItem *pExtra; + BaseItem *pEntry; + BaseItem *pTemp; + unsigned uPos; + int iOff; + int iMax; + + if(pData->cLockChanges) + return 0; + + if(uItem > pData->uTreeItemsMax) { // Pr�fe den Eintrag + if(uItem != U(TVI_ROOT)) + return 0; // Alles l�schen + if(pData->uLastChild == 0) + return 0; + + while(pData->uLastChild) { + TreeListDeleteItem(pData, pData->uLastChild, 0); + } + + pData->uItemPosCount = 0; + + UpdateScrollY(pData); + UpdateView(pData); + + return 1; + } + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) { // Pr�fe den Eintrag + if(uItem != 0) + return 0; // Alles l�schen + if(pData->uLastChild == 0) + return 0; + + while(pData->uLastChild) { + TreeListDeleteItem(pData, pData->uLastChild, 0); + } + + pData->uItemPosCount = 0; + + UpdateScrollY(pData); + UpdateView(pData); + + return 1; + } + + if(iMode == 2) { // Nur Kindereintr�ge l�schen + if(!pEntry->uFirstChild) { + return 0; + } + + while(pEntry->uLastChild) { // Alle Kinder l�schen + TreeListDeleteItem(pData, pEntry->uLastChild, 0); + } + + uPos = pEntry->uShowPos; + if(uPos) { + UpdateItems(pData, uItem); + } + + return 1; + } + + while(pEntry->uLastChild) { // Alle Kinder l�schen + TreeListDeleteItem(pData, pEntry->uLastChild, 0); + } + + if(uItem == pData->uSelectedItem) { // Einen ausgew�hlten Eintrag l�schen + sNotify.hdr.code = TVN_SELCHANGED; + sNotify.action = TVC_UNKNOWN; + sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemOld.hItem = (HTREEITEM)uItem; + sNotify.itemOld.stateMask = 0xFFFFFFFF; + sNotify.itemOld.state = pEntry->uState&~TVIS_SELECTED; + sNotify.itemOld.lParam = pEntry->lParam; + sNotify.itemOld.cChildren = 0; + sNotify.itemOld.pszText = (LPTSTR) - 1; + sNotify.itemOld.cchTextMax = -1; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemNew.hItem = NULL; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = 0; + sNotify.itemNew.lParam = 0; + sNotify.itemNew.cChildren = 0; + sNotify.itemNew.pszText = (LPTSTR) - 1; + sNotify.itemNew.cchTextMax = -1; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + UNLOCK(pData); + SendNotify(pData, &sNotify.hdr); // Bekant geben das der Eintrag nicht mehr ausgew�hlt ist + LOCK(pData); + + pData->uSelectedItem = 0; + pData->uSelectedSub = 0; + } + + sNotify.hdr.code = TVN_DELETEITEM; + sNotify.itemNew.mask = 0; + sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; + sNotify.itemOld.hItem = (HTREEITEM)uItem; + sNotify.itemOld.lParam = pEntry->lParam; + sNotify.itemOld.pszText = (LPTSTR) - 1; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = pEntry->uState; + sNotify.itemOld.cchTextMax = -1; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + UNLOCK(pData); + SendNotify(pData, &sNotify.hdr); + LOCK(pData); + + pEntry = pData->pTreeItems[uItem]; // Pr�fen ob der Eintrag noch existiert + if(!pEntry) + return 0; + + if(uItem == pData->uTrackedItem) { // Einen unterstrichenen Eintrag l�schen + pData->uTrackedItem = 0; + pData->uTrackedSub = 0; + } + + if(pData->uInsertMark == uItem) { + pData->uInsertMark = 0; + } + + if(pData->uSingleSel == uItem) { + pData->uSingleSel = 0; + } + + if(pEntry->uPrevItem) { // Gibt es einen vorherigen Eintrag + pTemp = pData->pTreeItems[pEntry->uPrevItem]; + pTemp->uNextItem = pEntry->uNextItem; + } else { + if(pEntry->uParent) { // Neues erstes Kind in Elterneintrag + pTemp = pData->pTreeItems[pEntry->uParent]; + pTemp->uFirstChild = pEntry->uNextItem; + } else { + pData->uFirstChild = pEntry->uNextItem; + } + } + + if(pEntry->uNextItem) { // Gibt es einen vorherigen Eintrag + pTemp = pData->pTreeItems[pEntry->uNextItem]; + pTemp->uPrevItem = pEntry->uPrevItem; + } else { + if(pEntry->uParent) { // Neues letztes Kind in Elterneintrag + pTemp = pData->pTreeItems[pEntry->uParent]; + pTemp->uLastChild = pEntry->uPrevItem; + + if(pTemp->uFirstChild == 0 && pTemp->uLastChild == 0) { + pTemp->bFlags &= ~TVIX_HASBUTTON; + } + } else { + pData->uLastChild = pEntry->uPrevItem; + } + } + + for(uPos = 1; uPos < pData->uColumnCount; uPos++) { // Alle Extraeintr�ge l�schen + pList = pData->pExtraItems[uPos - 1]; + + pExtra = pList[uItem]; + if(!pExtra) + continue; + + pList[uItem] = NULL; + + if(pExtra->pText) { + pExtra->uTextSize = 0; + delete(pExtra->pText); + } + + delete(pExtra); + } + + + pData->pTreeItems[uItem] = NULL; // Den Eintrag l�schen + + if(pEntry->pText) { + pEntry->uTextSize = 0; + delete(pEntry->pText); + } + + if(iMode) { // Den Eintrag neuzeichnen + uItem = pEntry->uPrevItem; + if(!uItem && !pEntry->uNextItem) { + uItem = pEntry->uParent; + if(!uItem) + uPos = 1; + else + uPos = pData->pTreeItems[uItem]->uShowPos; + } else { + uPos = pEntry->uShowPos; + } + + if(uPos) { + UpdateItems(pData, uItem); + } + } + + if(pEntry->uState & TVIS_SELECTED) // Ausgew�hlte Eintr�ge runterz�hlen + if(pData->uSelectedCount > 0) { + pData->uSelectedCount--; + } + + delete(pEntry); + + pData->uTreeItemsCount--; + + iOff = pData->uScrollY; // Pr�fe die Scrollposition + iMax = pData->uItemPosCount; + iMax -= pData->uPageEnties - 1; + + if(iOff >= iMax) + iOff = iMax; + if(iOff < 0) + iOff = 0; + if(iOff != (int)pData->uScrollY) { + pData->uScrollY = iOff; + SetScrollPos(pData->hWnd, SB_VERT, iOff, TRUE); + UpdateView(pData); + } + + return 1; +} + +//***************************************************************************** +//* +//* TreeListXorSelectItem +//* +//***************************************************************************** +// W�hlt einen Eintrag ab bzw. an +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages der ausgew�hlt werden soll +// iMode : Ist der Grund f�r die �nderung +// TVC_BYKEYBOARD +// TVC_BYMOUSE +// TVC_UNKNOWN +// Ergibt 1 wenn der Eintrag ab/angew�hlt wurde +// 0 wenn der Eintrag nicht ver�ndert wurde +static int TreeListXorSelectItem(TreeListData *pData, unsigned uItem, int iMode) { + + NMTREEVIEW sNotify; + BaseItem *pEntry; + unsigned uOld; + unsigned uRet; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + if(uItem == pData->uSelectedItem) + return 0; + + uOld = pEntry->uState; + + sNotify.hdr.code = TVN_SELCHANGING; + sNotify.action = iMode; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = pEntry->uState; + sNotify.itemNew.lParam = pEntry->lParam; + sNotify.itemNew.cChildren = 0; + sNotify.itemNew.pszText = (LPTSTR) - 1; + sNotify.itemNew.cchTextMax = -1; + sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemOld.hItem = NULL; + sNotify.itemOld.stateMask = 0xFFFFFFFF; + sNotify.itemOld.state = 0; + sNotify.itemOld.lParam = 0; + sNotify.itemOld.cChildren = 0; + sNotify.itemOld.pszText = (LPTSTR) - 1; + sNotify.itemOld.cchTextMax = -1; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + UNLOCK(pData); + uRet = U(SendNotify(pData, &sNotify.hdr)); + LOCK(pData); + + if(uRet) + return 0; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + pEntry->uState ^= TVIS_SELECTED; + + sNotify.hdr.code = TVN_SELCHANGED; + sNotify.action = iMode; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = pEntry->uState; + sNotify.itemNew.lParam = pEntry->lParam; + sNotify.itemNew.cChildren = 0; + sNotify.itemNew.pszText = (LPTSTR) - 1; + sNotify.itemNew.cchTextMax = -1; + sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemOld.hItem = NULL; + sNotify.itemOld.stateMask = 0xFFFFFFFF; + sNotify.itemOld.state = 0; + sNotify.itemOld.lParam = 0; + sNotify.itemOld.cChildren = 0; + sNotify.itemOld.pszText = (LPTSTR) - 1; + sNotify.itemOld.cchTextMax = -1; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + UNLOCK(pData); + SendNotify(pData, &sNotify.hdr); + LOCK(pData); + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + if(pEntry->uShowPos) { + if(pData->uStyleEx & TVS_EX_FULLROWMARK) + UpdateRow(pData, uItem); + else + UpdateRect(pData, uItem, 0); + } + + if((uOld ^ pEntry->uState)&TVIS_SELECTED) { + if(pEntry->uState & TVIS_SELECTED) + pData->uSelectedCount++; + else + pData->uSelectedCount--; + } + + return 1; +} + + +//***************************************************************************** +//* +//* TreeListRemoveFocus +//* +//***************************************************************************** +// W�hlt den Focus ab +// pData : Zeiger auf die Fensterdaten +static void TreeListRemoveFocus(TreeListData *pData) { + + ExtraItem *pExtra; + BaseItem *pEntry; + unsigned uItem; + unsigned uSub; + + if(!pData->uFocusItem) + return; + + uItem = pData->uFocusItem; + pEntry = pData->pTreeItems[uItem]; + + if(pEntry) { + pEntry->bFlags &= ~TVIX_FOCUSED; + + uSub = pData->uFocusSub; + + if(uSub) { + pExtra = pData->pExtraItems[uSub - 1][uItem]; + if(pExtra) + pExtra->bFlags &= ~TVIX_FOCUSED; + } + + UpdateRect(pData, uItem, uSub); + } + + pData->uFocusItem = 0; + pData->uFocusSub = 0; +} + +//***************************************************************************** +//* +//* TreeListSetFocus +//* +//***************************************************************************** +// W�hlt den Focus-Eintrag +// pData : Zeiger auf die Fensterdaten +// uItem : Eintrag f�r den Focus (0xFFFFFFFF=keine �nderung) +// uSub : Spalte f�r den Focus (0xFFFFFFFF=keine �nderung) +// Ergibt 1 wenn der Focus gesetzt wurde, bzw 0 bei einem Fehler +static int TreeListSetFocus(TreeListData *pData, unsigned uItem, unsigned uSub) { + + ExtraItem *pExtra; + BaseItem *pEntry; + BaseItem *pTemp; + unsigned uTemp; + unsigned uCol; + + if(pData->uFocusItem) { + if(uSub == 0xFFFFFFFF) + uSub = pData->uFocusSub; + if(uItem == 0xFFFFFFFF) + uItem = pData->uFocusItem; + } else { + if(uSub == 0xFFFFFFFF) + uSub = pData->uSelectedSub; + if(uItem == 0xFFFFFFFF) + uItem = pData->uSelectedItem; + } + + if(pData->uFocusItem == uItem) + if(pData->uFocusSub == uSub) + return 1; + + if(!uItem) { // Focus abw�hlen + TreeListRemoveFocus(pData); + return 1; + } + + + if(uItem > pData->uTreeItemsMax) { // Den Eintrag pr�fen + return 0; + } + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) { + return 0; + } + + if(!(pData->uStyleEx & TVS_EX_SUBSELECT)) + uSub = 0; + + if(!(pData->uStyleEx & TVS_EX_MULTISELECT)) { // Einzel auswahl + return TreeListSelectItem(pData, uItem, uSub, TVC_UNKNOWN); + } + + uTemp = pData->uFocusItem; + pTemp = pData->pTreeItems[uTemp]; + + if(pTemp) { // Den alten Eintrag abw�hlen + pTemp->bFlags &= ~TVIX_FOCUSED; + uCol = pData->uFocusSub; + + if(uCol) { + pExtra = pData->pExtraItems[uCol - 1][uTemp]; + if(pExtra) + pExtra->bFlags &= ~TVIX_FOCUSED; + } + + UpdateRect(pData, uItem, uSub); + } + + + if(uSub) { // Neuen Eintrag w�hlen + pExtra = pData->pExtraItems[uSub - 1][uItem]; + if(pExtra) + pExtra->bFlags |= TVIX_FOCUSED; + } else { + pEntry->bFlags |= TVIX_FOCUSED; + } + + pData->uFocusItem = uItem; + pData->uFocusSub = uSub; + + if(pEntry->uState & TVIS_SELECTED) { // Auch die Auswahl nachziehen + if(pData->uSelectedItem != uItem) { + uTemp = pData->uSelectedItem; + uCol = pData->uSelectedSub; + } else { + uTemp = 0; + uCol = pData->uSelectedSub; + } + + pData->uSelectedItem = uItem; + pData->uSelectedSub = uSub; + + if(pData->uStyleEx & TVS_EX_FULLROWMARK) { + uCol = uSub + 1; + } + + if(uTemp) { + if(uCol != uSub) + UpdateRow(pData, uTemp); + else + UpdateRect(pData, uTemp, uCol); + } + + + if(uCol != uSub) + UpdateRow(pData, uItem); + else + UpdateRect(pData, uItem, uCol); + } else { + UpdateRect(pData, uItem, uSub); + } + + return 1; +} + +//***************************************************************************** +//* +//* TreeListSelectItem +//* +//***************************************************************************** +// W�hlt einen Eintrag aus +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages der ausgew�hlt werden soll +// uSubItem : Ist die Spalte die gew�hlt werden soll +// iMode : Ist der Grund f�r die �nderung +// TVC_BYKEYBOARD +// TVC_BYMOUSE +// TVC_UNKNOWN +// TVC_ONLYFOCUS (nur der Focus hat sich ver�ndert) +// TVC_DESELECT (dieses Flag l�scht die alte Auswahl) +// TVC_UNSELECT (dieses Flag l�scht Auswahl bei MultiSel) +// Ergibt 2 wenn der Eintrag gew�hlt und umgeklapt wurde +// 1 wenn der Eintrag gew�hlt wurde +// 0 wenn der Eintrag nicht gew�hlt wurde +static int TreeListSelectItem(TreeListData *pData, unsigned uItem, unsigned uSubItem, int iMode) { + + NMTREEVIEW sNotify; + ExtraItem *pExtra; + BaseItem *pEntry; + BaseItem *pTemp; + LPARAM lParam; + LPARAM lPaOld; + unsigned uState; + unsigned uStOld; + unsigned uNext; + unsigned uPos; + unsigned uOld; + unsigned uSub; + unsigned uRet; + int iDel; + int iSel; + + uOld = pData->uSelectedItem; + uSub = pData->uSelectedSub; + + if(uSubItem >= pData->uColumnCount && uSubItem > 0) + return 0; + if(uItem > pData->uTreeItemsMax) + return 0; + if(uItem == uOld) + if(uSubItem == uSub) + if(pData->uSelectedCount <= 1 || !(pData->uStyleEx & TVS_EX_MULTISELECT)) { + return 1; + } + + if(pData->uStyleEx & TVS_EX_MULTISELECT) { // Ist die Mehrfachauswahl m�glich + iSel = iMode & TVC_UNSELECT; + iDel = iMode & TVC_DESELECT; + if(!iDel) { + if(pData->uStyleEx & (TVS_EX_FULLROWMARK | TVS_EX_SUBSELECT)) + UpdateRow(pData, uOld); + else + UpdateRect(pData, uOld, uSub); + + uOld = 0; + uSub = 0; + } else { // Alle gew�hlten Eintr�ge abw�hlen + if(pData->uSelectedCount > 1 && pData->uTreeItemsMax) { + for(uPos = pData->uTreeItemsMax; uPos; uPos--) { + pEntry = pData->pTreeItems[uPos]; + if(!pEntry || !(pEntry->uState & TVIS_SELECTED)) + continue; + if(TreeListXorSelectItem(pData, uPos, iMode)) + if(!pData->uSelectedCount) + break; // Wurden alle Eintr�ge abgew�hlt + } + } + } + } else { // Altes Select l�schen + iMode &= ~TVC_ONLYFOCUS; + iDel = 1; + iSel = 0; + } + + iMode &= ~(TVC_DESELECT | TVC_UNSELECT); + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) { // Neuen Statatus holen + if(uItem) + return 0; + uState = 0; + lParam = 0; + } else { + uState = pEntry->uState; + lParam = pEntry->lParam; + + if(uSubItem) { + uState &= TVIS_BASEFLAGS; + pExtra = pData->pExtraItems[uSubItem - 1][uItem]; + if(pExtra) + uState |= pExtra->uState; + } + } + + pTemp = pData->pTreeItems[uOld]; + if(!pTemp) { // Alten Status holen + uStOld = 0; + lPaOld = 0; + } else { + uStOld = pTemp->uState; + lPaOld = pTemp->lParam; + + if(uSub) { + uStOld &= TVIS_BASEFLAGS; + pExtra = pData->pExtraItems[uSub - 1][uOld]; + if(pExtra) + uStOld |= pExtra->uState; + } + } + + sNotify.hdr.code = TVN_SELCHANGING; + sNotify.action = iMode; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = uState; + sNotify.itemNew.lParam = lParam; + sNotify.itemNew.cChildren = uSubItem; + sNotify.itemNew.pszText = (LPTSTR) - 1; + sNotify.itemNew.cchTextMax = -1; + sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemOld.hItem = (HTREEITEM)uOld; + sNotify.itemOld.stateMask = 0xFFFFFFFF; + sNotify.itemOld.state = uStOld; + sNotify.itemNew.lParam = lPaOld; + sNotify.itemOld.cChildren = uSub; + sNotify.itemOld.pszText = (LPTSTR) - 1; + sNotify.itemOld.cchTextMax = -1; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + + UNLOCK(pData); + + if(SendNotify(pData, &sNotify.hdr)) { // Abfragen ob der Eintrag gew�hlt werden darf + LOCK(pData); + return 0; + } + + LOCK(pData); + + if(uItem) { // Pr�fen ob der Eintrag noch existiert + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + } + + if(iDel) { + uOld = pData->uSelectedItem; + pTemp = pData->pTreeItems[uOld]; + } + + + if(pTemp) { // Den alten Eintrag abw�hlen + if(pTemp->uShowPos) { // Den Eintrag neu zeichnen + if((pData->uStyleEx & TVS_EX_FULLROWMARK) || pData->uSelectedSub) + UpdateRow(pData, uOld); + else + UpdateRect(pData, uOld, uSub); + } + + if(pTemp->uState & TVIS_SELECTED) { + uStOld &= ~TVIS_SELECTED; + pTemp->uState &= ~TVIS_SELECTED; + + if(pData->uSelectedCount > 0) { + pData->uSelectedCount -= 1; + } + } + + pData->uSelectedSub = 0; + pData->uSelectedItem = 0; + } else { + uOld = 0; + } + + + if(uItem) { // Den neuen Eintrag w�hlen + if(iSel) { + if(pEntry->uState & TVIS_SELECTED) { + uState &= ~TVIS_SELECTED; + pEntry->uState &= ~TVIS_SELECTED; + if(pData->uSelectedCount) + pData->uSelectedCount--; + } + } else { + if(!(pEntry->uState & TVIS_SELECTED)) { + uState |= TVIS_SELECTED; + pEntry->uState |= TVIS_SELECTED; + pData->uSelectedCount += 1; + } + } + + if(uSubItem && uSubItem < pData->uColumnCount) { + pExtra = pData->pExtraItems[uSubItem - 1][uItem]; + if(!pExtra) { + pExtra = new(ExtraItem, 1); + memset(pExtra, 0, sizeof(ExtraItem)); + pExtra->iImage = TV_NOIMAGE; + pExtra->uState = pEntry->uState & (TVIS_BOLD | TVIS_UNDERLINE); + pData->pExtraItems[uSubItem - 1][uItem] = pExtra; + } + + uState = pExtra->uState; + uState |= pEntry->uState & TVIS_BASEFLAGS; + } else { + uState = pEntry->uState; + } + + if(pEntry->uShowPos) { // Den Eintrag neu zeichnen + if(pData->uStyleEx & (TVS_EX_FULLROWMARK | TVS_EX_SUBSELECT)) + UpdateRow(pData, uItem); + else + UpdateRect(pData, uItem, uSubItem); + } + + pData->uSelectedSub = uSubItem; + pData->uSelectedItem = uItem; + } else { + pData->uSelectedItem = 0; + pData->uSelectedSub = 0; + uState = 0; + } + + sNotify.hdr.code = TVN_SELCHANGED; + sNotify.action = iMode; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = uState; + sNotify.itemNew.lParam = lParam; + sNotify.itemNew.cChildren = uSubItem; + sNotify.itemNew.pszText = (LPTSTR) - 1; + sNotify.itemNew.cchTextMax = -1; + sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE | TVIF_SUBITEM | TVIF_PARAM; + sNotify.itemOld.hItem = (HTREEITEM)uOld; + sNotify.itemOld.stateMask = 0xFFFFFFFF; + sNotify.itemOld.state = uStOld; + sNotify.itemOld.lParam = lPaOld; + sNotify.itemOld.cChildren = uSub; + sNotify.itemOld.pszText = (LPTSTR) - 1; + sNotify.itemOld.cchTextMax = -1; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + UNLOCK(pData); + SendNotify(pData, &sNotify.hdr); + LOCK(pData); + + if(!(pData->uStyle & TVS_SINGLEEXPAND)) { // Einzelmodus aktiv + if(pData->uStyle & TVS_SHOWSELALWAYS) + if(pData->uSelectedItem) { + TreeListEnsureVisible(pData, pData->uSelectedItem, pData->uSelectedSub); + } + + return 1; + } + + + //***************************************************************************** + + + sNotify.hdr.code = TVN_SINGLEEXPAND; + sNotify.action = iMode; + sNotify.itemNew.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; + sNotify.itemNew.hItem = (HTREEITEM)uItem; + sNotify.itemNew.stateMask = 0xFFFFFFFF; + sNotify.itemNew.state = (pEntry) ? pEntry->uState : 0; + sNotify.itemNew.cChildren = 0; + sNotify.itemNew.pszText = (LPTSTR) - 1; + sNotify.itemNew.cchTextMax = -1; + sNotify.itemOld.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE; + sNotify.itemOld.hItem = (HTREEITEM)uOld; + sNotify.itemOld.stateMask = 0xFFFFFFFF; + sNotify.itemOld.state = (pTemp) ? pTemp->uState : 0; + sNotify.itemOld.cChildren = 0; + sNotify.itemOld.pszText = (LPTSTR) - 1; + sNotify.itemOld.cchTextMax = -1; + sNotify.ptDrag.x = 0; + sNotify.ptDrag.y = 0; + + UNLOCK(pData); + uRet = U(SendNotify(pData, &sNotify.hdr)); // Anfragen ob die Zweige umgeklappt werden d�rfen + LOCK(pData); + + + pTemp = pData->pTreeItems[uOld ]; // Zeiger neu holen falls es �nderungen gab + pEntry = pData->pTreeItems[uItem]; + + while(pTemp && pEntry) { // Beide Zweige sysnchronisieren + if(pEntry->uLevel > pTemp->uLevel) { + uNext = pEntry->uParent; + + if(!(uRet & TVNRET_SKIPNEW)) + if(!(pEntry->uState & TVIS_EXPANDED)) { + TreeListToggleItem(pData, uItem, 0); + } + + pEntry = pData->pTreeItems[uNext]; + uItem = uNext; + + if(!uItem) + break; + + continue; + } + + if(uItem == uOld) + goto EndSel; // Bis zum gleichen Knoten + + uNext = pTemp->uParent; + + if(!(uRet & TVNRET_SKIPOLD)) + if(pTemp->uState & TVIS_EXPANDED) { + TreeListToggleItem(pData, uOld, 0); + } + + pTemp = pData->pTreeItems[uNext]; + uOld = uNext; + } + + if(!uItem) { + if(!(uRet & TVNRET_SKIPOLD)) + while(pTemp) { // Alten Zweig zuklappen + uNext = pTemp->uParent; + + if(pTemp->uState & TVIS_EXPANDED) { + TreeListToggleItem(pData, uOld, 0); + } + + pTemp = pData->pTreeItems[uNext]; + uOld = uNext; + } + + goto EndSel; + } + + if(!uOld) { + if(!(uRet & TVNRET_SKIPNEW)) + while(pEntry) { // Neuen Zweig aufklappen + uNext = pEntry->uParent; + + if(!(pEntry->uState & TVIS_EXPANDED)) { + TreeListToggleItem(pData, uItem, 0); + } + + pEntry = pData->pTreeItems[uNext]; + uItem = uNext; + } + } + +EndSel: + + if(pData->uStyle & TVS_SHOWSELALWAYS) + if(pData->uSelectedItem) { + TreeListEnsureVisible(pData, pData->uSelectedItem, pData->uSelectedSub); + } + + return 2; +} + +//***************************************************************************** +//* +//* TreeListSelectChilds +//* +//***************************************************************************** +// W�hlt einen Eintrag aus +// pData : Zeiger auf die Fensterdaten +// uItem : Ist die Nummer des Eintrages der ausgew�hlt werden soll +// iMode : Bit 0 = Untereint�ge auch �ndern +// Bit 1 = Eintr�ge abw�hlen +// Ergibt 1 wenn die Auswahl funktioniert hat, bzw. 0 bei einem Fehler +static int TreeListSelectChilds(TreeListData *pData, unsigned uItem, int iMode) { + + BaseItem *pEntry; + unsigned uLevel; + unsigned uXor; + + if(!(pData->uStyleEx & TVS_EX_MULTISELECT)) + return 0; + + uLevel = 0; + + if(uItem == U(TVI_ROOT)) { + uItem = pData->uFirstChild; + } else { + if(uItem > pData->uTreeItemsMax) + return 0; + } + + if(!pData->pTreeItems[uItem]) { + return 0; + } + + + uXor = (iMode & TVIS_DESELECT) ? 0 : TVIS_SELECTED; + iMode &= TVIS_WITHCHILDS; + + for(;;) { + pEntry = pData->pTreeItems[uItem]; + + if((pEntry->uState ^ uXor)&TVIS_SELECTED) { + TreeListXorSelectItem(pData, uItem, TVC_UNKNOWN); + } + + if(iMode && pEntry->uFirstChild) { // Auch Kinder �ndern + uItem = pEntry->uFirstChild; + uLevel++; + continue; + } + + for(;;) { // Eine Ebene h�her + uItem = pEntry->uNextItem; + if(uItem != 0) + break; + if(uLevel == 0) + return 1; + + uLevel--; + + uItem = pEntry->uParent; + pEntry = pData->pTreeItems[uItem]; + } + } +} + +//***************************************************************************** +//* +//* TreeListInsertItem +//* +//***************************************************************************** +// F�gt einen Eintrag ins Fenster ein +// pData : Zeiger auf die Fensterdaten +// pInsert : Zeiger auf die ein zu f�genden Daten +// Ergibt die Einf�geposition des neuen Eintrages oder 0 bei einem Fehler +static unsigned TreeListInsertItem(TreeListData *pData, TV_INSERTSTRUCT *pInsert) { + + char *pTemp; + BYTE bFlag; + LPCTSTR pText; + LPCTSTR pTextTemp; + PFNTVSORTEX pCompare; + ExtraItem **pExOld[MAX_COLUMNS]; + ExtraItem **pExNew[MAX_COLUMNS]; + BaseItem *pNew; + BaseItem **pOld; + BaseItem **pItems; + BaseItem *pEntry; + BaseItem *pParent; + unsigned *pPosNew; + unsigned *pPosOld; + unsigned *pFirst; + unsigned *pLast; + unsigned uBefore; + unsigned uParent; + unsigned uAfter; + unsigned uFirst; + unsigned uSize; + unsigned uBits; + unsigned uItem; + unsigned uNext; + unsigned uMax; + unsigned uPos; + unsigned uNum; + int iCmp; + int iNone; + int iCount; + int iShift; + + if(pData->cLockChanges) + return 0; + + uParent = U(pInsert->hParent); + if(uParent > pData->uTreeItemsMax) { // Pr�fe das Elternelement + if(pInsert->hParent != TVI_ROOT) { + return 0; + } + + pParent = NULL; + } else { + pParent = pData->pTreeItems[uParent]; + if(!pParent) { + if(uParent) + return 0; + pParent = NULL; + } + } + + if(pData->uTreeItemsCount + 1 > pData->uTreeItemsMax) { // Gr��e der Liste erh�hen + pPosOld = pData->pItemPos; + pOld = pData->pTreeItems; + uMax = pData->uTreeItemsMax; + uMax += pData->uTreeItemsMax / 2; + uMax += 64; + pItems = new(BaseItem*, uMax + 1); + + if(!pItems) { + return 0; + } + + pPosNew = new(unsigned, uMax); + if(!pPosNew) { + delete(pItems); + return 0; + } + + for(uPos = 1; uPos < pData->uColumnCount; uPos++) { + pExOld[uPos] = pData->pExtraItems[uPos - 1]; + pExNew[uPos] = new(ExtraItem*, uMax + 1); + + if(!pExNew[uPos]) { + for(uPos--; uPos > 0; uPos--) + delete(pExNew[uPos]); + delete(pPosNew); + delete(pItems); + return 0; + } + } + + memcpy(pItems , pData->pTreeItems , sizeof(BaseItem *) * (pData->uTreeItemsMax + 1)); + memset(pItems + pData->uTreeItemsMax + 1, 0, sizeof(BaseItem *) * (uMax - pData->uTreeItemsMax)); + memcpy(pPosNew, pData->pItemPos , sizeof(unsigned) * (pData->uTreeItemsCount)); + memset(pPosNew + pData->uTreeItemsCount, 0, sizeof(unsigned) * (uMax - pData->uTreeItemsCount)); + + for(uPos = 1; uPos < pData->uColumnCount; uPos++) { + memcpy(pExNew[uPos], pExOld[uPos] , sizeof(ExtraItem *) * (pData->uTreeItemsMax + 1)); + memset(pExNew[uPos] + pData->uTreeItemsMax + 1, 0, sizeof(ExtraItem *) * (uMax - pData->uTreeItemsMax)); + pData->pExtraItems[uPos - 1] = pExNew[uPos]; + delete(pExOld[uPos]); + } + + pData->uTreeItemsMax = uMax; + pData->pTreeItems = pItems; + pData->pItemPos = pPosNew; + delete(pPosOld); + delete(pOld); + } + + //******************** Den neuen Eintrag erzeugen ***************************** + pItems = pData->pTreeItems; + uPos = pData->uNextSeachPos + 1; + pTemp = new(char, sizeof(BaseItem) + pData->uUserDataSize); + pNew = (BaseItem *)pTemp; + + if(!pNew) { // Konnte der Speicher reserviert werden + return 0; + } + + if(pData->uUserDataSize) { // Die Userdaten auf 0 setzen + memset(pTemp + sizeof(BaseItem), 0, pData->uUserDataSize); + } + + for(;; uPos++) { // Suche freie Position + if(uPos > pData->uTreeItemsMax) + uPos = 1; + if(pItems[uPos] == NULL) + break; + } + + pData->uNextSeachPos = uPos; + + memset(pNew, 0, sizeof(BaseItem)); // Erstelle den neuen Eintrag + pNew->iImage = TV_NOIMAGE; + pNew->iSelectedImage = TV_NOIMAGE; + + uBits = pInsert->item.mask; + + if(uBits & TVIF_STATE) { + pNew->uState = pInsert->item.state & pInsert->item.stateMask; + } else { + if(pData->uStyle & TVS_CHECKBOXES) + if(!(pData->uStyleEx & TVS_EX_BITCHECKBOX)) { + pNew->uState = 0x1000; + } + } + + if(uBits & TVIF_PARAM) { + pNew->lParam = pInsert->item.lParam; + } + + if(uBits & TVIF_IMAGE) { + pNew->iImage = pInsert->item.iImage; + if(pNew->iImage == I_IMAGECALLBACK) + pNew->bCallback |= TVIF_IMAGE; + } + + if(uBits & TVIF_SELECTEDIMAGE) { + pNew->iSelectedImage = pInsert->item.iSelectedImage; + if(pNew->iSelectedImage == I_IMAGECALLBACK) + pNew->bCallback |= TVIF_SELECTEDIMAGE; + } + + if(uBits & TVIF_CHILDREN) { // Art der Schaltfl�chen + switch(pInsert->item.cChildren) { + case 0: + break; + case 1: + pNew->bFlags |= TVIX_HASBUTTON; + break; + case I_CCB: + pNew->bCallback |= TVIF_CHILDREN; + break; + default + : + pNew->bFlags |= TVIX_VARBUTTON; + break; + } + } else { + pNew->bFlags |= TVIX_VARBUTTON; + } + + if(pData->uStyle & TVS_SINGLEEXPAND) { // Nicht aufklappen bei Einzelmodus + pNew->uState &= ~TVIS_EXPANDED; + } + + if(uBits & TVIF_TEXT) { // Text einf�gen + if(pInsert->item.pszText == LPSTR_TEXTCALLBACK) { + pNew->bCallback |= TVIF_TEXT; + pNew->uTextSize = 0; + pNew->pText = 0; + } else { + pNew->uTextSize = (WORD)str_len(pInsert->item.pszText); + pNew->pText = new(TCHAR, pNew->uTextSize + 1); + memcpy(pNew->pText, pInsert->item.pszText, sizeof(TCHAR) * (pNew->uTextSize + 1)); + } + } else { + pNew->pText = new(TCHAR, 1); + pNew->pText[0] = 0; + pNew->uTextSize = 0; + } + + if(!pParent) { // Einen Root-Eintrag einf�gen + pNew->uParent = 0; + uParent = 0; + bFlag = 0; + uFirst = 0xFFFFFFFF; + pFirst = &pData->uFirstChild; + pLast = &pData->uLastChild; + } else { // Einen Tree-Eintrag einf�gen + pNew->uParent = uParent; + pNew->uLevel = pParent->uLevel + 1; + uFirst = pParent->uFirstChild; + pFirst = &pParent->uFirstChild; + pLast = &pParent->uLastChild; + bFlag = pParent->bFlags; + + if(pParent->bFlags & TVIX_VARBUTTON) { + pParent->bFlags |= TVIX_HASBUTTON; + } + } + + //******************** Eintrage einf�gen ************************************** + uAfter = U(pInsert->hInsertAfter); + + switch(uAfter) { + case U(TVI_BEFORE): // Nach einem Eintrag einf�gen + if(pParent) { // Einen Root-Eintrag einf�gen + pEntry = pParent; + pParent ->bFlags = bFlag; + uParent = pParent->uParent; + pParent = pItems [uParent]; + + if(!pParent) { + pNew->uParent = 0; + pNew->uLevel = 0; + uParent = 0; + uFirst = 0xFFFFFFFF; + pFirst = &pData->uFirstChild; + pLast = &pData->uLastChild; + } else { // Einen Tree-Eintrag einf�gen + pNew->uParent = uParent; + pNew->uLevel = pParent->uLevel + 1; + uFirst = pParent->uFirstChild; + pFirst = &pParent->uFirstChild; + pLast = &pParent->uLastChild; + + if(pParent->bFlags & TVIX_VARBUTTON) { + pParent->bFlags |= TVIX_HASBUTTON; + } + } + + if(pEntry->uPrevItem) { + uAfter = pEntry->uPrevItem; + goto DoInsert; + } + } + + case U(TVI_FIRST): // Am Anfang einf�gen + if(pFirst[0]) { // Gibt es schon Eintr�ge + pEntry = pItems[pFirst[0]]; + pEntry->uPrevItem = uPos; + } else { + pFirst[0] = uPos; + pLast [0] = uPos; + break; + } + + pNew ->uNextItem = pFirst[0]; // Eintrag einf�gen + pFirst[0] = uPos; + break; + + case U(TVI_ROOT): // Als Root-Eintrag einf�gen + pNew->uParent = 0; + uParent = 0; + pFirst = &pData->uFirstChild; + pLast = &pData->uLastChild; + + case U(TVI_LAST): // Am Ende einf�gen + if(pLast[0]) { // Gibt es schon Eintr�ge + pEntry = pItems[pLast[0]]; + pEntry->uNextItem = uPos; + } else { + pFirst[0] = uPos; + pLast [0] = uPos; + break; + } + + pNew ->uPrevItem = pLast[0]; // Eintrag einf�gen + pLast[0] = uPos; + break; + + + case U(TVI_SORTEX): // Einf�gen mittels Funktion + uItem = pFirst[0]; + if(!uItem) { // Gibt es keine Kindeintr�ge + pFirst[0] = uPos; + pLast [0] = uPos; + break; + } + + if(pNew->bCallback & TVIF_TEXT) { // Text �ber Callback holen + uSize = 1; + LOCK(pData); + CallbackEntry(pData, pNew, uPos, TVIF_TEXT, &iNone, &uSize, &pText); + UNLOCK(pData); + } else { + pText = pNew->pText; + } + + pData->cLockChanges = 1; + + pCompare = (PFNTVSORTEX)(pInsert->item.hItem); + if(!pCompare) + break; + uNext = uItem; + iCount = 0; + uBefore = 0; + + while(uNext) { // Z�hle die Eintr�ge + iCount++; + uNext = pItems[uNext]->uNextItem; + } + + while(iCount > 0) { // Binary-Seach Algorithnus + iShift = iCount / 2; + uNext = uItem; + + while(iShift > 0) { + uNext = pItems[uNext]->uNextItem; + iShift--; + } + + pEntry = pItems[uNext]; + if(pEntry->bCallback & TVIF_TEXT) { // Text �ber Callback holen + uSize = 0; + LOCK(pData); + CallbackEntry(pData, pEntry, uItem, TVIF_TEXT, &iNone, &uSize, &pTextTemp); + UNLOCK(pData); + } else { + pTextTemp = pEntry->pText; + } + + iCmp = pCompare(pData->hWnd, (HTREEITEM)uNext, pTextTemp, pText, pEntry->lParam, pInsert->item.lParam); + if(iCmp < 0) { + iCount -= (iCount + 1) / 2; + continue; + } + + if(iCmp > 0) { + iCount -= iCount / 2 + 1; + uBefore = uNext; + uItem = pItems[uNext]->uNextItem; + continue; + } + + uBefore = pEntry->uPrevItem; + uItem = uNext; + break; + } + + pData->cLockChanges = 0; + + pNew->uNextItem = uItem; + pNew->uPrevItem = uBefore; + + if(uBefore) { // Vorherigen Eintrag anpassen + pEntry = pItems[uBefore]; + pEntry->uNextItem = uPos; + } else { // Am Anfang einf�gen + pFirst[0] = uPos; + } + + if(uItem) { // N�chsten Eintrag anpassen + pEntry = pItems[uItem]; + pEntry->uPrevItem = uPos; + } else { // Am Ende anh�ngen + pLast[0] = uPos; + } + break; + + case U(TVI_SORT): // Alphapetisch einf�gen + uItem = pFirst[0]; + if(!uItem) { // Gibt es keine Kindeintr�ge + pFirst[0] = uPos; + pLast [0] = uPos; + break; + } + + if(pNew->bCallback & TVIF_TEXT) { // Text �ber Callback holen + uSize = 1; + LOCK(pData); + CallbackEntry(pData, pNew, uPos, TVIF_TEXT, &iNone, &uSize, &pText); + UNLOCK(pData); + } else { + pText = pNew->pText; + } + + pData->cLockChanges = 1; + + uNext = uItem; + iCount = 0; + uBefore = 0; + + while(uNext) { // Z�hle die Eintr�ge + iCount++; + uNext = pItems[uNext]->uNextItem; + } + + while(iCount > 0) { // Binary-Seach Algorithnus + iShift = iCount / 2; + uNext = uItem; + + while(iShift > 0) { + uNext = pItems[uNext]->uNextItem; + iShift--; + } + + + pEntry = pItems[uNext]; + if(pEntry->bCallback & TVIF_TEXT) { // Text �ber Callback holen + uSize = 0; + LOCK(pData); + CallbackEntry(pData, pEntry, uItem, TVIF_TEXT, &iNone, &uSize, &pTextTemp); + UNLOCK(pData); + } else { + pTextTemp = pEntry->pText; + } + + iCmp = str_icmp(pText, pTextTemp); + + if(iCmp < 0) { + iCount -= (iCount + 1) / 2; + continue; + } + + if(iCmp > 0) { + iCount -= iCount / 2 + 1; + uBefore = uNext; + uItem = pItems[uNext]->uNextItem; + continue; + } + + uBefore = pEntry->uPrevItem; + uItem = uNext; + break; + } + + + pData->cLockChanges = 0; + + pNew->uNextItem = uItem; + pNew->uPrevItem = uBefore; + + if(uBefore) { // Vorherigen Eintrag anpassen + pEntry = pItems[uBefore]; + pEntry->uNextItem = uPos; + } else { // Am Anfang einf�gen + pFirst[0] = uPos; + } + + if(uItem) { // N�chsten Eintrag anpassen + pEntry = pItems[uItem]; + pEntry->uPrevItem = uPos; + } else { // Am Ende anh�ngen + pLast[0] = uPos; + } + break; + + case U(TVI_AFTER): // Nach einem Eintrag einf�gen + uAfter = uParent; + + if(pParent) { // Einen Root-Eintrag einf�gen + pParent ->bFlags = bFlag; + uParent = pParent->uParent; + pParent = pItems [uParent]; + + if(!pParent) { + pNew->uParent = 0; + pNew->uLevel = 0; + uParent = 0; + uFirst = 0xFFFFFFFF; + pFirst = &pData->uFirstChild; + pLast = &pData->uLastChild; + } else { // Einen Tree-Eintrag einf�gen + pNew->uParent = uParent; + pNew->uLevel = pParent->uLevel + 1; + uFirst = pParent->uFirstChild; + pFirst = &pParent->uFirstChild; + pLast = &pParent->uLastChild; + + if(pParent->bFlags & TVIX_VARBUTTON) { + pParent->bFlags |= TVIX_HASBUTTON; + } + } + } + + default + : // Hinter einen Eintrag einf�gen +DoInsert: + uItem = pFirst[0]; + if(!uItem) { // Gibt es keine Kindeintr�ge + pFirst[0] = uPos; + pLast [0] = uPos; + break; + } + + if(uAfter > pData->uTreeItemsMax) { + if((uAfter & 0xFFF00000) == 0xFFE00000) { // In einer genauen Reihe nach Patent einf�gen + uAfter &= 0xFFFFF; + + uItem = pFirst[0]; + if(!uItem) { // Gibt es keine Kindeintr�ge + pFirst[0] = uPos; + pLast [0] = uPos; + break; + } + + if(uAfter == 0) { // In die erste Reihe einf�gen + pEntry = pItems[uItem]; + pEntry->uPrevItem = uPos; + pNew ->uNextItem = uItem; + pFirst[0] = uPos; + break; + } + + uNum = 1; + uBefore = 0; + // Suche Einf�gereihe + for(; uItem; uItem = pItems[uItem]->uNextItem) { + uBefore = uItem; + + if(uNum == uAfter) { + uItem = pItems[uItem]->uNextItem; + break; + } + + uNum++; + } + + pNew->uNextItem = uItem; + pNew->uPrevItem = uBefore; + + if(uBefore) { // Vorherigen Eintrag anpassen + pEntry = pItems[uBefore]; + pEntry->uNextItem = uPos; + } else { // Am Anfang einf�gen + pFirst[0] = uPos; + } + + if(uItem) { // N�chsten Eintrag anpassen + pEntry = pItems[uItem]; + pEntry->uPrevItem = uPos; + } else { // Am Ende anh�ngen + pLast[0] = uPos; + } + + break; + } + + pEntry = NULL; + } else { + pEntry = pItems[uAfter]; + } + + if(pEntry && uParent == pEntry->uParent) { // Stimmt der Elterneintrag ? + uItem = pEntry->uNextItem; + uBefore = uAfter; + } else { + uItem = 0; + uBefore = pLast[0]; + pEntry = pItems[uBefore]; + } + + pNew->uNextItem = uItem; + pNew->uPrevItem = uBefore; + + if(uBefore) { // Vorherigen Eintrag anpassen + pEntry->uNextItem = uPos; + } else { // Am Anfang einf�gen + pFirst[0] = uPos; + } + + if(uItem) { // N�chsten Eintrag anpassen + pEntry = pItems[uItem]; + pEntry->uPrevItem = uPos; + } else { // Am Ende anh�ngen + pLast[0] = uPos; + } + + break; + } + + pItems[uPos] = pNew; + pData->uTreeItemsCount++; + // Die Anzeigezeilen akualisieren + if(!pParent || !uFirst || (pParent->uState & TVIS_EXPANDED)) { + uItem = pNew->uPrevItem; + if(!uItem) + uItem = uParent; + + if(!uItem) + UpdateItems(pData, 0); + else { + pEntry = pItems[uItem]; + if(pEntry && pEntry->uShowPos) + UpdateItems(pData, uItem); + } + } + + if(pNew->uState & TVIS_SELECTED) { // Den ausgew�hlten Eintrag ausw�hlen + TreeListSelectItem(pData, uPos, 0, TVC_UNKNOWN); + } + + return uPos; +} + +//***************************************************************************** +//* +//* TreeListSetItem +//* +//***************************************************************************** +// �ndert einen Eintrag im Fenster +// pData : Zeiger auf die Fensterdaten +// pItem : Zeiger auf die ein zu �ndernden Daten +// Ergibt 1 wenn ok oder 0 bei einem Fehler +static int TreeListSetItem(TreeListData *pData, const TV_ITEM *pItem) { + + BYTE bCall; + BYTE bFlags; + ExtraItem **pList; + ExtraItem *pExtra; + BaseItem *pEntry; + unsigned uChange; + unsigned uMask; + unsigned uBits; + unsigned uItem; + unsigned uSub; + unsigned uLen; + int iVal; + int iRet; + + uChange = 0; + + uItem = U(pItem->hItem); + if(uItem > pData->uTreeItemsMax) + return 0; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + + uBits = pItem->mask; + + if(uBits & TVIF_SUBITEM) { // Einen Extraeintrag �ndern + uSub = pItem->cChildren; + if(uSub > 0) { + if(uSub >= pData->uColumnCount) + return 0; + pList = pData->pExtraItems[uSub - 1]; + pExtra = pList[uItem]; + + if(!pExtra) { // Einen neuen Eintrag erzeugen + pExtra = new(ExtraItem, 1); + memset(pExtra, 0, sizeof(ExtraItem)); + pExtra->iImage = TV_NOIMAGE; + pExtra->uState = pEntry->uState & (TVIS_BOLD | TVIS_UNDERLINE); + pList[uItem] = pExtra; + } + + if(uBits & TVIF_PARAM) { + pEntry->lParam = pItem->lParam; + } + + if((uBits & TVIF_IMAGE) && pExtra->iImage != pItem->iImage) { + if(pData->hImages) + uChange = 1; + pExtra->iImage = pItem->iImage; + if(pExtra->iImage == I_IMAGECALLBACK) + pExtra->bCallback |= TVIF_IMAGE; + else + pExtra->bCallback &= TVIF_IMAGE; + } + + if(uBits & TVIF_TEXT) { // Einen neuen Text einstellen + if(pItem->pszText == LPSTR_TEXTCALLBACK) { + if(pExtra->pText) + delete(pExtra->pText); + pExtra->bCallback |= TVIF_TEXT; + pExtra->uTextSize = 0; + pExtra->pText = 0; + uChange = 1; + } else { + uLen = str_len(pItem->pszText); + + if(uLen > pExtra->uTextSize || !pExtra->pText) { + if(pExtra->pText) + delete(pExtra->pText); + pExtra->pText = new(TCHAR, uLen + 1); + } + + memcpy(pExtra->pText, pItem->pszText, (uLen + 1)*sizeof(TCHAR)); + pExtra->bCallback &= ~TVIF_TEXT; + pExtra->uTextSize = (WORD)uLen; + pExtra->iTextPixels = 0; + uChange = 1; + } + } + + if(uBits & TVIF_STATE) { // Den Status �ndern + uMask = pItem->stateMask&~TVIS_BASEFLAGS; + uBits = uMask & (pExtra->uState ^ pItem->state); + uBits |= (pItem->stateMask & TVIS_BASEFLAGS) & (pEntry->uState ^ pItem->state); + pExtra->uState &= ~uMask; + pExtra->uState |= uMask & pItem->state; + + if((uBits & (TVIS_OVERLAYMASK | TVIS_CUT)) && (pData->hImages || pData->aColumn[uSub].bEdit >= TVAX_CHECK)) { + uChange = 1; // Ein Icon hats sich ver�ndert + } + + if(uBits & (TVIS_BOLD | TVIS_DROPHILITED)) { + pExtra->iTextPixels = 0; + uChange = 1; + } + + if((uBits & TVIS_EXPANDED) && pEntry->uFirstChild) { + iVal = TreeListToggleItem(pData, uItem, 0); + if(iVal < 0) + return 0; + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + } + + if(uBits & TVIS_SELECTED) { // Hat sich die Auswahl ge�ndert + iVal = (pData->uStyleEx & TVS_EX_SUBSELECT) ? uSub : 0; + + if(pItem->state & TVIS_SELECTED) { + iRet = TreeListSelectItem(pData, uItem, iVal, TVC_UNKNOWN); + } else + if(pData->uStyleEx & TVS_EX_MULTISELECT) { + TreeListSelectItem(pData, 0 , 0, TVC_UNKNOWN); + iRet = TreeListXorSelectItem(pData, uItem, TVC_UNKNOWN); + } else { + iRet = TreeListSelectItem(pData, 0, 0, TVC_UNKNOWN); + } + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + + if(iRet >= 2) { + pList = pData->pExtraItems[uSub - 1]; + pExtra = pList[uItem]; + if(!pExtra) + return 0; + } else + if(iRet == 1) { + uChange = 1; + } + } + } + + if(!uChange || !pEntry->uShowPos) + return 1; // Neuzeichnen des Eintrages + + UpdateRect(pData, uItem, uSub); + + return 1; + } + + uBits &= ~TVIF_CHILDREN; + } + + //******************** Einen Basis Eintrag �ndern ***************************** + if(uBits & TVIF_PARAM) { + pEntry->lParam = pItem->lParam; + } + + if((uBits & TVIF_IMAGE) && pEntry->iImage != pItem->iImage) { + pEntry->iImage = pItem->iImage; + if(!(pEntry->uState & TVIS_SELECTED) && pData->hImages) + uChange = 1; + if(pEntry->iImage == I_IMAGECALLBACK) + pEntry->bCallback |= TVIF_IMAGE; + else + pEntry->bCallback &= TVIF_IMAGE; + } + + if((uBits & TVIF_SELECTEDIMAGE) && pEntry->iSelectedImage != pItem->iSelectedImage) { + pEntry->iSelectedImage = pItem->iSelectedImage; + if((pEntry->uState & TVIS_SELECTED) && pData->hImages) + uChange = 1; + if(pEntry->iSelectedImage == I_IMAGECALLBACK) + pEntry->bCallback |= TVIF_SELECTEDIMAGE; + else + pEntry->bCallback &= TVIF_SELECTEDIMAGE; + } + + if(uBits & TVIF_CHILDREN) { + bCall = pEntry->bCallback; + bFlags = pEntry->bFlags; + + switch(pItem->cChildren) { + case 0: + pEntry->bCallback &= ~TVIF_CHILDREN; + pEntry->bFlags &= ~TVIX_HASBUTTON; + pEntry->bFlags |= TVIX_VARBUTTON; + break; + + case 1: + pEntry->bCallback &= ~TVIF_CHILDREN; + pEntry->bFlags &= TVIX_VARBUTTON; + pEntry->bFlags |= TVIX_HASBUTTON; + break; + + case I_CCB: + pEntry->bCallback |= TVIF_CHILDREN; + pEntry->bFlags &= ~TVIX_VARBUTTON; + break; + + default + : + pEntry->bCallback &= ~TVIF_CHILDREN; + pEntry->bFlags |= TVIX_VARBUTTON; + + if(pEntry->uFirstChild) + pEntry->bFlags |= TVIX_HASBUTTON; + else + pEntry->bFlags &= ~TVIX_HASBUTTON; + } + + if(bCall != pEntry->bCallback || bFlags != pEntry->bFlags) { + uChange = 1; + } + } + + if(uBits & TVIF_TEXT) { // Einen neuen Text einstellen + if(pItem->pszText == LPSTR_TEXTCALLBACK) { + if(pEntry->pText) + delete(pEntry->pText); + pEntry->bCallback |= TVIF_TEXT; + pEntry->uTextSize = 0; + pEntry->pText = 0; + uChange = 1; + } else { + uLen = str_len(pItem->pszText); + + if(uLen > pEntry->uTextSize) { + if(pEntry->pText) + delete(pEntry->pText); + pEntry->pText = new(TCHAR, uLen + 1); + } + + memcpy(pEntry->pText, pItem->pszText, (uLen + 1)*sizeof(TCHAR)); + pEntry->bCallback &= ~TVIF_TEXT; + pEntry->uTextSize = (WORD)uLen; + pEntry->iTextPixels = 0; + uChange = 1; + } + } + + if(uBits & TVIF_STATE) { + uMask = pItem->stateMask; + + if(pData->uStyle & TVS_SINGLEEXPAND) { // Nicht aufklappen bei Einzelmodus + uMask &= ~TVIS_EXPANDED; + } + + uBits = uMask & (pEntry->uState ^ pItem->state); + pEntry->uState &= ~uMask; + pEntry->uState |= uMask & pItem->state; + + + if((uBits & (TVIS_OVERLAYMASK | TVIS_CUT)) && pData->hImages) { + uChange = 1; + } + + if(uBits & TVIS_STATEIMAGEMASK) { // Haben sich die State-Bits ver�ndert + if(pData->hStates) { + uChange = 1; + } + + if(pData->uStyleEx & TVS_EX_BITCHECKBOX) { + if(pEntry->uState & 0x1000) { + pData->uSingleSel = uItem; + } else + if(pData->uSingleSel == uItem) { + pData->uSingleSel = 0; + } + } else { + if((pEntry->uState & TVIS_STATEIMAGEMASK) == 0x2000) { + pData->uSingleSel = uItem; + } else + if(pData->uSingleSel == uItem) { + pData->uSingleSel = 0; + } + } + } + + if(uBits & (TVIS_BOLD | TVIS_DROPHILITED)) { + pEntry->iTextPixels = 0; + uChange = 1; + } + + if(uBits & TVIS_SELECTED) { // Hat sich die Auswahl ge�ndert + pEntry->uState ^= TVIS_SELECTED; + + if(pItem->state & TVIS_SELECTED) { + iRet = TreeListSelectItem(pData, uItem, 0, TVC_UNKNOWN); + } else + if(pData->uStyleEx & TVS_EX_MULTISELECT) { + TreeListSelectItem(pData, 0 , 0, TVC_UNKNOWN); + iRet = TreeListXorSelectItem(pData, uItem, TVC_UNKNOWN); + } else { + iRet = TreeListSelectItem(pData, 0, 0, TVC_UNKNOWN); + } + + pEntry = pData->pTreeItems[uItem]; + if(!pEntry) + return 0; + + if(iRet == 1) { + uChange = 1; + } + } + + if((uBits & TVIS_EXPANDED) && pEntry->uFirstChild) { // Sollen Teile auf/zugeklappt werden + uMask &= TVIS_EXPANDPARTIAL | TVIS_EXPANDPARTIAL; + pEntry->uState ^= TVIS_EXPANDED; + pEntry->uState ^= uBits & uMask; + iVal = uMask & pItem->state; + + iRet = TreeListToggleItem(pData, uItem, iVal); + if(iRet) { // Abbruch oder Fehler beim Auf/Zuklappen + if(uChange && pEntry->uShowPos) { // Neuzeichnen des Eintrages + UpdateRect(pData, uItem, 0); + } + + return 0; + } + + pEntry->uState &= ~uMask; + pEntry->uState |= iVal; + } + } + + if(uChange && pEntry->uShowPos) { // Neuzeichnen des Eintrages + UpdateRect(pData, uItem, 0); + } + return 1; +} + + +//***************************************************************************** +//* +//* TreeListGetItem +//* +//***************************************************************************** +// Daten vone einem Eintrag abfragen ... 9270 lines suppressed ...

6 years, 1 month

09/13: [SETUPLIB] Retrieve and store the machine (architecture) ID of the discovered NTOS installations. Will be used later.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e282ec39a25061675e927… commit e282ec39a25061675e9279fcfd71983bd6dbbf6d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 28 23:32:52 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:09:13 2018 +0100 [SETUPLIB] Retrieve and store the machine (architecture) ID of the discovered NTOS installations. Will be used later. --- base/setup/lib/utils/osdetect.c | 87 +++++++++++++++++++++++++++++------------ base/setup/lib/utils/osdetect.h | 5 ++- 2 files changed, 66 insertions(+), 26 deletions(-) diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index ed5e1f5805..8dd35cd55b 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -34,6 +34,7 @@ static const PCWSTR KnownVendors[] = { VENDOR_REACTOS, VENDOR_MICROSOFT }; static BOOLEAN IsValidNTOSInstallation( IN PUNICODE_STRING SystemRootPath, + OUT PUSHORT Machine OPTIONAL, OUT PUNICODE_STRING VendorName OPTIONAL); static PNTOS_INSTALLATION @@ -47,6 +48,7 @@ static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, IN PCWSTR InstallationName, + IN USHORT Machine, IN PCWSTR VendorName, IN PCWSTR SystemRootArcPath, IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? @@ -82,6 +84,7 @@ EnumerateInstallations( UNICODE_STRING SystemRootPath; WCHAR SystemRoot[MAX_PATH]; + USHORT Machine; UNICODE_STRING VendorName; WCHAR VendorNameBuffer[MAX_PATH]; @@ -166,7 +169,7 @@ EnumerateInstallations( /* Check if this is a valid NTOS installation; stop there if it isn't one */ RtlInitEmptyUnicodeString(&VendorName, VendorNameBuffer, sizeof(VendorNameBuffer)); - if (!IsValidNTOSInstallation(&SystemRootPath, &VendorName)) + if (!IsValidNTOSInstallation(&SystemRootPath, &Machine, &VendorName)) { /* Continue the enumeration */ return STATUS_SUCCESS; @@ -196,6 +199,7 @@ EnumerateInstallations( /* Add the discovered NTOS installation into the list */ AddNTOSInstallation(Data->List, BootEntry->FriendlyName, + Machine, VendorName.Buffer, // FIXME: What if it's not NULL-terminated? Options->OsLoadPath, &SystemRootPath, PathComponent, @@ -239,14 +243,15 @@ static BOOLEAN CheckForValidPEAndVendor( IN HANDLE RootDirectory OPTIONAL, IN PCWSTR PathNameToFile, - OUT PUNICODE_STRING VendorName - ) + OUT PUSHORT Machine, + OUT PUNICODE_STRING VendorName) { BOOLEAN Success = FALSE; NTSTATUS Status; HANDLE FileHandle, SectionHandle; // SIZE_T ViewSize; PVOID ViewBase; + PIMAGE_NT_HEADERS NtHeader; PVOID VersionBuffer = NULL; // Read-only PVOID pvData = NULL; UINT BufLen = 0; @@ -266,14 +271,18 @@ CheckForValidPEAndVendor( return FALSE; // Status; } - /* Make sure it's a valid PE file */ - if (!RtlImageNtHeader(ViewBase)) + /* Make sure it's a valid NT PE file */ + NtHeader = RtlImageNtHeader(ViewBase); + if (!NtHeader) { - DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", PathNameToFile); + DPRINT1("File '%S' does not seem to be a valid NT PE file, bail out\n", PathNameToFile); Status = STATUS_INVALID_IMAGE_FORMAT; goto UnmapCloseFile; } + /* Retrieve the target architecture of this PE module */ + *Machine = NtHeader->FileHeader.Machine; + /* * Search for a valid executable version and vendor. * NOTE: The module is loaded as a data file, it should be marked as such. @@ -336,11 +345,13 @@ UnmapCloseFile: static BOOLEAN IsValidNTOSInstallationByHandle( IN HANDLE SystemRootDirectory, + OUT PUSHORT Machine OPTIONAL, OUT PUNICODE_STRING VendorName OPTIONAL) { BOOLEAN Success = FALSE; PCWSTR PathName; USHORT i; + USHORT LocalMachine; UNICODE_STRING LocalVendorName; WCHAR VendorNameBuffer[MAX_PATH]; @@ -404,11 +415,17 @@ IsValidNTOSInstallationByHandle( /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and retrieves its vendor name */ PathName = L"System32\\ntoskrnl.exe"; - Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &LocalVendorName); + Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &LocalMachine, &LocalVendorName); if (!Success) DPRINT1("Kernel executable '%S' is either not a PE file, or does not have any vendor?\n", PathName); - /* The kernel gives the OS its flavour */ + /* + * The kernel gives the OS its flavour. If we failed due to the absence of + * ntoskrnl.exe this might be due to the fact this particular installation + * uses a custom kernel that has a different name, overridden in the boot + * parameters. We then rely on the existence of ntdll.dll, which cannot be + * renamed on a valid NT system. + */ if (Success) { for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) @@ -421,23 +438,32 @@ IsValidNTOSInstallationByHandle( break; } } - } - /* Return the vendor name */ - if (VendorName) - { - /* Copy the string and invalidate the pointer */ - RtlCopyUnicodeString(VendorName, &LocalVendorName); - VendorName = NULL; + /* Return the target architecture */ + if (Machine) + { + /* Copy the value and invalidate the pointer */ + *Machine = LocalMachine; + Machine = NULL; + } + + /* Return the vendor name */ + if (VendorName) + { + /* Copy the string and invalidate the pointer */ + RtlCopyUnicodeString(VendorName, &LocalVendorName); + VendorName = NULL; + } } /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ /* Check for the existence of \SystemRoot\System32\ntdll.dll and retrieves its vendor name */ PathName = L"System32\\ntdll.dll"; - Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &LocalVendorName); + Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &LocalMachine, &LocalVendorName); if (!Success) DPRINT1("User-mode DLL '%S' is either not a PE file, or does not have any vendor?\n", PathName); + if (Success) { for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) @@ -449,14 +475,22 @@ IsValidNTOSInstallationByHandle( break; } } - } - /* Return the vendor name if not already obtained */ - if (VendorName) - { - /* Copy the string and invalidate the pointer */ - RtlCopyUnicodeString(VendorName, &LocalVendorName); - VendorName = NULL; + /* Return the target architecture if not already obtained */ + if (Machine) + { + /* Copy the value and invalidate the pointer */ + *Machine = LocalMachine; + Machine = NULL; + } + + /* Return the vendor name if not already obtained */ + if (VendorName) + { + /* Copy the string and invalidate the pointer */ + RtlCopyUnicodeString(VendorName, &LocalVendorName); + VendorName = NULL; + } } return Success; @@ -465,6 +499,7 @@ IsValidNTOSInstallationByHandle( static BOOLEAN IsValidNTOSInstallation( IN PUNICODE_STRING SystemRootPath, + OUT PUSHORT Machine, OUT PUNICODE_STRING VendorName OPTIONAL) { NTSTATUS Status; @@ -491,7 +526,8 @@ IsValidNTOSInstallation( return FALSE; } - Success = IsValidNTOSInstallationByHandle(SystemRootDirectory, VendorName); + Success = IsValidNTOSInstallationByHandle(SystemRootDirectory, + Machine, VendorName); /* Done! */ NtClose(SystemRootDirectory); @@ -573,6 +609,7 @@ static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, IN PCWSTR InstallationName, + IN USHORT Machine, IN PCWSTR VendorName, IN PCWSTR SystemRootArcPath, IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? @@ -613,6 +650,8 @@ AddNTOSInstallation( NtOsInstall->PartitionNumber = PartitionNumber; NtOsInstall->PartEntry = PartEntry; + NtOsInstall->Machine = Machine; + RtlInitEmptyUnicodeString(&NtOsInstall->SystemArcPath, (PWCHAR)(NtOsInstall + 1), ArcPathLength); diff --git a/base/setup/lib/utils/osdetect.h b/base/setup/lib/utils/osdetect.h index 7151d6feb8..e8b5449601 100644 --- a/base/setup/lib/utils/osdetect.h +++ b/base/setup/lib/utils/osdetect.h @@ -16,8 +16,9 @@ typedef struct _NTOS_INSTALLATION { LIST_ENTRY ListEntry; // BOOLEAN IsDefault; // TRUE / FALSE whether this installation is marked as "default" in its corresponding loader configuration file. - UNICODE_STRING SystemArcPath; // Normalized ARC path - UNICODE_STRING SystemNtPath; // Corresponding NT path + USHORT Machine; // Target architecture of the NTOS installation + UNICODE_STRING SystemArcPath; // Normalized ARC path ("ArcSystemRoot") + UNICODE_STRING SystemNtPath; // Corresponding NT path ("NtSystemRoot") PCWSTR PathComponent; // Pointer inside SystemNtPath.Buffer ULONG DiskNumber; ULONG PartitionNumber;

6 years, 1 month

08/13: [SETUPLIB][USETUP] Partition code improvements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f41750ab7fed908a4ece1… commit f41750ab7fed908a4ece110eafe374457dc8446f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 28 23:24:06 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:09:02 2018 +0100 [SETUPLIB][USETUP] Partition code improvements. - SETUPLIB and USETUP: Convert PARTENTRY::DriveLetter to WCHAR. - SETUPLIB: Retrieve volume label. - SETUPLIB and USETUP: Move the partition types (IDs) table from USETUP to SETUPLIB so that they can share it with the 1st-stage GUI installer too. Also take the opportunity to update the table with information from http://www.win.tue.nl/~aeb/partitions/partition_types-1.html and cross-checked with the list from Paragon Hard-Disk Manager. - USETUP: Simplify PrintPartitionData(). - Add some code comments. --- base/setup/lib/utils/partlist.c | 311 +++++++++++++++++++++++++++++++++++++--- base/setup/lib/utils/partlist.h | 20 ++- base/setup/usetup/partlist.c | 203 ++++---------------------- base/setup/usetup/usetup.c | 12 +- 4 files changed, 337 insertions(+), 209 deletions(-) diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 6976e1ee97..4047bc1ff9 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -27,6 +27,185 @@ typedef struct _REG_DISK_MOUNT_INFO #include <poppack.h> +/* HELPERS FOR PARTITION TYPES **********************************************/ + +/* + * This partition type list was ripped from the kernelDisk.c module of + * the Visopsys Operating System (see license below), and completed with + * information from Paragon Hard-Disk Manager, and the following websites: + * http://www.win.tue.nl/~aeb/partitions/partition_types-1.html + * https://en.wikipedia.org/wiki/Partition_type#List_of_partition_IDs + */ +/* + * kernelDisk.c + * + * Visopsys Operating System + * Copyright (C) 1998-2015 J. Andrew McLaughlin + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* This is a table for keeping known partition type codes and descriptions */ +PARTITION_TYPE PartitionTypes[NUM_PARTITION_TYPE_ENTRIES] = +{ + { 0x00, "(Empty)" }, + { 0x01, "FAT12" }, + { 0x02, "XENIX root" }, + { 0x03, "XENIX usr" }, + { 0x04, "FAT16 (< 32 MB)" }, + { 0x05, "Extended" }, + { 0x06, "FAT16" }, + { 0x07, "NTFS/HPFS/exFAT" }, + { 0x08, "OS/2 or AIX boot" }, + { 0x09, "AIX data" }, + { 0x0A, "OS/2 Boot Manager" }, + { 0x0B, "FAT32" }, + { 0x0C, "FAT32 (LBA)" }, + { 0x0E, "FAT16 (LBA)" }, + { 0x0F, "Extended (LBA)" }, + { 0x10, "OPUS" }, + { 0x11, "Hidden FAT12" }, + { 0x12, "FAT diagnostic (Compaq)" }, + { 0x13, "BTRON" }, + { 0x14, "Hidden FAT16 (< 32 MB)" }, + { 0x16, "Hidden FAT16" }, + { 0x17, "Hidden HPFS or NTFS" }, + { 0x18, "AST SmartSleep" }, + { 0x1B, "Hidden FAT32" }, + { 0x1C, "Hidden FAT32 (LBA)" }, + { 0x1E, "Hidden FAT16 (LBA)" }, + { 0x24, "NEC DOS 3.x" }, + { 0x27, "Hidden WinRE NTFS" }, + { 0x2A, "AtheOS File System (AFS)" }, + { 0x2B, "SyllableSecure (SylStor)" }, + { 0x32, "NOS" }, + { 0x35, "JFS on OS/2 or eCS" }, + { 0x38, "THEOS v3.2 2GB partition" }, + { 0x39, "Plan 9" }, + { 0x3A, "THEOS v4 4GB partition" }, + { 0x3B, "THEOS v4 extended partition" }, + { 0x3C, "PartitionMagic recovery partition" }, + { 0x3D, "Hidden NetWare" }, + { 0x40, "Lynx" }, + { 0x41, "PowerPC PReP boot" }, + { 0x42, "Win2K Dynamic Volume extended" }, + { 0x43, "Old Linux" }, + { 0x44, "GoBack" }, + { 0x45, "Priam or Boot-US Boot Manager" }, + { 0x4D, "QNX4.x" }, + { 0x4E, "QNX4.x 2nd partition" }, + { 0x4F, "QNX4.x 3rd partition" }, + { 0x50, "OnTrack Disk Manager R/O" }, + { 0x51, "OnTrack Disk Manager R/W or Novell" }, + { 0x52, "CP/M" }, + { 0x53, "OnTrack DM6 Aux3" }, + { 0x54, "OnTrack DM6 Dynamic Drive Overlay" }, + { 0x55, "EZ-Drive" }, + { 0x56, "Golden Bow VFeature Partitioned Volume" }, + { 0x5C, "Priam EDisk" }, + { 0x61, "SpeedStor" }, + { 0x62, "Pick" }, + { 0x63, "GNU HURD or Unix System V (SCO, ISC Unix, UnixWare)" }, + { 0x64, "Novell NetWare 286, 2.xx" }, + { 0x65, "Novell NetWare 386, 3.xx or 4.xx" }, + { 0x66, "Novell NetWare SMS Partition" }, + { 0x67, "Novell" }, + { 0x68, "Novell" }, + { 0x69, "Novell NetWare 5+" }, + { 0x70, "DiskSecure Multi-Boot" }, + { 0x75, "IBM PC/IX" }, + { 0x7E, "Veritas VxVM public" }, + { 0x7F, "Veritas VxVM private" }, + { 0x80, "Old MINIX" }, + { 0x81, "Linux or MINIX" }, + { 0x82, "Linux swap or Solaris" }, + { 0x83, "Linux Native" }, + { 0x84, "Hibernate" }, + { 0x85, "Extended Linux" }, + { 0x86, "FAT16 mirrored" }, + { 0x87, "HPFS or NTFS mirrored" }, + { 0x88, "Linux plaintext partition table" }, + { 0x8B, "FAT32 mirrored" }, + { 0x8C, "FAT32 (LBA) mirrored" }, + { 0x8E, "Linux LVM" }, + { 0x93, "Hidden Linux" }, + { 0x94, "Amoeba BBT" }, + { 0x96, "CDFS/ISO-9660" }, + { 0x9F, "BSD/OS" }, + { 0xA0, "Laptop Hibernate" }, + { 0xA1, "Laptop Hibernate (NEC 6000H)" }, + { 0xA5, "BSD, NetBSD, FreeBSD" }, + { 0xA6, "OpenBSD" }, + { 0xA7, "NeXTStep" }, + { 0xA8, "Darwin UFS" }, // Also known as "OS-X" + { 0xA9, "NetBSD" }, + { 0xAB, "Darwin boot" }, + { 0xAF, "Apple HFS" }, + { 0xB6, "NT FAT16 corrupt mirror" }, + { 0xB7, "BSDI BSD/386 FS" }, // Alternatively, "NT NTFS corrupt mirror" + { 0xB8, "BSDI BSD/386 swap" }, + { 0xBB, "Boot Wizard hidden" }, + { 0xBC, "Paragon Backup capsule" }, + { 0xBE, "Solaris 8 boot partition" }, + { 0xBF, "Solaris 10 x86" }, + { 0xC0, "NTFT" }, // Alternatively, "CTOS" or "REAL/32 or DR-DOS or Novell-DOS secure partition" + { 0xC1, "DR-DOS FAT12" }, + { 0xC2, "Hidden Linux" }, + { 0xC3, "Hidden Linux swap" }, + { 0xC4, "DR-DOS FAT16 (< 32 MB)" }, + { 0xC5, "DR-DOS Extended" }, + { 0xC6, "DR-DOS FAT16" }, + { 0xC7, "HPFS mirrored" }, // Alternatively, "Syrinx boot" + { 0xCB, "DR-DOS FAT32" }, + { 0xCC, "DR-DOS FAT32 (LBA)" }, + { 0xCE, "DR-DOS FAT16 (LBA)" }, + { 0xD0, "MDOS" }, + { 0xD1, "MDOS FAT12" }, + { 0xD4, "MDOS FAT16 (< 32 MB)" }, + { 0xD5, "MDOS Extended" }, + { 0xD6, "MDOS FAT16" }, + { 0xD8, "CP/M-86" }, + { 0xDB, "Digital Research CP/M" }, + { 0xDE, "Dell OEM" }, + { 0xDF, "BootIt EMBRM (FAT16/32)" }, + { 0xE1, "SpeedStor FAT12" }, + { 0xE3, "SpeedStor (0xE3)" }, + { 0xE4, "SpeedStor FAT16" }, + { 0xE5, "Tandy MSDOS" }, + { 0xE6, "SpeedStor (0xE6)" }, + { 0xE8, "Linux Unified Key Setup partition" }, + { 0xEA, "Rufus private partition" }, + { 0xEB, "BeOS BFS" }, + { 0xEC, "SkyOS SkyFS" }, + { 0xEE, "EFI GPT protective" }, + { 0xEF, "EFI System partition" }, + { 0xF0, "Linux/PA-RISC boot loader" }, + { 0xF1, "SpeedStor (0xF1)" }, + { 0xF2, "DOS 3.3+ second" }, + { 0xF4, "SpeedStor (0xF4)" }, + { 0xF5, "SpeedStor (0xF5)" }, + { 0xF6, "SpeedStor (0xF6)" }, + { 0xFA, "Bochs" }, + { 0xFB, "VMware FS" }, + { 0xFC, "VMware swap" }, + { 0xFD, "Linux RAID auto" }, + { 0xFE, "NT hidden partition" }, + { 0xFF, "XENIX Bad Block Table" }, +}; + + /* FUNCTIONS ****************************************************************/ #ifdef DUMP_PARTITION_TABLE @@ -119,6 +298,7 @@ GetDriverName( QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].EntryContext = &DiskEntry->DriverName; + /* This will allocate DiskEntry->DriverName if needed */ Status = RtlQueryRegistryValues(RTL_REGISTRY_DEVICEMAP, KeyName, QueryTable, @@ -139,9 +319,9 @@ AssignDriveLetters( PPARTENTRY PartEntry; PLIST_ENTRY Entry1; PLIST_ENTRY Entry2; - CHAR Letter; + WCHAR Letter; - Letter = 'C'; + Letter = L'C'; /* Assign drive letters to primary partitions */ Entry1 = List->DiskListHead.Flink; @@ -163,7 +343,7 @@ AssignDriveLetters( (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && PartEntry->SectorCount.QuadPart != 0LL)) { - if (Letter <= 'Z') + if (Letter <= L'Z') { PartEntry->DriveLetter = Letter; Letter++; @@ -196,7 +376,7 @@ AssignDriveLetters( (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && PartEntry->SectorCount.QuadPart != 0LL)) { - if (Letter <= 'Z') + if (Letter <= L'Z') { PartEntry->DriveLetter = Letter; Letter++; @@ -331,8 +511,6 @@ SystemConfigurationDataQueryRoutine( } -#define ROOT_NAME L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter" - static VOID EnumerateBiosDiskEntries( IN PPARTLIST PartList) @@ -345,6 +523,8 @@ EnumerateBiosDiskEntries( PCM_INT13_DRIVE_PARAMETER Int13Drives; PBIOSDISKENTRY BiosDiskEntry; +#define ROOT_NAME L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter" + memset(QueryTable, 0, sizeof(QueryTable)); QueryTable[1].Name = L"Configuration Data"; @@ -480,6 +660,8 @@ EnumerateBiosDiskEntries( } RtlFreeHeap(ProcessHeap, 0, Int13Drives); + +#undef ROOT_NAME } static @@ -490,8 +672,16 @@ AddPartitionToDisk( IN ULONG PartitionIndex, IN BOOLEAN LogicalPartition) { + NTSTATUS Status; PPARTITION_INFORMATION PartitionInfo; PPARTENTRY PartEntry; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + WCHAR Buffer[MAX_PATH]; + UNICODE_STRING Name; + UCHAR LabelBuffer[sizeof(FILE_FS_VOLUME_INFORMATION) + 256 * sizeof(WCHAR)]; + PFILE_FS_VOLUME_INFORMATION LabelInfo = (PFILE_FS_VOLUME_INFORMATION)LabelBuffer; PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex]; @@ -544,6 +734,55 @@ AddPartitionToDisk( PartEntry->FormatState = UnknownFormat; } + /* Initialize the partition volume label */ + RtlZeroMemory(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel)); + + /* Open the volume, ignore any errors */ + RtlStringCchPrintfW(Buffer, ARRAYSIZE(Buffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, PartEntry->PartitionNumber); + RtlInitUnicodeString(&Name, Buffer); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_DATA | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (NT_SUCCESS(Status)) + { + /* Retrieve the partition volume label */ + Status = NtQueryVolumeInformationFile(FileHandle, + &IoStatusBlock, + &LabelBuffer, + sizeof(LabelBuffer), + FileFsVolumeInformation); + /* Close the handle */ + NtClose(FileHandle); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Copy the (possibly truncated) volume label and NULL-terminate it */ + RtlStringCbCopyNW(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel), + LabelInfo->VolumeLabel, LabelInfo->VolumeLabelLength); + } + else + { + DPRINT1("NtQueryVolumeInformationFile() failed, Status 0x%08lx\n", Status); + } + } + else + { + DPRINT1("NtOpenFile() failed, Status 0x%08lx\n", Status); + } + if (LogicalPartition) InsertTailList(&DiskEntry->LogicalPartListHead, &PartEntry->ListEntry); @@ -912,6 +1151,7 @@ AddDiskToList( ULONG LayoutBufferSize; PDRIVE_LAYOUT_INFORMATION NewLayoutBuffer; + /* Retrieve the drive geometry */ Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, @@ -921,7 +1161,7 @@ AddDiskToList( NULL, 0, &DiskGeometry, - sizeof(DISK_GEOMETRY)); + sizeof(DiskGeometry)); if (!NT_SUCCESS(Status)) return; @@ -931,6 +1171,11 @@ AddDiskToList( return; } + /* + * FIXME: Here we suppose the disk is always SCSI. What if it is + * of another type? To check this we need to retrieve the name of + * the driver the disk device belongs to. + */ Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, @@ -940,7 +1185,7 @@ AddDiskToList( NULL, 0, &ScsiAddress, - sizeof(SCSI_ADDRESS)); + sizeof(ScsiAddress)); if (!NT_SUCCESS(Status)) return; @@ -991,6 +1236,8 @@ AddDiskToList( sizeof(DISKENTRY)); if (DiskEntry == NULL) { + RtlFreeHeap(ProcessHeap, 0, Mbr); + DPRINT1("Failed to allocate a new disk entry.\n"); return; } @@ -1034,6 +1281,7 @@ AddDiskToList( } else { + // FIXME: What to do? } } ListEntry = ListEntry->Flink; @@ -1097,6 +1345,11 @@ AddDiskToList( InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); + + /* + * We now retrieve the disk partition layout + */ + /* Allocate a layout buffer with 4 partition entries first */ LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + ((4 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); @@ -1109,6 +1362,7 @@ AddDiskToList( return; } + /* Keep looping while the drive layout buffer is too small */ for (;;) { DPRINT1("Buffer size: %lu\n", LayoutBufferSize); @@ -1227,8 +1481,13 @@ CreatePartitionList(VOID) InitializeListHead(&List->DiskListHead); InitializeListHead(&List->BiosDiskListHead); + /* + * Enumerate the disks seen by the BIOS; this will be used later + * to map drives seen by NTOS with their corresponding BIOS names. + */ EnumerateBiosDiskEntries(List); + /* Enumerate disks seen by NTOS */ Status = NtQuerySystemInformation(SystemDeviceInformation, &Sdi, sizeof(Sdi), @@ -1257,7 +1516,7 @@ CreatePartitionList(VOID) FILE_READ_DATA | FILE_READ_ATTRIBUTES | SYNCHRONIZE, &ObjectAttributes, &Iosb, - FILE_SHARE_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); if (NT_SUCCESS(Status)) { @@ -2553,10 +2812,10 @@ CheckActiveSystemPartition( if (List->SystemPartition != NULL) { /* We already have an active system partition */ - DPRINT1("Use the current system partition %lu in disk %lu, drive letter %c\n", + DPRINT1("Use the current system partition %lu in disk %lu, drive letter %C\n", List->SystemPartition->PartitionNumber, List->SystemPartition->DiskEntry->DiskNumber, - (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + (List->SystemPartition->DriveLetter == 0) ? L'-' : List->SystemPartition->DriveLetter); return; } @@ -2586,10 +2845,10 @@ CheckActiveSystemPartition( List->OriginalSystemPartition = List->SystemPartition; - DPRINT1("Use new first active system partition %lu in disk %lu, drive letter %c\n", + DPRINT1("Use new first active system partition %lu in disk %lu, drive letter %C\n", List->SystemPartition->PartitionNumber, List->SystemPartition->DiskEntry->DiskNumber, - (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + (List->SystemPartition->DriveLetter == 0) ? L'-' : List->SystemPartition->DriveLetter); goto SetSystemPartition; } @@ -2630,10 +2889,10 @@ CheckActiveSystemPartition( ASSERT(DiskEntry == List->SystemPartition->DiskEntry); List->OriginalSystemPartition = List->SystemPartition; // First PartEntry - DPRINT1("Use first active system partition %lu in disk %lu, drive letter %c\n", + DPRINT1("Use first active system partition %lu in disk %lu, drive letter %C\n", List->SystemPartition->PartitionNumber, List->SystemPartition->DiskEntry->DiskNumber, - (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + (List->SystemPartition->DriveLetter == 0) ? L'-' : List->SystemPartition->DriveLetter); goto SetSystemPartition; } @@ -2664,10 +2923,10 @@ CheckActiveSystemPartition( ASSERT(DiskEntry == PartEntry->DiskEntry); List->SystemPartition = PartEntry; - DPRINT1("Found active system partition %lu in disk %lu, drive letter %c\n", + DPRINT1("Found active system partition %lu in disk %lu, drive letter %C\n", PartEntry->PartitionNumber, DiskEntry->DiskNumber, - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter); + (PartEntry->DriveLetter == 0) ? L'-' : PartEntry->DriveLetter); break; } } @@ -2718,10 +2977,10 @@ CheckActiveSystemPartition( goto FindAndUseAlternativeSystemPartition; } - DPRINT1("Use existing active system partition %lu in disk %lu, drive letter %c\n", + DPRINT1("Use existing active system partition %lu in disk %lu, drive letter %C\n", List->SystemPartition->PartitionNumber, List->SystemPartition->DiskEntry->DiskNumber, - (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + (List->SystemPartition->DriveLetter == 0) ? L'-' : List->SystemPartition->DriveLetter); return; @@ -2744,10 +3003,10 @@ FindAndUseAlternativeSystemPartition: UseAlternativeSystemPartition: List->SystemPartition = List->CurrentPartition; - DPRINT1("Use alternative active system partition %lu in disk %lu, drive letter %c\n", + DPRINT1("Use alternative active system partition %lu in disk %lu, drive letter %C\n", List->SystemPartition->PartitionNumber, List->SystemPartition->DiskEntry->DiskNumber, - (List->SystemPartition->DriveLetter == 0) ? '-' : List->SystemPartition->DriveLetter); + (List->SystemPartition->DriveLetter == 0) ? L'-' : List->SystemPartition->DriveLetter); SetSystemPartition: /* Set the new active system partition */ @@ -2800,6 +3059,12 @@ WritePartitions( DumpPartitionTable(DiskEntry); #endif + // + // FIXME: We first *MUST* use IOCTL_DISK_CREATE_DISK to initialize + // the disk in MBR or GPT format in case the disk was not initialized!! + // For this we must ask the user which format to use. + // + BufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + ((DiskEntry->LayoutBuffer->PartitionCount - 1) * sizeof(PARTITION_INFORMATION)); Status = NtDeviceIoControlFile(FileHandle, @@ -2862,7 +3127,7 @@ WritePartitionsToDisk( BOOLEAN SetMountedDeviceValue( - IN CHAR Letter, + IN WCHAR Letter, IN ULONG Signature, IN LARGE_INTEGER StartingOffset) { @@ -2875,7 +3140,7 @@ SetMountedDeviceValue( HANDLE KeyHandle; RtlStringCchPrintfW(ValueNameBuffer, ARRAYSIZE(ValueNameBuffer), - L"\\DosDevices\\%C:", Letter); + L"\\DosDevices\\%c:", Letter); RtlInitUnicodeString(&ValueName, ValueNameBuffer); InitializeObjectAttributes(&ObjectAttributes, diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index d23642731b..5ffbd8cca4 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -7,6 +7,20 @@ #pragma once +/* HELPERS FOR PARTITION TYPES **********************************************/ + +typedef struct _PARTITION_TYPE +{ + UCHAR Type; + PCHAR Description; +} PARTITION_TYPE, *PPARTITION_TYPE; + +#define NUM_PARTITION_TYPE_ENTRIES 143 +extern PARTITION_TYPE PartitionTypes[NUM_PARTITION_TYPE_ENTRIES]; + + +/* PARTITION UTILITY FUNCTIONS **********************************************/ + typedef enum _FORMATSTATE { Unformatted, @@ -35,7 +49,9 @@ typedef struct _PARTENTRY ULONG PartitionNumber; /* Enumerated partition number (primary partitions first -- excluding the extended partition container --, then the logical partitions) */ ULONG PartitionIndex; /* Index in the LayoutBuffer->PartitionEntry[] cached array of the corresponding DiskEntry */ - CHAR DriveLetter; + WCHAR DriveLetter; + WCHAR VolumeLabel[20]; + // CHAR FileSystemName[9]; // NOTE: Superseded by the FileSystem member BOOLEAN LogicalPartition; @@ -299,7 +315,7 @@ WritePartitionsToDisk( BOOLEAN SetMountedDeviceValue( - IN CHAR Letter, + IN WCHAR Letter, IN ULONG Signature, IN LARGE_INTEGER StartingOffset); diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index f403a976ce..3544606c22 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -30,143 +30,6 @@ /* HELPERS FOR PARTITION TYPES **********************************************/ -typedef struct _PARTITION_TYPE -{ - UCHAR Type; - PCHAR Description; -} PARTITION_TYPE, *PPARTITION_TYPE; - -/* - * This partition type list was ripped off the kernelDisk.c module from: - * - * Visopsys Operating System - * Copyright (C) 1998-2015 J. Andrew McLaughlin - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * - * See also https://en.wikipedia.org/wiki/Partition_type#List_of_partition_IDs - * and http://www.win.tue.nl/~aeb/partitions/partition_types-1.html - * for a complete list. - */ - -/* This is a table for keeping known partition type codes and descriptions */ -static PARTITION_TYPE PartitionTypes[] = -{ - { 0x00, "(Empty)" }, - { 0x01, "FAT12" }, - { 0x02, "XENIX root" }, - { 0x03, "XENIX /usr" }, - { 0x04, "FAT16 (small)" }, - { 0x05, "Extended" }, - { 0x06, "FAT16" }, - { 0x07, "NTFS/HPFS/exFAT" }, - { 0x08, "OS/2 or AIX boot" }, - { 0x09, "AIX data" }, - { 0x0A, "OS/2 Boot Manager" }, - { 0x0B, "FAT32" }, - { 0x0C, "FAT32 (LBA)" }, - { 0x0E, "FAT16 (LBA)" }, - { 0x0F, "Extended (LBA)" }, - { 0x11, "Hidden FAT12" }, - { 0x12, "FAT diagnostic" }, - { 0x14, "Hidden FAT16 (small)" }, - { 0x16, "Hidden FAT16" }, - { 0x17, "Hidden HPFS or NTFS" }, - { 0x1B, "Hidden FAT32" }, - { 0x1C, "Hidden FAT32 (LBA)" }, - { 0x1E, "Hidden FAT16 (LBA)" }, - { 0x35, "JFS" }, - { 0x39, "Plan 9" }, - { 0x3C, "PartitionMagic" }, - { 0x3D, "Hidden Netware" }, - { 0x41, "PowerPC PReP" }, - { 0x42, "Win2K dynamic extended" }, - { 0x43, "Old Linux" }, - { 0x44, "GoBack" }, - { 0x4D, "QNX4.x" }, - { 0x4D, "QNX4.x 2nd" }, - { 0x4D, "QNX4.x 3rd" }, - { 0x50, "Ontrack R/O" }, - { 0x51, "Ontrack R/W or Novell" }, - { 0x52, "CP/M" }, - { 0x63, "GNU HURD or UNIX SysV" }, - { 0x64, "Netware 2" }, - { 0x65, "Netware 3/4" }, - { 0x66, "Netware SMS" }, - { 0x67, "Novell" }, - { 0x68, "Novell" }, - { 0x69, "Netware 5+" }, - { 0x7E, "Veritas VxVM public" }, - { 0x7F, "Veritas VxVM private" }, - { 0x80, "Minix" }, - { 0x81, "Linux or Minix" }, - { 0x82, "Linux swap or Solaris" }, - { 0x83, "Linux" }, - { 0x84, "Hibernation" }, - { 0x85, "Linux extended" }, - { 0x86, "HPFS or NTFS mirrored" }, - { 0x87, "HPFS or NTFS mirrored" }, - { 0x8E, "Linux LVM" }, - { 0x93, "Hidden Linux" }, - { 0x96, "CDFS/ISO-9660" }, - { 0x9F, "BSD/OS" }, - { 0xA0, "Laptop hibernation" }, - { 0xA1, "Laptop hibernation" }, - { 0xA5, "BSD, NetBSD, FreeBSD" }, - { 0xA6, "OpenBSD" }, - { 0xA7, "NeXTSTEP" }, - { 0xA8, "OS-X UFS" }, - { 0xA9, "NetBSD" }, - { 0xAB, "OS-X boot" }, - { 0xAF, "OS-X HFS" }, - { 0xB6, "NT corrupt mirror" }, - { 0xB7, "BSDI" }, - { 0xB8, "BSDI swap" }, - { 0xBE, "Solaris 8 boot" }, - { 0xBF, "Solaris x86" }, - { 0xC0, "NTFT" }, - { 0xC1, "DR-DOS FAT12" }, - { 0xC2, "Hidden Linux" }, - { 0xC3, "Hidden Linux swap" }, - { 0xC4, "DR-DOS FAT16 (small)" }, - { 0xC5, "DR-DOS Extended" }, - { 0xC6, "DR-DOS FAT16" }, - { 0xC7, "HPFS mirrored" }, - { 0xCB, "DR-DOS FAT32" }, - { 0xCC, "DR-DOS FAT32 (LBA)" }, - { 0xCE, "DR-DOS FAT16 (LBA)" }, - { 0xD0, "MDOS" }, - { 0xD1, "MDOS FAT12" }, - { 0xD4, "MDOS FAT16 (small)" }, - { 0xD5, "MDOS Extended" }, - { 0xD6, "MDOS FAT16" }, - { 0xD8, "CP/M-86" }, - { 0xDF, "BootIt EMBRM(FAT16/32)" }, - { 0xEB, "BeOS BFS" }, - { 0xEE, "EFI GPT protective" }, - { 0xEF, "EFI filesystem" }, - { 0xF0, "Linux/PA-RISC boot" }, - { 0xF2, "DOS 3.3+ second" }, - { 0xFA, "Bochs" }, - { 0xFB, "VmWare" }, - { 0xFC, "VmWare swap" }, - { 0xFD, "Linux RAID" }, - { 0xFE, "NT hidden" }, -}; - VOID GetPartTypeStringFromPartitionType( IN UCHAR partitionType, @@ -288,28 +151,29 @@ PrintPartitionData( coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Top + 1 + ListUi->Line; - if (PartEntry->IsPartitioned == FALSE) - { - PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + /* Get the partition size */ + PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (PartSize.QuadPart >= 10 * GB) /* 10 GB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB); - Unit = MUIGetString(STRING_GB); - } - else + if (PartSize.QuadPart >= 10 * GB) /* 10 GB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB); + Unit = MUIGetString(STRING_GB); + } + else #endif - if (PartSize.QuadPart >= 10 * MB) /* 10 MB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB); - Unit = MUIGetString(STRING_MB); - } - else - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB); - Unit = MUIGetString(STRING_KB); - } + if (PartSize.QuadPart >= 10 * MB) /* 10 MB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB); + Unit = MUIGetString(STRING_MB); + } + else + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB); + Unit = MUIGetString(STRING_KB); + } + if (PartEntry->IsPartitioned == FALSE) + { sprintf(LineBuffer, MUIGetString(STRING_UNPSPACE), PartEntry->LogicalPartition ? " " : "", @@ -333,31 +197,11 @@ PrintPartitionData( PartType = PartTypeString; } - PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (PartSize.QuadPart >= 10 * GB) /* 10 GB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB); - Unit = MUIGetString(STRING_GB); - } - else -#endif - if (PartSize.QuadPart >= 10 * MB) /* 10 MB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB); - Unit = MUIGetString(STRING_MB); - } - else - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB); - Unit = MUIGetString(STRING_KB); - } - if (strcmp(PartType, MUIGetString(STRING_FORMATUNKNOWN)) == 0) { sprintf(LineBuffer, MUIGetString(STRING_HDDINFOUNK5), - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->BootIndicator ? '*' : ' ', PartEntry->LogicalPartition ? " " : "", @@ -370,7 +214,7 @@ PrintPartitionData( { sprintf(LineBuffer, "%c%c %c %s%-24s%s %6lu %s", - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->BootIndicator ? '*' : ' ', PartEntry->LogicalPartition ? " " : "", @@ -455,6 +299,9 @@ PrintDiskData( Unit = MUIGetString(STRING_MB); } + // + // FIXME: We *MUST* use TXTSETUP.SIF strings from section "DiskDriverMap" !! + // if (DiskEntry->DriverName.Length > 0) { sprintf(LineBuffer, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 518194937f..975c45f5ea 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -439,7 +439,7 @@ GetNTOSInstallationName( { /* We have retrieved a partition that is mounted */ return RtlStringCchPrintfA(Buffer, cchBufferSize, - "%c:%S \"%S\"", + "%C:%S \"%S\"", PartEntry->DriveLetter, NtOsInstall->PathComponent, NtOsInstall->InstallationName); @@ -2480,7 +2480,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) { CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDDINFOUNK2), - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartitionType, PartSize, @@ -2490,7 +2490,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) { CONSOLE_PrintTextXY(6, 10, " %c%c %s %I64u %s", - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartTypeString, PartSize, @@ -2795,7 +2795,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) { CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDINFOUNK4), - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartitionType, PartSize, @@ -2805,7 +2805,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) { CONSOLE_PrintTextXY(8, 10, "%c%c %s %I64u %s", - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : (CHAR)PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartTypeString, PartSize, @@ -3200,7 +3200,7 @@ BuildInstallPaths(PWSTR InstallDir, UNREFERENCED_PARAMETER(Status); /* Initialize DestinationDriveLetter */ - DestinationDriveLetter = (WCHAR)PartEntry->DriveLetter; + DestinationDriveLetter = PartEntry->DriveLetter; }

6 years, 1 month

07/13: [REACTOS] Add helpers and modify ConvertNtPathToWin32Path() to make it use a cache of NT/Win32 path mappings.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c3570f9f5362309a6681… commit 7c3570f9f5362309a668172c913f2ff339e4467e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 9 03:21:38 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:04:30 2018 +0100 [REACTOS] Add helpers and modify ConvertNtPathToWin32Path() to make it use a cache of NT/Win32 path mappings. This increases performance for each time the SETUPLIB calls (using NT paths) Win32 SetupAPI functions which of course only accept Win32 paths. - Handle also the fact that a NT path to convert may start with \Device\HarddiskX\PartitionY\..., which can be a symlink to \Device\HarddiskVolumeN\... on some systems. In that case, the Win32 path mapping should be done slightly differently. - Add support for network mapped drives. --- base/setup/reactos/reactos.c | 198 ++++++++++++++++++++++++++++----- base/setup/reactos/reactos.h | 34 ++++++ base/setup/reactos/spapisup/fileqsup.c | 17 ++- base/setup/reactos/spapisup/infsupp.c | 3 +- 4 files changed, 220 insertions(+), 32 deletions(-) diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 626b0ad9f8..230eafa38c 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -1192,37 +1192,99 @@ BOOL LoadSetupData( return ret; } +VOID +InitNtToWin32PathMappingList( + IN OUT PNT_WIN32_PATH_MAPPING_LIST MappingList) +{ + InitializeListHead(&MappingList->List); + MappingList->MappingsCount = 0; +} + +VOID +FreeNtToWin32PathMappingList( + IN OUT PNT_WIN32_PATH_MAPPING_LIST MappingList) +{ + PLIST_ENTRY ListEntry; + PVOID Entry; + + while (!IsListEmpty(&MappingList->List)) + { + ListEntry = RemoveHeadList(&MappingList->List); + Entry = (PVOID)CONTAINING_RECORD(ListEntry, NT_WIN32_PATH_MAPPING, ListEntry); + HeapFree(ProcessHeap, 0, Entry); + } + + MappingList->MappingsCount = 0; +} + /* * Attempts to convert a pure NT file path into a corresponding Win32 path. * Adapted from GetInstallSourceWin32() in dll/win32/syssetup/wizard.c */ BOOL ConvertNtPathToWin32Path( + IN OUT PNT_WIN32_PATH_MAPPING_LIST MappingList, OUT PWSTR pwszPath, IN DWORD cchPathMax, IN PCWSTR pwszNTPath) { BOOL FoundDrive = FALSE, RetryOnce = FALSE; + PLIST_ENTRY ListEntry; + PNT_WIN32_PATH_MAPPING Entry; + PCWSTR pwszNtPathToMap = pwszNTPath; + PCWSTR pwszRemaining = NULL; DWORD cchDrives; PWCHAR pwszDrive; - PCWSTR pwszRemaining = NULL; WCHAR wszDrives[512]; WCHAR wszNTPath[MAX_PATH]; - WCHAR TargetPath[MAX_PATH] = L""; + WCHAR TargetPath[MAX_PATH]; *pwszPath = UNICODE_NULL; + /* + * We find first a mapping inside the MappingList. If one is found, use it + * to build the Win32 path. If there is none, we need to create one by + * checking the Win32 drives (and possibly NT symlinks too). + * In case of success, add the newly found mapping to the list and use it + * to build the Win32 path. + */ + + for (ListEntry = MappingList->List.Flink; + ListEntry != &MappingList->List; + ListEntry = ListEntry->Flink) + { + Entry = CONTAINING_RECORD(ListEntry, NT_WIN32_PATH_MAPPING, ListEntry); + + DPRINT("Testing '%S' --> '%S'\n", Entry->Win32Path, Entry->NtPath); + + /* Check whether the queried NT path prefixes the user-provided NT path */ + FoundDrive = !_wcsnicmp(pwszNtPathToMap, Entry->NtPath, wcslen(Entry->NtPath)); + if (FoundDrive) + { + /* Found it! */ + + /* Set the pointers and go build the Win32 path */ + pwszDrive = Entry->Win32Path; + pwszRemaining = pwszNTPath + wcslen(Entry->NtPath); + goto Quit; + } + } + + /* + * No mapping exists for this path yet: try to find one now. + */ + /* Retrieve the mounted drives (available drive letters) */ cchDrives = GetLogicalDriveStringsW(_countof(wszDrives) - 1, wszDrives); if (cchDrives == 0 || cchDrives >= _countof(wszDrives)) { /* Buffer too small or failure */ - DPRINT1("GetLogicalDriveStringsW failed\n"); + DPRINT1("ConvertNtPathToWin32Path: GetLogicalDriveStringsW failed\n"); return FALSE; } - -Retry: // We go back there once if RetryOnce == TRUE +/* We go back there once if RetryOnce == TRUE */ +Retry: /* Enumerate the mounted drives */ for (pwszDrive = wszDrives; *pwszDrive; pwszDrive += wcslen(pwszDrive) + 1) @@ -1235,25 +1297,87 @@ Retry: // We go back there once if RetryOnce == TRUE DPRINT("Testing '%S' --> '%S'\n", pwszDrive, wszNTPath); /* Check whether the queried NT path prefixes the user-provided NT path */ - if (!_wcsnicmp(wszNTPath, pwszNTPath, wcslen(wszNTPath))) + FoundDrive = !_wcsnicmp(pwszNtPathToMap, wszNTPath, wcslen(wszNTPath)); + if (!FoundDrive) + { + PWCHAR ptr, ptr2; + + /* + * Check whether this was a network share that has a drive letter, + * but the user-provided NT path points to this share without + * mentioning the drive letter. + * + * The format is: \Device\<network_redirector>\;X:<data>\share\path + * The corresponding drive letter is 'X'. + * A system-provided network redirector (LanManRedirector or Mup) + * or a 3rd-party one may be used. + * + * We check whether the user-provided NT path has the form: + * \Device\<network_redirector>\<data>\share\path + * as it obviously did not have the full form (the previous check + * would have been OK otherwise). + */ + if (!_wcsnicmp(wszNTPath, L"\\Device\\", _countof(L"\\Device\\")-1) && + (ptr = wcschr(wszNTPath + _countof(L"\\Device\\")-1, L'\\')) && + wcslen(++ptr) >= 3 && ptr[0] == L';' && ptr[2] == L':') + { + /* + * Normally the specified drive letter should correspond + * to the one used for the mapping. But we will ignore + * if it happens not to be the case. + */ + if (pwszDrive[0] != ptr[1]) + { + DPRINT1("Peculiar: expected network share drive letter %C different from actual one %C\n", + pwszDrive[0], ptr[1]); + } + + /* Remove the drive letter from the NT network share path */ + ptr2 = ptr + 3; + /* Swallow as many possible consecutive backslashes as there could be */ + while (*ptr2 == L'\\') ++ptr2; + + memmove(ptr, ptr2, (wcslen(ptr2) + 1) * sizeof(WCHAR)); + + /* Now do the check again */ + FoundDrive = !_wcsnicmp(pwszNtPathToMap, wszNTPath, wcslen(wszNTPath)); + } + } + if (FoundDrive) { /* Found it! */ - FoundDrive = TRUE; - if (!RetryOnce && pwszNTPath != TargetPath) + + pwszDrive[2] = UNICODE_NULL; // Remove the backslash + + if (pwszNtPathToMap == pwszNTPath) + { + ASSERT(!RetryOnce && pwszNTPath != TargetPath); pwszRemaining = pwszNTPath + wcslen(wszNTPath); + } break; } } if (FoundDrive) { - pwszDrive[2] = UNICODE_NULL; // Remove the backslash - StringCchPrintfW(pwszPath, cchPathMax, - L"%s%s", - pwszDrive, - pwszRemaining); - DPRINT1("ConvertNtPathToWin32Path: %S\n", pwszPath); - return TRUE; + /* A mapping was found, add it to the cache */ + Entry = HeapAlloc(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(*Entry)); + if (!Entry) + { + DPRINT1("ConvertNtPathToWin32Path: Cannot allocate memory\n"); + return FALSE; + } + StringCchCopyNW(Entry->NtPath, _countof(Entry->NtPath), + pwszNTPath, pwszRemaining - pwszNTPath); + StringCchCopyW(Entry->Win32Path, _countof(Entry->Win32Path), pwszDrive); + + /* Insert it as the most recent entry */ + InsertHeadList(&MappingList->List, &Entry->ListEntry); + MappingList->MappingsCount++; + + /* Set the pointers and go build the Win32 path */ + pwszDrive = Entry->Win32Path; + goto Quit; } /* @@ -1309,10 +1433,12 @@ Retry: // We go back there once if RetryOnce == TRUE if (!NT_SUCCESS(Status)) { /* Not a symlink, or something else happened: bail out */ - DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", &SymLink, Status); + DPRINT1("ConvertNtPathToWin32Path: NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", + &SymLink, Status); return FALSE; } + *TargetPath = UNICODE_NULL; RtlInitEmptyUnicodeString(&Target, TargetPath, sizeof(TargetPath)); /* Resolve the link and close its handle */ @@ -1323,25 +1449,41 @@ Retry: // We go back there once if RetryOnce == TRUE if (!NT_SUCCESS(Status)) { /* Not a symlink, or something else happened: bail out */ - DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", &SymLink, Status); + DPRINT1("ConvertNtPathToWin32Path: NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", + &SymLink, Status); return FALSE; } - /* Set pointers */ + /* Set the pointers */ pwszRemaining = pwszNTPath + Length; - pwszNTPath = TargetPath; + pwszNtPathToMap = TargetPath; // Point to our local buffer /* Retry once */ RetryOnce = TRUE; goto Retry; } + ASSERT(!FoundDrive); + +Quit: + if (FoundDrive) + { + StringCchPrintfW(pwszPath, cchPathMax, + L"%s%s", + pwszDrive, + pwszRemaining); + DPRINT("ConvertNtPathToWin32Path: %S\n", pwszPath); + return TRUE; + } + return FALSE; } /* Used to enable and disable the shutdown privilege */ /* static */ BOOL -EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) +EnablePrivilege( + IN LPCWSTR lpszPrivilegeName, + IN BOOL bEnablePrivilege) { BOOL Success; HANDLE hToken; @@ -1382,6 +1524,14 @@ _tWinMain(HINSTANCE hInst, ProcessHeap = GetProcessHeap(); + SetupData.hInstance = hInst; + SetupData.hInstallThread = NULL; + SetupData.hHaltInstallEvent = NULL; + SetupData.bStopInstall = FALSE; + + /* Initialize the NT to Win32 path prefix mapping list */ + InitNtToWin32PathMappingList(&SetupData.MappingList); + /* Initialize Setup, phase 0 */ InitializeSetup(&SetupData.USetupData, 0); @@ -1406,11 +1556,6 @@ _tWinMain(HINSTANCE hInst, if (!LoadSetupData(&SetupData)) goto Quit; - SetupData.hInstance = hInst; - SetupData.hInstallThread = NULL; - SetupData.hHaltInstallEvent = NULL; - SetupData.bStopInstall = FALSE; - CheckUnattendedSetup(&SetupData.USetupData); SetupData.bUnattend = IsUnattendedSetup; // FIXME :-) @@ -1544,6 +1689,9 @@ Quit: /* Setup has finished */ FinishSetup(&SetupData.USetupData); + /* Free the NT to Win32 path prefix mapping list */ + FreeNtToWin32PathMappingList(&SetupData.MappingList); + #if 0 // NOTE: Disabled for testing purposes only! EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); ExitWindowsEx(EWX_REBOOT, 0); diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index 0c4a76eb40..ded1d85f74 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -66,6 +66,35 @@ typedef struct _KBLAYOUT #endif +/* + * A mapping entry that maps an NT path to a corresponding Win32 path. + * + * Example is: + * NT path: "\Device\Harddisk0\Partition1\some\path1" + * Win32 path: "C:\some\path1" + * + * Here, the NT path prefix to be cached is only + * "\Device\Harddisk0\Partition1\", to be mapped with "C:\". + * + * Then the same entry would be reused if one wants to convert + * the NT path "\Device\Harddisk0\Partition1\another\path2", + * which converts to the Win32 path "C:\another\path2" . + */ +typedef struct _NT_WIN32_PATH_MAPPING +{ + LIST_ENTRY ListEntry; + WCHAR NtPath[MAX_PATH]; // MAX_PATH for both entries should be more than enough. + WCHAR Win32Path[MAX_PATH]; +} NT_WIN32_PATH_MAPPING, *PNT_WIN32_PATH_MAPPING; + +/* The list of NT to Win32 path prefix mappings */ +typedef struct _NT_WIN32_PATH_MAPPING_LIST +{ + LIST_ENTRY List; + ULONG MappingsCount; +} NT_WIN32_PATH_MAPPING_LIST, *PNT_WIN32_PATH_MAPPING_LIST; + + typedef struct _SETUPDATA { /* General */ @@ -81,6 +110,8 @@ typedef struct _SETUPDATA TCHAR szAbortMessage[512]; TCHAR szAbortTitle[64]; + NT_WIN32_PATH_MAPPING_LIST MappingList; + USETUP_DATA USetupData; BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos @@ -113,6 +144,8 @@ typedef struct _SETUPDATA extern HANDLE ProcessHeap; extern BOOLEAN IsUnattendedSetup; +extern SETUPDATA SetupData; + typedef struct _IMGINFO { @@ -128,6 +161,7 @@ typedef struct _IMGINFO */ BOOL ConvertNtPathToWin32Path( + IN OUT PNT_WIN32_PATH_MAPPING_LIST MappingList, OUT PWSTR pwszPath, IN DWORD cchPathMax, IN PCWSTR pwszNTPath); diff --git a/base/setup/reactos/spapisup/fileqsup.c b/base/setup/reactos/spapisup/fileqsup.c index 9c15f8cdac..ea46c03f75 100644 --- a/base/setup/reactos/spapisup/fileqsup.c +++ b/base/setup/reactos/spapisup/fileqsup.c @@ -38,7 +38,8 @@ SpFileQueueCopy_NtToWin32( * the Win32 SetupQueueCopyW API only takes Win32 paths. We therefore * map the NT path to Win32 path and then call the Win32 API. */ - if (!ConvertNtPathToWin32Path(Win32SourceRootPath, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32SourceRootPath, _countof(Win32SourceRootPath), SourceRootPath)) { @@ -46,7 +47,8 @@ SpFileQueueCopy_NtToWin32( } /* SourcePath, SourceFileName and SourceCabinet are appended to SourceRootPath by the SetupApi function */ - if (!ConvertNtPathToWin32Path(Win32TargetDirectory, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32TargetDirectory, _countof(Win32TargetDirectory), TargetDirectory)) { @@ -64,7 +66,7 @@ SpFileQueueCopy_NtToWin32( SourcePath, SourceFileName, // Undocumented on MSDN is the fact that this parameter is mandatory *IF* one wants to take the TagFile into account! - L"foobar", + L"ReactOS", // SourceTagFile -- Special behaviour: use cabinet file present in ArchiveDir path! The API does not check for a ".cab" extension. SourceCabinet, Win32TargetDirectory, @@ -88,7 +90,8 @@ SpFileQueueDelete_NtToWin32( * the Win32 SetupQueueDeleteW API only takes Win32 paths. We therefore * map the NT path to Win32 path and then call the Win32 API. */ - if (!ConvertNtPathToWin32Path(Win32PathPart1, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32PathPart1, _countof(Win32PathPart1), PathPart1)) { @@ -116,7 +119,8 @@ SpFileQueueRename_NtToWin32( * the Win32 SetupQueueRenameW API only takes Win32 paths. We therefore * map the NT path to Win32 path and then call the Win32 API. */ - if (!ConvertNtPathToWin32Path(Win32SourcePath, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32SourcePath, _countof(Win32SourcePath), SourcePath)) { @@ -126,7 +130,8 @@ SpFileQueueRename_NtToWin32( if (TargetPath) { - if (!ConvertNtPathToWin32Path(Win32TargetPath, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32TargetPath, _countof(Win32TargetPath), TargetPath)) { diff --git a/base/setup/reactos/spapisup/infsupp.c b/base/setup/reactos/spapisup/infsupp.c index 7c40e8421e..98e48b07bb 100644 --- a/base/setup/reactos/spapisup/infsupp.c +++ b/base/setup/reactos/spapisup/infsupp.c @@ -48,7 +48,8 @@ SetupOpenInfFileExW( * the Win32 SetupOpenInfFileW API only takes Win32 paths. We therefore * map the NT path to Win32 path and then call the Win32 API. */ - if (!ConvertNtPathToWin32Path(Win32FileName, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32FileName, _countof(Win32FileName), FileName)) {

6 years, 1 month

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 November 2018