Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 01/01: [MSCTF_WINETEST] Sync with Wine Staging 4.0. CORE-15682

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53028dd240f5722591504… commit 53028dd240f572259150465573433e82785ab181 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Tue Jan 29 13:05:39 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Tue Jan 29 13:05:39 2019 +0100 [MSCTF_WINETEST] Sync with Wine Staging 4.0. CORE-15682 --- boot/bootdata/hivesft.inf | 4 ++++ modules/rostests/winetests/msctf/CMakeLists.txt | 4 ++-- modules/rostests/winetests/msctf/inputprocessor.c | 16 ++++++++++++++-- modules/rostests/winetests/msctf/msctf.manifest | 16 ++++++++++++++++ modules/rostests/winetests/msctf/msctf.rc | 22 ++++++++++++++++++++++ 5 files changed, 58 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index a5c8654b1d..5f78d8f1df 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -138,6 +138,10 @@ HKLM,"SOFTWARE\Clients\StartMenuInternet\IEXPLORE.EXE","",0x00000000,"Internet E HKLM,"SOFTWARE\Clients\StartMenuInternet\IEXPLORE.EXE\DefaultIcon","",0x00000000,"%programfiles%\Internet Explorer\iexplore.exe,-7" HKLM,"SOFTWARE\Clients\StartMenuInternet\IEXPLORE.EXE\shell\open\command","",0x00000000,"%programfiles%\Internet Explorer\iexplore.exe" +; CTF +HKLM,"SOFTWARE\Microsoft\CTF\SystemShared",,0x00000012 +HKLM,"SOFTWARE\Microsoft\CTF\TIP",,0x00000012 + ; DirectX HKLM,"SOFTWARE\Microsoft\DirectX","InstalledVersion",0x00000001, 0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\DirectX","Version",0x00000000,"4.09.00.0904" diff --git a/modules/rostests/winetests/msctf/CMakeLists.txt b/modules/rostests/winetests/msctf/CMakeLists.txt index 7853736422..f55675844c 100644 --- a/modules/rostests/winetests/msctf/CMakeLists.txt +++ b/modules/rostests/winetests/msctf/CMakeLists.txt @@ -1,5 +1,5 @@ -add_executable(msctf_winetest inputprocessor.c testlist.c) +add_executable(msctf_winetest inputprocessor.c testlist.c msctf.rc) set_module_type(msctf_winetest win32cui) -add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32) +add_importlibs(msctf_winetest ole32 user32 advapi32 msvcrt kernel32) add_rostests_file(TARGET msctf_winetest) diff --git a/modules/rostests/winetests/msctf/inputprocessor.c b/modules/rostests/winetests/msctf/inputprocessor.c index 8a02f95117..0d03ce3a8a 100644 --- a/modules/rostests/winetests/msctf/inputprocessor.c +++ b/modules/rostests/winetests/msctf/inputprocessor.c @@ -943,7 +943,18 @@ DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8 static HRESULT initialize(void) { HRESULT hr; + HKEY hkey; + CoInitialize(NULL); + + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\CTF\\TIP", 0, + KEY_READ|KEY_WRITE, &hkey) != ERROR_SUCCESS) + { + skip("Not enough permission to register input processor\n"); + return E_FAIL; + } + RegCloseKey(hkey); + hr = CoCreateInstance (&CLSID_TF_InputProcessorProfiles, NULL, CLSCTX_INPROC_SERVER, &IID_ITfInputProcessorProfiles, (void**)&g_ipp); if (SUCCEEDED(hr)) @@ -981,7 +992,8 @@ static void test_Register(void) ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); - hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, &CLSID_FakeService, szDesc, sizeof(szDesc)/sizeof(WCHAR), szFile, sizeof(szFile)/sizeof(WCHAR), 1); + hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, + &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1); ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); } @@ -2088,7 +2100,7 @@ static void enum_compartments(ITfCompartmentMgr *cmpmgr, REFGUID present, REFGUI { WCHAR str[50]; CHAR strA[50]; - StringFromGUID2(&g,str,sizeof(str)/sizeof(str[0])); + StringFromGUID2(&g,str,ARRAY_SIZE(str)); WideCharToMultiByte(CP_ACP,0,str,-1,strA,sizeof(strA),0,0); trace("found %s\n",strA); if (present && IsEqualGUID(present,&g)) diff --git a/modules/rostests/winetests/msctf/msctf.manifest b/modules/rostests/winetests/msctf/msctf.manifest new file mode 100644 index 0000000000..fc23c29b97 --- /dev/null +++ b/modules/rostests/winetests/msctf/msctf.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="Wine.msctf.Test" + version="1.0.0.0" + processorArchitecture="*" + /> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> diff --git a/modules/rostests/winetests/msctf/msctf.rc b/modules/rostests/winetests/msctf/msctf.rc new file mode 100644 index 0000000000..fcf9f23bab --- /dev/null +++ b/modules/rostests/winetests/msctf/msctf.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winuser.h" + +/* @makedep: msctf.manifest */ +1 RT_MANIFEST msctf.manifest

5 years, 7 months

[reactos] 01/01: [MSCTF] Sync with Wine Staging 4.0. CORE-15682

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f089261cb9e4c6fe1192f… commit f089261cb9e4c6fe1192f22ee8a0f59a6ca44d72 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Tue Jan 29 13:05:02 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Tue Jan 29 13:05:02 2019 +0100 [MSCTF] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/msctf/documentmgr.c | 2 +- media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msctf/documentmgr.c b/dll/win32/msctf/documentmgr.c index cf4c601cff..9fa6b0f0dd 100644 --- a/dll/win32/msctf/documentmgr.c +++ b/dll/win32/msctf/documentmgr.c @@ -188,7 +188,7 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) { int i; - for (i = 0; i < sizeof(This->contextStack)/sizeof(This->contextStack[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->contextStack); i++) if (This->contextStack[i]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink, This->contextStack[i]); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 334d42d01a..fb1db00c8b 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -106,7 +106,7 @@ reactos/dll/win32/msadp32.acm # Synced to WineStaging-4.0 reactos/dll/win32/mscat32 # Synced to WineStaging-3.3 reactos/dll/win32/mscms # Synced to WineStaging-4.0 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-3.9 +reactos/dll/win32/msctf # Synced to WineStaging-4.0 reactos/dll/win32/msftedit # Synced to WineStaging-3.3 reactos/dll/win32/msg711.acm # Synced to WineStaging-3.3 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-3.3

5 years, 7 months

[reactos] 01/01: [MSCMS] Sync with Wine Staging 4.0. CORE-15682

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=513e1441978d52f4526b7… commit 513e1441978d52f4526b7d5427ae5e4dd467a46b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Tue Jan 29 13:04:32 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Tue Jan 29 13:04:32 2019 +0100 [MSCMS] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/mscms/mscms.spec | 44 ++++++++++++++++++++++++++++++++++++++++++++ dll/win32/mscms/profile.c | 27 ++++++++++++++++++++++++--- media/doc/README.WINE | 2 +- 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dll/win32/mscms/mscms.spec b/dll/win32/mscms/mscms.spec index dd404f10a7..f521ac6969 100644 --- a/dll/win32/mscms/mscms.spec +++ b/dll/win32/mscms/mscms.spec @@ -3,6 +3,20 @@ @ stdcall CheckBitmapBits(ptr ptr ptr long long long ptr ptr long) @ stdcall CheckColors(ptr ptr long long ptr) @ stdcall CloseColorProfile(ptr) +@ stub CloseDisplay +@ stub ColorCplGetDefaultProfileScope +@ stub ColorCplGetDefaultRenderingIntentScope +@ stub ColorCplGetProfileProperties +@ stub ColorCplHasSystemWideAssociationListChanged +@ stub ColorCplInitialize +@ stub ColorCplLoadAssociationList +@ stub ColorCplMergeAssociationLists +@ stub ColorCplOverwritePerUserAssociationList +@ stub ColorCplReleaseProfileProperties +@ stub ColorCplResetSystemWideAssociationListChangedWarning +@ stub ColorCplSaveAssociationList +@ stub ColorCplSetUsePerUserProfiles +@ stub ColorCplUninitialize @ stdcall ConvertColorNameToIndex(ptr ptr ptr long) @ stdcall ConvertIndexToColorName(ptr ptr ptr long) @ stdcall CreateColorTransformA(ptr ptr ptr long) @@ -11,9 +25,17 @@ @ stdcall CreateMultiProfileTransform(ptr long ptr long long long) @ stdcall CreateProfileFromLogColorSpaceA(ptr ptr) @ stdcall CreateProfileFromLogColorSpaceW(ptr ptr) +@ stub DccwCreateDisplayProfileAssociationList +@ stub DccwGetDisplayProfileAssociationList +@ stub DccwGetGamutSize +@ stub DccwReleaseDisplayProfileAssociationList +@ stub DccwSetDisplayProfileAssociationList @ stdcall DeleteColorTransform(ptr) +@ stub DeviceRenameEvent @ stdcall DisassociateColorProfileFromDeviceA(str str str) @ stdcall DisassociateColorProfileFromDeviceW(wstr wstr wstr) +#@ stub DllCanUnloadNow +#@ stub DllGetClassObject @ stdcall EnumColorProfilesA(str ptr ptr ptr ptr) @ stdcall EnumColorProfilesW(wstr ptr ptr ptr ptr) @ stdcall GenerateCopyFilePaths(wstr wstr ptr long ptr ptr ptr ptr long) @@ -38,11 +60,14 @@ @ stub InternalGetPS2ColorRenderingDictionary @ stub InternalGetPS2ColorSpaceArray @ stub InternalGetPS2PreviewCRD +@ stub InternalRefreshCalibration @ stub InternalSetDeviceConfig +@ stub InternalWcsAssociateColorProfileWithDevice @ stdcall IsColorProfileTagPresent(ptr long ptr) @ stdcall IsColorProfileValid(ptr ptr) @ stdcall OpenColorProfileA(ptr long long long) @ stdcall OpenColorProfileW(ptr long long long) +@ stub OpenDisplay @ stdcall RegisterCMMA(str long str) @ stdcall RegisterCMMW(wstr long wstr) @ stdcall SelectCMM(long) @@ -59,3 +84,22 @@ @ stdcall UninstallColorProfileW(wstr wstr long) @ stdcall UnregisterCMMA(str long) @ stdcall UnregisterCMMW(wstr long) +@ stub WcsAssociateColorProfileWithDevice +@ stub WcsCheckColors +@ stub WcsCreateIccProfile +@ stub WcsDisassociateColorProfileFromDevice +@ stub WcsEnumColorProfiles +@ stdcall WcsEnumColorProfilesSize(long ptr ptr) +@ stub WcsGetCalibrationManagementState +@ stub WcsGetDefaultColorProfile +@ stub WcsGetDefaultColorProfileSize +@ stub WcsGetDefaultRenderingIntent +@ stdcall WcsGetUsePerUserProfiles(wstr long ptr) +@ stub WcsGpCanInstallOrUninstallProfiles +@ stub WcsOpenColorProfileA +@ stub WcsOpenColorProfileW +@ stub WcsSetCalibrationManagementState +@ stub WcsSetDefaultColorProfile +@ stub WcsSetDefaultRenderingIntent +@ stub WcsSetUsePerUserProfiles +@ stub WcsTranslateColors diff --git a/dll/win32/mscms/profile.c b/dll/win32/mscms/profile.c index f0c40877a1..a0b9d4133d 100644 --- a/dll/win32/mscms/profile.c +++ b/dll/win32/mscms/profile.c @@ -295,7 +295,7 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) if (machine || !size) return FALSE; - GetSystemDirectoryW( colordir, sizeof(colordir) / sizeof(WCHAR) ); + GetSystemDirectoryW( colordir, ARRAY_SIZE( colordir )); lstrcatW( colordir, colorsubdir ); len = lstrlenW( colordir ) * sizeof(WCHAR); @@ -668,9 +668,10 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi static BOOL header_from_file( LPCWSTR file, PPROFILEHEADER header ) { + static const WCHAR slash[] = {'\\',0}; BOOL ret; PROFILE profile; - WCHAR path[MAX_PATH], slash[] = {'\\',0}; + WCHAR path[MAX_PATH]; DWORD size = sizeof(path); HANDLE handle; @@ -953,8 +954,8 @@ exit: BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, PDWORD size, PDWORD number ) { + static const WCHAR spec[] = {'\\','*','i','c','m',0}; BOOL match, ret = FALSE; - WCHAR spec[] = {'\\','*','i','c','m',0}; WCHAR colordir[MAX_PATH], glob[MAX_PATH], **profiles = NULL; DWORD i, len = sizeof(colordir), count = 0, totalsize = 0; PROFILEHEADER header; @@ -1525,3 +1526,23 @@ BOOL WINAPI CloseColorProfile( HPROFILE profile ) #endif /* HAVE_LCMS2 */ return ret; } + +/****************************************************************************** + * WcsGetUsePerUserProfiles [MSCMS.@] + */ +BOOL WINAPI WcsGetUsePerUserProfiles( const WCHAR* name, DWORD class, BOOL* use_per_user_profile ) +{ + FIXME( "%s %s %p\n", debugstr_w(name), dbgstr_tag(class), use_per_user_profile ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/****************************************************************************** + * WcsEnumColorProfilesSize [MSCMS.@] + */ +BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTYPEW *record, DWORD *size ) +{ + FIXME( "%d %p %p\n", scope, record, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 8910a723dc..334d42d01a 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -104,7 +104,7 @@ reactos/dll/win32/msacm32 # Synced to WineStaging-4.0 reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3 reactos/dll/win32/msadp32.acm # Synced to WineStaging-4.0 reactos/dll/win32/mscat32 # Synced to WineStaging-3.3 -reactos/dll/win32/mscms # Synced to WineStaging-3.3 +reactos/dll/win32/mscms # Synced to WineStaging-4.0 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-3.9 reactos/dll/win32/msftedit # Synced to WineStaging-3.3

5 years, 7 months

[reactos] 01/01: [PSDK] Update icm.h. CORE-15682

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e78367014030817306d74… commit e78367014030817306d742035721a54624735937 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Tue Jan 29 13:03:59 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Tue Jan 29 13:03:59 2019 +0100 [PSDK] Update icm.h. CORE-15682 --- sdk/include/psdk/icm.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk/include/psdk/icm.h b/sdk/include/psdk/icm.h index 34b0b63d80..fbbdede3ed 100644 --- a/sdk/include/psdk/icm.h +++ b/sdk/include/psdk/icm.h @@ -176,6 +176,12 @@ typedef enum BM_16b_GRAY, } BMFORMAT, *PBMFORMAT, *LPBMFORMAT; +typedef enum +{ + WCS_PROFILE_MANAGEMENT_SCOPE_SYSTEM_WIDE, + WCS_PROFILE_MANAGEMENT_SCOPE_CURRENT_USER +} WCS_PROFILE_MANAGEMENT_SCOPE; + typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); typedef PBMCALLBACKFN LPPBMCALLBACKFN; @@ -403,6 +409,8 @@ BOOL WINAPI UninstallColorProfileW(PCWSTR,PCWSTR,BOOL); BOOL WINAPI UnregisterCMMA(PCSTR,DWORD); BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) +BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); +BOOL WINAPI WcsGetUsePerUserProfiles(const WCHAR*,DWORD,BOOL*); #define PROFILE_FILENAME 1 #define PROFILE_MEMBUFFER 2

5 years, 7 months

[reactos] 01/01: [WIN32SS][NTGDI] Optimize UnsafeGetBitmapBits/UnsafeSetBitmapBits

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cd2f5438c8fd56c77174… commit 1cd2f5438c8fd56c7717494bf1ec48e9178682c3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 29 12:04:46 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 29 12:04:46 2019 +0900 [WIN32SS][NTGDI] Optimize UnsafeGetBitmapBits/UnsafeSetBitmapBits --- win32ss/gdi/ntgdi/bitmaps.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/win32ss/gdi/ntgdi/bitmaps.c b/win32ss/gdi/ntgdi/bitmaps.c index c98259967e..0f556f9b91 100644 --- a/win32ss/gdi/ntgdi/bitmaps.c +++ b/win32ss/gdi/ntgdi/bitmaps.c @@ -52,7 +52,7 @@ UnsafeSetBitmapBits( { PUCHAR pjDst; const UCHAR *pjSrc; - LONG lDeltaDst, lDeltaSrc; + LONG lDeltaDst, lDeltaSrc, lDeltaDstAbs; ULONG Y, iSrc, iDst, cbSrc, cbDst, nWidth, nHeight, cBitsPixel; NT_ASSERT(psurf->flags & API_BITMAP); @@ -65,17 +65,18 @@ UnsafeSetBitmapBits( pjDst = psurf->SurfObj.pvScan0; pjSrc = pvBits; lDeltaDst = psurf->SurfObj.lDelta; + lDeltaDstAbs = labs(lDeltaDst); lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); - NT_ASSERT(lDeltaSrc <= labs(lDeltaDst)); + NT_ASSERT(lDeltaSrc <= lDeltaDstAbs); - cbDst = labs(lDeltaDst) * nHeight; + cbDst = lDeltaDstAbs * nHeight; cbSrc = lDeltaSrc * nHeight; cjBits = min(cjBits, cbSrc); iSrc = iDst = 0; for (Y = 0; Y < nHeight; Y++) { - if (iSrc + lDeltaSrc > cjBits || iDst + labs(lDeltaDst) > cbDst) + if (iSrc + lDeltaSrc > cjBits || iDst + lDeltaDstAbs > cbDst) { LONG lDelta = min(cjBits - iSrc, cbDst - iDst); NT_ASSERT(lDelta >= 0); @@ -89,7 +90,7 @@ UnsafeSetBitmapBits( pjSrc += lDeltaSrc; pjDst += lDeltaDst; iSrc += lDeltaSrc; - iDst += labs(lDeltaDst); + iDst += lDeltaDstAbs; } return iSrc; @@ -504,7 +505,7 @@ UnsafeGetBitmapBits( OUT PBYTE pvBits) { PUCHAR pjDst, pjSrc; - LONG lDeltaDst, lDeltaSrc; + LONG lDeltaDst, lDeltaSrc, lDeltaSrcAbs; ULONG Y, iSrc, iDst, cbSrc, cbDst, nWidth, nHeight, cBitsPixel; nWidth = psurf->SurfObj.sizlBitmap.cx; @@ -515,17 +516,18 @@ UnsafeGetBitmapBits( pjSrc = psurf->SurfObj.pvScan0; pjDst = pvBits; lDeltaSrc = psurf->SurfObj.lDelta; + lDeltaSrcAbs = labs(lDeltaSrc); lDeltaDst = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); - NT_ASSERT(labs(lDeltaSrc) >= lDeltaDst); + NT_ASSERT(lDeltaSrcAbs >= lDeltaDst); - cbSrc = nHeight * labs(lDeltaSrc); + cbSrc = nHeight * lDeltaSrcAbs; cbDst = nHeight * lDeltaDst; Bytes = min(Bytes, cbDst); iSrc = iDst = 0; for (Y = 0; Y < nHeight; Y++) { - if (iSrc + labs(lDeltaSrc) > cbSrc || iDst + lDeltaDst > Bytes) + if (iSrc + lDeltaSrcAbs > cbSrc || iDst + lDeltaDst > Bytes) { LONG lDelta = min(cbSrc - iSrc, Bytes - iDst); NT_ASSERT(lDelta >= 0); @@ -538,7 +540,7 @@ UnsafeGetBitmapBits( RtlCopyMemory(pjDst, pjSrc, lDeltaDst); pjSrc += lDeltaSrc; pjDst += lDeltaDst; - iSrc += labs(lDeltaSrc); + iSrc += lDeltaSrcAbs; iDst += lDeltaDst; }

5 years, 7 months

[reactos] 01/01: [NTOS:MM] Some fixes for NtCreatePagingFile().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06d4fce5ee55377259eeb… commit 06d4fce5ee55377259eeb550d576b56bb601c08c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 27 22:49:50 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 28 22:22:56 2019 +0100 [NTOS:MM] Some fixes for NtCreatePagingFile(). - Correctly probe the FileName user pointer before capturing its contents. - A paging file name with zero length is invalid too. - Remember (TODO!) in the code that the lower bounds of the Safe*Size values need to be checked too! --- ntoskrnl/mm/pagefile.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index d05580bfbd..54af15974a 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -368,11 +368,11 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, PWSTR Buffer; DEVICE_TYPE DeviceType; - DPRINT("NtCreatePagingFile(FileName %wZ, MinimumSize %I64d)\n", - FileName, MinimumSize->QuadPart); - PAGED_CODE(); + DPRINT("NtCreatePagingFile(FileName: '%wZ', MinimumSize: %I64d, MaximumSize: %I64d)\n", + FileName, MinimumSize->QuadPart, MaximumSize->QuadPart); + if (MmNumberOfPagingFiles >= MAX_PAGING_FILES) { return STATUS_TOO_MANY_PAGING_FILES; @@ -391,10 +391,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { SafeMinimumSize = ProbeForReadLargeInteger(MinimumSize); SafeMaximumSize = ProbeForReadLargeInteger(MaximumSize); - - PageFileName.Length = FileName->Length; - PageFileName.MaximumLength = FileName->MaximumLength; - PageFileName.Buffer = FileName->Buffer; + PageFileName = ProbeForReadUnicodeString(FileName); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -407,14 +404,14 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { SafeMinimumSize = *MinimumSize; SafeMaximumSize = *MaximumSize; - - PageFileName.Length = FileName->Length; - PageFileName.MaximumLength = FileName->MaximumLength; - PageFileName.Buffer = FileName->Buffer; + PageFileName = *FileName; } - /* Pagefiles can't be larger than 4GB and ofcourse the minimum should be - smaller than the maximum */ + /* + * Pagefiles can't be larger than 4GB and of course + * the minimum should be smaller than the maximum. + */ + // TODO: Actually validate the lower bound of these sizes! if (0 != SafeMinimumSize.u.HighPart) { return STATUS_INVALID_PARAMETER_2; @@ -428,31 +425,28 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return STATUS_INVALID_PARAMETER_MIX; } - /* Validate name length */ - if (PageFileName.Length > 128 * sizeof(WCHAR)) + /* Validate the name length */ + if ((PageFileName.Length == 0) || + (PageFileName.Length > 128 * sizeof(WCHAR))) { return STATUS_OBJECT_NAME_INVALID; } - /* We won't care about any potential UNICODE_NULL */ + /* We don't care about any potential UNICODE_NULL */ PageFileName.MaximumLength = PageFileName.Length; - /* Allocate a buffer to keep name copy */ + /* Allocate a buffer to keep the name copy */ Buffer = ExAllocatePoolWithTag(PagedPool, PageFileName.Length, TAG_MM); if (Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; } - /* Copy name */ + /* Copy the name */ if (PreviousMode != KernelMode) { _SEH2_TRY { - if (PageFileName.Length != 0) - { - ProbeForRead(PageFileName.Buffer, PageFileName.Length, sizeof(WCHAR)); - } - + ProbeForRead(PageFileName.Buffer, PageFileName.Length, sizeof(WCHAR)); RtlCopyMemory(Buffer, PageFileName.Buffer, PageFileName.Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -469,7 +463,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, RtlCopyMemory(Buffer, PageFileName.Buffer, PageFileName.Length); } - /* Erase caller's buffer with ours */ + /* Replace caller's buffer with ours */ PageFileName.Buffer = Buffer; /* Create the security descriptor for the page file */

5 years, 7 months

[reactos] 01/01: [SNDVOL32] Play the default sound when the volume or balance trackbar of the master line has been changed by the user.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dda77704ddfc6632b30de… commit dda77704ddfc6632b30dea8aad72a6b20498aa73 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Jan 28 22:04:18 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Jan 28 22:05:23 2019 +0100 [SNDVOL32] Play the default sound when the volume or balance trackbar of the master line has been changed by the user. --- base/applications/sndvol32/sndvol32.c | 80 ++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 19 deletions(-) diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 5484a8357f..3cc5ba0bcf 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -924,33 +924,75 @@ MainWindowProc(HWND hwnd, } case WM_VSCROLL: - { - if (LOWORD(wParam) == TB_THUMBTRACK) + switch (LOWORD(wParam)) { - /* get dialog item ctrl */ - CtrlID = GetDlgCtrlID((HWND)lParam); + case TB_THUMBTRACK: + /* get dialog item ctrl */ + CtrlID = GetDlgCtrlID((HWND)lParam); - /* get line index */ - LineOffset = CtrlID / IDC_LINE_SLIDER_VERT; + /* get line index */ + LineOffset = CtrlID / IDC_LINE_SLIDER_VERT; - /* compute window id of line name static control */ - CtrlID = LineOffset * IDC_LINE_NAME; + /* 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 = HIWORD(wParam); - Context.bVertical = TRUE; - Context.bSwitch = FALSE; + /* get line name */ + if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0) + { + /* setup context */ + Context.SliderPos = HIWORD(wParam); + Context.bVertical = TRUE; + Context.bSwitch = FALSE; - /* set volume */ - SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context); - } + /* set volume */ + SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context); + } + break; + + case TB_ENDTRACK: + MixerWindow = GetWindowData(hwnd, + MIXER_WINDOW); + + /* get dialog item ctrl */ + CtrlID = GetDlgCtrlID((HWND)lParam); + + /* get line index */ + LineOffset = CtrlID / IDC_LINE_SLIDER_VERT; + + if (LineOffset == 1 && MixerWindow->Mixer->MixerId == 0) + PlaySound((LPCTSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, SND_ASYNC | SND_ALIAS_ID); + break; + + default: + break; } + break; + + case WM_HSCROLL: + switch (LOWORD(wParam)) + { + case TB_THUMBTRACK: + /* FIXME */ + break; + + case TB_ENDTRACK: + MixerWindow = GetWindowData(hwnd, + MIXER_WINDOW); + + /* get dialog item ctrl */ + CtrlID = GetDlgCtrlID((HWND)lParam); + /* get line index */ + LineOffset = CtrlID / IDC_LINE_SLIDER_HORZ; + + if (LineOffset == 1 && MixerWindow->Mixer->MixerId == 0) + PlaySound((LPCTSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, SND_ASYNC | SND_ALIAS_ID); + break; + + default: + break; + } break; - } case WM_CREATE:

5 years, 7 months

[reactos] 01/01: [FREETYPE] Handle allocation failures in our stack-saving hacks. CORE-15642

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64d48843d78b0b9afbba6… commit 64d48843d78b0b9afbba64b45dc7f7dc56208a16 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jan 28 13:47:58 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Jan 28 14:31:49 2019 +0100 [FREETYPE] Handle allocation failures in our stack-saving hacks. CORE-15642 Running out of pool is likely at least during kmtest:ExPools. There is a chance of crashing when dereferencing these null pointers -- but worse, there's also a chance of overwriting the IVT or BDA if a VDM BIOS call is in progress, which can lead to crashes in non-obvious places later. --- sdk/lib/3rdparty/freetype/src/autofit/afcjk.c | 5 +++++ sdk/lib/3rdparty/freetype/src/autofit/aflatin.c | 5 +++++ sdk/lib/3rdparty/freetype/src/autofit/afmodule.c | 6 ++++++ sdk/lib/3rdparty/freetype/src/cid/cidgload.c | 3 +++ sdk/lib/3rdparty/freetype/src/psaux/psintrp.c | 9 ++++++++- sdk/lib/3rdparty/freetype/src/raster/ftraster.c | 6 ++++++ sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c | 4 ++++ sdk/lib/3rdparty/freetype/src/type1/t1gload.c | 12 ++++++++++++ 8 files changed, 49 insertions(+), 1 deletion(-) diff --git a/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c b/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c index dc77ed49e0..40b14ac88c 100644 --- a/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c +++ b/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c @@ -73,6 +73,7 @@ /* scan the array of segments in each direction */ #ifdef __REACTOS__ AF_GlyphHintsRec *hints = malloc(sizeof(AF_GlyphHintsRec)); + if (!hints) return; #else AF_GlyphHintsRec hints[1]; #endif @@ -95,6 +96,9 @@ int dim; #ifdef __REACTOS__ AF_CJKMetricsRec *dummy = malloc(sizeof(AF_CJKMetricsRec)); + if (!dummy) + goto Exit; + { #else AF_CJKMetricsRec dummy[1]; #endif @@ -274,6 +278,7 @@ } #ifdef __REACTOS__ free(dummy); + } #endif } diff --git a/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c b/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c index 7690e1e803..0fa6233b94 100644 --- a/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c +++ b/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c @@ -64,6 +64,7 @@ /* scan the array of segments in each direction */ #ifdef __REACTOS__ AF_GlyphHintsRec *hints = malloc(sizeof(AF_GlyphHintsRec)); + if (!hints) return; #else AF_GlyphHintsRec hints[1]; #endif @@ -86,6 +87,9 @@ int dim; #ifdef __REACTOS__ AF_LatinMetricsRec *dummy = malloc(sizeof(AF_LatinMetricsRec)); + if (!dummy) + goto Exit; + { #else AF_LatinMetricsRec dummy[1]; #endif @@ -267,6 +271,7 @@ } #ifdef __REACTOS__ free(dummy); + } #endif } diff --git a/sdk/lib/3rdparty/freetype/src/autofit/afmodule.c b/sdk/lib/3rdparty/freetype/src/autofit/afmodule.c index 4b994c3dc5..1360284ac5 100644 --- a/sdk/lib/3rdparty/freetype/src/autofit/afmodule.c +++ b/sdk/lib/3rdparty/freetype/src/autofit/afmodule.c @@ -552,6 +552,11 @@ #ifdef __REACTOS__ AF_GlyphHintsRec *hints = malloc(sizeof(AF_GlyphHintsRec)); AF_LoaderRec *loader = malloc(sizeof(AF_LoaderRec)); + if (!hints || !loader) + { + error = FT_Err_Out_Of_Memory; + goto Exit; + } #else AF_GlyphHintsRec hints[1]; AF_LoaderRec loader[1]; @@ -570,6 +575,7 @@ af_glyph_hints_done( hints ); #ifdef __REACTOS__ +Exit: free(hints); free(loader); #endif diff --git a/sdk/lib/3rdparty/freetype/src/cid/cidgload.c b/sdk/lib/3rdparty/freetype/src/cid/cidgload.c index dbc116c585..4ae2e051e3 100644 --- a/sdk/lib/3rdparty/freetype/src/cid/cidgload.c +++ b/sdk/lib/3rdparty/freetype/src/cid/cidgload.c @@ -343,8 +343,10 @@ FT_Error error; #ifdef __REACTOS__ T1_DecoderRec *decoder = malloc(sizeof(T1_DecoderRec)); + if (!decoder) return FT_Err_Out_Of_Memory; /* Ugly but it allows us to reduce the diff */ #define decoder (*decoder) + { #else T1_DecoderRec decoder; #endif @@ -533,6 +535,7 @@ #ifdef __REACTOS__ free(&decoder); #undef decoder + } #endif return error; } diff --git a/sdk/lib/3rdparty/freetype/src/psaux/psintrp.c b/sdk/lib/3rdparty/freetype/src/psaux/psintrp.c index 1ac5b9392b..bc86d00b27 100644 --- a/sdk/lib/3rdparty/freetype/src/psaux/psintrp.c +++ b/sdk/lib/3rdparty/freetype/src/psaux/psintrp.c @@ -527,6 +527,7 @@ CF2_HintMaskRec hintMask; #ifdef __REACTOS__ CF2_GlyphPathRec *glyphPath = malloc(sizeof(CF2_GlyphPathRec)); + if (!glyphPath) return; /* Ugly but it allows us to reduce the diff */ #define glyphPath (*glyphPath) #else @@ -2613,12 +2614,18 @@ */ #ifdef __REACTOS__ CF2_HintMapRec *counterHintMap = malloc(sizeof(CF2_HintMapRec)); + CF2_HintMaskRec counterMask; + if (!counterHintMap) + { + lastError = FT_Err_Out_Of_Memory; + goto exit; + } /* Ugly but it allows us to reduce the diff */ #define counterHintMap (*counterHintMap) #else CF2_HintMapRec counterHintMap; -#endif CF2_HintMaskRec counterMask; +#endif cf2_hintmap_init( &counterHintMap, diff --git a/sdk/lib/3rdparty/freetype/src/raster/ftraster.c b/sdk/lib/3rdparty/freetype/src/raster/ftraster.c index 7b76cdbed5..40d5d9d5a7 100644 --- a/sdk/lib/3rdparty/freetype/src/raster/ftraster.c +++ b/sdk/lib/3rdparty/freetype/src/raster/ftraster.c @@ -3208,6 +3208,12 @@ #ifdef __REACTOS__ worker = malloc(sizeof(black_TWorker)); buffer = malloc(FT_MAX(FT_RENDER_POOL_SIZE, 2048)); + if (!worker || !buffer) + { + free(worker); + free(buffer); + return FT_THROW( Out_Of_Memory ); + } #endif ras.outline = *outline; diff --git a/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c b/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c index e5fb3c7d52..a5ec55bf5a 100644 --- a/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c +++ b/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c @@ -1757,6 +1757,10 @@ typedef ptrdiff_t FT_PtrDist; #ifdef __REACTOS__ buffer = malloc(FT_MAX(FT_RENDER_POOL_SIZE, 2048)); + if (!buffer) + { + return 1; + } #endif /* set up vertical bands */ diff --git a/sdk/lib/3rdparty/freetype/src/type1/t1gload.c b/sdk/lib/3rdparty/freetype/src/type1/t1gload.c index ee2656b476..3e78b9e43a 100644 --- a/sdk/lib/3rdparty/freetype/src/type1/t1gload.c +++ b/sdk/lib/3rdparty/freetype/src/type1/t1gload.c @@ -215,6 +215,9 @@ FT_Error error; #ifdef __REACTOS__ T1_DecoderRec *decoder = malloc(sizeof(T1_DecoderRec)); + if (!decoder) + return FT_THROW( Out_Of_Memory ); + { /* Ugly but it allows us to reduce the diff */ #define decoder (*decoder) #else @@ -279,6 +282,7 @@ #ifdef __REACTOS__ free(&decoder); #undef decoder + } #endif return FT_Err_Ok; } @@ -294,8 +298,11 @@ T1_Face face = (T1_Face)t1face; #ifdef __REACTOS__ T1_DecoderRec *decoder = malloc(sizeof(T1_DecoderRec)); + if (!decoder) + return FT_THROW( Out_Of_Memory ); /* Ugly but it allows us to reduce the diff */ #define decoder (*decoder) + { #else T1_DecoderRec decoder; #endif @@ -358,6 +365,7 @@ #ifdef __REACTOS__ free(&decoder); #undef decoder + } #endif return FT_Err_Ok; } @@ -373,8 +381,11 @@ FT_Error error; #ifdef __REACTOS__ T1_DecoderRec *decoder = malloc(sizeof(T1_DecoderRec)); + if (!decoder) + return FT_THROW( Out_Of_Memory ); /* Ugly but it allows us to reduce the diff */ #define decoder (*decoder) + { #else T1_DecoderRec decoder; #endif @@ -629,6 +640,7 @@ #ifdef __REACTOS__ free(&decoder); #undef decoder + } #endif return error; }

5 years, 7 months

[reactos] 01/01: [SNDVOL32] Do the volume trackbar calculation like it is done in mmsys.cpl.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2d8e588bb896635517dc… commit e2d8e588bb896635517dcfe0133cc4a482afea7f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Jan 28 00:59:33 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Jan 28 00:59:33 2019 +0100 [SNDVOL32] Do the volume trackbar calculation like it is done in mmsys.cpl. --- base/applications/sndvol32/dialog.c | 19 +++++++++---------- base/applications/sndvol32/mixer.c | 2 +- base/applications/sndvol32/sndvol32.c | 14 ++++++-------- base/applications/sndvol32/sndvol32.h | 3 ++- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index ccaaf318f1..b3d52d57ed 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -175,7 +175,7 @@ AddDialogControl( /* Vertical trackbar: Volume */ /* set up range */ - SendMessage(hwnd, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, VOLUME_STEPS)); + SendMessage(hwnd, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX)); /* set up page size */ SendMessage(hwnd, TBM_SETPAGESIZE, 0, (LPARAM)VOLUME_PAGE_SIZE); @@ -184,10 +184,10 @@ AddDialogControl( SendMessage(hwnd, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)0); /* Calculate and set ticks */ - nSteps = (VOLUME_STEPS / (VOLUME_TICKS + 1)); - if (VOLUME_STEPS % (VOLUME_TICKS + 1) != 0) + nSteps = (VOLUME_MAX / (VOLUME_TICKS + 1)); + if (VOLUME_MAX % (VOLUME_TICKS + 1) != 0) nSteps++; - for (i = nSteps; i < VOLUME_STEPS; i += nSteps) + for (i = nSteps; i < VOLUME_MAX; i += nSteps) SendMessage(hwnd, TBM_SETTIC, 0, (LPARAM)i); } else @@ -449,7 +449,7 @@ EnumConnectionsCallback( if (SndMixerQueryControls(Mixer, &ControlCount, Line, &Control) != FALSE) { /* now go through all controls and update their states */ - for(Index = 0; Index < Line->cControls; Index++) + for (Index = 0; Index < Line->cControls; Index++) { if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_SWITCH) { @@ -483,11 +483,10 @@ EnumConnectionsCallback( if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&Details) != -1) { /* update dialog control */ - DWORD Position; - DWORD Step = 0x10000 / VOLUME_STEPS; + DWORD Position, Step; - /* FIXME: give me granularity */ - Position = VOLUME_STEPS - (Details.dwValue / Step); + Step = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); + Position = (Details.dwValue - Control[Index].Bounds.dwMinimum) / Step; /* FIXME support left - right slider */ wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_VERT; @@ -502,7 +501,7 @@ EnumConnectionsCallback( if (OldPosition != Position) { /* update control state */ - SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, Position + Index); + SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, VOLUME_MAX - Position); } } } diff --git a/base/applications/sndvol32/mixer.c b/base/applications/sndvol32/mixer.c index 1f1be9451e..768aa658f5 100644 --- a/base/applications/sndvol32/mixer.c +++ b/base/applications/sndvol32/mixer.c @@ -484,7 +484,7 @@ SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDet MixerDetails.cbDetails = cbDetails; MixerDetails.paDetails = paDetails; - if (mixerSetControlDetails((HMIXEROBJ)Mixer->hmx, &MixerDetails, MIXER_GETCONTROLDETAILSF_VALUE | MIXER_OBJECTF_HMIXER) == MMSYSERR_NOERROR) + if (mixerSetControlDetails((HMIXEROBJ)Mixer->hmx, &MixerDetails, MIXER_SETCONTROLDETAILSF_VALUE | MIXER_OBJECTF_HMIXER) == MMSYSERR_NOERROR) { return 1; } diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 4e3523ff7f..5484a8357f 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -657,11 +657,10 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx) { if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER) { - /* FIXME: give me granularity */ - DWORD Step = 0x10000 / VOLUME_STEPS; + DWORD Step = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); /* set up details */ - uDetails.dwValue = 0x10000 - Step * Context->SliderPos; + uDetails.dwValue = ((VOLUME_MAX - Context->SliderPos) * Step) + Control[Index].Bounds.dwMinimum; /* set volume */ SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&uDetails); @@ -745,14 +744,13 @@ MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVO if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&Details) != -1) { /* update dialog control */ - DWORD Position; - DWORD Step = 0x10000 / VOLUME_STEPS; + DWORD Position, Step; - /* FIXME: give me granularity */ - Position = VOLUME_STEPS - (Details.dwValue / Step); + Step = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); + Position = (Details.dwValue - Control[Index].Bounds.dwMinimum) / Step; /* update volume control slider */ - UpdateDialogLineSliderControl(&Preferences, Line, Control[Index].dwControlID, IDC_LINE_SLIDER_VERT, Position); + UpdateDialogLineSliderControl(&Preferences, Line, Control[Index].dwControlID, IDC_LINE_SLIDER_VERT, VOLUME_MAX - Position); } } break; diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index cd0192de78..a68cb37778 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -14,7 +14,8 @@ #include "resources.h" -#define VOLUME_STEPS 500 +#define VOLUME_MIN 0 +#define VOLUME_MAX 500 #define VOLUME_TICKS 5 #define VOLUME_PAGE_SIZE 100 #define BALANCE_STEPS 64

5 years, 7 months

[reactos] 01/01: [OSK] Initial implementation of a menu (#1301)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfa5ff553ba88d2ac1fb4… commit dfa5ff553ba88d2ac1fb4eeaedea2a67af6556d3 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Jan 27 17:35:26 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 27 17:35:26 2019 +0100 [OSK] Initial implementation of a menu (#1301) --- base/applications/osk/lang/ar-DZ.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/cs-CZ.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/de-DE.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/en-GB.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/en-US.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/es-ES.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/et-EE.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/fr-CA.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/fr-FR.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/he-IL.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/it-IT.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/pl-PL.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/ro-RO.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/ru-RU.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/tr-TR.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/zh-CN.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/lang/zh-TW.rc | 46 +++++++++++++++++++++++++++++++ base/applications/osk/main.c | 54 ++++++++++++++++++++++++++++++++++--- base/applications/osk/main.h | 1 + base/applications/osk/osk_res.h | 19 +++++++++++++ 20 files changed, 852 insertions(+), 4 deletions(-) diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc index c11d82844b..4feabe086a 100644 --- a/base/applications/osk/lang/ar-DZ.rc +++ b/base/applications/osk/lang/ar-DZ.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 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 @@ -126,6 +127,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -138,4 +178,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc index 316efe7de7..21b68ec8af 100644 --- a/base/applications/osk/lang/cs-CZ.rc +++ b/base/applications/osk/lang/cs-CZ.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Klávesnice na obrazovce" 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 @@ -126,6 +127,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -138,4 +178,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc index f3faa31e19..3fa0d40a1c 100644 --- a/base/applications/osk/lang/de-DE.rc +++ b/base/applications/osk/lang/de-DE.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Bildschirmtastatur" 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 @@ -127,6 +128,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -139,4 +179,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc index 01d02c599b..fa849f3ff3 100644 --- a/base/applications/osk/lang/en-GB.rc +++ b/base/applications/osk/lang/en-GB.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 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 @@ -127,6 +128,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -139,4 +179,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index c9dacb2b10..644e32cdf0 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 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 @@ -126,6 +127,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -138,4 +178,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc index f7f138e47a..41d8a188c2 100644 --- a/base/applications/osk/lang/es-ES.rc +++ b/base/applications/osk/lang/es-ES.rc @@ -12,6 +12,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Teclado en pantalla" 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 @@ -128,6 +129,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -140,4 +180,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc index 4284c6b603..139ecd9b6b 100644 --- a/base/applications/osk/lang/et-EE.rc +++ b/base/applications/osk/lang/et-EE.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Ekraaniklaviatuur" 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 @@ -126,6 +127,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -138,4 +178,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc index 008420fb70..429156c4f5 100644 --- a/base/applications/osk/lang/fr-CA.rc +++ b/base/applications/osk/lang/fr-CA.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Clavier visuel" 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 @@ -127,6 +128,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -139,4 +179,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc index 0b3dee5d7f..5057fa360c 100644 --- a/base/applications/osk/lang/fr-FR.rc +++ b/base/applications/osk/lang/fr-FR.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Clavier visuel" 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 @@ -127,6 +128,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "Clavier visuel" @@ -139,4 +179,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc index 3b1d67eead..c91405bdea 100644 --- a/base/applications/osk/lang/he-IL.rc +++ b/base/applications/osk/lang/he-IL.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "לוח מקשים על התצוגה" 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 @@ -126,6 +127,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -138,4 +178,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index 96c733487f..6e2c7921b2 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Tastiera a schermo" 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 @@ -127,6 +128,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDR_OSK_MENU MENU DISCARDABLE + BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "Tastiera a schermo" @@ -139,4 +179,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc index c3b57072d0..89244f0ac7 100644 --- a/base/applications/osk/lang/pl-PL.rc +++ b/base/applications/osk/lang/pl-PL.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Klawiatura Ekranowa" 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 @@ -126,6 +127,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -138,4 +178,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 9b3d080aaa..379e54ee7e 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -12,6 +12,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Tastatură virtuală" 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 @@ -127,6 +128,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "Tastatură virtuală" @@ -139,4 +179,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index bf99916de2..d4cdd6fef6 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Экранная клавиатура" 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 @@ -126,6 +127,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -138,4 +178,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc index 4c3ea733bd..c12958f67c 100644 --- a/base/applications/osk/lang/tr-TR.rc +++ b/base/applications/osk/lang/tr-TR.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Ekran Klavyesi" 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 @@ -126,6 +127,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -138,4 +178,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc index 48f9e42892..f8deff18d4 100644 --- a/base/applications/osk/lang/zh-CN.rc +++ b/base/applications/osk/lang/zh-CN.rc @@ -14,6 +14,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "屏幕键盘" FONT 9, "宋体" +MENU IDR_OSK_MENU STYLE WS_SYSMENU | WS_MINIMIZEBOX EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN @@ -129,6 +130,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "屏幕键盘" @@ -141,4 +181,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc index d200a53f3a..97e83a7f79 100644 --- a/base/applications/osk/lang/zh-TW.rc +++ b/base/applications/osk/lang/zh-TW.rc @@ -13,6 +13,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "螢幕鍵盤" FONT 9, "新細明體" +MENU IDR_OSK_MENU STYLE WS_SYSMENU | WS_MINIMIZEBOX EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN @@ -128,6 +129,45 @@ BEGIN CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END +IDR_OSK_MENU MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "&Exit", IDM_EXIT + END + + POPUP "Keyboard" + BEGIN + MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED + MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED + MENUITEM SEPARATOR + MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM SEPARATOR + MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 keys", IDM_102_KEYS, GRAYED + MENUITEM "106 keys", IDM_106_KEYS, GRAYED + END + + POPUP "Settings" + BEGIN + MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Font...", IDM_FONT, GRAYED + END + + POPUP "Help" + BEGIN + MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + END +END + IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "On-Screen Keyboard" @@ -140,4 +180,10 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END +STRINGTABLE +BEGIN + STRING_OSK "On-Screen Keyboard" + STRING_AUTHORS "Copyright Denis Robert" +END + /* EOF */ diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index 8e623661c0..ffb01a25d4 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -99,6 +99,32 @@ INT_PTR CALLBACK OSK_WarningProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lPar return FALSE; } +/*********************************************************************** + * + * OSK_About + * + * Initializes the "About" dialog box + */ +VOID OSK_About(VOID) +{ + WCHAR szTitle[MAX_BUFF]; + WCHAR szAuthors[MAX_BUFF]; + HICON OSKIcon; + + /* Load the icon */ + OSKIcon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + + /* Load the strings into the "About" dialog */ + LoadStringW(Globals.hInstance, STRING_OSK, szTitle, countof(szTitle)); + LoadStringW(Globals.hInstance, STRING_AUTHORS, szAuthors, countof(szAuthors)); + + /* Finally, execute the "About" dialog by using the Shell routine */ + ShellAboutW(Globals.hMainWnd, szTitle, szAuthors, OSKIcon); + + /* Once done, destroy the icon */ + DestroyIcon(OSKIcon); +} + /*********************************************************************** * @@ -401,10 +427,30 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_COMMAND: - if (wParam == IDCANCEL) - EndDialog(hDlg, FALSE); - else if (wParam != IDC_STATIC) - OSK_DlgCommand(wParam, (HWND) lParam); + switch (LOWORD(wParam)) + { + case IDCANCEL: + { + EndDialog(hDlg, FALSE); + break; + } + + case IDM_EXIT: + { + EndDialog(hDlg, FALSE); + break; + } + + case IDM_ABOUT: + { + OSK_About(); + break; + } + + default: + OSK_DlgCommand(wParam, (HWND)lParam); + break; + } break; case WM_CLOSE: diff --git a/base/applications/osk/main.h b/base/applications/osk/main.h index ca7922d030..67f08b26d8 100644 --- a/base/applications/osk/main.h +++ b/base/applications/osk/main.h @@ -31,6 +31,7 @@ typedef struct extern OSK_GLOBALS Globals; #define countof(x) (sizeof(x) / sizeof((x)[0])) +#define MAX_BUFF 256 #endif diff --git a/base/applications/osk/osk_res.h b/base/applications/osk/osk_res.h index 120632d742..d62777efdc 100644 --- a/base/applications/osk/osk_res.h +++ b/base/applications/osk/osk_res.h @@ -29,8 +29,27 @@ #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 IDD_WARNINGDIALOG_OSK 215 +#define STRING_OSK 500 +#define STRING_AUTHORS 501 + #define IDC_STATIC -1

5 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2019