Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Sync gdiplus with Wine 1.1.20

Browse source 
svn path=/trunk/; revision=40796
This commit is contained in:
Dmitry Chapyshev 2009-05-05 15:35:05 +00:00
parent 57e86f2709
commit 95a4fce528
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/gdiplus/font.c
View file

@ -224,9 +224,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC hdc,
if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE))
return GenericError; return GenericError;
GdipCreateFontFromLogfontW(hdc, &lfw, font); return GdipCreateFontFromLogfontW(hdc, &lfw, font);
return Ok;
} }
/******************************************************************************* /*******************************************************************************
@ -301,7 +299,7 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family)
* *
* RETURNS * RETURNS
* SUCCESS: Ok * SUCCESS: Ok
* FAILURE: InvalidParamter (font or size was NULL) * FAILURE: InvalidParameter (font or size was NULL)
* *
* NOTES * NOTES
* Size returned is actually emSize -- not internal size used for drawing. * Size returned is actually emSize -- not internal size used for drawing.
@ -390,7 +388,7 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics,
memcpy(lfa, &lfw, FIELD_OFFSET(LOGFONTA,lfFaceName) ); memcpy(lfa, &lfw, FIELD_OFFSET(LOGFONTA,lfFaceName) );
if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) if(!WideCharToMultiByte(CP_ACP, 0, lfw.lfFaceName, -1, lfa->lfFaceName, LF_FACESIZE, NULL, NULL))
return GenericError; return GenericError;
return Ok; return Ok;

2
reactos/dll/win32/gdiplus/gdiplus.spec
View file

@ -43,7 +43,7 @@
@ stdcall GdipBitmapGetPixel(ptr long long ptr) @ stdcall GdipBitmapGetPixel(ptr long long ptr)
@ stdcall GdipBitmapLockBits(ptr ptr long long ptr) @ stdcall GdipBitmapLockBits(ptr ptr long long ptr)
@ stub GdipBitmapSetPixel @ stub GdipBitmapSetPixel
@ stub GdipBitmapSetResolution @ stdcall GdipBitmapSetResolution(ptr long long)
@ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipBitmapUnlockBits(ptr ptr)
@ stdcall GdipClearPathMarkers(ptr) @ stdcall GdipClearPathMarkers(ptr)
@ stub GdipCloneBitmapArea @ stub GdipCloneBitmapArea

7
reactos/dll/win32/gdiplus/image.c
View file

@ -192,6 +192,13 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect,
return Ok; return Ok;
} }
GpStatus WINGDIPAPI GdipBitmapSetResolution(GpBitmap* bitmap, REAL xdpi, REAL ydpi)
{
FIXME("(%p, %.2f, %.2f)\n", bitmap, xdpi, ydpi);
return NotImplemented;
}
GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap,
BitmapData* lockeddata) BitmapData* lockeddata)
{ {