Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 37084: - Fix a memory leak (CID 625)
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 03:35:15 2008 New Revision: 37084 URL: http://svn.reactos.org/svn/reactos?rev=37084&view=rev Log: - Fix a memory leak (CID 625) Modified: trunk/reactos/base/applications/network/finger/finger.c Modified: trunk/reactos/base/applications/network/finger/finger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/finger/finger.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/finger/finger.c [iso-8859-1] Thu Oct 30 03:35:15 2008 @@ -122,7 +122,7 @@ static void userlist(int argc, char **argv) { - int *used; + int *used = NULL; char **ap, **nargv, **np, **p; WORD wVersionRequested; WSADATA wsaData; @@ -166,6 +166,8 @@ /* Bring down winsock */ WSACleanup(); + free(nargv); + free(used); exit(0); }

1 0

[janderwald] 37083: - Fix memory leak (CID 621)
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 03:28:50 2008 New Revision: 37083 URL: http://svn.reactos.org/svn/reactos?rev=37083&view=rev Log: - Fix memory leak (CID 621) Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Thu Oct 30 03:28:50 2008 @@ -296,6 +296,10 @@ // Allocate space for parameters szArguments = (LPTSTR*)malloc(sizeof(LPVOID)* pevlr->NumStrings); + if (!szArguments) + { + return FALSE; + } for (i = 0; i < pevlr->NumStrings ; i++) { @@ -371,6 +375,8 @@ LoadString(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); wsprintf (EventText, szStringIDNotFound , (DWORD)(pevlr->EventID & 0xFFFF) , SourceName ); } + + free(szArguments); // No more dlls to try , return result return bDone;

1 0

[janderwald] 37082: - Clean up resources on failure
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 03:23:53 2008 New Revision: 37082 URL: http://svn.reactos.org/svn/reactos?rev=37082&view=rev Log: - Clean up resources on failure Modified: trunk/reactos/base/applications/msconfig/srvpage.c Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] Thu Oct 30 03:23:53 2008 @@ -145,7 +145,7 @@ if (hService != INVALID_HANDLE_VALUE) { /* check if service is required by the system*/ - if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)pServiceFailureActions, 0, &BytesNeeded)) + if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)NULL, 0, &BytesNeeded)) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -156,11 +156,17 @@ if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)pServiceFailureActions, BytesNeeded, &BytesNeeded)) { HeapFree(GetProcessHeap(), 0, pServiceFailureActions); + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; } } else /* exit on failure */ { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; } } @@ -183,22 +189,32 @@ /* get vendor of service binary */ BytesNeeded = 0; - if (!QueryServiceConfig(hService, pServiceConfig, 0, &BytesNeeded)) + if (!QueryServiceConfig(hService, NULL, 0, &BytesNeeded)) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (pServiceConfig == NULL) - return; - + { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); + return; + } if (!QueryServiceConfig(hService, pServiceConfig, BytesNeeded, &BytesNeeded)) { HeapFree(GetProcessHeap(), 0, pServiceConfig); + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; } } else /* exit on failure */ { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; } } @@ -221,11 +237,18 @@ { lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); if (lpData == NULL) - return; - + { + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); + return; + } if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { HeapFree(GetProcessHeap(), 0, lpData); + HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(hService); + CloseServiceHandle(ScHandle); return; }

1 0

[janderwald] 37081: - Fix a potential buffer overflow in SH_ShowDriveProperties (CID 589) - Fix a possible null dereference (CID 495) - Fix initializing Recycle Bin Property dialog - Add LVS_EX_FULLROWSELECT style
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 02:59:55 2008 New Revision: 37081 URL: http://svn.reactos.org/svn/reactos?rev=37081&view=rev Log: - Fix a potential buffer overflow in SH_ShowDriveProperties (CID 589) - Fix a possible null dereference (CID 495) - Fix initializing Recycle Bin Property dialog - Add LVS_EX_FULLROWSELECT style Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/enumidlist.c trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Thu Oct 30 02:59:55 2008 @@ -678,7 +678,7 @@ PROPSHEETHEADERW psh; BOOL ret; UINT i; - WCHAR szName[MAX_PATH]; + WCHAR szName[MAX_PATH+6]; DWORD dwMaxComponent, dwFileSysFlags; IDataObject * pDataObj = NULL; @@ -700,8 +700,8 @@ /* FIXME * check if disk is a really a local hdd */ - i = LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szName, sizeof(szName)/sizeof(WCHAR)); - if (i > 0 && i < (sizeof(szName)/sizeof(WCHAR)) + 6) + i = LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szName, sizeof(szName)/sizeof(WCHAR)-6); + if (i > 0 && i < (sizeof(szName)/sizeof(WCHAR)) - 6) { szName[i] = L' '; szName[i+1] = L'('; @@ -929,6 +929,8 @@ HWND hDlgCtrl; Length = GetWindowTextW(hwndDlg, szText, sizeof(szText)/sizeof(WCHAR)); + if (Length < 0) + Length = 0; szDrive[0] = pContext->Drive + L'A'; if (GetVolumeInformationW(szDrive, &szText[Length+1], (sizeof(szText)/sizeof(WCHAR))- Length - 2, &dwSerial, &dwMaxComp, &dwFileSys, szFs, sizeof(szFs)/sizeof(WCHAR))) { Modified: trunk/reactos/dll/win32/shell32/enumidlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli… ============================================================================== --- trunk/reactos/dll/win32/shell32/enumidlist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/enumidlist.c [iso-8859-1] Thu Oct 30 02:59:55 2008 @@ -97,8 +97,8 @@ while(pCur) { - REFIID curid = _ILGetGUIDPointer(pCur->pidl); - if (IsEqualIID(curid, refid)) + LPGUID curid = _ILGetGUIDPointer(pCur->pidl); + if (curid && IsEqualGUID(curid, refid)) { return TRUE; } Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] Thu Oct 30 02:59:55 2008 @@ -1218,7 +1218,7 @@ li.iSubItem = 0; li.pszText = szVolume; li.iItem = itemCount; - (void)SendMessageW(hDlgCtrl, LVM_INSERTCOLUMN, 0, (LPARAM)&li); + (void)SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li); if (GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable , &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) { if (StrFormatByteSizeW(TotalNumberOfFreeBytes.QuadPart, szVolume, sizeof(szVolume) / sizeof(WCHAR))) @@ -1383,11 +1383,17 @@ PDRIVE_ITEM_CONTEXT pItem; BOOL bSuccess; UINT uResult; + PROPSHEETPAGE * page; + DWORD dwStyle; switch(uMsg) { - case WM_INITDIALOG: - InitializeBitBucketDlg(hwndDlg, (WCHAR)lParam); + case WM_INITDIALOG: + page = (PROPSHEETPAGE*)lParam; + InitializeBitBucketDlg(hwndDlg, (WCHAR)page->lParam); + dwStyle = (DWORD) SendDlgItemMessage(hwndDlg, 14000, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT; + SendDlgItemMessage(hwndDlg, 14000, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); if (GetDlgCtrlID((HWND)wParam) != 14000) { SetFocus(GetDlgItem(hwndDlg, 14000));

1 0

[janderwald] 37080: - Fix displaying MAC of adapter
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 02:24:37 2008 New Revision: 37080 URL: http://svn.reactos.org/svn/reactos?rev=37080&view=rev Log: - Fix displaying MAC of adapter Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Thu Oct 30 02:24:37 2008 @@ -429,9 +429,11 @@ { li.iItem = InsertItemToListView(hDlgCtrl, IDS_PHYSICAL_ADDRESS); if (li.iItem >= 0) - if (MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pCurAdapter->Address, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) - SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); - + { + swprintf(szBuffer, L"%02x-%02x-%02x-%02x-%02x-%02x",pCurAdapter->Address[0], pCurAdapter->Address[1], + pCurAdapter->Address[2], pCurAdapter->Address[3], pCurAdapter->Address[4], pCurAdapter->Address[5]); + SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); + } li.iItem = InsertItemToListView(hDlgCtrl, IDS_IP_ADDRESS); if (li.iItem >= 0) if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->IpAddressList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)))

1 0

[weiden] 37079: Make the task bar top-most when necessary
by weiden＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: weiden Date: Wed Oct 29 20:58:24 2008 New Revision: 37079 URL: http://svn.reactos.org/svn/reactos?rev=37079&view=rev Log: Make the task bar top-most when necessary Modified: trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Wed Oct 29 20:58:24 2008 @@ -698,6 +698,15 @@ This->HideClock = (sr.dwFlags & 0x8) != 0; /* FIXME: Are there more flags? */ + + if (This->hWnd != NULL) + SetWindowPos (This->hWnd, + This->AlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, + 0, + 0, + 0, + 0, + SWP_NOMOVE | SWP_NOSIZE); if (sr.Position > ABE_BOTTOM) This->Position = ABE_BOTTOM;

1 0

[jimtabor] 37078: - Move code out of freetype.c. - Implement GetRasterizerCaps. - From wine: Patch by Bobby Bingham: Add support for the GGO_UNHINTED flag in GetGlyphOutline.
by jimtabor＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: jimtabor Date: Wed Oct 29 20:32:44 2008 New Revision: 37078 URL: http://svn.reactos.org/svn/reactos?rev=37078&view=rev Log: - Move code out of freetype.c. - Implement GetRasterizerCaps. - From wine: Patch by Bobby Bingham: Add support for the GGO_UNHINTED flag in GetGlyphOutline. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/text.c 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] Wed Oct 29 20:32:44 2008 @@ -13,6 +13,15 @@ #define NDEBUG #include <debug.h> +// +// FIXME PLEASE!!!! +// Why are these here? Well there is a problem with drivers/directx. +// 1st: It does not belong there. +// 2nd: Due to being placed outside Win32k build environment, it creates +// compiling issues. +// Until svn mv drivers/directx subsystem/win32/win32k/drivers/directx, +// it will not get fixed. +// ULONG FASTCALL ftGdiGetGlyphOutline( @@ -24,6 +33,10 @@ OUT OPTIONAL PVOID UnsafeBuf, IN LPMAT2 pmat2, IN BOOL bIgnoreRotation); + +INT +FASTCALL +IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size, OUTLINETEXTMETRICW *Otm); /** Functions ******************************************************************/ @@ -59,7 +72,80 @@ return Ret; } +DWORD +STDCALL +NtGdiGetKerningPairs(HDC hDC, + ULONG NumPairs, + LPKERNINGPAIR krnpair) +{ + UNIMPLEMENTED; + return 0; +} + +/* + From "Undocumented Windows 2000 Secrets" Appendix B, Table B-2, page + 472, this is NtGdiGetOutlineTextMetricsInternalW. + */ +ULONG +STDCALL +NtGdiGetOutlineTextMetricsInternalW (HDC hDC, + ULONG Data, + OUTLINETEXTMETRICW *otm, + TMDIFF *Tmd) +{ + PDC dc; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + HFONT hFont = 0; + ULONG Size; + OUTLINETEXTMETRICW *potm; + NTSTATUS Status; + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + hFont = Dc_Attr->hlfntNew; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc(dc); + if (TextObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + FontGDI = ObjToGDI(TextObj->Font, FONT); + TEXTOBJ_UnlockText(TextObj); + Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); + if (!otm) return Size; + if (Size > Data) + { + SetLastWin32Error(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (NULL == potm) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + IntGetOutlineTextMetrics(FontGDI, Size, potm); + if (otm) + { + Status = MmCopyToCaller(otm, potm, Size); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + ExFreePool(potm); + return 0; + } + } + ExFreePool(potm); + return Size; +} + /* EOF */ - - - 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] Wed Oct 29 20:32:44 2008 @@ -22,6 +22,7 @@ #define NDEBUG #include <debug.h> + FT_Library library; typedef struct _FONT_ENTRY { @@ -42,6 +43,8 @@ #define MAX_FONT_CACHE 256 UINT Hits; UINT Misses; + +SHORT ftLanguageID = 0; typedef struct _FONT_CACHE_ENTRY { LIST_ENTRY ListEntry; @@ -750,7 +753,7 @@ * IntGetOutlineTextMetrics * */ -static unsigned FASTCALL +INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size, OUTLINETEXTMETRICW *Otm) { @@ -1316,6 +1319,21 @@ } return NT_SUCCESS(Status) || STATUS_OBJECT_NAME_NOT_FOUND == Status; +} + +BOOL +FASTCALL +ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS lprs) +{ + if ( lprs ) + { + lprs->nSize = sizeof(RASTERIZER_STATUS); + lprs->wFlags = TT_AVAILABLE | TT_ENABLED; + lprs->nLanguageID = ftLanguageID; + return TRUE; + } + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; } int STDCALL @@ -2691,6 +2709,12 @@ if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2) load_flags |= FT_LOAD_NO_BITMAP; + + if (iFormat & GGO_UNHINTED) + { + load_flags |= FT_LOAD_NO_HINTING; + iFormat &= ~GGO_UNHINTED; + } error = FT_Load_Glyph(ft_face, glyph_index, load_flags); if (error) @@ -3207,91 +3231,137 @@ return needed; } -DWORD -STDCALL -NtGdiGetKerningPairs(HDC hDC, - ULONG NumPairs, - LPKERNINGPAIR krnpair) -{ - UNIMPLEMENTED; - return 0; -} - -/* - From "Undocumented Windows 2000 Secrets" Appendix B, Table B-2, page - 472, this is NtGdiGetOutlineTextMetricsInternalW. - */ -ULONG -STDCALL -NtGdiGetOutlineTextMetricsInternalW (HDC hDC, - ULONG Data, - OUTLINETEXTMETRICW *otm, - TMDIFF *Tmd) -{ - PDC dc; - PDC_ATTR Dc_Attr; - PTEXTOBJ TextObj; +BOOL +FASTCALL +TextIntGetTextExtentPoint(PDC dc, + PTEXTOBJ TextObj, + LPCWSTR String, + int Count, + int MaxExtent, + LPINT Fit, + LPINT Dx, + LPSIZE Size) +{ PFONTGDI FontGDI; - HFONT hFont = 0; - ULONG Size; - OUTLINETEXTMETRICW *potm; - NTSTATUS Status; - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); - DC_UnlockDc(dc); - if (TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } + FT_Face face; + FT_GlyphSlot glyph; + FT_Glyph realglyph; + INT error, n, glyph_index, i, previous; + ULONGLONG TotalWidth = 0; + FT_CharMap charmap, found = NULL; + BOOL use_kerning; + FT_Render_Mode RenderMode; + BOOLEAN Render; + FontGDI = ObjToGDI(TextObj->Font, FONT); - TEXTOBJ_UnlockText(TextObj); - Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - if (!otm) return Size; - if (Size > Data) - { - SetLastWin32Error(ERROR_INSUFFICIENT_BUFFER); - return 0; - } - potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (NULL == potm) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - IntGetOutlineTextMetrics(FontGDI, Size, potm); - if (otm) - { - Status = MmCopyToCaller(otm, potm, Size); - if (! NT_SUCCESS(Status)) + + face = FontGDI->face; + if (NULL != Fit) + { + *Fit = 0; + } + + IntLockFreeType; + if (face->charmap == NULL) + { + DPRINT("WARNING: No charmap selected!\n"); + DPRINT("This font face has %d charmaps\n", face->num_charmaps); + + for (n = 0; n < face->num_charmaps; n++) + { + charmap = face->charmaps[n]; + DPRINT("found charmap encoding: %u\n", charmap->encoding); + if (charmap->encoding != 0) + { + found = charmap; + break; + } + } + + if (! found) + { + DPRINT1("WARNING: Could not find desired charmap!\n"); + } + + error = FT_Set_Charmap(face, found); + if (error) + { + DPRINT1("WARNING: Could not set the charmap!\n"); + } + } + + Render = IntIsFontRenderingEnabled(); + if (Render) + RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); + else + RenderMode = FT_RENDER_MODE_MONO; + + error = FT_Set_Pixel_Sizes(face, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + /* FIXME should set character height if neg */ + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + if (error) + { + DPRINT1("Error in setting pixel sizes: %u\n", error); + } + + use_kerning = FT_HAS_KERNING(face); + previous = 0; + + for (i = 0; i < Count; i++) + { + glyph_index = FT_Get_Char_Index(face, *String); + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - ExFreePool(potm); - return 0; + 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); + break; + } + + glyph = face->glyph; + realglyph = NtGdiGlyphCacheSet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + if (!realglyph) + { + DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + break; + } } - } - ExFreePool(potm); - return Size; -} - - -BOOL -APIENTRY -NtGdiGetRasterizerCaps( - OUT LPRASTERIZER_STATUS praststat, - IN ULONG cjBytes) -{ - UNIMPLEMENTED; - return FALSE; + + /* retrieve kerning distance */ + if (use_kerning && previous && glyph_index) + { + FT_Vector delta; + FT_Get_Kerning(face, previous, glyph_index, 0, &delta); + TotalWidth += delta.x; + } + + TotalWidth += realglyph->advance.x >> 10; + + if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit) + { + *Fit = i + 1; + } + if (NULL != Dx) + { + Dx[i] = (TotalWidth + 32) >> 6; + } + + previous = glyph_index; + String++; + } + IntUnLockFreeType; + + Size->cx = (TotalWidth + 32) >> 6; + Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight); + Size->cy = EngMulDiv(Size->cy, IntGdiGetDeviceCaps(dc, LOGPIXELSY), 72); + + return TRUE; } @@ -3442,342 +3512,6 @@ Ret = FontTci[i].ciCharset; DPRINT("CharSet %d\n",Ret); return Ret; -} - -static BOOL -FASTCALL -TextIntGetTextExtentPoint(PDC dc, - PTEXTOBJ TextObj, - LPCWSTR String, - int Count, - int MaxExtent, - LPINT Fit, - LPINT Dx, - LPSIZE Size) -{ - PFONTGDI FontGDI; - FT_Face face; - FT_GlyphSlot glyph; - FT_Glyph realglyph; - INT error, n, glyph_index, i, previous; - ULONGLONG TotalWidth = 0; - FT_CharMap charmap, found = NULL; - BOOL use_kerning; - FT_Render_Mode RenderMode; - BOOLEAN Render; - - FontGDI = ObjToGDI(TextObj->Font, FONT); - - face = FontGDI->face; - if (NULL != Fit) - { - *Fit = 0; - } - - IntLockFreeType; - if (face->charmap == NULL) - { - DPRINT("WARNING: No charmap selected!\n"); - DPRINT("This font face has %d charmaps\n", face->num_charmaps); - - for (n = 0; n < face->num_charmaps; n++) - { - charmap = face->charmaps[n]; - DPRINT("found charmap encoding: %u\n", charmap->encoding); - if (charmap->encoding != 0) - { - found = charmap; - break; - } - } - - if (! found) - { - DPRINT1("WARNING: Could not find desired charmap!\n"); - } - - error = FT_Set_Charmap(face, found); - if (error) - { - DPRINT1("WARNING: Could not set the charmap!\n"); - } - } - - Render = IntIsFontRenderingEnabled(); - if (Render) - RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); - else - RenderMode = FT_RENDER_MODE_MONO; - - error = FT_Set_Pixel_Sizes(face, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, - /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - if (error) - { - DPRINT1("Error in setting pixel sizes: %u\n", error); - } - - use_kerning = FT_HAS_KERNING(face); - previous = 0; - - for (i = 0; i < Count; i++) - { - 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); - break; - } - - glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); - break; - } - } - - /* retrieve kerning distance */ - if (use_kerning && previous && glyph_index) - { - FT_Vector delta; - FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TotalWidth += delta.x; - } - - TotalWidth += realglyph->advance.x >> 10; - - if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit) - { - *Fit = i + 1; - } - if (NULL != Dx) - { - Dx[i] = (TotalWidth + 32) >> 6; - } - - previous = glyph_index; - String++; - } - IntUnLockFreeType; - - Size->cx = (TotalWidth + 32) >> 6; - Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight); - Size->cy = EngMulDiv(Size->cy, IntGdiGetDeviceCaps(dc, LOGPIXELSY), 72); - - return TRUE; -} - -W32KAPI -BOOL -APIENTRY -NtGdiGetTextExtentExW( - IN HDC hDC, - IN OPTIONAL LPWSTR UnsafeString, - IN ULONG Count, - IN ULONG MaxExtent, - OUT OPTIONAL PULONG UnsafeFit, - OUT OPTIONAL PULONG UnsafeDx, - OUT LPSIZE UnsafeSize, - IN FLONG fl -) -{ - PDC dc; - PDC_ATTR Dc_Attr; - LPWSTR String; - SIZE Size; - NTSTATUS Status; - BOOLEAN Result; - INT Fit; - LPINT Dx; - PTEXTOBJ TextObj; - - /* FIXME: Handle fl */ - - if (0 == Count) - { - Size.cx = 0; - Size.cy = 0; - Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - return TRUE; - } - - String = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); - if (NULL == String) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (NULL != UnsafeDx) - { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); - if (NULL == Dx) - { - ExFreePool(String); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - else - { - Dx = NULL; - } - - Status = MmCopyFromCaller(String, UnsafeString, Count * sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) - { - if (NULL != Dx) - { - ExFreePool(Dx); - } - ExFreePool(String); - SetLastNtError(Status); - return FALSE; - } - - dc = DC_LockDc(hDC); - if (NULL == dc) - { - if (NULL != Dx) - { - ExFreePool(Dx); - } - ExFreePool(String); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew); - if ( TextObj ) - { - Result = TextIntGetTextExtentPoint(dc, TextObj, String, Count, MaxExtent, - NULL == UnsafeFit ? NULL : &Fit, Dx, &Size); - TEXTOBJ_UnlockText(TextObj); - } - else - Result = FALSE; - DC_UnlockDc(dc); - - ExFreePool(String); - if (! Result) - { - if (NULL != Dx) - { - ExFreePool(Dx); - } - return FALSE; - } - - if (NULL != UnsafeFit) - { - Status = MmCopyToCaller(UnsafeFit, &Fit, sizeof(INT)); - if (! NT_SUCCESS(Status)) - { - if (NULL != Dx) - { - ExFreePool(Dx); - } - SetLastNtError(Status); - return FALSE; - } - } - - if (NULL != UnsafeDx) - { - Status = MmCopyToCaller(UnsafeDx, Dx, Count * sizeof(INT)); - if (! NT_SUCCESS(Status)) - { - if (NULL != Dx) - { - ExFreePool(Dx); - } - SetLastNtError(Status); - return FALSE; - } - } - if (NULL != Dx) - { - ExFreePool(Dx); - } - - Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; -} - -BOOL -STDCALL -NtGdiGetTextExtent(HDC hdc, - LPWSTR lpwsz, - INT cwc, - LPSIZE psize, - UINT flOpts) -{ - return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, 0); -} - -W32KAPI -INT -APIENTRY -NtGdiGetTextFaceW( - IN HDC hDC, - IN INT Count, - OUT OPTIONAL LPWSTR FaceName, - IN BOOL bAliasName -) -{ - PDC Dc; - PDC_ATTR Dc_Attr; - HFONT hFont; - PTEXTOBJ TextObj; - NTSTATUS Status; - - /* FIXME: Handle bAliasName */ - - Dc = DC_LockDc(hDC); - if (Dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = Dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - hFont = Dc_Attr->hlfntNew; - DC_UnlockDc(Dc); - - TextObj = TEXTOBJ_LockText(hFont); - ASSERT(TextObj != NULL); - Count = min(Count, wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)); - Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); - TEXTOBJ_UnlockText(TextObj); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } - - return Count; } W32KAPI 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] Wed Oct 29 20:32:44 2008 @@ -2,7 +2,7 @@ * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory * FILE: subsystems/win32/win32k/objects/text.c - * PURPOSE: Text + * PURPOSE: Text/Font * PROGRAMMER: */ @@ -13,8 +13,220 @@ #define NDEBUG #include <debug.h> +BOOL +FASTCALL +ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS lprs); + +BOOL +FASTCALL +TextIntGetTextExtentPoint(PDC dc, + PTEXTOBJ TextObj, + LPCWSTR String, + int Count, + int MaxExtent, + LPINT Fit, + LPINT Dx, + LPSIZE Size); + /** Functions ******************************************************************/ + +BOOL +APIENTRY +NtGdiGetRasterizerCaps( + OUT LPRASTERIZER_STATUS praststat, + IN ULONG cjBytes) +{ + NTSTATUS Status = STATUS_SUCCESS; + RASTERIZER_STATUS rsSafe; + + if (praststat && cjBytes) + { + if ( cjBytes >= sizeof(RASTERIZER_STATUS) ) cjBytes = sizeof(RASTERIZER_STATUS); + if ( ftGdiGetRasterizerCaps(&rsSafe)) + { + _SEH_TRY + { + ProbeForWrite( praststat, + sizeof(RASTERIZER_STATUS), + 1); + RtlCopyMemory(praststat, &rsSafe, cjBytes ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + } + } + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetTextExtentExW( + IN HDC hDC, + IN OPTIONAL LPWSTR UnsafeString, + IN ULONG Count, + IN ULONG MaxExtent, + OUT OPTIONAL PULONG UnsafeFit, + OUT OPTIONAL PULONG UnsafeDx, + OUT LPSIZE UnsafeSize, + IN FLONG fl +) +{ + PDC dc; + PDC_ATTR Dc_Attr; + LPWSTR String; + SIZE Size; + NTSTATUS Status; + BOOLEAN Result; + INT Fit; + LPINT Dx; + PTEXTOBJ TextObj; + + /* FIXME: Handle fl */ + + if (0 == Count) + { + Size.cx = 0; + Size.cy = 0; + Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + return TRUE; + } + + String = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); + if (NULL == String) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (NULL != UnsafeDx) + { + Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); + if (NULL == Dx) + { + ExFreePool(String); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + else + { + Dx = NULL; + } + + Status = MmCopyFromCaller(String, UnsafeString, Count * sizeof(WCHAR)); + if (! NT_SUCCESS(Status)) + { + if (NULL != Dx) + { + ExFreePool(Dx); + } + ExFreePool(String); + SetLastNtError(Status); + return FALSE; + } + + dc = DC_LockDc(hDC); + if (NULL == dc) + { + if (NULL != Dx) + { + ExFreePool(Dx); + } + ExFreePool(String); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew); + if ( TextObj ) + { + Result = TextIntGetTextExtentPoint(dc, TextObj, String, Count, MaxExtent, + NULL == UnsafeFit ? NULL : &Fit, Dx, &Size); + TEXTOBJ_UnlockText(TextObj); + } + else + Result = FALSE; + DC_UnlockDc(dc); + + ExFreePool(String); + if (! Result) + { + if (NULL != Dx) + { + ExFreePool(Dx); + } + return FALSE; + } + + if (NULL != UnsafeFit) + { + Status = MmCopyToCaller(UnsafeFit, &Fit, sizeof(INT)); + if (! NT_SUCCESS(Status)) + { + if (NULL != Dx) + { + ExFreePool(Dx); + } + SetLastNtError(Status); + return FALSE; + } + } + + if (NULL != UnsafeDx) + { + Status = MmCopyToCaller(UnsafeDx, Dx, Count * sizeof(INT)); + if (! NT_SUCCESS(Status)) + { + if (NULL != Dx) + { + ExFreePool(Dx); + } + SetLastNtError(Status); + return FALSE; + } + } + if (NULL != Dx) + { + ExFreePool(Dx); + } + + Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + return TRUE; +} + +BOOL +STDCALL +NtGdiGetTextExtent(HDC hdc, + LPWSTR lpwsz, + INT cwc, + LPSIZE psize, + UINT flOpts) +{ + return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, 0); +} BOOL STDCALL @@ -42,4 +254,48 @@ return TRUE; } + +W32KAPI +INT +APIENTRY +NtGdiGetTextFaceW( + IN HDC hDC, + IN INT Count, + OUT OPTIONAL LPWSTR FaceName, + IN BOOL bAliasName +) +{ + PDC Dc; + PDC_ATTR Dc_Attr; + HFONT hFont; + PTEXTOBJ TextObj; + NTSTATUS Status; + + /* FIXME: Handle bAliasName */ + + Dc = DC_LockDc(hDC); + if (Dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + hFont = Dc_Attr->hlfntNew; + DC_UnlockDc(Dc); + + TextObj = TEXTOBJ_LockText(hFont); + ASSERT(TextObj != NULL); + Count = min(Count, wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)); + Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + TEXTOBJ_UnlockText(TextObj); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return 0; + } + + return Count; +} + /* EOF */

1 0

[hyperion] 37077: Merging 37059-37076 due to rbuild changes
by hyperion＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: hyperion Date: Wed Oct 29 19:52:39 2008 New Revision: 37077 URL: http://svn.reactos.org/svn/reactos?rev=37077&view=rev Log: Merging 37059-37076 due to rbuild changes Added: branches/the-real-msvc/hal/hal/hal.pspec - copied unchanged from r37076, trunk/reactos/hal/hal/hal.pspec branches/the-real-msvc/subsystems/win32/win32k/objects/freetype.c - copied unchanged from r37076, trunk/reactos/subsystems/win32/win32k/objects/freetype.c branches/the-real-msvc/subsystems/win32/win32k/win32k.pspec - copied unchanged from r37076, trunk/reactos/subsystems/win32/win32k/win32k.pspec Removed: branches/the-real-msvc/hal/hal/hal.spec branches/the-real-msvc/ntoskrnl/ntoskrnl.spec Modified: branches/the-real-msvc/dll/win32/shell32/shfldr_admintools.c branches/the-real-msvc/dll/win32/shell32/shlview.c branches/the-real-msvc/dll/win32/shell32/shv_def_cmenu.c branches/the-real-msvc/hal/hal/hal.rbuild branches/the-real-msvc/hal/halarm/up/halup.rbuild branches/the-real-msvc/hal/halx86/halmp.rbuild branches/the-real-msvc/hal/halx86/halup.rbuild branches/the-real-msvc/hal/halx86/halxbox.rbuild branches/the-real-msvc/include/reactos/win32k/ntgdityp.h branches/the-real-msvc/ntoskrnl/include/internal/ke_x.h branches/the-real-msvc/ntoskrnl/ke/timerobj.c branches/the-real-msvc/ntoskrnl/mm/section.c branches/the-real-msvc/ntoskrnl/mm/virtual.c branches/the-real-msvc/ntoskrnl/ntoskrnl-generic.rbuild branches/the-real-msvc/subsystems/win32/win32k/objects/dc.c branches/the-real-msvc/subsystems/win32/win32k/objects/font.c branches/the-real-msvc/subsystems/win32/win32k/objects/text.c branches/the-real-msvc/subsystems/win32/win32k/win32k.rbuild branches/the-real-msvc/tools/rbuild/backend/codeblocks/codeblocks.cpp branches/the-real-msvc/tools/rbuild/backend/codeblocks/codeblocks.h branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.h branches/the-real-msvc/tools/rbuild/compilationunit.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/the-real-msvc/dll/win32/shell32/shfldr_admintools.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/shell32… Modified: branches/the-real-msvc/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/shell32… Modified: branches/the-real-msvc/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/shell32… Modified: branches/the-real-msvc/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/hal/hal/hal.rbuil… Removed: branches/the-real-msvc/hal/hal/hal.spec URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/hal/hal/hal.spec?… Modified: branches/the-real-msvc/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/hal/halarm/up/hal… Modified: branches/the-real-msvc/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/hal/halx86/halmp.… Modified: branches/the-real-msvc/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/hal/halx86/halup.… Modified: branches/the-real-msvc/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/hal/halx86/halxbo… Modified: branches/the-real-msvc/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w… Modified: branches/the-real-msvc/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ntoskrnl/include/… Modified: branches/the-real-msvc/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ntoskrnl/ke/timer… Modified: branches/the-real-msvc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ntoskrnl/mm/secti… Modified: branches/the-real-msvc/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ntoskrnl/mm/virtu… Modified: branches/the-real-msvc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ntoskrnl/ntoskrnl… Removed: branches/the-real-msvc/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ntoskrnl/ntoskrnl… Modified: branches/the-real-msvc/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/back… Modified: branches/the-real-msvc/tools/rbuild/backend/codeblocks/codeblocks.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/back… Modified: branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/back… Modified: branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/back… Modified: branches/the-real-msvc/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/comp…

1 0

[jimtabor] 37076: - Move FreeType support to freetype.c. - Add font.c to build system and picked our first victim to populate it. - Implemented NtGdiSetTextJustification in text.c.
by jimtabor＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: jimtabor Date: Wed Oct 29 16:57:04 2008 New Revision: 37076 URL: http://svn.reactos.org/svn/reactos?rev=37076&view=rev Log: - Move FreeType support to freetype.c. - Add font.c to build system and picked our first victim to populate it. - Implemented NtGdiSetTextJustification in text.c. Added: trunk/reactos/subsystems/win32/win32k/objects/freetype.c - copied, changed from r37043, trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Copied: trunk/reactos/subsystems/win32/win32k/objects/freetype.c (from r37043, trunk/reactos/subsystems/win32/win32k/objects/text.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

1 0

[sginsberg] 37075: - Fix kernel SMP intrinsics: - Correct typos and add missing casts - Use IPI_APC in KiRequestApcInterrupt as we are requesting an APC IPI, not DPC - Fix KiAcquireDispatcherObject (credit to Alex) - Add missing SMP versions of KiAcquire/ReleaseDispatcherLockAtDpcLevel and KiAcquire/ReleaseTimerLock - Stub out KiRundownThread for SMP
by sginsberg＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: sginsberg Date: Wed Oct 29 16:08:20 2008 New Revision: 37075 URL: http://svn.reactos.org/svn/reactos?rev=37075&view=rev Log: - Fix kernel SMP intrinsics: - Correct typos and add missing casts - Use IPI_APC in KiRequestApcInterrupt as we are requesting an APC IPI, not DPC - Fix KiAcquireDispatcherObject (credit to Alex) - Add missing SMP versions of KiAcquire/ReleaseDispatcherLockAtDpcLevel and KiAcquire/ReleaseTimerLock - Stub out KiRundownThread for SMP Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Wed Oct 29 16:08:20 2008 @@ -87,6 +87,46 @@ (DrAddress <= MM_HIGHEST_USER_ADDRESS) ? DrAddress : 0); } #endif /* _M_IX86 */ + +#ifndef _M_ARM +PRKTHREAD +FORCEINLINE +KeGetCurrentThread(VOID) +{ +#ifdef _M_IX86 + /* Return the current thread */ + return ((PKIPCR)KeGetPcr())->PrcbData.CurrentThread; +#else + PKPRCB Prcb = KeGetCurrentPrcb(); + return Prcb->CurrentThread; +#endif +} + +UCHAR +FORCEINLINE +KeGetPreviousMode(VOID) +{ + /* Return the current mode */ + return KeGetCurrentThread()->PreviousMode; +} +#endif + +VOID +FORCEINLINE +KeFlushProcessTb(VOID) +{ + /* Flush the TLB by resetting CR3 */ +#ifdef _M_PPC + __asm__("sync\n\tisync\n\t"); +#elif _M_ARM + // + // We need to implement this! + // + ASSERTMSG("Need ARM flush routine\n", FALSE); +#else + __writecr3(__readcr3()); +#endif +} // // Enters a Guarded Region @@ -411,7 +451,10 @@ { #ifdef DBG /* On debug builds, we use a much slower but useful routine */ - Kii386SpinOnSpinLock(SpinLock, 5); + //Kii386SpinOnSpinLock(SpinLock, 5); + + /* FIXME: Do normal yield for now */ + YieldProcessor(); #else /* Otherwise, just yield and keep looping */ YieldProcessor(); @@ -422,7 +465,7 @@ { #ifdef DBG /* On debug builds, we OR in the KTHREAD */ - *SpinLock = KeGetCurrentThread() | 1; + *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; #endif /* All is well, break out */ break; @@ -439,21 +482,21 @@ { #ifdef DBG /* Make sure that the threads match */ - if ((KeGetCurrentThread() | 1) != *SpinLock) + if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock) { /* They don't, bugcheck */ - KeBugCheckEx(SPIN_LOCK_NOT_OWNED, SpinLock, 0, 0, 0); + KeBugCheckEx(SPIN_LOCK_NOT_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); } #endif /* Clear the lock */ - InterlockedAnd(SpinLock, 0); -} - -KIRQL + InterlockedAnd((PLONG)SpinLock, 0); +} + +VOID FORCEINLINE KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object) { - LONG OldValue, NewValue; + LONG OldValue; /* Make sure we're at a safe level to touch the lock */ ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); @@ -462,20 +505,23 @@ do { /* Loop until the other CPU releases it */ - while ((UCHAR)Object->Lock & KOBJECT_LOCK_BIT) + while (TRUE) { + /* Check if it got released */ + OldValue = Object->Lock; + if ((OldValue & KOBJECT_LOCK_BIT) == 0) break; + /* Let the CPU know that this is a loop */ YieldProcessor(); - }; + } /* Try acquiring the lock now */ - NewValue = InterlockedCompareExchange(&Object->Lock, - OldValue | KOBJECT_LOCK_BIT, - OldValue); - } while (NewValue != OldValue); -} - -KIRQL + } while (InterlockedCompareExchange(&Object->Lock, + OldValue | KOBJECT_LOCK_BIT, + OldValue) != OldValue); +} + +VOID FORCEINLINE KiReleaseDispatcherObject(IN DISPATCHER_HEADER* Object) { @@ -506,6 +552,22 @@ KiExitDispatcher(OldIrql); } +VOID +FORCEINLINE +KiAcquireDispatcherLockAtDpcLevel(VOID) +{ + /* Acquire the dispatcher lock */ + KeAcquireQueuedSpinLockAtDpcLevel(LockQueueDispatcherLock); +} + +VOID +FORCEINLINE +KiReleaseDispatcherLockFromDpcLevel(VOID) +{ + /* Release the dispatcher lock */ + KeReleaseQueuedSpinLockFromDpcLevel(LockQueueDispatcherLock); +} + // // This routine inserts a thread into the deferred ready list of the given CPU // @@ -569,7 +631,7 @@ for (;;) { /* Acquire the lock and break out if we acquired it first */ - if (!InterlockedExchange(&Prcb->PrcbLock, 1)) break; + if (!InterlockedExchange((PLONG)&Prcb->PrcbLock, 1)) break; /* Loop until the other CPU releases it */ do @@ -595,7 +657,7 @@ ASSERT(Prcb->PrcbLock != 0); /* Release it */ - InterlockedAnd(&Prcb->PrcbLock, 0); + InterlockedAnd((PLONG)&Prcb->PrcbLock, 0); } // @@ -616,7 +678,7 @@ for (;;) { /* Acquire the lock and break out if we acquired it first */ - if (!InterlockedExchange(&Thread->ThreadLock, 1)) break; + if (!InterlockedExchange((PLONG)&Thread->ThreadLock, 1)) break; /* Loop until the other CPU releases it */ do @@ -639,7 +701,7 @@ KiReleaseThreadLock(IN PKTHREAD Thread) { /* Release it */ - InterlockedAnd(&Thread->ThreadLock, 0); + InterlockedAnd((PLONG)&Thread->ThreadLock, 0); } FORCEINLINE @@ -653,7 +715,7 @@ /* Otherwise, try to acquire it and check the result */ Value = 1; - Value = InterlockedExchange(&Thread->ThreadLock, &Value); + Value = InterlockedExchange((PLONG)&Thread->ThreadLock, Value); /* Return the lock state */ return (Value == TRUE); @@ -669,6 +731,16 @@ FORCEINLINE VOID +KiRundownThread(IN PKTHREAD Thread) +{ +#if defined(_M_IX86) || defined(_M_AMD64) + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +#endif +} + +FORCEINLINE +VOID KiRequestApcInterrupt(IN BOOLEAN NeedApc, IN UCHAR Processor) { @@ -676,10 +748,10 @@ if (NeedApc) { /* Check if it's on another CPU */ - if (KeGetPcr()->Number != Cpu) + if (KeGetPcr()->Number != Processor) { /* Send an IPI to request delivery */ - KiIpiSendRequest(AFFINITY_MASK(Cpu), IPI_DPC); + KiIpiSendRequest(AFFINITY_MASK(Processor), IPI_APC); } else { @@ -687,6 +759,36 @@ HalRequestSoftwareInterrupt(APC_LEVEL); } } +} + +FORCEINLINE +PKSPIN_LOCK_QUEUE +KiAcquireTimerLock(IN ULONG Hand) +{ + PKSPIN_LOCK_QUEUE LockQueue; + ULONG LockIndex; + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + /* Get the lock index */ + LockIndex = Hand >> LOCK_QUEUE_TIMER_LOCK_SHIFT; + LockIndex &= (LOCK_QUEUE_TIMER_TABLE_LOCKS - 1); + + /* Now get the lock */ + LockQueue = &KeGetCurrentPrcb()->LockQueue[LockQueueTimerTableLock + LockIndex]; + + /* Acquire it and return */ + KeAcquireQueuedSpinLockAtDpcLevel(LockQueue); + return LockQueue; +} + +FORCEINLINE +VOID +KiReleaseTimerLock(IN PKSPIN_LOCK_QUEUE LockQueue) +{ + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + /* Release the lock */ + KeReleaseQueuedSpinLockFromDpcLevel(LockQueue); } #endif @@ -1525,44 +1627,3 @@ /* Return the new priority */ return Priority; } - -#ifndef _M_ARM -PRKTHREAD -FORCEINLINE -KeGetCurrentThread(VOID) -{ -#ifdef _M_IX86 - /* Return the current thread */ - return ((PKIPCR)KeGetPcr())->PrcbData.CurrentThread; -#else - PKPRCB Prcb = KeGetCurrentPrcb(); - return Prcb->CurrentThread; -#endif -} - -UCHAR -FORCEINLINE -KeGetPreviousMode(VOID) -{ - /* Return the current mode */ - return KeGetCurrentThread()->PreviousMode; -} -#endif - -VOID -FORCEINLINE -KeFlushProcessTb(VOID) -{ - /* Flush the TLB by resetting CR3 */ -#ifdef _M_PPC - __asm__("sync\n\tisync\n\t"); -#elif _M_ARM - // - // We need to implement this! - // - ASSERTMSG("Need ARM flush routine\n", FALSE); -#else - __writecr3(__readcr3()); -#endif -} -

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