Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[spetreolle] 51801: Add cmake configure script for unix.
by spetreolle＠svn.reactos.org 16 May '11

16 May '11

Author: spetreolle Date: Mon May 16 21:26:08 2011 New Revision: 51801 URL: http://svn.reactos.org/svn/reactos?rev=51801&view=rev Log: Add cmake configure script for unix. Added: trunk/reactos/configure.sh (with props) Modified: trunk/reactos/configure.cmd (props changed) Propchange: trunk/reactos/configure.cmd ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=51801&vie… ============================================================================== --- trunk/reactos/configure.sh (added) +++ trunk/reactos/configure.sh [iso-8859-1] Mon May 16 21:26:08 2011 @@ -1,0 +1,38 @@ +#!/bin/bash +if [ "x$ROS_ARCH" == "x" ] +then + echo Could not detect RosBE. + exit 1 +fi + +BUILD_ENVIRONMENT=MinGW +ARCH=$ROS_ARCH +REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) +REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH + +echo ARCH $ARCH ROS $ROS_ARCH +if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] +then + echo Creating directories in $REACTOS_OUTPUT_PATH + mkdir -p $REACTOS_OUTPUT_PATH + cd "$REACTOS_OUTPUT_PATH" +fi + +mkdir -p host-tools +mkdir -p reactos + +echo Preparing host tools... +cd host-tools +if [ -f CMakeCache.txt ] +then + rm -f CMakeCache.txt +fi + +REACTOS_BUILD_TOOLS_DIR="$PWD" +cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" + +cd ../reactos +cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" + +echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...). + Propchange: trunk/reactos/configure.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/configure.sh ------------------------------------------------------------------------------ svn:executable = *

1 0

[mkupfer] 51800: restart German translation - please don't delete existing work in future
by mkupfer＠svn.reactos.org 16 May '11

16 May '11

Author: mkupfer Date: Mon May 16 19:13:15 2011 New Revision: 51800 URL: http://svn.reactos.org/svn/reactos?rev=51800&view=rev Log: restart German translation - please don't delete existing work in future Modified: trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5180… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 51799: [CMAKE] * Add the missing temporary import libs.
by akhaldi＠svn.reactos.org 16 May '11

16 May '11

Author: akhaldi Date: Mon May 16 18:53:45 2011 New Revision: 51799 URL: http://svn.reactos.org/svn/reactos?rev=51799&view=rev Log: [CMAKE] * Add the missing temporary import libs. Added: trunk/reactos/importlibs/libcoldname.a (with props) trunk/reactos/importlibs/libgcc.a (with props) trunk/reactos/importlibs/libmingw32.a (with props) trunk/reactos/importlibs/libmingwex.a (with props) trunk/reactos/importlibs/libsupc++.a (with props) Added: trunk/reactos/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libcoldname.a?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libcoldname.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/importlibs/libgcc.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libgcc.a?rev=51… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libgcc.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/importlibs/libmingw32.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libmingw32.a?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libmingw32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/importlibs/libmingwex.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libmingwex.a?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libmingwex.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/importlibs/libsupc++.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libsupc%2B%2B.a… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libsupc++.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tkreuzer] 51798: [GDI FONT DRIVER] - Implement copying 1bpp bitmaps - The driver now "works" as a replacement for the original true type driver in Windows, several glitches need to be fixed
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 18:13:29 2011 New Revision: 51798 URL: http://svn.reactos.org/svn/reactos?rev=51798&view=rev Log: [GDI FONT DRIVER] - Implement copying 1bpp bitmaps - The driver now "works" as a replacement for the original true type driver in Windows, several glitches need to be fixed Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Mon May 16 18:13:29 2011 @@ -434,7 +434,25 @@ BYTE *pjDest, FT_Bitmap *ftbitmap) { - __debugbreak(); + ULONG ulRows, ulDstDelta, ulSrcDelta; + PBYTE pjDstLine, pjSrcLine; + + pjDstLine = pjDest; + ulDstDelta = (ftbitmap->width + 7) / 8; + + pjSrcLine = ftbitmap->buffer; + ulSrcDelta = abs(ftbitmap->pitch); + + ulRows = ftbitmap->rows; + while (ulRows--) + { + /* Copy one line */ + memcpy(pjDstLine, pjSrcLine, ulDstDelta); + + /* Next ros */ + pjDstLine += ulDstDelta; + pjSrcLine += ulSrcDelta; + } } static

1 0

[pschweitzer] 51797: [NTOSKRNL] - Fix the fix for IopStoreSystemPartitionInformation(). The sizeof wasn't on an unicode string... I blame the guy who first wrote that function! Thanks to "rs" on IR...
by pschweitzer＠svn.reactos.org 16 May '11

16 May '11

Author: pschweitzer Date: Mon May 16 18:06:14 2011 New Revision: 51797 URL: http://svn.reactos.org/svn/reactos?rev=51797&view=rev Log: [NTOSKRNL] - Fix the fix for IopStoreSystemPartitionInformation(). The sizeof wasn't on an unicode string... I blame the guy who first wrote that function! Thanks to "rs" on IRC for having spotted the error. Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Mon May 16 18:06:14 2011 @@ -701,7 +701,7 @@ UNICODE_STRING LinkTarget, KeyName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE LinkHandle, RegistryHandle, KeyHandle; - WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof("SystemPartition") / sizeof(WCHAR)]; + WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof(L"SystemPartition") / sizeof(WCHAR)]; UNICODE_STRING CmRegistryMachineSystemName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM"); ASSERT(NtSystemPartitionDeviceName->MaximumLength >= NtSystemPartitionDeviceName->Length + sizeof(WCHAR));

1 0

[pschweitzer] 51796: [NTOSKRNL] - Implemented IoSetSystemPartition(). This is required by MountMgr. - Fixed buffer size in IopStoreSystemPartitionInformation(). No need to have a buffer twice bigge...
by pschweitzer＠svn.reactos.org 16 May '11

16 May '11

Author: pschweitzer Date: Mon May 16 17:52:03 2011 New Revision: 51796 URL: http://svn.reactos.org/svn/reactos?rev=51796&view=rev Log: [NTOSKRNL] - Implemented IoSetSystemPartition(). This is required by MountMgr. - Fixed buffer size in IopStoreSystemPartitionInformation(). No need to have a buffer twice bigger than maximum use. Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Mon May 16 17:52:03 2011 @@ -701,7 +701,7 @@ UNICODE_STRING LinkTarget, KeyName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE LinkHandle, RegistryHandle, KeyHandle; - WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof("SystemPartition")]; + WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof("SystemPartition") / sizeof(WCHAR)]; UNICODE_STRING CmRegistryMachineSystemName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM"); ASSERT(NtSystemPartitionDeviceName->MaximumLength >= NtSystemPartitionDeviceName->Length + sizeof(WCHAR)); Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Mon May 16 17:52:03 2011 @@ -937,14 +937,56 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI IoSetSystemPartition(IN PUNICODE_STRING VolumeNameString) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + HANDLE RootHandle, KeyHandle; + UNICODE_STRING HKLMSystem, KeyString; + WCHAR Buffer[sizeof(L"SystemPartition") / sizeof(WCHAR)]; + + RtlInitUnicodeString(&HKLMSystem, L"\\REGISTRY\\MACHINE\\SYSTEM"); + + /* Open registry to save data (HKLM\SYSTEM) */ + Status = IopOpenRegistryKeyEx(&RootHandle, 0, &HKLMSystem, KEY_ALL_ACCESS); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Create or open Setup subkey */ + KeyString.Buffer = Buffer; + KeyString.Length = sizeof(L"Setup") - sizeof(UNICODE_NULL); + KeyString.MaximumLength = sizeof(L"Setup"); + RtlCopyMemory(Buffer, L"Setup", sizeof(L"Setup")); + Status = IopCreateRegistryKeyEx(&KeyHandle, + RootHandle, + &KeyString, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + NULL); + ZwClose(RootHandle); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Store caller value */ + KeyString.Length = sizeof(L"SystemPartition") - sizeof(UNICODE_NULL); + KeyString.MaximumLength = sizeof(L"SystemPartition"); + RtlCopyMemory(Buffer, L"SystemPartition", sizeof(L"SystemPartition")); + Status = ZwSetValueKey(KeyHandle, + &KeyString, + 0, + REG_SZ, + VolumeNameString->Buffer, + VolumeNameString->Length + sizeof(UNICODE_NULL)); + ZwClose(KeyHandle); + + return Status; } /*

1 0

[gschneider] 51795: [charmap] Carlo Bramini (carlo dot bramix at libero dot it): - Fix font zoom when scrolling and changing fonts - Optimize font zoom drawing See issue #3500 for more details.
by gschneider＠svn.reactos.org 16 May '11

16 May '11

Author: gschneider Date: Mon May 16 17:46:49 2011 New Revision: 51795 URL: http://svn.reactos.org/svn/reactos?rev=51795&view=rev Log: [charmap] Carlo Bramini (carlo dot bramix at libero dot it): - Fix font zoom when scrolling and changing fonts - Optimize font zoom drawing See issue #3500 for more details. Modified: trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Mon May 16 17:46:49 2011 @@ -61,53 +61,76 @@ static VOID DrawGrid(PMAP infoPtr, - HDC hdc) + PAINTSTRUCT *ps) { INT x, y; + RECT rc; + PCELL Cell; for (y = 0; y < YCELLS; y++) for (x = 0; x < XCELLS; x++) { - Rectangle(hdc, - infoPtr->Cells[y][x].CellExt.left, - infoPtr->Cells[y][x].CellExt.top, - infoPtr->Cells[y][x].CellExt.right, - infoPtr->Cells[y][x].CellExt.bottom); - } - - if (infoPtr->pActiveCell) - DrawActiveCell(infoPtr, - hdc); + Cell = &infoPtr->Cells[y][x]; + + if (!IntersectRect(&rc, + &ps->rcPaint, + &Cell->CellExt)) + { + continue; + } + + Rectangle(ps->hdc, + Cell->CellExt.left, + Cell->CellExt.top, + Cell->CellExt.right, + Cell->CellExt.bottom); + + if (infoPtr->pActiveCell == Cell) + { + DrawActiveCell(infoPtr, ps->hdc); + } + } } static VOID FillGrid(PMAP infoPtr, - HDC hdc) + PAINTSTRUCT *ps) { HFONT hOldFont; WCHAR ch; INT x, y; - - hOldFont = SelectObject(hdc, + RECT rc; + PCELL Cell; + + hOldFont = SelectObject(ps->hdc, infoPtr->hFont); for (y = 0; y < YCELLS; y++) for (x = 0; x < XCELLS; x++) { + Cell = &infoPtr->Cells[y][x]; + + if (!IntersectRect(&rc, + &ps->rcPaint, + &Cell->CellExt)) + { + continue; + } + ch = (WCHAR)((XCELLS * (y + infoPtr->iYStart)) + x); - TagFontToCell(&infoPtr->Cells[y][x], ch); - - DrawTextW(hdc, + TagFontToCell(Cell, ch); + + DrawTextW(ps->hdc, &ch, 1, - &infoPtr->Cells[y][x].CellInt, + &Cell->CellInt, DT_CENTER | DT_VCENTER | DT_SINGLELINE); } - SelectObject(hdc, + SelectObject(ps->hdc, hOldFont); } @@ -187,6 +210,10 @@ { HDC hdc; + /* Destroy Zoom window, since it was created with older font */ + DestroyWindow(infoPtr->hLrgWnd); + infoPtr->hLrgWnd = NULL; + if (infoPtr->hFont) DeleteObject(infoPtr->hFont); @@ -207,6 +234,13 @@ InvalidateRect(infoPtr->hMapWnd, NULL, TRUE); + + /* Test if zoom window must be reopened */ + if (infoPtr->pActiveCell != NULL && + infoPtr->pActiveCell->bLarge) + { + CreateLargeCell(infoPtr); + } } @@ -391,6 +425,11 @@ iYDiff = iOldYStart - infoPtr->iYStart; if (iYDiff) { + if (infoPtr->hLrgWnd != NULL) + { + ShowWindow(infoPtr->hLrgWnd, SW_HIDE); + } + SetScrollPos(infoPtr->hMapWnd, SB_VERT, infoPtr->iYStart, @@ -417,6 +456,11 @@ NULL, TRUE); } + + if (infoPtr->hLrgWnd != NULL) + { + ShowWindow(infoPtr->hLrgWnd, SW_SHOW); + } } } @@ -450,11 +494,9 @@ } } - DrawGrid(infoPtr, - hdc); - - FillGrid(infoPtr, - hdc); + DrawGrid(infoPtr, &ps); + + FillGrid(infoPtr, &ps); if (wParam == 0) {

1 0

[tkreuzer] 51794: [GDI FONT DRIVER] - Get font revision and lowest ppem from 'head' true type table - use font revision to create the unique name
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 17:40:41 2011 New Revision: 51794 URL: http://svn.reactos.org/svn/reactos?rev=51794&view=rev Log: [GDI FONT DRIVER] - Get font revision and lowest ppem from 'head' true type table - use font revision to create the unique name Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Mon May 16 17:40:41 2011 @@ -51,6 +51,7 @@ } } + /* Return the average glyph width */ return (FWORD)(ulAccumCharWidth / cGlyphs); } @@ -85,7 +86,7 @@ pifi->dpCharSets = FIELD_OFFSET(FTFD_IFIMETRICS, ajCharSet); pifi->dpFontSim = 0; - /* Charsets */ + /* Initialize charsets */ pifi->jWinCharSet = ANSI_CHARSET; pifiex->ajCharSet[0] = pifi->jWinCharSet; for (i = 1; i < 16; i++) @@ -118,7 +119,7 @@ /* Font resolution */ pifi->fwdUnitsPerEm = ftface->units_per_EM; - pifi->fwdLowestPPEm = 3; // FIXME + pifi->fwdLowestPPEm = 3; /* Font metrics */ pifi->fwdMacAscender = ftface->ascender; @@ -242,15 +243,13 @@ strnlen(ftface->family_name, MAX_PATH)); /* Create a unique name */ - wcscpy(pifiex->awcUniqueName, L"1.000;ABCD;"); + wcscpy(pifiex->awcUniqueName, L"1.000;????;"); wcsncat(pifiex->awcUniqueName, pifiex->awcFamilyName, LF_FACESIZE); - pifiex->awcUniqueName[0] = L'1'; // + version? - pifiex->awcUniqueName[2] = L'0'; // + version? - EngMultiByteToUnicodeN(pifiex->awcUniqueName + 6, - 4, - NULL, - pifi->achVendId, - 4); + pifiex->awcUniqueName[0] = L'0' + HIWORD(pface->ulFontRevision) % 10; + pifiex->awcUniqueName[2] = L'0' + (LOWORD(pface->ulFontRevision) / 100) % 10; + pifiex->awcUniqueName[3] = L'0' + (LOWORD(pface->ulFontRevision) / 10) % 10; + pifiex->awcUniqueName[4] = L'0' + LOWORD(pface->ulFontRevision) % 10; + EngMultiByteToUnicodeN(pifiex->awcUniqueName+6, 4, NULL, pifi->achVendId, 4); //__debugbreak(); return TRUE; @@ -279,7 +278,6 @@ WARN("EngAllocMem() failed.\n"); return NULL; } - /* Calculate FD_GLYPHSET size (incl. HGLYPH array!) */ cjSize = FIELD_OFFSET(FD_GLYPHSET, awcrun) @@ -437,6 +435,7 @@ wcCurrent = (WCHAR)FT_Get_Next_Char(ftface, wcCurrent, &index); } + /* Save the last character */ pface->ifiex.ifi.wcLastChar = wcPrev; /* Initialize IFIMETRICS */ Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Mon May 16 17:40:41 2011 @@ -93,6 +93,7 @@ ULONG cGlyphs; ULONG cMappings; ULONG cRuns; + ULONG ulFontRevision; PWCHAR pwcReverseTable; FD_GLYPHSET *pGlyphSet; FD_KERNINGPAIR *pKerningPairs; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Mon May 16 17:40:41 2011 @@ -263,10 +263,8 @@ { PFTFD_FONT pfont = pfo->pvProducer; - if (!pfont) - { - pfont = FtfdCreateFontInstance(pfo); - } + /* Create a font instance if neccessary */ + if (!pfont) pfont = FtfdCreateFontInstance(pfo); /* Return the font instance */ return pfont; @@ -302,7 +300,7 @@ /* Accelerator flags (ignored atm) */ pfddm->flRealizedType = 0; - /* Fixed width advance */ + /* Set fixed width advance */ if (FT_IS_FIXED_WIDTH(ftface)) pfddm->lD = ftface->max_advance_width; else @@ -362,7 +360,7 @@ /* Check if the glyph needs to be updated */ if (pfont->hgSelected != hg) { - /* Load the glypg into the freetype face slot */ + /* Load the glyph into the freetype face slot */ fterror = FT_Load_Glyph(pfont->ftface, hg, 0); if (fterror) { @@ -406,7 +404,7 @@ } /* D is the glyph advance width */ - pgd->fxD = ftglyph->advance.x / 4; // should be projected on the x-axis + pgd->fxD = ftglyph->advance.x / 4; // FIXME: should be projected on the x-axis /* This is the box in which the bitmap fits */ pgd->rclInk.left = ftglyph->bitmap_left; @@ -418,7 +416,7 @@ pgd->fxInkBottom = (-pgd->rclInk.bottom) << 4; pgd->fxInkTop = pgd->rclInk.top << 4; - /* Make the bitmap at least 1x1 pixel */ + /* Make the bitmap at least 1x1 pixel large */ if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; @@ -668,7 +666,7 @@ FT_Error fterror; FT_Fixed advance; - TRACE("FtfdQueryAdvanceWidths\n"); + //TRACE("FtfdQueryAdvanceWidths\n"); // FIXME: layout horizontal/vertical fl = (iMode == QAW_GETEASYWIDTHS) ? FT_ADVANCE_FLAG_FAST_ONLY : 0; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Mon May 16 17:40:41 2011 @@ -312,13 +312,26 @@ { PFTFD_FILE pfile = pface->pfile; PVOID pvView = pfile->pvView; - PTT_OS2_DATA pOs2; + PTT_TABLE_OS2 pOs2; + PTT_TABLE_HEAD pHead; + + /* Get the head table for the face */ + pHead = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, 'daeh', NULL); + if (!pHead) + { + WARN("Couldn't find 'head' table\n"); + return FALSE; + } + + /* Get lowest PPEm */ + pifi->fwdLowestPPEm = GETW(&pHead->lowestRecPPEM); + pface->ulFontRevision = GETD(&pHead->fontRevision); /* Get the OS/2 table for the face */ pOs2 = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, '2/SO', NULL); if (!pOs2) { - WARN("Couldn't find OS/2 table\n"); + WARN("Couldn't find 'OS/2' table\n"); return FALSE; } Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] Mon May 16 17:40:41 2011 @@ -66,7 +66,7 @@ SHORT glyphDataFormat; } TT_TABLE_HEAD, *PTT_TABLE_HEAD; -typedef struct _TT_OS2_DATA +typedef struct _TT_TABLE_OS2 { USHORT version; // // 0x00 SHORT xAvgCharWidth; @@ -113,7 +113,7 @@ USHORT usDefaultChar; USHORT usBreakChar; USHORT usMaxContext; -} TT_OS2_DATA, *PTT_OS2_DATA; +} TT_TABLE_OS2, *PTT_TABLE_OS2; typedef struct _TT_KERNPAIR {

1 0

[gschneider] 51793: [bootvid] Adam Kachwalla: use the BOOTCHAR_HEIGHT macro for defining the font height See issue #6259 for more details.
by gschneider＠svn.reactos.org 16 May '11

16 May '11

Author: gschneider Date: Mon May 16 17:29:27 2011 New Revision: 51793 URL: http://svn.reactos.org/svn/reactos?rev=51793&view=rev Log: [bootvid] Adam Kachwalla: use the BOOTCHAR_HEIGHT macro for defining the font height See issue #6259 for more details. Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Mon May 16 17:29:27 2011 @@ -739,7 +739,7 @@ NTAPI VidDisplayString(PUCHAR String) { - ULONG TopDelta = 14; + ULONG TopDelta = BOOTCHAR_HEIGHT + 1; /* Start looping the string */ while (*String)

1 0

[akhaldi] 51792: [CMAKE] * Fix the typo, fix the build.
by akhaldi＠svn.reactos.org 16 May '11

16 May '11

Author: akhaldi Date: Mon May 16 16:32:34 2011 New Revision: 51792 URL: http://svn.reactos.org/svn/reactos?rev=51792&view=rev Log: [CMAKE] * Fix the typo, fix the build. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=51792&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Mon May 16 16:32:34 2011 @@ -37,7 +37,7 @@ include(config-arm.cmake) endif() -add_definitions(-D__REACTOS__ __ROS_CMAKE__) +add_definitions(-D__REACTOS__ -D__ROS_CMAKE__) if(NOT CMAKE_CROSSCOMPILING)

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
52
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 May 2011