mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 05:37:44 +00:00
reform the code.
less warings and errors in vc svn path=/trunk/; revision=27758
This commit is contained in:
parent
7fd0ba2791
commit
a67d29ae20
|
@ -297,16 +297,17 @@ NtGdiCreateEnhMetaFile(HDC hDCRef,
|
|||
DWORD length = 0;
|
||||
HDC tempHDC;
|
||||
DWORD MemSize;
|
||||
DWORD dwDesiredAccess;
|
||||
|
||||
tempHDC = hDCRef;
|
||||
if (hDCRef == NULL)
|
||||
{
|
||||
/* FIXME ??
|
||||
* Shall we create hdc NtGdiHdcCompatible hdc ??
|
||||
*/
|
||||
UNICODE_STRING DriverName;
|
||||
RtlInitUnicodeString(&DriverName, L"DISPLAY");
|
||||
//IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE);
|
||||
/* FIXME ??
|
||||
* Shall we create hdc NtGdiHdcCompatible hdc ??
|
||||
*/
|
||||
UNICODE_STRING DriverName;
|
||||
RtlInitUnicodeString(&DriverName, L"DISPLAY");
|
||||
//IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE);
|
||||
tempHDC = NtGdiOpenDCW( &DriverName,
|
||||
NULL,
|
||||
NULL,
|
||||
|
@ -407,15 +408,15 @@ NtGdiCreateEnhMetaFile(HDC hDCRef,
|
|||
DPRINT1("Trying Create EnhMetaFile\n");
|
||||
|
||||
/* disk based metafile */
|
||||
DWORD dwDesiredAccess = GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE | FILE_READ_ATTRIBUTES;
|
||||
dwDesiredAccess = GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE | FILE_READ_ATTRIBUTES;
|
||||
OBJECT_ATTRIBUTES ObjectAttributes;
|
||||
IO_STATUS_BLOCK IoStatusBlock;
|
||||
IO_STATUS_BLOCK Iosb;
|
||||
IO_STATUS_BLOCK Iosb;
|
||||
UNICODE_STRING NtPathU;
|
||||
NTSTATUS Status;
|
||||
ULONG FileAttributes = (FILE_ATTRIBUTE_VALID_FLAGS & ~FILE_ATTRIBUTE_DIRECTORY);
|
||||
|
||||
if (!RtlDosPathNameToNtPathName_U (File, &NtPathU, NULL, NULL))
|
||||
if (!RtlDosPathNameToNtPathName_U (File, &NtPathU, NULL, NULL))
|
||||
{
|
||||
DC_UnlockDc(Dc);
|
||||
if (hDCRef == NULL)
|
||||
|
@ -427,25 +428,24 @@ NtGdiCreateEnhMetaFile(HDC hDCRef,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
InitializeObjectAttributes(&ObjectAttributes, &NtPathU, 0, NULL, NULL);
|
||||
InitializeObjectAttributes(&ObjectAttributes, &NtPathU, 0, NULL, NULL);
|
||||
|
||||
Status = NtCreateFile (&Dc->hFile, dwDesiredAccess, &ObjectAttributes, &IoStatusBlock,
|
||||
NULL, FileAttributes, 0, FILE_OVERWRITE_IF, FILE_NON_DIRECTORY_FILE,
|
||||
NULL, 0);
|
||||
NULL, FileAttributes, 0, FILE_OVERWRITE_IF, FILE_NON_DIRECTORY_FILE,
|
||||
NULL, 0);
|
||||
|
||||
RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathU.Buffer);
|
||||
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
Dc->hFile = NULL;
|
||||
DC_UnlockDc(Dc);
|
||||
Dc->hFile = NULL;
|
||||
DC_UnlockDc(Dc);
|
||||
if (hDCRef == NULL)
|
||||
{
|
||||
NtGdiDeleteObjectApp(tempHDC);
|
||||
}
|
||||
DPRINT1("Create EnhMetaFile fail\n");
|
||||
SetLastWin32Error(ERROR_INVALID_HANDLE);
|
||||
DPRINT1("Create EnhMetaFile fail\n");
|
||||
SetLastWin32Error(ERROR_INVALID_HANDLE);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -463,16 +463,16 @@ NtGdiCreateEnhMetaFile(HDC hDCRef,
|
|||
|
||||
if (NT_SUCCESS(Status))
|
||||
{
|
||||
ret = tempHDC;
|
||||
DC_UnlockDc(Dc);
|
||||
ret = tempHDC;
|
||||
DC_UnlockDc(Dc);
|
||||
}
|
||||
else
|
||||
{
|
||||
Dc->hFile = NULL;
|
||||
DPRINT1("Write to EnhMetaFile fail\n");
|
||||
SetLastWin32Error(ERROR_CAN_NOT_COMPLETE);
|
||||
ret = NULL;
|
||||
DC_UnlockDc(Dc);
|
||||
DPRINT1("Write to EnhMetaFile fail\n");
|
||||
SetLastWin32Error(ERROR_CAN_NOT_COMPLETE);
|
||||
ret = NULL;
|
||||
DC_UnlockDc(Dc);
|
||||
if (hDCRef == NULL)
|
||||
{
|
||||
NtGdiDeleteObjectApp(tempHDC);
|
||||
|
|
|
@ -213,8 +213,6 @@ NtGdiGetPath(
|
|||
INT ret = -1;
|
||||
GdiPath *pPath;
|
||||
|
||||
DPRINT("Enter NtGdiGetPath\n");
|
||||
|
||||
DC *dc = DC_LockDc(hDC);
|
||||
if(!dc)
|
||||
{
|
||||
|
|
|
@ -2502,6 +2502,8 @@ NtGdiGetGlyphOutline(
|
|||
INT adv, lsb, bbx; /* These three hold to widths of the unrotated chars */
|
||||
OUTLINETEXTMETRICW *potm;
|
||||
PVOID pvBuf = NULL;
|
||||
int n = 0;
|
||||
FT_CharMap found = 0, charmap;
|
||||
|
||||
DPRINT("%p, %d, %08x, %p, %08lx, %p, %p\n", hdc, wch, iFormat, pgm,
|
||||
cjBuf, UnsafeBuf, pmat2);
|
||||
|
@ -2544,8 +2546,8 @@ NtGdiGetGlyphOutline(
|
|||
{
|
||||
DPRINT("WARNING: No charmap selected!\n");
|
||||
DPRINT("This font face has %d charmaps\n", ft_face->num_charmaps);
|
||||
int n;
|
||||
FT_CharMap found = 0, charmap;
|
||||
|
||||
|
||||
|
||||
for (n = 0; n < ft_face->num_charmaps; n++)
|
||||
{
|
||||
|
@ -4159,13 +4161,15 @@ NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set)
|
|||
{
|
||||
/* Ulta-Ugly Hax! */
|
||||
INT Ret = 0x80000000;
|
||||
DPRINT("TextCharacterExtra %d", CharExtra);
|
||||
|
||||
PDC dc = DC_LockDc ( hDC );
|
||||
if (!dc)
|
||||
{
|
||||
{
|
||||
DPRINT("TextCharacterExtra %d", CharExtra);
|
||||
SetLastWin32Error(ERROR_INVALID_HANDLE);
|
||||
return Ret;
|
||||
}
|
||||
}
|
||||
DPRINT("TextCharacterExtra %d", CharExtra);
|
||||
Ret = dc->w.charExtra;
|
||||
if( Set ) dc->w.charExtra = CharExtra;
|
||||
DC_UnlockDc(dc);
|
||||
|
|
Loading…
Reference in a new issue