Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[janderwald] 42756: - Fix a big bug in the samplerate conversion routine
by janderwald＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: janderwald Date: Mon Aug 17 15:39:20 2009 New Revision: 42756 URL: http://svn.reactos.org/svn/reactos?rev=42756&view=rev Log: - Fix a big bug in the samplerate conversion routine Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Mon Aug 17 15:39:20 2009 @@ -127,13 +127,13 @@ { PUSHORT Res = (PUSHORT)ResultOut; - src_float_to_short_array(FloatIn, (short*)Res, Data.output_frames_gen * NumChannels); + src_float_to_short_array(FloatOut, (short*)Res, Data.output_frames_gen * NumChannels); } else if (BytesPerSample == 4) { PULONG Res = (PULONG)ResultOut; - src_float_to_int_array(FloatIn, (int*)Res, Data.output_frames_gen * NumChannels); + src_float_to_int_array(FloatOut, (int*)Res, Data.output_frames_gen * NumChannels); }

1 0

[janderwald] 42755: - Add members required for usermode-mixing support
by janderwald＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: janderwald Date: Mon Aug 17 15:37:57 2009 New Revision: 42755 URL: http://svn.reactos.org/svn/reactos?rev=42755&view=rev Log: - Add members required for usermode-mixing support Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Mon Aug 17 15:37:57 2009 @@ -184,6 +184,10 @@ struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; PWAVEHDR Header; BOOL PerformCompletion; + + DWORD OriginalBufferSize; + LPOVERLAPPED_COMPLETION_ROUTINE OriginalCompletionRoutine; + } SOUND_OVERLAPPED, *PSOUND_OVERLAPPED; typedef MMRESULT (*WAVE_COMMIT_FUNC)( @@ -329,6 +333,7 @@ DWORD LoopsRemaining; DWORD FrameSize; DWORD BufferCount; + WAVEFORMATEX WaveFormatEx; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; /* This lives in WAVEHDR.reserved */

1 0

[jimtabor] 42754: - Add win32k support functions for GetCharacterPlacement.
by jimtabor＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: jimtabor Date: Mon Aug 17 07:46:57 2009 New Revision: 42754 URL: http://svn.reactos.org/svn/reactos?rev=42754&view=rev Log: - Add win32k support functions for GetCharacterPlacement. Modified: trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Mon Aug 17 07:46:57 2009 @@ -109,6 +109,8 @@ BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL RECTL*, IN LPWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); DWORD FASTCALL IntGetCharDimensions(HDC, PTEXTMETRICW, PDWORD); +BOOL FASTCALL GreGetTextExtentW(HDC,LPWSTR,INT,LPSIZE,UINT); +BOOL FASTCALL GreGetTextExtentExW(HDC,LPWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FLONG); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Mon Aug 17 07:46:57 2009 @@ -14,6 +14,27 @@ #include <debug.h> /** Internal ******************************************************************/ + +DWORD +FASTCALL +GreGetCharacterPlacementW( + HDC hdc, + LPWSTR pwsz, + INT nCount, + INT nMaxExtent, + LPGCP_RESULTSW pgcpw, + DWORD dwFlags) +{ + SIZE Size = {0,0}; + + if (!pgcpw) + { + if (GreGetTextExtentW( hdc, pwsz, nCount, &Size, 1)) + return MAKELONG(Size.cx, Size.cy); + } + UNIMPLEMENTED; + return 0; +} INT FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Mon Aug 17 07:46:57 2009 @@ -13,7 +13,114 @@ #define NDEBUG #include <debug.h> -/** Functions ******************************************************************/ +/** Functions *****************************************************************/ + +BOOL +FASTCALL +GreGetTextExtentW( + HDC hDC, + LPWSTR lpwsz, + INT cwc, + LPSIZE psize, + UINT flOpts) +{ + PDC pdc; + PDC_ATTR pdcattr; + BOOL Result; + PTEXTOBJ TextObj; + + if (!cwc) + { + psize->cx = 0; + psize->cy = 0; + return TRUE; + } + + pdc = DC_LockDc(hDC); + if (!pdc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + pdcattr = pdc->pdcattr; + + TextObj = RealizeFontInit(pdcattr->hlfntNew); + if ( TextObj ) + { + Result = TextIntGetTextExtentPoint( pdc, + TextObj, + lpwsz, + cwc, + 0, + NULL, + 0, + psize); + TEXTOBJ_UnlockText(TextObj); + } + else + Result = FALSE; + + DC_UnlockDc(pdc); + return Result; +} + +BOOL +FASTCALL +GreGetTextExtentExW( + HDC hDC, + LPWSTR String, + ULONG Count, + ULONG MaxExtent, + PULONG Fit, + PULONG Dx, + LPSIZE pSize, + FLONG fl) +{ + PDC pdc; + PDC_ATTR pdcattr; + BOOL Result; + PTEXTOBJ TextObj; + + if ( (!String && Count ) || !pSize ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ( !Count ) + { + if ( Fit ) Fit = 0; + return TRUE; + } + + pdc = DC_LockDc(hDC); + if (NULL == pdc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + pdcattr = pdc->pdcattr; + + TextObj = RealizeFontInit(pdcattr->hlfntNew); + if ( TextObj ) + { + Result = TextIntGetTextExtentPoint( pdc, + TextObj, + String, + Count, + MaxExtent, + (LPINT)Fit, + (LPINT)Dx, + pSize); + TEXTOBJ_UnlockText(TextObj); + } + else + Result = FALSE; + + DC_UnlockDc(pdc); + return Result; +} DWORD APIENTRY @@ -214,8 +321,14 @@ TextObj = RealizeFontInit(pdcattr->hlfntNew); if ( TextObj ) { - Result = TextIntGetTextExtentPoint(dc, TextObj, String, Count, MaxExtent, - NULL == UnsafeFit ? NULL : &Fit, Dx, &Size); + Result = TextIntGetTextExtentPoint( dc, + TextObj, + String, + Count, + MaxExtent, + NULL == UnsafeFit ? NULL : &Fit, + Dx, + &Size); TEXTOBJ_UnlockText(TextObj); } else

1 0

[dreimer] 42753: Sync all apps with wine 1.1.27. (reactos) This is not a 1:1 sync anymore, because Wine adds all single rc files into the makefile now and we don't support this right now. -> Reverted to old behavior and added a pragma revert line to all rc files which change the pragma for UTF8 Support. Now all Wine apps properly work again.
by dreimer＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: dreimer Date: Mon Aug 17 03:42:32 2009 New Revision: 42753 URL: http://svn.reactos.org/svn/reactos?rev=42753&view=rev Log: Sync all apps with wine 1.1.27. (reactos) This is not a 1:1 sync anymore, because Wine adds all single rc files into the makefile now and we don't support this right now. -> Reverted to old behavior and added a pragma revert line to all rc files which change the pragma for UTF8 Support. Now all Wine apps properly work again. Added: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc - copied, changed from r42072, trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/write/rsrc.rc - copied, changed from r42072, trunk/reactos/base/applications/write/rsrc.rc Removed: trunk/reactos/base/applications/write/lang/ Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild trunk/reactos/base/applications/winhlp32/De.rc trunk/reactos/base/applications/winhlp32/Fr.rc trunk/reactos/base/applications/winhlp32/It.rc trunk/reactos/base/applications/winhlp32/Ja.rc trunk/reactos/base/applications/winhlp32/Lt.rc trunk/reactos/base/applications/winhlp32/Nl.rc trunk/reactos/base/applications/winhlp32/Pt.rc trunk/reactos/base/applications/winhlp32/Rm.rc trunk/reactos/base/applications/winhlp32/Ru.rc trunk/reactos/base/applications/winhlp32/Si.rc trunk/reactos/base/applications/winhlp32/Zh.rc trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhlp32.rbuild trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/write/De.rc trunk/reactos/base/applications/write/Fr.rc trunk/reactos/base/applications/write/Ja.rc trunk/reactos/base/applications/write/Lt.rc trunk/reactos/base/applications/write/Ro.rc trunk/reactos/base/applications/write/Ru.rc trunk/reactos/base/applications/write/Si.rc trunk/reactos/base/applications/write/write.rbuild Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -80,3 +80,4 @@ \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -81,3 +81,4 @@ \t\tque le fichier source\n\n" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Lt.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -29,18 +29,18 @@ STRINGTABLE { STRING_INVPARMS, "Neteisingas parametrÅ³ skaiÄius - pagalba: xcopy /?\n" - STRING_INVPARM, "Neteisingas parametras '%s' - pagalba: xcopy /?\n" + STRING_INVPARM, "Neteisingas parametras â%sâ - pagalba: xcopy /?\n" STRING_PAUSE, "Spauskite <enter> kopijavimui pradÄti\n" STRING_SIMCOPY, "bus nukopijuota failÅ³: %d\n" STRING_COPY, "nukopijuota failÅ³: %d\n" - STRING_QISDIR, "Ar '%s' yra failas, ar katalogas,\n" \ + STRING_QISDIR, "Ar â%sâ yra failas, ar katalogas,\n" \ "ar paskirtis?\n" \ "(F - failas, K - katalogas)\n" STRING_SRCPROMPT,"%s? (Taip|Ne)\n" STRING_OVERWRITE,"PerraÅ¡yti %s? (Taip|Ne|Visus)\n" - STRING_COPYFAIL, "'%s' kopijavimas Ä¯ '%s' nepavyko su r/c %d\n" - STRING_OPENFAIL, "Nepavyko atverti '%s'\n" - STRING_READFAIL, "Klaida skaitant '%s'\n" + STRING_COPYFAIL, "â%sâ kopijavimas Ä¯ â%sâ nepavyko su r/c %d\n" + STRING_OPENFAIL, "Nepavyko atverti â%sâ\n" + STRING_READFAIL, "Klaida skaitant â%sâ\n" STRING_YES_CHAR, "T" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "V" @@ -81,3 +81,4 @@ \t\tsenesnis uÅ¾ Å¡altinio failÄ\n\n" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -20,6 +20,8 @@ */ #include "xcopy.h" + +#pragma code_page(65001) LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -77,3 +79,4 @@ \t\tdatum. Als geen detum wordt gegeven, copiÃ«er alleen als bron nieuwer is.\n\n" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -22,26 +22,29 @@ #include "xcopy.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { STRING_INVPARMS, -"Íåäîïóñòèìîå ÷èñëî ïàðàìåòðîâ - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ\n\ -ïîäðîáíîãî îïèñàíèÿ.\n" +"ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ ÑÐ¸ÑÐ»Ð¾ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ\n\ +Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n" STRING_INVPARM, -"Íåäîïóñòèìûé ïàðàìåòð '%s' - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ ïîäðîáíîãî\n\ -îïèñàíèÿ.\n" - STRING_PAUSE, "Íàæìèòå êëàâèøó <enter>, ÷òîáû íà÷àòü êîïèðîâàíèå.\n" - STRING_SIMCOPY, "%d ôàéë(îâ) áûëî áû ñêîïèðîâàíî.\n" - STRING_COPY, "%d ôàéë(îâ) ñêîïèðîâàíî.\n" - STRING_QISDIR, "'%s' ÿâëÿåòñÿ ôàéëîì èëè ïàïêîé?\n" \ - "(F - Ôàéë, D - Ïàïêà)\n" +"ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%s' - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾\n\ +Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n" + STRING_PAUSE, "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÑ <enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" + STRING_SIMCOPY, "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð±ÑÐ»Ð¾ Ð±Ñ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" + STRING_COPY, "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" + STRING_QISDIR, "'%s' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n" \ + "(F - Ð¤Ð°Ð¹Ð», D - ÐÐ°Ð¿ÐºÐ°)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" - STRING_OVERWRITE,"Ïåðåïèñàòü %s? (Yes|No|All)\n" - STRING_COPYFAIL, "Ïðè êîïèðîâàíèè '%s' â '%s' ïðîèçîøëà îøèáêà: %d\n" - STRING_OPENFAIL, "Íåâîçìîæíî îòêðûòü '%s'\n" - STRING_READFAIL, "Ïðè ÷òåíèè '%s' ïðîèçîøëà îøèáêà\n" + STRING_OVERWRITE,"ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÑ %s? (Yes|No|All)\n" + STRING_COPYFAIL, "ÐÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸ '%s' Ð² '%s' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°: %d\n" + STRING_OPENFAIL, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ '%s'\n" + STRING_READFAIL, "ÐÑÐ¸ ÑÑÐµÐ½Ð¸Ð¸ '%s' Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°\n" STRING_YES_CHAR, "Y" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "A" @@ -49,35 +52,36 @@ STRING_DIR_CHAR, "D" STRING_HELP, -"XCOPY - Êîïèðóåò ôàéëû è äåðåâüÿ ïàïîê\n\ +"XCOPY - ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ°Ð¹Ð»Ñ Ð¸ Ð´ÐµÑÐµÐ²ÑÑ Ð¿Ð°Ð¿Ð¾Ðº\n\ \n\ -Ñèíòàêñèñ:\n\ +Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ -Ãäå:\n\ +ÐÐ´Ðµ:\n\ \n\ -[/I] Åñëè êîíå÷íàÿ ïàïêà îòñóòñòâóåò è êîïèðóåòñÿ áîëåå îäíîãî ôàéëà,\n\ - òî ïðåäïîëàãàåòñÿ ïàïêà â êà÷åñòâå ìåñòà íàçíà÷åíèÿ.\n\ -[/S] Êîïèðóåò ïàïêè è ïîäïàïêè.\n\ -[/E] Êîïèðóåò ïàïêè è ïîäïàïêè, âêëþ÷àÿ ïóñòûå.\n\ -[/Q] Íå îòîáðàæàåò èìåíà êîïèðóåìûõ ôàéëîâ.\n\ -[/F] Îòîáðàæàåò ïîëíûå èìåíà èñõîäíûõ è êîíå÷íûõ ôàéëîâ.\n\ -[/L] Âûâîäèò ñïèñîê ôàéëîâ, êîòîðûå áóäóò ñêîïèðîâàíû.\n\ -[/W] Çàïðàøèâàåò ïîäòâåðæäåíèå ïåðåä íà÷àëîì êîïèðîâàíèÿ.\n\ -[/T] Ñîçäàåò ñòðóêòóðó ïàïîê, íî íå êîïèðóåò ôàéëû.\n\ -[/Y] Ïîäàâëÿåò çàïðîñ íà ïîäòâåðæäåíèå ïåðåçàïèñè ôàéëîâ.\n\ -[/-Y] Çàïðàøèâàåò ïîäòâåðæäåíèå íà ïåðåçàïèñü ôàéëîâ.\n\ -[/P] Çàïðàøèâàåò ïîäòâåðæäåíèå äëÿ êàæäîãî êîïèðóåìîãî ôàéëà.\n\ -[/N] Èñïîëüçóåò êîðîòêèå èìåíà ôàéëîâ ïðè êîïèðîâàíèè.\n\ -[/U] Êîïèðóåò òîëüêî òå ôàéëû, êîòîðûå óæå ñóùåñòâóþò â êîíå÷íîé ïàïêå.\n\ -[/R] Ïåðåçàïèñûâàåò ôàéëû, äîñòóïíûå òîëüêî äëÿ ÷òåíèÿ.\n\ -[/H] Êîïèðóåò ñêðûòûå è ñèñòåìíûå ôàéëû.\n\ -[/C] Ïðîäîëæàåò ðàáîòó, äàæå åñëè ïðîèçîøëà îøèáêà.\n\ -[/A] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò \"àðõèâíûé\".\n\ -[/M] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò \"àðõèâíûé\",\n\ - ïðè ýòîì àòðèáóò óäàëÿåòñÿ.\n\ -[/D | /D:m-d-y] Êîïèðóåò òîëüêî íîâûå ôàéëû èëè òå, êîòîðûå áûëè èçìåíåíû\n\ - ïîñëå óêàçàííîé äàòû. Åñëè äàòà íå óêàçàíà, êîïèðóåò òîëüêî\n\ - òå ôàéëû, êîòîðûå íîâåå â èñõîäíîé ïàïêå.\n" +[/I] ÐÑÐ»Ð¸ ÐºÐ¾Ð½ÐµÑÐ½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ Ð¸ ÐºÐ¾Ð¿Ð¸ÑÑÐµÑÑÑ Ð±Ð¾Ð»ÐµÐµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°,\n\ + ÑÐ¾ Ð¿ÑÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑÑÑ Ð¿Ð°Ð¿ÐºÐ° Ð² ÐºÐ°ÑÐµÑÑÐ²Ðµ Ð¼ÐµÑÑÐ° Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ.\n\ +[/S] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ Ð¿Ð°Ð¿ÐºÐ¸ Ð¸ Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ¸.\n\ +[/E] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ Ð¿Ð°Ð¿ÐºÐ¸ Ð¸ Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ¸, Ð²ÐºÐ»ÑÑÐ°Ñ Ð¿ÑÑÑÑÐµ.\n\ +[/Q] ÐÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð¼ÐµÐ½Ð° ÐºÐ¾Ð¿Ð¸ÑÑÐµÐ¼ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð².\n\ +[/F] ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¿Ð¾Ð»Ð½ÑÐµ Ð¸Ð¼ÐµÐ½Ð° Ð¸ÑÑÐ¾Ð´Ð½ÑÑ Ð¸ ÐºÐ¾Ð½ÐµÑÐ½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð².\n\ +[/L] ÐÑÐ²Ð¾Ð´Ð¸Ñ ÑÐ¿Ð¸ÑÐ¾Ðº ÑÐ°Ð¹Ð»Ð¾Ð², ÐºÐ¾ÑÐ¾ÑÑÐµ Ð±ÑÐ´ÑÑ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ñ.\n\ +[/W] ÐÐ°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿ÐµÑÐµÐ´ Ð½Ð°ÑÐ°Ð»Ð¾Ð¼ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ.\n\ +[/T] Ð¡Ð¾Ð·Ð´Ð°ÐµÑ ÑÑÑÑÐºÑÑÑÑ Ð¿Ð°Ð¿Ð¾Ðº, Ð½Ð¾ Ð½Ðµ ÐºÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ°Ð¹Ð»Ñ.\n\ +[/Y] ÐÐ¾Ð´Ð°Ð²Ð»ÑÐµÑ Ð·Ð°Ð¿ÑÐ¾Ñ Ð½Ð° Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿ÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð².\n\ +[/-Y] ÐÐ°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¿ÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð².\n\ +[/P] ÐÐ°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ ÐºÐ¾Ð¿Ð¸ÑÑÐµÐ¼Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°.\n\ +[/N] ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ ÐºÐ¾ÑÐ¾ÑÐºÐ¸Ðµ Ð¸Ð¼ÐµÐ½Ð° ÑÐ°Ð¹Ð»Ð¾Ð² Ð¿ÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸.\n\ +[/U] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÑÑ Ð² ÐºÐ¾Ð½ÐµÑÐ½Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ.\n\ +[/R] ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑÐ²Ð°ÐµÑ ÑÐ°Ð¹Ð»Ñ, Ð´Ð¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ.\n\ +[/H] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐºÑÑÑÑÐµ Ð¸ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ.\n\ +[/C] ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑ ÑÐ°Ð±Ð¾ÑÑ, Ð´Ð°Ð¶Ðµ ÐµÑÐ»Ð¸ Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°.\n\ +[/A] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ \"Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹\".\n\ +[/M] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°ÑÑÐ¸Ð±ÑÑ \"Ð°ÑÑÐ¸Ð²Ð½ÑÐ¹\",\n\ + Ð¿ÑÐ¸ ÑÑÐ¾Ð¼ Ð°ÑÑÐ¸Ð±ÑÑ ÑÐ´Ð°Ð»ÑÐµÑÑÑ.\n\ +[/D | /D:m-d-y] ÐÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð½Ð¾Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ ÑÐµ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð±ÑÐ»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ñ\n\ + Ð¿Ð¾ÑÐ»Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð´Ð°ÑÑ. ÐÑÐ»Ð¸ Ð´Ð°ÑÐ° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°, ÐºÐ¾Ð¿Ð¸ÑÑÐµÑ ÑÐ¾Ð»ÑÐºÐ¾\n\ + ÑÐµ ÑÐ°Ð¹Ð»Ñ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð½Ð¾Ð²ÐµÐµ Ð² Ð¸ÑÑÐ¾Ð´Ð½Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ.\n" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -80,3 +80,4 @@ \t\tod izvora\n\n" } +#pragma code_page(default) Copied: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc (from r42072, trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -16,19 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> - #include "xcopy.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#include "Bg.rc" +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "xcopy command\0" +#define REACTOS_STR_INTERNAL_NAME "xcopy\0" +#define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe\0" +#include <reactos/version.rc> + #include "Da.rc" #include "De.rc" -#include "El.rc" #include "En.rc" #include "Fr.rc" -#include "It.rc" #include "Ko.rc" #include "Lt.rc" #include "Nl.rc" Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -7,17 +7,6 @@ <library>user32</library> <library>kernel32</library> <file>xcopy.c</file> - <file>Da.rc</file> - <file>De.rc</file> - <file>En.rc</file> - <file>Fr.rc</file> - <file>Ko.rc</file> - <file>Lt.rc</file> - <file>Nl.rc</file> - <file>No.rc</file> - <file>Pl.rc</file> - <file>Pt.rc</file> - <file>Ru.rc</file> - <file>Si.rc</file> + <file>rsrc.rc</file> <metadata description="xcopy command-line tool" /> </module> Modified: trunk/reactos/base/applications/winhlp32/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/De.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -97,13 +97,13 @@ STID_NOT_IMPLEMENTED, "Nicht implementiert" STID_HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'" STID_INDEX, "&Inhalt" -STID_CONTENTS, "Summary" +STID_CONTENTS, "Zusammenfassung" STID_BACK, "&ZurÃ¼ck" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" STID_NO_RICHEDIT "Die Richedit Implementation konnte nicht gefunden werden... Breche ab." -STID_PSH_INDEX, "Help topics: " +STID_PSH_INDEX, "Hilfethemen: " } CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -128,3 +128,4 @@ MENUITEM "Systemfarben verwenden", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Fr.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -131,3 +131,4 @@ MENUITEM "Utiliser les couleurs systÃ¨me", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/It.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -20,6 +20,8 @@ */ #include "winhelp_res.h" + +#pragma code_page(65001) /* Menu */ @@ -87,3 +89,4 @@ STID_NO_RICHEDIT "Non Ã¨ stato possibile trovare un'implementazione richedit... Annullando" STID_PSH_INDEX, "Argomenti di aiuto: " } +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ja.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -128,3 +128,4 @@ MENUITEM "ã·ã¹ãã ã«ã©ã¼ãä½¿ã", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Lt.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -129,3 +129,4 @@ MENUITEM "Naudoti sistemos spalvas", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -127,3 +127,4 @@ MENUITEM "Gebruik systeem kleuren", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Pt.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -6,7 +6,8 @@ * Portuguese translation by Gustavo Junior Alves <alves(a)correionet.com.br> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003 Marcelo Duarte - * Copyright 2004,2007 Américo José Melo + * Copyright 2004,2007 AmÃ©rico JosÃ© Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,8 @@ */ #include "winhelp_res.h" + +#pragma code_page(65001) /* Menu */ @@ -65,9 +68,9 @@ } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &visível", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Informações...", MNID_HELP_ABOUT + MENUITEM "Sempre &visÃvel", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&InformaÃ§Ãµes...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Sobre WINE", MNID_HELP_WINE #endif @@ -94,33 +97,49 @@ POPUP "In&dicador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&OpÃ§Ãµes" { + POPUP "Ajuda sempre visÃvel" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE - END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "OmissÃ£o", MNID_OPTS_HELP_DEFAULT + MENUITEM "VisÃvel", MNID_OPTS_HELP_VISIBLE + MENUITEM "InvisÃvel", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "HistÃ³rico", MNID_OPTS_HISTORY + POPUP "Tipos de Letra" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Pequeno", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE - END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Usar cores do sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &visível", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Informações...", MNID_HELP_ABOUT + MENUITEM "Sempre &visÃvel", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&InformaÃ§Ãµes...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Acerca do WINE", MNID_HELP_WINE #endif } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Ãndice" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Procura" +{ + LTEXT "Ainda nÃ£o implementado", -1, 10, 10, 180, 150 +} + /* Strings */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -130,10 +149,10 @@ STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" -STID_INFO, "Informação" -STID_NOT_IMPLEMENTED, "Não implementado" +STID_INFO, "InformaÃ§Ã£o" +STID_NOT_IMPLEMENTED, "NÃ£o implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" -STID_INDEX, "&Conteúdo" +STID_INDEX, "&ConteÃºdo" STID_CONTENTS, "Summary" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os arquivos (*.*)" @@ -150,15 +169,39 @@ STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" -STID_INFO, "Informação" -STID_NOT_IMPLEMENTED, "Não implementado" +STID_INFO, "InformaÃ§Ã£o" +STID_NOT_IMPLEMENTED, "NÃ£o implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do ficheiro de ajuda '%s'" -STID_INDEX, "&Conteúdo" -STID_CONTENTS, "Summary" +STID_INDEX, "&ConteÃºdo" +STID_CONTENTS, "SumÃ¡rio" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os ficheiros (*.*)" STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s "Não é possível encontrar '%s'. Deseja procurar este ficheiro você mesmo?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " -} +STID_FILE_NOT_FOUND_s "NÃ£o Ã© possÃvel encontrar '%s'. Deseja procurar este ficheiro vocÃª mesmo?" +STID_NO_RICHEDIT "NÃ£o foi possÃvel encontrar uma implementaÃ§Ã£o do richedit... A abortar" +STID_PSH_INDEX, "TÃ³picos de ajuda: " +} + +CONTEXT_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +BEGIN + POPUP "" + BEGIN + MENUITEM "AnotaÃ§Ã£o...", MNID_CTXT_ANNOTATE + MENUITEM "Copiar", MNID_CTXT_COPY + MENUITEM "Imprimir...", MNID_CTXT_PRINT + POPUP "Tipos de letra" + BEGIN + MENUITEM "Pequeno", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Grande", MNID_CTXT_FONTS_LARGE + END + POPUP "Ajuda sempre visÃvel" + BEGIN + MENUITEM "OmissÃ£o", MNID_CTXT_HELP_DEFAULT + MENUITEM "VisÃvel", MNID_CTXT_HELP_VISIBLE + MENUITEM "InvisÃvel", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Usar cores do sistema", MNID_CTXT_SYSTEM_COLORS + END +END +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Rm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Rm.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Rm.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -21,6 +21,8 @@ */ #include "winhelp_res.h" + +#pragma code_page(65001) /* FIXME: This file is in the Vallader Romansh dialect and not in the official Rumantsch Grischun. */ @@ -90,3 +92,4 @@ STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" STID_PSH_INDEX, "Help topics: " } +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -20,99 +20,105 @@ #include "winhelp_res.h" +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { - POPUP "&Ôàéë" { - MENUITEM "&Îòêðûòü", MNID_FILE_OPEN + POPUP "&Ð¤Ð°Ð¹Ð»" { + MENUITEM "&ÐÑÐºÑÑÑÑ", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "&Ïå÷àòàòü", MNID_FILE_PRINT - MENUITEM "Íàñòðîéêà &ïðèíòåðà...", MNID_FILE_SETUP + MENUITEM "&ÐÐµÑÐ°ÑÐ°ÑÑ", MNID_FILE_PRINT + MENUITEM "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° &Ð¿ÑÐ¸Ð½ÑÐµÑÐ°...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "&Âûõîä", MNID_FILE_EXIT + MENUITEM "&ÐÑÑÐ¾Ð´", MNID_FILE_EXIT } - POPUP "&Ïðàâêà" { - MENUITEM "&Êîïèðîâàòü...", MNID_EDIT_COPYDLG + POPUP "&ÐÑÐ°Ð²ÐºÐ°" { + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Çàìåòêè...", MNID_EDIT_ANNOTATE + MENUITEM "&ÐÐ°Ð¼ÐµÑÐºÐ¸...", MNID_EDIT_ANNOTATE } - POPUP "&Çàêëàäêà" { - MENUITEM "&Îïðåäåëèòü...", MNID_BKMK_DEFINE + POPUP "&ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ°" { + MENUITEM "&ÐÐ¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ...", MNID_BKMK_DEFINE } - POPUP "&Íàñòðîéêè" { - POPUP "Âèäèìîñòü îêíà ñïðàâêè" + POPUP "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" { + POPUP "ÐÐ¸Ð´Ð¸Ð¼Ð¾ÑÑÑ Ð¾ÐºÐ½Ð° ÑÐ¿ÑÐ°Ð²ÐºÐ¸" BEGIN - MENUITEM "Ïî óìîë÷àíèþ", MNID_OPTS_HELP_DEFAULT - MENUITEM "Íàâåðõó", MNID_OPTS_HELP_VISIBLE - MENUITEM "Íå íàâåðõó", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", MNID_OPTS_HELP_DEFAULT + MENUITEM "ÐÐ°Ð²ÐµÑÑÑ", MNID_OPTS_HELP_VISIBLE + MENUITEM "ÐÐµ Ð½Ð°Ð²ÐµÑÑÑ", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "Èñòîðèÿ", MNID_OPTS_HISTORY - POPUP "Øðèôò" + MENUITEM "ÐÑÑÐ¾ÑÐ¸Ñ", MNID_OPTS_HISTORY + POPUP "Ð¨ÑÐ¸ÑÑ" BEGIN - MENUITEM "Ìåëêèé", MNID_OPTS_FONTS_SMALL - MENUITEM "Îáû÷íûé", MNID_OPTS_FONTS_NORMAL - MENUITEM "Êðóïíûé", MNID_OPTS_FONTS_LARGE + MENUITEM "ÐÐµÐ»ÐºÐ¸Ð¹", MNID_OPTS_FONTS_SMALL + MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", MNID_OPTS_FONTS_NORMAL + MENUITEM "ÐÑÑÐ¿Ð½ÑÐ¹", MNID_OPTS_FONTS_LARGE END - MENUITEM "Èñïîëüçîâàòü ñèñòåìíûå öâåòà", MNID_OPTS_SYSTEM_COLORS + MENUITEM "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÐ²ÐµÑÐ°", MNID_OPTS_SYSTEM_COLORS } - POPUP "&Ñïðàâêà" { - MENUITEM "Ïîìîùü &ïî ïîìîùè", MNID_HELP_HELPON - MENUITEM "Âñåãäà &ñâåðõó", MNID_HELP_HELPTOP + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" { + MENUITEM "ÐÐ¾Ð¼Ð¾ÑÑ &Ð¿Ð¾ Ð¿Ð¾Ð¼Ð¾ÑÐ¸", MNID_HELP_HELPON + MENUITEM "ÐÑÐµÐ³Ð´Ð° &ÑÐ²ÐµÑÑÑ", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Èíôîðìàöèÿ...", MNID_HELP_ABOUT + MENUITEM "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Î Wine", MNID_HELP_WINE + MENUITEM "&Ð Wine", MNID_HELP_WINE #endif } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Óêàçàòåëü" +CAPTION "Ð£ÐºÐ°Ð·Ð°ÑÐµÐ»Ñ" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "Ñïðàâêà WINE" -STID_WHERROR, "ÎØÈÁÊÀ" -STID_WARNING, "ÂÍÈÌÀÍÈÅ" -STID_INFO, "Èíôîðìàöèÿ" -STID_NOT_IMPLEMENTED, "Íå ðåàëèçîâàííî" -STID_HLPFILE_ERROR_s, "Îøèáêà ïðè ÷òåíèè ôàéëà ïîìîùè `%s'" -STID_INDEX, "&Ñîäåðæàíèå" -STID_CONTENTS, "Íà÷àëî" -STID_BACK, "&Íàçàä" -STID_ALL_FILES, "Âñå ôàéëû (*.*)" -STID_HELP_FILES_HLP, "Ôàéëû ñïðàâêè (*.hlp)" -STID_FILE_NOT_FOUND_s "Íå ìîãó íàéòè '%s'. Âû õîòèòå íàéòè ýòîò ôàéë ñàìîñòîÿòåëüíî?" -STID_NO_RICHEDIT "Íå ìîãó íàéòè richedit" -STID_PSH_INDEX, "Ñîäåðæàíèå: " +STID_WINE_HELP, "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° WINE" +STID_WHERROR, "ÐÐ¨ÐÐÐÐ" +STID_WARNING, "ÐÐÐÐÐÐÐÐ" +STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" +STID_NOT_IMPLEMENTED, "ÐÐµ ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð½Ð¾" +STID_HLPFILE_ERROR_s, "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ ÑÑÐµÐ½Ð¸Ð¸ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð¼Ð¾ÑÐ¸ `%s'" +STID_INDEX, "&Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ" +STID_CONTENTS, "ÐÐ°ÑÐ°Ð»Ð¾" +STID_BACK, "&ÐÐ°Ð·Ð°Ð´" +STID_ALL_FILES, "ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)" +STID_HELP_FILES_HLP, "Ð¤Ð°Ð¹Ð»Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ (*.hlp)" +STID_FILE_NOT_FOUND_s "ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ '%s'. ÐÑ ÑÐ¾ÑÐ¸ÑÐµ Ð½Ð°Ð¹ÑÐ¸ ÑÑÐ¾Ñ ÑÐ°Ð¹Ð» ÑÐ°Ð¼Ð¾ÑÑÐ¾ÑÑÐµÐ»ÑÐ½Ð¾?" +STID_NO_RICHEDIT "ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ richedit" +STID_PSH_INDEX, "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ: " } -CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "Çàìåòêè...", MNID_CTXT_ANNOTATE - MENUITEM "Êîïèðîâàòü", MNID_CTXT_COPY - MENUITEM "Ïå÷àòü...", MNID_CTXT_PRINT - POPUP "Øðèôò" + MENUITEM "ÐÐ°Ð¼ÐµÑÐºÐ¸...", MNID_CTXT_ANNOTATE + MENUITEM "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ", MNID_CTXT_COPY + MENUITEM "ÐÐµÑÐ°ÑÑ...", MNID_CTXT_PRINT + POPUP "Ð¨ÑÐ¸ÑÑ" BEGIN - MENUITEM "Ìåëêèé", MNID_CTXT_FONTS_SMALL - MENUITEM "Îáû÷íûé", MNID_CTXT_FONTS_NORMAL - MENUITEM "Êðóïíûé", MNID_CTXT_FONTS_LARGE + MENUITEM "ÐÐµÐ»ÐºÐ¸Ð¹", MNID_CTXT_FONTS_SMALL + MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", MNID_CTXT_FONTS_NORMAL + MENUITEM "ÐÑÑÐ¿Ð½ÑÐ¹", MNID_CTXT_FONTS_LARGE END - POPUP "Âèäèìîñòü îêíà ñïðàâêè" + POPUP "ÐÐ¸Ð´Ð¸Ð¼Ð¾ÑÑÑ Ð¾ÐºÐ½Ð° ÑÐ¿ÑÐ°Ð²ÐºÐ¸" BEGIN - MENUITEM "Ïî óìîë÷àíèþ", MNID_CTXT_HELP_DEFAULT - MENUITEM "Íàâåðõó", MNID_CTXT_HELP_VISIBLE - MENUITEM "Íå íàâåðõó", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", MNID_CTXT_HELP_DEFAULT + MENUITEM "ÐÐ°Ð²ÐµÑÑÑ", MNID_CTXT_HELP_VISIBLE + MENUITEM "ÐÐµ Ð½Ð°Ð²ÐµÑÑÑ", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "Èñïîëüçîâàòü ñèñòåìíûå öâåòà", MNID_CTXT_SYSTEM_COLORS + MENUITEM "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÐ²ÐµÑÐ°", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Si.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -126,3 +126,4 @@ MENUITEM "Uporabi sistemske barve", MNID_CTXT_SYSTEM_COLORS END END +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Zh.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -160,3 +160,4 @@ STID_NO_RICHEDIT "æ¾ä¸å° richedit... çµæ¢" STID_PSH_INDEX, "å¹«å©å§å®¹: " } +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -446,10 +446,13 @@ void CALLBACK MACRO_HelpOn(void) { - LPCSTR file; - - WINE_TRACE("()\n"); - file = MACRO_CurrentWindow()->page->file->help_on_file; + WINHELP_WINDOW *win = MACRO_CurrentWindow(); + LPCSTR file = NULL; + + WINE_TRACE("()\n"); + if (win && win->page && win->page->file) + file = win->page->file->help_on_file; + if (!file) file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp"; Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -23,3 +23,28 @@ /* @makedep: winhelp.ico */ IDI_WINHELP ICON DISCARDABLE winhelp.ico + +#include "Bg.rc" +#include "Cs.rc" +#include "Da.rc" +#include "De.rc" +#include "En.rc" +#include "Es.rc" +#include "Fi.rc" +#include "Fr.rc" +#include "Hu.rc" +#include "It.rc" +#include "Ja.rc" +#include "Ko.rc" +#include "Lt.rc" +#include "Nl.rc" +#include "No.rc" +#include "Pl.rc" +#include "Pt.rc" +#include "Rm.rc" +#include "Ru.rc" +#include "Si.rc" +#include "Sk.rc" +#include "Sv.rc" +#include "Tr.rc" +#include "Zh.rc" Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -167,7 +167,7 @@ lpszFile[0]='\0'; openfilename.lStructSize = sizeof(OPENFILENAME); - openfilename.hwndOwner = NULL; + openfilename.hwndOwner = (Globals.active_win ? Globals.active_win->hMainWnd : 0); openfilename.hInstance = Globals.hInstance; openfilename.lpstrFilter = szzFilter; openfilename.lpstrCustomFilter = 0; Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -18,28 +18,5 @@ <file>string.c</file> <file>winhelp.c</file> <file>lex.yy.c</file> - <file>Bg.rc</file> - <file>Cs.rc</file> - <file>Da.rc</file> - <file>De.rc</file> - <file>En.rc</file> - <file>Es.rc</file> - <file>Fi.rc</file> - <file>Fr.rc</file> - <file>Hu.rc</file> - <file>It.rc</file> - <file>Ja.rc</file> - <file>Ko.rc</file> - <file>Lt.rc</file> - <file>Nl.rc</file> - <file>No.rc</file> - <file>Pl.rc</file> - <file>Pt.rc</file> - <file>Rm.rc</file> - <file>Ru.rc</file> - <file>Si.rc</file> - <file>Sk.rc</file> - <file>Sv.rc</file> - <file>Tr.rc</file> <file>rsrc.rc</file> </module> Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -246,3 +246,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert" STRING_MAX_TAB_STOPS, "Es kÃ¶nnen nur maximal 32 Tabstopps definiert werden." END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -180,29 +180,22 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "¸®Ä¡ ÅØ½ºÆ® ÆÄÀÏÇü½Ä (*.rtf)" - STRING_TEXT_FILES_TXT, "ÅØ½ºÆ® ÆÄÀÏ (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "À¯´ÏÄÚµå ÅØ½ºÆ® ¹®¼(*.txt)" - STRING_ALL_FILES, "¸ðµç ¹®¼ (*.*)" -END + STRING_ALL_FILES, "¸ðµç ¹®¼ (*.*)" + STRING_TEXT_FILES_TXT, "ÅØ½ºÆ® ÆÄÀÏ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "À¯´ÏÄÚµå ÅØ½ºÆ® ¹®¼ (*.txt)" + STRING_RICHTEXT_FILES_RTF, "¸®Ä¡ ÅØ½ºÆ® ÆÄÀÏÇü½Ä (*.rtf)" + STRING_NEWFILE_RICHTEXT, "¸®Ä¡ ÅØ½ºÆ® ¹®¼" + STRING_NEWFILE_TXT, "ÅØ½ºÆ® ¹®¼" + STRING_NEWFILE_TXT_UNICODE, "À¯´ÏÄÚµå ÅØ½ºÆ® ¹®¼" + STRING_PRINTER_FILES_PRN, "ÇÁ¸°ÅÍ ÆÄÀÏ (*.PRN)" +END + STRINGTABLE DISCARDABLE BEGIN STRING_ALIGN_LEFT, "¿ÞÂÊ" STRING_ALIGN_RIGHT, "¿À¸¥ÂÊ" STRING_ALIGN_CENTER, "°¡¿îµ¥" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "¸®Ä¡ ÅØ½ºÆ® ¹®¼" - STRING_NEWFILE_TXT, "ÅØ½ºÆ® ¹®¼" - STRING_NEWFILE_TXT_UNICODE, "À¯´ÏÄÚµå ÅØ½ºÆ® ¹®¼" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "ÇÁ¸°ÅÍ ÆÄÀÏ (*.PRN)" END STRINGTABLE DISCARDABLE @@ -220,10 +213,6 @@ STRING_PREVIEW_TWOPAGES, "µÎ ÆäÀÌÁö" STRING_PREVIEW_ONEPAGE, "ÇÑ ÆäÀÌÁö" STRING_PREVIEW_CLOSE, "´Ý±â" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_UNITS_CM, "cm" END Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -180,10 +180,14 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text formaat (*.rtf)" + STRING_ALL_FILES, "Alle documenten (*.*)" STRING_TEXT_FILES_TXT, "Tekst documenten (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekst document (*.txt)" - STRING_ALL_FILES, "Alle documenten (*.*)" + STRING_RICHTEXT_FILES_RTF, "Rich text formaat (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Rich tekst document" + STRING_NEWFILE_TXT, "Tekst document" + STRING_NEWFILE_TXT_UNICODE, "Unicode tekst document" + STRING_PRINTER_FILES_PRN, "Printer bestanden (*.PRN)" END STRINGTABLE DISCARDABLE @@ -191,18 +195,6 @@ STRING_ALIGN_LEFT, "Links" STRING_ALIGN_RIGHT, "Rechts" STRING_ALIGN_CENTER, "Gecentreerd" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich tekst document" - STRING_NEWFILE_TXT, "Tekst document" - STRING_NEWFILE_TXT_UNICODE, "Unicode tekst document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer bestanden (*.PRN)" END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -18,78 +18,81 @@ #include "wordpad.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE BEGIN - POPUP "&Ôàéë" - BEGIN - MENUITEM "Ñîçä&àòü...\tCtrl+N",ID_FILE_NEW - MENUITEM "&Îòêðûòü...\tCtrl+O",ID_FILE_OPEN - MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE - MENUITEM "Ñîõðàíèòü &êàê...", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Ïå÷àòü...\tCtrl+P", ID_PRINT - MENUITEM "Ïðåä&âàðèòåëüíûé ïðîñìîòð...", ID_PREVIEW - MENUITEM "&Ìàêåò ñòðàíèöû...", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "Â&ûõîä", ID_FILE_EXIT - END - POPUP "&Ïðàâêà" - BEGIN - MENUITEM "&Îòìåíèòü\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Ïîâòîðèòü\tCtrl+Y", ID_EDIT_REDO - MENUITEM SEPARATOR - MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE - MENUITEM "&Óäàëèòü\tDEL", ID_EDIT_CLEAR - MENUITEM "Âûäåëèòü â&ñå\tCtrl+A", ID_EDIT_SELECTALL - MENUITEM SEPARATOR - MENUITEM "&Íàéòè...\tCrtl+F", ID_FIND - MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT - MENUITEM "&Çàìåíèòü...\tCtrl+H", ID_REPLACE - MENUITEM SEPARATOR - MENUITEM "&Òîëüêî äëÿ ÷òåíèÿ", ID_EDIT_READONLY - MENUITEM "&Èçìåíåí", ID_EDIT_MODIFIED - MENUITEM SEPARATOR - POPUP "&Äîïîëíèòåëüíî" + POPUP "&Ð¤Ð°Ð¹Ð»" + BEGIN + MENUITEM "Ð¡Ð¾Ð·Ð´&Ð°ÑÑ...\tCtrl+N",ID_FILE_NEW + MENUITEM "&ÐÑÐºÑÑÑÑ...\tCtrl+O",ID_FILE_OPEN + MENUITEM "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ\tCtrl+S", ID_FILE_SAVE + MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ &ÐºÐ°Ðº...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&ÐÐµÑÐ°ÑÑ...\tCtrl+P", ID_PRINT + MENUITEM "ÐÑÐµÐ´&Ð²Ð°ÑÐ¸ÑÐµÐ»ÑÐ½ÑÐ¹ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ...", ID_PREVIEW + MENUITEM "&ÐÐ°ÐºÐµÑ ÑÑÑÐ°Ð½Ð¸ÑÑ...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "Ð&ÑÑÐ¾Ð´", ID_FILE_EXIT + END + POPUP "&ÐÑÐ°Ð²ÐºÐ°" + BEGIN + MENUITEM "&ÐÑÐ¼ÐµÐ½Ð¸ÑÑ\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÑ\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&ÐÑÑÐµÐ·Ð°ÑÑ\tCtrl+X", ID_EDIT_CUT + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tCtrl+C", ID_EDIT_COPY + MENUITEM "&ÐÑÑÐ°Ð²Ð¸ÑÑ\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Ð£Ð´Ð°Ð»Ð¸ÑÑ\tDEL", ID_EDIT_CLEAR + MENUITEM "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²&ÑÐµ\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°Ð¹ÑÐ¸...\tCrtl+F", ID_FIND + MENUITEM "ÐÐ°&Ð¹ÑÐ¸ Ð´Ð°Ð»ÐµÐµ\tF3", ID_FIND_NEXT + MENUITEM "&ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "&Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ", ID_EDIT_READONLY + MENUITEM "&ÐÐ·Ð¼ÐµÐ½ÐµÐ½", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾" BEGIN - MENUITEM "&Èíôîðìàöèÿ î âûäåëåíèè", ID_EDIT_SELECTIONINFO - MENUITEM "&Ôîðìàò ñèìâîëîâ", ID_EDIT_CHARFORMAT - MENUITEM "Ôîðìàò ñèìâîëîâ &ïî óìîë÷àíèþ", ID_EDIT_DEFCHARFORMAT - MENUITEM "Ôîðìàò &àáçàöà", ID_EDIT_PARAFORMAT - MENUITEM "Ï&îëó÷èòü òåêñò", ID_EDIT_GETTEXT + MENUITEM "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ð¸", ID_EDIT_SELECTIONINFO + MENUITEM "&Ð¤Ð¾ÑÐ¼Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²", ID_EDIT_CHARFORMAT + MENUITEM "Ð¤Ð¾ÑÐ¼Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² &Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", ID_EDIT_DEFCHARFORMAT + MENUITEM "Ð¤Ð¾ÑÐ¼Ð°Ñ &Ð°Ð±Ð·Ð°ÑÐ°", ID_EDIT_PARAFORMAT + MENUITEM "Ð&Ð¾Ð»ÑÑÐ¸ÑÑ ÑÐµÐºÑÑ", ID_EDIT_GETTEXT END END - POPUP "&Âèä" - BEGIN - MENUITEM "Ïàíåëü &èíñòðóìåíòîâ", ID_TOGGLE_TOOLBAR - MENUITEM "Ï&àíåëü ôîðìàòèðîâàíèÿ", ID_TOGGLE_FORMATBAR - MENUITEM "&Ëèíåéêà", ID_TOGGLE_RULER - MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Ïàðàìåòðû...", ID_VIEWPROPERTIES - END - POPUP "Âñò&àâêà" - BEGIN - MENUITEM "&Äàòà è âðåìÿ...", ID_DATETIME - END - POPUP "Ôîð&ìàò" - BEGIN - MENUITEM "&Øðèôò...", ID_FONTSETTINGS - MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö..." ID_PARAFORMAT - MENUITEM "&Òàáóëÿöèÿ..." ID_TABSTOPS - POPUP "&Ôîí" + POPUP "&ÐÐ¸Ð´" + BEGIN + MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", ID_TOGGLE_TOOLBAR + MENUITEM "Ð&Ð°Ð½ÐµÐ»Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ", ID_TOGGLE_FORMATBAR + MENUITEM "&ÐÐ¸Ð½ÐµÐ¹ÐºÐ°", ID_TOGGLE_RULER + MENUITEM "&Ð¡ÑÑÐ¾ÐºÐ° ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ...", ID_VIEWPROPERTIES + END + POPUP "ÐÑÑ&Ð°Ð²ÐºÐ°" + BEGIN + MENUITEM "&ÐÐ°ÑÐ° Ð¸ Ð²ÑÐµÐ¼Ñ...", ID_DATETIME + END + POPUP "Ð¤Ð¾Ñ&Ð¼Ð°Ñ" + BEGIN + MENUITEM "&Ð¨ÑÐ¸ÑÑ...", ID_FONTSETTINGS + MENUITEM "&ÐÐ°ÑÐºÐµÑ" ID_BULLET + MENUITEM "&ÐÐ±Ð·Ð°Ñ..." ID_PARAFORMAT + MENUITEM "&Ð¢Ð°Ð±ÑÐ»ÑÑÐ¸Ñ..." ID_TABSTOPS + POPUP "&Ð¤Ð¾Ð½" BEGIN - MENUITEM "&Ñèñòåìíûé\tCtrl+1", ID_BACK_1 - MENUITEM "&Æåëòîâàòûé PostThat\tCtrl+2", ID_BACK_2 + MENUITEM "&Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐ¹\tCtrl+1", ID_BACK_1 + MENUITEM "&ÐÐµÐ»ÑÐ¾Ð²Ð°ÑÑÐ¹ PostThat\tCtrl+2", ID_BACK_2 END END - POPUP "&Ñïðàâêà" - BEGIN - MENUITEM "&Î Wine Wordpad" ID_ABOUT + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" + BEGIN + MENUITEM "&Ð Wine Wordpad" ID_ABOUT END END @@ -97,67 +100,67 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö..." ID_PARAFORMAT + MENUITEM "&ÐÑÑÐµÐ·Ð°ÑÑ\tCtrl+X", ID_EDIT_CUT + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tCtrl+C", ID_EDIT_COPY + MENUITEM "ÐÑÑ&Ð°Ð²Ð¸ÑÑ", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°ÑÐºÐµÑ" ID_BULLET + MENUITEM "&ÐÐ±Ð·Ð°Ñ..." ID_PARAFORMAT END END IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Äàòà è âðåìÿ" +CAPTION "ÐÐ°ÑÐ° Ð¸ Ð²ÑÐµÐ¼Ñ" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Äîñòóïíûå ôîðìàòû",-1,3,2,100,15 + LTEXT "ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY - PUSHBUTTON "&ÎÊ",IDOK,87,12,40,12 - PUSHBUTTON "Î&òìåíà",IDCANCEL,87,26,40,12 + PUSHBUTTON "&ÐÐ",IDOK,87,12,40,12 + PUSHBUTTON "Ð&ÑÐ¼ÐµÐ½Ð°",IDCANCEL,87,26,40,12 END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Íîâûé äîêóìåíò" +CAPTION "ÐÐ¾Ð²ÑÐ¹ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Òèï ñîçäàâàåìîãî äîêóìåíòà",-1,3,2,100,15 + LTEXT "Ð¢Ð¸Ð¿ ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&ÎÊ",IDOK,97,12,40,12 - PUSHBUTTON "Î&òìåíà",IDCANCEL,97,26,40,12 + PUSHBUTTON "&ÐÐ",IDOK,97,12,40,12 + PUSHBUTTON "Ð&ÑÐ¼ÐµÐ½Ð°",IDCANCEL,97,26,40,12 END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Àáçàö" +Caption "ÐÐ±Ð·Ð°Ñ" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îòñòóï", -1, 10, 10, 120, 68 - LTEXT "Ñëåâà", -1, 15, 22, 40, 13 + GROUPBOX "ÐÑÑÑÑÐ¿", -1, 10, 10, 120, 68 + LTEXT "Ð¡Ð»ÐµÐ²Ð°", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Ñïðàâà", -1, 15, 40, 40, 13 + LTEXT "Ð¡Ð¿ÑÐ°Ð²Ð°", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Ïåðâàÿ ñòðîêà", -1, 15, 58, 40, 13 + LTEXT "ÐÐµÑÐ²Ð°Ñ ÑÑÑÐ¾ÐºÐ°", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Âûðàâíèâàíèå", -1, 15, 87, 40, 13 + LTEXT "ÐÑÑÐ°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ðµ", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST - PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15 - PUSHBUTTON "Î&òìåíà", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "&ÐÐ", IDOK, 137, 15, 50, 15 + PUSHBUTTON "Ð&ÑÐ¼ÐµÐ½Ð°", IDCANCEL, 137, 33, 50, 15 END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Òàáóëÿöèÿ" +Caption "Ð¢Ð°Ð±ÑÐ»ÑÑÐ¸Ñ" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Ïîçèöèè òàáóëÿöèè", -1, 10, 10, 120, 90 + GROUPBOX "ÐÐ¾Ð·Ð¸ÑÐ¸Ð¸ ÑÐ°Ð±ÑÐ»ÑÑÐ¸Ð¸", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE - DEFPUSHBUTTON "&Óñòàíîâèòü", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "Î&÷èñòèòü", ID_TAB_DEL, 72, 80, 45, 15 - PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15 - PUSHBUTTON "Î&òìåíà", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Î÷èñòèòü &âñå", ID_TAB_EMPTY, 137, 51, 50, 15 + DEFPUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "Ð&ÑÐ¸ÑÑÐ¸ÑÑ", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&ÐÐ", IDOK, 137, 15, 50, 15 + PUSHBUTTON "Ð&ÑÐ¼ÐµÐ½Ð°", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "ÐÑÐ¸ÑÑÐ¸ÑÑ &Ð²ÑÐµ", ID_TAB_EMPTY, 137, 51, 50, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -165,77 +168,78 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ïåðåíîñ ïî ñëîâàì", -1, 10, 10, 130, 85 + GROUPBOX "ÐÐµÑÐµÐ½Ð¾Ñ Ð¿Ð¾ ÑÐ»Ð¾Ð²Ð°Ð¼", -1, 10, 10, 130, 85 RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON "Â ãðàíèöàõ &îêíà", IDC_PAGEFMT_WW, 18, 45, 117, 15 - RADIOBUTTON "Â ãðàíèöàõ &ïîëåé", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Ïàíåëè", -1, 150, 10, 120, 85 - CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ëèíåéêà", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_PAGEFMT_SB, 160, 74, 80, 15 + RADIOBUTTON "Ð Ð³ÑÐ°Ð½Ð¸ÑÐ°Ñ &Ð¾ÐºÐ½Ð°", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Ð Ð³ÑÐ°Ð½Ð¸ÑÐ°Ñ &Ð¿Ð¾Ð»ÐµÐ¹", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "ÐÐ°Ð½ÐµÐ»Ð¸", -1, 150, 10, 120, 85 + CHECKBOX "&ÐÐ½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&ÐÐ¸Ð½ÐµÐ¹ÐºÐ°", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Ð¡ÑÑÐ¾ÐºÐ° ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Ôàéëû RTF (*.rtf)" - STRING_TEXT_FILES_TXT, "Òåêñòîâûå äîêóìåíòû (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Äîêóìåíòû Unicode (*.txt)" - STRING_ALL_FILES, "Âñå äîêóìåíòû (*.*)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_ALIGN_LEFT, "Ïî ëåâîìó êðàþ" - STRING_ALIGN_RIGHT, "Ïî ïðàâîìó êðàþ" - STRING_ALIGN_CENTER, "Ïî öåíòðó" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Ôàéë RTF" - STRING_NEWFILE_TXT, "Òåêñòîâûé äîêóìåíò" - STRING_NEWFILE_TXT_UNICODE, "Äîêóìåíò â ôîðìàòå Unicode" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Ôàéëû ïðèíòåðà (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Íàñòðîéêè" - STRING_VIEWPROPS_TEXT, "Òåêñò" - STRING_VIEWPROPS_RICHTEXT, "Ôàéë RTF" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "Ïå÷àòü" - STRING_PREVIEW_NEXTPAGE, "Ñëåäóþùàÿ ñòðàíèöà" - STRING_PREVIEW_PREVPAGE, "Ïðåäûäóùàÿ ñòðàíèöà" + STRING_RICHTEXT_FILES_RTF, "Ð¤Ð°Ð¹Ð»Ñ RTF (*.rtf)" + STRING_TEXT_FILES_TXT, "Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÑ Unicode (*.txt)" + STRING_ALL_FILES, "ÐÑÐµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "ÐÐ¾ Ð»ÐµÐ²Ð¾Ð¼Ñ ÐºÑÐ°Ñ" + STRING_ALIGN_RIGHT, "ÐÐ¾ Ð¿ÑÐ°Ð²Ð¾Ð¼Ñ ÐºÑÐ°Ñ" + STRING_ALIGN_CENTER, "ÐÐ¾ ÑÐµÐ½ÑÑÑ" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "Ð¤Ð°Ð¹Ð» RTF" + STRING_NEWFILE_TXT, "Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ" + STRING_NEWFILE_TXT_UNICODE, "ÐÐ¾ÐºÑÐ¼ÐµÐ½Ñ Ð² ÑÐ¾ÑÐ¼Ð°ÑÐµ Unicode" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Ð¤Ð°Ð¹Ð»Ñ Ð¿ÑÐ¸Ð½ÑÐµÑÐ° (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" + STRING_VIEWPROPS_TEXT, "Ð¢ÐµÐºÑÑ" + STRING_VIEWPROPS_RICHTEXT, "Ð¤Ð°Ð¹Ð» RTF" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "ÐÐµÑÐ°ÑÑ" + STRING_PREVIEW_NEXTPAGE, "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°" + STRING_PREVIEW_PREVPAGE, "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°" STRING_PREVIEW_TWOPAGES, "Two pages" STRING_PREVIEW_ONEPAGE, "One page" - STRING_PREVIEW_CLOSE, "Çàêðûòü" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "ñì" + STRING_PREVIEW_CLOSE, "ÐÐ°ÐºÑÑÑÑ" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "ÑÐ¼" END STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Ñîõðàíèòü èçìåíåíèÿ â '%s'?" - STRING_SEARCH_FINISHED, "Ïîèñê â äîêóìåíòå çàâåðøåí." - STRING_LOAD_RICHED_FAILED, "Îøèáêà çàãðóçêè áèáëèîòåêè RichEdit." - STRING_SAVE_LOSEFORMATTING, "Ñîõðàíåíèå äîêóìåíòà â âèäå íåôîðìàòèðîâàííîãî òåêñòà, " \ - "ïðèâåäåò ê ïîòåðå ôîðìàòèðîâàíèÿ. Ïîäòâåðæäàåòå âûïîëíåíèå" \ - "ýòîé îïåðàöèè?" - STRING_INVALID_NUMBER, "Íåïðàâèëüíûé ÷èñëîâîé ôîðìàò" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage äîêóìåíòû íå ïîääåðæèâàþòñÿ" - STRING_PRINTING_NOT_IMPLEMENTED, "Ïå÷àòü íå ïîääåðæèâàåòñÿ" -END + STRING_PROMPT_SAVE_CHANGES, "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² '%s'?" + STRING_SEARCH_FINISHED, "ÐÐ¾Ð¸ÑÐº Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ Ð·Ð°Ð²ÐµÑÑÐµÐ½." + STRING_LOAD_RICHED_FAILED, "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ¸ RichEdit." + STRING_SAVE_LOSEFORMATTING, "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð² Ð²Ð¸Ð´Ðµ Ð½ÐµÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐµÐºÑÑÐ°, " \ + "Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿Ð¾ÑÐµÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ. ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ" \ + "ÑÑÐ¾Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸?" + STRING_INVALID_NUMBER, "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑÑÑ" + STRING_PRINTING_NOT_IMPLEMENTED, "ÐÐµÑÐ°ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ" +END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -247,3 +247,4 @@ STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (Å¡e) ni na voljo" STRING_MAX_TAB_STOPS, "Ne morem vstaviti veÄ kot 32 poloÅ¾ajev tabulatorja." END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -471,3 +471,4 @@ STRING_OPEN_FAILED, "ä¸è½éåæªæ¡." STRING_OPEN_ACCESS_DENIED, "ä½ æ²æéåæªæ¡çæ¬å." END +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -68,6 +68,7 @@ #include "Hu.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc" Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -52,7 +52,6 @@ /* use LoadString */ static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; -static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0}; static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0}; static const WCHAR stringFormat[] = {'%','2','d','\0'}; @@ -1867,7 +1866,7 @@ PostQuitMessage(1); } - hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL, + hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, RICHEDIT_CLASS20W, NULL, WS_CHILD|WS_VISIBLE|ES_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL|WS_HSCROLL, 0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL); Modified: trunk/reactos/base/applications/write/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/De… ============================================================================== --- trunk/reactos/base/applications/write/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/De.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -27,3 +27,4 @@ { IDS_FAILED, "Der Start von Wordpad ist fehlgeschlagen" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/write/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Fr… ============================================================================== --- trunk/reactos/base/applications/write/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Fr.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -28,3 +28,4 @@ { IDS_FAILED, "Wordpad n'a pas pu Ãªtre dÃ©marrÃ©" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/write/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ja… ============================================================================== --- trunk/reactos/base/applications/write/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Ja.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -29,3 +29,4 @@ { IDS_FAILED, "Wordpad ã®èµ·åã«å¤±æãã¾ãã" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/write/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Lt… ============================================================================== --- trunk/reactos/base/applications/write/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Lt.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -29,3 +29,4 @@ { IDS_FAILED, "Nepavyko paleisti Wordpad" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/write/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ro… ============================================================================== --- trunk/reactos/base/applications/write/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Ro.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -27,3 +27,4 @@ { IDS_FAILED, "ExecuÈia Wordpad a eÈuat" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/write/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ru… ============================================================================== --- trunk/reactos/base/applications/write/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Ru.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -20,9 +20,13 @@ #include "resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_FAILED, "Íå óäàëîñü çàïóñòèòü Wordpad" + IDS_FAILED, "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Wordpad" } +#pragma code_page(default) Modified: trunk/reactos/base/applications/write/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Si… ============================================================================== --- trunk/reactos/base/applications/write/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/Si.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -28,3 +28,4 @@ { IDS_FAILED, "Zagon programa Wordpad ni uspel" } +#pragma code_page(default) Copied: trunk/reactos/base/applications/write/rsrc.rc (from r42072, trunk/reactos/base/applications/write/rsrc.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… ============================================================================== --- trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -16,27 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/ja-JP.rc" -#include "lang/ko-KR.rc" -#include "lang/nl-NL.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/pt-BR.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/sl-SI.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" +#include "De.rc" +#include "En.rc" +#include "Fr.rc" +#include "Ja.rc" +#include "Ko.rc" +#include "Lt.rc" +#include "Nl.rc" +#include "Pt.rc" +#include "Ro.rc" +#include "Ru.rc" +#include "Si.rc" +#include "Sv.rc" Modified: trunk/reactos/base/applications/write/write.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/wr… ============================================================================== --- trunk/reactos/base/applications/write/write.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/write.rbuild [iso-8859-1] Mon Aug 17 03:42:32 2009 @@ -6,18 +6,5 @@ <library>gdi32</library> <library>kernel32</library> <file>write.c</file> - <file>De.rc</file> - <file>En.rc</file> - <file>Fr.rc</file> - <file>Ja.rc</file> - <file>Ko.rc</file> - <file>Lt.rc</file> - <file>Nl.rc</file> - <file>No.rc</file> - <file>Pl.rc</file> - <file>Pt.rc</file> - <file>Ro.rc</file> - <file>Ru.rc</file> - <file>Si.rc</file> - <file>Sv.rc</file> + <file>rsrc.rc</file> </module>

1 0

[dreimer] 42752: Sync all apps with wine 1.1.27. (rosapps) This is not a 1:1 sync anymore, because Wine adds all single rc files into the makefile now and we dont support this right now. -> Reverted to old behavior and added a pragma revert line to all rc files which change the pragma for UTF8 Support.
by dreimer＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: dreimer Date: Mon Aug 17 03:37:17 2009 New Revision: 42752 URL: http://svn.reactos.org/svn/reactos?rev=42752&view=rev Log: Sync all apps with wine 1.1.27. (rosapps) This is not a 1:1 sync anymore, because Wine adds all single rc files into the makefile now and we dont support this right now. -> Reverted to old behavior and added a pragma revert line to all rc files which change the pragma for UTF8 Support. Modified: trunk/rosapps/applications/winfile/De.rc trunk/rosapps/applications/winfile/Fr.rc trunk/rosapps/applications/winfile/Ja.rc trunk/rosapps/applications/winfile/Lt.rc trunk/rosapps/applications/winfile/Pt.rc trunk/rosapps/applications/winfile/Ru.rc trunk/rosapps/applications/winfile/Si.rc trunk/rosapps/applications/winfile/Zh.rc trunk/rosapps/applications/winfile/rsrc.rc trunk/rosapps/applications/winfile/winfile.rbuild Modified: trunk/rosapps/applications/winfile/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/De.rc… ============================================================================== --- trunk/rosapps/applications/winfile/De.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/De.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -258,3 +258,4 @@ IDS_FREE_SPACE_FMT "%s von %s frei" } +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Fr.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Fr.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Fr.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -265,3 +265,4 @@ IDS_FREE_SPACE_FMT "%s sur %s libre" } +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ja.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ja.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ja.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -263,3 +263,4 @@ IDS_FREE_SPACE_FMT "%s of %s free" } +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Lt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Lt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Lt.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -261,3 +261,4 @@ IDS_FREE_SPACE_FMT "%s iÅ¡ %s laisva" } +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -414,3 +414,4 @@ IDS_FREE_SPACE_FMT "%s de %s livre" } +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ru.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -21,204 +21,207 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* Menu */ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "&Ôàéë" { - MENUITEM "&Îòêðûòü\tEnter", ID_ACTIVATE - MENUITEM "&Ïåðåìåñòèòü...\tF7", ID_FILE_MOVE - MENUITEM "&Êîïèðîâàòü...\tF8", ID_FILE_COPY - MENUITEM "&Â áóôåð îáìåíà...\tF9", 118 - MENUITEM "&Óäàëèòü\tDel", ID_FILE_DELETE - MENUITEM "Ïåðåèìåíîâàòü...", 109 - MENUITEM "Ñâîéñòâà...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "Àðõèâèðîâàòü...", 119 - MENUITEM "Ðàñïàêîâàòü...", 120 - MENUITEM SEPARATOR - MENUITEM "&Çàïóñòèòü...", ID_EXECUTE - MENUITEM "&Ïå÷àòàòü...", 102 - MENUITEM "Àññîöèèðîâàòü...", 103 - MENUITEM SEPARATOR - MENUITEM "Ñîçäàòü äèðåêòîðèþ...", 111 - MENUITEM "Ïîèñê...", 104 - MENUITEM "&Âûäåëèòü ôàéëû...", 116 + POPUP "&Ð¤Ð°Ð¹Ð»" { + MENUITEM "&ÐÑÐºÑÑÑÑ\tEnter", ID_ACTIVATE + MENUITEM "&ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ...\tF7", ID_FILE_MOVE + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ...\tF8", ID_FILE_COPY + MENUITEM "&Ð Ð±ÑÑÐµÑ Ð¾Ð±Ð¼ÐµÐ½Ð°...\tF9", 118 + MENUITEM "&Ð£Ð´Ð°Ð»Ð¸ÑÑ\tDel", ID_FILE_DELETE + MENUITEM "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ...", 109 + MENUITEM "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "ÐÑÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ...", 119 + MENUITEM "Ð Ð°ÑÐ¿Ð°ÐºÐ¾Ð²Ð°ÑÑ...", 120 + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ...", ID_EXECUTE + MENUITEM "&ÐÐµÑÐ°ÑÐ°ÑÑ...", 102 + MENUITEM "ÐÑÑÐ¾ÑÐ¸Ð¸ÑÐ¾Ð²Ð°ÑÑ...", 103 + MENUITEM SEPARATOR + MENUITEM "Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ...", 111 + MENUITEM "ÐÐ¾Ð¸ÑÐº...", 104 + MENUITEM "&ÐÑÐ´ÐµÐ»Ð¸ÑÑ ÑÐ°Ð¹Ð»Ñ...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "Âûõîä\tAlt+X", ID_FILE_EXIT + MENUITEM "ÐÑÑÐ¾Ð´\tAlt+X", ID_FILE_EXIT #else - MENUITEM "Âûõîä", ID_FILE_EXIT -#endif - } - - POPUP "&Äèñê" { - MENUITEM "&Êîïèðîâàòü äèñê...", 201 - MENUITEM "&Ìåòêà òîìà...", 202 - MENUITEM SEPARATOR - MENUITEM "&Ôîðìàòèðîâàòü...", ID_FORMAT_DISK + MENUITEM "ÐÑÑÐ¾Ð´", ID_FILE_EXIT +#endif + } + + POPUP "&ÐÐ¸ÑÐº" { + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð´Ð¸ÑÐº...", 201 + MENUITEM "&ÐÐµÑÐºÐ° ÑÐ¾Ð¼Ð°...", 202 + MENUITEM SEPARATOR + MENUITEM "&Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "&Ñîçäàòü ñèñòåìíûé äèñê...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Ïîäêëþ&÷èòü ñåòåâîé äèñê", ID_CONNECT_NETWORK_DRIVE - MENUITEM "Îòê&ëþ÷èòü ñåòåâîé äèñê", ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "Ñäåëàòü î&áùèì êàê...", 254 - MENUITEM "&Çàêðûòü îáùèé äîñòóï...", 255 - MENUITEM SEPARATOR - MENUITEM "&Âûáðàòü äèñê...", 251 - } - - POPUP "&Ïàïêè" { - MENUITEM "Ñ&ëåäóþùèé óðîâåíü\t+", 301 - MENUITEM "&Ðàçâåðíóòü äåðåâî\t*", 302 - MENUITEM "Ðàçâåðíóòü â&ñå\tStrg+*", 303 - MENUITEM "&Ñâåðíóòü äåðåâî\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Îòìåòèòü âåòâè", 505 - } - - POPUP "&Âèä" { - MENUITEM "Äåðåâî &è ïàïêà", 413 - MENUITEM "Òîëüêî &äåðåâî", 411 - MENUITEM "Òîëüêî &ïàïêà", 412 - MENUITEM SEPARATOR - MENUITEM "Ðàç&áèòü", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "È&ìÿ", ID_VIEW_NAME - MENUITEM "Â&ñå ïîäðîáíîñòè î ôàéëå", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "&Âûáîðî÷íî î ôàéëå...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Ñîðòèðîâàòü ïî èìåíè", ID_VIEW_SORT_NAME - MENUITEM "Ñîðòèðîâàòü ïî &òèïó", ID_VIEW_SORT_TYPE - MENUITEM "Ñîðòèðîâàòü ïî &ðàçìåðó", ID_VIEW_SORT_SIZE - MENUITEM "Ñîðòèðîâàòü ïî ä&àòå", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Ñîðòèðîâàòü ïî &...", ID_VIEW_FILTER - } - - POPUP "&Íàñòðîéêè" { - MENUITEM "Ïîä&òâåðæäåíèÿ...", 501 - MENUITEM "&Øðèôò...", ID_SELECT_FONT - MENUITEM "&Íàñòðîèòü ïàíåëü èíñòðóìåíòîâ...", 512 - MENUITEM SEPARATOR - MENUITEM "&Ïàíåëü èíñòðóìåíòîâ", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Ïàíåëü &äèñêîâ", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "&Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐ¹ Ð´Ð¸ÑÐº...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "ÐÐ¾Ð´ÐºÐ»Ñ&ÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº", ID_CONNECT_NETWORK_DRIVE + MENUITEM "ÐÑÐº&Ð»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "Ð¡Ð´ÐµÐ»Ð°ÑÑ Ð¾&Ð±ÑÐ¸Ð¼ ÐºÐ°Ðº...", 254 + MENUITEM "&ÐÐ°ÐºÑÑÑÑ Ð¾Ð±ÑÐ¸Ð¹ Ð´Ð¾ÑÑÑÐ¿...", 255 + MENUITEM SEPARATOR + MENUITEM "&ÐÑÐ±ÑÐ°ÑÑ Ð´Ð¸ÑÐº...", 251 + } + + POPUP "&ÐÐ°Ð¿ÐºÐ¸" { + MENUITEM "Ð¡&Ð»ÐµÐ´ÑÑÑÐ¸Ð¹ ÑÑÐ¾Ð²ÐµÐ½Ñ\t+", 301 + MENUITEM "&Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð´ÐµÑÐµÐ²Ð¾\t*", 302 + MENUITEM "Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð²&ÑÐµ\tStrg+*", 303 + MENUITEM "&Ð¡Ð²ÐµÑÐ½ÑÑÑ Ð´ÐµÑÐµÐ²Ð¾\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&ÐÑÐ¼ÐµÑÐ¸ÑÑ Ð²ÐµÑÐ²Ð¸", 505 + } + + POPUP "&ÐÐ¸Ð´" { + MENUITEM "ÐÐµÑÐµÐ²Ð¾ &Ð¸ Ð¿Ð°Ð¿ÐºÐ°", 413 + MENUITEM "Ð¢Ð¾Ð»ÑÐºÐ¾ &Ð´ÐµÑÐµÐ²Ð¾", 411 + MENUITEM "Ð¢Ð¾Ð»ÑÐºÐ¾ &Ð¿Ð°Ð¿ÐºÐ°", 412 + MENUITEM SEPARATOR + MENUITEM "Ð Ð°Ð·&Ð±Ð¸ÑÑ", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "Ð&Ð¼Ñ", ID_VIEW_NAME + MENUITEM "Ð&ÑÐµ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ Ð¾ ÑÐ°Ð¹Ð»Ðµ", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&ÐÑÐ±Ð¾ÑÐ¾ÑÐ½Ð¾ Ð¾ ÑÐ°Ð¹Ð»Ðµ...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾ Ð¸Ð¼ÐµÐ½Ð¸", ID_VIEW_SORT_NAME + MENUITEM "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾ &ÑÐ¸Ð¿Ñ", ID_VIEW_SORT_TYPE + MENUITEM "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾ &ÑÐ°Ð·Ð¼ÐµÑÑ", ID_VIEW_SORT_SIZE + MENUITEM "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾ Ð´&Ð°ÑÐµ", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾ &...", ID_VIEW_FILTER + } + + POPUP "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" { + MENUITEM "ÐÐ¾Ð´&ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ...", 501 + MENUITEM "&Ð¨ÑÐ¸ÑÑ...", ID_SELECT_FONT + MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²...", 512 + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &Ð´Ð¸ÑÐºÐ¾Ð²", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Ð¡ÑÑÐ¾ÐºÐ° ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "Ï&îëíûé ýêðàí\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Çíà÷îê â ñïèñîê ïðîãðàìì", 504 - MENUITEM "Ñî&õðàíÿòü íàñòðîéêè ïðè âûõîäå",511 - } - - - POPUP "&Áåçîïàñíîñòü" { - MENUITEM "&Äîñòóï...", 605 - MENUITEM "&Ïðîòîêîëû...", 606 - MENUITEM "&Âëàäåëåö...", 607 - } - - POPUP "&Îêíî" { - MENUITEM "Íîâîå &îêíî", ID_WINDOW_NEW - MENUITEM "Îêíà &êàñêàäîì\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Îêíà ñ&âåðõó âíèç", ID_WINDOW_TILE_HORZ - MENUITEM "Îêíà ñ&ëåâà íàïðàâî\tCtrl+F4",ID_WINDOW_TILE_VERT + MENUITEM "Ð&Ð¾Ð»Ð½ÑÐ¹ ÑÐºÑÐ°Ð½\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&ÐÐ½Ð°ÑÐ¾Ðº Ð² ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼", 504 + MENUITEM "Ð¡Ð¾&ÑÑÐ°Ð½ÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ",511 + } + + + POPUP "&ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ" { + MENUITEM "&ÐÐ¾ÑÑÑÐ¿...", 605 + MENUITEM "&ÐÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ñ...", 606 + MENUITEM "&ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ...", 607 + } + + POPUP "&ÐÐºÐ½Ð¾" { + MENUITEM "ÐÐ¾Ð²Ð¾Ðµ &Ð¾ÐºÐ½Ð¾", ID_WINDOW_NEW + MENUITEM "ÐÐºÐ½Ð° &ÐºÐ°ÑÐºÐ°Ð´Ð¾Ð¼\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "ÐÐºÐ½Ð° Ñ&Ð²ÐµÑÑÑ Ð²Ð½Ð¸Ð·", ID_WINDOW_TILE_HORZ + MENUITEM "ÐÐºÐ½Ð° Ñ&Ð»ÐµÐ²Ð° Ð½Ð°Ð¿ÑÐ°Ð²Ð¾\tCtrl+F4",ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS - MENUITEM "Ðàñïîëîæèòü &àâòîìàòè÷åñêè", ID_WINDOW_AUTOSORT -#endif - MENUITEM "&Ðàñïîëîæèòü", ID_WINDOW_ARRANGE - MENUITEM "Î&áíîâèòü\tF5", ID_REFRESH - } - - POPUP "&Ñïðàâêà" { - MENUITEM "&Ñîäåðæàíèå\tF1", ID_HELP - MENUITEM "&Ïîèñê...\tF1", ID_HELP - MENUITEM "&Èñïîëüçîâàíèå ñïðàâêè\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&Î Winefile...", ID_ABOUT + MENUITEM "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÑ &Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸", ID_WINDOW_AUTOSORT +#endif + MENUITEM "&Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÑ", ID_WINDOW_ARRANGE + MENUITEM "Ð&Ð±Ð½Ð¾Ð²Ð¸ÑÑ\tF5", ID_REFRESH + } + + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" { + MENUITEM "&Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ\tF1", ID_HELP + MENUITEM "&ÐÐ¾Ð¸ÑÐº...\tF1", ID_HELP + MENUITEM "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¿ÑÐ°Ð²ÐºÐ¸\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&Ð Winefile...", ID_ABOUT } } IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Âûïîëíèòü" +CAPTION "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Êîìàíäà:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&ÐÐ¾Ð¼Ð°Ð½Ð´Ð°:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Êàê &ñèìâîë", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + CONTROL "ÐÐ°Ðº &ÑÐ¸Ð¼Ð²Ð¾Ð»", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Îòìåíà", 2, 158, 23, 47, 14 - PUSHBUTTON "&Ñïðàâêà", 254, 158, 43, 47, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", 2, 158, 23, 47, 14 + PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Âûáåðèòå ïóòü íàçíà÷åíèÿ" +CAPTION "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿ÑÑÑ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Ïóòü:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&ÐÑÑÑ:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Îòìåíà", 2, 158, 23, 47, 14 - PUSHBUTTON "&Îáçîð", 254, 158, 43, 47, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", 2, 158, 23, 47, 14 + PUSHBUTTON "&ÐÐ±Ð·Ð¾Ñ", 254, 158, 43, 47, 14 } IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ïî òèïó ôàéëîâ" +CAPTION "ÐÐ¾ ÑÐ¸Ð¿Ñ ÑÐ°Ð¹Ð»Ð¾Ð²" FONT 8, "MS Sans Serif" BEGIN - LTEXT "&Èìÿ:",-1,7,8,22,10 + LTEXT "&ÐÐ¼Ñ:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL - GROUPBOX "Òèï ôàéëà",-1,7,23,87,56 - CONTROL "&Êàòàëîãè",IDC_VIEW_TYPE_DIRECTORIES,"Button", + GROUPBOX "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ð°",-1,7,23,87,56 + CONTROL "&ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸",IDC_VIEW_TYPE_DIRECTORIES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 - CONTROL "&Ïðîãðàììû",IDC_VIEW_TYPE_PROGRAMS,"Button", + CONTROL "&ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ",IDC_VIEW_TYPE_PROGRAMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 - CONTROL "&Äîêóìåíòû",IDC_VIEW_TYPE_DOCUMENTS,"Button", + CONTROL "&ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÑ",IDC_VIEW_TYPE_DOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 - CONTROL "Äðóãèå &ôàéëû",IDC_VIEW_TYPE_OTHERS,"Button", + CONTROL "ÐÑÑÐ³Ð¸Ðµ &ÑÐ°Ð¹Ð»Ñ",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "Ïîêàçàòü ñêðûòûå/&ñèñòåìíûå ôàéëû",IDC_VIEW_TYPE_HIDDEN, + CONTROL "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐºÑÑÑÑÐµ/&ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ",IDC_VIEW_TYPE_HIDDEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,104,24,50,14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,104,24,50,14 END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ñâîéñòâà %s" +CAPTION "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° %s" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,191,29,50,14 - LTEXT "Èìÿ &ôàéëà:",-1,7,7,59,9 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,191,29,50,14 + LTEXT "ÐÐ¼Ñ &ÑÐ°Ð¹Ð»Ð°:",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "&Ïîëíûé ïóòü:",-1,7,18,59,9 + LTEXT "&ÐÐ¾Ð»Ð½ÑÐ¹ Ð¿ÑÑÑ:",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Ïîñëåäíåå èçìåíåíèå:",-1,7,29,59,9 + LTEXT "ÐÐ¾ÑÐ»ÐµÐ´Ð½ÐµÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ:",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Âåðñèÿ:",-1,7,40,59,9 + LTEXT "ÐÐµÑÑÐ¸Ñ:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Cop&yright:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Ðàçìåð:",-1,7,62,59,9 + LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - GROUPBOX "Àòðèáóòû",-1,7,79,158,46 - CONTROL "&Òîëüêî äëÿ ÷òåíèÿ",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "Ñ&êðûòûé",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + GROUPBOX "ÐÑÑÐ¸Ð±ÑÑÑ",-1,7,79,158,46 + CONTROL "&Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "Ð¡&ÐºÑÑÑÑÐ¹",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 - CONTROL "&Ñèñòåìíûé",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "Ñ&æàòûé",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - GROUPBOX "&Èíôîðìàöèÿ î âåðñèè",-1,7,129,234,79 + CONTROL "&Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐ¹",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "Ð¡&Ð¶Ð°ÑÑÐ¹",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð²ÐµÑÑÐ¸Ð¸",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -226,34 +229,35 @@ STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "Ïðèìåíåíèå ïàðàìåòðîâ íàñòðîéêè øðèôòà" - IDS_FONT_SEL_ERROR "Îøèáêà ïðè âûáîðå íîâîãî øðèôòà." + IDS_FONT_SEL_DLG_NAME "ÐÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÑÐ¸ÑÑÐ°" + IDS_FONT_SEL_ERROR "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð²ÑÐ±Ð¾ÑÐµ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÑÐ¸ÑÑÐ°." } STRINGTABLE { IDS_WINEFILE "Winefile" - IDS_ERROR "Îøèáêà" - IDS_ROOT_FS "Êîðíåâàÿ ôàéëîâàÿ ñèñòåìà" - IDS_UNIXFS "Îñíîâíàÿ ôàéëîâàÿ ñèñòåìà" - IDS_DESKTOP "Ðàáî÷èé ñòîë" + IDS_ERROR "ÐÑÐ¸Ð±ÐºÐ°" + IDS_ROOT_FS "ÐÐ¾ÑÐ½ÐµÐ²Ð°Ñ ÑÐ°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð°" + IDS_UNIXFS "ÐÑÐ½Ð¾Ð²Ð½Ð°Ñ ÑÐ°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð°" + IDS_DESKTOP "Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»" IDS_SHELL "Shell" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Åù¸ íå ðåàëèçîâàíî" + IDS_NO_IMPL "ÐÑÑ Ð½Ðµ ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¾" IDS_WINE_FILE "Wine File" } STRINGTABLE { - IDS_COL_NAME "Èìÿ" - IDS_COL_SIZE "Ðàçìåð" - IDS_COL_CDATE "Äàòà ñîçäàíèÿ" - IDS_COL_ADATE "Äàòà ïîñëåäíåãî äîñòóïà" - IDS_COL_MDATE "Äàòà ïîñëåäíåãî èçìåíåíèÿ" + IDS_COL_NAME "ÐÐ¼Ñ" + IDS_COL_SIZE "Ð Ð°Ð·Ð¼ÐµÑ" + IDS_COL_CDATE "ÐÐ°ÑÐ° ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ" + IDS_COL_ADATE "ÐÐ°ÑÐ° Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð°" + IDS_COL_MDATE "ÐÐ°ÑÐ° Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ³Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ" IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Ññûëêè" - IDS_COL_ATTR "Àòðèáóòû" - IDS_COL_SEC "Áåçîïàñíîñòü" - - IDS_FREE_SPACE_FMT "%s èç %s ñâîáîäíî" -} + IDS_COL_LINKS "Ð¡ÑÑÐ»ÐºÐ¸" + IDS_COL_ATTR "ÐÑÑÐ¸Ð±ÑÑÑ" + IDS_COL_SEC "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ" + + IDS_FREE_SPACE_FMT "%s Ð¸Ð· %s ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾" +} +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Si.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Si.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Si.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -260,3 +260,4 @@ IDS_FREE_SPACE_FMT "Prosto: %s od %s" } +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Zh.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Zh.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Zh.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -300,3 +300,4 @@ PUSHBUTTON "åæ¶", 2, 158, 23, 47, 14 PUSHBUTTON "å¹«å©(&H)", 254, 158, 43, 47, 14 } +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… ============================================================================== --- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -49,3 +49,26 @@ /* @makedep: images.bmp */ IDB_IMAGES BITMAP DISCARDABLE images.bmp + +/* include localised resources */ + +#include "Cs.rc" +#include "Da.rc" +#include "De.rc" +#include "En.rc" +#include "Es.rc" +#include "Fr.rc" +#include "Hu.rc" +#include "It.rc" +#include "Ja.rc" +#include "Ko.rc" +#include "Lt.rc" +#include "Nl.rc" +#include "No.rc" +#include "Pl.rc" +#include "Pt.rc" +#include "Ru.rc" +#include "Si.rc" +#include "Sv.rc" +#include "Tr.rc" +#include "Zh.rc" Modified: trunk/rosapps/applications/winfile/winfile.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winfi… ============================================================================== --- trunk/rosapps/applications/winfile/winfile.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winfile.rbuild [iso-8859-1] Mon Aug 17 03:37:17 2009 @@ -16,25 +16,6 @@ <library>uuid</library> <file>splitpath.c</file> <file>winefile.c</file> - <file>Cs.rc</file> - <file>Da.rc</file> - <file>De.rc</file> - <file>En.rc</file> - <file>Fr.rc</file> - <file>Hu.rc</file> - <file>It.rc</file> - <file>Ja.rc</file> - <file>Ko.rc</file> - <file>Lt.rc</file> - <file>Nl.rc</file> - <file>No.rc</file> - <file>Pl.rc</file> - <file>Pt.rc</file> - <file>Ru.rc</file> - <file>Si.rc</file> - <file>Sv.rc</file> - <file>Tr.rc</file> - <file>Zh.rc</file> <file>rsrc.rc</file> </module> </rbuild>

1 0

[jimtabor] 42751: - Move GetCharacterPlacement functions into new locations. Implemented GetCharacterPlacementA from wine port. - Port from wine, original authors: Juergen Schmied <juergen.schmied@metronet.de>, Peter Oberndorfer <kumbayo84@arcor.de>
by jimtabor＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: jimtabor Date: Mon Aug 17 03:34:20 2009 New Revision: 42751 URL: http://svn.reactos.org/svn/reactos?rev=42751&view=rev Log: - Move GetCharacterPlacement functions into new locations. Implemented GetCharacterPlacementA from wine port. - Port from wine, original authors: Juergen Schmied <juergen.schmied(a)metronet.de>, Peter Oberndorfer <kumbayo84(a)arcor.de> Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] Mon Aug 17 03:34:20 2009 @@ -12,28 +12,6 @@ #include "precomp.h" #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); - - - - -/* - * @unimplemented - */ -DWORD -WINAPI -GetCharacterPlacementA( - HDC hDc, - LPCSTR a1, - int a2, - int a3, - LPGCP_RESULTSA a4, - DWORD a5 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Mon Aug 17 03:34:20 2009 @@ -425,6 +425,58 @@ return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, FALSE); } + +/* + * @implemented + */ +DWORD +WINAPI +GetCharacterPlacementA( + HDC hdc, + LPCSTR lpString, + INT uCount, + INT nMaxExtent, + GCP_RESULTSA *lpResults, + DWORD dwFlags) +{ + WCHAR *lpStringW; + INT uCountW; + GCP_RESULTSW resultsW; + DWORD ret; + UINT font_cp; + + if ( !lpString || uCount <= 0 || (nMaxExtent < 0 && nMaxExtent != -1 ) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } +/* TRACE("%s, %d, %d, 0x%08x\n", + debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags); +*/ + /* both structs are equal in size */ + memcpy(&resultsW, lpResults, sizeof(resultsW)); + + lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); + if(lpResults->lpOutString) + resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); + + ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, &resultsW, dwFlags); + + lpResults->nGlyphs = resultsW.nGlyphs; + lpResults->nMaxFit = resultsW.nMaxFit; + + if(lpResults->lpOutString) { + WideCharToMultiByte(font_cp, 0, resultsW.lpOutString, uCountW, + lpResults->lpOutString, uCount, NULL, NULL ); + } + + HeapFree(GetProcessHeap(), 0, lpStringW); + HeapFree(GetProcessHeap(), 0, resultsW.lpOutString); + + return ret; +} + + /* * @implemented */ @@ -505,6 +557,47 @@ ret = MAKELONG(size.cx, size.cy); return ret; +} + +DWORD +WINAPI +NewGetCharacterPlacementW( + HDC hdc, + LPCWSTR lpString, + INT uCount, + INT nMaxExtent, + GCP_RESULTSW *lpResults, + DWORD dwFlags + ) +{ + INT nSet; + SIZE Size = {0,0}; + + if ( !lpString || uCount <= 0 || (nMaxExtent < 0 && nMaxExtent != -1 ) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if ( !lpResults ) + { + if ( GetTextExtentPointW(hdc, lpString, uCount, &Size) ) + { + return MAKELONG(Size.cx, Size.cy); + } + return 0; + } + + nSet = uCount; + if ( nSet > lpResults->nGlyphs ) + nSet = lpResults->nGlyphs; + + return NtGdiGetCharacterPlacementW( hdc, + (LPWSTR)lpString, + nSet, + nMaxExtent, + lpResults, + dwFlags); } /* Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Mon Aug 17 03:34:20 2009 @@ -215,6 +215,23 @@ ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); return Ret; +} + + /* + * @unimplemented + */ +DWORD +APIENTRY +NtGdiGetCharacterPlacementW( + IN HDC hdc, + IN LPWSTR pwsz, + IN INT nCount, + IN INT nMaxExtent, + IN OUT LPGCP_RESULTSW pgcpw, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return 0; } DWORD Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Mon Aug 17 03:34:20 2009 @@ -1164,23 +1164,6 @@ /* * @unimplemented */ -DWORD -APIENTRY -NtGdiGetCharacterPlacementW( - IN HDC hdc, - IN LPWSTR pwsz, - IN INT nCount, - IN INT nMaxExtent, - IN OUT LPGCP_RESULTSW pgcpw, - IN DWORD dwFlags) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ BOOL APIENTRY NtGdiGetCharWidthInfo(

1 0

[jimtabor] 42750: - Add callback for client side thread startup. This is for bug 4785.
by jimtabor＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: jimtabor Date: Mon Aug 17 02:30:25 2009 New Revision: 42750 URL: http://svn.reactos.org/svn/reactos?rev=42750&view=rev Log: - Add callback for client side thread startup. This is for bug 4785. Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/include/reactos/win32k/callback.h trunk/reactos/subsystems/win32/win32k/include/callback.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -232,6 +232,8 @@ (PVOID)User32CallEventProcFromKernel; NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADMENU] = (PVOID)User32CallLoadMenuFromKernel; + NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] = + (PVOID)User32CallClientThreadSetupFromKernel; NtUserProcessConnect( NtCurrentProcess(), &UserCon, @@ -353,3 +355,12 @@ gHandleEntries = SharedPtrToUser(gHandleTable->handles); } + +NTSTATUS +WINAPI +User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + ERR("GetConnected\n"); + return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); +} + Modified: trunk/reactos/include/reactos/win32k/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/cal… ============================================================================== --- trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -8,7 +8,8 @@ #define USER32_CALLBACK_HOOKPROC (4) #define USER32_CALLBACK_EVENTPROC (5) #define USER32_CALLBACK_LOADMENU (6) -#define USER32_CALLBACK_MAXIMUM (6) +#define USER32_CALLBACK_CLIENTTHREADSTARTUP (7) +#define USER32_CALLBACK_MAXIMUM (7) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -84,5 +85,7 @@ User32CallEventProcFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/callback.h [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -56,4 +56,6 @@ HMENU APIENTRY co_IntCallLoadMenu(HINSTANCE,PUNICODE_STRING); +NTSTATUS APIENTRY co_IntClientThreadSetup(VOID); + #endif /* _WIN32K_CALLBACK_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -703,4 +703,29 @@ return (HMENU)Result; } +NTSTATUS +APIENTRY +co_IntClientThreadSetup(VOID) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + + ArgumentLength = ResultLength = 0; + Argument = ResultPointer = NULL; + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_CLIENTTHREADSTARTUP, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + return Status; +} + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -94,6 +94,8 @@ HANDLE hPowerRequestEvent, HANDLE hMediaRequestEvent) { + NTSTATUS Status; + // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) // Create Object Directory,,, Looks like create workstation. "\\Windows\\WindowStations" // Create Event for Diconnect Desktop. @@ -105,6 +107,15 @@ // Initialize User Screen. // } // Create ThreadInfo for this Thread! +// { + + GetW32ThreadInfo(); + +// Callback to User32 Client Thread Setup + + Status = co_IntClientThreadSetup(); + +// } // Set Global SERVERINFO Error flags. // Load Resources.

1 0

[gschneider] 42749: - Don't allow glyph indices (ETO_GLYPH_INDEX) in ExtTextOut as long as they are not created properly - GetCharacterPlacementA/W has to work to allow this, currently broken/stubbed - Switch to full text processing mode so that those texts are shown - Fixes garbled text in OpenOffice 1.14/1.15 installers, bug #933
by gschneider＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: gschneider Date: Mon Aug 17 02:24:46 2009 New Revision: 42749 URL: http://svn.reactos.org/svn/reactos?rev=42749&view=rev Log: - Don't allow glyph indices (ETO_GLYPH_INDEX) in ExtTextOut as long as they are not created properly - GetCharacterPlacementA/W has to work to allow this, currently broken/stubbed - Switch to full text processing mode so that those texts are shown - Fixes garbled text in OpenOffice 1.14/1.15 installers, bug #933 Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Aug 17 02:24:46 2009 @@ -3694,6 +3694,9 @@ } } + /* FIXME: remove this as soon as GetCharacterPlacementA/W work properly */ + fuOptions &= ~ETO_GLYPH_INDEX; + /* Finally call the internal routine */ Result = GreExtTextOutW(hDC, XStart,

1 0

[gschneider] 42748: Handle a missing output buffer in NtGdiGetCharABCWidthsW
by gschneider＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: gschneider Date: Mon Aug 17 02:13:44 2009 New Revision: 42748 URL: http://svn.reactos.org/svn/reactos?rev=42748&view=rev Log: Handle a missing output buffer in NtGdiGetCharABCWidthsW Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Aug 17 02:13:44 2009 @@ -3761,6 +3761,12 @@ return FALSE; } + if (!Buffer) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + BufferSize = Count * sizeof(ABC); // Same size! SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); if (!fl) SafeBuffF = (LPABCFLOAT) SafeBuff;

1 0

[dgorbachev] 42747: Add an assertion. See bug #4785.
by dgorbachev＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: dgorbachev Date: Mon Aug 17 00:52:05 2009 New Revision: 42747 URL: http://svn.reactos.org/svn/reactos?rev=42747&view=rev Log: Add an assertion. See bug #4785. Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Mon Aug 17 00:52:05 2009 @@ -38,6 +38,9 @@ /* Validate the previous mode */ if (KeGetPreviousMode() == KernelMode) return STATUS_INVALID_PARAMETER; + + /* If no win32k, crashes later */ + ASSERT(PspW32ProcessCallout != NULL); /* Make sure win32k is here */ if (!PspW32ProcessCallout) return STATUS_ACCESS_DENIED;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
66
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 August 2009