Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[ekohl] 51982: [UMPNPMGR] Add support for missing properties to PNP_SetDeviceRegProp and fix a property issue in PNP_GetDeviceRegProp.
by ekohl＠svn.reactos.org 28 May '11

28 May '11

Author: ekohl Date: Sat May 28 19:08:20 2011 New Revision: 51982 URL: http://svn.reactos.org/svn/reactos?rev=51982&view=rev Log: [UMPNPMGR] Add support for missing properties to PNP_SetDeviceRegProp and fix a property issue in PNP_GetDeviceRegProp. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat May 28 19:08:20 2011 @@ -674,7 +674,7 @@ break; case CM_DRP_REMOVAL_POLICY: - lpValueName = L"RemovalPolicy"; + lpValueName = NULL; break; case CM_DRP_REMOVAL_POLICY_HW_DEFAULT: @@ -682,7 +682,7 @@ break; case CM_DRP_REMOVAL_POLICY_OVERRIDE: - lpValueName = NULL; + lpValueName = L"RemovalPolicy"; break; case CM_DRP_INSTALL_STATE: @@ -779,10 +779,17 @@ break; #if 0 - /* These properties are not supported by IoGetDeviceProperty */ + /* FIXME: This property is not supported by IoGetDeviceProperty */ case CM_DRP_DEVICE_POWER_DATA: +#endif + + case CM_DRP_REMOVAL_POLICY: + PlugPlayData.Property = 0x12; // DevicePropertyRemovalPolicy + break; + +#if 0 + /* FIXME: This property is not supported by IoGetDeviceProperty */ case CM_DRP_REMOVAL_POLICY_HW_DEFAULT: - case CM_DRP_REMOVAL_POLICY_OVERRIDE: #endif case CM_DRP_INSTALL_STATE: @@ -790,7 +797,7 @@ break; #if 0 - /* This property is not supported by IoGetDeviceProperty */ + /* FIXME: This property is not supported by IoGetDeviceProperty */ #if (WINVER >= _WIN32_WINNT_WS03) case CM_DRP_LOCATION_PATHS: #endif @@ -909,6 +916,30 @@ lpValueName = L"LowerFilters"; break; + case CM_DRP_SECURITY: + lpValueName = L"Security"; + break; + + case CM_DRP_DEVTYPE: + lpValueName = L"DeviceType"; + break; + + case CM_DRP_EXCLUSIVE: + lpValueName = L"Exclusive"; + break; + + case CM_DRP_CHARACTERISTICS: + lpValueName = L"DeviceCharacteristics"; + break; + + case CM_DRP_UI_NUMBER_DESC_FORMAT: + lpValueName = L"UINumberDescFormat"; + break; + + case CM_DRP_REMOVAL_POLICY_OVERRIDE: + lpValueName = L"RemovalPolicy"; + break; + default: return CR_INVALID_PROPERTY; } @@ -918,7 +949,7 @@ if (RegOpenKeyExW(hEnumKey, pDeviceId, 0, - KEY_ALL_ACCESS, /* FIXME: so much? */ + KEY_SET_VALUE, &hKey)) return CR_INVALID_DEVNODE;

1 0

[rmessiant] 51981: [NTOSKRNL] - Don't treat the head of the tracking block list as a list entry.
by rmessiant＠svn.reactos.org 28 May '11

28 May '11

Author: rmessiant Date: Sat May 28 17:56:07 2011 New Revision: 51981 URL: http://svn.reactos.org/svn/reactos?rev=51981&view=rev Log: [NTOSKRNL] - Don't treat the head of the tracking block list as a list entry. Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Sat May 28 17:56:07 2011 @@ -164,7 +164,7 @@ /* Start browsing tracking blocks to find a block that would match given tag */ TagFound = FALSE; - for (ListEntry = (PSINGLE_LIST_ENTRY)&Lock->Dbg.Blocks; ListEntry; ListEntry = ListEntry->Next) + for (ListEntry = ((PSINGLE_LIST_ENTRY)&Lock->Dbg.Blocks)->Next; ListEntry; ListEntry = ListEntry->Next) { TrackingBlock = CONTAINING_RECORD(ListEntry, IO_REMOVE_LOCK_TRACKING_BLOCK, BlockEntry); @@ -186,7 +186,7 @@ { /* Yes, then remove it from the queue and free it */ TagFound = TRUE; - if (ListEntry == (PSINGLE_LIST_ENTRY)&Lock->Dbg.Blocks) + if (ListEntry == ((PSINGLE_LIST_ENTRY)&Lock->Dbg.Blocks)->Next) { /* Here it is head, remove it using macro */ PopEntryList((PSINGLE_LIST_ENTRY)&(Lock->Dbg.Blocks));

1 0

[ekohl] 51980: [UMPNPMGR] Add support for missing properties to PNP_GetDeviceRegProp and improve error handling.
by ekohl＠svn.reactos.org 28 May '11

28 May '11

Author: ekohl Date: Sat May 28 17:35:51 2011 New Revision: 51980 URL: http://svn.reactos.org/svn/reactos?rev=51980&view=rev Log: [UMPNPMGR] Add support for missing properties to PNP_GetDeviceRegProp and improve error handling. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat May 28 17:35:51 2011 @@ -536,13 +536,32 @@ PLUGPLAY_CONTROL_PROPERTY_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; LPWSTR lpValueName = NULL; - HKEY hKey = 0; + HKEY hKey = NULL; + LONG lError; NTSTATUS Status; UNREFERENCED_PARAMETER(hBinding); - UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetDeviceRegProp() called\n"); + + if (pulTransferLen == NULL || pulLength == NULL) + { + ret = CR_INVALID_POINTER; + goto done; + } + + if (ulFlags != 0) + { + ret = CR_INVALID_FLAG; + goto done; + } + + /* FIXME: Check pDeviceID */ + + if (*pulLength < *pulTransferLen) + *pulLength = *pulTransferLen; + + *pulTransferLen = 0; switch (ulProperty) { @@ -626,8 +645,65 @@ lpValueName = NULL; break; + case CM_DRP_SECURITY: + lpValueName = L"Security"; + break; + + case CM_DRP_DEVTYPE: + lpValueName = L"DeviceType"; + break; + + case CM_DRP_EXCLUSIVE: + lpValueName = L"Exclusive"; + break; + + case CM_DRP_CHARACTERISTICS: + lpValueName = L"DeviceCharacteristics"; + break; + + case CM_DRP_ADDRESS: + lpValueName = NULL; + break; + + case CM_DRP_UI_NUMBER_DESC_FORMAT: + lpValueName = L"UINumberDescFormat"; + break; + + case CM_DRP_DEVICE_POWER_DATA: + lpValueName = NULL; + break; + + case CM_DRP_REMOVAL_POLICY: + lpValueName = L"RemovalPolicy"; + break; + + case CM_DRP_REMOVAL_POLICY_HW_DEFAULT: + lpValueName = NULL; + break; + + case CM_DRP_REMOVAL_POLICY_OVERRIDE: + lpValueName = NULL; + break; + + case CM_DRP_INSTALL_STATE: + lpValueName = NULL; + break; + +#if (WINVER >= _WIN32_WINNT_WS03) + case CM_DRP_LOCATION_PATHS: + lpValueName = NULL; + break; +#endif + +#if (WINVER >= _WIN32_WINNT_WIN7) + case CM_DRP_BASE_CONTAINERID: + lpValueName = NULL; + break; +#endif + default: - return CR_INVALID_PROPERTY; + ret = CR_INVALID_PROPERTY; + goto done; } DPRINT("Value name: %S\n", lpValueName); @@ -635,24 +711,34 @@ if (lpValueName) { /* Retrieve information from the Registry */ - if (RegOpenKeyExW(hEnumKey, - pDeviceID, - 0, - KEY_ALL_ACCESS, - &hKey)) - return CR_INVALID_DEVNODE; - - if (RegQueryValueExW(hKey, - lpValueName, - NULL, - pulRegDataType, - Buffer, - pulLength)) - ret = CR_REGISTRY_ERROR; - - /* FIXME: Check buffer size */ - - RegCloseKey(hKey); + lError = RegOpenKeyExW(hEnumKey, + pDeviceID, + 0, + KEY_QUERY_VALUE, + &hKey); + if (lError != ERROR_SUCCESS) + { + hKey = NULL; + *pulLength = 0; + ret = CR_INVALID_DEVNODE; + goto done; + } + + lError = RegQueryValueExW(hKey, + lpValueName, + NULL, + pulRegDataType, + Buffer, + pulLength); + if (lError == ERROR_MORE_DATA) + { + ret = CR_BUFFER_SMALL; + } + else + { + *pulLength = 0; + ret = CR_NO_SUCH_VALUE; + } } else { @@ -664,31 +750,57 @@ switch (ulProperty) { + case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: + PlugPlayData.Property = 0xb; // DevicePropertyPhysicalDeviceObjectName; + break; + + case CM_DRP_UI_NUMBER: + PlugPlayData.Property = 0x11; // DevicePropertyUINumber; + break; + + case CM_DRP_BUSTYPEGUID: + PlugPlayData.Property = 0xc; // DevicePropertyBusTypeGuid; + break; + + case CM_DRP_LEGACYBUSTYPE: + PlugPlayData.Property = 0xd; // DevicePropertyLegacyBusType; + break; + + case CM_DRP_BUSNUMBER: + PlugPlayData.Property = 0xe; // DevicePropertyBusNumber; + break; + + case CM_DRP_ENUMERATOR_NAME: + PlugPlayData.Property = 0xf; // DevicePropertyEnumeratorName; + break; + + case CM_DRP_ADDRESS: + PlugPlayData.Property = 0x10; // DevicePropertyAddress; + break; + #if 0 - case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: - PlugPlayData.Property = DevicePropertyPhysicalDeviceObjectName; + /* These properties are not supported by IoGetDeviceProperty */ + case CM_DRP_DEVICE_POWER_DATA: + case CM_DRP_REMOVAL_POLICY_HW_DEFAULT: + case CM_DRP_REMOVAL_POLICY_OVERRIDE: +#endif + + case CM_DRP_INSTALL_STATE: + PlugPlayData.Property = 0x12; // DevicePropertyInstallState; break; - case CM_DRP_UI_NUMBER: - PlugPlayData.Property = DevicePropertyUINumber; - break; - - case CM_DRP_BUSTYPEGUID: - PlugPlayData.Property = DevicePropertyBusTypeGuid; - break; - - case CM_DRP_LEGACYBUSTYPE: - PlugPlayData.Property = DevicePropertyLegacyBusType; - break; - - case CM_DRP_BUSNUMBER: - PlugPlayData.Property = DevicePropertyBusNumber; +#if 0 + /* This property is not supported by IoGetDeviceProperty */ +#if (WINVER >= _WIN32_WINNT_WS03) + case CM_DRP_LOCATION_PATHS: +#endif +#endif + +#if (WINVER >= _WIN32_WINNT_WIN7) + case CM_DRP_BASE_CONTAINERID: + PlugPlayData.Property = 0x16; // DevicePropertyContainerID; break; #endif - - case CM_DRP_ENUMERATOR_NAME: - PlugPlayData.Property = 15; //DevicePropertyEnumeratorName; - break; default: return CR_INVALID_PROPERTY; @@ -706,6 +818,12 @@ ret = NtStatusToCrError(Status); } } + +done:; + *pulTransferLen = (ret != CR_SUCCESS) ? 0 : *pulLength; + + if (hKey != NULL) + RegCloseKey(hKey); DPRINT("PNP_GetDeviceRegProp() done (returns %lx)\n", ret); @@ -2598,7 +2716,7 @@ DWORD len; DWORD DeviceIdLength; - DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT1("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); if (DeviceIdLength) @@ -2620,7 +2738,7 @@ } else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { - DPRINT("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT1("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); /* FIXME: ? */ } else

1 0

[tkreuzer] 51979: [WIN32K] - Add initial code for font driver support
by tkreuzer＠svn.reactos.org 28 May '11

28 May '11

Author: tkreuzer Date: Sat May 28 16:54:10 2011 New Revision: 51979 URL: http://svn.reactos.org/svn/reactos?rev=51979&view=rev Log: [WIN32K] - Add initial code for font driver support Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/enumfont.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ufi.c (with props) branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h (with props) Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/CMakeLists.txt branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/text.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/ntuser.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/gdiobj.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/stubs/stubs.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Sat May 28 16:54:10 2011 @@ -59,7 +59,6 @@ eng/rlecomp.c eng/semaphor.c eng/sort.c - eng/string.c eng/stretchblt.c eng/surface.c eng/transblt.c @@ -138,11 +137,10 @@ objects/dibobj.c objects/drawing.c objects/fillshap.c - objects/font.c - objects/freetype.c objects/gdibatch.c objects/gdidbg.c objects/gdiobj.c + objects/gdipool.c objects/icm.c objects/line.c objects/metafile.c @@ -154,9 +152,23 @@ objects/rect.c objects/region.c objects/stockobj.c - objects/text.c objects/wingl.c objects/xformobj.c + + font/dcfont.c + font/enumfont.c + font/fntdrvsup.c + font/fontdata.c + font/fontrsrc.c + font/glyphcache.c + font/lfont.c + font/rfont.c + font/strobj.c + font/textmetric.c + font/textout.c + font/ufi.c + font/misc.c + stubs/stubs.c stubs/umpdstubs.c win32k.rc) Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat May 28 16:54:10 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,154 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: DC/font related functions + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +#if 0 +PRFONT +NTAPI +DC_prfnt(PDC pdc) +{ + PLFONT plfnt; + PRFONT prfnt; + + /* Check if new font was selected */ + if (pdc->pdcattr->ulDirty_ & DIRTY_TEXT) + { + /* Lock the new font */ + plfnt = LFONT_ShareLockFont(pdc->pdcattr->hlfntNew); + if (plfnt) + { + LFONT_ShareUnlockFont(pdc->dclevel.pFont); + pdc->dclevel.pFont = plfnt; + } + else + { + // FIXME: test how selecting an invalid font is handled + pdc->pdcattr->hlfntNew = pdc->dclevel.pFont; + } + } + + /* Check if font is already realized */ + if (pdc->hlfntCur != pdc->pdcattr->hlfntNew) + { + + prfnt = LFONT_prfntRealizeFont(pdc->dclevel.pFont); + + /* Dereference the old RFONT */ + RFONT_ShareUnlockFont(pdc->prfnt); + + pdc->prfnt = prfnt; + + /* Set as new active font */ + pdc->hlfntCur = pdc->pdcattr->hlfntNew; + } + + ASSERT(prfnt); + return prfnt; +} +#endif + +W32KAPI +BOOL +APIENTRY +NtGdiAddRemoteFontToDC( + IN HDC hdc, + IN PVOID pvBuffer, + IN ULONG cjBuffer, + IN OPTIONAL PUNIVERSAL_FONT_ID pufi) +{ + ASSERT(FALSE); + return FALSE; +} + + +W32KAPI +BOOL +APIENTRY +NtGdiAddEmbFontToDC( + IN HDC hdc, + IN VOID **pFontID) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +ULONG +APIENTRY +NtGdiGetEmbedFonts(VOID) +{ + ASSERT(FALSE); + return FALSE; +} + + +W32KAPI +DWORD +APIENTRY +NtGdiGetCharSet( + IN HDC hdc) +{ + ASSERT(FALSE); +#if 0 + PDC pdc; + + pdc = DC_LockDc(hdc); + if (!pdc) + { + return -1; // FIXME ??? + } + + prfnt = DC_prfnt(pdc); + + jWinCharSet = prfnt->ppfe->pifi->jWinCharSet; + + + return jWinCharSet; +#endif +return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiSetFontXform( + IN HDC hdc, + IN DWORD dwxScale, + IN DWORD dwyScale) +{ + ASSERT(FALSE); + return FALSE; +} + + +W32KAPI +BOOL +APIENTRY +NtGdiSetTextJustification( + IN HDC hdc, + IN INT lBreakExtra, + IN INT cBreak) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +HFONT +APIENTRY +NtGdiSelectFont( + IN HDC hdc, + IN HFONT hf) +{ + ASSERT(FALSE); + return 0; +} Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/enumfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/enumfont.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/enumfont.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,90 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Font enumeration + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +W32KAPI +BOOL +APIENTRY +NtGdiEnumFontChunk( + IN HDC hdc, + IN ULONG_PTR idEnum, + IN ULONG cjEfdw, + OUT ULONG *pcjEfdw, + OUT PENUMFONTDATAW pefdw) +{ + ASSERT(FALSE); +#if 0 + PEFSTATE pefstate; + + /* Lock the EFSTATE object */ + pefstate = GDIOBJ_LockObject((HGDIOBJ)idEnum, GDIObjType_EFSTATE_TYPE); + if (!pefstate) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + +#endif + return 0; +} + +W32KAPI +ULONG_PTR +APIENTRY +NtGdiEnumFontOpen( + IN HDC hdc, + IN ULONG iEnumType, + IN FLONG flWin31Compat, + IN ULONG cwchMax, + IN OPTIONAL LPWSTR pwszFaceName, + IN ULONG lfCharSet, + OUT ULONG *pulCount) +{ + ULONG_PTR idEnum = 0; + + ASSERT(FALSE); + + /* Allocate an EFSTATE object */ + + + return idEnum; +} + + +W32KAPI +BOOL +APIENTRY +NtGdiEnumFontClose( + IN ULONG_PTR idEnum) +{ + + /* Verify that idEnum is a handle to an EFSTATE object */ + if (((idEnum >> 16) & 0x1f) != GDIObjType_EFSTATE_TYPE) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Delete the object */ + return GreDeleteObject((HGDIOBJ)idEnum); +} + +W32KAPI +ULONG +APIENTRY +NtGdiSetFontEnumeration( + IN ULONG ulType) +{ + ASSERT(FALSE); + return 0; +} + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/enumfont.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,210 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +BOOL gbAttachedCSRSS; + +HSEMAPHORE ghsemFontDriver; +LIST_ENTRY gleFontDriverList = {&gleFontDriverList, &gleFontDriverList}; + + +BOOL FASTCALL +InitFontSupport(VOID) +{ + ghsemFontDriver = EngCreateSemaphore(); + if (!ghsemFontDriver) return FALSE; + return TRUE; +} + + +typedef struct _FONTDEV +{ + LIST_ENTRY leLink; + DHPDEV dhpdev; + PLDEVOBJ pldev; + HSURF ahsurf[HS_DDI_MAX]; + DEVINFO devinfo; + + GDIINFO gdiinfo; // FIXME: something else? +} FONTDEV, *PFONTDEV; + +C_ASSERT(sizeof(GDIINFO) == 0x130); + + +//static +VOID +AttachCSRSS(KAPC_STATE *pApcState) +{ + ASSERT(gpepCSRSS); + KeStackAttachProcess(&gpepCSRSS->Pcb, pApcState); + gbAttachedCSRSS = TRUE; +} + +//static +VOID +DetachCSRSS(KAPC_STATE *pApcState) +{ + ASSERT(gbAttachedCSRSS); + KeUnstackDetachProcess(pApcState); + gbAttachedCSRSS = FALSE; +} + + +ULONG_PTR +FONTDEV_LoadFontFile( + PFONTDEV pfntdev, + ULONG cFiles, + ULONG_PTR *piFile, + PVOID *ppvView, + ULONG *pcjView, + DESIGNVECTOR *pdv, + ULONG ulLangID, + ULONG ulFastCheckSum) +{ + HFF hff; + ASSERT(gbAttachedCSRSS); + + /* Call the drivers DrvLoadFontFile function */ + hff = pfntdev->pldev->pfn.LoadFontFile(cFiles, + piFile, + ppvView, + pcjView, + pdv, + ulLangID, + ulFastCheckSum); + + if (hff == 0) return 0; + + return hff; + +} + +#if 0 +EngLoadFontFileFD( + PPFF ppff, +{ + KAPC_STATE ApcState; + ULONG_PTR aiFile[FD_MAX_FILES]; + PVOID apvView[FD_MAX_FILES]; + ULONG acjView[FD_MAX_FILES]; + ULONG ulLangID = 0; + HFF hff = 0; + + /* Loop all files */ + for (i = 0; i < ppff->cFiles; i++) + { + /* Setup the file array */ + aiFile[i] = (ULONG_PTR)ppff->ppfv[i]; + + /* Map the font file */ + bResult = EngMapFontFileFD(aiFile[i], &apvView[i], &acjView[i]); + } + + /* Attach to CSRSS */ + AttachCSRSS(&ApcState); + + /* Loop all installed font drivers */ + for (pfntdev = gleFontDriverList.Flink; + pfntdev != &gleFontDriverList; + pfntdev = pfntdev->leLink.Flink) + { + /* Try to load the font file */ + hff = FONTDEV_LoadFontFile(pfntdev, + cFiles, + aiFile, + apvView, + acjView, + pdv, + ulLangID, + ppff->ulCheckSum); + if (hff) + { + ppff->hff = hff; + break; + } + } + + /* Detach from CSRSS */ + DetachCSRSS(&ApcState) + +} +#endif + +BOOL +EngLoadFontDriver( + IN PWSTR pwszDriverName) +{ + PLDEVOBJ pldev; + PFONTDEV pfntdev; + + /* Load the driver */ + pldev = EngLoadImageEx(pwszDriverName, LDEV_FONT); + if (!pldev) + { + DPRINT1("Failed to load freetype font driver\n"); + return FALSE; + } + + // CHECK if all functions are there + + + /* Allocate a FONTDEV structure */ + pfntdev = EngAllocMem(0, sizeof(FONTDEV), 'vdfG'); + if (!pfntdev) + { + DPRINT1("Failed to allocate FONTDEV structure\n"); + EngUnloadImage(pldev); + return FALSE; + } + + pfntdev->pldev = pldev; + + /* Call the drivers DrvEnablePDEV function */ + pfntdev->dhpdev = pldev->pfn.EnablePDEV(NULL, + NULL, + HS_DDI_MAX, + pfntdev->ahsurf, + sizeof(GDIINFO), + &pfntdev->gdiinfo, + sizeof(DEVINFO), + &pfntdev->devinfo, + (HDEV)pfntdev, + NULL, + NULL); + + /* Call the drivers DrvCompletePDEV function */ + pldev->pfn.CompletePDEV(pfntdev->dhpdev, (HDEV)pfntdev); + + /* Insert the driver into the list */ + EngAcquireSemaphore(ghsemFontDriver); + InsertTailList(&gleFontDriverList, &pfntdev->leLink); + EngReleaseSemaphore(ghsemFontDriver); + + return TRUE; +} + +VOID +NTAPI +GreStartupFontDrivers(VOID) +{ + /* Load freetype font driver */ + if (!EngLoadFontDriver(L"ftfd.dll")) + { + DPRINT1("Could not load freetype font driver\n"); + KeBugCheck(VIDEO_DRIVER_INIT_FAILURE); + } + + + /* TODO: Enumerate installed font drivers */ + DPRINT1("############ Started font drivers\n"); +} + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,149 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +W32KAPI +ULONG +APIENTRY +NtGdiGetFontData( + IN HDC hdc, + IN DWORD dwTable, + IN DWORD dwOffset, + OUT OPTIONAL PVOID pvBuf, + IN ULONG cjBuf) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetWidthTable( + IN HDC hdc, + IN ULONG cSpecial, + IN WCHAR *pwc, + IN ULONG cwc, + OUT USHORT *psWidth, + OUT OPTIONAL WIDTHDATA *pwd, + OUT FLONG *pflInfo) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +INT +APIENTRY +NtGdiGetTextFaceW( + IN HDC hdc, + IN INT cChar, + OUT OPTIONAL LPWSTR pszOut, + IN BOOL bAliasName) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +INT +APIENTRY +NtGdiGetTextCharsetInfo( + IN HDC hdc, + OUT OPTIONAL LPFONTSIGNATURE lpSig, + IN DWORD dwFlags) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +DWORD +APIENTRY +NtGdiGetFontUnicodeRanges( + IN HDC hdc, + OUT OPTIONAL LPGLYPHSET pgs) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +DWORD +APIENTRY +NtGdiGetGlyphIndicesW( + IN HDC hdc, + IN OPTIONAL LPWSTR pwc, + IN INT cwc, + OUT OPTIONAL LPWORD pgi, + IN DWORD iMode) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +DWORD +APIENTRY +NtGdiGetGlyphIndicesWInternal( + IN HDC hdc, + IN OPTIONAL LPWSTR pwc, + IN INT cwc, + OUT OPTIONAL LPWORD pgi, + IN DWORD iMode, + IN BOOL bSubset) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +ULONG +APIENTRY +NtGdiGetKerningPairs( + IN HDC hdc, + IN ULONG cPairs, + OUT OPTIONAL KERNINGPAIR *pkpDst) +{ + ASSERT(FALSE); + return 0; +} + + +W32KAPI +BOOL +APIENTRY +NtGdiGetRealizationInfo( + IN HDC hdc, + OUT PREALIZATION_INFO pri, + IN HFONT hf) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +ULONG +APIENTRY +NtGdiGetGlyphOutline( + IN HDC hdc, + IN WCHAR wch, + IN UINT iFormat, + OUT LPGLYPHMETRICS pgm, + IN ULONG cjBuf, + OUT OPTIONAL PVOID pvBuf, + IN LPMAT2 pmat2, + IN BOOL bIgnoreRotation) +{ + ASSERT(FALSE); + return 0; +} Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontdata.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,307 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Font resource handling + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +HSEMAPHORE ghsemPFFList; +PPFF gppffList; +LIST_ENTRY glePFFList = {&glePFFList, &glePFFList}; + + +static +BOOL +ComparePFF( + PPFF ppff, + ULONG cFiles, + PFONTFILEVIEW pffv[]) +{ + ULONG i; + ASSERT(cFiles >= 1 && cFiles <= FD_MAX_FILES); + + /* Check if number of files matches */ + if (ppff->cFiles != cFiles) return FALSE; + + /* Loop all files */ + for (i = 0; i < cFiles; i++) + { + /* Check if the files match */ + if (pffv[i] != ppff->ppfv[i]) return FALSE; + } + + return TRUE; +} + +PPFF +NTAPI +EngLoadFontFile( + IN PWCHAR apwszFiles[], + IN ULONG cFiles) +{ + PFONTFILEVIEW apffv[FD_MAX_FILES]; + PLIST_ENTRY ple; + PPFF ppff; + ULONG i, cjSize; + + /* Loop the files */ + for (i = 0; i < cFiles; i++) + { + /* Try to load the file */ + apffv[i] = (PVOID)EngLoadModuleEx(apwszFiles[i], 0, FVF_FONTFILE); + if (!apffv[i]) + { + /* Cleanup and return */ + while (i--) EngFreeModule(apffv[i]); + return NULL; + } + } + + /* Acquire PFF list lock */ + EngAcquireSemaphore(ghsemPFFList); + + /* Loop all physical font files (PFF) */ + for (ple = glePFFList.Flink; ple != &glePFFList; ple = ple->Flink) + { + ppff = CONTAINING_RECORD(ple, PFF, leLink); + + /* Check if the files are already loaded */ + if (ComparePFF(ppff, cFiles, apffv)) + { + /* Unload the loaded files */ + while (i--) EngFreeModule(apffv[i]); + goto leave; + } + } + + /* Allocate a new PFF */ + cjSize = sizeof(PFF) + cFiles * sizeof(PVOID); + ppff = EngAllocMem(0, cjSize, 'ffpG'); + if (!ppff) + { + goto leave; + } + + ppff->sizeofThis = cjSize; + ppff->cFiles = cFiles; + ppff->ppfv = (PVOID)(ppff + 1); + + /* Copy the FONTFILEVIEWs */ + for (i = 0; i < cFiles; i++) ppff->ppfv[i] = apffv[i]; + + /* Insert the PFF into the list */ + InsertTailList(&glePFFList, &ppff->leLink); + +leave: + /* Release PFF list lock */ + EngReleaseSemaphore(ghsemPFFList); + + return ppff; +} + +INT +NTAPI +GreAddFontResourceInternal( + IN PWCHAR apwszFiles[], + IN ULONG cFiles, + IN FLONG f, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) +{ + + + ASSERT(FALSE); + return 0; +} + +static +BOOL +SeperateFileNames( + PWCHAR apwszFiles[], + PWCHAR pwcDest, + PWCHAR pwszFiles, + ULONG cwc, + ULONG cFiles) +{ + PWCHAR pwszEnd = pwszFiles + cwc; + WCHAR wc; + ULONG i = 0; + + apwszFiles[0] = pwcDest; + + /* Loop the file name string */ + while (pwszFiles < pwszEnd) + { + wc = *pwszFiles++; + + /* Must not be terminated before the end */ + if (wc == 0) return FALSE; + + /* Check for a seperator */ + if (wc == '|') + { + /* Zero terminate current path name */ + *pwcDest++ = 0; + + /* Go to next file name and check if its too many */ + if (++i >= cFiles) return FALSE; + apwszFiles[i] = pwcDest; + } + else + { + *pwcDest++ = wc; + } + } + + /* Must be terminated now */ + if (*pwszFiles != 0 || i != cFiles - 1) + { + return FALSE; + } + + return TRUE; +} + + +W32KAPI +INT +APIENTRY +NtGdiAddFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN FLONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) +{ + PVOID pvBuffer; + PWCHAR apwszFiles[FD_MAX_FILES]; + ULONG cjSize; + DESIGNVECTOR dv; + INT iRes = 0; + + /* Check parameters */ + if (cFiles > FD_MAX_FILES || cwc < 3 || cwc > FD_MAX_FILES * MAX_PATH) + { + return 0; + } + + /* Allocate a buffer */ + pvBuffer = EngAllocMem(0, (cwc + 1) * sizeof(WCHAR), 'pmTG'); + if (!pvBuffer) + { + return 0; + } + + _SEH2_TRY + { + ProbeForRead(pwszFiles, cwc * sizeof(WCHAR), 2); + if (!SeperateFileNames(apwszFiles, pvBuffer, pwszFiles, cwc, cFiles)) + { + _SEH2_YIELD(goto cleanup); + } + + /* Check if we have a DESIGNVECTOR */ + if (pdv) + { + /* Probe and check first 2 fields */ + ProbeForRead(pdv, 2 * sizeof(DWORD), sizeof(DWORD)); + if (pdv->dvReserved != STAMP_DESIGNVECTOR || + pdv->dvNumAxes > MM_MAX_NUMAXES) + { + _SEH2_YIELD(goto cleanup); + } + + /* Copy the vector */ + cjSize = FIELD_OFFSET(DESIGNVECTOR, dvValues) + pdv->dvNumAxes * sizeof(LONG); + ProbeForRead(pdv, cjSize, sizeof(DWORD)); + RtlCopyMemory(&dv, pdv, cjSize); + pdv = &dv; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(goto cleanup); + } + _SEH2_END + + /* Call the internal function */ + iRes = GreAddFontResourceInternal(apwszFiles, cFiles, fl, dwPidTid, pdv); + +cleanup: + EngFreeMem(pvBuffer); + + return iRes; +} + +W32KAPI +HANDLE +APIENTRY +NtGdiAddFontMemResourceEx( + IN PVOID pvBuffer, + IN DWORD cjBuffer, + IN DESIGNVECTOR *pdv, + IN ULONG cjDV, + OUT DWORD *pNumFonts) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiRemoveFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN ULONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiRemoveFontMemResourceEx( + IN HANDLE hMMFont) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiUnmapMemFont( + IN PVOID pvView) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetFontResourceInfoInternalW( + IN LPWSTR pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN UINT cjIn, + OUT LPDWORD pdwBytes, + OUT LPVOID pvBuf, + IN DWORD iType) +{ + ASSERT(FALSE); + return 0; +} + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,97 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +INT +FASTCALL +LFONT_GetObject(PLFONT plfnt, INT cjSize, PVOID pvBuffer) +{ + ASSERT(FALSE); + return 0; +} + +HFONT +NTAPI +GreHfontCreate( + IN ENUMLOGFONTEXDVW *pelfw, + IN ULONG cjElfw, + IN LFTYPE lft, + IN FLONG fl, + IN PVOID pvCliData) +{ + PLFONT plfnt; + HFONT hfont; + + /* Allocate an LFONT object */ + plfnt = (PLFONT)GDIOBJ_AllocObjWithHandle(GDIObjType_LFONT_TYPE << 16, sizeof(LFONT)); + if (!plfnt) + { + DPRINT1("Could not allocate LFONT object\n"); + return 0; + } + + /* Get the handle */ + hfont = plfnt->baseobj.hHmgr; + + /* Set the fields */ + plfnt->lft = lft; + plfnt->fl = fl; + plfnt->elfexw = *pelfw; + + /* Set client data */ + GDIOBJ_vSetObjectAttr(&plfnt->baseobj, pvCliData); + + /* Unlock the object */ + GDIOBJ_vUnlockObject(&plfnt->baseobj); + + /* Return the handle */ + return hfont; +} + + +W32KAPI +HFONT +APIENTRY +NtGdiHfontCreate( + IN ENUMLOGFONTEXDVW *pelfw, + IN ULONG cjElfw, + IN LFTYPE lft, + IN FLONG fl, + IN PVOID pvCliData) +{ + ENUMLOGFONTEXDVW elfw; + + if (!pelfw) + { + DPRINT1("NtGdiHfontCreate: pelfw == NULL\n"); + return NULL; + } + + /* Set maximum logfont size */ + if (cjElfw > sizeof(elfw)) cjElfw = sizeof(elfw); + + /* Enter SEH for buffer copy */ + _SEH2_TRY + { + ProbeForRead(pelfw, cjElfw, 1); + RtlCopyMemory(&elfw, pelfw, cjElfw); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return NULL;) + } + _SEH2_END + + /* Call internal function */ + return GreHfontCreate(&elfw, cjElfw, lft, fl, pvCliData); +} + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,227 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + + +W32KAPI +BOOL +APIENTRY +NtGdiAnyLinkedFonts(VOID) +{ + ASSERT(FALSE); + return FALSE; +} + + +W32KAPI +INT +APIENTRY +NtGdiSetupPublicCFONT( + IN HDC hdc, + IN OPTIONAL HFONT hf, + IN ULONG ulAve) +{ + ASSERT(FALSE); + return 0; +} + +PVOID +APIENTRY +EngFntCacheAlloc(IN ULONG FastCheckSum, + IN ULONG ulSize) +{ + ASSERT(FALSE); + return NULL; +} + +VOID +APIENTRY +EngFntCacheFault(IN ULONG ulFastCheckSum, + IN ULONG iFaultMode) +{ + ASSERT(FALSE); +} + +PVOID +APIENTRY +EngFntCacheLookUp(IN ULONG FastCheckSum, + OUT PULONG pulSize) +{ + ASSERT(FALSE); + return NULL; +} + +W32KAPI +ULONG +APIENTRY +NtGdiQueryFontAssocInfo( + IN HDC hdc) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +ULONG +APIENTRY +NtGdiMakeFontDir( + IN FLONG flEmbed, + OUT PBYTE pjFontDir, + IN unsigned cjFontDir, + IN LPWSTR pwszPathname, + IN unsigned cjPathname) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiAddRemoteMMInstanceToDC( + IN HDC hdc, + IN DOWNLOADDESIGNVECTOR *pddv, + IN ULONG cjDDV) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiFontIsLinked( + IN HDC hdc) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetRasterizerCaps( + OUT LPRASTERIZER_STATUS praststat, + IN ULONG cjBytes) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiChangeGhostFont( + IN KERNEL_PVOID *pfontID, + IN BOOL bLoad) +{ + ASSERT(FALSE); + return 0; +} + + +W32KAPI +BOOL +APIENTRY +NtGdiEudcLoadUnloadLink( + IN OPTIONAL LPCWSTR pBaseFaceName, + IN UINT cwcBaseFaceName, + IN LPCWSTR pEudcFontPath, + IN UINT cwcEudcFontPath, + IN INT iPriority, + IN INT iFontLinkType, + IN BOOL bLoadLin) +{ + ASSERT(FALSE); + return FALSE; +} + + +// *********** hacks + +ULONG +FASTCALL +ftGdiGetGlyphOutline( + PDC dc, + WCHAR wch, + UINT iFormat, + LPGLYPHMETRICS pgm, + ULONG cjBuf, + PVOID pvBuf, + LPMAT2 pmat2, + BOOL bIgnoreRotation) +{ + ASSERT(FALSE); + return 0; +} + +int APIENTRY +NtGdiGetFontFamilyInfo(HDC Dc, + LPLOGFONTW UnsafeLogFont, + PFONTFAMILYINFO UnsafeInfo, + DWORD Size) +{ + return 0; +} + +NTSTATUS FASTCALL +TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) +{ + *NewFont = GreHfontCreate((PVOID)lf, sizeof(LOGFONTW), 0, 0, 0); + if (*NewFont) return STATUS_SUCCESS; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +FASTCALL +TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) +{ + ASSERT(FALSE); + return -1; +} + +DWORD +FASTCALL +IntGetCharDimensions(HDC hdc, PTEXTMETRICW ptm, PDWORD height) +{ + ASSERT(FALSE); + return -1; +} + +INT +FASTCALL +ftGdiGetTextCharsetInfo( + PDC Dc, + LPFONTSIGNATURE lpSig, + DWORD dwFlags) +{ + ASSERT(FALSE); + return 0; +} + +DWORD +FASTCALL +IntGetFontLanguageInfo(PDC Dc) +{ + ASSERT(FALSE); + return 0; +} + +PTEXTOBJ +FASTCALL +RealizeFontInit(HFONT hFont) +{ + ASSERT(FALSE); + return 0; +} + + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,126 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +ULONG +APIENTRY +FONTOBJ_cGetAllGlyphHandles ( + IN FONTOBJ *FontObj, + IN HGLYPH *Glyphs + ) +{ + ASSERT(FALSE); + return 0; +} + +ULONG +APIENTRY +FONTOBJ_cGetGlyphs( + IN FONTOBJ *FontObj, + IN ULONG Mode, + IN ULONG NumGlyphs, + IN HGLYPH *GlyphHandles, + IN PVOID *OutGlyphs) +{ + ASSERT(FALSE); + return 0; +} + +IFIMETRICS* +APIENTRY +FONTOBJ_pifi(IN FONTOBJ *pfo) +{ + ASSERT(FALSE); + return NULL; +} + +PVOID +APIENTRY +FONTOBJ_pvTrueTypeFontFile( + IN FONTOBJ *FontObj, + IN ULONG *FileSize) +{ + ASSERT(FALSE); + return NULL; +} + +#undef XFORMOBJ +WIN32KAPI +XFORMOBJ* +APIENTRY +FONTOBJ_pxoGetXform( + IN FONTOBJ *pfo) +{ + ASSERT(FALSE); + return NULL; +} + +/* + * @unimplemented + */ +VOID +APIENTRY +FONTOBJ_vGetInfo( + IN FONTOBJ *FontObj, + IN ULONG InfoSize, + OUT PFONTINFO FontInfo) +{ + ASSERT(FALSE); +} + +/* + * @unimplemented + */ +FD_GLYPHSET * APIENTRY +FONTOBJ_pfdg( + IN FONTOBJ *FontObj) +{ + ASSERT(FALSE); + return NULL; +} + +/* + * @unimplemented + */ +PBYTE APIENTRY +FONTOBJ_pjOpenTypeTablePointer( + IN FONTOBJ *FontObj, + IN ULONG Tag, + OUT ULONG *Table) +{ + ASSERT(FALSE); + return NULL; +} + +/* + * @unimplemented + */ +PFD_GLYPHATTR APIENTRY +FONTOBJ_pQueryGlyphAttrs( + IN FONTOBJ *FontObj, + IN ULONG Mode) +{ + ASSERT(FALSE); + return NULL; +} + +/* + * @unimplemented + */ +LPWSTR APIENTRY +FONTOBJ_pwszFontFilePaths( + IN FONTOBJ *FontObj, + OUT ULONG *PathLength) +{ + ASSERT(FALSE); + return NULL; +} Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,84 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + + +BOOL +APIENTRY +STROBJ_bEnum( + IN STROBJ *pstro, + OUT ULONG *pc, + OUT PGLYPHPOS *ppgpos) +{ + ASSERT(FALSE); + return FALSE; +} + +DWORD +APIENTRY +STROBJ_dwGetCodePage(IN STROBJ *pstro) +{ + ASSERT(FALSE); + return FALSE; +} + +VOID +APIENTRY +STROBJ_vEnumStart(IN STROBJ *pstro) +{ + ASSERT(FALSE); +} + +BOOL +APIENTRY +STROBJ_bEnumPositionsOnly( + IN STROBJ *StringObj, + OUT ULONG *Count, + OUT PGLYPHPOS *Pos) +{ + ASSERT(FALSE); + return (BOOL) DDI_ERROR; +} + +ENGAPI +BOOL +APIENTRY +STROBJ_bGetAdvanceWidths( + STROBJ *pso, + ULONG iFirst, + ULONG c, + POINTQF *pptqD) +{ + ASSERT(FALSE); + return FALSE; +} + +ENGAPI +FIX +APIENTRY +STROBJ_fxBreakExtra( + STROBJ *pstro) +{ + ASSERT(FALSE); + return 0; +} + +ENGAPI +FIX +APIENTRY +STROBJ_fxCharacterExtra( + STROBJ *pstro) +{ + ASSERT(FALSE); + return 0; +} + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,136 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +W32KAPI +BOOL +APIENTRY +NtGdiGetTextMetricsW( + IN HDC hdc, + OUT TMW_INTERNAL * ptm, + IN ULONG cj) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetETM( + IN HDC hdc, + OUT EXTTEXTMETRIC *petm) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetCharABCWidthsW( + IN HDC hdc, + IN UINT wchFirst, + IN ULONG cwch, + IN OPTIONAL PWCHAR pwch, + IN FLONG fl, + OUT PVOID pvBuf) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +DWORD +APIENTRY +NtGdiGetCharacterPlacementW( + IN HDC hdc, + IN LPWSTR pwsz, + IN INT nCount, + IN INT nMaxExtent, + IN OUT LPGCP_RESULTSW pgcpw, + IN DWORD dwFlags) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetCharWidthW( + IN HDC hdc, + IN UINT wcFirst, + IN UINT cwc, + IN OPTIONAL PWCHAR pwc, + IN FLONG fl, + OUT PVOID pvBuf) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetCharWidthInfo( + IN HDC hdc, + OUT PCHWIDTHINFO pChWidthInfo) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +ULONG +APIENTRY +NtGdiGetOutlineTextMetricsInternalW( + IN HDC hdc, + IN ULONG cjotm, + OUT OPTIONAL OUTLINETEXTMETRICW *potmw, + OUT TMDIFF *ptmd) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetTextExtent( + IN HDC hdc, + IN LPWSTR lpwsz, + IN INT cwc, + OUT LPSIZE psize, + IN UINT flOpts) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetTextExtentExW( + IN HDC hdc, + IN OPTIONAL LPWSTR lpwsz, + IN ULONG cwc, + IN ULONG dxMax, + OUT OPTIONAL ULONG *pcCh, + OUT OPTIONAL PULONG pdxOut, + OUT LPSIZE psize, + IN FLONG fl) +{ + ASSERT(FALSE); + return FALSE; +} + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,111 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Text output + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +/* + * @unimplemented + */ +BOOL +APIENTRY +EngTextOut ( + SURFOBJ *pso, + STROBJ *pstro, + FONTOBJ *pfo, + CLIPOBJ *pco, + RECTL *prclExtra, + RECTL *prclOpaque, + BRUSHOBJ *pboFore, + BRUSHOBJ *pboOpaque, + POINTL *pptlOrg, + MIX mix + ) +{ + ASSERT(FALSE); + return FALSE; +} + +BOOL +APIENTRY +GreExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL PRECTL lprc, + IN LPWSTR String, + IN INT Count, + IN OPTIONAL LPINT Dx, + IN DWORD dwCodePage) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiExtTextOutW( + IN HDC hdc, + IN INT x, + IN INT y, + IN UINT flOpts, + IN OPTIONAL LPRECT prcl, + IN LPWSTR pwsz, + IN INT cwc, + IN OPTIONAL LPINT pdx, + IN DWORD dwCodePage) +{ + ASSERT(FALSE); + return 0; +} + + +BOOL +APIENTRY +NtGdiPolyTextOutW( + IN HDC hdc, + IN POLYTEXTW *pptw, + IN UINT cStr, + IN DWORD dwCodePage) +{ + ASSERT(FALSE); + return FALSE; +} + + +W32KAPI +UINT +APIENTRY +NtGdiGetStringBitmapW( + IN HDC hdc, + IN LPWSTR pwsz, + IN UINT cwc, + OUT BYTE *lpSB, + IN UINT cj) +{ + ASSERT(FALSE); + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiConsoleTextOut( + IN HDC hdc, + IN POLYTEXTW *lpto, + IN UINT nStrings, + IN RECTL *prclBounds) +{ + ASSERT(FALSE); + return FALSE; +} + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ufi.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ufi.c (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ufi.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,120 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <win32k.h> +#include <include/font.h> + +#define NDEBUG +#include <debug.h> + +W32KAPI +BOOL +APIENTRY +NtGdiGetUFI( + IN HDC hdc, + OUT PUNIVERSAL_FONT_ID pufi, + OUT OPTIONAL DESIGNVECTOR *pdv, + OUT ULONG *pcjDV, + OUT ULONG *pulBaseCheckSum, + OUT FLONG *pfl) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetEmbUFI( + IN HDC hdc, + OUT PUNIVERSAL_FONT_ID pufi, + OUT OPTIONAL DESIGNVECTOR *pdv, + OUT ULONG *pcjDV, + OUT ULONG *pulBaseCheckSum, + OUT FLONG *pfl, + OUT KERNEL_PVOID *embFontID) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetUFIPathname( + IN PUNIVERSAL_FONT_ID pufi, + OUT OPTIONAL ULONG* pcwc, + OUT OPTIONAL LPWSTR pwszPathname, + OUT OPTIONAL ULONG* pcNumFiles, + IN FLONG fl, + OUT OPTIONAL BOOL *pbMemFont, + OUT OPTIONAL ULONG *pcjView, + OUT OPTIONAL PVOID pvView, + OUT OPTIONAL BOOL *pbTTC, + OUT OPTIONAL ULONG *piTTC) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiSetLinkedUFIs( + IN HDC hdc, + IN PUNIVERSAL_FONT_ID pufiLinks, + IN ULONG uNumUFIs) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +INT +APIENTRY +NtGdiGetLinkedUFIs( + IN HDC hdc, + OUT OPTIONAL PUNIVERSAL_FONT_ID pufiLinkedUFIs, + IN INT BufferSize) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiForceUFIMapping( + IN HDC hdc, + IN PUNIVERSAL_FONT_ID pufi) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +BOOL +APIENTRY +NtGdiRemoveMergeFont( + IN HDC hdc, + IN UNIVERSAL_FONT_ID *pufi) +{ + ASSERT(FALSE); + return FALSE; +} + +W32KAPI +INT +APIENTRY +NtGdiQueryFonts( + OUT PUNIVERSAL_FONT_ID pufiFontList, + IN ULONG nBufferSize, + OUT PLARGE_INTEGER pTimeStamp) +{ + ASSERT(FALSE); + return FALSE; +} Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/ufi.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Sat May 28 16:54:10 2011 @@ -1,0 +1,218 @@ + +#define LFONT_GetObject FontGetObject + +#define ENGAPI + +#define FD_MAX_FILES 4 + +extern PEPROCESS gpepCSRSS; + +typedef struct _POINTEF +{ + FLOATOBJ x; + FLOATOBJ y; +} POINTEF, *PPOINTEF; + +typedef struct _RFONT *PRFONT; + +typedef struct _PFF +{ + ULONG sizeofThis; + LIST_ENTRY leLink; + PWSTR pwszPathname; + ULONG cwc; + ULONG cFiles; + FLONG flState; + ULONG cLoaded; + ULONG cNotEnum; + ULONG cRFONT; + PRFONT prfntList; + HFF hff; + HDEV hdev; + DHPDEV dhpdev; + void *pfhFace; + void *pfhFamily; + void *pfhUFI; + struct _PFT *pPFT; + ULONG ulCheckSum; + ULONG cFonts; + PFONTFILEVIEW *ppfv; + void *pPvtDataHead; +} PFF, *PPFF; + +typedef struct _PFE +{ + PFF * pPFF; + ULONG_PTR iFont; + FLONG flPFE; + FD_GLYPHSET * pfdg; + ULONG_PTR ulpId; + IFIMETRICS * pifi; + ULONG_PTR idifi; + FD_KERNINGPAIR *pkp; + ULONG_PTR idkp; + ULONG ckp; + ULONG iOrieintation; + ULONG cjEfdwPFE; + //GISET * pgiset; + ULONG ulTimeStamp; + UNIVERSAL_FONT_ID ufi; + DWORD pid; + DWORD tid; + LIST_ENTRY ql; + void * pFlEntry; + ULONG cAlt; + ULONG cPfdgRef; + ULONG aiFamilyName[1]; +} PFE, *PPFE; + +typedef struct +{ + PRFONT prfntPrev; + PRFONT prfntNext; +} RFONTLINK, *PRFONTLINK; + +typedef struct _CACHE +{ + GLYPHDATA *pgdNext; + GLYPHDATA *pgdThreshold; + PBYTE pjFirstBlockEnd; + void *pdblBase; + ULONG cMetrics; + ULONG cjbbl; + ULONG cBlocksMax; + ULONG cBlocks; + ULONG cGlyphs; + ULONG cjTotal; + void * pbblBase; + void * pbblCur; + GLYPHBITS * pgbNext; + GLYPHBITS * pgbThreshold; + PBYTE pjAuxCacheMem; + ULONG cjAuxCacheMem; + ULONG cjGlyphMax; + BOOL bSmallMetrics; + ULONG iMax; + ULONG iFirst; + ULONG cBits; +} CACHE; + +typedef struct _RFONT +{ + FONTOBJ fobj; + + HDEV hdevProducer; + HDEV hdevConsumer; + DHPDEV dhpdev; + + PFE * ppfe; + PFF * pPFF; + RFONTLINK rflPDEV; + RFONTLINK rflPFF; + PRFONT prfntSystemTT; + PRFONT prfntSysEUDC; + PRFONT prfntDefEUDC; + PRFONT *paprfntFaceName; + PRFONT aprfntQuickBuff[8]; + + FLONG flType; + FLONG flInfo; + FLONG flEUDCState; + ULONG ulContent; + ULONG ulTimeStamp; + ULONG uiNumLinks; + ULONG iGraphicsMode; + ULONG ulOrientation; + ULONG cBitsPerPel; + BOOL bVertical; + BOOL bDeviceFont; + BOOL bIsSystemFont; + BOOL bNeededPaths; + BOOL bFilledEudcArray; + + + FD_XFORM fdx; + FD_DEVICEMETRICS fddm; + FIX fxMaxExtent; + POINTFX ptfxMaxAscent; + POINTFX ptfxMaxDescent; + TEXTMETRICW *ptmw; + FD_GLYPHSET *pfdg; + HGLYPH *phg; + HGLYPH hgBreak; + FIX fxBreak; + void *wcgp; + + + MATRIX mxWorldToDevice; + MATRIX mxForDDI; + //EXFORMOBJ xoForDDI; + + POINTEF pteUnitAscent; + FLOATOBJ efWtoDAscent; + FLOATOBJ efDtoWAscent; + + POINTEF pteUnitBase; + FLOATOBJ efWtoDBase; + FLOATOBJ efDtoWBase; + + FLOATOBJ efWtoDEsc; + FLOATOBJ efDtoWEsc; + FLOATOBJ efEscToBase; + FLOATOBJ efEscToAscent; + FLOATOBJ efDtoWBase_31; + FLOATOBJ efDtoWAscent_31; + + POINTEF eptflNtoWScale; + + ULONG bNtoWIdent; + LONG lCharInc; + LONG lMaxAscent; + LONG lMaxHeight; + LONG lAscent; + LONG lEscapement; + ULONG cSelected; + + HSEMAPHORE hsemCache; + HSEMAPHORE hsemCache1; + CACHE cache; + + POINTL ptlSim; +} RFONT; + +typedef struct _LFONT +{ + BASEOBJECT baseobj; + LFTYPE lft; + FLONG fl; + PPDEVOBJ ppdev; + HGDIOBJ hPFE; + WCHAR awchFace[LF_FACESIZE]; + ENUMLOGFONTEXDVW elfexw; +} LFONT, *PLFONT; + +FORCEINLINE +PLFONT +LFONT_ShareLockFont(HFONT hfont) +{ + return (PLFONT)GDIOBJ_ReferenceObjectByHandle(hfont, GDIObjType_LFONT_TYPE); +} + +FORCEINLINE +VOID +LFONT_ShareUnlockFont(PLFONT plfnt) +{ + GDIOBJ_vDereferenceObject(&plfnt->baseobj); +} + + + +HFONT +NTAPI +GreHfontCreate( + IN ENUMLOGFONTEXDVW *pelfw, + IN ULONG cjElfw, + IN LFTYPE lft, + IN FLONG fl, + IN PVOID pvCliData); + Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/text.h [iso-8859-1] Sat May 28 16:54:10 2011 @@ -58,21 +58,7 @@ #define TEXTOBJECT_INIT 0x00010000 /* GDI logical font object */ -typedef struct -{ - /* Header for all gdi objects in the handle table. - Do not (re)move this. */ - BASEOBJECT BaseObject; - LFTYPE lft; - FLONG fl; - FONTOBJ *Font; - WCHAR FullName[LF_FULLFACESIZE]; - WCHAR Style[LF_FACESIZE]; - WCHAR FaceName[LF_FACESIZE]; - DWORD dwOffsetEndArray; -// Fixed: - ENUMLOGFONTEXDVW logfont; -} TEXTOBJ, *PTEXTOBJ; +typedef struct _LFONT TEXTOBJ, *PTEXTOBJ; /* Internal interface */ Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -128,6 +128,9 @@ return STATUS_SUCCESS; } +PEPROCESS gpepCSRSS; + +VOID NTAPI GreStartupFontDrivers(VOID); /* Called from win32csr. */ @@ -158,6 +161,9 @@ UserLeave(); return STATUS_UNSUCCESSFUL; } + + /* Safe CSRSS EPROCESS pointer */ + gpepCSRSS = PsGetCurrentProcess(); // Initialize Power Request List. // Initialize Media Change. @@ -166,6 +172,7 @@ // Startup DxGraphics. // calls ** IntGdiGetLanguageID() and sets it **. // Enables Fonts drivers, Initialize Font table & Stock Fonts. + GreStartupFontDrivers(); // } /* Initialize USER */ Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -215,7 +215,7 @@ InitLookasideList(GDIObjType_PATH_TYPE, sizeof(PATH)); InitLookasideList(GDIObjType_PAL_TYPE, sizeof(PALETTE)); InitLookasideList(GDIObjType_ICMLCS_TYPE, sizeof(COLORSPACE)); - InitLookasideList(GDIObjType_LFONT_TYPE, sizeof(TEXTOBJ)); + //InitLookasideList(GDIObjType_LFONT_TYPE, sizeof(TEXTOBJ)); InitLookasideList(GDIObjType_BRUSH_TYPE, sizeof(BRUSH)); return STATUS_SUCCESS; Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sat May 28 16:54:10 2011 @@ -6,31 +6,6 @@ #undef XFORMOBJ #define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) - - - -/* - * @unimplemented - */ -BOOL -APIENTRY -EngTextOut ( - SURFOBJ *pso, - STROBJ *pstro, - FONTOBJ *pfo, - CLIPOBJ *pco, - RECTL *prclExtra, - RECTL *prclOpaque, - BRUSHOBJ *pboFore, - BRUSHOBJ *pboOpaque, - POINTL *pptlOrg, - MIX mix - ) -{ - // www.osr.com/ddk/graphics/gdifncs_4tgn.htm - UNIMPLEMENTED; - return FALSE; -} /* * @unimplemented @@ -399,84 +374,6 @@ return FALSE; } -/* - * @unimplemented - */ -ULONG -APIENTRY -FONTOBJ_cGetAllGlyphHandles ( - IN FONTOBJ *FontObj, - IN HGLYPH *Glyphs - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -ULONG -APIENTRY -FONTOBJ_cGetGlyphs( - IN FONTOBJ *FontObj, - IN ULONG Mode, - IN ULONG NumGlyphs, - IN HGLYPH *GlyphHandles, - IN PVOID *OutGlyphs - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -IFIMETRICS* -APIENTRY -FONTOBJ_pifi ( IN FONTOBJ *FontObj ) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -PVOID -APIENTRY -FONTOBJ_pvTrueTypeFontFile ( - IN FONTOBJ *FontObj, - IN ULONG *FileSize) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -XFORMOBJ* -APIENTRY -FONTOBJ_pxoGetXform ( IN FONTOBJ *FontObj ) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -VOID -APIENTRY -FONTOBJ_vGetInfo ( - IN FONTOBJ *FontObj, - IN ULONG InfoSize, - OUT PFONTINFO FontInfo) -{ - UNIMPLEMENTED; -} LONG APIENTRY @@ -736,53 +633,6 @@ return FileTime; } -/* - * @unimplemented - */ -FD_GLYPHSET * APIENTRY -FONTOBJ_pfdg( - IN FONTOBJ *FontObj) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -PBYTE APIENTRY -FONTOBJ_pjOpenTypeTablePointer( - IN FONTOBJ *FontObj, - IN ULONG Tag, - OUT ULONG *Table) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -PFD_GLYPHATTR APIENTRY -FONTOBJ_pQueryGlyphAttrs( - IN FONTOBJ *FontObj, - IN ULONG Mode) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -LPWSTR APIENTRY -FONTOBJ_pwszFontFilePaths( - IN FONTOBJ *FontObj, - OUT ULONG *PathLength) -{ - UNIMPLEMENTED; - return NULL; -} /* * @unimplemented @@ -805,17 +655,6 @@ */ BOOL APIENTRY -NtGdiAnyLinkedFonts() -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY NtGdiEnableEudc(BOOL enable) { UNIMPLEMENTED; @@ -823,76 +662,6 @@ } /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiAddRemoteFontToDC( - IN HDC hdc, - IN PVOID pvBuffer, - IN ULONG cjBuffer, - IN OPTIONAL PUNIVERSAL_FONT_ID pufi) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -HANDLE -APIENTRY -NtGdiAddFontMemResourceEx( - IN PVOID pvBuffer, - IN DWORD cjBuffer, - IN DESIGNVECTOR *pdv, - IN ULONG cjDV, - OUT DWORD *pNumFonts -) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiRemoveMergeFont( - IN HDC hdc, - IN UNIVERSAL_FONT_ID *pufi) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiAddRemoteMMInstanceToDC( - IN HDC hdc, - IN DOWNLOADDESIGNVECTOR *pddv, - IN ULONG cjDDV) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiFontIsLinked(IN HDC hdc) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* * @unimplemented */ BOOL @@ -924,24 +693,7 @@ return NULL; } - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiGetUFI( - IN HDC hdc, - OUT PUNIVERSAL_FONT_ID pufi, - OUT OPTIONAL DESIGNVECTOR *pdv, - OUT ULONG *pcjDV, - OUT ULONG *pulBaseCheckSum, - OUT FLONG *pfl) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* +/* * @unimplemented */ HBRUSH @@ -1001,22 +753,7 @@ return FALSE; } - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiConsoleTextOut( - IN HDC hdc, - IN POLYTEXTW *lpto, - IN UINT nStrings, - IN RECTL *prclBounds) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* +/* * @unimplemented */ BOOL @@ -1057,84 +794,7 @@ return FALSE; } - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiEnumFontChunk( - IN HDC hdc, - IN ULONG_PTR idEnum, - IN ULONG cjEfdw, - OUT ULONG *pcjEfdw, - OUT PENUMFONTDATAW pefdw) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiEnumFontClose( - IN ULONG_PTR idEnum) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -ULONG_PTR -APIENTRY -NtGdiEnumFontOpen( - IN HDC hdc, - IN ULONG iEnumType, - IN FLONG flWin31Compat, - IN ULONG cwchMax, - IN OPTIONAL LPWSTR pwszFaceName, - IN ULONG lfCharSet, - OUT ULONG *pulCount) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiEudcLoadUnloadLink( - IN OPTIONAL LPCWSTR pBaseFaceName, - IN UINT cwcBaseFaceName, - IN LPCWSTR pEudcFontPath, - IN UINT cwcEudcFontPath, - IN INT iPriority, - IN INT iFontLinkType, - IN BOOL bLoadLin) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiForceUFIMapping( - IN HDC hdc, - IN PUNIVERSAL_FONT_ID pufi) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* +/* * @unimplemented */ NTSTATUS @@ -1150,20 +810,7 @@ return FALSE; } - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiGetCharWidthInfo( - IN HDC hdc, - OUT PCHWIDTHINFO pChWidthInfo) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* +/* * @unimplemented */ ULONG_PTR @@ -1173,19 +820,6 @@ { UNIMPLEMENTED; return 0; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiGetETM( - IN HDC hdc, - OUT EXTTEXTMETRIC *petm) -{ - UNIMPLEMENTED; - return FALSE; } /* @@ -1218,19 +852,6 @@ */ INT APIENTRY -NtGdiQueryFonts( OUT PUNIVERSAL_FONT_ID pufiFontList, - IN ULONG nBufferSize, - OUT PLARGE_INTEGER pTimeStamp) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -INT -APIENTRY NtGdiGetSpoolMessage( DWORD u1, DWORD u2, DWORD u3, @@ -1241,38 +862,7 @@ return 0; } - /* - * @unimplemented - */ -DWORD -APIENTRY -NtGdiGetGlyphIndicesWInternal( - IN HDC hdc, - IN OPTIONAL LPWSTR pwc, - IN INT cwc, - OUT OPTIONAL LPWORD pgi, - IN DWORD iMode, - IN BOOL bSubset) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -INT -APIENTRY -NtGdiGetLinkedUFIs( - IN HDC hdc, - OUT OPTIONAL PUNIVERSAL_FONT_ID pufiLinkedUFIs, - IN INT BufferSize) -{ - UNIMPLEMENTED; - return 0; -} - - /* +/* * @unimplemented */ HBITMAP @@ -1318,77 +908,6 @@ */ BOOL NtGdiUpdateTransform(IN HDC hdc) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiQueryFontAssocInfo( - IN HDC hdc) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -UINT -APIENTRY -NtGdiGetStringBitmapW( - IN HDC hdc, - IN LPWSTR pwsz, - IN UINT cwc, - OUT BYTE *lpSB, - IN UINT cj) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiRemoveFontMemResourceEx( - IN HANDLE hMMFont) -{ - UNIMPLEMENTED; - return FALSE; -} - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiRemoveFontResourceW( - IN WCHAR *pwszFiles, - IN ULONG cwc, - IN ULONG cFiles, - IN ULONG fl, - IN DWORD dwPidTid, - IN OPTIONAL DESIGNVECTOR *pdv) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiPolyTextOutW( - IN HDC hdc, - IN POLYTEXTW *pptw, - IN UINT cStr, - IN DWORD dwCodePage) { UNIMPLEMENTED; return FALSE; @@ -1410,19 +929,6 @@ return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented - */ -INT -APIENTRY -NtGdiSetupPublicCFONT( - IN HDC hdc, - IN OPTIONAL HFONT hf, - IN ULONG ulAve) -{ - UNIMPLEMENTED; - return 0; -} /* * @unimplemented @@ -1435,101 +941,6 @@ { UNIMPLEMENTED; return NULL; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiGetEmbUFI( - IN HDC hdc, - OUT PUNIVERSAL_FONT_ID pufi, - OUT OPTIONAL DESIGNVECTOR *pdv, - OUT ULONG *pcjDV, - OUT ULONG *pulBaseCheckSum, - OUT FLONG *pfl, - OUT KERNEL_PVOID *embFontID) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiGetUFIPathname( - IN PUNIVERSAL_FONT_ID pufi, - OUT OPTIONAL ULONG* pcwc, - OUT OPTIONAL LPWSTR pwszPathname, - OUT OPTIONAL ULONG* pcNumFiles, - IN FLONG fl, - OUT OPTIONAL BOOL *pbMemFont, - OUT OPTIONAL ULONG *pcjView, - OUT OPTIONAL PVOID pvView, - OUT OPTIONAL BOOL *pbTTC, - OUT OPTIONAL ULONG *piTTC) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiGetEmbedFonts( - VOID) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiChangeGhostFont( - IN KERNEL_PVOID *pfontID, - IN BOOL bLoad) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiAddEmbFontToDC( - IN HDC hdc, - IN VOID **pFontID) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiGetWidthTable( - IN HDC hdc, - IN ULONG cSpecial, - IN WCHAR *pwc, - IN ULONG cwc, - OUT USHORT *psWidth, - OUT OPTIONAL WIDTHDATA *pwd, - OUT FLONG *pflInfo) -{ - UNIMPLEMENTED; - return FALSE; } /* @@ -1561,23 +972,7 @@ return TRUE; } - /* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiMakeFontDir( - IN FLONG flEmbed, - OUT PBYTE pjFontDir, - IN unsigned cjFontDir, - IN LPWSTR pwszPathname, - IN unsigned cjPathname) -{ - UNIMPLEMENTED; - return 0; -} - - /* +/* * @unimplemented */ BOOL @@ -1600,46 +995,6 @@ { UNIMPLEMENTED; return NULL; -} - - /* - * @unimplemented - */ -ULONG -APIENTRY -NtGdiSetFontEnumeration( - IN ULONG ulType) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiSetFontXform( - IN HDC hdc, - IN DWORD dwxScale, - IN DWORD dwyScale) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiSetLinkedUFIs( - IN HDC hdc, - IN PUNIVERSAL_FONT_ID pufiLinks, - IN ULONG uNumUFIs) -{ - UNIMPLEMENTED; - return FALSE; } /* @@ -1669,17 +1024,6 @@ return FALSE; } - /* - * @implemented - */ -BOOL -APIENTRY -NtGdiUnmapMemFont( - IN PVOID pvView) -{ - return TRUE; -} - BOOL APIENTRY EngControlSprites( @@ -1688,32 +1032,6 @@ { UNIMPLEMENTED; return FALSE; -} - -PVOID -APIENTRY -EngFntCacheAlloc(IN ULONG FastCheckSum, - IN ULONG ulSize) -{ - UNIMPLEMENTED; - return NULL; -} - -VOID -APIENTRY -EngFntCacheFault(IN ULONG ulFastCheckSum, - IN ULONG iFaultMode) -{ - UNIMPLEMENTED; -} - -PVOID -APIENTRY -EngFntCacheLookUp(IN ULONG FastCheckSum, - OUT PULONG pulSize) -{ - UNIMPLEMENTED; - return NULL; } BOOLEAN

1 0

[ekohl] 51978: Add disk.inf to source file list.
by ekohl＠svn.reactos.org 28 May '11

28 May '11

Author: ekohl Date: Sat May 28 16:19:14 2011 New Revision: 51978 URL: http://svn.reactos.org/svn/reactos?rev=51978&view=rev Log: Add disk.inf to source file list. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat May 28 16:19:14 2011 @@ -545,7 +545,7 @@ drivers\video\miniport\vga\vgamp.sys 2 drivers\video\miniport\vbe\vbemp.sys 2 drivers\video\videoprt\videoprt.sys 2 -drivers\video\font\ftfd\ftfd.dll 1 +drivers\video\font\ftfd\ftfd.dll 1 drivers\wdm\audio\filters\kmixer\kmixer.sys 2 drivers\wdm\audio\sysaudio\sysaudio.sys 2 @@ -657,6 +657,7 @@ media\inf\battery.inf 6 media\inf\cdrom.inf 6 media\inf\cpu.inf 6 +media\inf\disk.inf 6 media\inf\display.inf 6 media\inf\font.inf 6 media\inf\fdc.inf 6

1 0

[tkreuzer] 51977: [WIN32K] - Fix EngMapFontFileFD (return adress and size) - Fix memory leak in EngUnloadImage
by tkreuzer＠svn.reactos.org 28 May '11

28 May '11

Author: tkreuzer Date: Sat May 28 16:12:40 2011 New Revision: 51977 URL: http://svn.reactos.org/svn/reactos?rev=51977&view=rev Log: [WIN32K] - Fix EngMapFontFileFD (return adress and size) - Fix memory leak in EngUnloadImage Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Sat May 28 16:12:40 2011 @@ -101,6 +101,7 @@ { /* Make sure we don't have a driver loaded */ ASSERT(pldev && pldev->pGdiDriverInfo == NULL); + ASSERT(pldev->cRefs == 0); /* Free the memory */ ExFreePoolWithTag(pldev, GDITAG_LDEV); @@ -475,8 +476,9 @@ if (pldev->pldevNext) pldev->pldevNext->pldevPrev = pldev->pldevPrev; - /* Unload the image */ + /* Unload the image and free the LDEV */ LDEVOBJ_vUnloadImage(pldev); + LDEVOBJ_vFreeLDEV(pldev); } /* Unlock loader */ Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Sat May 28 16:12:40 2011 @@ -512,6 +512,10 @@ PAGE_READONLY); } + /* Return base address and size */ + if (ppjBuf) *ppjBuf = pffv->pvViewFD; + if (pcjBuf) *pcjBuf = pffv->cjView; + return NT_SUCCESS(Status); }

1 0

[ekohl] 51976: Add an .inf file for disk drives. See issue #5111 for more details.
by ekohl＠svn.reactos.org 28 May '11

28 May '11

Author: ekohl Date: Sat May 28 16:12:28 2011 New Revision: 51976 URL: http://svn.reactos.org/svn/reactos?rev=51976&view=rev Log: Add an .inf file for disk drives. See issue #5111 for more details. Added: trunk/reactos/media/inf/disk.inf (with props) Modified: trunk/reactos/media/inf/syssetup.inf trunk/reactos/media/inf/syssetup.inf.tpl Added: trunk/reactos/media/inf/disk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/disk.inf?rev=519… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/disk.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Sat May 28 16:12:28 2011 @@ -5,6 +5,7 @@ [DeviceInfsToInstall] battery.inf cdrom.inf +disk.inf display.inf fdc.inf hdc.inf Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

1 0

[tkreuzer] 51975: [WIN32K] - Refactor EngLoadModuleEx, add the loaded module to a global list, don't map files multiple times, increase reference instead. - Implement EngMapFontFileFD and EngUnmapF...
by tkreuzer＠svn.reactos.org 28 May '11

28 May '11

Author: tkreuzer Date: Sat May 28 15:57:47 2011 New Revision: 51975 URL: http://svn.reactos.org/svn/reactos?rev=51975&view=rev Log: [WIN32K] - Refactor EngLoadModuleEx, add the loaded module to a global list, don't map files multiple times, increase reference instead. - Implement EngMapFontFileFD and EngUnmapFontFileFD Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Sat May 28 15:57:47 2011 @@ -12,7 +12,8 @@ #include <debug.h> HANDLE ghSystem32Directory; -HANDLE ghRootDirectory; +HSEMAPHORE ghsemModuleList; +LIST_ENTRY gleModulelist = {&gleModulelist, &gleModulelist}; PVOID NTAPI @@ -221,21 +222,29 @@ UNICODE_STRING ustrFileName; IO_STATUS_BLOCK IoStatusBlock; FILE_BASIC_INFORMATION FileInformation; - POBJECT_NAME_INFORMATION pNameInfo; - HANDLE hFile; + HANDLE hFile = NULL; NTSTATUS Status; LARGE_INTEGER liSize; - ULONG cjInfo, cjDesired; - - /* Check if the file is relative to system32 */ - if (fl & FVF_SYSTEMROOT) - { - hRootDir = ghSystem32Directory; - } - else - { - hRootDir = ghRootDirectory; - } + PLIST_ENTRY ple; + ULONG cjSize; + + /* Acquire module list lock */ + EngAcquireSemaphore(ghsemModuleList); + + /* Loop the list of loaded modules */ + for (ple = gleModulelist.Flink; ple != &gleModulelist; ple = ple->Flink) + { + pFileView = CONTAINING_RECORD(ple, FILEVIEW, leLink); + if (_wcsnicmp(pFileView->pwszPath, pwsz, MAX_PATH) == 0) + { + /* Increment reference count and leave */ + pFileView->cRefs++; + goto cleanup; + } + } + + /* Use system32 root dir or absolute path */ + hRootDir = fl & FVF_SYSTEMROOT ? ghSystem32Directory : NULL; /* Initialize unicode string and object attributes */ RtlInitUnicodeString(&ustrFileName, pwsz); @@ -258,15 +267,18 @@ NULL, 0); + if (!NT_SUCCESS(Status)) + { + pFileView = NULL; + goto cleanup; + } + /* Check if this is a font file */ if (fl & FVF_FONTFILE) { - /* Query name information length */ - Status = ZwQueryObject(hFile, ObjectNameInformation, NULL, 0, &cjInfo); - if (Status != STATUS_INFO_LENGTH_MISMATCH) goto cleanup; - /* Allocate a FONTFILEVIEW structure */ - pffv = EngAllocMem(0, sizeof(FONTFILEVIEW) + cjInfo, 'vffG'); + cjSize = sizeof(FONTFILEVIEW) + ustrFileName.Length + sizeof(WCHAR); + pffv = EngAllocMem(0, cjSize, 'vffG'); pFileView = (PFILEVIEW)pffv; if (!pffv) { @@ -274,17 +286,8 @@ goto cleanup; } - /* Query name information */ - pNameInfo = (POBJECT_NAME_INFORMATION)(pffv + 1); - Status = ZwQueryObject(hFile, - ObjectNameInformation, - pNameInfo, - cjInfo, - &cjDesired); - if (!NT_SUCCESS(Status)) goto cleanup; - /* Initialize extended fields */ - pffv->pwszPath = pNameInfo->Name.Buffer; + pffv->pwszPath = (PWSTR)&pffv[1]; pffv->ulRegionSize = 0; pffv->cKRefCount = 0; pffv->cRefCountFD = 0; @@ -294,29 +297,34 @@ else { /* Allocate a FILEVIEW structure */ - pFileView = EngAllocMem(0, sizeof(FILEVIEW), 'liFg'); + cjSize = sizeof(FILEVIEW) + ustrFileName.Length + sizeof(WCHAR); + pFileView = EngAllocMem(0, cjSize, 'liFg'); if (!pFileView) { Status = STATUS_NO_MEMORY; goto cleanup; } + + pFileView->pwszPath = (PWSTR)&pFileView[1]; } /* Initialize the structure */ + pFileView->cRefs = 1; pFileView->pvKView = NULL; pFileView->pvViewFD = NULL; pFileView->cjView = 0; + /* Copy the file name */ + wcscpy(pFileView->pwszPath, pwsz); + /* Query the last write time */ + FileInformation.LastWriteTime.QuadPart = 0; Status = ZwQueryInformationFile(hFile, &IoStatusBlock, &FileInformation, sizeof(FILE_BASIC_INFORMATION), FileBasicInformation); - if (NT_SUCCESS(Status)) - { - pFileView->LastWriteTime = FileInformation.LastWriteTime; - } + pFileView->LastWriteTime = FileInformation.LastWriteTime; /* Create a section from the file */ liSize.QuadPart = cjSizeOfModule; @@ -329,16 +337,22 @@ hFile, NULL); + if (!NT_SUCCESS(Status)) + { + EngFreeMem(pFileView); + pFileView = NULL; + goto cleanup; + } + + /* Insert the structure into the list */ + InsertTailList(&gleModulelist, &pFileView->leLink); + cleanup: /* Close the file handle */ - ZwClose(hFile); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create a section Status=0x%x\n", Status); - EngFreeMem(pFileView); - return NULL; - } + if (hFile) ZwClose(hFile); + + /* Release module list lock */ + EngReleaseSemaphore(ghsemModuleList); return pFileView; } @@ -394,19 +408,36 @@ PFILEVIEW pFileView = (PFILEVIEW)h; NTSTATUS Status; - /* Unmap the section */ - Status = MmUnmapViewInSessionSpace(pFileView->pvKView); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmUnmapViewInSessionSpace failed: 0x%lx\n", Status); - ASSERT(FALSE); - } - - /* Dereference the section */ - ObDereferenceObject(pFileView->pSection); - - /* Free the file view memory */ - EngFreeMem(pFileView); + /* Acquire module list lock */ + EngAcquireSemaphore(ghsemModuleList); + + /* Decrement reference count and check if its 0 */ + if (--pFileView->cRefs == 0) + { + /* Check if the section was mapped */ + if (pFileView->pvKView) + { + /* Unmap the section */ + Status = MmUnmapViewInSessionSpace(pFileView->pvKView); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmUnmapViewInSessionSpace failed: 0x%lx\n", Status); + ASSERT(FALSE); + } + } + + /* Dereference the section */ + ObDereferenceObject(pFileView->pSection); + + /* Remove the entry from the list */ + RemoveEntryList(&pFileView->leLink); + + /* Free the file view memory */ + EngFreeMem(pFileView); + } + + /* Release module list lock */ + EngReleaseSemaphore(ghsemModuleList); } PVOID @@ -460,9 +491,28 @@ OUT PULONG *ppjBuf, OUT ULONG *pcjBuf) { - // www.osr.com/ddk/graphics/gdifncs_0co7.htm - UNIMPLEMENTED; - return FALSE; + PFONTFILEVIEW pffv = (PFONTFILEVIEW)iFile; + NTSTATUS Status = STATUS_SUCCESS; + + // should be exclusively accessing this file! + + /* Increment reference count and check if its the 1st */ + if (++pffv->cRefCountFD == 1) + { + /* Map the file into the address space of CSRSS */ + Status = MmMapViewOfSection(pffv->pSection, + gpepCSRSS, + &pffv->pvViewFD, + 0, + 0, + NULL, + &pffv->cjView, + ViewUnmap, + 0, + PAGE_READONLY); + } + + return NT_SUCCESS(Status); } VOID @@ -470,8 +520,17 @@ EngUnmapFontFileFD( IN ULONG_PTR iFile) { - // http://www.osr.com/ddk/graphics/gdifncs_6wbr.htm - UNIMPLEMENTED; + PFONTFILEVIEW pffv = (PFONTFILEVIEW)iFile; + NTSTATUS Status = STATUS_SUCCESS; + + // should be exclusively accessing this file! + + /* Decrement reference count and check if we reached 0 */ + if (--pffv->cRefCountFD == 0) + { + /* Unmap the file from the address space of CSRSS */ + Status = MmUnmapViewOfSection(gpepCSRSS, pffv->pvViewFD); + } } BOOL Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] Sat May 28 15:57:47 2011 @@ -2,6 +2,8 @@ // HACK!!! #define MmMapViewInSessionSpace MmMapViewInSystemSpace #define MmUnmapViewInSessionSpace MmUnmapViewInSystemSpace + +extern PEPROCESS gpepCSRSS; typedef struct _ENGSECTION { @@ -13,6 +15,9 @@ typedef struct _FILEVIEW { + LIST_ENTRY leLink; + PWSTR pwszPath; + ULONG cRefs; LARGE_INTEGER LastWriteTime; PVOID pvKView; PVOID pvViewFD; @@ -23,8 +28,6 @@ typedef struct _FONTFILEVIEW { FILEVIEW; - DWORD reserved[2]; - PWSTR pwszPath; SIZE_T ulRegionSize; ULONG cKRefCount; ULONG cRefCountFD;

1 0

[cgutman] 51974: [UNPNPMGR] - Simplify and fix a few bugs in the ClassGUID reading code
by cgutman＠svn.reactos.org 28 May '11

28 May '11

Author: cgutman Date: Sat May 28 13:42:06 2011 New Revision: 51974 URL: http://svn.reactos.org/svn/reactos?rev=51974&view=rev Log: [UNPNPMGR] - Simplify and fix a few bugs in the ClassGUID reading code Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat May 28 13:42:06 2011 @@ -2249,7 +2249,6 @@ PROCESS_INFORMATION ProcessInfo; STARTUPINFOW StartupInfo; UUID RandomUuid; - WCHAR RegistryPath[MAX_PATH]; HKEY DeviceKey; /* The following lengths are constant (see below), they cannot overflow */ @@ -2262,11 +2261,8 @@ ZeroMemory(&ProcessInfo, sizeof(ProcessInfo)); - wcscpy(RegistryPath, L"SYSTEM\\CurrentControlSet\\Enum\\"); - wcscat(RegistryPath, DeviceInstance); - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - RegistryPath, + if (RegOpenKeyExW(hEnumKey, + DeviceInstance, 0, KEY_QUERY_VALUE, &DeviceKey) == ERROR_SUCCESS) @@ -2279,10 +2275,11 @@ NULL) == ERROR_SUCCESS) { DPRINT("No need to install: %S\n", DeviceInstance); + RegCloseKey(DeviceKey); return TRUE; } - CloseHandle(DeviceKey); + RegCloseKey(DeviceKey); } DPRINT1("Installing: %S\n", DeviceInstance);

1 0

[jimtabor] 51973: [ScreenSaver] - Fixed screen saver load and save plus the registry problems.
by jimtabor＠svn.reactos.org 28 May '11

28 May '11

Author: jimtabor Date: Sat May 28 11:39:36 2011 New Revision: 51973 URL: http://svn.reactos.org/svn/reactos?rev=51973&view=rev Log: [ScreenSaver] - Fixed screen saver load and save plus the registry problems. Modified: trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/dll/cpl/desk/screensaver.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Sat May 28 11:39:36 2011 @@ -240,7 +240,7 @@ StartScreenSaver( IN PWLSESSION Session) { - HKEY hKey = NULL; + HKEY hKey = NULL, hCurrentUser = NULL; WCHAR szApplicationName[MAX_PATH]; WCHAR szCommandLine[MAX_PATH + 3]; DWORD bufferSize = sizeof(szApplicationName) - sizeof(WCHAR); @@ -258,8 +258,17 @@ goto cleanup; } + rc = RegOpenCurrentUser( + KEY_READ, + &hCurrentUser); + if (rc != ERROR_SUCCESS) + { + ERR("WL: RegOpenCurrentUser Error!\n"); + goto cleanup; + } + rc = RegOpenKeyExW( - HKEY_CURRENT_USER, + hCurrentUser, L"Control Panel\\Desktop", 0, KEY_QUERY_VALUE, @@ -343,6 +352,8 @@ RevertToSelf(); if (hKey) RegCloseKey(hKey); + if (hCurrentUser) + RegCloseKey(hCurrentUser); if (!ret) { PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_SCRNSVR_ACTIVITY, 0); Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sat May 28 11:39:36 2011 @@ -460,6 +460,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) { HKEY regKey; + BOOL DeleteMode = FALSE; if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Desktop"), @@ -486,6 +487,7 @@ { /* Windows deletes the value if no screensaver is set */ RegDeleteValue(regKey, _T("SCRNSAVE.EXE")); + DeleteMode = TRUE; } /* set the screensaver time delay */ @@ -505,6 +507,10 @@ REG_SZ, (PBYTE)szTime, _tcslen(szTime) * sizeof(TCHAR)); + + if (DeleteMode) Time = 0; + + SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE); /* set the secure value */ Ret = SendDlgItemMessage(hwndDlg, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat May 28 11:39:36 2011 @@ -75,14 +75,15 @@ VOID FASTCALL DoTheScreenSaver(VOID) { LARGE_INTEGER TickCount; - DWORD Test; + DWORD Test, TO; if (gspv.iScrSaverTimeout > 0) // Zero means Off. { KeQueryTickCount(&TickCount); Test = MsqCalculateMessageTime(&TickCount); Test = Test - LastInputTick; - if (Test > gspv.iScrSaverTimeout) + TO = 1000 * gspv.iScrSaverTimeout; + if (Test > TO) { DPRINT("Screensaver Message Start! Tick %d Timeout %d \n", Test, gspv.iScrSaverTimeout); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sat May 28 11:39:36 2011 @@ -59,6 +59,7 @@ static const WCHAR* KEY_DESKTOP = L"Control Panel\\Desktop"; static const WCHAR* VAL_SCRTO = L"ScreenSaveTimeOut"; +static const WCHAR* VAL_SCRNSV = L"SCRNSAVE.EXE"; static const WCHAR* VAL_SCRACT = L"ScreenSaveActive"; static const WCHAR* VAL_GRID = L"GridGranularity"; static const WCHAR* VAL_DRAG = L"DragFullWindows"; @@ -134,6 +135,20 @@ return dValue; } return Result; +} + +static +DWORD +SpiLoadTimeOut(VOID) +{ // Must have the string! + WCHAR szApplicationName[MAX_PATH]; + RtlZeroMemory(&szApplicationName, sizeof(szApplicationName)); + if (!RegReadUserSetting(KEY_DESKTOP, VAL_SCRNSV, REG_SZ, &szApplicationName, sizeof(szApplicationName))) + { + return 0; + } + if (wcslen(szApplicationName) == 0) return 0; + return SpiLoadInt(KEY_DESKTOP, VAL_SCRTO, 0); } static @@ -280,7 +295,7 @@ gspv.bDropShadow = 1; gspv.dwMenuShowDelay = 100; - gspv.iScrSaverTimeout = 600000; // TO in 10 minutes. + gspv.iScrSaverTimeout = SpiLoadTimeOut(); gspv.bScrSaverActive = FALSE; gspv.bScrSaverRunning = FALSE; #if(WINVER >= 0x0600)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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