more gdi32 destubbing, fixed declarations for EnumFontsA/W

svn path=/trunk/; revision=5206
This commit is contained in:
Royce Mitchell III 2003-07-21 05:53:15 +00:00
parent ce107e0415
commit 934564a9a6
4 changed files with 175 additions and 141 deletions

View file

@ -1894,7 +1894,7 @@ EnumFontFamiliesA(HDC, LPCSTR, FONTENUMPROC, LPARAM);
int int
STDCALL STDCALL
EnumFontsA(HDC, LPCSTR, ENUMFONTSPROC, LPARAM); EnumFontsA(HDC, LPCSTR, FONTENUMPROC, LPARAM);
WINBOOL WINBOOL
STDCALL STDCALL

View file

@ -1905,7 +1905,7 @@ EnumFontFamiliesW(HDC, LPCWSTR, FONTENUMPROC, LPARAM);
int int
STDCALL STDCALL
EnumFontsW(HDC, LPCWSTR, ENUMFONTSPROC, LPARAM); EnumFontsW(HDC, LPCWSTR, FONTENUMPROC, LPARAM);
WINBOOL WINBOOL
STDCALL STDCALL

View file

@ -1,4 +1,4 @@
/* $Id: stubsa.c,v 1.14 2003/07/21 04:56:31 royce Exp $ /* $Id: stubsa.c,v 1.15 2003/07/21 05:53:15 royce Exp $
* *
* reactos/lib/gdi32/misc/stubs.c * reactos/lib/gdi32/misc/stubs.c
* *
@ -19,6 +19,7 @@
#include <win32k/metafile.h> #include <win32k/metafile.h>
#include <win32k/dc.h> #include <win32k/dc.h>
#include <rosrtl/devmode.h> #include <rosrtl/devmode.h>
#include <rosrtl/logfont.h>
/* /*
* @implemented * @implemented
@ -292,25 +293,29 @@ DeviceCapabilitiesExA(
/* /*
* @unimplemented * @implemented
*/ */
int int
STDCALL STDCALL
EnumFontFamiliesExA( EnumFontFamiliesExA(
HDC hdc, HDC hdc,
LPLOGFONT lpLogFont, LPLOGFONTA lpLogFont,
FONTENUMEXPROC lpEnumFontFamProc, FONTENUMEXPROC lpEnumFontFamProc,
LPARAM lParam, LPARAM lParam,
DWORD dwFlags DWORD dwFlags
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); LOGFONTW LogFontW;
return 0;
RosRtlLogFontA2W ( &LogFontW, lpLogFont );
/* no need to convert LogFontW back to lpLogFont b/c it's an [in] parameter only */
return W32kEnumFontFamiliesEx ( hdc, &LogFontW, lpEnumFontFamProc, lParam, dwFlags );
} }
/* /*
* @unimplemented * @implemented
*/ */
int int
STDCALL STDCALL
@ -321,144 +326,183 @@ EnumFontFamiliesA(
LPARAM lParam LPARAM lParam
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); NTSTATUS Status;
UNICODE_STRING Family;
int rc;
Status = RtlCreateUnicodeStringFromAsciiz ( &Family,
(PCSZ)lpszFamily );
if (!NT_SUCCESS (Status))
{
SetLastError (RtlNtStatusToDosError(Status));
return 0; return 0;
}
rc = W32kEnumFontFamilies ( hdc, Family.Buffer, lpEnumFontFamProc, lParam );
RtlFreeUnicodeString ( &Family );
return rc;
} }
/* /*
* @unimplemented * @implemented
*/ */
int int
STDCALL STDCALL
EnumFontsA( EnumFontsA (
HDC a0, HDC hDC,
LPCSTR a1, LPCSTR lpFaceName,
ENUMFONTSPROC a2, FONTENUMPROC FontFunc,
LPARAM a3 LPARAM lParam
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); NTSTATUS Status;
UNICODE_STRING FaceName;
int rc;
Status = RtlCreateUnicodeStringFromAsciiz ( &FaceName,
(PCSZ)lpFaceName );
if (!NT_SUCCESS (Status))
{
SetLastError (RtlNtStatusToDosError(Status));
return 0; return 0;
}
rc = W32kEnumFonts ( hDC, FaceName.Buffer, FontFunc, lParam );
RtlFreeUnicodeString ( &FaceName );
return rc;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
STDCALL STDCALL
GetCharWidthA( GetCharWidthA (
HDC a0, HDC hdc,
UINT a1, UINT iFirstChar,
UINT a2, UINT iLastChar,
LPINT a3 LPINT lpBuffer
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharWidth ( hdc, iFirstChar, iLastChar, lpBuffer );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
STDCALL STDCALL
GetCharWidth32A( GetCharWidth32A(
HDC a0, HDC hdc,
UINT a1, UINT iFirstChar,
UINT a2, UINT iLastChar,
LPINT a3 LPINT lpBuffer
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharWidth32 ( hdc, iFirstChar, iLastChar, lpBuffer );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
APIENTRY APIENTRY
GetCharWidthFloatA( GetCharWidthFloatA(
HDC a0, HDC hdc,
UINT a1, UINT iFirstChar,
UINT a2, UINT iLastChar,
PFLOAT a3 PFLOAT pxBuffer
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharWidthFloat ( hdc, iFirstChar, iLastChar, pxBuffer );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
APIENTRY APIENTRY
GetCharABCWidthsA( GetCharABCWidthsA(
HDC a0, HDC hdc,
UINT a1, UINT uFirstChar,
UINT a2, UINT uLastChar,
LPABC a3 LPABC lpabc
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharABCWidths ( hdc, uFirstChar, uLastChar, lpabc );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
APIENTRY APIENTRY
GetCharABCWidthsFloatA( GetCharABCWidthsFloatA(
HDC a0, HDC hdc,
UINT a1, UINT iFirstChar,
UINT a2, UINT iLastChar,
LPABCFLOAT a3 LPABCFLOAT lpABCF
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharABCWidthsFloat ( hdc, iFirstChar, iLastChar, lpABCF );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
DWORD DWORD
STDCALL STDCALL
GetGlyphOutlineA( GetGlyphOutlineA(
HDC a0, HDC hdc,
UINT a1, UINT uChar,
UINT a2, UINT uFormat,
LPGLYPHMETRICS a3, LPGLYPHMETRICS lpgm,
DWORD a4, DWORD cbBuffer,
LPVOID a5, LPVOID lpvBuffer,
CONST MAT2 *a6 CONST MAT2 *lpmat2
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetGlyphOutline ( hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2 );
return 0;
} }
/* /*
* @unimplemented * @implemented
*/ */
HMETAFILE HMETAFILE
STDCALL STDCALL
GetMetaFileA( GetMetaFileA(
LPCSTR a0 LPCSTR lpszMetaFile
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); NTSTATUS Status;
UNICODE_STRING MetaFile;
HMETAFILE rc;
Status = RtlCreateUnicodeStringFromAsciiz ( &MetaFile,
(PCSZ)lpszMetaFile );
if (!NT_SUCCESS (Status))
{
SetLastError (RtlNtStatusToDosError(Status));
return 0; return 0;
}
rc = W32kGetMetaFile ( MetaFile.Buffer );
RtlFreeUnicodeString ( &MetaFile );
return rc;
} }
@ -468,9 +512,9 @@ GetMetaFileA(
UINT UINT
APIENTRY APIENTRY
GetOutlineTextMetricsA( GetOutlineTextMetricsA(
HDC a0, HDC hdc,
UINT a1, UINT cbData,
LPOUTLINETEXTMETRICA a2 LPOUTLINETEXTMETRICA lpOTM
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -634,8 +678,7 @@ GetObjectA(
LPVOID a2 LPVOID a2
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetObject ( a0, a1, a2 );
return 0;
} }

View file

@ -1,4 +1,4 @@
/* $Id: stubsw.c,v 1.14 2003/07/21 04:56:32 royce Exp $ /* $Id: stubsw.c,v 1.15 2003/07/21 05:53:15 royce Exp $
* *
* reactos/lib/gdi32/misc/stubs.c * reactos/lib/gdi32/misc/stubs.c
* *
@ -135,7 +135,7 @@ int
STDCALL STDCALL
EnumFontFamiliesExW( EnumFontFamiliesExW(
HDC hdc, HDC hdc,
LPLOGFONT lpLogFont, LPLOGFONTW lpLogFont,
FONTENUMEXPROC lpEnumFontFamProc, FONTENUMEXPROC lpEnumFontFamProc,
LPARAM lParam, LPARAM lParam,
DWORD dwFlags DWORD dwFlags
@ -162,138 +162,130 @@ EnumFontFamiliesW(
/* /*
* @unimplemented * @implemented
*/ */
int int
STDCALL STDCALL
EnumFontsW( EnumFontsW(
HDC a0, HDC hDC,
LPCWSTR a1, LPCWSTR lpFaceName,
ENUMFONTSPROC a2, FONTENUMPROC FontFunc,
LPARAM a3 LPARAM lParam
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kEnumFonts ( hDC, lpFaceName, FontFunc, lParam );
return 0;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
STDCALL STDCALL
GetCharWidthW( GetCharWidthW (
HDC a0, HDC hdc,
UINT a1, UINT iFirstChar,
UINT a2, UINT iLastChar,
LPINT a3 LPINT lpBuffer
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharWidth ( hdc, iFirstChar, iLastChar, lpBuffer );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
STDCALL STDCALL
GetCharWidth32W( GetCharWidth32W(
HDC a0, HDC hdc,
UINT a1, UINT iFirstChar,
UINT a2, UINT iLastChar,
LPINT a3 LPINT lpBuffer
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharWidth32 ( hdc, iFirstChar, iLastChar, lpBuffer );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
APIENTRY APIENTRY
GetCharWidthFloatW( GetCharWidthFloatW(
HDC a0, HDC hdc,
UINT a1, UINT iFirstChar,
UINT a2, UINT iLastChar,
PFLOAT a3 PFLOAT pxBuffer
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharWidthFloat ( hdc, iFirstChar, iLastChar, pxBuffer );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
APIENTRY APIENTRY
GetCharABCWidthsW( GetCharABCWidthsW(
HDC a0, HDC hdc,
UINT a1, UINT uFirstChar,
UINT a2, UINT uLastChar,
LPABC a3 LPABC lpabc
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharABCWidths ( hdc, uFirstChar, uLastChar, lpabc );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
BOOL BOOL
APIENTRY APIENTRY
GetCharABCWidthsFloatW( GetCharABCWidthsFloatW(
HDC a0, HDC hdc,
UINT a1, UINT iFirstChar,
UINT a2, UINT iLastChar,
LPABCFLOAT a3 LPABCFLOAT lpABCF
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetCharABCWidthsFloat ( hdc, iFirstChar, iLastChar, lpABCF );
return FALSE;
} }
/* /*
* @unimplemented * @implemented
*/ */
DWORD DWORD
STDCALL STDCALL
GetGlyphOutlineW( GetGlyphOutlineW(
HDC a0, HDC hdc,
UINT a1, UINT uChar,
UINT a2, UINT uFormat,
LPGLYPHMETRICS a3, LPGLYPHMETRICS lpgm,
DWORD a4, DWORD cbBuffer,
LPVOID a5, LPVOID lpvBuffer,
CONST MAT2 *a6 CONST MAT2 *lpmat2
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetGlyphOutline ( hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2 );
return 0;
} }
/* /*
* @unimplemented * @implemented
*/ */
HMETAFILE HMETAFILE
STDCALL STDCALL
GetMetaFileW( GetMetaFileW(
LPCWSTR a0 LPCWSTR lpszMetaFile
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetMetaFile ( lpszMetaFile );
return 0;
} }
@ -303,9 +295,9 @@ GetMetaFileW(
UINT UINT
APIENTRY APIENTRY
GetOutlineTextMetricsW( GetOutlineTextMetricsW(
HDC a0, HDC hdc,
UINT a1, UINT cbData,
LPOUTLINETEXTMETRICW a2 LPOUTLINETEXTMETRICW lpOTM
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -469,8 +461,7 @@ GetObjectW(
LPVOID a2 LPVOID a2
) )
{ {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return W32kGetObject ( a0, a1, a2 );
return 0;
} }