Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [BOOTDATA] Delete "Layout Id" from Japanese/Korean Keyboard Layout
by Katayama Hirofumi MZ 07 Sep '22

07 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3f8f52f3d719d9893d17… commit e3f8f52f3d719d9893d17f879c9ec2d66dcebb5b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 7 17:40:51 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Sep 7 17:40:51 2022 +0900 [BOOTDATA] Delete "Layout Id" from Japanese/Korean Keyboard Layout CORE-11700 --- boot/bootdata/hivesys.inf | 2 -- 1 file changed, 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 08210654e43..ff31905f025 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -629,12 +629,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Displa HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdjpn.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Text",0x00000000,%JAPANESE% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5061" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Id",0x00000000,"0001" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout File",0x00000000,"kbdkor.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Text",0x00000000,%KOREAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5063" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Id",0x00000000,"0001" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout File",0x00000000,"kbdne.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout Text",0x00000000,%DUTCH%

1 0

[reactos] 04/04: [STOBJECT] Add support for the mouse key tray icon
by Mark Jansen 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27bc31100eda0d5424ef9… commit 27bc31100eda0d5424ef991b6dbe033bd31522b5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 18 21:24:41 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:11:09 2022 +0200 [STOBJECT] Add support for the mouse key tray icon --- dll/shellext/stobject/CMakeLists.txt | 1 + dll/shellext/stobject/csystray.cpp | 25 +++++ dll/shellext/stobject/csystray.h | 1 + dll/shellext/stobject/mouse.cpp | 125 +++++++++++++++++++++ dll/shellext/stobject/precomp.h | 6 + dll/shellext/stobject/resource.h | 12 ++ dll/shellext/stobject/resources/mouse/disabled.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/left_active.ico | Bin 0 -> 1406 bytes .../resources/mouse/left_active_right_down.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/left_down.ico | Bin 0 -> 1406 bytes .../resources/mouse/left_down_right_active.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/left_right_active.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/left_right_down.ico | Bin 0 -> 1406 bytes dll/shellext/stobject/resources/mouse/none.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/right_active.ico | Bin 0 -> 1406 bytes .../stobject/resources/mouse/right_down.ico | Bin 0 -> 1406 bytes dll/shellext/stobject/stobject.rc | 12 ++ 17 files changed, 182 insertions(+) diff --git a/dll/shellext/stobject/CMakeLists.txt b/dll/shellext/stobject/CMakeLists.txt index b8b18915cab..7604c3caecf 100644 --- a/dll/shellext/stobject/CMakeLists.txt +++ b/dll/shellext/stobject/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE csystray.cpp stobject.cpp hotplug.cpp + mouse.cpp power.cpp volume.cpp precomp.h) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index 93d17406115..bab008c0d01 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -22,6 +22,7 @@ const int g_NumIcons = _countof(g_IconHandlers); CSysTray::CSysTray() : dwServicesEnabled(0) { + wm_SHELLHOOK = RegisterWindowMessageW(L"SHELLHOOK"); wm_DESTROYWINDOW = RegisterWindowMessageW(L"CSysTray_DESTROY"); } @@ -128,6 +129,8 @@ HRESULT CSysTray::InitIcons() } } + MouseKeys_Init(this); + return InitNetShell(); } @@ -144,6 +147,8 @@ HRESULT CSysTray::ShutdownIcons() } } + MouseKeys_Shutdown(this); + return ShutdownNetShell(); } @@ -318,6 +323,17 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM { return DestroyWindow(); } + + if (wm_SHELLHOOK && uMsg == wm_SHELLHOOK) + { + if (wParam == HSHELL_ACCESSIBILITYSTATE && lParam == ACCESS_MOUSEKEYS) + { + MouseKeys_Update(this); + } + lResult = 0L; + return TRUE; + } + switch (uMsg) { case WM_NCCREATE: @@ -328,6 +344,7 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM GetServicesEnabled(); InitIcons(); SetTimer(1, 2000, NULL); + RegisterShellHookWindow(hWnd); return TRUE; case WM_TIMER: @@ -337,8 +354,16 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM ProcessIconMessage(uMsg, wParam, lParam, lResult); return TRUE; + case WM_SETTINGCHANGE: + if (wParam == SPI_SETMOUSEKEYS) + { + MouseKeys_Update(this); + } + break; + case WM_DESTROY: KillTimer(1); + DeregisterShellHookWindow(hWnd); ShutdownIcons(); PostQuitMessage(0); return TRUE; diff --git a/dll/shellext/stobject/csystray.h b/dll/shellext/stobject/csystray.h index 692948efcbf..059e7047f0b 100644 --- a/dll/shellext/stobject/csystray.h +++ b/dll/shellext/stobject/csystray.h @@ -29,6 +29,7 @@ class CSysTray : // TODO: keep icon handlers here DWORD dwServicesEnabled; + UINT wm_SHELLHOOK; UINT wm_DESTROYWINDOW; static DWORD WINAPI s_SysTrayThreadProc(PVOID param); diff --git a/dll/shellext/stobject/mouse.cpp b/dll/shellext/stobject/mouse.cpp new file mode 100644 index 00000000000..103b1235503 --- /dev/null +++ b/dll/shellext/stobject/mouse.cpp @@ -0,0 +1,125 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Mouse keys notification icon handler + * COPYRIGHT: Copyright 2022 Mark Jansen <mark.jansen(a)reactos.org> + */ + +#include "precomp.h" + +static MOUSEKEYS g_Mk; +static UINT g_MkState; +static HICON g_MkStateIcon; + +HRESULT STDMETHODCALLTYPE +MouseKeys_Init(_In_ CSysTray *pSysTray) +{ + TRACE("MouseKeys_Init!\n"); + + return MouseKeys_Update(pSysTray); +} + +HRESULT STDMETHODCALLTYPE +MouseKeys_Shutdown(_In_ CSysTray *pSysTray) +{ + TRACE("MouseKeys_Shutdown!\n"); + + if (g_MkStateIcon) + { + DestroyIcon(g_MkStateIcon); + g_MkStateIcon = NULL; + } + + if (g_MkState) + { + g_MkState = 0; + pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_MOUSE, g_MkStateIcon, L"MouseKeys"); + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE +MouseKeys_Update(_In_ CSysTray *pSysTray) +{ + TRACE("MouseKeys_Update!\n"); + + g_Mk.cbSize = sizeof(g_Mk); + SystemParametersInfoW(SPI_GETMOUSEKEYS, sizeof(g_Mk), &g_Mk, 0); + + UINT state = 0; + if ((g_Mk.dwFlags & (MKF_INDICATOR | MKF_MOUSEKEYSON)) == (MKF_INDICATOR | MKF_MOUSEKEYSON)) + { + if (g_Mk.dwFlags & MKF_MOUSEMODE) + { + switch (g_Mk.dwFlags & (MKF_LEFTBUTTONDOWN | MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONDOWN | MKF_RIGHTBUTTONSEL)) + { + case 0: + default: + state = IDI_MOUSE_NOBTN; + break; + case MKF_LEFTBUTTONSEL: + state = IDI_MOUSE_L_ACTIVE; + break; + case MKF_LEFTBUTTONDOWN: + case MKF_LEFTBUTTONDOWN | MKF_LEFTBUTTONSEL: + state = IDI_MOUSE_L_DOWN; + break; + case MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_R_ACTIVE; + break; + case MKF_RIGHTBUTTONDOWN: + case MKF_RIGHTBUTTONDOWN | MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_R_DOWN; + break; + case MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_LR_ACTIVE; + break; + case MKF_RIGHTBUTTONDOWN | MKF_LEFTBUTTONDOWN: + case MKF_RIGHTBUTTONDOWN | MKF_LEFTBUTTONDOWN | MKF_LEFTBUTTONSEL: + case MKF_RIGHTBUTTONDOWN | MKF_LEFTBUTTONDOWN | MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONSEL: + case MKF_RIGHTBUTTONDOWN | MKF_LEFTBUTTONDOWN | MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_LR_DOWN; + break; + case MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONDOWN: + case MKF_LEFTBUTTONSEL | MKF_RIGHTBUTTONDOWN | MKF_RIGHTBUTTONSEL: + state = IDI_MOUSE_L_ACTIVE_R_DOWN; + break; + case MKF_LEFTBUTTONDOWN | MKF_RIGHTBUTTONSEL: + case MKF_LEFTBUTTONDOWN | MKF_RIGHTBUTTONSEL | MKF_LEFTBUTTONSEL: + state = IDI_MOUSE_R_ACTIVE_L_DOWN; + break; + } + } + else + { + state = IDI_MOUSE_DISABLED; + } + } + + UINT uId = NIM_MODIFY; + if (state != g_MkState) + { + if (g_MkStateIcon) + { + DestroyIcon(g_MkStateIcon); + g_MkStateIcon = NULL; + } + + if (g_MkState == 0) + uId = NIM_ADD; + + g_MkState = state; + if (g_MkState) + { + g_MkStateIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(g_MkState)); + } + } + + if (g_MkState == 0) + { + uId = NIM_DELETE; + } + + return pSysTray->NotifyIcon(uId, ID_ICON_MOUSE, g_MkStateIcon, L"MouseKeys"); +} diff --git a/dll/shellext/stobject/precomp.h b/dll/shellext/stobject/precomp.h index e60b0a265b8..3d891af31b6 100644 --- a/dll/shellext/stobject/precomp.h +++ b/dll/shellext/stobject/precomp.h @@ -33,6 +33,7 @@ extern HINSTANCE g_hInstance; #define ID_ICON_VOLUME (WM_APP + 0x4CB) #define ID_ICON_HOTPLUG (WM_APP + 0x4CC) #define ID_ICON_POWER (WM_APP + 0x4CD) +#define ID_ICON_MOUSE (WM_APP + 0x4CE) #define POWER_SERVICE_FLAG 0x00000001 #define HOTPLUG_SERVICE_FLAG 0x00000002 @@ -74,6 +75,11 @@ extern HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); +extern HRESULT STDMETHODCALLTYPE MouseKeys_Init(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE MouseKeys_Shutdown(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE MouseKeys_Update(_In_ CSysTray * pSysTray); + + #define POWER_TIMER_ID 2 #define VOLUME_TIMER_ID 3 #define HOTPLUG_TIMER_ID 4 diff --git a/dll/shellext/stobject/resource.h b/dll/shellext/stobject/resource.h index 71d500ec25b..66e6aed204f 100644 --- a/dll/shellext/stobject/resource.h +++ b/dll/shellext/stobject/resource.h @@ -56,4 +56,16 @@ #define IDI_HOTPLUG_ERR 420 #define IDI_HOTPLUG_OK 421 +#define IDI_MOUSE_DISABLED 440 +#define IDI_MOUSE_NOBTN 441 +#define IDI_MOUSE_L_ACTIVE 442 +#define IDI_MOUSE_L_DOWN 443 +#define IDI_MOUSE_R_ACTIVE 444 +#define IDI_MOUSE_R_DOWN 445 +#define IDI_MOUSE_LR_ACTIVE 446 +#define IDI_MOUSE_LR_DOWN 447 +#define IDI_MOUSE_L_ACTIVE_R_DOWN 448 +#define IDI_MOUSE_R_ACTIVE_L_DOWN 449 + + #define IDR_SYSTRAY 11001 diff --git a/dll/shellext/stobject/resources/mouse/disabled.ico b/dll/shellext/stobject/resources/mouse/disabled.ico new file mode 100644 index 00000000000..e5b51a6d65b Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/disabled.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_active.ico b/dll/shellext/stobject/resources/mouse/left_active.ico new file mode 100644 index 00000000000..d87b21b3d36 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_active.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_active_right_down.ico b/dll/shellext/stobject/resources/mouse/left_active_right_down.ico new file mode 100644 index 00000000000..ee977316081 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_active_right_down.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_down.ico b/dll/shellext/stobject/resources/mouse/left_down.ico new file mode 100644 index 00000000000..97346434deb Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_down.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_down_right_active.ico b/dll/shellext/stobject/resources/mouse/left_down_right_active.ico new file mode 100644 index 00000000000..95899121b79 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_down_right_active.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_right_active.ico b/dll/shellext/stobject/resources/mouse/left_right_active.ico new file mode 100644 index 00000000000..4964f037312 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_right_active.ico differ diff --git a/dll/shellext/stobject/resources/mouse/left_right_down.ico b/dll/shellext/stobject/resources/mouse/left_right_down.ico new file mode 100644 index 00000000000..0283f66338a Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/left_right_down.ico differ diff --git a/dll/shellext/stobject/resources/mouse/none.ico b/dll/shellext/stobject/resources/mouse/none.ico new file mode 100644 index 00000000000..0c84cf292e1 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/none.ico differ diff --git a/dll/shellext/stobject/resources/mouse/right_active.ico b/dll/shellext/stobject/resources/mouse/right_active.ico new file mode 100644 index 00000000000..b2dcfe6fa2d Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/right_active.ico differ diff --git a/dll/shellext/stobject/resources/mouse/right_down.ico b/dll/shellext/stobject/resources/mouse/right_down.ico new file mode 100644 index 00000000000..624999a41c9 Binary files /dev/null and b/dll/shellext/stobject/resources/mouse/right_down.ico differ diff --git a/dll/shellext/stobject/stobject.rc b/dll/shellext/stobject/stobject.rc index f9b6e1bcf3d..bf310d7b95d 100644 --- a/dll/shellext/stobject/stobject.rc +++ b/dll/shellext/stobject/stobject.rc @@ -31,6 +31,18 @@ IDI_HOTPLUG_ERR ICON "resources/hotplug/0.ico" IDI_HOTPLUG_OK ICON "resources/hotplug/1.ico" +IDI_MOUSE_DISABLED ICON "resources/mouse/disabled.ico" +IDI_MOUSE_NOBTN ICON "resources/mouse/none.ico" +IDI_MOUSE_L_ACTIVE ICON "resources/mouse/left_active.ico" +IDI_MOUSE_L_DOWN ICON "resources/mouse/left_down.ico" +IDI_MOUSE_R_ACTIVE ICON "resources/mouse/right_active.ico" +IDI_MOUSE_R_DOWN ICON "resources/mouse/right_down.ico" +IDI_MOUSE_LR_ACTIVE ICON "resources/mouse/left_right_active.ico" +IDI_MOUSE_LR_DOWN ICON "resources/mouse/left_right_down.ico" +IDI_MOUSE_L_ACTIVE_R_DOWN ICON "resources/mouse/left_active_right_down.ico" +IDI_MOUSE_R_ACTIVE_L_DOWN ICON "resources/mouse/left_down_right_active.ico" + + IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" #include <reactos/manifest_dll.rc>

1 0

[reactos] 03/04: [PSDK] Add missing defines / argument names
by Mark Jansen 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab760e539d2196e107531… commit ab760e539d2196e1075316cd1857c30015b4f644 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 18 21:24:04 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:11:09 2022 +0200 [PSDK] Add missing defines / argument names --- sdk/include/psdk/winuser.h | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 4af5369cca5..bde95161a69 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -1256,6 +1256,9 @@ extern "C" { #endif /* WINVER >= 0x0400 */ #if(_WIN32_WINNT >= 0x0500) #define HSHELL_ACCESSIBILITYSTATE 11 +#define ACCESS_STICKYKEYS 0x01 +#define ACCESS_FILTERKEYS 0x02 +#define ACCESS_MOUSEKEYS 0x03 #define HSHELL_APPCOMMAND 12 #endif /* _WIN32_WINNT >= 0x0500 */ #if(_WIN32_WINNT >= 0x0501) @@ -2125,14 +2128,21 @@ extern "C" { #define HCF_HOTKEYSOUND 16 #define HCF_INDICATOR 32 #define HCF_HOTKEYAVAILABLE 64 -#define MKF_AVAILABLE 2 -#define MKF_CONFIRMHOTKEY 8 -#define MKF_HOTKEYACTIVE 4 -#define MKF_HOTKEYSOUND 16 -#define MKF_INDICATOR 32 -#define MKF_MOUSEKEYSON 1 -#define MKF_MODIFIERS 64 -#define MKF_REPLACENUMBERS 128 + +#define MKF_MOUSEKEYSON 0x00000001 +#define MKF_AVAILABLE 0x00000002 +#define MKF_HOTKEYACTIVE 0x00000004 +#define MKF_CONFIRMHOTKEY 0x00000008 +#define MKF_HOTKEYSOUND 0x00000010 +#define MKF_INDICATOR 0x00000020 +#define MKF_MODIFIERS 0x00000040 +#define MKF_REPLACENUMBERS 0x00000080 +#define MKF_LEFTBUTTONDOWN 0x01000000 +#define MKF_RIGHTBUTTONDOWN 0x02000000 +#define MKF_LEFTBUTTONSEL 0x10000000 +#define MKF_RIGHTBUTTONSEL 0x20000000 +#define MKF_MOUSEMODE 0x80000000 + #define SERKF_ACTIVE 8 /* May be obsolete. Not in recent MS docs. */ #define SERKF_AVAILABLE 2 #define SERKF_INDICATOR 4 @@ -5039,13 +5049,13 @@ MapWindowPoints( _In_ UINT cPoints); int WINAPI MenuItemFromPoint(_In_opt_ HWND, _In_ HMENU, _In_ POINT); -BOOL WINAPI MessageBeep(_In_ UINT); -int WINAPI MessageBoxA(_In_opt_ HWND, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_ UINT); -int WINAPI MessageBoxW(_In_opt_ HWND, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_ UINT); -int WINAPI MessageBoxExA(_In_opt_ HWND, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_ UINT, _In_ WORD); -int WINAPI MessageBoxExW(_In_opt_ HWND, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_ UINT, _In_ WORD); -int WINAPI MessageBoxIndirectA(_In_ CONST MSGBOXPARAMSA*); -int WINAPI MessageBoxIndirectW(_In_ CONST MSGBOXPARAMSW*); +BOOL WINAPI MessageBeep(_In_ UINT uType); +int WINAPI MessageBoxA(_In_opt_ HWND hWnd, _In_opt_ LPCSTR lpText, _In_opt_ LPCSTR lpCaption, _In_ UINT uType); +int WINAPI MessageBoxW(_In_opt_ HWND hWnd, _In_opt_ LPCWSTR lpText, _In_opt_ LPCWSTR lpCaption, _In_ UINT uType); +int WINAPI MessageBoxExA(_In_opt_ HWND hWnd, _In_opt_ LPCSTR lpText, _In_opt_ LPCSTR lpCaption, _In_ UINT uType, _In_ WORD wLanguageId); +int WINAPI MessageBoxExW(_In_opt_ HWND hWnd, _In_opt_ LPCWSTR lpText, _In_opt_ LPCWSTR lpCaption, _In_ UINT uType, _In_ WORD wLanguageId); +int WINAPI MessageBoxIndirectA(_In_ CONST MSGBOXPARAMSA* lpmbp); +int WINAPI MessageBoxIndirectW(_In_ CONST MSGBOXPARAMSW* lpmbp); BOOL WINAPI ModifyMenuA(_In_ HMENU, _In_ UINT, _In_ UINT, _In_ UINT_PTR, _In_opt_ LPCSTR); BOOL WINAPI ModifyMenuW(_In_ HMENU, _In_ UINT, _In_ UINT, _In_ UINT_PTR, _In_opt_ LPCWSTR); HMONITOR WINAPI MonitorFromPoint(_In_ POINT, _In_ DWORD); @@ -5347,8 +5357,8 @@ BOOL WINAPI SwitchDesktop(_In_ HDESK); #if(_WIN32_WINNT >= 0x0500) VOID WINAPI SwitchToThisWindow(_In_ HWND, _In_ BOOL); #endif /* (_WIN32_WINNT >= 0x0500) */ -BOOL WINAPI SystemParametersInfoA(_In_ UINT, _In_ UINT, _Inout_opt_ PVOID, _In_ UINT); -BOOL WINAPI SystemParametersInfoW(_In_ UINT, _In_ UINT, _Inout_opt_ PVOID, _In_ UINT); +BOOL WINAPI SystemParametersInfoA(_In_ UINT uiAction, _In_ UINT uiParam, _Inout_opt_ PVOID pvParam, _In_ UINT fWinIni); +BOOL WINAPI SystemParametersInfoW(_In_ UINT uiAction, _In_ UINT uiParam, _Inout_opt_ PVOID pvParam, _In_ UINT fWinIni); LONG WINAPI

1 0

[reactos] 02/04: [PSDK] Add COWAIT_DEFAULT
by Mark Jansen 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=876085212976bf5bb37b3… commit 876085212976bf5bb37b3ff0b747d3c4f552127a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 18 21:23:43 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:11:09 2022 +0200 [PSDK] Add COWAIT_DEFAULT --- sdk/include/psdk/objbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/objbase.h b/sdk/include/psdk/objbase.h index e93356c469c..d12f399d855 100644 --- a/sdk/include/psdk/objbase.h +++ b/sdk/include/psdk/objbase.h @@ -692,6 +692,7 @@ CoRegisterChannelHook( typedef enum tagCOWAIT_FLAGS { + COWAIT_DEFAULT = 0x00000000, COWAIT_WAITALL = 0x00000001, COWAIT_ALERTABLE = 0x00000002, COWAIT_INPUTAVAILABLE = 0x00000004

1 0

[reactos] 01/04: [STOBJECT] Keep the object alive while the thread is running,
by Mark Jansen 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=334c7cee35e4ba184b313… commit 334c7cee35e4ba184b3138550994229a5e24eb71 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 18 21:19:42 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:11:09 2022 +0200 [STOBJECT] Keep the object alive while the thread is running, Fix shutting down the thread. --- dll/shellext/stobject/csystray.cpp | 32 ++++++++++++++++++++++++-------- dll/shellext/stobject/csystray.h | 4 ++-- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index 14f9c213a9f..93d17406115 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -9,6 +9,7 @@ #include "precomp.h" +#include <regstr.h> #include <undocshell.h> #include <shellutils.h> @@ -19,8 +20,14 @@ SysTrayIconHandlers_t g_IconHandlers [] = { }; const int g_NumIcons = _countof(g_IconHandlers); -CSysTray::CSysTray() {} -CSysTray::~CSysTray() {} +CSysTray::CSysTray() : dwServicesEnabled(0) +{ + wm_DESTROYWINDOW = RegisterWindowMessageW(L"CSysTray_DESTROY"); +} + +CSysTray::~CSysTray() +{ +} VOID CSysTray::GetServicesEnabled() { @@ -30,8 +37,7 @@ VOID CSysTray::GetServicesEnabled() /* Enable power, volume and hotplug by default */ this->dwServicesEnabled = POWER_SERVICE_FLAG | VOLUME_SERVICE_FLAG | HOTPLUG_SERVICE_FLAG; - if (RegCreateKeyExW(HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\SysTray", + if (RegCreateKeyExW(HKEY_CURRENT_USER, REGSTR_PATH_SYSTRAY, 0, NULL, REG_OPTION_NON_VOLATILE, @@ -132,9 +138,9 @@ HRESULT CSysTray::ShutdownIcons() { if (this->dwServicesEnabled & g_IconHandlers[i].dwServiceFlag) { + this->dwServicesEnabled &= ~g_IconHandlers[i].dwServiceFlag; HRESULT hr = g_IconHandlers[i].pfnShutdown(this); - if (FAILED(hr)) - return hr; + FAILED_UNEXPECTEDLY(hr); } } @@ -253,12 +259,14 @@ HRESULT CSysTray::SysTrayThreadProc() CoUninitialize(); + Release(); FreeLibraryAndExitThread(hLib, ret); } HRESULT CSysTray::CreateSysTrayThread() { TRACE("CSysTray Init TODO: Initialize tray icon handlers.\n"); + AddRef(); HANDLE hThread = CreateThread(NULL, 0, s_SysTrayThreadProc, this, 0, NULL); @@ -269,8 +277,11 @@ HRESULT CSysTray::CreateSysTrayThread() HRESULT CSysTray::DestroySysTrayWindow() { - DestroyWindow(); - hwndSysTray = NULL; + if (!DestroyWindow()) + { + // Window is from another thread, ask it politely to destroy itself: + SendMessage(wm_DESTROYWINDOW); + } return S_OK; } @@ -303,6 +314,10 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM if (hWnd != m_hWnd) return FALSE; + if (wm_DESTROYWINDOW && uMsg == wm_DESTROYWINDOW) + { + return DestroyWindow(); + } switch (uMsg) { case WM_NCCREATE: @@ -325,6 +340,7 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM case WM_DESTROY: KillTimer(1); ShutdownIcons(); + PostQuitMessage(0); return TRUE; } diff --git a/dll/shellext/stobject/csystray.h b/dll/shellext/stobject/csystray.h index 0ff52367825..692948efcbf 100644 --- a/dll/shellext/stobject/csystray.h +++ b/dll/shellext/stobject/csystray.h @@ -29,7 +29,7 @@ class CSysTray : // TODO: keep icon handlers here DWORD dwServicesEnabled; - HWND hwndSysTray; + UINT wm_DESTROYWINDOW; static DWORD WINAPI s_SysTrayThreadProc(PVOID param); HRESULT SysTrayMessageLoop(); @@ -76,4 +76,4 @@ public: COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) END_COM_MAP() -}; \ No newline at end of file +};

1 0

[reactos] 01/01: [KERNEL32] Fix BaseDefaultPath containing extra '.'
by Mark Jansen 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f10d40f9122b926bf01b5… commit f10d40f9122b926bf01b5409a6d3c3d9d06806c3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon May 16 12:34:40 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Sep 6 21:09:38 2022 +0200 [KERNEL32] Fix BaseDefaultPath containing extra '.' --- dll/win32/kernel32/client/dllmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/dllmain.c b/dll/win32/kernel32/client/dllmain.c index a6720cd78a8..fe173bb10d8 100644 --- a/dll/win32/kernel32/client/dllmain.c +++ b/dll/win32/kernel32/client/dllmain.c @@ -174,7 +174,7 @@ DllMain(HANDLE hDll, /* Construct the default path (using the static buffer) */ Status = RtlStringCbPrintfW(BaseDefaultPathBuffer, sizeof(BaseDefaultPathBuffer), - L".;%wZ;%wZ\\system;%wZ;", + L"%wZ;%wZ\\system;%wZ;", &BaseWindowsSystemDirectory, &BaseWindowsDirectory, &BaseWindowsDirectory);

1 0

[reactos] 01/01: [NOTEPAD] Follow-up of 'CJK font workaround'
by Katayama Hirofumi MZ 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5fa4891e5fb907f4ac1a… commit a5fa4891e5fb907f4ac1ae0675422d324c7c0fb0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 7 00:54:31 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Sep 7 00:54:31 2022 +0900 [NOTEPAD] Follow-up of 'CJK font workaround' - Revert some code. - Add font name comments. CORE-11700 --- base/applications/notepad/lang/ja-JP.rc | 2 +- base/applications/notepad/lang/zh-CN.rc | 2 +- base/applications/notepad/lang/zh-HK.rc | 2 +- base/applications/notepad/lang/zh-TW.rc | 2 +- base/applications/notepad/settings.c | 17 ++++++++++++++--- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index 3bddaac5438..9ccc5f27419 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -167,7 +167,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d 行、%d 列" STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。" - STRING_DEFAULTFONT "ＭＳゴシック" + STRING_DEFAULTFONT "ＭＳゴシック" /* MS Gothic */ STRING_TEXT_DOCUMENT "テキスト文書" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index 53ce5d64653..0fade682a67 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -174,7 +174,7 @@ BEGIN STRING_CR "Mac（CR）" STRING_LINE_COLUMN "行 %d，列 %d" STRING_PRINTERROR "无法打印文件“%s”。\n\n请确保打印机已打开，并且已正确配置。" - STRING_DEFAULTFONT "宋体" + STRING_DEFAULTFONT "宋体" /* SimSun */ STRING_TEXT_DOCUMENT "文本文档" STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index f8a42cc9ee9..cd08e43b22c 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -175,7 +175,7 @@ BEGIN STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\ 請檢查印表機是否已經開機及正確設定。" - STRING_DEFAULTFONT "新細明體" + STRING_DEFAULTFONT "新細明體" /* PMingLiU */ STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index 4e0c36cdab3..a1cfd19ca4d 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -174,7 +174,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\n請檢查印表機是否已經開機和正確設定。" - STRING_DEFAULTFONT "新細明體" + STRING_DEFAULTFONT "新細明體" /* PMingLiU */ STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 8eadf20d8e5..d0295937b43 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -184,11 +184,13 @@ void NOTEPAD_LoadSettingsFromRegistry(void) ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); Globals.lfFont.lfCharSet = DEFAULT_CHARSET; + Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; + Globals.lfFont.lfEscapement = 0; LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, ARRAY_SIZE(Globals.lfFont.lfFaceName)); - Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; - Globals.lfFont.lfWeight = FW_NORMAL; - Globals.lfFont.lfHeight = HeightFromPointSize(100); + Globals.lfFont.lfItalic = FALSE; + Globals.lfFont.lfOrientation = 0; + Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS; /* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */ switch (PRIMARYLANGID(GetUserDefaultLangID())) @@ -198,7 +200,16 @@ void NOTEPAD_LoadSettingsFromRegistry(void) case LANG_KOREAN: Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; break; + default: + Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; + break; } + + Globals.lfFont.lfQuality = PROOF_QUALITY; + Globals.lfFont.lfStrikeOut = FALSE; + Globals.lfFont.lfUnderline = FALSE; + Globals.lfFont.lfWeight = FW_NORMAL; + Globals.lfFont.lfHeight = HeightFromPointSize(100); } hFont = CreateFontIndirect(&Globals.lfFont);

1 0

[reactos] 01/01: [NOTEPAD] CJK font workaround
by Katayama Hirofumi MZ 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ecf017ce2b6c6c8a6a28… commit 5ecf017ce2b6c6c8a6a28f99ea60fe340f8bd825 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 6 15:35:14 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 6 15:35:14 2022 +0900 [NOTEPAD] CJK font workaround Far East Asian users may not have suitable fixed-pitch fonts. CORE-11700 --- base/applications/notepad/settings.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 1e5e5ae9732..8eadf20d8e5 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -184,19 +184,21 @@ void NOTEPAD_LoadSettingsFromRegistry(void) ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); Globals.lfFont.lfCharSet = DEFAULT_CHARSET; - Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; - Globals.lfFont.lfEscapement = 0; LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, ARRAY_SIZE(Globals.lfFont.lfFaceName)); - Globals.lfFont.lfItalic = FALSE; - Globals.lfFont.lfOrientation = 0; - Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS; Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; - Globals.lfFont.lfQuality = PROOF_QUALITY; - Globals.lfFont.lfStrikeOut = FALSE; - Globals.lfFont.lfUnderline = FALSE; Globals.lfFont.lfWeight = FW_NORMAL; Globals.lfFont.lfHeight = HeightFromPointSize(100); + + /* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */ + switch (PRIMARYLANGID(GetUserDefaultLangID())) + { + case LANG_CHINESE: + case LANG_JAPANESE: + case LANG_KOREAN: + Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; + break; + } } hFont = CreateFontIndirect(&Globals.lfFont);

1 0

[reactos] 01/01: [NOTEPAD] Use DEFAULT_CHARSET instead of ANSI_CHARSET
by Katayama Hirofumi MZ 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d725449d2cf69deb3cfb… commit 2d725449d2cf69deb3cfb5f77400235ba4023de3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 6 14:21:46 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 6 14:21:46 2022 +0900 [NOTEPAD] Use DEFAULT_CHARSET instead of ANSI_CHARSET Fix the font problem. CORE-11700 --- base/applications/notepad/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index fcbcf0300b1..1e5e5ae9732 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -183,7 +183,7 @@ void NOTEPAD_LoadSettingsFromRegistry(void) ARRAY_SIZE(Globals.szFooter)); ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); - Globals.lfFont.lfCharSet = ANSI_CHARSET; + Globals.lfFont.lfCharSet = DEFAULT_CHARSET; Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; Globals.lfFont.lfEscapement = 0; LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName,

1 0

[reactos] 01/01: [NOTEPAD] Add STRING_DEFAULTFONT for default font
by Katayama Hirofumi MZ 06 Sep '22

06 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cef42ec44306db7c1025b… commit cef42ec44306db7c1025bf742d6871ed69bcb24c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 6 14:05:59 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 6 14:05:59 2022 +0900 [NOTEPAD] Add STRING_DEFAULTFONT for default font CORE-11700 --- base/applications/notepad/lang/bg-BG.rc | 1 + base/applications/notepad/lang/cs-CZ.rc | 1 + base/applications/notepad/lang/da-DK.rc | 1 + base/applications/notepad/lang/de-DE.rc | 1 + base/applications/notepad/lang/el-GR.rc | 1 + base/applications/notepad/lang/en-US.rc | 1 + base/applications/notepad/lang/es-ES.rc | 1 + base/applications/notepad/lang/et-EE.rc | 1 + base/applications/notepad/lang/eu-ES.rc | 1 + base/applications/notepad/lang/fi-FI.rc | 1 + base/applications/notepad/lang/fr-FR.rc | 1 + base/applications/notepad/lang/he-IL.rc | 1 + base/applications/notepad/lang/hi-IN.rc | 1 + base/applications/notepad/lang/hr-HR.rc | 1 + base/applications/notepad/lang/hu-HU.rc | 1 + base/applications/notepad/lang/hy-AM.rc | 1 + base/applications/notepad/lang/id-ID.rc | 1 + base/applications/notepad/lang/it-IT.rc | 1 + base/applications/notepad/lang/ja-JP.rc | 1 + base/applications/notepad/lang/lt-LT.rc | 1 + base/applications/notepad/lang/ms-MY.rc | 1 + base/applications/notepad/lang/nl-NL.rc | 1 + base/applications/notepad/lang/no-NO.rc | 1 + base/applications/notepad/lang/pl-PL.rc | 1 + base/applications/notepad/lang/pt-BR.rc | 1 + base/applications/notepad/lang/pt-PT.rc | 1 + base/applications/notepad/lang/ro-RO.rc | 1 + base/applications/notepad/lang/ru-RU.rc | 1 + base/applications/notepad/lang/sk-SK.rc | 1 + base/applications/notepad/lang/sl-SI.rc | 1 + base/applications/notepad/lang/sq-AL.rc | 1 + base/applications/notepad/lang/sv-SE.rc | 1 + base/applications/notepad/lang/th-TH.rc | 1 + base/applications/notepad/lang/tr-TR.rc | 1 + base/applications/notepad/lang/uk-UA.rc | 1 + base/applications/notepad/lang/uz-UZ.rc | 1 + base/applications/notepad/lang/zh-CN.rc | 1 + base/applications/notepad/lang/zh-HK.rc | 1 + base/applications/notepad/lang/zh-TW.rc | 1 + base/applications/notepad/notepad_res.h | 1 + base/applications/notepad/settings.c | 3 ++- 41 files changed, 42 insertions(+), 1 deletion(-) diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index 5b900b511f3..075c3bcfd3f 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -166,6 +166,7 @@ BEGIN STRING_CR "Мак (CR)" STRING_LINE_COLUMN "Ред %d, стълб %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Възпроизводствено право 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 36fd1d28b52..ad4e4f87391 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -167,6 +167,7 @@ paměti." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Řádek %d, sloupec %d" STRING_PRINTERROR "Soubor '%s' nebylo možné vytisknout.\n\nZkontrolujte, zda je tiskárna zapnutá a správně nastavená." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Textový dokument" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index 8ab2d8f4c07..6bb09d1e48d 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -167,6 +167,7 @@ hukommelse, og prøv så igen." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index c1c491f3e03..c8168630ddb 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -168,6 +168,7 @@ um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \ STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Zeile %d, Spalte %d" STRING_PRINTERROR "Die Datei '%s' kann nicht gedruckt werden.\n\nStellen Sie sicher, dass der Drucker angeschlossen und richtig konfiguriert ist." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Textdokument" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 32e23f3f00a..a9a39044505 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -167,6 +167,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index 242fb18c426..3fda7325bc4 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -166,6 +166,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 3700fe740cd..786b1b3c1d9 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -169,6 +169,7 @@ aumentar la cantidad\nde memoria libre." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Línea %d, columna %d" STRING_PRINTERROR "No se puede imprimir el archivo '%s'.\n\nAsegúrese de que la impresora esté encendida y configurada correctamente." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Documento de texto" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index f5b3afa982b..625b5011163 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -174,6 +174,7 @@ käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Rida %d, veerg %d" STRING_PRINTERROR "Ei suuda printida faili '%s'.\n\nVeendu et printer on sisse lülitatud ja korralikult sättestatud." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Tekstidokument" STRING_NOTEPAD_AUTHORS "Autoriõigus 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index bb082e9fbb6..c39b5d5aca6 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -167,6 +167,7 @@ memoria librearen\nkopurua handitzeko." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d linea, %d columna" STRING_PRINTERROR "'%s' fitxategia inprimatu ez ahal du.\n\nZihurtatu behar duzu inmprimagailua pistuta eta ongi konfiguratuta dago." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index d13c7ce9337..31278ed53d1 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -167,6 +167,7 @@ muistia." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index 6fba3e8d9c0..35340a79710 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -167,6 +167,7 @@ de la mémoire." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Ligne %d, colonne %d" STRING_PRINTERROR "Impossible d'imprimer le fichier '%s'.\n\nVérifiez que l'imprimante est allumée et correctement configurée." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Document Texte" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index f4929cf8d5f..14208a81b3a 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -169,6 +169,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_CR "מקינטוש (CR)" STRING_LINE_COLUMN "שורה %d, עמודה %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index 24ecb4b0094..f205d05538e 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -173,6 +173,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "लाइन%d, स्तंभ%d" STRING_PRINTERROR "फ़ाइल '%s' मुद्रित नहीं कर सकता।\n\n सुनिश्चित करें कि प्रिंटर चालू है और ठीक से कॉन्फ़िगर किया गया है।" + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "टेक्स्ट डॉक्यूमॅन्ट" STRING_NOTEPAD_AUTHORS "कॉपीराइट 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index 92eeafd4af5..4ec5d860647 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -173,6 +173,7 @@ zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linija %d, Stupac %d" STRING_PRINTERROR "Ne mogu ispisati datoteku '%s'.\n\nProvjerite je li pisač uključen i je li pravilno konfiguiran." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Tekstni dokument" STRING_NOTEPAD_AUTHORS "Copyright 1997, 98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index e23208079ff..cf257619dd9 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -167,6 +167,7 @@ Szeretné menteni a változásokat?" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Sor: %d, oszlop: %d" STRING_PRINTERROR "Nem sikerült kinyomtatni a következő fájlt: '%s'.\n\nEllenőrizze hogy a nyomtató be van-e kapcsolva és megfelelően van-e konfigurálva." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Szöveges dokumentum" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index d14af947fd7..d6b34ddf072 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -166,6 +166,7 @@ Would you like to save the changes ?" STRING_CR "Մակինտոշ (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 594ddac068d..f080b0d01e9 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -167,6 +167,7 @@ bebas." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Baris %d, kolom %d" STRING_PRINTERROR "Tidak bisa mencetak '%s'.\n\nPastikan pencetak telah menyala dan bisa digunakan dengan benar." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Teks Dokumen" STRING_NOTEPAD_AUTHORS "Hak Cipta 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index d06b07dceb9..03f5ce48fa0 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -167,6 +167,7 @@ di memoria libera." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linea %d, colonna %d" STRING_PRINTERROR "Impossibile stampare il file '%s'.\n\nControllare che la stampante sia accesa e impostata correttamente." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Documento di testo" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index 5b43cd0352e..3bddaac5438 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -167,6 +167,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d 行、%d 列" STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。" + STRING_DEFAULTFONT "ＭＳゴシック" STRING_TEXT_DOCUMENT "テキスト文書" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 040a66a6755..dd8baa3418e 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -166,6 +166,7 @@ Ar norite išsaugoti pakeitimus?" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Eilutė %d, stulpelis %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "(C) 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index 9674fdef67d..24b94da7ebd 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -168,6 +168,7 @@ tugas ini.\nTutup satu atau lebih aplikasi untuk menambah jumlah\ningatan kosong STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Garisan %d, Kolum %d" STRING_PRINTERROR "Tidak boleh mencetak fail '%s'.\n\nPastikan pencetak dihidupkan dan dikonfigurasikan dengan betul." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index a0ffe227096..cd1f4f4a3a6 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -166,6 +166,7 @@ Wilt u de wijzigingen opslaan?" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index b58fdf6b475..ab0b3fe71f8 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -167,6 +167,7 @@ minne." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linje %d, kolonne %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Enerett 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 708ead6edfb..2ea5139af72 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -161,6 +161,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linia %d, kolumna %d" STRING_PRINTERROR "Nie można wydrukować pliku '%s'.\n\nUpewnij się, że drukarka jest włączona i poprawnie skonfigurowana." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Dokument tekstowy" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 08f8714b570..a3012bf1ecc 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -166,6 +166,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linha %d, coluna %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 857c587bcb2..3a15441d46b 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -166,6 +166,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linha %d, coluna %d" STRING_PRINTERROR "Impossível imprimir o ficheiro '%s'.\n\nCertifique-se de que a impressora está ligada e correctamente configurada." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Documento de texto" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index cfe4487fe18..230c34a52b6 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -171,6 +171,7 @@ Păstrați modificările aduse?" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linia %d, coloana %d" STRING_PRINTERROR "Fișierul „%s” nu a putut fi imprimat.\n\nAsigurați-vă că imprimanta este pornită și configurată corespunzător." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Document text" STRING_NOTEPAD_AUTHORS "Drept de autor 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index c6c729b5fc9..916152413de 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -166,6 +166,7 @@ BEGIN STRING_CR "Macintosh (CR)" STRING_LINE_COLUMN "Строка %d, столбец %d" STRING_PRINTERROR "Невозможно распечатать файл '%s'.\n\nПроверьте, включен ли принтер, и настроен ли он правильно." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Текстовый документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 7a272f3fb41..0f5fc7ac423 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -174,6 +174,7 @@ alebo viac aplikácií, aby sa uvoľnila pamäť a skúste to znova." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Riadok %d, stĺpec %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index 5dacaf8b8a9..7cb591e0df3 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -166,6 +166,7 @@ operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in posk STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 82c55454577..3381c59ffbe 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -170,6 +170,7 @@ detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linje %d, kolonë %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index 49160f0fc62..8f124547918 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -166,6 +166,7 @@ den här åtgärden.\nAvsluta ett eller flera program för att frigöra mer minn STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index ac24b8d2d5e..b59aeffba94 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -161,6 +161,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 5a862b887c0..1485fa6c107 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -164,6 +164,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d. Satır, %d. Sütun" STRING_PRINTERROR """%s"" dosyası yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Metin Belgesi" STRING_NOTEPAD_AUTHORS "Telif Hakları: 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index a46758205ab..312dbd390c9 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -166,6 +166,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Рядок %d, стовпчик %d" STRING_PRINTERROR "Неможливо розпечатати файл '%s'.\n\nПереконайтесь, що принтер ввімкнено, та налаштовано." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Текстовий документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index abc5f6088ce..0ed6903c641 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -166,6 +166,7 @@ O‘zgarishlarni saqlashni istaysizmi?" STRING_CR "Macintosh (CR)" STRING_LINE_COLUMN "Qator %d, Ustun %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index 5b02a2fd733..53ce5d64653 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -174,6 +174,7 @@ BEGIN STRING_CR "Mac（CR）" STRING_LINE_COLUMN "行 %d，列 %d" STRING_PRINTERROR "无法打印文件“%s”。\n\n请确保打印机已打开，并且已正确配置。" + STRING_DEFAULTFONT "宋体" STRING_TEXT_DOCUMENT "文本文档" STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index c5e455fa877..f8a42cc9ee9 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -175,6 +175,7 @@ BEGIN STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\ 請檢查印表機是否已經開機及正確設定。" + STRING_DEFAULTFONT "新細明體" STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index 2cae1d75fd9..4e0c36cdab3 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -174,6 +174,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\n請檢查印表機是否已經開機和正確設定。" + STRING_DEFAULTFONT "新細明體" STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index 7b463383dc8..c4556771b2e 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -100,6 +100,7 @@ #define STRING_LINE_COLUMN 0x188 #define STRING_PRINTERROR 0x189 +#define STRING_DEFAULTFONT 0x18A #define STRING_TEXT_DOCUMENT 0x200 diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 40d8a9e7c67..fcbcf0300b1 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -186,7 +186,8 @@ void NOTEPAD_LoadSettingsFromRegistry(void) Globals.lfFont.lfCharSet = ANSI_CHARSET; Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; Globals.lfFont.lfEscapement = 0; - _tcscpy(Globals.lfFont.lfFaceName, _T("Lucida Console")); + LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, + ARRAY_SIZE(Globals.lfFont.lfFaceName)); Globals.lfFont.lfItalic = FALSE; Globals.lfFont.lfOrientation = 0; Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs