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

Fixed wine all of gdi32 dc tests and only 2 of gdiobj tests left todo.

Browse source 
svn path=/trunk/; revision=33460
This commit is contained in:
James Tabor 2008-05-12 04:59:20 +00:00
parent e051367b2f
commit f5cf7f122c
2 changed files with 34 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

92
reactos/dll/win32/gdi32/misc/stubs.c
View file

@ -1657,74 +1657,46 @@ GdiConvertMetaFilePict(HGLOBAL hMem)
*/ */
DEVMODEW * DEVMODEW *
STDCALL STDCALL
GdiConvertToDevmodeW(DEVMODEA *dm) GdiConvertToDevmodeW(DEVMODEA *dmA)
{ {
LPDEVMODEW dmw; DEVMODEW *dmW;
WORD dmW_size, dmA_size;
dmw = HEAP_alloc(sizeof(DEVMODEW)); dmA_size = dmA->dmSize;
#define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)dm->f, len, dmw->f, len )
#define COPYN(f) dmw->f = dm->f
COPYS(dmDeviceName, CCHDEVICENAME );
COPYN(dmSpecVersion);
COPYN(dmDriverVersion);
switch ( dm->dmSize )
{
case SIZEOF_DEVMODEA_300:
dmw->dmSize = SIZEOF_DEVMODEW_300;
break;
case SIZEOF_DEVMODEA_400:
dmw->dmSize = SIZEOF_DEVMODEW_400;
break;
case SIZEOF_DEVMODEA_500:
default: /* FIXME what to do??? */
dmw->dmSize = SIZEOF_DEVMODEW_500;
break;
}
COPYN(dmDriverExtra);
COPYN(dmFields);
COPYN(dmPosition.x);
COPYN(dmPosition.y);
COPYN(dmScale);
COPYN(dmCopies);
COPYN(dmDefaultSource);
COPYN(dmPrintQuality);
COPYN(dmColor);
COPYN(dmDuplex);
COPYN(dmYResolution);
COPYN(dmTTOption);
COPYN(dmCollate);
COPYS(dmFormName,CCHFORMNAME);
COPYN(dmLogPixels);
COPYN(dmBitsPerPel);
COPYN(dmPelsWidth);
COPYN(dmPelsHeight);
COPYN(dmDisplayFlags); // aka dmNup
COPYN(dmDisplayFrequency);
if ( dm->dmSize <= SIZEOF_DEVMODEA_300 ) /* this is the minimal dmSize that XP accepts */
if (dmA_size < FIELD_OFFSET(DEVMODEA, dmFields))
return NULL;
if (dmA_size > sizeof(DEVMODEA))
dmA_size = sizeof(DEVMODEA);
dmW_size = dmA_size + CCHDEVICENAME;
if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME)
dmW_size += CCHFORMNAME;
dmW = HeapAlloc(GetProcessHeap(), 0, dmW_size + dmA->dmDriverExtra);
if (!dmW) return NULL;
MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmDeviceName, CCHDEVICENAME,
dmW->dmDeviceName, CCHDEVICENAME);
/* copy slightly more, to avoid long computations */
memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA_size - CCHDEVICENAME);
if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME)
{ {
return dmw; // we're done with 0x300 fields MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmFormName, CCHFORMNAME,
dmW->dmFormName, CCHFORMNAME);
if (dmA_size > FIELD_OFFSET(DEVMODEA, dmLogPixels))
memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA_size - FIELD_OFFSET(DEVMODEA, dmLogPixels));
} }
COPYN(dmICMMethod); if (dmA->dmDriverExtra)
COPYN(dmICMIntent); memcpy((char *)dmW + dmW_size, (const char *)dmA + dmA_size, dmA->dmDriverExtra);
COPYN(dmMediaType);
COPYN(dmDitherType);
COPYN(dmReserved1);
COPYN(dmReserved2);
if ( dm->dmSize <= SIZEOF_DEVMODEA_400 ) dmW->dmSize = dmW_size;
{
return dmw; // we're done with 0x400 fields
}
COPYN(dmPanningWidth); return dmW;
COPYN(dmPanningHeight);
return dmw;
#undef COPYN
#undef COPYS
} }
/* /*

2
reactos/dll/win32/gdi32/objects/dc.c
View file

@ -387,6 +387,8 @@ GetDCObject( HDC hDC, INT iType)
HGDIOBJ hGO = NULL; HGDIOBJ hGO = NULL;
PDC_ATTR Dc_Attr; PDC_ATTR Dc_Attr;
if (!hDC) return hGO;
if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return NULL; if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return NULL;
switch (iType) switch (iType)