Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: msgdump.h undocumented drag & drop support (#1359)
by Katayama Hirofumi MZ 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8002fc065d724693364d… commit a8002fc065d724693364db3b9527cdbbf2950a38 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 16 17:27:25 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 16 17:27:25 2019 +0900 msgdump.h undocumented drag & drop support (#1359) In sdk/include/reactos/msgdump.h, support Drag & Drop undocumented messages. --- sdk/include/reactos/msgdump.h | 64 +++++++++++++++++++++++++++++++++++++++++-- sdk/include/reactos/winxx.h | 56 +++++++++++++++++++++++++++++++++++-- 2 files changed, 115 insertions(+), 5 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 696cbb7302..f69fd4a68d 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP +#define _INC_MSGDUMP 2 /* Version 2 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -14,7 +14,9 @@ */ #pragma once -#include "winxx.h" /* An unofficial extension of <windowsx.h>. */ +#ifndef _INC_WINXX + #include "winxx.h" /* An unofficial extension of <windowsx.h>. */ +#endif #include <strsafe.h> #ifndef MSGDUMP_TPRINTF @@ -938,6 +940,56 @@ MD_MDIGetActive(HWND hwnd) return NULL; } +#ifdef _UNDOCUSER_H + static __inline LRESULT MSGDUMP_API + MD_OnDropObject(HWND hwnd, WPARAM wParam, LPARAM lParam) + { + MSGDUMP_TPRINTF(TEXT("%sWM_DROPOBJECT(hwnd:%p, wParam:%p, lParam:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; + } + + static __inline LRESULT MSGDUMP_API + MD_OnQueryDropObject(HWND hwnd, WPARAM wParam, LPARAM lParam) + { + MSGDUMP_TPRINTF(TEXT("%sWM_QUERYDROPOBJECT(hwnd:%p, wParam:%p, lParam:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; + } + + static __inline LRESULT MSGDUMP_API + MD_OnBeginDrag(HWND hwnd, WPARAM wParam, LPARAM lParam) + { + MSGDUMP_TPRINTF(TEXT("%sWM_BEGINDRAG(hwnd:%p, wParam:%p, lParam:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; + } + + static __inline LRESULT MSGDUMP_API + MD_OnDragLoop(HWND hwnd, WPARAM wParam, LPARAM lParam) + { + MSGDUMP_TPRINTF(TEXT("%sWM_DRAGLOOP(hwnd:%p, wParam:%p, lParam:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; + } + + static __inline LRESULT MSGDUMP_API + MD_OnDragSelect(HWND hwnd, WPARAM wParam, LPARAM lParam) + { + MSGDUMP_TPRINTF(TEXT("%sWM_DRAGSELECT(hwnd:%p, wParam:%p, lParam:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; + } + + static __inline LRESULT MSGDUMP_API + MD_OnDragMove(HWND hwnd, WPARAM wParam, LPARAM lParam) + { + MSGDUMP_TPRINTF(TEXT("%sWM_DRAGMOVE(hwnd:%p, wParam:%p, lParam:%p)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)wParam, (void *)lParam); + return 0; + } +#endif + static __inline HMENU MSGDUMP_API MD_MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU hmenuFrame, HMENU hmenuWindow) { @@ -2916,6 +2968,14 @@ MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HANDLE_MSG(hwnd, WM_MDICASCADE, MD_MDICascade); HANDLE_MSG(hwnd, WM_MDIICONARRANGE, MD_MDIIconArrange); HANDLE_MSG(hwnd, WM_MDIGETACTIVE, MD_MDIGetActive); +#ifdef _UNDOCUSER_H + HANDLE_MSG(hwnd, WM_DROPOBJECT, MD_OnDropObject); + HANDLE_MSG(hwnd, WM_QUERYDROPOBJECT, MD_OnQueryDropObject); + HANDLE_MSG(hwnd, WM_BEGINDRAG, MD_OnBeginDrag); + HANDLE_MSG(hwnd, WM_DRAGLOOP, MD_OnDragLoop); + HANDLE_MSG(hwnd, WM_DRAGSELECT, MD_OnDragSelect); + HANDLE_MSG(hwnd, WM_DRAGMOVE, MD_OnDragMove); +#endif HANDLE_MSG(hwnd, WM_MDISETMENU, MD_MDISetMenu); HANDLE_MSG(hwnd, WM_ENTERSIZEMOVE, MD_OnEnterSizeMove); HANDLE_MSG(hwnd, WM_EXITSIZEMOVE, MD_OnExitSizeMove); diff --git a/sdk/include/reactos/winxx.h b/sdk/include/reactos/winxx.h index b7538de6d0..beb4a532cb 100644 --- a/sdk/include/reactos/winxx.h +++ b/sdk/include/reactos/winxx.h @@ -2,11 +2,11 @@ * PROJECT: ReactOS header files * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0.html) * PURPOSE: An unofficial extension of <windowsx.h> - * COPYRIGHT: Copyright 2017-2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * COPYRIGHT: Copyright 2017-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_WINXX -#define _INC_WINXX +#define _INC_WINXX 2 /* Version 2 */ #pragma once @@ -26,7 +26,7 @@ #ifndef HANDLE_WM_NULL #define HANDLE_WM_NULL(hwnd, wParam, lParam, fn) \ ((fn)((hwnd)), 0L) -#define FORWARD_WM_NULL(hwnd, compactRatio, fn) \ +#define FORWARD_WM_NULL(hwnd, fn) \ (void)((fn)((hwnd), WM_NULL, 0, 0L), 0L) #endif @@ -1044,4 +1044,54 @@ #define HANDLE_SBM_GETSCROLLBARINFO(hwnd, wParam, lParam, fn) \ (LRESULT)(INT_PTR)(BOOL)(fn)((hwnd), (LPSCROLLBARINFO)(lParam)) +#ifdef _UNDOCUSER_H /* UNDOCUMENTED */ + /* LRESULT Cls_OnDropObject(HWND hwnd, WPARAM wParam, LPARAM lParam) */ + #ifndef HANDLE_WM_DROPOBJECT + #define HANDLE_WM_DROPOBJECT(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (wParam), (lParam)) + #define FORWARD_WM_DROPOBJECT(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), WM_DROPOBJECT, wParam, lParam)) + #endif + + /* LRESULT Cls_OnQueryDropObject(HWND hwnd, WPARAM wParam, LPARAM lParam) */ + #ifndef HANDLE_WM_QUERYDROPOBJECT + #define HANDLE_WM_QUERYDROPOBJECT(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (wParam), (lParam)) + #define FORWARD_WM_QUERYDROPOBJECT(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), WM_QUERYDROPOBJECT, wParam, lParam)) + #endif + + /* LRESULT Cls_OnBeginDrag(HWND hwnd, WPARAM wParam, LPARAM lParam) */ + #ifndef HANDLE_WM_BEGINDRAG + #define HANDLE_WM_BEGINDRAG(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (wParam), (lParam)) + #define FORWARD_WM_BEGINDRAG(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), WM_BEGINDRAG, wParam, lParam)) + #endif + + /* LRESULT Cls_OnDragLoop(HWND hwnd, WPARAM wParam, LPARAM lParam) */ + #ifndef HANDLE_WM_DRAGLOOP + #define HANDLE_WM_DRAGLOOP(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (wParam), (lParam)) + #define FORWARD_WM_DRAGLOOP(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), WM_DRAGLOOP, wParam, lParam)) + #endif + + /* LRESULT Cls_OnDragSelect(HWND hwnd, WPARAM wParam, LPARAM lParam) */ + #ifndef HANDLE_WM_DRAGSELECT + #define HANDLE_WM_DRAGSELECT(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (wParam), (lParam)) + #define FORWARD_WM_DRAGSELECT(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), WM_DRAGSELECT, wParam, lParam)) + #endif + + /* LRESULT Cls_OnDragMove(HWND hwnd, WPARAM wParam, LPARAM lParam) */ + #ifndef HANDLE_WM_DRAGMOVE + #define HANDLE_WM_DRAGMOVE(hwnd, wParam, lParam, fn) \ + (LRESULT)(fn)((hwnd), (wParam), (lParam)) + #define FORWARD_WM_DRAGMOVE(hwnd, wParam, lParam, fn) \ + (LRESULT)((fn)((hwnd), WM_DRAGMOVE, wParam, lParam)) + #endif +#endif + #endif

1 0

[reactos] 03/03: [IPHLPAPI] Properly handle GetModuleBaseName failure
by Pierre Schweitzer 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22cb300805a6dd39c73bb… commit 22cb300805a6dd39c73bb8ee39bbc390dd8eb5cc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 16 09:05:15 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 16 09:05:15 2019 +0100 [IPHLPAPI] Properly handle GetModuleBaseName failure CID 1442662, 1442663 --- dll/win32/iphlpapi/iphlpapi_main.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 5993c74f98..327b31717a 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -2289,7 +2289,7 @@ DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) static DWORD GetOwnerModuleFromPidEntry(DWORD OwningPid, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize) { HANDLE Process; - DWORD FileLen, PathLen; + DWORD FileLen, PathLen, Error; WCHAR File[MAX_PATH], Path[MAX_PATH]; PTCPIP_OWNER_MODULE_BASIC_INFO BasicInfo; @@ -2326,13 +2326,23 @@ static DWORD GetOwnerModuleFromPidEntry(DWORD OwningPid, TCPIP_OWNER_MODULE_INFO PathLen *= sizeof(WCHAR); FileLen *= sizeof(WCHAR); } - else if (GetLastError() == ERROR_PARTIAL_COPY) + else { - wcscpy(File, L"System"); - wcscpy(Path, L"System"); + Error = GetLastError(); + + if (Error == ERROR_PARTIAL_COPY) + { + wcscpy(File, L"System"); + wcscpy(Path, L"System"); - PathLen = sizeof(L"System"); - FileLen = sizeof(L"System"); + PathLen = sizeof(L"System"); + FileLen = sizeof(L"System"); + } + else + { + CloseHandle(Process); + return Error; + } } CloseHandle(Process);

1 0

[reactos] 02/03: [IPHLPAPI] Check pointers when returning module info from specific connection
by Pierre Schweitzer 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93b0957641f1b8c831152… commit 93b0957641f1b8c831152aa6fdfc43e2d528f9b4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 16 09:00:06 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 16 09:00:06 2019 +0100 [IPHLPAPI] Check pointers when returning module info from specific connection --- dll/win32/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 83d53d2b10..5993c74f98 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -2293,6 +2293,12 @@ static DWORD GetOwnerModuleFromPidEntry(DWORD OwningPid, TCPIP_OWNER_MODULE_INFO WCHAR File[MAX_PATH], Path[MAX_PATH]; PTCPIP_OWNER_MODULE_BASIC_INFO BasicInfo; + if (IsBadWritePtr(pdwSize, sizeof(DWORD)) || + IsBadWritePtr(Buffer, *pdwSize)) + { + return ERROR_INVALID_PARAMETER; + } + if (OwningPid == 0) { return ERROR_NOT_FOUND; @@ -2363,6 +2369,12 @@ static DWORD GetOwnerModuleFromTagEntry(DWORD OwningPid, DWORD OwningTag, TCPIP_ PWSTR Buffer; } ServiceQuery; + if (IsBadWritePtr(pdwSize, sizeof(DWORD)) || + IsBadWritePtr(Buffer, *pdwSize)) + { + return ERROR_INVALID_PARAMETER; + } + /* First, secure (avoid injections) load advapi32.dll */ Size = GetSystemDirectoryW(SysDir, MAX_PATH); if (Size == 0)

1 0

[reactos] 01/03: [IPHLPAPI] Remove dead code
by Pierre Schweitzer 16 Feb '19

16 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22f60faf439c8d6b19508… commit 22f60faf439c8d6b195085acfd94912de6d214af Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 16 08:48:08 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 16 08:48:08 2019 +0100 [IPHLPAPI] Remove dead code CID 513306, 1442673, 1442697 --- dll/win32/iphlpapi/ipstats_reactos.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index 5906388fc4..6bf3df63e9 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -524,7 +524,6 @@ DWORD getNumArpEntries(void) } closeTcpFile( tcpFile ); - if( IpArpTable ) tdiFreeThingSet( IpArpTable ); if( entitySet ) tdiFreeThingSet( entitySet ); return totalNumber; } @@ -649,7 +648,6 @@ DWORD getNumUdpEntries(void) } closeTcpFile( tcpFile ); - if( IpUdpTable ) tdiFreeThingSet( IpUdpTable ); if( entitySet ) tdiFreeThingSet( entitySet ); return totalNumber; } @@ -761,7 +759,6 @@ DWORD getNumTcpEntries(void) } closeTcpFile( tcpFile ); - if( IpTcpTable ) tdiFreeThingSet( IpTcpTable ); if( entitySet ) tdiFreeThingSet( entitySet ); return totalNumber; }

1 0

[reactos] 01/01: [FASTFAT] On volume open, update share access if volume was already open
by Pierre Schweitzer 14 Feb '19

14 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f36cbf75e3aaf432a46ed… commit f36cbf75e3aaf432a46edd145e5d54bc120f7bca Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 14 10:48:32 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 14 10:48:32 2019 +0100 [FASTFAT] On volume open, update share access if volume was already open It was never updated afterwards, leading to a totally loss of share access information amongst callers. --- drivers/filesystems/fastfat/create.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 22ce0a54ff..aadc990e37 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -523,7 +523,7 @@ VfatCreateFile( Stack->Parameters.Create.ShareAccess, FileObject, &pFcb->FCBShareAccess, - FALSE); + TRUE); if (!NT_SUCCESS(Status)) { vfatAddToStat(DeviceExt, Fat.FailedCreates, 1);

1 0

[reactos] 01/01: [VFATLIB] Don't forcibly delete LFN when not in RW mode
by Pierre Schweitzer 14 Feb '19

14 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9c3622ef12acbd4f2d5e… commit c9c3622ef12acbd4f2d5e8a633f128a0ecdac22f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Feb 14 10:12:31 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Feb 14 10:13:32 2019 +0100 [VFATLIB] Don't forcibly delete LFN when not in RW mode --- sdk/lib/fslib/vfatlib/check/lfn.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk/lib/fslib/vfatlib/check/lfn.c b/sdk/lib/fslib/vfatlib/check/lfn.c index 17832f80c7..a9af62bde6 100644 --- a/sdk/lib/fslib/vfatlib/check/lfn.c +++ b/sdk/lib/fslib/vfatlib/check/lfn.c @@ -526,9 +526,17 @@ void lfn_check_orphaned(void) free(long_name); if (interactive) printf("1: Delete.\n2: Leave it.\n"); +#ifdef __REACTOS__ + else if (rw) +#else else +#endif printf(" Auto-deleting.\n"); +#ifdef __REACTOS__ + if ((!interactive && rw) || (interactive && get_key("12", "?") == '1')) { +#else if (!interactive || get_key("12", "?") == '1') { +#endif clear_lfn_slots(0, lfn_parts - 1); } lfn_reset();

1 0

[reactos] 01/01: [USETUP] Check the status value of BuildInstallPaths() (#1349)
by Bișoc George 13 Feb '19

13 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35f7267a9712da2b94dfd… commit 35f7267a9712da2b94dfd2fc0c08d4a021f15b88 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Feb 13 15:22:28 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Feb 13 15:22:28 2019 +0100 [USETUP] Check the status value of BuildInstallPaths() (#1349) --- base/setup/usetup/usetup.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index a9a4f81174..f10effde10 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3324,6 +3324,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) WCHAR InstallDir[MAX_PATH]; WCHAR c; ULONG Length, Pos; + NTSTATUS Status; /* We do not need the filesystem list anymore */ if (FileSystemList != NULL) @@ -3360,9 +3361,17 @@ InstallDirectoryPage(PINPUT_RECORD Ir) */ if ((RepairUpdateFlag || IsUnattendedSetup) && IsValidPath(InstallDir)) { - BuildInstallPaths(InstallDir, - DiskEntry, - PartEntry); + Status = BuildInstallPaths(InstallDir, + DiskEntry, + PartEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status); + PopupError("Failed to build the installation paths for the ReactOS installation directory!", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } /* * Check whether the user attempts to install ReactOS within the @@ -3462,9 +3471,17 @@ InstallDirectoryPage(PINPUT_RECORD Ir) return INSTALL_DIRECTORY_PAGE; } - BuildInstallPaths(InstallDir, - DiskEntry, - PartEntry); + Status = BuildInstallPaths(InstallDir, + DiskEntry, + PartEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status); + PopupError("Failed to build the installation paths for the ReactOS installation directory!", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } /* * Check whether the user attempts to install ReactOS within the

1 0

[reactos] 01/01: [NSLOOKUP] Fix crash in case of no network connectivity (#1354)
by Julian Kirsch 13 Feb '19

13 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42515190c53d45e282a8d… commit 42515190c53d45e282a8d6eea4dfa917bfc1f170 Author: Julian Kirsch <kirschju(a)sec.in.tum.de> AuthorDate: Wed Feb 13 13:12:52 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Feb 13 13:12:52 2019 +0100 [NSLOOKUP] Fix crash in case of no network connectivity (#1354) Prevent nslookup.exe from crashing when executed in a ROS VM with no network interfaces. This is due to a NULL pointer dereference occurring if `GetNetworkParams` in `main` fails with an error other than `ERROR_BUFFER_OVERFLOW`. In this case, `pNetInfo` remains initialized to NULL, causing `strncpy` to crash. --- base/applications/network/nslookup/nslookup.c | 35 +++++++++++++++------------ 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/base/applications/network/nslookup/nslookup.c b/base/applications/network/nslookup/nslookup.c index 6f80dfae1e..d86803eb3a 100644 --- a/base/applications/network/nslookup/nslookup.c +++ b/base/applications/network/nslookup/nslookup.c @@ -792,26 +792,31 @@ int main( int argc, char* argv[] ) /* We don't know how long of a buffer it will want to return. So we'll pass an empty one now and let it fail only once, instead of guessing. */ Status = GetNetworkParams( pNetInfo, &NetBufLen ); - if( Status == ERROR_BUFFER_OVERFLOW ) + + if( Status != ERROR_BUFFER_OVERFLOW ) { - pNetInfo = (PFIXED_INFO)HeapAlloc( ProcessHeap, 0, NetBufLen ); - if( pNetInfo == NULL ) - { - _tprintf( _T("ERROR: Out of memory\n") ); + _tprintf( _T("Error in GetNetworkParams call\n") ); - return -1; - } + return -2; + } - /* For real this time. */ - Status = GetNetworkParams( pNetInfo, &NetBufLen ); - if( Status != NO_ERROR ) - { - _tprintf( _T("Error in GetNetworkParams call\n") ); + pNetInfo = (PFIXED_INFO)HeapAlloc( ProcessHeap, 0, NetBufLen ); + if( pNetInfo == NULL ) + { + _tprintf( _T("ERROR: Out of memory\n") ); - HeapFree( ProcessHeap, 0, pNetInfo ); + return -1; + } - return -2; - } + /* For real this time. */ + Status = GetNetworkParams( pNetInfo, &NetBufLen ); + if( Status != NO_ERROR ) + { + _tprintf( _T("Error in GetNetworkParams call\n") ); + + HeapFree( ProcessHeap, 0, pNetInfo ); + + return -2; } strncpy( State.domain, pNetInfo->DomainName, 255 );

1 0

[reactos] 01/01: [CRYPTEXT] Add Romanian & Italian translations (#1352)
by Bișoc George 13 Feb '19

13 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67a3747722865bd0b8540… commit 67a3747722865bd0b85404a0b9bcaf39ca1f0dd7 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Feb 13 13:11:17 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Feb 13 13:11:17 2019 +0100 [CRYPTEXT] Add Romanian & Italian translations (#1352) --- dll/shellext/cryptext/cryptext.rc | 6 ++++++ dll/shellext/cryptext/lang/it-IT.rc | 14 ++++++++++++++ dll/shellext/cryptext/lang/ro-RO.rc | 14 ++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc index 9dc9c22e7d..88890f0b5f 100644 --- a/dll/shellext/cryptext/cryptext.rc +++ b/dll/shellext/cryptext/cryptext.rc @@ -23,6 +23,12 @@ #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/dll/shellext/cryptext/lang/it-IT.rc b/dll/shellext/cryptext/lang/it-IT.rc new file mode 100644 index 0000000000..36995db997 --- /dev/null +++ b/dll/shellext/cryptext/lang/it-IT.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Italian (Neutral) resource translation + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "Il file del certificato non è valido." + IDS_CER_FILE "File certificato" +END diff --git a/dll/shellext/cryptext/lang/ro-RO.rc b/dll/shellext/cryptext/lang/ro-RO.rc new file mode 100644 index 0000000000..5609ce5f3f --- /dev/null +++ b/dll/shellext/cryptext/lang/ro-RO.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Romanian (Neutral) resource translation + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "Acest fișier de certificat este invalid." + IDS_CER_FILE "Fișier de certificat" +END

1 0

[reactos] 01/01: [OSK] Romanian & Italian translations update (#1353)
by Bișoc George 13 Feb '19

13 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a95a8c02762255f0fbc2b… commit a95a8c02762255f0fbc2bc5d99e373a3b0bbc5ff Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Feb 13 13:10:54 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Feb 13 13:10:54 2019 +0100 [OSK] Romanian & Italian translations update (#1353) --- base/applications/osk/lang/it-IT.rc | 219 ++++++++++++++++++------------------ base/applications/osk/lang/ro-RO.rc | 200 ++++++++++++++++---------------- 2 files changed, 210 insertions(+), 209 deletions(-) diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index 0f614a1a98..965a73af5c 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -129,7 +129,7 @@ BEGIN END MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 -CAPTION "On screen keyboard" +CAPTION "Tastiera a schermo" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU STYLE WS_SYSMENU | WS_MINIMIZEBOX @@ -140,18 +140,18 @@ BEGIN 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 "F5",SCAN_CODE_116,143,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,163,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 "F9",SCAN_CODE_120,243,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 + PUSHBUTTON "Imp",SCAN_CODE_124,323,3,15,15 + PUSHBUTTON "Arr",SCAN_CODE_125,343,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,363,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 @@ -161,128 +161,129 @@ BEGIN 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 "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,55,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 "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 "Verr maj",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_42,243,60,15,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,15,BS_ICON + PUSHBUTTON "Shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Z",SCAN_CODE_45,64,79,15,15 + PUSHBUTTON "<",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 "-",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "Shift",SCAN_CODE_57,254,79,64,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 + PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 + PUSHBUTTON "alt gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 + PUSHBUTTON "home",SCAN_CODE_80,343,22,15,15,BS_ICON + PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 + PUSHBUTTON "pg up",SCAN_CODE_85,363,22,15,15,BS_ICON + PUSHBUTTON "pg down",SCAN_CODE_86,363,41,15,15,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 + CTEXT "Num",IDC_STATIC,383,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 + CTEXT "Caps",IDC_STATIC,408,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 + CTEXT "Scroll",IDC_STATIC,433,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END IDR_OSK_MENU MENU DISCARDABLE - BEGIN +BEGIN POPUP "File" BEGIN - MENUITEM "&Exit", IDM_EXIT + MENUITEM "&Esci", IDM_EXIT END - POPUP "Keyboard" + POPUP "Tastiera" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB + MENUITEM "Tastiera Estesa", IDM_ENHANCED_KB, CHECKED + MENUITEM "Tastiera Standard", IDM_STANDARD_KB MENUITEM SEPARATOR - MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED - MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM "Mappatura Regolare", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Mappatura a blocchi", 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 + MENUITEM "101 tasti", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 tasti", IDM_102_KEYS, GRAYED + MENUITEM "106 tasti", IDM_106_KEYS, GRAYED END - POPUP "Settings" + POPUP "Impostazioni" BEGIN - MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM "Sempre in primo piano", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Usa suono al click", IDM_CLICK_SOUND, GRAYED MENUITEM SEPARATOR - MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM "&Modalità di scrittura...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Tipo di carattere...", IDM_FONT, GRAYED END - POPUP "Help" + POPUP "Aiuto" BEGIN - MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM "&Guida in linea", IDM_HELP_TOPICS, GRAYED MENUITEM SEPARATOR - MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + MENUITEM "&Informazioni sulla tastiera a schermo...", IDM_ABOUT END END @@ -300,8 +301,8 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + STRING_OSK "Tastiera a schermo" + STRING_AUTHORS "Diritti d'autore Denis Robert" END /* EOF */ diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 57e1616d5e..405a163a28 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -129,7 +129,7 @@ BEGIN END MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115 -CAPTION "On screen keyboard" +CAPTION "Tastatură virtuală" FONT 8, "MS Shell Dlg" MENU IDR_OSK_MENU STYLE WS_SYSMENU | WS_MINIMIZEBOX @@ -140,17 +140,17 @@ BEGIN 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 "F5",SCAN_CODE_116,143,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,163,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 "F9",SCAN_CODE_120,243,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,363,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 @@ -164,125 +164,125 @@ BEGIN 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 "<--",SCAN_CODE_15,263,22,55,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 "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_29,270,41,48,15 + PUSHBUTTON "Fix cap",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 "ret",SCAN_CODE_43,262,60,56,15,BS_ICON + PUSHBUTTON "schimb",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 "schimb",SCAN_CODE_57,254,79,64,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 + PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 + PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 + PUSHBUTTON "ștg",SCAN_CODE_76,323,41,15,15 + PUSHBUTTON "init",SCAN_CODE_80,343,22,15,15 + PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 + PUSHBUTTON "pg sus",SCAN_CODE_85,363,22,15,15,BS_ICON + PUSHBUTTON "pg jos",SCAN_CODE_86,363,41,15,15,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 + PUSHBUTTON "intr",SCAN_CODE_108,443,78,15,35 + CTEXT "Num",IDC_STATIC,383,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 + CTEXT "Cap",IDC_STATIC,408,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 + CTEXT "Derul",IDC_STATIC,433,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END IDR_OSK_MENU MENU DISCARDABLE BEGIN - POPUP "File" + POPUP "Fișier" BEGIN - MENUITEM "&Exit", IDM_EXIT + MENUITEM "&Ieșire", IDM_EXIT END - POPUP "Keyboard" + POPUP "Tastatură" BEGIN - MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED - MENUITEM "Standard Keyboard", IDM_STANDARD_KB + MENUITEM "Tastatură îmbunătățită", IDM_ENHANCED_KB, CHECKED + MENUITEM "Tastatură standard", IDM_STANDARD_KB MENUITEM SEPARATOR - MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED - MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM "Aspect regular", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Aspect pe blocuri", 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 + MENUITEM "101 taste", IDM_101_KEYS, CHECKED, GRAYED + MENUITEM "102 taste", IDM_102_KEYS, GRAYED + MENUITEM "106 taste", IDM_106_KEYS, GRAYED END - POPUP "Settings" + POPUP "Setări" BEGIN - MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED + MENUITEM "Întotdeauna în sus", IDM_ON_TOP, CHECKED, GRAYED MENUITEM SEPARATOR - MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED + MENUITEM "&Folosește sunetul de clic", IDM_CLICK_SOUND, GRAYED MENUITEM SEPARATOR - MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED + MENUITEM "&Modalitatea de scriere...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Tip de caracter...", IDM_FONT, GRAYED END - POPUP "Help" + POPUP "Ajutor" BEGIN - MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED + MENUITEM "&Manual", IDM_HELP_TOPICS, GRAYED MENUITEM SEPARATOR - MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT + MENUITEM "&Despre tastatură virtuală...", IDM_ABOUT END END @@ -300,8 +300,8 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + STRING_OSK "Tastatură virtuală" + STRING_AUTHORS "Drepturi de autor Denis Robert" END /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs