Ros-diffs February 2019

ros-diffs@reactos.org

23 participants
208 discussions

[reactos] 01/01: [SNDVOL32] Fix coding style issues. No code changes!
by Eric Kohl 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b995880ee420ce85a3b78… commit b995880ee420ce85a3b78b6890d4b622d7f2e129 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 10 13:28:58 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 10 18:09:31 2019 +0100 [SNDVOL32] Fix coding style issues. No code changes! --- base/applications/sndvol32/dialog.c | 4 ++-- base/applications/sndvol32/sndvol32.c | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 53a1274027..564a88b8ea 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -573,7 +573,7 @@ UpdateDialogLineSwitchControl( WCHAR LineName[MIXER_LONG_NAME_CHARS]; /* find the index of this line */ - for(Index = 0; Index < PrefContext->Count; Index++) + for (Index = 0; Index < PrefContext->Count; Index++) { /* get id */ wID = (Index + 1) * IDC_LINE_NAME; @@ -621,7 +621,7 @@ UpdateDialogLineSliderControl( WCHAR LineName[MIXER_LONG_NAME_CHARS]; /* find the index of this line */ - for(Index = 0; Index < PrefContext->Count; Index++) + for (Index = 0; Index < PrefContext->Count; Index++) { /* get id */ wID = (Index + 1) * IDC_LINE_NAME; diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index fde487706e..592323e51b 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -94,7 +94,7 @@ PrefDlgAddLine(PSND_MIXER Mixer, PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context; UNREFERENCED_PARAMETER(Mixer); - UNREFERENCED_PARAMETER(DisplayControls); + UNREFERENCED_PARAMETER(DisplayControls); switch (Line->dwComponentType) { @@ -174,7 +174,7 @@ PrefDlgAddConnection(PSND_MIXER Mixer, UINT i; UNREFERENCED_PARAMETER(Mixer); - UNREFERENCED_PARAMETER(LineID); + UNREFERENCED_PARAMETER(LineID); if (Line->cControls != 0) { @@ -877,23 +877,23 @@ MainWindowProc(HWND hwnd, /* check if the message is from the line switch */ if (HIWORD(wParam) == BN_CLICKED && (CtrlID % IDC_LINE_SWITCH == 0)) { - /* compute line offset */ - LineOffset = CtrlID / IDC_LINE_SWITCH; + /* compute line offset */ + LineOffset = CtrlID / IDC_LINE_SWITCH; /* compute window id of line name static control */ CtrlID = LineOffset * IDC_LINE_NAME; - /* get line name */ - if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0) - { - /* setup context */ - Context.SliderPos = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); - Context.bVertical = FALSE; - Context.bSwitch = TRUE; - - /* set volume */ - SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context); - } + /* get line name */ + if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0) + { + /* setup context */ + Context.SliderPos = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); + Context.bVertical = FALSE; + Context.bSwitch = TRUE; + + /* set volume */ + SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context); + } } }

1 0

[reactos] 01/01: [CRYPTEXT] Make extension localizable, and add an icon for certificate files (#1347)
by Baruch Rutman 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d56d9c1aaa6107394f6bc… commit d56d9c1aaa6107394f6bc13570de8ca08a917b80 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Sun Feb 10 18:57:43 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 17:57:43 2019 +0100 [CRYPTEXT] Make extension localizable, and add an icon for certificate files (#1347) - Localize error message and shell file extension description. - Added Hebrew resources. - Added Icon. The icon is the Tango icon named "certificate". If anybody has a idea for more fitting icon please recommend it. Follow up of #1343 CORE-15736 --- boot/bootdata/hivecls.inf | 3 +++ dll/shellext/cryptext/CMakeLists.txt | 1 + dll/shellext/cryptext/cryptext.c | 17 ++++++++++++++--- dll/shellext/cryptext/cryptext.rc | 22 ++++++++++++++++++++++ dll/shellext/cryptext/lang/en-US.rc | 14 ++++++++++++++ dll/shellext/cryptext/lang/he-IL.rc | 14 ++++++++++++++ dll/shellext/cryptext/precomp.h | 2 +- dll/shellext/cryptext/res/cerfile.ico | Bin 0 -> 9662 bytes dll/shellext/cryptext/resource.h | 2 ++ 9 files changed, 71 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 37d81fd4b1..1b38c910e5 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -78,6 +78,9 @@ HKCR,"batfile\shell\open\command","",0x00000000,"""%1"" %*" ; Certificate HKCR,".cer","",0x00000000,"cerfile" +HKCR,"cerfile","",0x00000000,"Certificate File" +HKCR,"cerfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\cryptext.dll,-101" +HKCR,"cerfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\cryptext.dll,-1" HKCR,"cerfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe cryptext.dll,CryptExtOpenCER %1" ; ReactOS Command Script Files diff --git a/dll/shellext/cryptext/CMakeLists.txt b/dll/shellext/cryptext/CMakeLists.txt index faa2301ce9..8cd10f4a43 100644 --- a/dll/shellext/cryptext/CMakeLists.txt +++ b/dll/shellext/cryptext/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE add_library(cryptext SHARED ${SOURCE} cryptext.spec + cryptext.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptext.def) set_module_type(cryptext win32dll UNICODE) diff --git a/dll/shellext/cryptext/cryptext.c b/dll/shellext/cryptext/cryptext.c index 8825f41b91..ae5e40b813 100644 --- a/dll/shellext/cryptext/cryptext.c +++ b/dll/shellext/cryptext/cryptext.c @@ -7,12 +7,14 @@ #include "precomp.h" +HINSTANCE g_hInstance; BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) { switch (dwReason) { case DLL_PROCESS_ATTACH: + g_hInstance = hInstance; DisableThreadLibraryCalls(hInstance); break; } @@ -29,15 +31,24 @@ VOID WINAPI CryptExtOpenCERW(HWND hWnd, HINSTANCE hInst, LPCWSTR file, DWORD nCm if (CryptQueryObject(CERT_QUERY_OBJECT_FILE, file, CERT_QUERY_CONTENT_FLAG_CERT, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, (CONST VOID**)&pvContext)) { - CRYPTUI_VIEWCERTIFICATE_STRUCT CertViewInfo = {0}; + CRYPTUI_VIEWCERTIFICATE_STRUCTW CertViewInfo = {0}; CertViewInfo.dwSize = sizeof(CertViewInfo); CertViewInfo.pCertContext = pvContext; - CryptUIDlgViewCertificate(&CertViewInfo, NULL); + CryptUIDlgViewCertificateW(&CertViewInfo, NULL); CertFreeCertificateContext(pvContext); } else { - MessageBoxW(NULL, L"This is not a valid certificate", NULL, MB_OK); + WCHAR Message[MAX_PATH]; + + if (LoadStringW(g_hInstance, IDS_INVALIDFILE, Message, MAX_PATH)) + { + MessageBoxW(NULL, Message, NULL, MB_OK); + } + else + { + MessageBoxW(NULL, L"This is not a valid certificate file.", NULL, MB_OK); + } } } } diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc new file mode 100644 index 0000000000..e12afbdb4e --- /dev/null +++ b/dll/shellext/cryptext/cryptext.rc @@ -0,0 +1,22 @@ +#include <windef.h> +#include <winuser.h> + +#include "resource.h" + +1 ICON "res/cerfile.ico" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS CryptExt Shell Extension" +#define REACTOS_STR_INTERNAL_NAME "cryptext" +#define REACTOS_STR_ORIGINAL_FILENAME "cryptext.dll" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif diff --git a/dll/shellext/cryptext/lang/en-US.rc b/dll/shellext/cryptext/lang/en-US.rc new file mode 100644 index 0000000000..5aeae89dbf --- /dev/null +++ b/dll/shellext/cryptext/lang/en-US.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: English (United States) resource translation + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "This is not a valid certificate file." + IDS_CER_FILE "Certificate File" +END diff --git a/dll/shellext/cryptext/lang/he-IL.rc b/dll/shellext/cryptext/lang/he-IL.rc new file mode 100644 index 0000000000..5d821eb5a2 --- /dev/null +++ b/dll/shellext/cryptext/lang/he-IL.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hebrew resource translation + * COPYRIGHT: Copyright 2019 Baruch Rutman (peterooch at gmail dot com) + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "קובץ זה הוא לא קובץ אישורי הצפנה תקין." + IDS_CER_FILE "קובץ אישורי הצפנה" +END diff --git a/dll/shellext/cryptext/precomp.h b/dll/shellext/cryptext/precomp.h index e9df5d3270..21067f510b 100644 --- a/dll/shellext/cryptext/precomp.h +++ b/dll/shellext/cryptext/precomp.h @@ -13,6 +13,6 @@ #include <wincrypt.h> #include <winuser.h> #include <cryptuiapi.h> - +#include "resource.h" #endif /* CRYPTEXT_PRECOMP_H */ diff --git a/dll/shellext/cryptext/res/cerfile.ico b/dll/shellext/cryptext/res/cerfile.ico new file mode 100644 index 0000000000..362fb40f88 Binary files /dev/null and b/dll/shellext/cryptext/res/cerfile.ico differ diff --git a/dll/shellext/cryptext/resource.h b/dll/shellext/cryptext/resource.h new file mode 100644 index 0000000000..1ec6542a78 --- /dev/null +++ b/dll/shellext/cryptext/resource.h @@ -0,0 +1,2 @@ +#define IDS_INVALIDFILE 100 +#define IDS_CER_FILE 101

1 0

[reactos] 01/01: [NETCFGX] Fix an assignment typo.
by Hermès Bélusca-Maïto 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0d97cec8884fde689c14… commit c0d97cec8884fde689c145c7d50ef944d378f666 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 10 17:30:56 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 17:30:56 2019 +0100 [NETCFGX] Fix an assignment typo. --- dll/win32/netcfgx/propertypage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index abf44daa0d..87be83650f 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -316,7 +316,7 @@ GetEnumOptions( &dwValueLength); if (dwError == ERROR_NO_MORE_ITEMS) { - dwError == ERROR_SUCCESS; + dwError = ERROR_SUCCESS; goto done; } else if (dwError != ERROR_SUCCESS)

1 0

[reactos] 01/01: [CMAKE] msvc.cmake: Remove 2 now redundant '/GF' (#1239)
by Serge Gautherie 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=237110604b52fa45e1005… commit 237110604b52fa45e10058b074770471081843be Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Feb 10 16:46:23 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 16:46:23 2019 +0100 [CMAKE] msvc.cmake: Remove 2 now redundant '/GF' (#1239) Addendum to 5e673f3. CORE-14373 --- sdk/cmake/msvc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 4d76d91437..43fbd0dfbd 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -4,7 +4,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") # no optimization add_compile_flags("/Ob0 /Od") elseif(CMAKE_BUILD_TYPE STREQUAL "Release") - add_compile_flags("/Ox /Ob2 /Ot /Oy /GT /GF") + add_compile_flags("/Ox /Ob2 /Ot /Oy /GT") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF") elseif(OPTIMIZE STREQUAL "1") add_compile_flags("/O1") @@ -15,7 +15,7 @@ elseif(OPTIMIZE STREQUAL "3") elseif(OPTIMIZE STREQUAL "4") add_compile_flags("/Os /Ox /GS-") elseif(OPTIMIZE STREQUAL "5") - add_compile_flags("/GF /Gy /Ob2 /Os /Ox /GS-") + add_compile_flags("/Gy /Ob2 /Os /Ox /GS-") endif() # Always use string pooling: this helps reducing the binaries size since a lot

1 0

[reactos] 01/01: [USETUP][REACTOS] Check the status return value of InitDestinationPaths() (#1264)
by Bișoc George 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bde4de2d6ad0a7685743… commit 8bde4de2d6ad0a768574334c035de83604a2e821 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Feb 10 16:43:51 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 16:43:51 2019 +0100 [USETUP][REACTOS] Check the status return value of InitDestinationPaths() (#1264) - Within the function's body code, check the status values returned by the called functions. - Change the BuildInstallPaths's function type to NTSTATUS instead of VOID (and check the status of InitDestinationPaths() as well. --- base/setup/lib/setuplib.c | 98 ++++++++++++++++++++++++++++++++++-------- base/setup/reactos/drivepage.c | 10 ++++- base/setup/usetup/usetup.c | 12 ++++-- 3 files changed, 96 insertions(+), 24 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 2b52c463f3..9e4d22ee37 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -628,18 +628,29 @@ InitDestinationPaths( IN PPARTENTRY PartEntry) // FIXME: HACK! { WCHAR PathBuffer[MAX_PATH]; - - // - // TODO: Check return status values of the functions! - // + NTSTATUS Status; /* Create 'pSetupData->DestinationRootPath' string */ RtlFreeUnicodeString(&pSetupData->DestinationRootPath); - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu\\", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlCreateUnicodeString(&pSetupData->DestinationRootPath, PathBuffer); + Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlStringCchPrintfW() failed with status 0x%08lx\n", Status); + return Status; + } + + Status = RtlCreateUnicodeString(&pSetupData->DestinationRootPath, PathBuffer) ? STATUS_SUCCESS : STATUS_NO_MEMORY; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status); + return Status; + } + DPRINT("DestinationRootPath: %wZ\n", &pSetupData->DestinationRootPath); // FIXME! Which variable to choose? @@ -649,23 +660,72 @@ InitDestinationPaths( /** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/ /* Create 'pSetupData->DestinationArcPath' */ RtlFreeUnicodeString(&pSetupData->DestinationArcPath); - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\", - DiskEntry->BiosDiskNumber, - PartEntry->OnDiskPartitionNumber); - ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallationDir); - RtlCreateUnicodeString(&pSetupData->DestinationArcPath, PathBuffer); + Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\", + DiskEntry->BiosDiskNumber, + PartEntry->OnDiskPartitionNumber); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlStringCchPrintfW() failed with status 0x%08lx\n", Status); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); + return Status; + } + + Status = ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallationDir); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ConcatPaths() failed with status 0x%08lx\n", Status); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); + return Status; + } + + Status = RtlCreateUnicodeString(&pSetupData->DestinationArcPath, PathBuffer) ? STATUS_SUCCESS : STATUS_NO_MEMORY; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); + return Status; + } /** Equivalent of 'NTOS_INSTALLATION::SystemNtPath' **/ /* Create 'pSetupData->DestinationPath' string */ RtlFreeUnicodeString(&pSetupData->DestinationPath); - CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - pSetupData->DestinationRootPath.Buffer, InstallationDir); - RtlCreateUnicodeString(&pSetupData->DestinationPath, PathBuffer); + Status = CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + pSetupData->DestinationRootPath.Buffer, InstallationDir); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("CombinePaths() failed with status 0x%08lx\n", Status); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); + RtlFreeUnicodeString(&pSetupData->DestinationArcPath); + return Status; + } + + Status = RtlCreateUnicodeString(&pSetupData->DestinationPath, PathBuffer) ? STATUS_SUCCESS : STATUS_NO_MEMORY; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); + RtlFreeUnicodeString(&pSetupData->DestinationArcPath); + return Status; + } /** Equivalent of 'NTOS_INSTALLATION::PathComponent' **/ // FIXME: This is only temporary!! Must be removed later! - /***/RtlCreateUnicodeString(&pSetupData->InstallPath, InstallationDir);/***/ + Status = RtlCreateUnicodeString(&pSetupData->InstallPath, InstallationDir) ? STATUS_SUCCESS : STATUS_NO_MEMORY; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); + RtlFreeUnicodeString(&pSetupData->DestinationArcPath); + RtlFreeUnicodeString(&pSetupData->DestinationPath); + return Status; + } return STATUS_SUCCESS; } diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index a1b7d137bb..b5f07b21d3 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -33,6 +33,9 @@ #include "resource.h" +#define NDEBUG +#include <debug.h> + /* GLOBALS ******************************************************************/ #define IDS_LIST_COLUMN_FIRST IDS_PARTITION_NAME @@ -795,8 +798,11 @@ DisableWizNext: Status = InitDestinationPaths(&pSetupData->USetupData, NULL, // pSetupData->USetupData.InstallationDirectory, &DiskEntry, &PartEntry); - // TODO: Check Status - UNREFERENCED_PARAMETER(Status); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("InitDestinationPaths() failed with status 0x%08lx\n", Status); + } break; } diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 5aeb33697c..a9a4f81174 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3238,7 +3238,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } -static VOID +static NTSTATUS BuildInstallPaths(PWSTR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEntry) @@ -3246,11 +3246,17 @@ BuildInstallPaths(PWSTR InstallDir, NTSTATUS Status; Status = InitDestinationPaths(&USetupData, InstallDir, DiskEntry, PartEntry); - // TODO: Check Status - UNREFERENCED_PARAMETER(Status); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("InitDestinationPaths() failed with status 0x%08lx\n", Status); + return Status; + } /* Initialize DestinationDriveLetter */ DestinationDriveLetter = PartEntry->DriveLetter; + + return STATUS_SUCCESS; }

1 0

[reactos] 01/01: [OSK] Implement standard/enhanced keyboard handler (#1338)
by Bișoc George 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cd3d896b7659f1c5376f… commit 3cd3d896b7659f1c5376f4036594e28cd2edbf7c Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Feb 10 16:04:16 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 16:04:16 2019 +0100 [OSK] Implement standard/enhanced keyboard handler (#1338) - Add the respective standard keyboard resource. - Implement the standard/enhanced keyboard dialog switcher. - Implement save/load handler. - Move the warning box conditinal check (bShowWarning) to wWinMain application entry point (this will prevent the modal welcome box from displaying each time the user switches into another dialog). CORE-14428 --- base/applications/osk/lang/ar-DZ.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/cs-CZ.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/de-DE.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/en-GB.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/en-US.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/es-ES.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/et-EE.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/fr-CA.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/fr-FR.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/he-IL.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/it-IT.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/pl-PL.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/ro-RO.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/ru-RU.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/tr-TR.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/zh-CN.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/lang/zh-TW.rc | 125 +++++++++++++++++++++++++++++++++++- base/applications/osk/main.c | 96 ++++++++++++++++++++++++--- base/applications/osk/main.h | 1 + base/applications/osk/osk_res.h | 79 ++++++++++++----------- base/applications/osk/settings.c | 52 ++++++++++++--- 21 files changed, 2246 insertions(+), 107 deletions(-) diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc index 4feabe086a..3bf1192f0a 100644 --- a/base/applications/osk/lang/ar-DZ.rc +++ b/base/applications/osk/lang/ar-DZ.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -127,6 +127,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -136,8 +255,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc index 21b68ec8af..3d35fa2b47 100644 --- a/base/applications/osk/lang/cs-CZ.rc +++ b/base/applications/osk/lang/cs-CZ.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Klávesnice na obrazovce" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -127,6 +127,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -136,8 +255,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc index 3fa0d40a1c..6748444650 100644 --- a/base/applications/osk/lang/de-DE.rc +++ b/base/applications/osk/lang/de-DE.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Bildschirmtastatur" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -128,6 +128,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -137,8 +256,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc index fa849f3ff3..11f91b9b2f 100644 --- a/base/applications/osk/lang/en-GB.rc +++ b/base/applications/osk/lang/en-GB.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -128,6 +128,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -137,8 +256,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index 644e32cdf0..cabdadbc6a 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -127,6 +127,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -136,8 +255,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc index 41d8a188c2..4fc2284830 100644 --- a/base/applications/osk/lang/es-ES.rc +++ b/base/applications/osk/lang/es-ES.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Teclado en pantalla" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -129,6 +129,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -138,8 +257,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc index 139ecd9b6b..4de3166e29 100644 --- a/base/applications/osk/lang/et-EE.rc +++ b/base/applications/osk/lang/et-EE.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Ekraaniklaviatuur" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -127,6 +127,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -136,8 +255,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc index 429156c4f5..27c2cc78fb 100644 --- a/base/applications/osk/lang/fr-CA.rc +++ b/base/applications/osk/lang/fr-CA.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Clavier visuel" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -128,6 +128,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -137,8 +256,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc index 5057fa360c..eef680d01b 100644 --- a/base/applications/osk/lang/fr-FR.rc +++ b/base/applications/osk/lang/fr-FR.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Clavier visuel" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -128,6 +128,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -137,8 +256,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc index c91405bdea..5f1fa891c3 100644 --- a/base/applications/osk/lang/he-IL.rc +++ b/base/applications/osk/lang/he-IL.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "לוח מקשים על התצוגה" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -127,6 +127,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -136,8 +255,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index 6e2c7921b2..0f614a1a98 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Tastiera a schermo" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -128,6 +128,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -137,8 +256,8 @@ IDR_OSK_MENU MENU DISCARDABLE POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc index 89244f0ac7..d5f7e2d30b 100644 --- a/base/applications/osk/lang/pl-PL.rc +++ b/base/applications/osk/lang/pl-PL.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Klawiatura Ekranowa" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -127,6 +127,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -136,8 +255,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 379e54ee7e..57e1616d5e 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Tastatură virtuală" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -128,6 +128,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -137,8 +256,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index d4cdd6fef6..cbaafcf41b 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Экранная клавиатура" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -127,6 +127,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -136,8 +255,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc index c12958f67c..3ccca25ba1 100644 --- a/base/applications/osk/lang/tr-TR.rc +++ b/base/applications/osk/lang/tr-TR.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Ekran Klavyesi" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU @@ -127,6 +127,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -136,8 +255,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc index f8deff18d4..da381ed815 100644 --- a/base/applications/osk/lang/zh-CN.rc +++ b/base/applications/osk/lang/zh-CN.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "屏幕键盘" FONT 9, "宋体" MENU IDR_OSK_MENU @@ -130,6 +130,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -139,8 +258,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc index 97e83a7f79..3ea417a631 100644 --- a/base/applications/osk/lang/zh-TW.rc +++ b/base/applications/osk/lang/zh-TW.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "螢幕鍵盤" FONT 9, "新細明體" MENU IDR_OSK_MENU @@ -129,6 +129,125 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 +CAPTION "On screen keyboard" +FONT 8, "MS Shell Dlg" +MENU IDR_OSK_MENU +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35 + CTEXT "Num",IDC_STATIC,364,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3 + CTEXT "Caps",IDC_STATIC,389,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 + CTEXT "Scroll",IDC_STATIC,414,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3 +END + IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -138,8 +257,8 @@ BEGIN POPUP "Keyboard" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB MENUITEM SEPARATOR MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index ffb01a25d4..72cee21f30 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -143,8 +143,19 @@ int OSK_DlgInitDialog(HWND hDlg) /* Save handle */ Globals.hMainWnd = hDlg; - /* Load the settings from the registry hive */ - LoadDataFromRegistry(); + /* Check the checked menu item before displaying the modal box */ + if (Globals.bIsEnhancedKeyboard) + { + /* Enhanced keyboard dialog chosen, set the respective menu item as checked */ + CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_CHECKED); + CheckMenuItem(GetMenu(hDlg), IDM_STANDARD_KB, MF_BYCOMMAND | MF_UNCHECKED); + } + else + { + /* Standard keyboard dialog chosen, set the respective menu item as checked */ + CheckMenuItem(GetMenu(hDlg), IDM_STANDARD_KB, MF_BYCOMMAND | MF_CHECKED); + CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_UNCHECKED); + } /* Set the application's icon */ hIcon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); @@ -197,12 +208,6 @@ int OSK_DlgInitDialog(HWND hDlg) /* Set a timer for periodics tasks */ Globals.iTimer = SetTimer(hDlg, 0, 200, NULL); - /* If the member of the struct (bShowWarning) is set then display the dialog box */ - if (Globals.bShowWarning) - { - DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(IDD_WARNINGDIALOG_OSK), Globals.hMainWnd, OSK_WarningProc); - } - return TRUE; } @@ -441,6 +446,58 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) break; } + case IDM_ENHANCED_KB: + { + if (!Globals.bIsEnhancedKeyboard) + { + /* + The user attempted to switch to enhanced keyboard dialog type. + Set the member value as TRUE, destroy the dialog and save the data configuration into the registry. + */ + Globals.bIsEnhancedKeyboard = TRUE; + EndDialog(hDlg, FALSE); + SaveDataToRegistry(); + + /* Change the condition of enhanced keyboard item menu to checked */ + CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_CHECKED); + CheckMenuItem(GetMenu(hDlg), IDM_STANDARD_KB, MF_BYCOMMAND | MF_UNCHECKED); + + /* Finally, display the dialog modal box with the enhanced keyboard dialog */ + DialogBoxW(Globals.hInstance, + MAKEINTRESOURCEW(MAIN_DIALOG_ENHANCED_KB), + GetDesktopWindow(), + OSK_DlgProc); + } + + break; + } + + case IDM_STANDARD_KB: + { + if (Globals.bIsEnhancedKeyboard) + { + /* + The user attempted to switch to standard keyboard dialog type. + Set the member value as FALSE, destroy the dialog and save the data configuration into the registry. + */ + Globals.bIsEnhancedKeyboard = FALSE; + EndDialog(hDlg, FALSE); + SaveDataToRegistry(); + + /* Change the condition of standard keyboard item menu to checked */ + CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_UNCHECKED); + CheckMenuItem(GetMenu(hDlg), IDM_STANDARD_KB, MF_BYCOMMAND | MF_CHECKED); + + /* Finally, display the dialog modal box with the standard keyboard dialog */ + DialogBoxW(Globals.hInstance, + MAKEINTRESOURCEW(MAIN_DIALOG_STANDARD_KB), + GetDesktopWindow(), + OSK_DlgProc); + } + + break; + } + case IDM_ABOUT: { OSK_About(); @@ -471,6 +528,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, int show) { HANDLE hMutex; + INT LayoutResource; UNREFERENCED_PARAMETER(prev); UNREFERENCED_PARAMETER(cmdline); @@ -479,6 +537,25 @@ int WINAPI wWinMain(HINSTANCE hInstance, ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; + /* Load the settings from the registry hive */ + LoadDataFromRegistry(); + + /* If the member of the struct (bShowWarning) is set then display the dialog box */ + if (Globals.bShowWarning) + { + DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(IDD_WARNINGDIALOG_OSK), Globals.hMainWnd, OSK_WarningProc); + } + + /* Before initializing the dialog execution, check if the chosen keyboard type is standard or enhanced */ + if (Globals.bIsEnhancedKeyboard) + { + LayoutResource = MAIN_DIALOG_ENHANCED_KB; + } + else + { + LayoutResource = MAIN_DIALOG_STANDARD_KB; + } + /* Rry to open a mutex for a single instance */ hMutex = OpenMutexW(MUTEX_ALL_ACCESS, FALSE, L"osk"); @@ -487,8 +564,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, /* Mutex doesn�t exist. This is the first instance so create the mutex. */ hMutex = CreateMutexW(NULL, FALSE, L"osk"); + /* Create the modal box based on the configuration registry */ DialogBoxW(hInstance, - MAKEINTRESOURCEW(MAIN_DIALOG), + MAKEINTRESOURCEW(LayoutResource), GetDesktopWindow(), OSK_DlgProc); diff --git a/base/applications/osk/main.h b/base/applications/osk/main.h index 67f08b26d8..a399abadd2 100644 --- a/base/applications/osk/main.h +++ b/base/applications/osk/main.h @@ -24,6 +24,7 @@ typedef struct /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */ HWND hActiveWnd; BOOL bShowWarning; + BOOL bIsEnhancedKeyboard; } OSK_GLOBALS; /* DEFINES ********************************************************************/ diff --git a/base/applications/osk/osk_res.h b/base/applications/osk/osk_res.h index d62777efdc..03fdffc9a7 100644 --- a/base/applications/osk/osk_res.h +++ b/base/applications/osk/osk_res.h @@ -6,51 +6,52 @@ * PROGRAMMERS: Denis ROBERT */ -#define MAIN_DIALOG 2000 +#define MAIN_DIALOG_ENHANCED_KB 2000 +#define MAIN_DIALOG_STANDARD_KB 2001 -#define IDC_LED_NUM 100 -#define IDC_LED_CAPS 101 -#define IDC_LED_SCROLL 102 -#define IDC_SHOWWARNINGCHECK 103 +#define IDC_LED_NUM 100 +#define IDC_LED_CAPS 101 +#define IDC_LED_SCROLL 102 +#define IDC_SHOWWARNINGCHECK 103 -#define IDI_OSK 200 -#define IDI_BACK 201 -#define IDI_TAB 202 -#define IDI_CAPS_LOCK 203 -#define IDI_RETURN 204 -#define IDI_SHIFT 205 -#define IDI_REACTOS 206 -#define IDI_MENU 207 -#define IDI_HOME 208 -#define IDI_PG_UP 209 -#define IDI_PG_DOWN 210 -#define IDI_LEFT 211 -#define IDI_TOP 212 -#define IDI_RIGHT 213 -#define IDI_BOTTOM 214 +#define IDI_OSK 200 +#define IDI_BACK 201 +#define IDI_TAB 202 +#define IDI_CAPS_LOCK 203 +#define IDI_RETURN 204 +#define IDI_SHIFT 205 +#define IDI_REACTOS 206 +#define IDI_MENU 207 +#define IDI_HOME 208 +#define IDI_PG_UP 209 +#define IDI_PG_DOWN 210 +#define IDI_LEFT 211 +#define IDI_TOP 212 +#define IDI_RIGHT 213 +#define IDI_BOTTOM 214 -#define IDR_OSK_MENU 600 -#define IDM_EXIT 601 -#define IDM_STANDARD_KB 602 -#define IDM_ENCHANCED_KB 603 -#define IDM_REG_LAYOUT 604 -#define IDM_BLOCK_LAYOUT 605 -#define IDM_101_KEYS 606 -#define IDM_102_KEYS 607 -#define IDM_106_KEYS 608 -#define IDM_ON_TOP 609 -#define IDM_CLICK_SOUND 610 -#define IDM_TYPE_MODE 611 -#define IDM_FONT 612 -#define IDM_HELP_TOPICS 613 -#define IDM_ABOUT 614 +#define IDR_OSK_MENU 600 +#define IDM_EXIT 601 +#define IDM_STANDARD_KB 602 +#define IDM_ENHANCED_KB 603 +#define IDM_REG_LAYOUT 604 +#define IDM_BLOCK_LAYOUT 605 +#define IDM_101_KEYS 606 +#define IDM_102_KEYS 607 +#define IDM_106_KEYS 608 +#define IDM_ON_TOP 609 +#define IDM_CLICK_SOUND 610 +#define IDM_TYPE_MODE 611 +#define IDM_FONT 612 +#define IDM_HELP_TOPICS 613 +#define IDM_ABOUT 614 -#define IDD_WARNINGDIALOG_OSK 215 +#define IDD_WARNINGDIALOG_OSK 215 -#define STRING_OSK 500 -#define STRING_AUTHORS 501 +#define STRING_OSK 500 +#define STRING_AUTHORS 501 -#define IDC_STATIC -1 +#define IDC_STATIC -1 /* Scan codes by key number */ diff --git a/base/applications/osk/settings.c b/base/applications/osk/settings.c index 33f8893d57..fa21d67d3a 100644 --- a/base/applications/osk/settings.c +++ b/base/applications/osk/settings.c @@ -16,11 +16,12 @@ BOOL LoadDataFromRegistry() { HKEY hKey; LONG lResult; - DWORD dwData; + DWORD dwShowWarningData, dwLayout; DWORD cbData = sizeof(DWORD); - /* Set the structure member to TRUE */ + /* Set the structure members to TRUE */ Globals.bShowWarning = TRUE; + Globals.bIsEnhancedKeyboard = TRUE; /* Open the key, so that we can query it */ lResult = RegOpenKeyExW(HKEY_CURRENT_USER, @@ -40,7 +41,7 @@ BOOL LoadDataFromRegistry() L"ShowWarning", 0, 0, - (BYTE *)&dwData, + (BYTE *)&dwShowWarningData, &cbData); if (lResult != ERROR_SUCCESS) @@ -51,7 +52,25 @@ BOOL LoadDataFromRegistry() } /* Load the data value (it can be either FALSE or TRUE depending on the data itself) */ - Globals.bShowWarning = (dwData != 0); + Globals.bShowWarning = (dwShowWarningData != 0); + + /* Query the key */ + lResult = RegQueryValueExW(hKey, + L"IsEnhancedKeyboard", + 0, + 0, + (BYTE *)&dwLayout, + &cbData); + + if (lResult != ERROR_SUCCESS) + { + /* Bail out and return FALSE if we fail */ + RegCloseKey(hKey); + return FALSE; + } + + /* Load the dialog layout value */ + Globals.bIsEnhancedKeyboard = (dwLayout != 0); /* If we're here then we succeed, close the key and return TRUE */ RegCloseKey(hKey); @@ -62,7 +81,7 @@ BOOL SaveDataToRegistry() { HKEY hKey; LONG lResult; - DWORD dwData; + DWORD dwShowWarningData, dwLayout; /* If no key has been made, create one */ lResult = RegCreateKeyExW(HKEY_CURRENT_USER, @@ -82,14 +101,31 @@ BOOL SaveDataToRegistry() } /* The data value of the subkey will be appended to the warning dialog switch */ - dwData = Globals.bShowWarning; + dwShowWarningData = Globals.bShowWarning; lResult = RegSetValueExW(hKey, L"ShowWarning", 0, REG_DWORD, - (BYTE *)&dwData, - sizeof(dwData)); + (BYTE *)&dwShowWarningData, + sizeof(dwShowWarningData)); + + if (lResult != ERROR_SUCCESS) + { + /* Bail out and return FALSE if we fail */ + RegCloseKey(hKey); + return FALSE; + } + + /* The value will be appended to the layout dialog */ + dwLayout = Globals.bIsEnhancedKeyboard; + + lResult = RegSetValueExW(hKey, + L"IsEnhancedKeyboard", + 0, + REG_DWORD, + (BYTE *)&dwLayout, + sizeof(dwLayout)); if (lResult != ERROR_SUCCESS) {

1 0

[reactos] 01/01: [SETUP][INF] Add font substitute for CJK. (#1346)
by Luo Yufan 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02eeee15f0463e1a534dd… commit 02eeee15f0463e1a534dd2a46840ad81964f190b Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Sun Feb 10 22:46:19 2019 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 15:46:19 2019 +0100 [SETUP][INF] Add font substitute for CJK. (#1346) Fix CJK font problem in Royale theme in ReactOS. The reason for this PR is similar to the previous one (#1127). CORE-15738 --- base/setup/lib/muifonts.h | 10 ++++++++-- media/inf/font.inf | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index b865a40d4b..72292afc46 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -117,7 +117,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, - { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -131,7 +131,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, - { L"Trebuchet MS", L"Open Sans" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"SimSun", L"Droid Sans Fallback" }, { L"NSimSun", L"Droid Sans Fallback" }, { L"SimHei", L"Droid Sans Fallback" }, @@ -173,6 +173,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ming Light", L"Droid Sans Fallback" }, { L"MingLiU", L"Droid Sans Fallback" }, { L"PMingLiU", L"Droid Sans Fallback" }, @@ -180,6 +181,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingBold", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Comic Sans MS", L"Ubuntu" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -214,12 +216,14 @@ MUI_SUBFONT JapaneseFonts[] = { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"MS Mincho", L"Droid Sans Fallback" }, { L"MS PMincho", L"Droid Sans Fallback" }, { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS PGothic", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Comic Sans MS", L"Ubuntu" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -256,6 +260,7 @@ MUI_SUBFONT KoreanFonts[] = { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, + { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Batang", L"Droid Sans Fallback" }, { L"BatangChe", L"Droid Sans Fallback" }, { L"Gungsuh", L"Droid Sans Fallback" }, @@ -264,6 +269,7 @@ MUI_SUBFONT KoreanFonts[] = { L"GulimChe", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Comic Sans MS", L"Ubuntu" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index 62eedd1f49..2327a76866 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -97,6 +97,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Franklin Gothic Medium",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" @@ -110,6 +111,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Trebuchet MS",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Droid Sans Fallback" [Font.Unicode.Reg]

1 0

[reactos] 01/01: [IPHLPAPI] Preserve decoration in exported symbols CORE-8462 CORE-15665
by Mark Jansen 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bdca09a857dcaae920dd… commit 0bdca09a857dcaae920ddf19bdd84d80ff3063c0 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 9 13:23:47 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 10 13:44:08 2019 +0100 [IPHLPAPI] Preserve decoration in exported symbols CORE-8462 CORE-15665 --- dll/win32/iphlpapi/CMakeLists.txt | 2 + dll/win32/iphlpapi/iphlpapi.spec | 53 +++++++++----- dll/win32/iphlpapi/iphlpapi_fakestubs.c | 120 ++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 16 deletions(-) diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt index 2b47c61629..3bdcb1f71e 100644 --- a/dll/win32/iphlpapi/CMakeLists.txt +++ b/dll/win32/iphlpapi/CMakeLists.txt @@ -25,6 +25,8 @@ list(APPEND SOURCE add_library(iphlpapi SHARED ${SOURCE} iphlpapi.rc + iphlpapi_fakestubs.c + iphlpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def) set_module_type(iphlpapi win32dll UNICODE) diff --git a/dll/win32/iphlpapi/iphlpapi.spec b/dll/win32/iphlpapi/iphlpapi.spec index 9c9c25bac6..d9a2066793 100644 --- a/dll/win32/iphlpapi/iphlpapi.spec +++ b/dll/win32/iphlpapi/iphlpapi.spec @@ -136,22 +136,43 @@ @ stdcall SetTcpEntry( ptr ) @ stub SetTcpEntryToStack @ stdcall UnenableRouter( ptr ptr ) -@ stub _PfAddFiltersToInterface@24 -@ stub _PfAddGlobalFilterToInterface@8 -@ stub _PfBindInterfaceToIPAddress@12 -@ stub _PfBindInterfaceToIndex@16 -@ stub _PfCreateInterface@24 -@ stub _PfDeleteInterface@4 -@ stub _PfDeleteLog@0 -@ stub _PfGetInterfaceStatistics@16 -@ stub _PfMakeLog@4 -@ stub _PfRebindFilters@8 -@ stub _PfRemoveFilterHandles@12 -@ stub _PfRemoveFiltersFromInterface@20 -@ stub _PfRemoveGlobalFilterFromInterface@8 -@ stub _PfSetLogBuffer@28 -@ stub _PfTestPacket@20 -@ stub _PfUnBindInterface@4 + +# These are actually stubs, but we need to forward them to preserve the decoration. +@ stdcall -arch=i386 _PfAddFiltersToInterface@24() _PfAddFiltersToInterface@24 +@ stdcall -arch=i386 _PfAddGlobalFilterToInterface@8() _PfAddGlobalFilterToInterface@8 +@ stdcall -arch=i386 _PfBindInterfaceToIPAddress@12() _PfBindInterfaceToIPAddress@12 +@ stdcall -arch=i386 _PfBindInterfaceToIndex@16() _PfBindInterfaceToIndex@16 +@ stdcall -arch=i386 _PfCreateInterface@24() _PfCreateInterface@24 +@ stdcall -arch=i386 _PfDeleteInterface@4() _PfDeleteInterface@4 +@ stdcall -arch=i386 _PfDeleteLog@0() _PfDeleteLog@0 +@ stdcall -arch=i386 _PfGetInterfaceStatistics@16() _PfGetInterfaceStatistics@16 +@ stdcall -arch=i386 _PfMakeLog@4() _PfMakeLog@4 +@ stdcall -arch=i386 _PfRebindFilters@8() _PfRebindFilters@8 +@ stdcall -arch=i386 _PfRemoveFilterHandles@12() _PfRemoveFilterHandles@12 +@ stdcall -arch=i386 _PfRemoveFiltersFromInterface@20() _PfRemoveFiltersFromInterface@20 +@ stdcall -arch=i386 _PfRemoveGlobalFilterFromInterface@8() _PfRemoveGlobalFilterFromInterface@8 +@ stdcall -arch=i386 _PfSetLogBuffer@28() _PfSetLogBuffer@28 +@ stdcall -arch=i386 _PfTestPacket@20() _PfTestPacket@20 +@ stdcall -arch=i386 _PfUnBindInterface@4() _PfUnBindInterface@4 + +# x64 does not use decoration in these names +@ stdcall -arch=x86_64 _PfAddFiltersToInterface@24() +@ stdcall -arch=x86_64 _PfAddGlobalFilterToInterface@8() +@ stdcall -arch=x86_64 _PfBindInterfaceToIPAddress@12() +@ stdcall -arch=x86_64 _PfBindInterfaceToIndex@16() +@ stdcall -arch=x86_64 _PfCreateInterface@24() +@ stdcall -arch=x86_64 _PfDeleteInterface@4() +@ stdcall -arch=x86_64 _PfDeleteLog@0() +@ stdcall -arch=x86_64 _PfGetInterfaceStatistics@16() +@ stdcall -arch=x86_64 _PfMakeLog@4() +@ stdcall -arch=x86_64 _PfRebindFilters@8() +@ stdcall -arch=x86_64 _PfRemoveFilterHandles@12() +@ stdcall -arch=x86_64 _PfRemoveFiltersFromInterface@20() +@ stdcall -arch=x86_64 _PfRemoveGlobalFilterFromInterface@8() +@ stdcall -arch=x86_64 _PfSetLogBuffer@28() +@ stdcall -arch=x86_64 _PfTestPacket@20() +@ stdcall -arch=x86_64 _PfUnBindInterface@4() + @ stub do_echo_rep @ stub do_echo_req @ stub register_icmp diff --git a/dll/win32/iphlpapi/iphlpapi_fakestubs.c b/dll/win32/iphlpapi/iphlpapi_fakestubs.c new file mode 100644 index 0000000000..8304b33ffc --- /dev/null +++ b/dll/win32/iphlpapi/iphlpapi_fakestubs.c @@ -0,0 +1,120 @@ +#include <stubs.h> + +// These are here so we can forward the decorated export functions. +// Without forwarding, we'll lose the decoration +// See: +// https://jira.reactos.org/browse/CORE-8462 +// https://jira.reactos.org/browse/CORE-15665 + +int __stdcall PfAddFiltersToInterface(long a0, long a1, long a2, long a3, long a4, long a5) +{ + DbgPrint("WARNING: calling stub PfAddFiltersToInterface(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4, (long)a5); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfAddGlobalFilterToInterface(long a0, long a1) +{ + DbgPrint("WARNING: calling stub PfAddGlobalFilterToInterface(0x%lx,0x%lx)\n", (long)a0, (long)a1); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfBindInterfaceToIPAddress(long a0, long a1, long a2) +{ + DbgPrint("WARNING: calling stub PfBindInterfaceToIPAddress(0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfBindInterfaceToIndex(long a0, long a1, long a2, long a3) +{ + DbgPrint("WARNING: calling stub PfBindInterfaceToIndex(0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfCreateInterface(long a0, long a1, long a2, long a3, long a4, long a5) +{ + DbgPrint("WARNING: calling stub PfCreateInterface(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4, (long)a5); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfDeleteInterface(long a0) +{ + DbgPrint("WARNING: calling stub PfDeleteInterface(0x%lx)\n", (long)a0); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfDeleteLog() +{ + DbgPrint("WARNING: calling stub PfDeleteLog()\n"); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfGetInterfaceStatistics(long a0, long a1, long a2, long a3) +{ + DbgPrint("WARNING: calling stub PfGetInterfaceStatistics(0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfMakeLog(long a0) +{ + DbgPrint("WARNING: calling stub PfMakeLog(0x%lx)\n", (long)a0); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfRebindFilters(long a0, long a1) +{ + DbgPrint("WARNING: calling stub PfRebindFilters(0x%lx,0x%lx)\n", (long)a0, (long)a1); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfRemoveFilterHandles(long a0, long a1, long a2) +{ + DbgPrint("WARNING: calling stub PfRemoveFilterHandles(0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfRemoveFiltersFromInterface(long a0, long a1, long a2, long a3, long a4) +{ + DbgPrint("WARNING: calling stub PfRemoveFiltersFromInterface(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfRemoveGlobalFilterFromInterface(long a0, long a1) +{ + DbgPrint("WARNING: calling stub PfRemoveGlobalFilterFromInterface(0x%lx,0x%lx)\n", (long)a0, (long)a1); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfSetLogBuffer(long a0, long a1, long a2, long a3, long a4, long a5, long a6) +{ + DbgPrint("WARNING: calling stub PfSetLogBuffer(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4, (long)a5, (long)a6); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfTestPacket(long a0, long a1, long a2, long a3, long a4) +{ + DbgPrint("WARNING: calling stub PfTestPacket(0x%lx,0x%lx,0x%lx,0x%lx,0x%lx)\n", (long)a0, (long)a1, (long)a2, (long)a3, (long)a4); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} + +int __stdcall PfUnBindInterface(long a0) +{ + DbgPrint("WARNING: calling stub PfUnBindInterface(0x%lx)\n", (long)a0); + __wine_spec_unimplemented_stub("iphlpapi.dll", __FUNCTION__); + return 0; +} +

1 0

[reactos] 01/01: [SNDVOL32] Disable the 'Advanced Controls' menu item by default.
by Eric Kohl 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cf443d6d7cee35b4c511… commit 6cf443d6d7cee35b4c511ff4332e4086f04ccb75 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 10 12:53:08 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 10 12:53:08 2019 +0100 [SNDVOL32] Disable the 'Advanced Controls' menu item by default. --- base/applications/sndvol32/sndvol32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 3cc5ba0bcf..fde487706e 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -1055,6 +1055,9 @@ MainWindowProc(HWND hwnd, (LPARAM)szProduct); } } + + /* Disable the 'Advanced Controls' menu item */ + EnableMenuItem(GetMenu(hwnd), IDC_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_GRAYED); } break; }

1 0

[reactos] 01/01: [NTOSKRNL] Also display sections name
by Pierre Schweitzer 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df829f79487a7ec194675… commit df829f79487a7ec1946751585057b7c7ad0bd544 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 10 11:23:57 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 10 11:23:57 2019 +0100 [NTOSKRNL] Also display sections name --- ntoskrnl/ex/handle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index fdd9f2d7e4..f75f0363f7 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -1438,7 +1438,8 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) /* For directory, and win32k objects, display object name */ else if (ObjectHeader->Type == ObpDirectoryObjectType || ObjectHeader->Type == ExWindowStationObjectType || - ObjectHeader->Type == ExDesktopObjectType) + ObjectHeader->Type == ExDesktopObjectType || + ObjectHeader->Type == MmSectionObjectType) { ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); if (ObjectNameInfo != NULL && ObjectNameInfo->Name.Buffer != NULL)

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
21
Older →

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 February 2019