Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[pschweitzer] 70367: [IPHLPAPI_APITEST] Rewrite the two existing tests for ICMP and add a third one (for IPv6). Patch by Tim Crawford. ROSTESTS-212 #resolve #comment Commited in r70367. Thanks!

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Dec 16 21:11:22 2015 New Revision: 70367 URL: http://svn.reactos.org/svn/reactos?rev=70367&view=rev Log: [IPHLPAPI_APITEST] Rewrite the two existing tests for ICMP and add a third one (for IPv6). Patch by Tim Crawford. ROSTESTS-212 #resolve #comment Commited in r70367. Thanks! Modified: trunk/rostests/apitests/iphlpapi/icmp.c Modified: trunk/rostests/apitests/iphlpapi/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/iphlpapi/icmp.c?… ============================================================================== --- trunk/rostests/apitests/iphlpapi/icmp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/iphlpapi/icmp.c [iso-8859-1] Wed Dec 16 21:11:22 2015 @@ -1,21 +1,8 @@ /* - * Unit test suite for Icmp functions - * - * Copyright 2006 Steven Edwards - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * PROJECT: ReactOS API Tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Tests for ICMP functions + * PROGRAMMERS: Tim Crawford */ #include <apitest.h> @@ -23,23 +10,81 @@ #include <iphlpapi.h> #include <icmpapi.h> -HANDLE handle; +static +void +test_IcmpCreateFile(void) +{ + HANDLE hIcmp; -static void test_IcmpCreateFile(void) -{ - handle=IcmpCreateFile(); - ok(handle!=INVALID_HANDLE_VALUE,"Failed to create icmp file handle\n"); + SetLastError(0xDEADBEEF); + hIcmp = IcmpCreateFile(); + ok(hIcmp != INVALID_HANDLE_VALUE, "IcmpCreateFile failed unexpectedly: %lu\n", GetLastError()); + + if (hIcmp != INVALID_HANDLE_VALUE) + IcmpCloseHandle(hIcmp); } -static void test_IcmpCloseHandle(void) +static +void +test_Icmp6CreateFile(void) { - BOOL result; - result=IcmpCloseHandle(handle); - ok(result!=FALSE,"Failed to close icmp file handle\n"); + HANDLE hIcmp; + + SetLastError(0xDEADBEEF); + hIcmp = Icmp6CreateFile(); + + if (GetLastError() == ERROR_FILE_NOT_FOUND) + { + /* On Windows Server 2003, the IPv6 protocol must be installed. */ + skip("IPv6 is not available.\n"); + return; + } + + ok(hIcmp != INVALID_HANDLE_VALUE, "Icmp6CreateFile failed unexpectedly: %lu\n", GetLastError()); + + if (hIcmp != INVALID_HANDLE_VALUE) + IcmpCloseHandle(hIcmp); +} + +static +void +test_IcmpCloseHandle(void) +{ + HANDLE hIcmp; + BOOL bRet; + + SetLastError(0xDEADBEEF); + hIcmp = IcmpCreateFile(); + if (hIcmp != INVALID_HANDLE_VALUE) + { + bRet = IcmpCloseHandle(hIcmp); + ok(bRet, "IcmpCloseHandle failed unexpectedly: %lu\n", GetLastError()); + } + + SetLastError(0xDEADBEEF); + hIcmp = Icmp6CreateFile(); + if (hIcmp != INVALID_HANDLE_VALUE) + { + bRet = IcmpCloseHandle(hIcmp); + ok(bRet, "IcmpCloseHandle failed unexpectedly: %lu\n", GetLastError()); + } + + hIcmp = INVALID_HANDLE_VALUE; + SetLastError(0xDEADBEEF); + bRet = IcmpCloseHandle(hIcmp); + ok(!bRet, "IcmpCloseHandle succeeded unexpectedly\n"); + ok_err(ERROR_INVALID_HANDLE); + + hIcmp = NULL; + SetLastError(0xDEADBEEF); + bRet = IcmpCloseHandle(hIcmp); + ok(!bRet, "IcmpCloseHandle succeeded unexpectedly\n"); + ok_err(ERROR_INVALID_HANDLE); } START_TEST(icmp) { test_IcmpCreateFile(); + test_Icmp6CreateFile(); test_IcmpCloseHandle(); }

8 years, 9 months

[tfaber] 70366: [NTOS:IO] - Add some missing OBJ_KERNEL_HANDLE. CORE-10207

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Dec 16 18:08:38 2015 New Revision: 70366 URL: http://svn.reactos.org/svn/reactos?rev=70366&view=rev Log: [NTOS:IO] - Add some missing OBJ_KERNEL_HANDLE. CORE-10207 Modified: trunk/reactos/ntoskrnl/io/iomgr/symlink.c Modified: trunk/reactos/ntoskrnl/io/iomgr/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/symlink.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/symlink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/symlink.c [iso-8859-1] Wed Dec 16 18:08:38 2015 @@ -31,7 +31,7 @@ /* Initialize the object attributes and create the link */ InitializeObjectAttributes(&ObjectAttributes, SymbolicLinkName, - OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + OBJ_KERNEL_HANDLE | OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, NULL, SePublicDefaultSd); Status = ZwCreateSymbolicLinkObject(&Handle, @@ -73,7 +73,7 @@ /* Initialize the object attributes and create the link */ InitializeObjectAttributes(&ObjectAttributes, SymbolicLinkName, - OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + OBJ_KERNEL_HANDLE | OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, NULL, &SecurityDescriptor); Status = ZwCreateSymbolicLinkObject(&Handle, @@ -101,7 +101,7 @@ /* Initialize the object attributes and open the link */ InitializeObjectAttributes(&ObjectAttributes, SymbolicLinkName, - OBJ_CASE_INSENSITIVE, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenSymbolicLinkObject(&Handle, DELETE, &ObjectAttributes);

8 years, 9 months

[hbelusca] 70365: [COMMAND.COM] Surround welcome & debugging messages in #ifndef NDEBUG blocks, that should be compiled in trunk but will be disabled in the release. This is to "cure" the bad-looki...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 16 17:28:59 2015 New Revision: 70365 URL: http://svn.reactos.org/svn/reactos?rev=70365&view=rev Log: [COMMAND.COM] Surround welcome & debugging messages in #ifndef NDEBUG blocks, that should be compiled in trunk but will be disabled in the release. This is to "cure" the bad-looking problem described in http://www.reactos.org/forum/viewtopic.php?f=25&t=14620 . Modified: trunk/reactos/subsystems/mvdm/dos/command.S Modified: trunk/reactos/subsystems/mvdm/dos/command.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/dos/comman… ============================================================================== --- trunk/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] Wed Dec 16 17:28:59 2015 @@ -16,6 +16,8 @@ #include <asm.inc> #include "asmxtras.inc" #include <isvbop.inc> + +// #define NDEBUG /* DEFINES ********************************************************************/ @@ -124,11 +126,15 @@ jz Run cmp word ptr OldParentPsp, SYSTEM_PSP // Check whether our parent is SYSTEM je Run + +#ifndef NDEBUG /********************************/ mov dx, offset Msg1 mov ah, HEX(09) int HEX(21) /********************************/ +#endif + BOP BOP_CMD, HEX(0A) // Start 32-bit COMSPEC jnc Quit @@ -143,11 +149,14 @@ mov word ptr FIELD(NextCmd, AppNameOff), offset PgmName /* Wait for the next command */ +#ifndef NDEBUG /********************************/ mov dx, offset Msg2 mov ah, HEX(09) int HEX(21) /********************************/ +#endif + // FIXME: Initialize memory with structure for holding CmdLine etc... // mov ds, seg NextCmd mov dx, offset NextCmd @@ -190,6 +199,8 @@ Quit: mov bl, al // Save AL in BL + +#ifndef NDEBUG /********************************/ cmp al, HEX(0A) jne XXXX @@ -198,11 +209,15 @@ int HEX(21) XXXX: /********************************/ +#endif + +#ifndef NDEBUG /* Say bye-bye */ // mov ds, seg QuitMsg mov dx, offset QuitMsg mov ah, HEX(09) int HEX(21) +#endif /* Restore our old parent PSP */ mov ax, word ptr OldParentPsp @@ -220,6 +235,7 @@ /* DATA *******************************/ +#ifndef NDEBUG QuitMsg: .ascii "Bye bye!", CR, LF, "$" @@ -228,6 +244,7 @@ Msg2: .ascii "Waiting for new command...", CR, LF, "$" Msg3: .ascii "Bad environment!", CR, LF, "$" /********************************/ +#endif OldParentPsp: .word 0 CurrentPsp: .word 0 @@ -257,9 +274,12 @@ /* DATA *******************************/ +#ifndef NDEBUG WelcomeMsg: .ascii "ReactOS DOS32 Command", CR, LF, \ "Copyright (C) ReactOS Team 2015" , CR, LF, "$" +#endif + VerErrMsg: .ascii "Incorrect DOS version", CR, LF, "$" @@ -320,11 +340,13 @@ mov ax, word ptr CurrentPsp mov PSP_VAR(ParentPsp), ax +#ifndef NDEBUG /* Say hello */ // mov ds, seg WelcomeMsg mov dx, offset WelcomeMsg mov ah, HEX(09) int HEX(21) +#endif /* Jump to resident code */ jmp ResidentMain

8 years, 9 months

[akhaldi] 70364: [0.4.0] * Merge the blurry icons fix by Henry Tang Ih in r70363. CORE-10640

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 16 14:59:17 2015 New Revision: 70364 URL: http://svn.reactos.org/svn/reactos?rev=70364&view=rev Log: [0.4.0] * Merge the blurry icons fix by Henry Tang Ih in r70363. CORE-10640 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.ico branches/ros-branch-0_4_0/reactos/base/applications/games/spider/spider.ico branches/ros-branch-0_4_0/reactos/base/applications/iexplore/iexplore.ico branches/ros-branch-0_4_0/reactos/base/applications/mspaint/icons/paint.ico branches/ros-branch-0_4_0/reactos/base/applications/osk/res/osk.ico branches/ros-branch-0_4_0/reactos/dll/cpl/main/resources/keyboard.ico Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 14:59:17 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70335-70337,70357-70358,70360 +/trunk:70000-70321,70323-70324,70335-70337,70357-70358,70360,70363 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 14:59:17 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70335-70337,70357-70358,70360 +/trunk/reactos:70000-70321,70323-70324,70335-70337,70357-70358,70360,70363 Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/spider/spider.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_0/reactos/base/applications/iexplore/iexplore.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_0/reactos/base/applications/mspaint/icons/paint.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_0/reactos/base/applications/osk/res/osk.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/main/resources/keyboard.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== Binary files - no diff available.

8 years, 9 months

[akhaldi] 70363: [ICONS] Fix some blurry icons by Henry Tang Ih. CORE-10640

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 16 14:57:14 2015 New Revision: 70363 URL: http://svn.reactos.org/svn/reactos?rev=70363&view=rev Log: [ICONS] Fix some blurry icons by Henry Tang Ih. CORE-10640 Modified: trunk/reactos/base/applications/games/solitaire/solitaire.ico trunk/reactos/base/applications/games/spider/spider.ico trunk/reactos/base/applications/iexplore/iexplore.ico trunk/reactos/base/applications/mspaint/icons/paint.ico trunk/reactos/base/applications/osk/res/osk.ico trunk/reactos/dll/cpl/main/resources/keyboard.ico Modified: trunk/reactos/base/applications/games/solitaire/solitaire.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/games/spider/spider.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/iexplore/iexplore.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mspaint/icons/paint.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/osk/res/osk.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/res/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/keyboard.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/key… ============================================================================== Binary files - no diff available.

8 years, 9 months

[akhaldi] 70362: [0.4.0] * Merge VBoxTray tooltip text fix by Mark Jansen and David Quintana in r70360. CORE-10497

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 16 14:53:50 2015 New Revision: 70362 URL: http://svn.reactos.org/svn/reactos?rev=70362&view=rev Log: [0.4.0] * Merge VBoxTray tooltip text fix by Mark Jansen and David Quintana in r70360. CORE-10497 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/dll/win32/shell32/systray.cpp Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 14:53:50 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70335-70337,70357-70358 +/trunk:70000-70321,70323-70324,70335-70337,70357-70358,70360 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 14:53:50 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70335-70337,70357-70358 +/trunk/reactos:70000-70321,70323-70324,70335-70337,70357-70358,70360 Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shell32/systray.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] Wed Dec 16 14:53:50 2015 @@ -63,6 +63,7 @@ */ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) { + NOTIFYICONDATAW nidW; DWORD cbSize; /* Validate the cbSize as Windows XP does */ @@ -77,7 +78,37 @@ else cbSize = pnid->cbSize; - return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, cbSize, FALSE); + ZeroMemory(&nidW, sizeof(nidW)); + nidW.cbSize = sizeof(nidW); + nidW.hWnd = pnid->hWnd; + nidW.uID = pnid->uID; + nidW.uFlags = pnid->uFlags; + nidW.uCallbackMessage = pnid->uCallbackMessage; + nidW.hIcon = pnid->hIcon; + + /* szTip */ + if (pnid->uFlags & NIF_TIP) + MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, _countof(nidW.szTip)); + + if (cbSize >= NOTIFYICONDATAA_V2_SIZE) + { + nidW.dwState = pnid->dwState; + nidW.dwStateMask = pnid->dwStateMask; + + /* szInfo, szInfoTitle */ + if (pnid->uFlags & NIF_INFO) + { + MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, _countof(nidW.szTip)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, _countof(nidW.szTip)); + } + + nidW.uTimeout = pnid->uTimeout; + nidW.dwInfoFlags = pnid->dwInfoFlags; + } + + if (cbSize >= sizeof(NOTIFYICONDATAA)) + nidW.hBalloonIcon = pnid->hBalloonIcon; + return Shell_NotifyIconW(dwMessage, &nidW); } /*************************************************************************

8 years, 9 months

[ekohl] 70361: [WINLOGON] Get rid of setup.h.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Dec 16 14:45:19 2015 New Revision: 70361 URL: http://svn.reactos.org/svn/reactos?rev=70361&view=rev Log: [WINLOGON] Get rid of setup.h. Removed: trunk/reactos/base/system/winlogon/setup.h Modified: trunk/reactos/base/system/winlogon/winlogon.h Removed: trunk/reactos/base/system/winlogon/setup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/setup.h (removed) @@ -1,32 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS winlogon - * FILE: base/system/winlogon/setup.h - * PURPOSE: Setup support functions - * PROGRAMMER: Eric Kohl - */ - -#pragma once - -DWORD GetSetupType (VOID); -BOOL RunSetup (VOID); - -/* EOF */ Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Wed Dec 16 14:45:19 2015 @@ -46,7 +46,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winlogon); -#include "setup.h" #include "resource.h" typedef BOOL (WINAPI * PFWLXNEGOTIATE) (DWORD, DWORD *); @@ -306,8 +305,14 @@ VOID StartScreenSaver(IN PWLSESSION Session); +/* setup.c */ +DWORD +GetSetupType(VOID); + +BOOL +RunSetup(VOID); + /* winlogon.c */ - BOOL PlaySoundRoutine(IN LPCWSTR FileName, IN UINT Logon,

8 years, 9 months

[dquintana] 70360: [SHELL32] Apply patch by Mark Jansen (learn_more) with a few tweaks. Fixes calls to Shell_NotifyIconA such as those from VBoxTray. CORE-10497 #resolve

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Dec 16 12:36:33 2015 New Revision: 70360 URL: http://svn.reactos.org/svn/reactos?rev=70360&view=rev Log: [SHELL32] Apply patch by Mark Jansen (learn_more) with a few tweaks. Fixes calls to Shell_NotifyIconA such as those from VBoxTray. CORE-10497 #resolve Modified: trunk/reactos/dll/win32/shell32/systray.cpp Modified: trunk/reactos/dll/win32/shell32/systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/systray.… ============================================================================== --- trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] Wed Dec 16 12:36:33 2015 @@ -63,6 +63,7 @@ */ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) { + NOTIFYICONDATAW nidW; DWORD cbSize; /* Validate the cbSize as Windows XP does */ @@ -77,7 +78,37 @@ else cbSize = pnid->cbSize; - return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, cbSize, FALSE); + ZeroMemory(&nidW, sizeof(nidW)); + nidW.cbSize = sizeof(nidW); + nidW.hWnd = pnid->hWnd; + nidW.uID = pnid->uID; + nidW.uFlags = pnid->uFlags; + nidW.uCallbackMessage = pnid->uCallbackMessage; + nidW.hIcon = pnid->hIcon; + + /* szTip */ + if (pnid->uFlags & NIF_TIP) + MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, _countof(nidW.szTip)); + + if (cbSize >= NOTIFYICONDATAA_V2_SIZE) + { + nidW.dwState = pnid->dwState; + nidW.dwStateMask = pnid->dwStateMask; + + /* szInfo, szInfoTitle */ + if (pnid->uFlags & NIF_INFO) + { + MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, _countof(nidW.szTip)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, _countof(nidW.szTip)); + } + + nidW.uTimeout = pnid->uTimeout; + nidW.dwInfoFlags = pnid->dwInfoFlags; + } + + if (cbSize >= sizeof(NOTIFYICONDATAA)) + nidW.hBalloonIcon = pnid->hBalloonIcon; + return Shell_NotifyIconW(dwMessage, &nidW); } /*************************************************************************

8 years, 9 months

[akhaldi] 70359: [0.4.0] * Merge the Romanian translation update by Ștefan Fulea in revisions 70357 and 70358. CORE-10676

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 16 12:06:20 2015 New Revision: 70359 URL: http://svn.reactos.org/svn/reactos?rev=70359&view=rev Log: [0.4.0] * Merge the Romanian translation update by Ștefan Fulea in revisions 70357 and 70358. CORE-10676 Added: branches/ros-branch-0_4_0/reactos/base/applications/clipbrd/lang/ro-RO.rc - copied unchanged from r70358, trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/base/applications/cmdutils/clip/lang/ro-RO.rc - copied unchanged from r70358, trunk/reactos/base/applications/cmdutils/clip/lang/ro-RO.rc Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/applications/clipbrd/clipbrd.rc branches/ros-branch-0_4_0/reactos/base/applications/cmdutils/clip/clip.rc branches/ros-branch-0_4_0/reactos/base/applications/msconfig_new/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/dll/win32/browseui/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc branches/ros-branch-0_4_0/reactos/dll/win32/shell32/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/media/rapps/air.txt branches/ros-branch-0_4_0/reactos/media/rapps/dilinuxreader.txt branches/ros-branch-0_4_0/reactos/media/rapps/everythingse.txt branches/ros-branch-0_4_0/reactos/media/rapps/freestopwatch.txt branches/ros-branch-0_4_0/reactos/media/rapps/opera9.txt branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc branches/ros-branch-0_4_0/reactos/win32ss/user/user32/lang/ro-RO.rc Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 12:06:20 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70335-70337 +/trunk:70000-70321,70323-70324,70335-70337,70357-70358 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 12:06:20 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70335-70337 +/trunk/reactos:70000-70321,70323-70324,70335-70337,70357-70358 Modified: branches/ros-branch-0_4_0/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -27,6 +27,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif Modified: branches/ros-branch-0_4_0/reactos/base/applications/cmdutils/clip/clip.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -22,6 +22,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif Modified: branches/ros-branch-0_4_0/reactos/base/applications/msconfig_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/msconfig_new/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/msconfig_new/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -143,20 +143,20 @@ IDD_FIND_DIALOG DIALOGEX 30, 73, 236, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Find" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Find what:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP +CAPTION "GÄsire" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&GÄseÈte:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP EDITTEXT IDC_TXT_FIND_TEXT, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_GROUP - CONTROL "Match &whole word only", IDC_CBX_FIND_WHOLE_WORD_ONLY, + CONTROL "&Doar pentru Ã®ntreg cuvÃ¢ntul", IDC_CBX_FIND_WHOLE_WORD_ONLY, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12 - CONTROL "Match &case", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 - GROUPBOX "Direction", IDC_STATIC, 107, 26, 68, 28 - CONTROL "&Up", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 - CONTROL "&Down", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 - DEFPUSHBUTTON "Find &Next", IDOK, 182, 5, 50, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 182, 23, 50, 14, WS_GROUP - CONTROL "&Search from the beginning (Direction: Down) or end (Direction: Up)", IDC_CBX_FIND_FROM_BEGINNING, + CONTROL "Distinge &MAJ/min", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 + GROUPBOX "DirecÈie", IDC_STATIC, 107, 26, 68, 28 + CONTROL "S&us", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 + CONTROL "J&os", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 + DEFPUSHBUTTON "GÄseÈte &urmÄtorul", IDOK, 182, 5, 50, 14, WS_GROUP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 182, 23, 50, 14, WS_GROUP + CONTROL "&CautÄ de la Ã®nceput (DirecÈie: Sus) sau sfÃ¢rÈit (DirecÈie: Jos)", IDC_CBX_FIND_FROM_BEGINNING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 58, 231, 12 END Modified: branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -56,7 +56,7 @@ END POPUP "F&ormatare" BEGIN - MENUITEM "Mod te&xt Ã®ncadrat", CMD_WRAP + MENUITEM "Ãn&cadreazÄ liniile lungi", CMD_WRAP MENUITEM "&Fontâ¦", CMD_FONT END POPUP "&AfiÈare" @@ -187,5 +187,5 @@ STRING_LINE_COLUMN "Linia %d, coloana %d" STRING_PRINTERROR "Nu se poate imprima fiÈierul '%s'.\n\nAsiguraÈi-vÄ cÄ imprimanta este pornitÄ Èi configuratÄ corespunzÄtor." - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "Document text" END Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/shell/explorer/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -102,50 +102,50 @@ IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 - LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 +CAPTION "Particularizare notificÄri" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS afiÈeazÄ pictograme pentru notificÄri active Èi urgente Èi le ascunde pe cele inactive. PuteÈi altera acest comportament pentru elementele din lista de mai jos.", IDC_STATIC, 6, 6, 220, 30 + LTEXT "SelectaÈi un element apoi alegeÈi comportamentul de notificare:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS - PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "&Valori implicite", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 122, 220, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 +CAPTION "Particularizare meniu de Pornire clasic" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Meniul âPornireâ", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "PuteÈi particulariza meniul âPornireâ prin adÄugarea sau eliminarea de elemente.", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "A&dÄugareâ¦", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "&Eliminareâ¦", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "A&vansate", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "&Ordonare", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 + LTEXT "Pentru a elimina Ã®nregistrÄri ale documentelor, programelor, Èi siturilor Web recent accesate, apÄsaÈi âCurÄÈÄâ.", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "&CurÄÈÄ", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "OpÈiuni avansate ale meniului âPornireâ:", IDC_STATIC, 8, 129, 150, 8 CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 122, 220, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 176, 220, 50, 14 } IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 +CAPTION "Avertisment nume fiÈier" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Ign&orÄ", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "&RedenumeÈte", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "N&u efectua aceastÄ verificare la pornire", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Ãn calculator existÄ un fiÈier sau dosar numit %s care poate cauza probleme Ã®n funcÈionarea corectÄ a anumitor aplicaÈii. Redenumirea sa Ã®n %s ar rezolva aceastÄ problemÄ. DoriÈi sÄ-l redenumiÈi acum?", IDC_STATIC, 34, 7, 224, 37 } IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 @@ -153,15 +153,15 @@ CAPTION "Advanced" FONT 8, "MS Shell Dlg" { - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 - AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 + GROUPBOX "OpÈiuni ale meniului âPornireâ ", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "&Deschide submeniurile cÃ¢nd mÄ opresc la ele cu indicatorul Èoricelului", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "&EvidenÈiazÄ programele nou instalate", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "Elemente ale meniului âPornireâ:", IDC_STATIC, 7, 53, 238, 8 CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE - GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 - LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 - AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 + GROUPBOX "Documente recente ", IDC_STATIC, 7, 133, 238, 56 + LTEXT "SelectaÈi aceastÄ opÈiune pentru a oferi un acces rapid la documentele recent accesate. CurÄÈarea acestei liste nu va Èterge documentele.", IDC_STATIC, 14, 144, 224, 21 + AUTOCHECKBOX "AfiÈeazÄ cele mai &recent accesate documente", IDC_RECENTLY, 14, 168, 147, 10 + PUSHBUTTON "&CurÄÈÄ lista", IDC_CLEAR, 182, 168, 55, 14 } IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 @@ -169,18 +169,18 @@ CAPTION "General" FONT 8, "MS Shell Dlg" { - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 + GROUPBOX "SelectaÈi o dimensiune de pictogramÄ pentru programe ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 + AUTORADIOBUTTON "Pictograme m&ari", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "Pictograme &mici", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "Programe ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "Meniul âPornireâ conÈine scurtÄturi la programele cele mai utilizate. CurÄÈÃ¢nd lista de scurtÄturi nu va Èterge programele.", IDC_STATIC, 14, 63, 224, 20 + LTEXT "N&umÄrul de programe Ã®n meniul âPornireâ:", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 + PUSHBUTTON "&CurÄÈÄ lista", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "AfiÈare Ã®n meniul âPornireâ ", IDC_STATIC, 7, 126, 238, 63 AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 Modified: branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/f… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "FreeLoader Debugger" + IDS_APP_TITLE "Program de depanare FreeLoader" IDS_HELLO "Salut, lume!" IDC_FDEBUG "FDEBUG" END Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -119,7 +119,7 @@ LTEXT "NumÄr serial:", IDC_STATIC, 10, 55, 52, 8 LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 - AUTOCHECKBOX "Acesta este un calculator porta&bil", IDC_HWPPROP_PORTABLE, 17, 68, 115, 10, WS_GROUP | WS_TABSTOP + AUTOCHECKBOX "Acesta este un calculator porta&bil", IDC_HWPPROP_PORTABLE, 17, 68, 120, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Sta&rea de andocare este nespecificatÄ", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Calculatorul &este andocat", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 AUTORADIOBUTTON "Calculatorul n&u este andocat", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 Modified: branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/sh… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -3,6 +3,6 @@ STRINGTABLE BEGIN - IDS_NTOBJFLD_NAME "SpaÈiu de nume Obiect NT" + IDS_NTOBJFLD_NAME "SpaÈiul de nume Obiect NT" IDS_REGISTRY_NAME "Registrul de sistem" END Modified: branches/ros-branch-0_4_0/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -268,10 +268,10 @@ STRINGTABLE BEGIN IDS_BACK "Ãnapoi la %s" - IDS_FORWARD "Forward to %s" -END - -STRINGTABLE -BEGIN - IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" -END + IDS_FORWARD "Ãnainte la %s" +END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Ãnapoi|Ãnainte|Sus|CÄutare|Dosare|Mutare Ã®n|Copiere Ã®n|Ètergere|Desfacere|AfiÈÄri|Oprire|ÃmprospÄtare|AcasÄ|Conectare unitate de stocare|Deconectare|Favorite|Istoric|Pe tot ecranul|ProprietÄÈi|Decupare|Copiere|Lipire|OpÈiuni de dosar||" +END Modified: branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -31,9 +31,9 @@ IDS_NOTOLEMOD "FiÈierul nu pare a fi un modul OLE valid. Nu se poate Ã®nregistra controlul OLE." IDS_NOTOLEMODCAPTION "AdaugÄ un control" IDS_VERBMENU_OBJECT "&Obiect" - IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object" + IDS_VERBMENU_OBJECT_WITH_NAME "&Obiect %1" IDS_VERBMENU_CONVERT "&Convertireâ¦" - IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object" + IDS_VERBMENU_SINGLEVERB_OBJECT "&Obiect %1 %2" } STRINGTABLE Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -791,11 +791,11 @@ IDS_TTF_FILE "Font TrueType" IDS_OTF_FILE "Font OpenType" IDS_HLP_FILE "Manual de utilizare" - IDS_ICO_FILE "Icon" + IDS_ICO_FILE "PictogramÄ" IDS_INI_FILE "FiÈier de iniÈializare" IDS_LNK_FILE "ScurtÄturÄ" - IDS_PIF_FILE "NT VDM Program Information File" - IDS_SCR_FILE "Screen Saver" + IDS_PIF_FILE "FiÈier de informaÈii program NT VDM" + IDS_SCR_FILE "AnimaÈie regim de inactivitate" IDS_SYS_FILE "FiÈier de sistem" IDS_VXD_FILE "Pilot dispozitiv virtual" Modified: branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/shimgvw/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -25,11 +25,11 @@ STRINGTABLE BEGIN - // IDS_EMF_FILE "EMF Image" - IDS_GIF_FILE "GIF Image" - IDS_JPG_FILE "JPEG Image" - IDS_BMP_FILE "Bitmap Image" - IDS_PNG_FILE "PNG Image" - // IDS_TIF_FILE "TIF Image" - // IDS_WMF_FILE "WMF Image" + // IDS_EMF_FILE "Imagine EMF" + IDS_GIF_FILE "Imagine GIF" + IDS_JPG_FILE "Imagine JPEG" + IDS_BMP_FILE "Imagine bitmap" + IDS_PNG_FILE "Imagine PNG" + // IDS_TIF_FILE "Imagine TIF" + // IDS_WMF_FILE "Imagine WMF" END Modified: branches/ros-branch-0_4_0/reactos/media/rapps/air.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/media/rapps/air.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/media/rapps/air.txt [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -16,6 +16,11 @@ [Section.0407] Description = Mithilfe der Adobe AIR-Laufzeit kÃ¶nnen Entwickler den gleichen Code in native Anwendungen und Spiele einbinden. +[Section.0418] +License = Acord de licenÈiere Adobe Software +Description = Adobe AIR oferÄ programatorilor posibilitatea de a Ã®ncorpora Ã®n acelaÈi pachet aplicaÈii native Èi jocuri. +Size = 17,3 Mo + [Section.041f] License = Adobe YazÄ±lÄ±m Ruhsatlama AnlaÅmasÄ± Description = Adobe AIR yÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ geliÅtiricilere aynÄ± kodu Ã¶zgÃ¼n uygulamalara ve oyunlara paketlemeye olanak saÄlar. Modified: branches/ros-branch-0_4_0/reactos/media/rapps/dilinuxreader.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/media/rapps/dilinuxreader.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/media/rapps/dilinuxreader.txt [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -16,6 +16,11 @@ [Section.0407] Description = Eine einfache MÃ¶glichkeit zwischen Windows/ReactOS und Ext2/Ext3/Ext4, HFS und ReiserFS-Dateisystemen zu Ã¼berbrÃ¼cken. +[Section.0418] +License = GratuitÄ +Description = Un mod facil de acces Ã®ntre Windows/ReactOS Èi sistemele de fiÈiere Ext2/Ext3/Ext4, HFS Èi ReiserFS. +Size = 19,9 Mo + [Section.041f] Name = DiskInternals Linux Okuyucu License = Ãcretsiz Modified: branches/ros-branch-0_4_0/reactos/media/rapps/everythingse.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/media/rapps/everythingse.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/media/rapps/everythingse.txt [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -16,6 +16,11 @@ [Section.0407] Description = Finde schnell Dateien und Ordner durch den Namen. +[Section.0418] +License = GratuitÄ +Description = LocalizeazÄ automat dupÄ nume fiÈiere Èi dosare. +Size = 907 ko + [Section.041f] Name = TÃ¼m Åeyler Arama Motoru License = Ãcretsiz Modified: branches/ros-branch-0_4_0/reactos/media/rapps/freestopwatch.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/media/rapps/freestopwatch.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/media/rapps/freestopwatch.txt [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -16,6 +16,11 @@ [Section.0407] Description = Eine flexible digitale Stoppuhr-Software. +[Section.0418] +License = GratuitÄ +Description = AplicaÈie flexibilÄ de cronometru digital. +Size = 1,0 Mo + [Section.041f] Name = Ãcretsiz SÃ¼reÃ¶lÃ§er License = Ãcretsiz Modified: branches/ros-branch-0_4_0/reactos/media/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/media/… ============================================================================== --- branches/ros-branch-0_4_0/reactos/media/rapps/opera9.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/media/rapps/opera9.txt [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -38,7 +38,7 @@ [Section.0418] License = GratuitÄ -Description = Navigatorul popular Opera cu multe funcÈionalitÄÈi avansate, incluzÃ¢nd poÈtÄ electronicÄ Èi un client de BitTorrent. +Description = Navigator popular cu multe funcÈionalitÄÈi avansate, incluzÃ¢nd poÈtÄ electronicÄ Èi client de BitTorrent. Size = 7,21 Mo [Section.0419] Modified: branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/subsys… ============================================================================== --- branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -3,8 +3,8 @@ STRINGTABLE BEGIN - IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" - IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_CAPTURE_MOUSE, "&CapteazÄ indicatorul de Èoricel" + IDS_RELEASE_MOUSE, "&ElibereazÄ indicatorul de Èoricel" IDS_VDM_MENU , "ReactOS &VDM" END Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/user/user32/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/user/user32/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 12:06:20 2015 @@ -71,7 +71,7 @@ IDS_YES "D&a" IDS_NO "N&u" IDS_CLOSE "Ã&nchide" - IDS_HELP "Manual" + IDS_HELP "&Manual" IDS_TRYAGAIN "&ReÃ®ncearcÄ" IDS_CONTINUE "&ContinuÄ" END

8 years, 9 months

[akhaldi] 70358: [CLIPBRD] Translate ERROR_INVALID_FILE_FORMAT to Romanian. By Ștefan Fulea.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 16 10:26:31 2015 New Revision: 70358 URL: http://svn.reactos.org/svn/reactos?rev=70358&view=rev Log: [CLIPBRD] Translate ERROR_INVALID_FILE_FORMAT to Romanian. By Ștefan Fulea. Modified: trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc Modified: trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:26:31 2015 @@ -61,5 +61,5 @@ STRINGTABLE BEGIN ERROR_UNSUPPORTED_FORMAT "Ãn clipboard sunt date Ã®ntr-un format care nu poate fi afiÈat." - ERROR_INVALID_FILE_FORMAT "The selected file is not a valid clipboard file." + ERROR_INVALID_FILE_FORMAT "FiÈierul selectat nu e un fiÈier clipboard valid." END

8 years, 9 months

← Newer
1
...
9
10
11
12
13
14
15
...
26
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 December 2015