Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 26843: Update WIDL to rev 20070519.
by ekohl＠svn.reactos.org 19 May '07

19 May '07

Author: ekohl Date: Sun May 20 03:02:35 2007 New Revision: 26843 URL: http://svn.reactos.org/svn/reactos?rev=26843&view=rev Log: Update WIDL to rev 20070519. Modified: trunk/reactos/tools/widl/ChangeLog trunk/reactos/tools/widl/Makefile.in trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/lex.yy.c trunk/reactos/tools/widl/parser.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib.h trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/utils.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h trunk/reactos/tools/widl/widl.man.in trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/widl/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/ChangeLog?rev=2… Modified: trunk/reactos/tools/widl/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/Makefile.in?rev… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=26… Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=2684… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=26… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=26… Modified: trunk/reactos/tools/widl/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/lex.yy.c?rev=26… Modified: trunk/reactos/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.h?rev=26… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=26… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=26… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=268… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=26… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=2… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=2… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=2… Modified: trunk/reactos/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.h?rev=2… Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=268… Modified: trunk/reactos/tools/widl/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=268… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=2684… Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=2684… Modified: trunk/reactos/tools/widl/widl.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.man.in?rev… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

[hpoussin] 26842: Another try to fix release builds to please Colin_Finck...
by hpoussin＠svn.reactos.org 19 May '07

19 May '07

Author: hpoussin Date: Sun May 20 00:45:17 2007 New Revision: 26842 URL: http://svn.reactos.org/svn/reactos?rev=26842&view=rev Log: Another try to fix release builds to please Colin_Finck... Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c Sun May 20 00:45:17 2007 @@ -356,4 +356,10 @@ } } +#else + +VOID DebugPrint(ULONG Mask, char *format, ...) +{ +} + #endif // defined DBG Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Sun May 20 00:45:17 2007 @@ -76,8 +76,6 @@ #else - inline VOID DebugPrint(ULONG Mask, char *format, ...) {} - #define DebugInit() #define DbgPrint(_x_) { if (0) DebugPrint _x_; } #define DPRINT1(_x_) { if (0) printf _x_; }

1 0

[dgorbachev] 26841: Do not use paged pool at page fault time; see bug report #2252.
by dgorbachev＠svn.reactos.org 19 May '07

19 May '07

Author: dgorbachev Date: Sat May 19 19:13:37 2007 New Revision: 26841 URL: http://svn.reactos.org/svn/reactos?rev=26841&view=rev Log: Do not use paged pool at page fault time; see bug report #2252. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Sat May 19 19:13:37 2007 @@ -313,7 +313,7 @@ { Table = Segment->PageDirectory.PageTables[DirectoryOffset] = - ExAllocatePoolWithTag(PagedPool, sizeof(SECTION_PAGE_TABLE), + ExAllocatePoolWithTag(NonPagedPool, sizeof(SECTION_PAGE_TABLE), TAG_SECTION_PAGE_TABLE); if (Table == NULL) {

1 0

[tkreuzer] 26840: fix drawing on resize
by tkreuzer＠svn.reactos.org 19 May '07

19 May '07

Author: tkreuzer Date: Sat May 19 18:23:00 2007 New Revision: 26840 URL: http://svn.reactos.org/svn/reactos?rev=26840&view=rev Log: fix drawing on resize Modified: trunk/rosapps/fontview/display.c Modified: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.c (original) +++ trunk/rosapps/fontview/display.c Sat May 19 18:23:00 2007 @@ -178,7 +178,7 @@ BeginPaint(hwnd, &ps); - /* fill with white */ + /* Fill with white */ FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); /* Draw the text */ @@ -193,17 +193,34 @@ Display_OnSize(HWND hwnd) { RECT rect; - SCROLLINFO si; + SCROLLINFO si; + int nOldPos; GetClientRect(hwnd, &rect); + /* Get the old pos */ + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); + nOldPos = si.nPos; + /* Set the new page size */ - si.cbSize = sizeof(si); si.fMask = SIF_PAGE; si.nPage = rect.bottom; - SetScrollInfo(hwnd, SB_VERT, &si, TRUE); -// FIXME: handle exceeding of current pos -> redraw entire window -// if new page size is < curent pos: current pos = maximum whatever and then redraw + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + + /* Get the new pos */ + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); + + /* If the don't match ... */ + if (nOldPos != si.nPos) + { + /* ... scroll the window */ + ScrollWindowEx(hwnd, 0, -(si.nPos - nOldPos), NULL, NULL, NULL, NULL, SW_INVALIDATE); + UpdateWindow(hwnd); + } + return 0; } @@ -231,7 +248,7 @@ case SB_LINEDOWN: nPos = si.nPos + 10; break; -// case SB_THUMBTRACK: + case SB_THUMBTRACK: case SB_THUMBPOSITION: nPos = si.nTrackPos; break;

1 0

[sgasiorek] 26839: - add support for ETO_GLYPH_INDEX in NtGdiExtTextOut. (fixes character shift problem in QT apps) see bug #975
by sgasiorek＠svn.reactos.org 19 May '07

19 May '07

Author: sgasiorek Date: Sat May 19 17:55:23 2007 New Revision: 26839 URL: http://svn.reactos.org/svn/reactos?rev=26839&view=rev Log: - add support for ETO_GLYPH_INDEX in NtGdiExtTextOut. (fixes character shift problem in QT apps) see bug #975 Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sat May 19 17:55:23 2007 @@ -1863,7 +1863,11 @@ for (i = Start; i < Count; i++) { - glyph_index = FT_Get_Char_Index(face, *TempText); + if (fuOptions & ETO_GLYPH_INDEX) + glyph_index = *TempText; + else + glyph_index = FT_Get_Char_Index(face, *TempText); + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { @@ -1913,21 +1917,28 @@ for (i = 0; i < Count; i++) { - glyph_index = FT_Get_Char_Index(face, *String); + if (fuOptions & ETO_GLYPH_INDEX) + glyph_index = *String; + else + glyph_index = FT_Get_Char_Index(face, *String); + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - IntUnLockFreeType; - goto fail; - } - glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + goto fail; + } + glyph = face->glyph; + realglyph = NtGdiGlyphCacheSet(face, + glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + glyph, + RenderMode); } // DbgPrint("realglyph: %x\n", realglyph); // DbgPrint("TextLeft: %d\n", TextLeft);

1 0

[ekohl] 26838: Unicode.nls contains the Unicode case conversion tables. It does _not_ contain codepage tables.
by ekohl＠svn.reactos.org 19 May '07

19 May '07

Author: ekohl Date: Sat May 19 14:40:59 2007 New Revision: 26838 URL: http://svn.reactos.org/svn/reactos?rev=26838&view=rev Log: Unicode.nls contains the Unicode case conversion tables. It does _not_ contain codepage tables. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sat May 19 14:40:59 2007 @@ -94,8 +94,6 @@ ; NLS Files -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","0",0x00000000,"unicode.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","1",0x00000000,"unicode.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","37",0x00000000,"c_037.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","424",0x00000000,"c_424.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","437",0x00000000,"c_437.nls"

1 0

[dgorbachev] 26837: - Add Chinese (PRC) and Armenian NLS settings.
by dgorbachev＠svn.reactos.org 19 May '07

19 May '07

Author: dgorbachev Date: Sat May 19 14:11:59 2007 New Revision: 26837 URL: http://svn.reactos.org/svn/reactos?rev=26837&view=rev Log: - Add Chinese (PRC) and Armenian NLS settings. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sat May 19 14:11:59 2007 @@ -94,6 +94,8 @@ ; NLS Files +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","0",0x00000000,"unicode.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","1",0x00000000,"unicode.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","37",0x00000000,"c_037.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","424",0x00000000,"c_424.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","437",0x00000000,"c_437.nls" @@ -155,6 +157,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0402",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls" @@ -234,7 +237,7 @@ ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0427",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0429",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042a",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042b",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042b",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042c",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","082c",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042d",0x00000000,"l_intl.nls" @@ -261,6 +264,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00000000,"1" @@ -340,7 +344,7 @@ ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,"" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00000000,"1"

1 0

[dgorbachev] 26836: - Handle DBCS codepages. - Add Armenian locale definitions from Wine.
by dgorbachev＠svn.reactos.org 19 May '07

19 May '07

Author: dgorbachev Date: Sat May 19 14:11:48 2007 New Revision: 26836 URL: http://svn.reactos.org/svn/reactos?rev=26836&view=rev Log: - Handle DBCS codepages. - Add Armenian locale definitions from Wine. Added: trunk/reactos/dll/win32/kernel32/nls/hye.nls Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc Sat May 19 14:11:48 2007 @@ -175,7 +175,7 @@ //#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_NEUTRAL */ -//#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_NEUTRAL */ +#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_NEUTRAL */ //#include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ //#include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Sat May 19 14:11:48 2007 @@ -399,10 +399,64 @@ /* Different handling for DBCS code pages. */ if (CodePageTable->MaximumCharacterSize > 1) { - /* UNIMPLEMENTED */ - return 0; - } - else + /* FIXME */ + + UCHAR Char; + USHORT DBCSOffset; + LPCSTR MbsEnd = MultiByteString + MultiByteCount; + ULONG Count; + + /* Does caller query for output buffer size? */ + if (WideCharCount == 0) + { + for (; MultiByteString < MbsEnd; WideCharCount++) + { + Char = *MultiByteString++; + + if (Char < 0x80) + continue; + + DBCSOffset = CodePageTable->DBCSOffsets[Char]; + + if (!DBCSOffset) + continue; + + if (MultiByteString < MbsEnd) + MultiByteString++; + } + + return WideCharCount; + } + + for (Count = 0; Count < WideCharCount && MultiByteString < MbsEnd; Count++) + { + Char = *MultiByteString++; + + if (Char < 0x80) + { + *WideCharString++ = Char; + continue; + } + + DBCSOffset = CodePageTable->DBCSOffsets[Char]; + + if (!DBCSOffset) + { + *WideCharString++ = CodePageTable->MultiByteTable[Char]; + continue; + } + + if (MultiByteString < MbsEnd) + *WideCharString++ = + CodePageTable->DBCSOffsets[DBCSOffset + *(PUCHAR)MultiByteString++]; + } + + if (MultiByteString < MbsEnd) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + + return Count; + } + else /* Not DBCS code page */ { /* Check for invalid characters. */ if (Flags & MB_ERR_INVALID_CHARS) @@ -554,10 +608,81 @@ /* Different handling for DBCS code pages. */ if (CodePageTable->MaximumCharacterSize > 1) { - DPRINT1("WideCharToMultiByte for DBCS codepages is not implemented!\n"); - return 0; - } - else + /* FIXME */ + + USHORT WideChar; + USHORT MbChar; + + /* Does caller query for output buffer size? */ + if (MultiByteCount == 0) + { + for (TempLength = 0; WideCharCount; WideCharCount--, TempLength++) + { + WideChar = *WideCharString++; + + if (WideChar < 0x80) + continue; + + MbChar = ((PWCHAR)CodePageTable->WideCharTable)[WideChar]; + + if (!(MbChar & 0xff00)) + continue; + + TempLength++; + } + + return TempLength; + } + + for (TempLength = MultiByteCount; WideCharCount; WideCharCount--) + { + WideChar = *WideCharString++; + + if (WideChar < 0x80) + { + if (!TempLength) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + TempLength--; + + *MultiByteString++ = (CHAR)WideChar; + continue; + } + + MbChar = ((PWCHAR)CodePageTable->WideCharTable)[WideChar]; + + if (!(MbChar & 0xff00)) + { + if (!TempLength) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + TempLength--; + + *MultiByteString++ = (CHAR)MbChar; + continue;; + } + + if (TempLength >= 2) + { + MultiByteString[1] = (CHAR)MbChar; MbChar >>= 8; + MultiByteString[0] = (CHAR)MbChar; + MultiByteString += 2; + TempLength -= 2; + } + else + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + } + + return MultiByteCount - TempLength; + } + else /* Not DBCS code page */ { /* Does caller query for output buffer size? */ if (MultiByteCount == 0) Added: trunk/reactos/dll/win32/kernel32/nls/hye.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hye… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/hye.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/hye.nls Sat May 19 14:11:48 2007 @@ -1,0 +1,155 @@ +/* + * Locale definitions for Armenian + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(0) /* Unicode only */ + +STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x042f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0013\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE L"1" + LOCALE_ICENTURY L"1" + LOCALE_ICOUNTRY L"374" + LOCALE_ICURRDIGITS L"2" + LOCALE_ICURRENCY L"3" + LOCALE_IDATE L"1" + LOCALE_IDAYLZERO L"1" + LOCALE_IDEFAULTANSICODEPAGE L"0" + LOCALE_IDEFAULTCODEPAGE L"1" + LOCALE_IDEFAULTCOUNTRY L"374" + LOCALE_IDEFAULTEBCDICCODEPAGE L"500" + LOCALE_IDEFAULTLANGUAGE L"042b" + LOCALE_IDEFAULTMACCODEPAGE L"2" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE L"65001" + LOCALE_IDIGITS L"2" + LOCALE_IDIGITSUBSTITUTION L"1" + LOCALE_IFIRSTDAYOFWEEK L"0" + LOCALE_IFIRSTWEEKOFYEAR L"0" + LOCALE_IINTLCURRDIGITS L"2" + LOCALE_ILANGUAGE L"042b" + LOCALE_ILDATE L"1" + LOCALE_ILZERO L"1" + LOCALE_IMEASURE L"0" + LOCALE_IMONLZERO L"1" + LOCALE_INEGCURR L"8" + LOCALE_INEGNUMBER L"1" + LOCALE_INEGSEPBYSPACE L"1" + LOCALE_INEGSIGNPOSN L"1" + LOCALE_INEGSYMPRECEDES L"0" + LOCALE_IOPTIONALCALENDAR L"0" + LOCALE_IPAPERSIZE L"9" + LOCALE_IPOSSEPBYSPACE L"1" + LOCALE_IPOSSIGNPOSN L"1" + LOCALE_IPOSSYMPRECEDES L"0" + LOCALE_ITIME L"1" + LOCALE_ITIMEMARKPOSN L"0" + LOCALE_ITLZERO L"0" + LOCALE_S1159 L"" + LOCALE_S2359 L"" + LOCALE_SABBREVCTRYNAME L"ARM" + LOCALE_SABBREVDAYNAME1 L"\x0535\x0580\x056f" + LOCALE_SABBREVDAYNAME2 L"\x0535\x0580\x0584" + LOCALE_SABBREVDAYNAME3 L"\x0549\x0580\x0584" + LOCALE_SABBREVDAYNAME4 L"\x0540\x0576\x0563" + LOCALE_SABBREVDAYNAME5 L"\x0548\x0552\x0580" + LOCALE_SABBREVDAYNAME6 L"\x0547\x0562\x0569" + LOCALE_SABBREVDAYNAME7 L"\x053f\x056b\x0580" + LOCALE_SABBREVLANGNAME L"HYE" + LOCALE_SABBREVMONTHNAME1 L"\x0540\x0546\x054e" + LOCALE_SABBREVMONTHNAME2 L"\x0553\x054f\x054e" + LOCALE_SABBREVMONTHNAME3 L"\x0544\x0550\x054f" + LOCALE_SABBREVMONTHNAME4 L"\x0531\x054a\x0550" + LOCALE_SABBREVMONTHNAME5 L"\x0544\x0545\x054d" + LOCALE_SABBREVMONTHNAME6 L"\x0540\x0546\x054d" + LOCALE_SABBREVMONTHNAME7 L"\x0540\x053c\x054d" + LOCALE_SABBREVMONTHNAME8 L"\x0555\x0533\x054d" + LOCALE_SABBREVMONTHNAME9 L"\x054d\x0535\x054a" + LOCALE_SABBREVMONTHNAME10 L"\x0540\x0548\x053f" + LOCALE_SABBREVMONTHNAME11 L"\x0546\x0548\x0545" + LOCALE_SABBREVMONTHNAME12 L"\x0534\x0535\x053f" + LOCALE_SABBREVMONTHNAME13 L"" + LOCALE_SCOUNTRY L"Armenia" + LOCALE_SCURRENCY L"\x0564\x0580." + LOCALE_SDATE L"." + LOCALE_SDAYNAME1 L"\x0535\x0580\x056f\x0578\x0582\x0577\x0561\x0562\x0569\x056b" + LOCALE_SDAYNAME2 L"\x0535\x0580\x0565\x0584\x0577\x0561\x0562\x0569\x056b" + LOCALE_SDAYNAME3 L"\x0549\x0578\x0580\x0565\x0584\x0577\x0561\x0562\x0569\x056b" + LOCALE_SDAYNAME4 L"\x0540\x056b\x0576\x0563\x0577\x0561\x0562\x0569\x056b" + LOCALE_SDAYNAME5 L"\x0548\x0552\x0580\x0562\x0561\x0569" + LOCALE_SDAYNAME6 L"\x0547\x0561\x0562\x0561\x0569" + LOCALE_SDAYNAME7 L"\x053f\x056b\x0580\x0561\x056f\x056b" + LOCALE_SDECIMAL L"." + LOCALE_SENGCOUNTRY L"Armenia" + LOCALE_SENGCURRNAME L"Armenian Dram" + LOCALE_SENGLANGUAGE L"Armenian" + LOCALE_SGROUPING L"3;0" + LOCALE_SINTLSYMBOL L"AMD" + LOCALE_SISO3166CTRYNAME L"AM" + LOCALE_SISO639LANGNAME L"hy" + LOCALE_SLANGUAGE L"Armenian" + LOCALE_SLIST L"," + LOCALE_SLONGDATE L"d MMMM, yyyy" + LOCALE_SMONDECIMALSEP L"." + LOCALE_SMONGROUPING L"3;0" + LOCALE_SMONTHNAME1 L"\x0540\x0578\x0582\x0576\x057e\x0561\x0580" + LOCALE_SMONTHNAME2 L"\x0553\x0565\x057f\x0580\x057e\x0561\x0580" + LOCALE_SMONTHNAME3 L"\x0544\x0561\x0580\x057f" + LOCALE_SMONTHNAME4 L"\x0531\x057a\x0580\x056b\x056c" + LOCALE_SMONTHNAME5 L"\x0544\x0561\x0575\x056b\x057d" + LOCALE_SMONTHNAME6 L"\x0540\x0578\x0582\x0576\x056b\x057d" + LOCALE_SMONTHNAME7 L"\x0540\x0578\x0582\x056c\x056b\x057d" + LOCALE_SMONTHNAME8 L"\x0555\x0563\x0578\x057d\x057f\x0578\x057d" + LOCALE_SMONTHNAME9 L"\x054d\x0565\x057a\x057f\x0565\x0574\x0562\x0565\x0580" + LOCALE_SMONTHNAME10 L"\x0540\x0578\x056f\x057f\x0565\x0574\x0562\x0565\x0580" + LOCALE_SMONTHNAME11 L"\x0546\x0578\x0575\x0565\x0574\x0562\x0565\x0580" + LOCALE_SMONTHNAME12 L"\x0534\x0565\x056f\x057f\x0565\x0574\x0562\x0565\x0580" + LOCALE_SMONTHNAME13 L"" + LOCALE_SMONTHOUSANDSEP L"," +// LOCALE_SNAME L"hy-AM" + LOCALE_SNATIVECTRYNAME L"\x0540\x0561\x0575\x0561\x057d\x057f\x0561\x0576" + LOCALE_SNATIVECURRNAME L"\x0564\x0580\x0561\x0574" + LOCALE_SNATIVEDIGITS L"0123456789" + LOCALE_SNATIVELANGNAME L"\x0540\x0561\x0575\x0565\x0580\x0565\x0576" + LOCALE_SNEGATIVESIGN L"-" + LOCALE_SPOSITIVESIGN L"" + LOCALE_SSHORTDATE L"dd.MM.yyyy" + LOCALE_SSORTNAME L"Default" + LOCALE_STHOUSAND L"," + LOCALE_STIME L":" + LOCALE_STIMEFORMAT L"H:mm:ss" + LOCALE_SYEARMONTH L"MMMM, yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" + LGRPID_GREEK+LGRPID_RES_BASE L"Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE L"Thai" + LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE L"Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" +}

1 0

[dgorbachev] 26835: - Add some code to deal with multibyte code pages.
by dgorbachev＠svn.reactos.org 19 May '07

19 May '07

Author: dgorbachev Date: Sat May 19 14:11:22 2007 New Revision: 26835 URL: http://svn.reactos.org/svn/reactos?rev=26835&view=rev Log: - Add some code to deal with multibyte code pages. Modified: trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=26835&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c (original) +++ trunk/reactos/lib/rtl/nls.c Sat May 19 14:11:22 2007 @@ -254,7 +254,35 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + UCHAR Char; + USHORT LeadByteInfo; + PCSTR MbEnd = MbString + MbSize; + + for (i = 0; i < UnicodeSize / sizeof(WCHAR) && MbString < MbEnd; i++) + { + Char = *(PUCHAR)MbString++; + + if (Char < 0x80) + { + *UnicodeString++ = Char; + continue; + } + + LeadByteInfo = NlsLeadByteInfo[Char]; + + if (!LeadByteInfo) + { + *UnicodeString++ = NlsAnsiToUnicodeTable[Char]; + continue; + } + + if (MbString < MbEnd) + *UnicodeString++ = NlsLeadByteInfo[LeadByteInfo + *(PUCHAR)MbString++]; + } + + if (ResultSize != NULL) + *ResultSize = i * sizeof(WCHAR); } return(STATUS_SUCCESS); @@ -281,12 +309,16 @@ else { /* multi-byte code page */ + /* FIXME */ + while (MbSize--) { - if (NlsLeadByteInfo[*(PUCHAR)MbString++]) + UCHAR Char = *(PUCHAR)MbString++; + + if (Char >= 0x80 && NlsLeadByteInfo[Char]) { - if (MbSize) - { + if (MbSize) + { /* Move on */ MbSize--; MbString++; @@ -342,7 +374,36 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + UCHAR Char; + USHORT OemLeadByteInfo; + PCHAR OemEnd = OemString + OemSize; + + for (i = 0; i < UnicodeSize / sizeof(WCHAR) && OemString < OemEnd; i++) + { + Char = *(PUCHAR)OemString++; + + if (Char < 0x80) + { + *UnicodeString++ = Char; + continue; + } + + OemLeadByteInfo = NlsOemLeadByteInfo[Char]; + + if (!OemLeadByteInfo) + { + *UnicodeString++ = NlsOemToUnicodeTable[Char]; + continue; + } + + if (OemString < OemEnd) + *UnicodeString++ = + NlsOemLeadByteInfo[OemLeadByteInfo + *(PUCHAR)OemString++]; + } + + if (ResultSize != NULL) + *ResultSize = i * sizeof(WCHAR); } return STATUS_SUCCESS; @@ -461,7 +522,39 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + USHORT WideChar; + USHORT MbChar; + + for (i = MbSize, Size = UnicodeSize / sizeof(WCHAR); i && Size; i--, Size--) + { + WideChar = *UnicodeString++; + + if (WideChar < 0x80) + { + *MbString++ = LOBYTE(WideChar); + continue; + } + + MbChar = NlsDbcsUnicodeToAnsiTable[WideChar]; + + if (!HIBYTE(MbChar)) + { + *MbString++ = LOBYTE(MbChar); + continue; + } + + if (i >= 2) + { + *MbString++ = HIBYTE(MbChar); + *MbString++ = LOBYTE(MbChar); + i--; + } + else break; + } + + if (ResultSize != NULL) + *ResultSize = MbSize - i; } return STATUS_SUCCESS; @@ -487,9 +580,13 @@ else { /* multi-byte code page */ + /* FIXME */ + while (UnicodeLength--) { - if (HIBYTE(NlsUnicodeToAnsiTable[*UnicodeString++])) + USHORT WideChar = *UnicodeString++; + + if (WideChar >= 0x80 && HIBYTE(NlsDbcsUnicodeToAnsiTable[WideChar])) { MbLength += sizeof(WCHAR); } @@ -498,7 +595,7 @@ MbLength++; } } - + *MbSize = MbLength; } @@ -541,7 +638,39 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + USHORT WideChar; + USHORT OemChar; + + for (i = OemSize, Size = UnicodeSize / sizeof(WCHAR); i && Size; i--, Size--) + { + WideChar = *UnicodeString++; + + if (WideChar < 0x80) + { + *OemString++ = LOBYTE(WideChar); + continue; + } + + OemChar = NlsDbcsUnicodeToOemTable[WideChar]; + + if (!HIBYTE(OemChar)) + { + *OemString++ = LOBYTE(OemChar); + continue; + } + + if (i >= 2) + { + *OemString++ = HIBYTE(OemChar); + *OemString++ = LOBYTE(OemChar); + i--; + } + else break; + } + + if (ResultSize != NULL) + *ResultSize = OemSize - i; } return STATUS_SUCCESS; @@ -704,7 +833,39 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + USHORT WideChar; + USHORT OemChar; + + for (i = OemSize, Size = UnicodeSize / sizeof(WCHAR); i && Size; i--, Size--) + { + WideChar = RtlUpcaseUnicodeChar(*UnicodeString++); + + if (WideChar < 0x80) + { + *OemString++ = LOBYTE(WideChar); + continue; + } + + OemChar = NlsDbcsUnicodeToOemTable[WideChar]; + + if (!HIBYTE(OemChar)) + { + *OemString++ = LOBYTE(OemChar); + continue; + } + + if (i >= 2) + { + *OemString++ = HIBYTE(OemChar); + *OemString++ = LOBYTE(OemChar); + i--; + } + else break; + } + + if (ResultSize != NULL) + *ResultSize = OemSize - i; } return STATUS_SUCCESS;

1 0

[tkreuzer] 26834: implement a basic fontview.exe. It doesn't work on ROS atm due to missing implementation of GetFontResourceInfoW(), but works on XP.
by tkreuzer＠svn.reactos.org 19 May '07

19 May '07

Author: tkreuzer Date: Sat May 19 05:33:27 2007 New Revision: 26834 URL: http://svn.reactos.org/svn/reactos?rev=26834&view=rev Log: implement a basic fontview.exe. It doesn't work on ROS atm due to missing implementation of GetFontResourceInfoW(), but works on XP. Added: trunk/rosapps/fontview/ trunk/rosapps/fontview/display.c trunk/rosapps/fontview/display.h trunk/rosapps/fontview/fontview.c trunk/rosapps/fontview/fontview.h trunk/rosapps/fontview/fontview.rbuild trunk/rosapps/fontview/fontview.rc trunk/rosapps/fontview/lang/ trunk/rosapps/fontview/lang/de-DE.rc trunk/rosapps/fontview/lang/en-US.rc trunk/rosapps/fontview/resource.h Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=26834… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sat May 19 05:33:27 2007 @@ -20,6 +20,10 @@ <directory name="downloader"> <xi:include href="downloader/downloader.rbuild" /> +</directory> + +<directory name="fontview"> + <xi:include href="fontview/fontview.rbuild" /> </directory> <directory name="gettype"> Added: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.c (added) +++ trunk/rosapps/fontview/display.c Sat May 19 05:33:27 2007 @@ -1,0 +1,344 @@ +/* + * fontview display class + * + * display.c + * + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <windows.h> +#include <stdio.h> + +#include "display.h" + +#define SPACING1 8 +#define SPACING2 5 + +const WCHAR g_szFontDisplayClassName[] = L"FontDisplayClass"; +LRESULT CALLBACK DisplayProc(HWND, UINT, WPARAM, LPARAM); + +/* Internal data storage type */ +typedef struct +{ + int nHeight; + WCHAR szTypeFaceName[MAX_TYPEFACENAME]; + WCHAR szFormat[MAX_FORMAT]; + WCHAR szString[MAX_STRING]; +} DISPLAYDATA; + +/* This is the only public function, it registers the class */ +BOOL +Display_InitClass(HINSTANCE hInstance) +{ + WNDCLASSEXW wincl; + + /* Set the fontdisplay window class structure */ + wincl.cbSize = sizeof(WNDCLASSEX); + wincl.style = CS_DBLCLKS; + wincl.lpfnWndProc = DisplayProc; + wincl.cbClsExtra = 0; + wincl.cbWndExtra = 0; + wincl.hInstance = hInstance; + wincl.hIcon = NULL; + wincl.hCursor = LoadCursor (NULL, IDC_ARROW); + wincl.hbrBackground = GetStockObject(WHITE_BRUSH); + wincl.lpszMenuName = NULL; + wincl.lpszClassName = g_szFontDisplayClassName; + wincl.hIconSm = NULL; + + /* Register the window class, and if it fails return FALSE */ + if (!RegisterClassExW (&wincl)) + { + return FALSE; + } + return TRUE; +} + +static int +Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos, BOOL bDraw) +{ + HFONT hOldFont, hFont, hFontNums; + TEXTMETRIC tm; + int i, y; + const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; + WCHAR szSize[5]; + WCHAR szCaption[MAX_TYPEFACENAME + 20]; + + /* This is the location on the DC where we draw */ + y = -nYPos; + + /* Draw font name */ + hFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + hOldFont = SelectObject(hDC, hFont); + if (bDraw) + { + swprintf(szCaption, L"%s (%s)", pData->szTypeFaceName, pData->szFormat); + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + } + GetTextMetrics(hDC, &tm); + y += tm.tmHeight + SPACING1; + SelectObject(hDC, hOldFont); + DeleteObject(hFont); + + /* Draw a seperation Line */ + if (bDraw) + { + SelectObject(hDC, GetStockObject(BLACK_PEN)); + MoveToEx(hDC, 0, y, NULL); + LineTo(hDC, 10000, y); + } + y += SPACING2; + + /* Output font info */ + hFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + hOldFont = SelectObject(hDC, hFont); + SelectObject(hDC, hOldFont); + DeleteObject(hFont); + + /* Outout the lines for different sizes */ + hFontNums = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + + for (i = 0; i < 7; i++) + { + hOldFont = SelectObject(hDC, hFontNums); + if (bDraw) + { + swprintf(szSize, L"%d", nSizes[i]); + TextOutW(hDC, 0, y, szSize, wcslen(szSize)); + } + hFont = CreateFontW(nSizes[i], 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + SelectObject(hDC, hFont); + if (bDraw) + { + TextOutW(hDC, 20, y, pData->szString, wcslen(pData->szString)); + } + GetTextMetrics(hDC, &tm); + y += tm.tmHeight + 2; + SelectObject(hDC, hOldFont); + DeleteObject(hFont); + } + DeleteObject(hFontNums); + + return y; +} + +static LRESULT +Display_OnCreate(HWND hwnd) +{ + DISPLAYDATA* pData; + + /* Initialize data structure */ + pData = malloc(sizeof(DISPLAYDATA)); + pData->nHeight = 0; + swprintf(pData->szTypeFaceName, L""); + swprintf(pData->szFormat, L""); + swprintf(pData->szString, L""); + + /* Set the window's GWLP_USERDATA to our data structure */ + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + + return 0; +} + +static LRESULT +Display_OnPaint(HWND hwnd) +{ + DISPLAYDATA* pData; + PAINTSTRUCT ps; + SCROLLINFO si; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + /* Get the Scroll position */ + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); + + BeginPaint(hwnd, &ps); + + /* fill with white */ + FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); + + /* Draw the text */ + Display_DrawText(ps.hdc, pData, si.nPos, TRUE); + + EndPaint(hwnd, &ps); + + return 0; +} + +static LRESULT +Display_OnSize(HWND hwnd) +{ + RECT rect; + SCROLLINFO si; + + GetClientRect(hwnd, &rect); + + /* Set the new page size */ + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE; + si.nPage = rect.bottom; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); +// FIXME: handle exceeding of current pos -> redraw entire window +// if new page size is < curent pos: current pos = maximum whatever and then redraw + return 0; +} + +static LRESULT +Display_OnVScroll(HWND hwnd, WPARAM wParam) +{ + SCROLLINFO si; + int nPos; + + si.cbSize = sizeof(si); + si.fMask = SIF_POS | SIF_RANGE | SIF_TRACKPOS; + GetScrollInfo(hwnd, SB_VERT, &si); + + switch(LOWORD(wParam)) + { + case SB_PAGEUP: + nPos = si.nPos - 50; + break; + case SB_PAGEDOWN: + nPos = si.nPos + 50; + break; + case SB_LINEUP: + nPos = si.nPos - 10; + break; + case SB_LINEDOWN: + nPos = si.nPos + 10; + break; +// case SB_THUMBTRACK: + case SB_THUMBPOSITION: + nPos = si.nTrackPos; + break; + default: + nPos = si.nPos; + } + + nPos = max(nPos, si.nMin); + nPos = min(nPos, si.nMax); + if (nPos != si.nPos) + { + ScrollWindowEx(hwnd, 0, -(nPos - si.nPos), NULL, NULL, NULL, NULL, SW_INVALIDATE); + si.cbSize = sizeof(si); + si.nPos = nPos; + si.fMask = SIF_POS; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + UpdateWindow(hwnd); + } + return 0; +} + +static LRESULT +Display_SetTypeFace(HWND hwnd, LPARAM lParam) +{ + DISPLAYDATA* pData; + HDC hDC; + RECT rect; + SCROLLINFO si; + + /* Set the new type face name */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); + + /* Calculate new page dimensions */ + hDC = GetDC(hwnd); + pData->nHeight = Display_DrawText(hDC, pData, 0, FALSE); + ReleaseDC(hwnd, hDC); + + /* Set the vertical scrolling range and page size */ + GetClientRect(hwnd, &rect); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; + si.nMin = 0; + si.nMax = pData->nHeight; + si.nPage = rect.bottom; + si.nPos = 0; + si.nTrackPos = 0; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + + return 0; +} + +static LRESULT +Display_SetString(HWND hwnd, LPARAM lParam) +{ + DISPLAYDATA* pData; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam); + + // FIXME: redraw the window + + return 0; +} + +static LRESULT +Display_OnDestroy(HWND hwnd) +{ + DISPLAYDATA* pData; + + /* Free the data structure */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + free(pData); + + return 0; +} + +LRESULT CALLBACK +DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_CREATE: + return Display_OnCreate(hwnd); + + case WM_PAINT: + return Display_OnPaint(hwnd); + + case WM_SIZE: + return Display_OnSize(hwnd); + + case WM_VSCROLL: + return Display_OnVScroll(hwnd, wParam); + + case FVM_SETTYPEFACE: + return Display_SetTypeFace(hwnd, lParam); + + case FVM_SETSTRING: + return Display_SetString(hwnd, lParam); + + case WM_DESTROY: + return Display_OnDestroy(hwnd); + + default: + return DefWindowProc (hwnd, message, wParam, lParam); + } + + return 0; +} + Added: trunk/rosapps/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.h?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.h (added) +++ trunk/rosapps/fontview/display.h Sat May 19 05:33:27 2007 @@ -1,0 +1,18 @@ +#ifndef _DISPLAY_H +#define _DISPLAY_H + +/* Messages for the display class */ +#define FVM_SETTYPEFACE WM_USER +#define FVM_SETSTRING (WM_USER + 1) + +/* Size restrictions */ +#define MAX_STRING 100 +#define MAX_TYPEFACENAME 32 +#define MAX_FORMAT 20 + +extern const WCHAR g_szFontDisplayClassName[]; + +/* Public function */ +BOOL Display_InitClass(HINSTANCE hInstance); + +#endif // _DISPLAY_H Added: trunk/rosapps/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.c?rev=26… ============================================================================== --- trunk/rosapps/fontview/fontview.c (added) +++ trunk/rosapps/fontview/fontview.c Sat May 19 05:33:27 2007 @@ -1,0 +1,316 @@ +/* + * fontview + * + * fontview.c + * + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "fontview.h" + +HINSTANCE g_hInstance; +WCHAR g_szTitle[MAX_LOADSTRING]; +WCHAR g_szTypeFaceName[MAX_TYPEFACENAME]; +static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; + +/* Tye definition for the GetFontResourceInfo function */ +typedef BOOL (WINAPI *PGFRI)(LPCWSTR, DWORD *, LPWSTR, DWORD); + +DWORD +FormatString( + DWORD dwFlags, + HINSTANCE hInstance, + DWORD dwStringId, + DWORD dwLanguageId, + LPWSTR lpBuffer, + DWORD nSize, + va_list* Arguments +) +{ + DWORD dwRet; + int len; + WCHAR Buffer[1000]; + + len = LoadStringW(hInstance, dwStringId, (LPWSTR)Buffer, 1000); + + if (len) + { + dwFlags |= FORMAT_MESSAGE_FROM_STRING; + dwFlags &= ~(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM); + dwRet = FormatMessageW(dwFlags, Buffer, 0, dwLanguageId, lpBuffer, nSize, Arguments); + return dwRet; + } + return 0; +} + +static void +ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...) +{ + HMODULE hModule; + HLOCAL hMemCaption = NULL; + HLOCAL hMemText = NULL; + va_list args; + + hModule = GetModuleHandle(NULL); + + va_start(args, dwMessageId); + FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, dwMessageId, 0, (LPWSTR)&hMemText, 0, &args); + va_end(args); + + FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, dwCaptionID, 0, (LPWSTR)&hMemCaption, 0, NULL); + + MessageBoxW(hParent, hMemText, hMemCaption, MB_ICONERROR); + + LocalFree(hMemCaption); + LocalFree(hMemText); +} + +int WINAPI +WinMain (HINSTANCE hThisInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + int argc; + WCHAR** argv; + DWORD dwSize; + HWND hMainWnd; + MSG msg; + WNDCLASSEXW wincl; + + g_hInstance = hThisInstance; + + /* Get unicode command line */ + argv = CommandLineToArgvW(GetCommandLineW(), &argc); + if (argc < 2) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_BADCMD, argv[1]); + return -1; + } + + /* Try to add the font resource */ + if (!AddFontResourceW(argv[1])) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + return -1; + } + + /* Load the GetFontResourceInfo function from gdi32.dll */ + HINSTANCE hDLL = LoadLibraryW(L"GDI32.DLL"); + PGFRI GetFontResourceInfoW = (PGFRI)GetProcAddress(hDLL, "GetFontResourceInfoW"); + + /* Get the font name */ + dwSize = sizeof(g_szTypeFaceName); + if (!GetFontResourceInfoW(argv[1], &dwSize, g_szTypeFaceName, 1)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + return -1; + } + + if (!Display_InitClass(hThisInstance)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOCLASS); + return -1; + } + + /* The main window class */ + wincl.cbSize = sizeof (WNDCLASSEX); + wincl.style = CS_DBLCLKS; + wincl.lpfnWndProc = MainWndProc; + wincl.cbClsExtra = 0; + wincl.cbWndExtra = 0; + wincl.hInstance = hThisInstance; + wincl.hIcon = LoadIcon (NULL, IDI_APPLICATION); + wincl.hCursor = LoadCursor (NULL, IDC_ARROW); + wincl.hbrBackground = (HBRUSH)COLOR_BACKGROUND; + wincl.lpszMenuName = NULL; + wincl.lpszClassName = g_szFontViewClassName; + wincl.hIconSm = LoadIcon (NULL, IDI_APPLICATION); + + /* Register the window class, and if it fails quit the program */ + if (!RegisterClassExW (&wincl)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOCLASS); + return 0; + } + + /* The class is registered, let's create the main window */ + hMainWnd = CreateWindowExW( + 0, /* Extended possibilites for variation */ + g_szFontViewClassName, /* Classname */ + g_szTitle, /* Title Text */ + WS_OVERLAPPEDWINDOW, /* default window */ + CW_USEDEFAULT, /* Windows decides the position */ + CW_USEDEFAULT, /* where the window ends up on the screen */ + 544, /* The programs width */ + 375, /* and height in pixels */ + HWND_DESKTOP, /* The window is a child-window to desktop */ + NULL, /* No menu */ + hThisInstance, /* Program Instance handler */ + NULL /* No Window Creation data */ + ); + ShowWindow (hMainWnd, nCmdShow); + + /* Main message loop */ + while (GetMessage (&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + RemoveFontResourceW(argv[1]); + + return msg.wParam; +} + +static LRESULT +MainWnd_OnCreate(HWND hwnd) +{ + WCHAR szQuit[MAX_BUTTONNAME]; + WCHAR szPrint[MAX_BUTTONNAME]; + WCHAR szString[MAX_STRING]; + HWND hDisplay, hButtonQuit, hButtonPrint; + + /* create the display window */ + hDisplay = CreateWindowExW( + 0, /* Extended style */ + g_szFontDisplayClassName, /* Classname */ + L"", /* Title text */ + WS_CHILD | WS_VSCROLL| WS_VISIBLE, /* Window style */ + 0, /* X-pos */ + HEADER_SIZE, /* Y-Pos */ + 550, /* Width */ + 370-HEADER_SIZE, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_DISPLAY, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + + /* Init the display window wit the font name */ + LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING); + + SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); + SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)g_szTypeFaceName); + /* Create the quit button */ + LoadStringW(g_hInstance, IDS_QUIT, szQuit, MAX_BUTTONNAME); + hButtonQuit = CreateWindowExW( + 0, /* Extended style */ + L"button", /* Classname */ + szQuit, /* Title text */ + WS_CHILD | WS_VISIBLE, /* Window style */ + BUTTON_POS_X, /* X-pos */ + BUTTON_POS_Y, /* Y-Pos */ + BUTTON_WIDTH, /* Width */ + BUTTON_HEIGHT, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_QUIT, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + SendMessage(hButtonQuit, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + + /* Create the print button */ + LoadStringW(g_hInstance, IDS_PRINT, szPrint, MAX_BUTTONNAME); + hButtonPrint = CreateWindowExW( + 0, /* Extended style */ + L"button", /* Classname */ + szPrint, /* Title text */ + WS_CHILD | WS_VISIBLE, /* Window style */ + 450, /* X-pos */ + BUTTON_POS_Y, /* Y-Pos */ + BUTTON_WIDTH, /* Width */ + BUTTON_HEIGHT, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_PRINT, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + SendMessage(hButtonPrint, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + + return 0; +} + +static LRESULT +MainWnd_OnSize(HWND hwnd) +{ + RECT rc; + + GetClientRect(hwnd, &rc); + MoveWindow(GetDlgItem(hwnd, IDC_PRINT), rc.right - BUTTON_WIDTH - BUTTON_POS_X, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, TRUE); + MoveWindow(GetDlgItem(hwnd, IDC_DISPLAY), 0, HEADER_SIZE, rc.right, rc.bottom - HEADER_SIZE, TRUE); + + return 0; +} + +static LRESULT +MainWnd_OnPaint(HWND hwnd) +{ + HDC hDC; + PAINTSTRUCT ps; + RECT rc; + + hDC = BeginPaint(hwnd, &ps); + GetClientRect(hwnd, &rc); + rc.top = HEADER_SIZE - 2; + rc.bottom = HEADER_SIZE; + FillRect(hDC, &rc, GetStockObject(GRAY_BRUSH)); + EndPaint(hwnd, &ps); + return 0; +} + +LRESULT CALLBACK +MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_CREATE: + return MainWnd_OnCreate(hwnd); + + case WM_PAINT: + return MainWnd_OnPaint(hwnd); + + case WM_SIZE: + return MainWnd_OnSize(hwnd); + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_QUIT: + PostQuitMessage (0); /* send a WM_QUIT to the message queue */ + break; + + case IDC_PRINT: + MessageBox(hwnd, TEXT("This function is unimplemented"), TEXT("Unimplemented"), MB_OK); + break; + } + break; + + case WM_DESTROY: + PostQuitMessage (0); /* send a WM_QUIT to the message queue */ + break; + + default: /* for messages that we don't deal with */ + return DefWindowProc (hwnd, message, wParam, lParam); + } + + return 0; +} + +/* EOF */ Added: trunk/rosapps/fontview/fontview.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.h?rev=26… ============================================================================== --- trunk/rosapps/fontview/fontview.h (added) +++ trunk/rosapps/fontview/fontview.h Sat May 19 05:33:27 2007 @@ -1,0 +1,21 @@ +#include <windows.h> + +#include "resource.h" +#include "display.h" + +#define MAX_LOADSTRING 50 +#define MAX_BUTTONNAME 30 + +#define HEADER_SIZE 37 +#define BUTTON_POS_X 6 +#define BUTTON_POS_Y 8 +#define BUTTON_WIDTH 72 +#define BUTTON_HEIGHT 21 + +#define IDC_QUIT 1001 +#define IDC_PRINT 1002 +#define IDC_DISPLAY 1003 + +LRESULT CALLBACK MainWndProc(HWND, UINT, WPARAM, LPARAM); + +BOOL LoadFont(LPWSTR lpCmdLine); Added: trunk/rosapps/fontview/fontview.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rbuild?r… ============================================================================== --- trunk/rosapps/fontview/fontview.rbuild (added) +++ trunk/rosapps/fontview/fontview.rbuild Sat May 19 05:33:27 2007 @@ -1,0 +1,11 @@ +<module name="fontview" type="win32gui" installbase="system32" installname="fontview.exe"> + <include base="fontview">.</include> + <define name="__USE_W32API" /> + <library>gdi32</library> + <library>user32</library> + <library>shell32</library> + <library>kernel32</library> + <file>fontview.c</file> + <file>display.c</file> + <file>fontview.rc</file> +</module> Added: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=2… ============================================================================== --- trunk/rosapps/fontview/fontview.rc (added) +++ trunk/rosapps/fontview/fontview.rc Sat May 19 05:33:27 2007 @@ -1,0 +1,10 @@ + + +#include "lang/de-DE.rc" + +STRINGTABLE DISCARDABLE +{ + IDS_CHARSLOWER, "abcdefghijklmnopqrstuvmxyz" + IDS_CHARSUPPER, "ABCDEFGHIJKLMNOPQRSTUVMXYZ" + IDS_SPECIALCHARS, "0123456789.:,;(*!?')" +} Added: trunk/rosapps/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/de-DE.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/de-DE.rc (added) +++ trunk/rosapps/fontview/lang/de-DE.rc Sat May 19 05:33:27 2007 @@ -1,0 +1,18 @@ + +#include "windows.h" +#include "../resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +STRINGTABLE DISCARDABLE +{ + IDS_QUIT, "Fertig" + IDS_PRINT, "Drucken" + IDS_STRING, "Franz jagt im komplett verwahrlosten Taxi quer durch Bayern. 1234567890" + IDS_ERROR, "Fehler" + IDS_ERROR_NOMEM, "Es steht nicht genügend Speicher zur Verfügung." + IDS_ERROR_NOFONT, "Die angegebene Datei %1 ist keine gültige Schriftartendatei." + IDS_ERROR_NOCLASS, "Fehler beim initialisieren der Fensterklasse." + IDS_ERROR_BADCMD, "Keine Schriftartendatei angegeben.\nSyntax:\n fontview.exe <Schriftdatei>" +} + Added: trunk/rosapps/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/en-US.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/en-US.rc (added) +++ trunk/rosapps/fontview/lang/en-US.rc Sat May 19 05:33:27 2007 @@ -1,0 +1,18 @@ + +#include "windows.h" +#include "../resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +STRINGTABLE DISCARDABLE +{ + IDS_QUIT, "Quit" + IDS_PRINT, "Print" + IDS_STRING, "Jackdaws love my big sphinx of quartz. 123456890" + IDS_ERROR, "Error" + IDS_ERROR_NOMEM, "There's not enough memory to complete the operation." + IDS_ERROR_NOFONT, "The file %1 ist not a valid font file." + IDS_ERROR_NOCLASS, "Could not initialize window class." + IDS_ERROR_BADCMD, "No font file given.\nSyntax:\n fontview.exe <font file>" +} + Added: trunk/rosapps/fontview/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/resource.h?rev=26… ============================================================================== --- trunk/rosapps/fontview/resource.h (added) +++ trunk/rosapps/fontview/resource.h Sat May 19 05:33:27 2007 @@ -1,0 +1,15 @@ + +#define IDS_ERROR 100 +#define IDS_ERROR_NOMEM 101 +#define IDS_ERROR_NOFONT 102 +#define IDS_ERROR_NOCLASS 103 +#define IDS_ERROR_BADCMD 104 + +#define IDS_QUIT 500 +#define IDS_PRINT 501 +#define IDS_STRING 502 + +#define IDS_CHARSLOWER 700 +#define IDS_CHARSUPPER 701 +#define IDS_SPECIALCHARS 702 +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs