Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 19:05:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch by Stefan100 stefan__100__ at hotmail.com. Removes unimplemented NtGdi functions.

Browse source 
svn path=/trunk/; revision=31620
This commit is contained in:
James Tabor 2008-01-06 02:52:19 +00:00
parent 4197bbe411
commit 6880f63f6f
5 changed files with 20 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/gdi32/misc/stubsw.c
View file

@ -298,4 +298,19 @@ GetStringBitmapW(HDC hdc,
}
BOOL
WINAPI
CreateScalableFontResourceW(
DWORD fdwHidden,
LPCWSTR lpszFontRes,
LPCWSTR lpszFontFile,
LPCWSTR lpszCurrentPath
)
{
UNIMPLEMENTED;
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
/* EOF */

63
reactos/dll/win32/gdi32/objects/font.c
View file

@ -1412,26 +1412,7 @@ CreateFontW(
/*
* @implemented
*/
BOOL
STDCALL
CreateScalableFontResourceW(
DWORD fdwHidden,
LPCWSTR lpszFontRes,
LPCWSTR lpszFontFile,
LPCWSTR lpszCurrentPath
)
{
return NtGdiCreateScalableFontResource ( fdwHidden,
lpszFontRes,
lpszFontFile,
lpszCurrentPath );
}
/*
* @implemented
* @unimplemented
*/
BOOL
STDCALL
@ -1442,39 +1423,7 @@ CreateScalableFontResourceA(
LPCSTR lpszCurrentPath
)
{
NTSTATUS Status;
LPWSTR lpszFontResW, lpszFontFileW, lpszCurrentPathW;
BOOL rc = FALSE;
Status = HEAP_strdupA2W ( &lpszFontResW, lpszFontRes );
if (!NT_SUCCESS (Status))
SetLastError (RtlNtStatusToDosError(Status));
else
{
Status = HEAP_strdupA2W ( &lpszFontFileW, lpszFontFile );
if (!NT_SUCCESS (Status))
SetLastError (RtlNtStatusToDosError(Status));
else
{
Status = HEAP_strdupA2W ( &lpszCurrentPathW, lpszCurrentPath );
if (!NT_SUCCESS (Status))
SetLastError (RtlNtStatusToDosError(Status));
else
{
rc = NtGdiCreateScalableFontResource ( fdwHidden,
lpszFontResW,
lpszFontFileW,
lpszCurrentPathW );
HEAP_free ( lpszCurrentPathW );
}
HEAP_free ( lpszFontFileW );
}
HEAP_free ( lpszFontResW );
}
return rc;
return FALSE;
}
@ -1584,7 +1533,7 @@ RemoveFontResourceA(LPCSTR lpFileName)
}
/*
* @implemented
* @unimplemented
*/
BOOL
STDCALL
@ -1595,7 +1544,6 @@ RemoveFontResourceExA(LPCSTR lpFileName,
{
NTSTATUS Status;
LPWSTR lpFileNameW;
BOOL rc = 0;
/* FIXME the flags */
/* FIXME the pdv */
@ -1606,12 +1554,11 @@ RemoveFontResourceExA(LPCSTR lpFileName,
SetLastError (RtlNtStatusToDosError(Status));
else
{
rc = NtGdiRemoveFontResource ( lpFileNameW );
HEAP_free ( lpFileNameW );
}
return rc;
return 0;
}
/*
@ -1626,7 +1573,7 @@ RemoveFontResourceExW(LPCWSTR lpFileName,
/* FIXME the flags */
/* FIXME the pdv */
/* FIXME NtGdiRemoveFontResource handle flags and pdv */
return NtGdiRemoveFontResource ( lpFileName);
return 0;
}

36
reactos/include/reactos/win32k/ntgdibad.h
View file

@ -59,16 +59,6 @@ NtGdiGetFontFamilyInfo(
DWORD Size
);
/* The gdi32 call does all the work in user-mode, save for NtGdiMakeFontDir */
BOOL
NTAPI
NtGdiCreateScalableFontResource(
DWORD Hidden,
LPCWSTR FontRes,
LPCWSTR FontFile,
LPCWSTR CurrentPath
);
/* The gdi32 call Should Use NtGdiGetTextExtent */
BOOL
NTAPI
@ -98,27 +88,12 @@ NtGdiCreateDIBitmap (
UINT Usage
);
/* Should be done in user-mode. */
int
STDCALL
NtGdiEnumFonts(HDC hDC,
LPCWSTR FaceName,
FONTENUMPROCW FontFunc,
LPARAM lParam);
/* Should be done in user-mode. */
BOOL
STDCALL
NtGdiGetAspectRatioFilterEx(HDC hDC,
LPSIZE AspectRatio);
/* Should be done in user-mode. */
DWORD
STDCALL
NtGdiGetFontLanguageInfo(HDC hDC);
/* Use NtGdiGetDCPoint with GdiGetViewPortExt */
BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt);
@ -151,11 +126,6 @@ NtGdiOffsetWindowOrgEx (
LPPOINT Point
);
/* Should be done in user-mode. */
BOOL
STDCALL
NtGdiRemoveFontResource(LPCWSTR FileName);
/* Use SetDIBitsToDevice in gdi32. */
INT
STDCALL
@ -169,12 +139,6 @@ NtGdiSetDIBits (
UINT ColorUse
);
/* Needs to be done in user-mode, using shared GDI Object Attributes. */
DWORD
STDCALL
NtGdiSetMapperFlags(HDC hDC,
DWORD Flag);
/* Needs to be done in user-mode. */
BOOL
STDCALL

47
reactos/subsystems/win32/win32k/objects/text.c
View file

@ -575,18 +575,6 @@ NtGdiHfontCreate(
}
BOOL
STDCALL
NtGdiCreateScalableFontResource(DWORD Hidden,
LPCWSTR FontRes,
LPCWSTR FontFile,
LPCWSTR CurrentPath)
{
DPRINT1("NtGdiCreateScalableFontResource - is unimplemented, have a nice day and keep going");
return FALSE;
}
/*************************************************************************
* TranslateCharsetInfo
*
@ -1410,16 +1398,6 @@ NtGdiGetFontFamilyInfo(HDC Dc,
return Count;
}
int
STDCALL
NtGdiEnumFonts(HDC hDC,
LPCWSTR FaceName,
FONTENUMPROCW FontFunc,
LPARAM lParam)
{
UNIMPLEMENTED;
return 0;
}
FT_Glyph STDCALL
NtGdiGlyphCacheGet(
FT_Face Face,
@ -2443,13 +2421,6 @@ NtGdiGetCharWidthW(
return TRUE;
}
DWORD
STDCALL
NtGdiGetFontLanguageInfo(HDC hDC)
{
UNIMPLEMENTED;
return 0;
}
/*
* @implemented
@ -4000,24 +3971,6 @@ NtGdiGetTextMetricsW(
return TRUE;
}
BOOL
STDCALL
NtGdiRemoveFontResource(LPCWSTR FileName)
{
DPRINT1("NtGdiRemoveFontResource is UNIMPLEMENTED\n");
return FALSE;
}
DWORD
STDCALL
NtGdiSetMapperFlags(HDC hDC,
DWORD Flag)
{
UNIMPLEMENTED;
return 0;
}
BOOL
STDCALL
NtGdiSetTextJustification(HDC hDC,

5
reactos/subsystems/win32/win32k/w32ksvc.db
View file

@ -679,7 +679,6 @@ NtGdiDrawStream 3
#
#ReactOS specific syscalls
NtGdiSetDIBits 7
NtGdiSetMapperFlags 2
NtGdiSetViewportExtEx 4
NtGdiSetViewportOrgEx 4
NtGdiSetWindowExtEx 4
@ -719,15 +718,11 @@ NtUserSetScrollBarInfo 3
NtUserGetDesktopWindow 0
NtGdiAddFontResource 2
NtGdiCreateDIBitmap 6
NtGdiCreateScalableFontResource 4
NtGdiEnumFonts 4
NtGdiGetAspectRatioFilterEx 2
NtGdiGetFontFamilyInfo 4
NtGdiGetFontLanguageInfo 1
NtGdiGetTextExtentPoint32 4
NtGdiOffsetViewportOrgEx 4
NtGdiOffsetWindowOrgEx 4
NtGdiRemoveFontResource 1
#
# ReactOS only system calls
NtUserAcquireOrReleaseInputOwnership 1