Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[gedmurphy] 31688: forgot to remove the assert

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 9 19:07:48 2008 New Revision: 31688 URL: http://svn.reactos.org/svn/reactos?rev=31688&view=rev Log: forgot to remove the assert Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c Wed Jan 9 19:07:48 2008 @@ -108,8 +108,6 @@ } DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d\n", iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor ); - - ASSERT(FALSE); //#endif return NULL; #if 0

17 years

[gedmurphy] 31687: - Fall back onto some of the previous win32k icon handling code, and fix user32 to suit. - This fixes the handle problem we were seeing which was caused by a failing NtUserFindExistingCursorIcon call in user32. It was incompatible with the new code and thus, creating a new icon for all LR_SHARED resources. - The new code is correct, and will be re-enabled once I've finished the cursoricon object rewrite (which will make it compatible with windows) - You'll probably need to 'ma

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 9 19:04:34 2008 New Revision: 31687 URL: http://svn.reactos.org/svn/reactos?rev=31687&view=rev Log: - Fall back onto some of the previous win32k icon handling code, and fix user32 to suit. - This fixes the handle problem we were seeing which was caused by a failing NtUserFindExistingCursorIcon call in user32. It was incompatible with the new code and thus, creating a new icon for all LR_SHARED resources. - The new code is correct, and will be re-enabled once I've finished the cursoricon object rewrite (which will make it compatible with windows) - You'll probably need to 'make win32k_clean' before building Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Wed Jan 9 19:04:34 2008 @@ -268,7 +268,7 @@ if (hIcon && 0 != (fuLoad & LR_SHARED)) { -#if 0 +#if 1 NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, hResInfo, (HRSRC)NULL); #else @@ -762,7 +762,7 @@ return pbi->bmiHeader.biBitCount; } - +#if 0 static BOOL SetCursorIconData( HANDLE Handle, @@ -770,6 +770,7 @@ LPWSTR lpResName, PICONINFO pIconInfo) { + UNICODE_STRING Res; if (!Handle || !pIconInfo) @@ -778,6 +779,7 @@ RtlInitUnicodeString(&Res, lpResName); return NtUserSetCursorIconData(Handle, hMod, &Res, pIconInfo); + } @@ -840,7 +842,7 @@ return hNewIcon; } - +#endif /* * @unimplemented @@ -873,7 +875,8 @@ return CopyBmp(hnd, type, desiredx, desiredy, flags); case IMAGE_ICON: - return CopyIcoCur(hnd, type, desiredx, desiredy, flags); + //return CopyIcoCur(hnd, type, desiredx, desiredy, flags); + return CopyIcon(hnd); case IMAGE_CURSOR: { Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Jan 9 19:04:34 2008 @@ -2067,9 +2067,11 @@ NTAPI NtUserSetCursorIconData( HANDLE Handle, + PBOOL fIcon, + POINT *Hotspot, HMODULE hModule, - PUNICODE_STRING pstrResName, - PICONINFO pIconInfo); + HRSRC hRsrc, + HRSRC hGroupRsrc); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Wed Jan 9 19:04:34 2008 @@ -1187,6 +1187,7 @@ /* * @implemented */ +#if 0 BOOL NTAPI NtUserSetCursorIconData( @@ -1272,7 +1273,89 @@ UserLeave(); END_CLEANUP; } - +#else +BOOL +STDCALL +NtUserSetCursorIconData( + HANDLE hCurIcon, + PBOOL fIcon, + POINT *Hotspot, + HMODULE hModule, + HRSRC hRsrc, + HRSRC hGroupRsrc) +{ + PCURICON_OBJECT CurIcon; + PWINSTATION_OBJECT WinSta; + NTSTATUS Status; + POINT SafeHotspot; + BOOL Ret = FALSE; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserSetCursorIconData\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if(WinSta == NULL) + { + RETURN( FALSE); + } + + if(!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + ObDereferenceObject(WinSta); + RETURN(FALSE); + } + + CurIcon->hModule = hModule; + CurIcon->hRsrc = hRsrc; + CurIcon->hGroupRsrc = hGroupRsrc; + + /* Copy fields */ + if(fIcon) + { + Status = MmCopyFromCaller(&CurIcon->IconInfo.fIcon, fIcon, sizeof(BOOL)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + goto done; + } + } + else + { + if(!Hotspot) + Ret = TRUE; + } + + if(Hotspot) + { + Status = MmCopyFromCaller(&SafeHotspot, Hotspot, sizeof(POINT)); + if(NT_SUCCESS(Status)) + { + CurIcon->IconInfo.xHotspot = SafeHotspot.x; + CurIcon->IconInfo.yHotspot = SafeHotspot.y; + + Ret = TRUE; + } + else + SetLastNtError(Status); + } + + if(!fIcon && !Hotspot) + { + Ret = TRUE; + } + +done: + ObDereferenceObject(WinSta); + RETURN( Ret); + + +CLEANUP: + DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} +#endif /* * @unimplemented Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c Wed Jan 9 19:04:34 2008 @@ -108,6 +108,8 @@ } DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d\n", iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor ); + + ASSERT(FALSE); //#endif return NULL; #if 0 Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Jan 9 19:04:34 2008 @@ -519,7 +519,7 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -NtUserSetCursorIconData 4 +NtUserSetCursorIconData 6 #4 NtUserSetDbgTag 2 NtUserSetFocus 1 NtUserSetImeHotKey 5

17 years

[cwittich] 31686: add Internet Explorer registry entries (now Visio 2003 installer doesn't complain about missing IE anymore)

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 9 17:21:39 2008 New Revision: 31686 URL: http://svn.reactos.org/svn/reactos?rev=31686&view=rev Log: add Internet Explorer registry entries (now Visio 2003 installer doesn't complain about missing IE anymore) Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Wed Jan 9 17:21:39 2008 @@ -190,7 +190,7 @@ HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" -System-Files +; System-Files HKCR,".sys","",0x00000000,"sysfile" HKCR,"sysfile","",0x00000000,"System File" HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" @@ -666,4 +666,107 @@ HKCR,"MIME\Database\Rfc1766","043D",0x00000000,"ji;Yiddish" HKCR,"MIME\Database\Rfc1766","0435",0x00000000,"zu;Zulu" +HKCR,"CLSID\{FBF23B42-E3F0-101B-8488-00AA003E56F8}",,,"Internet Explorer(Ver 1.0)" +HKCR,"CLSID\{FBF23B42-E3F0-101B-8488-00AA003E56F8}\LocalServer32",,,"iexplore.exe" +HKCR,"CLSID\{FBF23B42-E3F0-101B-8488-00AA003E56F8}\ProgID",,,"InternetExplorer.Application.1" +HKCR,"CLSID\{FBF23B42-E3F0-101B-8488-00AA003E56F8}\VersionIndependentProgID",,,"InternetExplorer.Application" +HKCR,"InternetExplorer.Application",,,"Internet Explorer(Ver 1.0)" +HKCR,"InternetExplorer.Application\CLSID",,,"{FBF23B42-E3F0-101B-8488-00AA003E56F8}" +HKCR,"InternetExplorer.Application\CurVer",,,"InternetExplorer.Application.1" +HKCR,"InternetExplorer.Application.1",,,"Internet Explorer(Ver 1.0)" +HKCR,"InternetExplorer.Application.1\CLSID",,,"{FBF23B42-E3F0-101B-8488-00AA003E56F8}" + +;HKCR,"CLSID\%CLSID_SearchAssistantOC%",,,"SearchAssistantOC" +;HKCR,"CLSID\%CLSID_SearchAssistantOC%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_SearchAssistantOC%\InProcServer32","ThreadingModel",,"Apartment" +;HKCR,"CLSID\%CLSID_SearchAssistantOC%\ProgID",,,"SearchAssistantOC.SearchAssistantOC.1" +;HKCR,"CLSID\%CLSID_SearchAssistantOC%\VersionIndependentProgID",,,"SearchAssistantOC.SearchAssistantOC" +;HKCR,"SearchAssistantOC.SearchAssistantOC",,,"" +;HKCR,"SearchAssistantOC.SearchAssistantOC\CLSID",,,"%CLSID_SearchAssistantOC%" +;HKCR,"SearchAssistantOC.SearchAssistantOC\CurVer",,,"SearchAssistantOC.SearchAssistantOC.1" +;HKCR,"SearchAssistantOC.SearchAssistantOC.1",,,"" +;HKCR,"SearchAssistantOC.SearchAssistantOC.1\CLSID",,,"%CLSID_SearchAssistantOC%" + +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}",,,"Shell Name Space" +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}\ProgID",,,"ShellNameSpace.ShellNameSpace.1" +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}\VersionIndependentProgID",,,"ShellNameSpace.ShellNameSpace" + +HKCR,"CLSID\{3C374A40-BAE4-11CF-BF7D-00AA006946EE}",,,"Microsoft Url History Service" +HKCR,"CLSID\{3C374A40-BAE4-11CF-BF7D-00AA006946EE}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{3C374A40-BAE4-11CF-BF7D-00AA006946EE}\InProcServer32","ThreadingModel",,"Apartment" + +;HKCR,"CLSID\%CLSID_MruLongList%",,,"MruLongList" +;HKCR,"CLSID\%CLSID_MruLongList%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_MruLongList%\InProcServer32","ThreadingModel",,"Apartment" + +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%",,,"Shell Name Space" +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%\InProcServer32","ThreadingModel",,"Apartment" +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%\ProgID",,,"ShellNameSpace.ShellNameSpace.1" +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%\VersionIndependentProgID",,,"ShellNameSpace.ShellNameSpace" + +HKCR,"CLSID\{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}",,,"Microsoft Shell UI Helper" +HKCR,"CLSID\{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}\ProgID",,,"Shell.UIHelper.1" +HKCR,"Shell.UIHelper",,,"Microsoft Shell UI Helper" +HKCR,"Shell.UIHelper\CLSID",,,"{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}" +HKCR,"Shell.UIHelper\CurVer",,,"Shell.UIHelper.2" +HKCR,"Shell.UIHelper.1",,,"" +HKCR,"Shell.UIHelper.1\CLSID",,,"{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}" + +HKCR,"CLSID\{871C5380-42A0-1069-A2EA-08002B30309D}",,,"Internet Explorer" +HKCR,"CLSID\{871C5380-42A0-1069-A2EA-08002B30309D}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{871C5380-42A0-1069-A2EA-08002B30309D}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{871C5380-42A0-1069-A2EA-08002B30309D}\ShellFolder",,2,"0x24" + +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}",,,"Microsoft Web Browser" +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}\ProgID",,,"Shell.Explorer.2" +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}\VersionIndependentProgID",,,"Shell.Explorer" +HKCR,"Shell.Explorer",,,"Microsoft Web Browser" +HKCR,"Shell.Explorer\CLSID",,,"{8856F961-340A-11D0-A96B-00C04FD705A2}" +HKCR,"Shell.Explorer\CurVer",,,"Shell.Explorer.2" +HKCR,"Shell.Explorer.2",,,"" +HKCR,"Shell.Explorer.2\CLSID",,,"{8856F961-340A-11D0-A96B-00C04FD705A2}" + +HKCR,"CLSID\{9BA05972-F6A8-11CF-A442-00A0C90A8F39}",,,"ShellWindows" +HKCR,"CLSID\{9BA05972-F6A8-11CF-A442-00A0C90A8F39}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{9BA05972-F6A8-11CF-A442-00A0C90A8F39}\InProcServer32","ThreadingModel",,"Apartment" + +;HKCR,"CLSID\%CLSID_MicrosoftBrowserArchitecture%",,,"Microsoft Browser Architecture" +;HKCR,"CLSID\%CLSID_MicrosoftBrowserArchitecture%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_MicrosoftBrowserArchitecture%\InProcServer32","ThreadingModel",,"Apartment" + +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%",,,"SearchAssistantOC" +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%\InProcServer32","ThreadingModel",,"Apartment" +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%\ProgID",,,"SearchAssistantOC.SearchAssistantOC.1" +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%\VersionIndependentProgID",,,"SearchAssistantOC.SearchAssistantOC" + +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}",,,"Microsoft Web Browser Version 1" +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}\ProgID",,,"Shell.Explorer.1" +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}\VersionIndependentProgID",,,"Shell.Explorer" +HKCR,"Shell.Explorer.1",,,"" +HKCR,"Shell.Explorer.1\CLSID",,,"{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}",,,"Internet Shortcut" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}\ProgID",,,"InternetShortcut" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}\shellex\MayChangeDefaultMenu",,, +HKCR,"InternetShortcut",,,"Internet Shortcut" +HKCR,"InternetShortcut","EditFlags",2,"2" +HKCR,"InternetShortcut","IsShortcut",, +HKCR,"InternetShortcut","NeverShowExt",, +;HKCR,"InternetShortcut\CLSID",,,"%CLSID_InteretShortcut%" +HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0" +HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l" +HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\"" +HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\" \"%2\" \"%3\" \"%4\"" + ; EOF Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Wed Jan 9 17:21:39 2008 @@ -122,4 +122,10 @@ 75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +; Internet Explorer + +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",,"http://www.reactos.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",,"http://www.google.com" + + ; EOF Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Wed Jan 9 17:21:39 2008 @@ -2,6 +2,9 @@ Signature="$ReactOS$ [AddReg] + +; Internet Explorer +HKLM,"Software\Microsoft\Internet Explorer","Version",,"6.0.2900.2180" ; DirectX HKLM,"SOFTWARE\Microsoft\DirectX","Version",0x00000000,"4.09.00.0904"

17 years

[gedmurphy] 31685: sorry, I deleted the wrong entry

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 9 17:03:13 2008 New Revision: 31685 URL: http://svn.reactos.org/svn/reactos?rev=31685&view=rev Log: sorry, I deleted the wrong entry Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Jan 9 17:03:13 2008 @@ -519,7 +519,7 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -NtUserSetCursorIconData 6 +NtUserSetCursorIconData 4 NtUserSetDbgTag 2 NtUserSetFocus 1 NtUserSetImeHotKey 5

17 years

[cwittich] 31684: add missing forwarders

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 9 15:59:36 2008 New Revision: 31684 URL: http://svn.reactos.org/svn/reactos?rev=31684&view=rev Log: add missing forwarders Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Wed Jan 9 15:59:36 2008 @@ -19,12 +19,12 @@ ; LIBRARY CFGMGR32.DLL EXPORTS -CMP_Init_Detection = SETUPAPI.CMP_Init_Detection -;CMP_RegisterNotification -CMP_Report_LogOn = SETUPAPI.CMP_Report_LogOn -;CMP_UnregisterNotification -;CMP_WaitNoPendingInstallEvents -;CMP_WaitServices +CMP_Init_Detection=SETUPAPI.CMP_Init_Detection +CMP_RegisterNotification=SETUPAPI.CMP_RegisterNotification +CMP_Report_LogOn=SETUPAPI.CMP_Report_LogOn +CMP_UnregisterNotification=SETUPAPI.CMP_UnregisterNotification +CMP_WaitNoPendingInstallEvents=SETUPAPI.CMP_WaitNoPendingInstallEvents +CMP_WaitServicesAvailable=SETUPAPI.CMP_WaitServicesAvailable CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex CM_Add_IDA=SETUPAPI.CM_Add_IDA @@ -35,27 +35,27 @@ CM_Add_IDW=SETUPAPI.CM_Add_IDW CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW -;CM_Add_Range -;CM_Add_Res_Des -;CM_Add_Res_Des_Ex +CM_Add_Range=SETUPAPI.CM_Add_Range +CM_Add_Res_Des=SETUPAPI.CM_Add_Res_Des +CM_Add_Res_Des_Ex=SETUPAPI.CM_Add_Res_Des_Ex CM_Connect_MachineA=SETUPAPI.CM_Connect_MachineA CM_Connect_MachineW=SETUPAPI.CM_Connect_MachineW CM_Create_DevNodeA=SETUPAPI.CM_Create_DevNodeA CM_Create_DevNodeW=SETUPAPI.CM_Create_DevNodeW CM_Create_DevNode_ExA=SETUPAPI.CM_Create_DevNode_ExA CM_Create_DevNode_ExW=SETUPAPI.CM_Create_DevNode_ExW -;CM_Create_Range_List +CM_Create_Range_List=SETUPAPI.CM_Create_Range_List CM_Delete_Class_Key=SETUPAPI.CM_Delete_Class_Key CM_Delete_Class_Key_Ex=SETUPAPI.CM_Delete_Class_Key_Ex CM_Delete_DevNode_Key=SETUPAPI.CM_Delete_DevNode_Key CM_Delete_DevNode_Key_Ex=SETUPAPI.CM_Delete_DevNode_Key_Ex -;CM_Delete_Range -;CM_Detect_Resource_Conflict -;CM_Detect_Resource_Conflict_Ex +CM_Delete_Range=SETUPAPI.CM_Delete_Range +CM_Detect_Resource_Conflict=SETUPAPI.CM_Detect_Resource_Conflict +CM_Detect_Resource_Conflict_Ex=SETUPAPI.CM_Detect_Resource_Conflict_Ex CM_Disable_DevNode=SETUPAPI.CM_Disable_DevNode CM_Disable_DevNode_Ex=SETUPAPI.CM_Disable_DevNode_Ex CM_Disconnect_Machine=SETUPAPI.CM_Disconnect_Machine -;CM_Dup_Range_List +CM_Dup_Range_List=SETUPAPI.CM_Dup_Range_List CM_Enable_DevNode=SETUPAPI.CM_Enable_DevNode CM_Enable_DevNode_Ex=SETUPAPI.CM_Enable_DevNode_Ex CM_Enumerate_Classes=SETUPAPI.CM_Enumerate_Classes @@ -64,17 +64,17 @@ CM_Enumerate_EnumeratorsW=SETUPAPI.CM_Enumerate_EnumeratorsW CM_Enumerate_Enumerators_ExA=SETUPAPI.CM_Enumerate_Enumerators_ExA CM_Enumerate_Enumerators_ExW=SETUPAPI.CM_Enumerate_Enumerators_ExW -;CM_Find_Range -;CM_First_Range +CM_Find_Range=SETUPAPI.CM_Find_Range +CM_First_Range=SETUPAPI.CM_First_Range CM_Free_Log_Conf=SETUPAPI.CM_Free_Log_Conf CM_Free_Log_Conf_Ex=SETUPAPI.CM_Free_Log_Conf_Ex CM_Free_Log_Conf_Handle=SETUPAPI.CM_Free_Log_Conf_Handle -;CM_Free_Range_List -;CM_Free_Res_Des -;CM_Free_Res_Des_Ex -;CM_Free_Res_Des_Handle -CM_Get_Child = SETUPAPI.CM_Get_Child -CM_Get_Child_Ex = SETUPAPI.CM_Get_Child_Ex +CM_Free_Range_List=SETUPAPI.CM_Free_Range_List +CM_Free_Res_Des=SETUPAPI.CM_Free_Res_Des +CM_Free_Res_Des_Ex=SETUPAPI.CM_Free_Res_Des_Ex +CM_Free_Res_Des_Handle=SETUPAPI.CM_Free_Res_Des_Handle +CM_Get_Child=SETUPAPI.CM_Get_Child +CM_Get_Child_Ex=SETUPAPI.CM_Get_Child_Ex CM_Get_Class_Key_NameA=SETUPAPI.CM_Get_Class_Key_NameA CM_Get_Class_Key_NameW=SETUPAPI.CM_Get_Class_Key_NameW CM_Get_Class_Key_Name_ExA=SETUPAPI.CM_Get_Class_Key_Name_ExA @@ -105,18 +105,18 @@ CM_Get_Device_ID_List_Size_ExW=SETUPAPI.CM_Get_Device_ID_List_Size_ExA CM_Get_Device_ID_Size=SETUPAPI.CM_Get_Device_ID_Size CM_Get_Device_ID_Size_Ex=SETUPAPI.CM_Get_Device_ID_Size_Ex -;CM_Get_Device_Interface_AliasA -;CM_Get_Device_Interface_AliasW -;CM_Get_Device_Interface_Alias_ExA -;CM_Get_Device_Interface_Alias_ExW -;CM_Get_Device_Interface_ListA -;CM_Get_Device_Interface_ListW -;CM_Get_Device_Interface_List_ExA -;CM_Get_Device_Interface_List_ExW -;CM_Get_Device_Interface_List_SizeA -;CM_Get_Device_Interface_List_SizeW -;CM_Get_Device_Interface_List_Size_ExA -;CM_Get_Device_Interface_List_Size_ExW +CM_Get_Device_Interface_AliasA=SETUPAPI.CM_Get_Device_Interface_AliasA +CM_Get_Device_Interface_AliasW=SETUPAPI.CM_Get_Device_Interface_AliasW +CM_Get_Device_Interface_Alias_ExA=SETUPAPI.CM_Get_Device_Interface_Alias_ExA +CM_Get_Device_Interface_Alias_ExW=SETUPAPI.CM_Get_Device_Interface_Alias_ExW +CM_Get_Device_Interface_ListA=SETUPAPI.CM_Get_Device_Interface_ListA +CM_Get_Device_Interface_ListW=SETUPAPI.CM_Get_Device_Interface_ListW +CM_Get_Device_Interface_List_ExA=SETUPAPI.CM_Get_Device_Interface_List_ExA +CM_Get_Device_Interface_List_ExW=SETUPAPI.CM_Get_Device_Interface_List_ExW +CM_Get_Device_Interface_List_SizeA=SETUPAPI.CM_Get_Device_Interface_List_SizeA +CM_Get_Device_Interface_List_SizeW=SETUPAPI.CM_Get_Device_Interface_List_SizeW +CM_Get_Device_Interface_List_Size_ExA=SETUPAPI.CM_Get_Device_Interface_List_Size_ExA +CM_Get_Device_Interface_List_Size_ExW=SETUPAPI.CM_Get_Device_Interface_List_Size_ExW CM_Get_First_Log_Conf=SETUPAPI.CM_Get_First_Log_Conf CM_Get_First_Log_Conf_Ex=SETUPAPI.CM_Get_First_Log_Conf_Ex CM_Get_Global_State=SETUPAPI.CM_Get_Global_State @@ -125,70 +125,70 @@ CM_Get_HW_Prof_FlagsW=SETUPAPI.CM_Get_HW_Prof_FlagsW CM_Get_HW_Prof_Flags_ExA=SETUPAPI.CM_Get_HW_Prof_Flags_ExA CM_Get_HW_Prof_Flags_ExW=SETUPAPI.CM_Get_HW_Prof_Flags_ExW -;CM_Get_Hardware_Profile_InfoA -;CM_Get_Hardware_Profile_InfoW -;CM_Get_Hardware_Profile_Info_ExA -;CM_Get_Hardware_Profile_Info_ExW +CM_Get_Hardware_Profile_InfoA=SETUPAPI.CM_Get_Hardware_Profile_InfoA +CM_Get_Hardware_Profile_InfoW=SETUPAPI.CM_Get_Hardware_Profile_InfoW +CM_Get_Hardware_Profile_Info_ExA=SETUPAPI.CM_Get_Hardware_Profile_Info_ExA +CM_Get_Hardware_Profile_Info_ExW=SETUPAPI.CM_Get_Hardware_Profile_Info_ExW CM_Get_Log_Conf_Priority=SETUPAPI.CM_Get_Log_Conf_Priority CM_Get_Log_Conf_Priority_Ex=SETUPAPI.CM_Get_Log_Conf_Priority_Ex CM_Get_Next_Log_Conf=SETUPAPI.CM_Get_Next_Log_Conf CM_Get_Next_Log_Conf_Ex=SETUPAPI.CM_Get_Next_Log_Conf_Ex -;CM_Get_Next_Res_Des -;CM_Get_Next_Res_Des_Ex +CM_Get_Next_Res_Des=SETUPAPI.CM_Get_Next_Res_Des +CM_Get_Next_Res_Des_Ex=SETUPAPI.CM_Get_Next_Res_Des_Ex CM_Get_Parent=SETUPAPI.CM_Get_Parent CM_Get_Parent_Ex=SETUPAPI.CM_Get_Parent_Ex -;CM_Get_Res_Des_Data -;CM_Get_Res_Des_Data_Ex -;CM_Get_Res_Des_Data_Size -;CM_Get_Res_Des_Data_Size_Ex +CM_Get_Res_Des_Data=SETUPAPI.CM_Get_Res_Des_Data +CM_Get_Res_Des_Data_Ex=SETUPAPI.CM_Get_Res_Des_Data_Ex +CM_Get_Res_Des_Data_Size=SETUPAPI.CM_Get_Res_Des_Data_Size +CM_Get_Res_Des_Data_Size_Ex=SETUPAPI.CM_Get_Res_Des_Data_Size_Ex CM_Get_Sibling=SETUPAPI.CM_Get_Sibling CM_Get_Sibling_Ex=SETUPAPI.CM_Get_Sibling_Ex CM_Get_Version=SETUPAPI.CM_Get_Version CM_Get_Version_Ex=SETUPAPI.CM_Get_Version_Ex -;CM_Intersect_Range_List -;CM_Invert_Range_List +CM_Intersect_Range_List=SETUPAPI.CM_Intersect_Range_List +CM_Invert_Range_List=SETUPAPI.CM_Invert_Range_List CM_Is_Dock_Station_Present=SETUPAPI.CM_Is_Dock_Station_Present CM_Is_Dock_Station_Present_Ex=SETUPAPI.CM_Is_Dock_Station_Present_Ex CM_Locate_DevNodeA=SETUPAPI.CM_Locate_DevNodeA CM_Locate_DevNodeW=SETUPAPI.CM_Locate_DevNodeW CM_Locate_DevNode_ExA=SETUPAPI.CM_Locate_DevNode_ExA CM_Locate_DevNode_ExW=SETUPAPI.CM_Locate_DevNode_ExW -;CM_Merge_Range_List -;CM_Modify_Res_Des -;CM_Modify_Res_Des_Ex +CM_Merge_Range_List=SETUPAPI.CM_Merge_Range_List +CM_Modify_Res_Des=SETUPAPI.CM_Modify_Res_Des +CM_Modify_Res_Des_Ex=SETUPAPI.CM_Modify_Res_Des_Ex CM_Move_DevNode=SETUPAPI.CM_Move_DevNode CM_Move_DevNode_Ex=SETUPAPI.CM_Move_DevNode_Ex -;CM_Next_Range +CM_Next_Range=SETUPAPI.CM_Next_Range CM_Open_Class_KeyA=SETUPAPI.CM_Open_Class_KeyA CM_Open_Class_KeyW=SETUPAPI.CM_Open_Class_KeyW CM_Open_Class_Key_ExA=SETUPAPI.CM_Open_Class_Key_ExA CM_Open_Class_Key_ExW=SETUPAPI.CM_Open_Class_Key_ExW CM_Open_DevNode_Key=SETUPAPI.CM_Open_DevNode_Key CM_Open_DevNode_Key_Ex=SETUPAPI.CM_Open_DevNode_Key_Ex -;CM_Query_Arbitrator_Free_Data -;CM_Query_Arbitrator_Free_Data_Ex -;CM_Query_Arbitrator_Free_Size -;CM_Query_Arbitrator_Free_Size_Ex -;CM_Query_Remove_SubTree -;CM_Query_Remove_SubTree_Ex +CM_Query_Arbitrator_Free_Data=SETUPAPI.CM_Query_Arbitrator_Free_Data +CM_Query_Arbitrator_Free_Data_Ex=SETUPAPI.CM_Query_Arbitrator_Free_Data_Ex +CM_Query_Arbitrator_Free_Size=SETUPAPI.CM_Query_Arbitrator_Free_Size +CM_Query_Arbitrator_Free_Size_Ex=SETUPAPI.CM_Query_Arbitrator_Free_Size_Ex +CM_Query_Remove_SubTree=SETUPAPI.CM_Query_Remove_SubTree +CM_Query_Remove_SubTree_Ex=SETUPAPI.CM_Query_Remove_SubTree_Ex CM_Reenumerate_DevNode=SETUPAPI.CM_Reenumerate_DevNode CM_Reenumerate_DevNode_Ex=SETUAPI.CM_Reenumerate_DevNode_Ex -;CM_Register_Device_Driver -;CM_Register_Device_Driver_Ex -;CM_Register_Device_InterfaceA -;CM_Register_Device_InterfaceW -;CM_Register_Device_Interface_ExA -;CM_Register_Device_Interface_ExW -;CM_Remove_SubTree -;CM_Remove_SubTree_Ex -;CM_Remove_Unmarked_Children -;CM_Remove_Unmarked_Children_Ex -;CM_Request_Device_EjectA -;CM_Request_Device_EjectW +CM_Register_Device_Driver=SETUAPI.CM_Register_Device_Driver +CM_Register_Device_Driver_Ex=SETUAPI.CM_Register_Device_Driver_Ex +CM_Register_Device_InterfaceA=SETUAPI.CM_Register_Device_InterfaceA +CM_Register_Device_InterfaceW=SETUAPI.CM_Register_Device_InterfaceW +CM_Register_Device_Interface_ExA=SETUAPI.CM_Register_Device_Interface_ExA +CM_Register_Device_Interface_ExW=SETUAPI.CM_Register_Device_Interface_ExW +CM_Remove_SubTree=SETUAPI.CM_Remove_SubTree +CM_Remove_SubTree_Ex=SETUAPI.CM_Remove_SubTree_Ex +CM_Remove_Unmarked_Children=SETUAPI.CM_Remove_Unmarked_Children +CM_Remove_Unmarked_Children_Ex=SETUAPI.CM_Remove_Unmarked_Children_Ex +CM_Request_Device_EjectA=SETUAPI.CM_Request_Device_EjectA +CM_Request_Device_EjectW=SETUAPI.CM_Request_Device_EjectW CM_Request_Eject_PC=SETUPAPI.CM_Request_Eject_PC CM_Request_Eject_PC_Ex=SETUPAPI.CM_Request_Eject_PC_Ex -;CM_Reset_Children_Marks -;CM_Reset_Children_Marks_Ex +CM_Reset_Children_Marks=SETUPAPI.CM_Reset_Children_Marks +CM_Reset_Children_Marks_Ex=SETUPAPI.CM_Reset_Children_Marks_Ex CM_Run_Detection=SETUPAPI.CM_Run_Detection CM_Run_Detection_Ex=SETUPAPI.CM_Run_Detection_Ex CM_Set_DevNode_Problem=SETUPAPI.CM_Set_DevNode_Problem @@ -197,18 +197,18 @@ CM_Set_DevNode_Registry_PropertyW=SETUPAPI.CM_Set_DevNode_Registry_PropertyW CM_Set_DevNode_Registry_Property_ExA=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA CM_Set_DevNode_Registry_Property_ExW=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW -;CM_Set_HW_Prof -;CM_Set_HW_Prof_Ex +CM_Set_HW_Prof=SETUPAPI.CM_Set_HW_Prof +CM_Set_HW_Prof_Ex=SETUPAPI.CM_Set_HW_Prof_Ex CM_Set_HW_Prof_FlagsA=SETUPAPI.CM_Set_HW_Prof_FlagsA CM_Set_HW_Prof_FlagsW=SETUPAPI.CM_Set_HW_Prof_FlagsW CM_Set_HW_Prof_Flags_ExA=SETUPAPI.CM_Set_HW_Prof_Flags_ExA CM_Set_HW_Prof_Flags_ExW=SETUPAPI.CM_Set_HW_Prof_Flags_ExW CM_Setup_DevNode=SETUPAPI.CM_Setup_DevNode CM_Setup_DevNode_Ex=SETUPAPI.CM_Setup_DevNode_Ex -;CM_Test_Range_Available +CM_Test_Range_Available=SETUPAPI.CM_Test_Range_Available CM_Uninstall_DevNode=SETUPAPI.CM_Uninstall_DevNode CM_Uninstall_DevNode_Ex=SETUPAPI.CM_Uninstall_DevNode_Ex -;CM_Unregister_Device_InterfaceA -;CM_Unregister_Device_InterfaceW -;CM_Unregister_Device_Interface_ExA -;CM_Unregister_Device_Interface_ExW +CM_Unregister_Device_InterfaceA=SETUPAPI.CM_Unregister_Device_InterfaceA +CM_Unregister_Device_InterfaceW=SETUPAPI.CM_Unregister_Device_InterfaceW +CM_Unregister_Device_Interface_ExA=SETUPAPI.CM_Unregister_Device_Interface_ExA +CM_Unregister_Device_Interface_ExW=SETUPAPI.CM_Unregister_Device_Interface_ExW

17 years

[gedmurphy] 31683: remove duplicate entry

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 9 15:42:21 2008 New Revision: 31683 URL: http://svn.reactos.org/svn/reactos?rev=31683&view=rev Log: remove duplicate entry Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Jan 9 15:42:21 2008 @@ -519,7 +519,6 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -NtUserSetCursorIconData 4 NtUserSetCursorIconData 6 NtUserSetDbgTag 2 NtUserSetFocus 1

17 years

[hpoussin] 31682: Add 'const' when needed Remove a string copy (an a possible buffer overflow)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jan 9 12:40:47 2008 New Revision: 31682 URL: http://svn.reactos.org/svn/reactos?rev=31682&view=rev Log: Add 'const' when needed Remove a string copy (an a possible buffer overflow) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Jan 9 12:40:47 2008 @@ -199,8 +199,8 @@ } VOID -PopupError(PCHAR Text, - PCHAR Status, +PopupError(PCCH Text, + PCCH Status, PINPUT_RECORD Ir, ULONG WaitEvent) { @@ -212,7 +212,7 @@ ULONG MaxLength; ULONG Lines; PCHAR p; - PCHAR pnext; + PCCH pnext; BOOLEAN LastLine; SHORT Width; SHORT Height; @@ -560,14 +560,14 @@ DPRINT("Running unattended setup\n"); } -void -UpdateKBLayout() +VOID +UpdateKBLayout(VOID) { PLIST_ENTRY Entry; PGENERIC_LIST_ENTRY ListEntry; - WCHAR szNewLayout[20]; - - MUIDefaultKeyboardLayout(szNewLayout); + LPCWSTR pszNewLayout; + + pszNewLayout = MUIDefaultKeyboardLayout(); if (LayoutList == NULL) { @@ -575,17 +575,22 @@ } Entry = LayoutList->ListHead.Flink; - while (Entry != &LayoutList->ListHead) - { - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - - if (!wcscmp(szNewLayout, ListEntry->UserData)) - { - LayoutList->CurrentEntry = ListEntry; - break; - } - - Entry = Entry->Flink; + + /* Search for default layout (if provided) */ + if (pszNewLayout != NULL) + { + while (Entry != &LayoutList->ListHead) + { + ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + + if (!wcscmp(pszNewLayout, ListEntry->UserData)) + { + LayoutList->CurrentEntry = ListEntry; + break; + } + + Entry = Entry->Flink; + } } } Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Wed Jan 9 12:40:47 2008 @@ -42,7 +42,7 @@ #include "lang/sv-SE.h" #include "lang/uk-UA.h" -static MUI_LANGUAGE LanguageList[] = +static const MUI_LANGUAGE LanguageList[] = { { L"00000409", /* The Language ID */ @@ -155,18 +155,18 @@ extern VOID -PopupError(PCHAR Text, - PCHAR Status, - PINPUT_RECORD Ir, - ULONG WaitEvent); +PopupError(IN PCCH Text, + IN PCCH Status, + IN PINPUT_RECORD Ir, + IN ULONG WaitEvent); static -MUI_ENTRY * -FindMUIEntriesOfPage (ULONG PageNumber) +const MUI_ENTRY * +FindMUIEntriesOfPage(IN ULONG PageNumber) { ULONG muiIndex = 0; ULONG lngIndex = 0; - MUI_PAGE * Pages = NULL; + const MUI_PAGE * Pages = NULL; do { @@ -195,8 +195,8 @@ } static -MUI_ERROR * -FindMUIErrorEntries () +const MUI_ERROR * +FindMUIErrorEntries(VOID) { ULONG lngIndex = 0; @@ -216,8 +216,8 @@ return NULL; } -VOID -MUIDefaultKeyboardLayout(WCHAR * KeyboardLayout) +LPCWSTR +MUIDefaultKeyboardLayout(VOID) { ULONG lngIndex = 0; do @@ -225,26 +225,25 @@ /* First we search the language list till we find current selected language messages */ if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) { - /* Get all available error messages for this language */ - wcscpy(KeyboardLayout, LanguageList[lngIndex].LanguageKeyboardLayoutID); - return; + /* Return default keyboard layout */ + return LanguageList[lngIndex].LanguageKeyboardLayoutID; } lngIndex++; } while (LanguageList[lngIndex].MuiPages != NULL); - KeyboardLayout[0] = L'\0'; + return NULL; } VOID -MUIDisplayPage(ULONG page) -{ - MUI_ENTRY * entry; +MUIDisplayPage(IN ULONG page) +{ + const MUI_ENTRY * entry; int index; int flags; - entry = FindMUIEntriesOfPage (page); + entry = FindMUIEntriesOfPage(page); if (!entry) { PopupError("Error: Failed to find translated page", @@ -281,13 +280,13 @@ } VOID -MUIDisplayError(ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent) -{ - MUI_ERROR * entry; +MUIDisplayError(IN ULONG ErrorNum, OUT PINPUT_RECORD Ir, IN ULONG WaitEvent) +{ + const MUI_ERROR * entry; if (ErrorNum >= ERROR_LAST_ERROR_CODE) { - PopupError("Pnvalid error number provided", + PopupError("Invalid error number provided", "Press ENTER to continue", Ir, POPUP_WAIT_ENTER); @@ -295,7 +294,7 @@ return; } - entry = FindMUIErrorEntries (); + entry = FindMUIErrorEntries(); if (!entry) { PopupError("Error: Failed to find translated error message", @@ -312,7 +311,7 @@ } static BOOLEAN -AddCodepageToRegistry(PWCHAR ACPage, PWCHAR OEMCPage, PWCHAR MACCPage) +AddCodepageToRegistry(IN LPCWSTR ACPage, IN LPCWSTR OEMCPage, IN LPCWSTR MACCPage) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -322,15 +321,15 @@ // Open the nls codepage key RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"); + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"); InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); Status = NtOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); + KEY_WRITE, + &ObjectAttributes); if (!NT_SUCCESS(Status)) { DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); @@ -340,11 +339,11 @@ // Set ANSI codepage RtlInitUnicodeString(&ValueName, L"ACP"); Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)ACPage, - 4 * sizeof(PWCHAR)); + &ValueName, + 0, + REG_SZ, + (PVOID)ACPage, + wcslen(ACPage) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -355,11 +354,11 @@ // Set OEM codepage RtlInitUnicodeString(&ValueName, L"OEMCP"); Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)OEMCPage, - 3 * sizeof(PWCHAR)); + &ValueName, + 0, + REG_SZ, + (PVOID)OEMCPage, + wcslen(OEMCPage) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -370,11 +369,11 @@ // Set MAC codepage RtlInitUnicodeString(&ValueName, L"MACCP"); Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MACCPage, - 5 * sizeof(PWCHAR)); + &ValueName, + 0, + REG_SZ, + (PVOID)MACCPage, + wcslen(MACCPage) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -403,7 +402,8 @@ lngIndex++; } while (LanguageList[lngIndex].MuiPages != NULL); - return FALSE; + + return FALSE; } /* EOF */ Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Wed Jan 9 12:40:47 2008 @@ -5,19 +5,19 @@ { BYTE X; BYTE Y; - CHAR * Buffer; + LPCSTR Buffer; BYTE Flags; }MUI_ENTRY, *PMUI_ENTRY; typedef struct { - CHAR * ErrorText; - CHAR * ErrorStatus; + LPCSTR ErrorText; + LPCSTR ErrorStatus; }MUI_ERROR; typedef struct { - long Number; + LONG Number; MUI_ENTRY * MuiEntry; }MUI_PAGE; @@ -29,8 +29,8 @@ PWCHAR OEMCPage; PWCHAR MACCPage; PWCHAR LanguageDescriptor; - MUI_PAGE * MuiPages; - MUI_ERROR * MuiErrors; + const MUI_PAGE * MuiPages; + const MUI_ERROR * MuiErrors; }MUI_LANGUAGE; @@ -50,8 +50,8 @@ VOID MUIDisplayError (ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent); -VOID -MUIDefaultKeyboardLayout(WCHAR * KeyboardLayout); +LPCWSTR +MUIDefaultKeyboardLayout(VOID); BOOLEAN AddCodePage(VOID);

17 years

[dchapyshev] 31681: - Update Russian translation - Added some functionality

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jan 9 11:34:47 2008 New Revision: 31681 URL: http://svn.reactos.org/svn/reactos?rev=31681&view=rev Log: - Update Russian translation - Added some functionality Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/advanced.c trunk/reactos/dll/cpl/input/changekeyseq.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/inputlangprop.c trunk/reactos/dll/cpl/input/keysettings.c trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/langbar.c trunk/reactos/dll/cpl/input/misc.c trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=31… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c (original) +++ trunk/reactos/dll/cpl/input/add.c Wed Jan 9 11:34:47 2008 @@ -25,16 +25,6 @@ * UPDATE HISTORY: * 06-09-2007 Created */ - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> #include "resource.h" #include "input.h" Modified: trunk/reactos/dll/cpl/input/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/advanced.c (original) +++ trunk/reactos/dll/cpl/input/advanced.c Wed Jan 9 11:34:47 2008 @@ -26,18 +26,63 @@ * 06-09-2007 Created */ -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> - #include "resource.h" #include "input.h" + +static VOID +InitControls(HWND hWnd) +{ + HKEY hKey; + DWORD dwValue, dwType, dwSize; + + if (SendDlgItemMessage(hWnd, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + EnableWindow(GetDlgItem(hWnd, IDC_SUPPORT_ADV_SERV_CHECKBOX),FALSE); + EnableWindow(GetDlgItem(hWnd, IDC_SUPPORT_ADV_SERV_TEXT),FALSE); + } + if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\CTF", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + if (RegQueryValueEx(hKey, + L"Disable Thread Input Manager", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) == ERROR_SUCCESS) + { + if (dwValue == 0x0) + SendDlgItemMessage(hWnd, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_SETCHECK, 0, 0); + if (dwValue == 0x1) + SendDlgItemMessage(hWnd, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_SETCHECK, 1, 1); + } + } + RegCloseKey(hKey); +} + +static VOID +SaveSettings(HWND hWnd) +{ + HKEY hKey; + DWORD dwValue, dwType, dwSize; + + if (RegOpenKey(HKEY_CURRENT_USER, L"Software\\Microsoft\\CTF",&hKey) == ERROR_SUCCESS) + { + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + if (SendDlgItemMessage(hWnd, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_GETCHECK, 0, 0) == BST_CHECKED) + dwValue = 0x1; + else + dwValue = 0x0; + RegSetValueEx(hKey, + L"Disable Thread Input Manager", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(DWORD)); + } + RegCloseKey(hKey); +} /* Property page dialog callback */ INT_PTR CALLBACK @@ -50,14 +95,37 @@ switch (uMsg) { case WM_INITDIALOG: + { + InitControls(hwndDlg); + } break; - + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + if (lpnm->code == (UINT)PSN_APPLY) + { + SaveSettings(hwndDlg); + } + } + break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_SUPPORT_ADV_SERV_CHECKBOX: case IDC_TURNOFF_ADV_TXTSERV_CHECKBOX: + { + if (SendDlgItemMessage(hwndDlg, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_CHECKBOX),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_TEXT),FALSE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_CHECKBOX),TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_TEXT),TRUE); + } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } break; } break; Modified: trunk/reactos/dll/cpl/input/changekeyseq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/changekeyseq… ============================================================================== --- trunk/reactos/dll/cpl/input/changekeyseq.c (original) +++ trunk/reactos/dll/cpl/input/changekeyseq.c Wed Jan 9 11:34:47 2008 @@ -25,16 +25,6 @@ * UPDATE HISTORY: * 06-09-2007 Created */ - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> #include "resource.h" #include "input.h" Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c (original) +++ trunk/reactos/dll/cpl/input/input.c Wed Jan 9 11:34:47 2008 @@ -25,16 +25,6 @@ * UPDATE HISTORY: * 06-09-2007 Created */ - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> #include "resource.h" #include "input.h" Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h (original) +++ trunk/reactos/dll/cpl/input/input.h Wed Jan 9 11:34:47 2008 @@ -1,5 +1,15 @@ #ifndef __CPL_INPUT_H #define __CPL_INPUT_H + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> typedef LONG (CALLBACK *CPLAPPLET_PROC)(VOID); Modified: trunk/reactos/dll/cpl/input/inputlangprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/inputlangpro… ============================================================================== --- trunk/reactos/dll/cpl/input/inputlangprop.c (original) +++ trunk/reactos/dll/cpl/input/inputlangprop.c Wed Jan 9 11:34:47 2008 @@ -25,16 +25,6 @@ * UPDATE HISTORY: * 06-09-2007 Created */ - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> #include "resource.h" #include "input.h" Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c (original) +++ trunk/reactos/dll/cpl/input/keysettings.c Wed Jan 9 11:34:47 2008 @@ -25,16 +25,6 @@ * UPDATE HISTORY: * 06-09-2007 Created */ - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> #include "resource.h" #include "input.h" Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc Wed Jan 9 11:34:47 2008 @@ -27,7 +27,7 @@ BEGIN GROUPBOX "Íàñòðîéêà çà ñúâìåñòèìîñò", -1, 7,7,231,60 AUTOCHECKBOX "Èç&ïîëçâàíå íà ïîääðúæêàòà íà ðàøèðåíèòå ñëîâåñíè óñëóãè âúâ âñè÷êè ïðèëîæåíèÿ", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Îòìåòíåòå òàçè êóòèéêà, çà äà âêëþ÷èòå ðàçøèðåíàòà ñëîâåñíà ïîääðúæêà çà áåëåæíèêà è çà äðóãè ïðèëîæåíèÿ, êîèòî îáèêíîâåíî íå ïîääúðæàò ðúêîïèñíî ðàçïîçíàâàíå èëè äðóãè ðàçøèðåíè óñëóãè çà âúâåæäàíå.",-1,14,33,220,25 + LTEXT "Îòìåòíåòå òàçè êóòèéêà, çà äà âêëþ÷èòå ðàçøèðåíàòà ñëîâåñíà ïîääðúæêà çà áåëåæíèêà è çà äðóãè ïðèëîæåíèÿ, êîèòî îáèêíîâåíî íå ïîääúðæàò ðúêîïèñíî ðàçïîçíàâàíå èëè äðóãè ðàçøèðåíè óñëóãè çà âúâåæäàíå.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25 GROUPBOX "Íàñòðîéêà íà óðåäáàòà", -1, 7,74,231,60 AUTOCHECKBOX "&Èçêëþ÷âàíå íà ðàçøèðåíèòå ñëîâåñíè óñëóãè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP LTEXT "Îòìåòíåòå òàçè êóòèéêà, çà äà âêëþ÷èòå ðàçøèðåíàòà ñëîâåñíà ïîääðúæêà çà âñè÷êè ïðîãðàìè. Íå ñå ïðåïîðú÷âà çà èçòî÷íîàçèàòñêè ïîòðåáèòåëè, çàùîòî ùå çàòâîðè åçèêîâàòà ëåíòà.",-1,14,100,220,25 Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Wed Jan 9 11:34:47 2008 @@ -27,7 +27,7 @@ BEGIN GROUPBOX "Kompatibilitäts-Konfiguration", -1, 7,7,231,60 AUTOCHECKBOX "&Erweiterte Textdienste in allen Programmen verwenden.", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",-1,14,33,220,25 + LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25 GROUPBOX "Systemkonfiguration", -1, 7,74,231,60 AUTOCHECKBOX "Erweiterte Textdienste d&eaktivieren", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP LTEXT "Wählen Sie diese Option, um alle Erweiterten Textdienste in allen Programmen zu deaktivieren. Dies ist für Ostasiatische Sprachen nicht empfohlen, da somit die Sprachleiste geschlossen wird.",-1,14,100,220,25 Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Wed Jan 9 11:34:47 2008 @@ -27,7 +27,7 @@ BEGIN GROUPBOX "Compatibility Configuration", -1, 7,7,231,60 AUTOCHECKBOX "&Extend support of advanced text services to all programs", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Select this check box to on for active advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",-1,14,33,220,25 + LTEXT "Select this check box to on for active advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25 GROUPBOX "System Configuration", -1, 7,74,231,60 AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP LTEXT "Select this check box to turn off advanced text services in all programs. Not recommended for East Asian users because this closes the language bar.",-1,14,100,220,25 Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Wed Jan 9 11:34:47 2008 @@ -27,7 +27,7 @@ BEGIN GROUPBOX "Configuration de la compatibilité", -1, 7,7,231,60 AUTOCHECKBOX "&Étendre le support des services avancés de à tous les programmes", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Sélectionnez cette case à cocher pour activer les services avancés de texte dans le bloc-note et d'autres programmes qui ne supporte normalement pas la reconnaissance vocale et l'écriture manuscrite ou tout autre service avancé de saisie.",-1,14,33,220,25 + LTEXT "Sélectionnez cette case à cocher pour activer les services avancés de texte dans le bloc-note et d'autres programmes qui ne supporte normalement pas la reconnaissance vocale et l'écriture manuscrite ou tout autre service avancé de saisie.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25 GROUPBOX "Configuration du système", -1, 7,74,231,60 AUTOCHECKBOX "Désac&tiver les services avancés de texte", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP LTEXT "Déselectionnez cette case à cocher pour désactiver les services avancés de texte dans tous les programmes. Non recommandé pour les utilisateurs de l'Est de l'Asie car cela ferme la barre de langue.",-1,14,100,220,25 Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc Wed Jan 9 11:34:47 2008 @@ -34,7 +34,7 @@ BEGIN GROUPBOX "Kompatybilnoæ", -1, 7,7,231,60 AUTOCHECKBOX "&Rozszerz wspieranie zaawansowanych us³ug tekstowych na wszystkie programy", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Zaznacz t¹ opcjê by uruchomiæ zaawansowane us³ugi tekstowe w Notatniku i innych programach, które normalnie nie obs³uguj¹ rozpoznawania mowy i pisma odrêcznego czy innych zaawansowanych us³ug wprowadzania.",-1,14,33,220,25 + LTEXT "Zaznacz t¹ opcjê by uruchomiæ zaawansowane us³ugi tekstowe w Notatniku i innych programach, które normalnie nie obs³uguj¹ rozpoznawania mowy i pisma odrêcznego czy innych zaawansowanych us³ug wprowadzania.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25 GROUPBOX "Konfiguracja systemu", -1, 7,74,231,60 AUTOCHECKBOX "&Wy³¹cz zaawansowane us³ugi tekstowe", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP LTEXT "Zaznacz t¹ opcjê by wy³¹czyæ zaawansowane us³ugi tekstowe we wszystkich programach. Nie zalecane dla u¿ytkowników jêzyków Dalekiego Wschodu, jako ¿e zamyka to Pasek Jêzyków.",-1,14,100,220,25 Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc Wed Jan 9 11:34:47 2008 @@ -4,22 +4,22 @@ IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêè" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Îñíîâíîé ÿçûê ââîäà", -1, 7,7,237,53 - LTEXT "Âûáåðèòå îäèí îñíîâíîé ÿçûê ââîäà ïðè âêëþ÷åíèè êîìïüþòåðà.",-1,14,18,220,17 +CAPTION "Ïàðàìåòðû" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&ßçûê ââîäà ïî óìîë÷àíèþ", -1, 7,7,231,53 + LTEXT "Âûáåðèòå îäèí èç óñòàíîâëåííûõ ÿçûêîâ ââîäà, êîòîðûé áóäåò èñïîëüçîâàòüñÿ ïðè çàãðóçêå êîìïüþòåðà.",-1,14,18,220,17 COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT - GROUPBOX "Óñ&òàíîâëåííûå ñåðâèñû", -1, 7,65,237,115 - LTEXT "Âûáåðèòå ñåðâèñ êîòîðûé âû õîòèòå äëÿ êàæäîãî ÿçûêà îòîáðàæîííîãî â ëèñòå.\nÈñïîëüçóÿ êëàâèøè äîáàâëåíèå è èñêëþ÷åíèå äëÿ èçìåíåíèÿ ëèñòà.",-1,14,75,220,17 + GROUPBOX "Óñ&òàíîâëåííûå ñëóæáû", -1, 7,65,231,115 + LTEXT "Âûáåðèòå íóæíûå ñëóæáû äëÿ êàæäîãî ÿçûêà ââîäà èç ñïèñêà. Äëÿ èçìåíåíèÿ ñïèñêà ñëóæàò êíîïêè ""Äîáàâèòü"" è ""Óäàëèòü"".",-1,14,75,220,17 CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 - PUSHBUTTON "&Óñòàíîâèòü ïî óìîë÷àíèþ", IDC_SET_DEFAULT, 179, 106, 59, 14 - PUSHBUTTON "&Äîáàâèòü...", IDC_ADD_BUTTON, 179, 124, 59, 14 - PUSHBUTTON "&Èñêëþ÷èòü...", IDC_REMOVE_BUTTON, 179, 142, 59, 14 - PUSHBUTTON "&Ñâîéñòâà...", IDC_PROP_BUTTON, 179, 160, 59, 14 - GROUPBOX "Ñâîéñòâà", -1, 7,185,237,36 - PUSHBUTTON "ßçûêîâàÿ ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 - PUSHBUTTON "Óñòàíîâêè êëàâèø...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 + PUSHBUTTON "Óìîë&÷àíèå", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "&Äîáàâèòü...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "&Óäàëèòü...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "&Ñâîéñòâà...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "Íàñòðîéêà", -1, 7,185,231,36 + PUSHBUTTON "ß&çûêîâàÿ ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 87, 14 + PUSHBUTTON "&Ïàðàìåòðû êëàâèàòóðû...", IDC_KEY_SETTINGS_BUTTON, 105, 198, 110, 14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -27,208 +27,208 @@ CAPTION "Äîïîëíèòåëüíî" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Êîíôèãóðàöèÿ ñîâìåñòèìîñòè", -1, 7,7,231,60 - AUTOCHECKBOX "&Ðàñøèðåííàÿ ïîääåðæêà äîïîëíèòåëüíûõ òåêñòîâûõ ñåðâèñîâ äëÿ âñåõ ïðîãðàìì", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Îòìåòüòå ãàëî÷êîé çäåñü ïðè íåîáõîäèìîñòè âêëþ÷åíèÿ äîïîëíèòåëüíûõ ñåðâèñîâ äëÿ ïðîãðàìì êîòîðûå íåìîãóò ïîääåðæèâàòü ãîëîñîâîå ñîïðîâîæäåíèå, èëè ðàñïîçíàâàíèå, è äðóãèõ äîïîëíèòåëüíûõ ñåðâèñîâ ââîäà.",-1,14,33,220,25 - GROUPBOX "Êîíôèãóðàöèÿ ñèñòåìû", -1, 7,74,231,60 - AUTOCHECKBOX "&Îòêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñåðâèñû", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP - LTEXT "Îòìåòüòå ãàëî÷êîé çäåñü äëÿ îòêëþ÷åíèÿ äîïîëíèòåëüíûõ òåêñòîâûõ ñåðâèñîâ âî âñåõ ïðîãðàììàõ. Íåðåêîìåíäîâàíî äëÿ ïîëüçîâàòåëåé Âîñòî÷íîé Àçèè äàííîå äåéñòâèå ïîëíîñòüþ îòêëþ÷èò äîñòóï ê ÿçûêîâîé ïàíåëè.",-1,14,100,220,25 + GROUPBOX "Ïàðàìåòðû ñîâìåñòèìîñòè", -1, 7,7,231,68 + AUTOCHECKBOX "&Ðàñøèðåííàÿ ïîääåðæêà äîïîëíèòåëüíûõ òåêñòîâûõ ñëóæá äëÿ âñåõ ïðîãðàìì", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 221, 15, WS_GROUP | BS_MULTILINE + LTEXT "Îòìåòüòå ãàëî÷êîé çäåñü ïðè íåîáõîäèìîñòè âêëþ÷åíèÿ äîïîëíèòåëüíûõ ñëóæá äëÿ ïðîãðàìì, êîòîðûå íåìîãóò ïîääåðæèâàòü ãîëîñîâîå ñîïðîâîæäåíèå èëè ðàñïîçíàâàíèå, è äðóãèõ äîïîëíèòåëüíûõ ñëóæá ââîäà.",IDC_SUPPORT_ADV_SERV_TEXT,14,37,220,34 + GROUPBOX "Ïàðàìåòðû ñèñòåìû", -1, 7,80,231,66 + AUTOCHECKBOX "Â&ûêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñëóæáû", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 92, 210, 10, WS_GROUP | BS_MULTILINE + LTEXT "Óñòàíîâèòå ýòîò ôëàæîê äëÿ âûêëþ÷åíèÿ ïîääåðæêè äîïîëíèòåëüíûõ òåêñòîâûõ ñëóæá äëÿ âñåõ ïðîãðàìì. Íå ðåêîìåíäóåòñÿ äëÿ ÿçûêîâ âîñòî÷íîé Àçèè, ïîñêîëüêó ÿçûêîâàÿ ïàíåëü áóäåò çàêðûòà.",-1,14,106,220,35 END IDD_LANGBAR DIALOG 20, 20, 240, 120 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Óñòàíîâêà ÿçûêîâîé ïàíåëè" +CAPTION "Ïàðàìåòðû ÿçûêîâîé ïàíåëè" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 7, 7, 226, 85 - AUTOCHECKBOX "Îòîáðàæàòü ÿçûêîâóþ ïàíåëü íà ýêðàíå", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP - AUTOCHECKBOX "&Ïðîçðà÷íîñü ÿçûêîâîé ïàíåëè", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 - AUTOCHECKBOX "&Äîïîëíèòåëüíûå èêîíêè ÿçûêîâîé ïàíåëè â îáëàñòè óâåäîìëåíèé", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 - AUTOCHECKBOX "Ïîêàçûâàòü ïîäïèñè ê ÿðëûêàì â ïàíåëè ÿçûêîâ", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 - AUTOCHECKBOX "&Îòêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñåðâèñû", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 + AUTOCHECKBOX "&Îòîáðàæàòü ÿçûêîâóþ ïàíåëü íà ðàáî÷åì ñòîëå", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP + AUTOCHECKBOX "&ßçûêîâàÿ ïàíåëü ïðîçðà÷íà, êîãäà íå àêòèâíà", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 + AUTOCHECKBOX "Äîïîëíèòåëüíûé &çíà÷îê ïàíåëè â îáëàñòè óâåäîìëåíèé", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 + AUTOCHECKBOX "Î&òîáðàæàòü òåêñòîâûå ìåòêè íà ÿçûêîâîé ïàíåëè", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 + AUTOCHECKBOX "Â&ûêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñëóæáû", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 182, 99, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 182, 99, 50, 14 END IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Äîïîëíèòåëüíûõ óñòàíîâêè" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Äëÿ îòêëþ÷åíèÿ Caps Lock", -1, 7, 7, 258, 26 - AUTORADIOBUTTON "Íàæìèòå êëàâèøó CAPS &LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP - AUTORADIOBUTTON "Íàæìèòå êëàâèøó SHI&FT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP - GROUPBOX "Ãîðÿ÷èå êëàâèøè ÿçûêîâ", -1, 7, 37, 258, 95 +CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû êëàâèàòóðû" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Îòêëþ÷åíèå ðåæèìà Caps Lock", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "&Êëàâèøåé CAPS LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "Ê&ëàâèøåé SHIFT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Ñî÷åòàíèÿ êëàâèø äëÿ ÿçûêîâ ââîäà", -1, 7, 37, 258, 95 LTEXT "Äåéñòâèå", -1, 14, 47, 60, 9 - RTEXT "Ñî&÷åòàíèå êëàâèø", -1, 177, 47, 79, 9 + RTEXT "&Ñî÷åòàíèå êëàâèø", -1, 177, 47, 79, 9 LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Èçìåíèòü ñî÷åòàíèå êëàâèø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP + PUSHBUTTON "Ñì&åíà ñî÷åòàíèÿ êëàâèø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 146, 140, 70, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 146, 140, 70, 14 END IDD_ADD DIALOG 20, 20, 227, 90 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Äîáàâèòü ÿçûê ââîäà" +CAPTION "Äîáàâëåíèå ÿçûêà ââîäà" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - LTEXT "&Ðàñêëàäêà êëàâèàòóðû/IME:", -1, 7, 36, 110, 10 + LTEXT "&Ðàñêëàäêà êëàâèàòóðû èëè ìåòîä ââîäà (IME):", -1, 7, 36, 170, 10 COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 169, 68, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 169, 68, 50, 14 END IDD_ADD2 DIALOG 20, 20, 257, 176 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Äîáàâèòü ÿçûê ââîäà" +CAPTION "Äîáàâëåíèå ÿçûêà ââîäà" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû èëè ìåòîä ââîäà (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 180, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Ðàñïî&çíàâàíèå ðó÷íîãî ââîäà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + AUTOCHECKBOX "Ð&àñïîçíàâàíèå ðóêîïèñíîãî òåêñòà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 144, 10 COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Ãîëîñ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + AUTOCHECKBOX "Ð&å÷ü:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Ñåðâèñû òåêñòîâ:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + AUTOCHECKBOX "Äðóã&èå òåêñòîâûå ñëóæáû:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 199, 155, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 199, 155, 50, 14 END IDD_ADD3 DIALOG 20, 20, 257, 147 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Äîáàâèòü ÿçûê ââîäà" +CAPTION "Äîáàâëåíèå ÿçûêà ââîäà" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû èëè ìåòîä ââîäà (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 180, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Ðàñïî&çíàâàíèå ðó÷íîãî ââîäà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + AUTOCHECKBOX "Ð&àñïîçíàâàíèå ðóêîïèñíîãî òåêñòà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 150, 10 COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Ãîëîñ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + AUTOCHECKBOX "Ð&å÷ü", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 199, 126, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 199, 126, 50, 14 END IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" +CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", -1, 16, 5, 250, 10 - GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "&Âêëþ÷èòü ñî÷åòàíèå êëàâèø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 + GROUPBOX "", -1, 12, 17, 195, 48 + AUTOCHECKBOX "&Èñïîëüçîâàòü ñî÷åòàíèå êëàâèø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 133, 8 CTEXT "SHIFT", -1, 68, 37, 27, 12 CTEXT "+", -1, 57, 37, 8, 9 CTEXT "+", -1, 98, 37, 8, 10 CHECKBOX "&CTRL", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Êëàâèøà:", -1, 110, 37, 14, 10 - COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "&Êëàâèøà:", -1, 110, 37, 40, 10 + COMBOBOX IDC_CKEY_COMBOBOX, 151, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 212, 47, 50, 14 -END - -IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "", -1, 9, 5, 209, 60 - AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + PUSHBUTTON "Îòìåíà", IDCANCEL, 212, 47, 50, 14 +END + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 335, 71 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 7, 4, 263, 60 + AUTOCHECKBOX "Ïåðåêëþ÷àòü &ÿçûêè ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 107, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 10 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 33, 11, WS_GROUP + AUTORADIOBUTTON "Alt ñ&ëåâà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 52, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðåêëþ÷àòü ðàñêëàäêè &êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 125, 15, 143, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 10 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 33, 11, WS_GROUP + AUTORADIOBUTTON "Alt ñë&åâà", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 51, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 278, 16, 50, 14 + PUSHBUTTON "Îòìåíà", 2, 278, 41, 50, 14 +END + +IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 274, 122 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 6, 4, 206, 110 + AUTOCHECKBOX "Ïåðåêëþ÷àòü &ÿçûêè ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 110, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 - LTEXT "SHIFT", -1, 179, 37, 27, 12 - CTEXT "+", -1, 168, 37, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 227, 44, 50, 14 -END - -IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + AUTORADIOBUTTON "Alt ñ&ëåâà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 50, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðåêëþ÷àòü ðàñêëàäêè &êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 144, 12 LTEXT "SHIFT", -1, 73, 87, 27, 12 CTEXT "+", -1, 62, 87, 8, 9 CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 - AUTORADIOBUTTON "Âñòàâèòü &óäàðåíèå ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "&¨ èëè çíàê óäàðåíèÿ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 100, 10, WS_GROUP AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 192, 47, 50, 14 -END - -IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 - AUTORADIOBUTTON "Âñòàâèòü &óäàðåíèå ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP - AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 192, 47, 50, 14 + AUTORADIOBUTTON "Alt ñë&åâà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 50, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 218, 8, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 218, 27, 50, 14 +END + +IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 277, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 5, 3, 209, 110 + AUTOCHECKBOX "Ïåðåêëþ÷àòü &ÿçûêè ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 114, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 10 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "&¨ èëè çíàê óäàðåíèÿ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 101, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 32, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Alt ñ&ëåâà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 50, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðåêëþ÷àòü ðàñêëàäêè &êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 148, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 10 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 32, 11, WS_GROUP + AUTORADIOBUTTON "Alt ñë&åâà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 50, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 220, 7, 50, 14 + PUSHBUTTON "Îòìåíà", 2, 220, 24, 50, 14 END IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" +CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", 1240, 16, 5, 250, 10 - GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "&Âêëþ÷èòü ñî÷åòàíèå êëàâèø", 1249, 17, 17, 85, 8 + GROUPBOX "", -1, 12, 17, 195, 48 + AUTOCHECKBOX "&Èñïîëüçîâàòü ñî÷åòàíèå êëàâèø", 1249, 17, 17, 135, 8 CTEXT "SHIFT", -1, 68, 37, 27, 12 CTEXT "+", -1, 57, 37, 8, 9 CTEXT "+", -1, 98, 37, 8, 10 AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Ëåâûé &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Êëàâèøà:", -1, 110, 37, 14, 10 - COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + AUTORADIOBUTTON "Alt ñ&ëåâà", -1, 24, 45, 50, 12, NOT WS_TABSTOP + LTEXT "&Êëàâèøà:", -1, 110, 37, 40, 10 + COMBOBOX 1236, 151, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 212, 47, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 212, 47, 50, 14 END IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ïàðàìåòðû ââîäà" +CAPTION "Ñâîéñòâà ÿçûêà ââîäà" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ßçûê ââîäà:", -1, 7, 7, 61, 8 LTEXT "", -1, 73, 7, 129, 8 - LTEXT "&Ðàñêëàäêà êëàâèàòóðû/IME:", -1, 7, 21, 110, 10 + LTEXT "&Ðàñêëàäêà êëàâèàòóðû èëè ìåòîä ââîäà (IME):", -1, 7, 21, 170, 10 COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 - PUSHBUTTON "Îòìåíèòü", IDCANCEL, 169, 53, 52, 14 + DEFPUSHBUTTON "OK", IDOK, 114, 53, 52, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 169, 53, 52, 14 END STRINGTABLE @@ -236,148 +236,148 @@ IDS_CPLSYSTEMNAME "Òåêñòîâûå ñåðâèñû è ââîä ÿçûêîâ" IDS_CPLSYSTEMDESCRIPTION "Äîïîëíèòåëüíûå ïàðàìåòðû òåêñòîâîãî ââîäà ÿçûêîâ." IDS_KEYBOARD "Êëàâèàòóðà" - IDS_ADV_TEXT_SRV "Advanced Text Services" - IDS_NONE "(None)" - IDS_UNKNOWN "(Unknown)" - IDS_RESTART "Do you want to restart your computer now?" - IDS_SPEECH "Speech" + IDS_ADV_TEXT_SRV "Äîïîëíèòåëüíûå òåêñòîâûå ñëóæáû" + IDS_NONE "(Íåò)" + IDS_UNKNOWN "(Íåò äàííûõ)" + IDS_RESTART "Âûïîëíèòü ïåðåçàãðóçêó ñåé÷àñ?" + IDS_SPEECH "Ðå÷ü" IDS_HRD_REC "Handwriting Recognition" - IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" - IDS_WHATS_THIS "What's This?" + IDS_OFF_ADV_TXT_SRV "Ïîäòâåðæäàåòå îòêëþ÷åíèå äîïîëíèòåëüíûõ òåêñòîâûõ ñëóæá?" + IDS_WHATS_THIS "×òî ýòî?" END STRINGTABLE BEGIN - IDS_US_LAYOUT, "US" - IDS_BELGIAN_LAYOUT, "Belgian (Period)" - IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" - IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" - IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" - IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" - IDS_DANISH_LAYOUT, "Danish" - IDS_DUTCH_LAYOUT, "Dutch" - IDS_FINNISH_LAYOUT, "Finnish" - IDS_FRENCH_LAYOUT, "French" - IDS_GERMAN_LAYOUT, "German" - IDS_GERMAN_IBM_LAYOUT, "German (IBM)" - IDS_ICELANDIC_LAYOUT, "Icelandic" - IDS_IRISH_LAYOUT, "Irish" - IDS_ITALIAN_LAYOUT, "Italian" - IDS_ITALIAN_142_LAYOUT, "Italian (142)" - IDS_LATIN_AMERICAN_LAYOUT, "Latin American" - IDS_NORWEGIAN_LAYOUT, "Norwegian" - IDS_PORTUGUESE_LAYOUT, "Portuguese" - IDS_SPANISH_LAYOUT, "Spanish" - IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" - IDS_SWEDISH_LAYOUT, "Swedish" - IDS_SWISS_FRENCH_LAYOUT, "Swiss French" - IDS_SWISS_GERMAN_LAYOUT, "Swiss German" - IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" - IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" - IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" - IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" - IDS_ALBANIAN_LAYOUT, "Albanian" - IDS_CROATIAN_LAYOUT, "Croatian" - IDS_CZECH_LAYOUT, "Czech" - IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" - IDS_HUNGARIAN_LAYOUT, "Hungarian" - IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" - IDS_POLISH_LAYOUT, "Polish (Programmers)" - IDS_POLISH_214_LAYOUT, "Polish (214)" - IDS_ROMANIAN_LAYOUT, "Romanian" - IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" - IDS_SLOVAK_LAYOUT, "Slovak" - IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" - IDS_SLOVENIAN_LAYOUT, "Slovenian" - IDS_ESTONIAN_LAYOUT, "Estonian" - IDS_LATVIAN_LAYOUT, "Latvian" - IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" - IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" - IDS_GREEK_LAYOUT, "Greek" - IDS_GREEK_LATIN_LAYOUT, "Greek Latin" - IDS_GREEK_220_LAYOUT, "Greek (220)" - IDS_GREEK_319_LAYOUT, "Greek (319)" - IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" - IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" - IDS_BELARUSIAN_LAYOUT, "Belarusian" - IDS_BULGARIAN_LAYOUT, "Bulgarian" - IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" - IDS_RUSSIAN_LAYOUT, "Russian" - IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" - IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" - IDS_UKRAINIAN_LAYOUT, "Ukrainian" - IDS_TURKISH_F_LAYOUT, "Turkish F" - IDS_TURKISH_Q_LAYOUT, "Turkish Q" - IDS_JAPANESE_LAYOUT, "Japanese" - IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" - IDS_KOREAN_LAYOUT, "Korean" - IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" - IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" - IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" - IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" - IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" - IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" - IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" - IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" - IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" - IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" - IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" - IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" - IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" - IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" - IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" - IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" - IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" - IDS_HEBREW_LAYOUT, "Hebrew" - IDS_ARABIC_101_LAYOUT, "Arabic (101)" - IDS_ARABIC_102_LAYOUT, "Arabic (102)" - IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" - IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" - IDS_LITHUANIAN_LAYOUT, "Lithuanian" - IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" - IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" - IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" - IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" - IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" - IDS_ASSAMESE_LAYOUT, "Assamese" - IDS_BENGALI_LAYOUT, "Bengali" - IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" - IDS_GUJARATI_LAYOUT, "Gujarati" - IDS_KANNADA_LAYOUT, "Kannada" - IDS_MALAYALAM_LAYOUT, "Malayalam" - IDS_ORIYA_LAYOUT, "Oriya" - IDS_PUNJABI_LAYOUT, "Punjabi" - IDS_TAMIL_LAYOUT, "Tamil" - IDS_TELUGU_LAYOUT, "Telugu" - IDS_MARATHI_LAYOUT, "Marathi" - IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" - IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" - IDS_FAEROESE_LAYOUT, "Faeroese" - IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" - IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" - IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" - IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" - IDS_KAZAKH_LAYOUT, "Kazakh" - IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" - IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" - IDS_TATAR_LAYOUT, "Tatar" - IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" - IDS_VIETNAMESE_LAYOUT, "Vietnamese" - IDS_GEORGIAN_LAYOUT, "Georgian" - IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" - IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" - IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" - IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" - IDS_FARSI_LAYOUT, "Farsi" - IDS_GAELIC_LAYOUT, "Gaelic" - IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" - IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" - IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" - IDS_URDU_LAYOUT, "Urdu" - IDS_SYRIAC_LAYOUT, "Syriac" - IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" - IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" - IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" - IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" - IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" -END + IDS_US_LAYOUT, "ÑØÀ" + IDS_BELGIAN_LAYOUT, "Áåëüãèéñêàÿ (ñ òî÷êîé)" + IDS_BELGIAN_FRENCH_LAYOUT, "Áåëüãèéñêàÿ (ôðàíöóçñêàÿ)" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Ïîðòóãàëüñêàÿ (Áðàçèëüñêàÿ ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Êàíàäñêàÿ (ôðàíöóçñêàÿ)" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Êàíàäñêàÿ (ôðàíöóçñêàÿ òðàäèöèîííàÿ)" + IDS_DANISH_LAYOUT, "Äàòñêàÿ" + IDS_DUTCH_LAYOUT, "Ãîëëàíäñêàÿ" + IDS_FINNISH_LAYOUT, "Ôèíñêàÿ" + IDS_FRENCH_LAYOUT, "Ôðàíöóçñêàÿ" + IDS_GERMAN_LAYOUT, "Íåìåöêàÿ" + IDS_GERMAN_IBM_LAYOUT, "Íåìåöêàÿ (IBM)" + IDS_ICELANDIC_LAYOUT, "Èñëàíäñêàÿ" + IDS_IRISH_LAYOUT, "Èðëàíäñêàÿ" + IDS_ITALIAN_LAYOUT, "Èòàëüÿíñêàÿ" + IDS_ITALIAN_142_LAYOUT, "Èòàëüÿíñêàÿ (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Ëàòèíîàìåðèêàíñêàÿ" + IDS_NORWEGIAN_LAYOUT, "Íîðâåæñêàÿ" + IDS_PORTUGUESE_LAYOUT, "Ïîðòóãàëüñêàÿ" + IDS_SPANISH_LAYOUT, "Èñïàíñêàÿ" + IDS_SPANISH_VARIANTION_LAYOUT, "Èñïàíñêàÿ 2" + IDS_SWEDISH_LAYOUT, "Øâåäñêàÿ" + IDS_SWISS_FRENCH_LAYOUT, "Øâåéöàðñêàÿ ôðàíöóçñêàÿ" + IDS_SWISS_GERMAN_LAYOUT, "Øâåéöàðñêàÿ íåìåöêàÿ" + IDS_UNITED_KINGDOM_LAYOUT, "Áðèòàíñêàÿ" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "ÑØÀ - ìåæäóíàðîäíàÿ" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "ÑØÀ - ïî Äâîðàêó äëÿ ëåâîé ðóêè" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "ÑØÀ - ïî Äâîðàêó äëÿ ïðàâîé ðóêè" + IDS_ALBANIAN_LAYOUT, "Àëáàíñêàÿ" + IDS_CROATIAN_LAYOUT, "Õîðâàòñêàÿ" + IDS_CZECH_LAYOUT, "×åøñêàÿ" + IDS_CZECH_QWERTY_LAYOUT, "×åøñêàÿ (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Âåíãåðñêàÿ" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Âåíãåðñêàÿ (101 êëàâèøà)" + IDS_POLISH_LAYOUT, "Ïîëüñêàÿ (ïðîãðàììèñòñêàÿ)" + IDS_POLISH_214_LAYOUT, "Ïîëüñêàÿ (214)" + IDS_ROMANIAN_LAYOUT, "Ðóìûíñêàÿ" + IDS_SERBIAN_LATIN_LAYOUT, "Ñåðáñêàÿ (ëàòèíèöà)" + IDS_SLOVAK_LAYOUT, "Ñëîâàöêàÿ" + IDS_SLOVAK_QWERTY_LAYOUT, "Ñëîâàöêàÿ (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Ñëîâåíñêàÿ" + IDS_ESTONIAN_LAYOUT, "Ýñòîíñêàÿ" + IDS_LATVIAN_LAYOUT, "Ëàòûøñêàÿ" + IDS_LATVIAN_QWERTY_LAYOUT, "Ëàòâèéñêàÿ (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Ëèòîâñêàÿ IBM" + IDS_GREEK_LAYOUT, "Ãðå÷åñêàÿ" + IDS_GREEK_LATIN_LAYOUT, "Ãðå÷åñêàÿ ëàòèíèöà" + IDS_GREEK_220_LAYOUT, "Ãðå÷åñêàÿ (220)" + IDS_GREEK_319_LAYOUT, "Ãðå÷åñêàÿ (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Ãðå÷åñêàÿ (220) ëàòèíèöà" + IDS_GREEK_319_LATIN_LAYOUT, "Ãðå÷åñêàÿ (319) ëàòèíèöà" + IDS_BELARUSIAN_LAYOUT, "Áåëîðóññêàÿ" + IDS_BULGARIAN_LAYOUT, "Áîëãàðñêàÿ" + IDS_BULGARIAN_LATIN_LAYOUT, "Áîëãàðñêàÿ (ëàòèíèöà)" + IDS_RUSSIAN_LAYOUT, "Ðóññêàÿ" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Ðóññêàÿ (ìàøèíîïèñü)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Ñåðáñêàÿ (êèðèëëèöà)" + IDS_UKRAINIAN_LAYOUT, "Óêðàèíñêàÿ" + IDS_TURKISH_F_LAYOUT, "Òóðåöêàÿ F" + IDS_TURKISH_Q_LAYOUT, "Òóðåöêàÿ Q" + IDS_JAPANESE_LAYOUT, "ßïîíñêàÿ" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "ßïîíñêàÿ ñèñòåìà ââîäà (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Êîðåéñêèé" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Êîðåéñêàÿ ñèñòåìà ââîäà (MS-IME98)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - ÑØÀ" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - ôîíåòè÷åñêàÿ" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - Þíèêîä" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - àëôàâèòíî-öèôðîâàÿ" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Êèòàéñêàÿ (óïðîùåííàÿ) - ÑØÀ" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Êèòàéñêàÿ (óïðîùåííàÿ) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Êèòàéñêàÿ (óïðîùåííàÿ) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Êèòàéñêàÿ (óïðîùåííàÿ) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Êèòàéñêàÿ (óïðîùåííàÿ) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Òàéñêàÿ Êåäìàíè" + IDS_THAI_PATTACHOTE_LAYOUT, "Òàéñêàÿ Ïàòàøîò" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Òàéñêàÿ Êåäìàíè (áåç ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Òàéñêàÿ Ïàòàøîò (áåç ShiftLock)" + IDS_HEBREW_LAYOUT, "Èâðèò" + IDS_ARABIC_101_LAYOUT, "Àðàáñêàÿ (101)" + IDS_ARABIC_102_LAYOUT, "Àðàáñêàÿ (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Àðàáñêàÿ (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "×åøñêàÿ (ïðîãðàììèñòñêàÿ)" + IDS_LITHUANIAN_LAYOUT, "Ëèòîâñêàÿ" + IDS_BELGIAN_COMMA_LAYOUT, "Áåëüãèéñêàÿ (ñ çàïÿòîé)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - íîâàÿ ôîíåòè÷åñêàÿ" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Êèòàéñêàÿ (óïðîùåííàÿ) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "ÑØÀ - ïî Äâîðàêó" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - íîâàÿ ChangJie" + IDS_ASSAMESE_LAYOUT, "Àññàìñêàÿ" + IDS_BENGALI_LAYOUT, "Áåíãàëüñêàÿ" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Äåâàíàãàðè - èíñêðèïò" + IDS_GUJARATI_LAYOUT, "Ãóäæàðàòè" + IDS_KANNADA_LAYOUT, "Êàííàäà" + IDS_MALAYALAM_LAYOUT, "Ìàëàÿëàì" + IDS_ORIYA_LAYOUT, "Îðèÿ" + IDS_PUNJABI_LAYOUT, "Ïåíäæàáñêàÿ" + IDS_TAMIL_LAYOUT, "Òàìèëüñêàÿ" + IDS_TELUGU_LAYOUT, "Òåëóãó" + IDS_MARATHI_LAYOUT, "Ìàðàòõè" + IDS_HINDI_TRADITIONAL_LAYOUT, "Õèíäè òðàäèöèîííàÿ" + IDS_CANTONESE_PHONETIC_LAYOUT, "Êàíòîíñêàÿ ôîíåòè÷åñêàÿ" + IDS_FAEROESE_LAYOUT, "Ôàðåðñêàÿ" + IDS_FYRO_MACEDONIAN_LAYOUT, "Ìàêåäîíñêèé (FYROM)" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Êàíàäñêàÿ ñòàíäàðòíàÿ (ìíîãîÿçû÷íàÿ)" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - áûñòðàÿ" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Êèòàéñêàÿ (òðàäèöèîííàÿ) - òàáëèöåé" + IDS_KAZAKH_LAYOUT, "Êàçàõñêàÿ" + IDS_UZBEK_CYRILLIC_LAYOUT, "Óçáåêñêàÿ êèðèëëèöà" + IDS_AZERI_CYRILLIC_LAYOUT, "Àçåðáàéäæàíñêàÿ (êèð)" + IDS_TATAR_LAYOUT, "Òàòàðñêàÿ" + IDS_AZERI_LATIN_LAYOUT, "Àçåðáàéäæàíñêàÿ (ëàò)" + IDS_VIETNAMESE_LAYOUT, "Âüåòíàìñêàÿ" + IDS_GEORGIAN_LAYOUT, "Ãðóçèíñêàÿ" + IDS_ARMENIAN_EASTERN_LAYOUT, "Àðìÿíñêàÿ âîñòî÷íàÿ" + IDS_ARMENIAN_WESTERN_LAYOUT, "Àðìÿíñêàÿ çàïàäíàÿ" + IDS_GREEK_POLYTONIC_LAYOUT, "Ãðå÷åñêàÿ ïîëèòîíè÷åñêàÿ" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "ÑØÀ àíãëèéñêàÿ òàáëè÷íàÿ äëÿ IBM àðàáñêîãî 238_L" + IDS_FARSI_LAYOUT, "Ôàðñè" + IDS_GAELIC_LAYOUT, "Ãýëüñêàÿ" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Ïîðòóãàëüñêàÿ (Áðàçèëèÿ)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Ìîíãîëüñêàÿ (êèðèëëèöà)" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Êèðãèçñêàÿ (êèðèëëèöà)" + IDS_URDU_LAYOUT, "Óðäó" + IDS_SYRIAC_LAYOUT, "Ñèðèéñêàÿ" + IDS_SYRIAC_PHONETIC_LAYOUT, "Ñèðèéñêàÿ ôîíåòè÷åñêàÿ" + IDS_DIVEHI_PHONETIC_LAYOUT, "Äèâèõàé ôîíåòè÷åñêàÿ" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Äèâèõàé ìàøèíîïèñü" + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Áîëãàðñêàÿ ôîíåòè÷åñêàÿ (êëàññè÷åñêàÿ)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Áîëãàðñêàÿ ôîíåòè÷åñêàÿ (BDS)" +END Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Wed Jan 9 11:34:47 2008 @@ -35,7 +35,7 @@ BEGIN GROUPBOX "Íàñòðîéêà ñóì³ñíîñò³", -1, 7,7,231,60 AUTOCHECKBOX "&Ðîçïîâñþäèòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá íà âñ³ ïðîãðàìè", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",-1,14,33,220,25 + LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25 GROUPBOX "Íàñòðîéêà ñèñòåìè", -1, 7,74,231,60 AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè äëÿ âñ³õ ïðîãðàì. Íå ðåêîìåíäîâàíî äëÿ ìîâ ñõ³äíî¿ Àç³¿, îñê³ëüêè ìîâíà ïàíåëü áóäå çàêðèòà.",-1,14,100,220,25 Modified: trunk/reactos/dll/cpl/input/langbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/langbar.c?re… ============================================================================== --- trunk/reactos/dll/cpl/input/langbar.c (original) +++ trunk/reactos/dll/cpl/input/langbar.c Wed Jan 9 11:34:47 2008 @@ -25,16 +25,6 @@ * UPDATE HISTORY: * 06-09-2007 Created */ - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> #include "resource.h" #include "input.h" Modified: trunk/reactos/dll/cpl/input/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/misc.c?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/input/misc.c (original) +++ trunk/reactos/dll/cpl/input/misc.c Wed Jan 9 11:34:47 2008 @@ -25,16 +25,6 @@ * UPDATE HISTORY: * 06-09-2007 Created */ - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> #include "resource.h" #include "input.h" Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h (original) +++ trunk/reactos/dll/cpl/input/resource.h Wed Jan 9 11:34:47 2008 @@ -75,6 +75,7 @@ #define IDC_MORE_TEXT_SERV_COMBO 190 #define IDC_CKS_BUTTON 191 #define IDC_GRAVE_ACCENT_RADIOBTN 192 +#define IDC_SUPPORT_ADV_SERV_TEXT 193 /* IDS */ #define IDS_CPLSYSTEMNAME 1 Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c (original) +++ trunk/reactos/dll/cpl/input/settings.c Wed Jan 9 11:34:47 2008 @@ -26,16 +26,6 @@ * 06-09-2007 Created */ -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> -#include <process.h> - #include "resource.h" #include "input.h" @@ -121,7 +111,7 @@ } static BOOL -InitDefaultLangList(HWND hWnd) +InitLangList(HWND hWnd) { HKEY hKey, hSubKey; TCHAR szPreload[BUFSIZE], szCount[BUFSIZE], szSub[BUFSIZE]; @@ -270,9 +260,32 @@ switch (uMsg) { case WM_INITDIALOG: - InitDefaultLangList(hwndDlg); + { + InitLangList(hwndDlg); + EnableWindow(GetDlgItem(hwndDlg, IDC_PROP_BUTTON),FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT),FALSE); + } break; - + case WM_NOTIFY: + { + switch (LOWORD(wParam)) + { + case IDC_KEYLAYOUT_TREE: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + switch (lpnm->code) + { + case NM_CLICK: + { + + } + break; + } + } + break; + } + } + break; case WM_COMMAND: switch (LOWORD(wParam)) {

17 years

[dreimer] 31680: Bug 2944: Polish translation: part 4/4 - Dll by Olaf Siejka

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 9 10:51:42 2008 New Revision: 31680 URL: http://svn.reactos.org/svn/reactos?rev=31680&view=rev Log: Bug 2944: Polish translation: part 4/4 - Dll by Olaf Siejka Added: trunk/reactos/dll/win32/modemui/lang/pl-PL.rc (with props) trunk/reactos/dll/win32/rasapi32/lang/pl-PL.rc (with props) Modified: trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/rasapi32/rsrc.rc Added: trunk/reactos/dll/win32/modemui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/pl-PL.rc (added) +++ trunk/reactos/dll/win32/modemui/lang/pl-PL.rc Wed Jan 9 10:51:42 2008 @@ -1,0 +1,620 @@ +/* + * translated by Caemyr - Olaf Siejka (Jan,2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDM_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Kopiuj..", 0 + MENUITEM "&Usuñ", 1 + MENUITEM "&Zobacz logi", 2 + MENUITEM SEPARATOR + MENUITEM "&W³aciwoci", 3 + MENUITEM "K&opiuj w³aciwoci", 4 + MENUITEM "Za&stosuj w³aciwoci", 5 + END +END + +IDD_ADVANCED DIALOG 17, 12, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Zaawansowane" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ustawienia dodatkowe", 1018, 6, 6, 225, 70 + LTEXT "&Dodatkowe komendy inicjalizacji:", 1011, 16, 20, 143, 8 + EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL + LTEXT "&Czekaj na sygna³ karty kredytowej:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE + EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP + CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12 + LTEXT "sekund", 1010, 173, 54, 40, 8, NOT WS_VISIBLE + GROUPBOX "&Wybór Kraju/Regionu", 1012, 6, 80, 225, 75 + COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP + PUSHBUTTON "&Zaaw. ustawienia portu", 1100, 107, 170, 125, 14 + DEFPUSHBUTTON "Zmieñ &ustawienia domylne", 3, 107, 188, 125, 14 +END + +IDD_GENERAL DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ogólne" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Port:", 1018, 9, 8, 32, 10 + LTEXT "Port szeregowy", 1095, 48, 8, 181, 10 + GROUPBOX "&G³onoc", 1029, 10, 21, 218, 48 + CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20 + RTEXT "Wy³¹czona", 1045, 56, 40, 22, 8 + LTEXT "Wysoka", 1001, 155, 40, 25, 11 + GROUPBOX "&Maksymalna prêdkoæ portu", 1031, 10, 78, 218, 46 + COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Kontrola wybierania", 1060, 10, 133, 218, 51 + AUTOCHECKBOX "&Czekaj na sygna³ przed rozpoczêciem po³¹czenia", 1003, 27, 157, 174, 10 +END + +IDD_DISTINCTIVE_RING DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Linia wielonumerowa" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 145 + AUTOCHECKBOX "&Ta linia posiada us³ugê wielu numerów", 1069, 20, 7, 184, 10 + CTEXT "Wzorzec sygna³u", -1, 84, 21, 70, 8 + CTEXT "Typ po³¹czenia", -1, 159, 21, 63, 8 + LTEXT "&Numer g³ówny:", 1070, 20, 41, 62, 8 + COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Numer &1:", 1071, 20, 59, 62, 8 + COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Numer &2:", 1072, 20, 77, 62, 8 + COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Numer &3:", 1076, 20, 95, 62, 8 + COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Numer &priorytetowy:", 1078, 20, 112, 62, 8 + COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Oddzwanianie:", 1080, 20, 131, 62, 8 + COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DISTINCTIVE_RING_2 DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Linia wielonumerowa" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 87 + AUTOCHECKBOX "&Ta linia posiada us³ugê wielu numerów", 1069, 19, 7, 177, 10 + CTEXT "Wzorzec sygna³u", -1, 20, 21, 74, 8 + CTEXT "Rodzaj po³¹czenia", -1, 96, 21, 65, 8 + LTEXT "&Pojedynczy:", 1088, 20, 37, 53, 8 + COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "P&odwójny:", 1089, 20, 57, 53, 8 + COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Po&trójny:", 1090, 20, 76, 53, 8 + COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DIAGNOSTICS DIALOG 0, 0, 238, 215 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Diagnostyka" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58 + CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58 + PUSHBUTTON "&Zapytanie modemu", 1096, 138, 149, 75, 14 + AUTOCHECKBOX "Nagraj &logi", 1020, 18, 187, 98, 10 + PUSHBUTTON "&Przejrzyj logi", 1094, 138, 184, 75, 14, WS_DISABLED + GROUPBOX "Informacje o modemie", 1047, 10, 6, 217, 164 + GROUPBOX "Logowanie", -1, 10, 173, 217, 32 +END + +IDD_PLEASE_WAIT DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Proszê czekaæ..." +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Próba komunikacji z modemem. To mo¿e zaj¹æ wiele sekund.", -1, 42, 7, 146, 28 + DEFPUSHBUTTON "Cancel", 2, 72, 52, 50, 14 +END + +IDD_GENERAL_2 DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ogólne" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Wybieranie rêczne", 1002, 19, 22, 150, 10 + AUTOCHECKBOX "&Roz³¹cz jeli po³¹czenie jest bezczynne powy¿ej:", 1042, 19, 38, 143, 10 + EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "&Anuluj po³¹czenie jeli nie uda³o siê po³¹czyæ w ci¹gu", -1, 19, 56, 147, 10 + EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + RTEXT "&Szybkoæ portu:", 1034, 16, 102, 93, 8 + COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Protokó³ danych:", 1032, 16, 122, 93, 8 + COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Kompresja:", 1035, 16, 139, 93, 8 + COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "K&ontrola przep³ywu:", 1027, 16, 157, 93, 8 + COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Opcje po³¹czenia", 1060, 11, 7, 217, 66 + LTEXT "minut", 1044, 195, 38, 22, 8 + LTEXT "sekund", 1041, 194, 56, 22, 8 + GROUPBOX "Opcje po³¹czenia", -1, 11, 82, 217, 94 +END + +IDD_ADVANCED_2 DIALOG 17, 12, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Zaawansowane" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Przywo³aj okno &terminala przed po³¹czeniem", 1000, 20, 21, 200, 10 + AUTOCHECKBOX "Przywo³aj okno t&erminala po po³¹czeniu", 1001, 20, 38, 200, 10 + RTEXT "&Bity danych:", 1024, 18, 79, 93, 8 + COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Parzystoæ:", 1026, 18, 97, 93, 8 + COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "B&ity stopu:", 1029, 18, 115, 93, 8 + COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Modulacja:", 1045, 18, 133, 93, 8 + COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Okno terminala", 1004, 10, 7, 217, 49 + GROUPBOX "Ustawienia sprzêtowe", 1005, 10, 64, 217, 89 +END + +IDD_ISDN DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ISDN" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Typ Switcha", -1, 11, 6, 217, 39 + COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "&Pierwszy numer", -1, 11, 50, 217, 50 + EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8 + EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER + GROUPBOX "&Drugi numer", -1, 11, 105, 217, 49 + EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8 + EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER +END + +IDD_PLEASE_WAIT_2 DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Proszê czekaæ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Wysy³anie informacji o kraju/regionie do Modemu.", -1, 42, 7, 146, 28 +END + +IDD_WARNING DIALOG 0, 0, 360, 105 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Ostrze¿enie" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Nie pokazuj wiêcej tej wiadomoci", 1109, 17, 73, 118, 10 + DEFPUSHBUTTON "OK", 1, 302, 84, 50, 14 + LTEXT "Niektóre modemy nie obs³uguj¹ w³aciwie komendy inicjalizacji o tej wielkoci.", -1, 50, 27, 304, 8 + LTEXT "Informacje o tym ograniczeniu mog¹ zostaæ uzyskane od producenta Modemu.", -1, 50, 41, 304, 8 + ICON 5100, -1, 15, 14, 20, 20 + LTEXT "Wprowadzi³e komendê inicjalizacji d³u¿sz¹ ni¿ 57 znaków.", -1, 50, 14, 304, 8 +END + +IDD_MODEMS DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Modemy" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, 1057, 6, 7, 20, 20 + LTEXT "Zainstalowane &modemy:", -1, 44, 12, 203, 9 + CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE + PUSHBUTTON "&Dodaj...", 110, 56, 198, 60, 14 + PUSHBUTTON "&Usuñ....", 112, 121, 198, 60, 14 + PUSHBUTTON "&W³aciwoci", 109, 185, 198, 60, 14 +END + +IDD_PLEASE_WAIT_3 DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Proszê czekaæ..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Stop", 2, 74, 53, 50, 14 + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Usuwanie", -1, 40, 8, 151, 8 + LTEXT "Modemu", 1005, 40, 16, 151, 25 +END + +STRINGTABLE +BEGIN + 180 "Port szeregowy RS-232" + 181 "Modem Zewnêtrzny" + 182 "Modem Wewnêtrzny" + 183 "Modem PCMCIA" + 184 "Modem Równoleg³y" + 185 "Port Równoleg³y" + 200 "110" + 201 "1200" + 202 "2400" + 203 "4800" + 204 "9600" + 206 "19200" + 207 "38400" + 210 "115200" + 211 "57600" + 216 "300" + 220 "230400" + 221 "460800" + 222 "921600" + 240 "4" + 241 "5" + 242 "6" + 243 "7" + 244 "8" + 250 "Parzysta" + 251 "Nieparzysta" + 252 "Brak" + 253 "Jedynka" + 254 "Zero" + 255 "1" + 256 "1.5" + 257 "2" + 260 "Xon / Xoff" + 261 "Sprzêtowa" + 262 "Brak" + 263 "W³¹czona" + 264 "Niska" + 265 "V.23 (Minitel)" + 266 "Standardowy" + 267 "Niestandardowy (Bell, HST)" + 270 "Do³¹cz do &logów" + 300 "Niesprecyzowana" + 301 "Dane" + 302 "Faks" + 303 "G³os" + 304 "Brak" + 320 "Ustawienia kraju/regionu zaktualizowane" + 340 "Modem" + 341 "Ustawienia Modemu" + 342 "Numer modemu" + 400 "Ustawienia kraju/regionu niezaktualizowane" + 401 "Niektóre modemy nie obs³uguj¹ w³aciwie komendy inicjalizacji d³u¿szej ni¿ 57 znaków.\n\nInformacje o tym ograniczeniu mog¹ zostaæ uzyskane od producenta Modemu." + 402 "Ostrze¿enie" + 460 "Nie ma doæ pamiêci by otworzyæ okno Modem - Ogólne.\nZamknij pliki b¹d programy i spróbuj ponownie." + 461 "Nie ma doæ pamiêci by otworzyæ okno ustawieñ Modemu.\nZamknij pliki b¹d programy i spróbuj ponownie." + 463 "Ka¿dy numer musi byæ ustawione na 'Automatycznie' albo na unikalny.\n\nZmieñ powtórzony wzorzec sygna³u na nieu¿ywany." + 465 "Standardowy EC" + 466 "Wymuszony EC" + 467 "Komórkowy" + 468 "Wy³¹czony" + 469 "W³¹czony" + 470 "Wy³¹czony" + 480 "AUTO (1 Ch.)" + 481 "AUTO (2 Ch.)" + 482 "PPP (56K)" + 483 "PPP (64K)" + 484 "PPP (112K)" + 485 "PPP (112K,PAP)" + 486 "PPP (112K,CHAP)" + 487 "PPP (112K,MSCHAP)" + 488 "PPP (128K)" + 489 "PPP (128K,PAP)" + 490 "PPP (128K,CHAP)" + 491 "PPP (128K,MSCHAP)" + 500 "V.120 (64K)" + 501 "V.120 (56K)" + 502 "V.120 (112K)" + 503 "V.120 (128K)" + 504 "X.75 (64K)" + 505 "X.75 (128K)" + 506 "X.75 (T.70)" + 507 "X.75 (BTX)" + 508 "V.110 (1.2K)" + 509 "V.110 (2.4K)" + 510 "V.110 (4.8K)" + 511 "V.110 (9.6K)" + 512 "V.110 (12.0K)" + 513 "V.110 (14.4K)" + 514 "V.110 (19.2K)" + 515 "V.110 (28.8K)" + 516 "V.110 (38.4K)" + 517 "V.110 (57.6K)" + 518 "Analogowy (V.34/V.90)" + 550 "ESS5 (AT&T) (North America)" + 551 "AT&T Point do Multipoint" + 552 "Krajowy ISDN 1 (NI-1)" + 553 "Northern Telecom DMS 100 (NT1)" + 554 "NTT INS64 (Japonia)" + 555 "Europejski ISDN (DSS1)" + 556 "Niemiecki Krajowy (1TR6)" + 557 "Francuski Krajowy (VN3)" + 558 "Belgijski Krajowy" + 559 "Australijski Krajowy" + 560 "Nieznany switch" + 570 "Konfiguracja ISDN dla tego Modemu\NIS nie zosta³a ukoñczona.\n\nProszê wype³niæ wszystkie pola w\nzak³adce ISDN przed prób¹ u¿ycia modemu." + 600 "PPP (56K,GSM)" + 601 "PPP (64K,GSM)" + 602 "V.120 (64K,GSM)" + 604 "V.110 (1.2K,GSM)" + 605 "V.110 (2.4K,GSM)" + 606 "V.110 (4.8K,GSM)" + 607 "V.110 (9.6K,GSM)" + 608 "V.110 (12.0K,GSM)" + 609 "V.110 (14.4K,GSM)" + 610 "V.110 (19.2K,GSM)" + 611 "V.110 (28.8K,GSM)" + 612 "V.110 (38.4K,GSM)" + 613 "V.110 (57.6K,GSM)" + 614 "Analogowy RLP" + 615 "Analogowy NRLP" + 616 "GPRS" + 617 "PIAFS - przychodz¹ce" + 618 "PIAFS - wychodz¹ce" + 700 "U¿yj obecnej lokalizacji TAPI" + 2006 "Do³¹czony do" + 2007 "Nieobecny" + 2008 "Nie funkcjonuje" + 2009 "Wymaga restartu" + 2010 "#Aby zakoñczyæ konfiguracjê modemu, musisz zrestartowaæ komputer.\n\nCzy chcesz zrestartowaæ komputer w tej chwili?" + 2011 "Modem nie zosta³ zainstalowany poprawnie" + 2012 "Port nieznany" + 3000 "Konfiguracja Modemu" + 3018 "Modemy" + 3019 "Instalacja nowego Modemu albo zmiana jego w³aciwoci." + 3053 "Nie mo¿na wywietliæ w³aciwoci Modemu, bo sam Modem nie jest dostêpny.\n\nZrestartuj system i spróbuj ponownie." + 3054 "W³aciwoci Modemów" + 3060 "Czy na pewno chcesz usun¹æ wybrany Modem z twojego systemu??" + 3061 "ReactOS nie móg³ usun¹æ Modemu '%1' z %2." + 3062 "Modem" + 3069 "Nie ma doæ pamiêci by otworzyæ panel kontrolny Modemu.\n\nZamknij kilka plików lub programów i spróbuj ponownie." + 3073 "Musisz byæ Administratorem Systemu by zainstalowaæ Modem." + 3074 "Brak zainstalowanych Modemów. Musisz byæ Administratorem Systemu by zainstalowaæ Modem." + 3076 "Musisz zestartowaæ swój komputer zanim nowe zmiany zostan¹ wprowadzone.\n\nCzy chcesz zrestartowaæ komputer w tej chwili?" + 3077 "Zmiana ustawieñ sieci." + 3200 "300 Baudów" + 3201 "1200 Baudów" + 3202 "2400 Baudów" + 3203 "9600 Baudów" + 3204 "19.2K Baudów" + 3205 "38.4K Baudów" + 3206 "57.6K Baudów" + 3207 "Brak odpowiedzi" + 3212 "Komenda" + 3213 "Odpowied" + 3214 "Nie uda³o siê otworzyæ portu, do którego pod³¹czony jest modem. To mo¿e byæ efekt konfliktu sprzêtowego. Sprawd w mened¿erze urz¹dzeñ czy modem pracuje poprawnie." + 3215 "Port do którego pod³¹czony jest modem wykorzytuje w tej chwili inna aplikacja. Zamknij j¹ by kontynuowaæ." + 3218 "OpenComm" + 3221 "115K Baudów" + 3222 "Uaktualnianie" + 3223 "B³¹d" + 3233 "Powodzenie" + 3236 "Modem nie odpowiedzia³. Upewnij siê ¿e jest poprawnie pod³¹czony i uruchomiony. Je¿eli jest poprawnie pod³¹czony, albo to modem wewnêtrzny, sprawd czy dobrze ustawione jest przerwanie." + 3237 "KOMENDA NIEOBS£UGIWANA" + 3238 "Pole" + 3239 "Wartoæ" + 3240 " Ustawienia Domylne" + 3241 " Ustawienia Po³¹czenia" + 6144 "Japonia" + 6145 "Albania" + 6146 "Algieria" + 6147 "Amerykañska Samoa" + 6148 "Niemcy (kod 04)" + 6149 "Anguilla" + 6150 "Antigua i Barbuda" + 6151 "Argentyna" + 6152 "Wyspy Wniebowst¹pienia" + 6153 "Australia" + 6154 "Austria" + 6155 "Bahamy" + 6156 "Bahrain" + 6157 "Bangladesz" + 6158 "Barbados" + 6159 "Belgia" + 6160 "Belize" + 6161 "Benin" + 6162 "Bermudy" + 6163 "Bhutan" + 6164 "Boliwia" + 6165 "Botswana" + 6166 "Brazylia" + 6167 "Kod kraju/regiounu (23)" + 6168 "Brytyjskie terytorium oceanu Indyjskiego" + 6169 "Brytyjskie Wyspy Dziewicze" + 6170 "Brunei" + 6171 "Bu³garia" + 6172 "Birma" + 6173 "Burundi" + 6174 "Bia³oru" + 6175 "Kamerun" + 6176 "Kanada" + 6177 "Cape Verde" + 6178 "Kajmany" + 6179 "Republika Afryki rodkowej" + 6180 "Czad" + 6181 "Chile" + 6182 "Chiny" + 6183 "Kolumbia" + 6184 "Komory" + 6185 "Kongo" + 6186 "Wyspy Cooka" + 6187 "Kostaryka" + 6188 "Kuba" + 6189 "Cypr" + 6190 "Czechy" + 6191 "Kambod¿a" + 6192 "Korea Pó³nocna" + 6193 "Dania" + 6194 "D¿ibuti" + 6195 "Republika Domikinany" + 6196 "Dominikana" + 6197 "Ekwador" + 6198 "Egipt" + 6199 "San Salwador" + 6200 "Gwinea Równikowa" + 6201 "Etiopia" + 6202 "Falklandy" + 6203 "Wyspy Fiji" + 6204 "Finlandia" + 6205 "Francja" + 6206 "Polinezja Francuska" + 6207 "Kod kraju/regiounu (63)" + 6208 "Gabon" + 6209 "Gambia" + 6210 "Niemcy (kod kraju/regiounu 66)" + 6211 "Angola" + 6212 "Ghana" + 6213 "Gibraltar" + 6214 "Grecja" + 6215 "Grenada" + 6216 "Guam" + 6217 "Gwtemala" + 6218 "Guernsey" + 6219 "Gwinea" + 6220 "Gwinea-Bissau" + 6221 "Gujana" + 6222 "Haiti" + 6223 "Honduras" + 6224 "Hong Kong" + 6225 "Wêgry" + 6226 "Islandia" + 6227 "Indie" + 6228 "Indonezja" + 6229 "Iran" + 6230 "Irak" + 6231 "Irlandia" + 6232 "Izrael" + 6233 "W³ochy" + 6234 "Wybrze¿e Koci S³oniowej" + 6235 "Jamajka" + 6236 "Afganistan" + 6237 "Wyspa Jersey" + 6238 "Jordania" + 6239 "Kenia" + 6240 "Kiribati" + 6241 "Korea" + 6242 "Kuwejt" + 6243 "Laos" + 6244 "Liban" + 6245 "Lesoto" + 6246 "Liberia" + 6247 "Libia" + 6248 "Lichtenstein" + 6249 "Luksemburg" + 6250 "Makau" + 6251 "Madagaskar" + 6252 "Malezja" + 6253 "Malawi" + 6254 "Maldiwy" + 6255 "Mali" + 6256 "Malta" + 6257 "Mauretania" + 6258 "Mauritius" + 6259 "Meksyk" + 6260 "Monako" + 6261 "Mongolia" + 6262 "Montserrat" + 6263 "Maroko" + 6264 "Mozambik" + 6265 "Nauru" + 6266 "Nepal" + 6267 "Holandia" + 6268 "Antyle Holenderskie" + 6269 "Nowa Kaledonia" + 6270 "Nowa Zealand" + 6271 "Nikaragua" + 6272 "Niger" + 6273 "Nigeria" + 6274 "Norwegia" + 6275 "Oman" + 6276 "Pakistan" + 6277 "Panama" + 6278 "Papua Nowa Gwinea" + 6279 "Paragwaj" + 6280 "Peru" + 6281 "Filipiny" + 6282 "Polska" + 6283 "Portugalia" + 6284 "Puerto Rico" + 6285 "Katar" + 6286 "Rumunia" + 6287 "Rwanda" + 6288 "Wyspy St. Kitts i Nevis" + 6289 "Kod kraju/regionu (145)" + 6290 "Wyspy w. Heleny" + 6291 "Wyspy St. Lucia" + 6292 "San Marino" + 6293 "Kod kraju/regionu (148)" + 6294 "Sao Tome" + 6295 "Wyspy w. Wincenta" + 6296 "Arabia Saudyjska" + 6297 "Senegal" + 6298 "Seszele" + 6299 "Sierra Leone" + 6300 "Singapur" + 6301 "Wyspy Salomona" + 6302 "Somalia" + 6303 "RPA" + 6304 "Hiszpania" + 6305 "Sri Lanka" + 6306 "Sudan" + 6307 "Surinam" + 6308 "Suazi" + 6309 "Szwecja" + 6310 "Szwajcaria" + 6311 "Syria" + 6312 "Tanzania" + 6313 "Tajlandia" + 6314 "Togo" + 6315 "Tonga" + 6316 "Trinidad i Tobago" + 6317 "Tunezja" + 6318 "Turcja" + 6319 "Turks and Caicos Islands" + 6320 "Tuvalu" + 6321 "Uganda" + 6322 "Ukraina" + 6323 "Zjednoczone Emiraty Arabskie" + 6324 "Wielka Brytania" + 6325 "Stany Zjednoczone" + 6326 "Burkina Faso" + 6327 "Urugwaj" + 6328 "Kod kraju/regionu (184)" + 6329 "Republika Vanuatu" + 6330 "Watykan" + 6331 "Wenezuela" + 6332 "Wietnam" + 6333 "Wallis i Futuna" + 6334 "Samoa" + 6335 "Jemen" + 6336 "Jemen" + 6337 "Kod kraju/regionu (193)" + 6338 "Kongo (DRk)" + 6339 "Zambia" + 6340 "Zimbabwe" + 6501 "Mo³dawia" + 6502 "Estonia" + 6503 "Litwa" + 6504 "Armenia" + 6505 "Gruzja" + 6506 "Azerbejd¿an" + 6507 "Turkmenistan" + 6508 "Uzbekistan" + 6509 "Kazachstan" + 6510 "Tad¿ykistan" + 6511 "Kirgyzstan" + 6512 "£otwa" + 6513 "Rosja" + 6600 "Chorwacja" + 6601 "S³owenia" + 6602 "Macedonia" + 6603 "Bosnia and Hercegovina" + 6604 "Jugos³awia" + 20013 "ID Sprzêtu" +END Propchange: trunk/reactos/dll/win32/modemui/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… ============================================================================== --- trunk/reactos/dll/win32/modemui/modemui.rc (original) +++ trunk/reactos/dll/win32/modemui/modemui.rc Wed Jan 9 10:51:42 2008 @@ -16,5 +16,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -#include "lang/ru-RU.rc" Added: trunk/reactos/dll/win32/rasapi32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/lang/pl-PL.rc (added) +++ trunk/reactos/dll/win32/rasapi32/lang/pl-PL.rc Wed Jan 9 10:51:42 2008 @@ -1,0 +1,38 @@ +/* + * translated by Caemyr - Olaf Siejka (Jan,2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + 4097 "Skrypt '%1' nie zosta³ znaleziony." + 4098 "%1(%2!d!) : Nieoczekiwane zakoñczenie pliku" + 4099 "%1(%2!d!) : '%3' : b³¹d sk³adni" + 4100 "%1 : brak deklaracji 'proc main'" + 4101 "%1(%2!d!) : oczekiwano identyfikatora" + 4102 "%1(%2!d!) : oczekiwano parametru string" + 4103 "%1(%2!d!) : oczekiwano parametru integer" + 4104 "%1(%2!d!) : '%3' : typ nieprawid³owy" + 4105 "Nie ma doæ pamiêci by przetworzyæ ten skrypt." + 4106 "%1(%2!d!) : '%3' : wyst¹pi³ b³¹d wewnêtrzny." + 4107 "%1(%2!d!) : '%3' : nieprawid³owy parametr" + 4108 "%1(%2!d!) : '%3' : nieprawid³owy parametr 'set ipaddr'" + 4109 "%1(%2!d!) : '%3' : nieprawid³owy parametr'set port'" + 4110 "%1(%2!d!) : '%3' : nieprawid³owy zakres liczbowy" + 4111 "%1(%2!d!) : '%3' : nieprawid³owy parametr 'set screen'" + 4112 "%1(%2!d!) : '%3' : oczekiwano '('" + 4113 "%1(%2!d!) : '%3' : oczekiwano typu integer" + 4114 "%1(%2!d!) : '%3' : oczekiwano typu string" + 4115 "%1(%2!d!) : '%3' : oczekiwano typu boolean" + 4116 "%1(%2!d!) : '%3' : oczekiwano typu integer albo string" + 4117 "%1(%2!d!) : '%3' : nieprawid³owy typ" + 4118 "%1(%2!d!) : '%3' : identyfikator juz zosta³ zdefiniowany" + 4119 "%1(%2!d!) : '%3' : identyfikator nie zosta³ zdefiniowany" + 4120 "%1(%2!d!) : '%3' : oczekiwano typu etykieta" + 4121 "%1(%2!d!) : dzielenie przez zero" + 4122 "%1(%2!d!) : '%3' : oczekiwano typu integer, string, albo boolean" +END Propchange: trunk/reactos/dll/win32/rasapi32/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/rasapi32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rsrc.rc (original) +++ trunk/reactos/dll/win32/rasapi32/rsrc.rc Wed Jan 9 10:51:42 2008 @@ -2,5 +2,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

17 years

[jimtabor] 31679: Update SetMetaRgn, UpdateColors, ResizePalette and add support for windows client info gdi.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jan 9 07:15:42 2008 New Revision: 31679 URL: http://svn.reactos.org/svn/reactos?rev=31679&view=rev Log: Update SetMetaRgn, UpdateColors, ResizePalette and add support for windows client info gdi. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/palette.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Jan 9 07:15:42 2008 @@ -185,18 +185,6 @@ /* - * @implemented - */ -int -STDCALL -GetMetaRgn(HDC hdc, - HRGN hrgn) -{ - return NtGdiGetRandomRgn(hdc,hrgn,2); -} - - -/* * @unimplemented */ UINT @@ -213,7 +201,6 @@ } - /* * @unimplemented */ @@ -244,35 +231,6 @@ } /* - * @unimplemented - */ -BOOL -STDCALL -ResizePalette( - HPALETTE a0, - UINT a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -int -STDCALL -SetMetaRgn( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* * @implemented */ UINT @@ -315,21 +273,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - -/* - * @unimplemented - */ -BOOL -STDCALL -UpdateColors( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c Wed Jan 9 07:15:42 2008 @@ -89,7 +89,19 @@ return UserRealizePalette(hDC); } - +/* + * @implemented + */ +BOOL +STDCALL +ResizePalette( + HPALETTE hPalette, + UINT nEntries + ) +{ + return NtGdiResizePalette(hPalette, nEntries); +} + /* * @implemented */ @@ -110,4 +122,17 @@ return retValue; } +/* + * @implemented + */ +BOOL +STDCALL +UpdateColors( + HDC hdc + ) +{ + ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins = 0; + return NtGdiUpdateColors(hdc); +} + /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Wed Jan 9 07:15:42 2008 @@ -243,6 +243,17 @@ /* * @implemented */ +int +STDCALL +GetMetaRgn(HDC hdc, + HRGN hrgn) +{ + return NtGdiGetRandomRgn(hdc,hrgn,2); +} + +/* + * @implemented + */ BOOL STDCALL MirrorRgn(HWND hwnd, HRGN hrgn) @@ -313,3 +324,28 @@ #endif } +/* + * @implemented + */ +int +STDCALL +SetMetaRgn( HDC hDC ) +{ + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_DC) + return NtGdiSetMetaRgn(hDC); +#if 0 + PLDC pLDC = GdiGetLDC(hDC); + if ( pLDC && GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_METADC ) + { + if (pLDC->iType == LDC_EMFLDC || EMFDRV_SetMetaRgn(hDC)) + { + return NtGdiSetMetaRgn(hDC); + } + else + SetLastError(ERROR_INVALID_HANDLE); + } +#endif + return 0; +} + + Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed Jan 9 07:15:42 2008 @@ -357,6 +357,16 @@ RECT r; HBRUSH hBrush; } PATRECT, * PPATRECT; + +typedef struct _W32CLIENTINFO +{ + ULONG CI_flags; + ULONG cSpins; + ULONG ulWindowsVersion; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG W32ClientInfo[57]; +} W32CLIENTINFO, *PW32CLIENTINFO; #endif typedef struct _GDIBSPPATBLT

17 years

← Newer
1
...
36
37
38
39
40
41
42
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008