[fireball] 62759: [ARWINSS] - Bring in Eng functions from trunk's gdi32 - Add GetFontResourceInfoW() because base/applications/fontviewer started to depend on it - Stub InitializeLpkHooks() in user...
Author: fireball Date: Wed Apr 16 17:02:22 2014 New Revision: 62759
URL: http://svn.reactos.org/svn/reactos?rev=62759&view=rev Log: [ARWINSS] - Bring in Eng functions from trunk's gdi32 - Add GetFontResourceInfoW() because base/applications/fontviewer started to depend on it - Stub InitializeLpkHooks() in user32 - Arwinss now builds in trunk. I hope the cat is happier now and gets off my window.
Added: branches/arwinss/arwinss/client/gdi32/eng.c - copied, changed from r62758, trunk/reactos/win32ss/gdi/gdi32/objects/eng.c Modified: branches/arwinss/arwinss/client/gdi32/CMakeLists.txt branches/arwinss/arwinss/client/gdi32/font.c branches/arwinss/arwinss/client/gdi32/gdi32.spec branches/arwinss/arwinss/client/user32/legacy.c branches/arwinss/arwinss/client/user32/user32.spec
Modified: branches/arwinss/arwinss/client/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/CMa... ============================================================================== --- branches/arwinss/arwinss/client/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/CMakeLists.txt [iso-8859-1] Wed Apr 16 17:02:22 2014 @@ -23,6 +23,7 @@ dc.c dib.c driver.c + eng.c enhmetafile.c enhmeta2.c font.c
Copied: branches/arwinss/arwinss/client/gdi32/eng.c (from r62758, trunk/reactos/win32ss/gdi/gdi32/objects/eng.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/eng... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/eng.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/eng.c [iso-8859-1] Wed Apr 16 17:02:22 2014 @@ -6,7 +6,29 @@ * */
-#include <precomp.h> +#include "config.h" + +/* Definitions */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define NTOS_MODE_USER + +#include <stdarg.h> + +/* SDK/DDK/NDK Headers. */ +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <objbase.h> +#include <ndk/rtlfuncs.h> +#include <wingdi.h> +#define _ENGINE_EXPORT_ +#include <winddi.h> +#include <winuser.h> + +#include "gdi_private.h" +
/* * @implemented @@ -18,54 +40,6 @@ RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)hsem); }
- -/* - * @unimplemented - */ -BOOL -copy_my_glyphset( FD_GLYPHSET *dst_glyphset , FD_GLYPHSET * src_glyphset, ULONG Size) -{ - BOOL retValue = FALSE; - - memcpy(src_glyphset, dst_glyphset, Size); - if (src_glyphset->cRuns == 0) - { - retValue = TRUE; - } - - /* FIXME copy wrun */ - return retValue; -} - -/* - * @implemented - */ -FD_GLYPHSET* -WINAPI -EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) -{ - FD_GLYPHSET * ntfd_glyphset; - FD_GLYPHSET * myfd_glyphset = NULL; - - ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); - - if (ntfd_glyphset) - { - if (ntfd_glyphset->cjThis) - { - myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); - if (myfd_glyphset) - { - if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) - { - GlobalFree(myfd_glyphset); - myfd_glyphset = NULL; - } - } - } - } - return myfd_glyphset; -}
/* * @implemented @@ -151,42 +125,6 @@ *AnsiCodePage = GetACP(); }
- -/* - * @implemented - */ -LPWSTR WINAPI -EngGetDriverName(HDEV hdev) -{ - // DHPDEV from NtGdiGetDhpdev must be from print driver. - PUMPDEV pPDev = (PUMPDEV)NtGdiGetDhpdev(hdev); - - if (!pPDev) return NULL; - - if (pPDev->Sig != PDEV_UMPD_ID) - { - pPDev = (PUMPDEV)pPDev->Sig; - } - return pPDev->pdi5Info->pDriverPath; -} - -/* - * @implemented - */ -LPWSTR WINAPI -EngGetPrinterDataFileName(HDEV hdev) -{ - PUMPDEV pPDev = (PUMPDEV)NtGdiGetDhpdev(hdev); - - if (!pPDev) return NULL; - - if (pPDev->Sig != PDEV_UMPD_ID) - { - pPDev = (PUMPDEV)pPDev->Sig; - } - return pPDev->pdi5Info->pDataFile; -} - /* * @implemented */
Modified: branches/arwinss/arwinss/client/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/fon... ============================================================================== --- branches/arwinss/arwinss/client/gdi32/font.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/font.c [iso-8859-1] Wed Apr 16 17:02:22 2014 @@ -3480,3 +3480,16 @@ return 0; }
+ +BOOL +WINAPI +GetFontResourceInfoW( + LPCWSTR lpFileName, + DWORD *pdwBufSize, + void* lpBuffer, + DWORD dwType +) +{ + FIXME("GetFontResourceInfoW(%S) UNIMPLEMENTED\n", lpFileName); + return FALSE; +}
Modified: branches/arwinss/arwinss/client/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/gdi... ============================================================================== --- branches/arwinss/arwinss/client/gdi32/gdi32.spec [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/gdi32.spec [iso-8859-1] Wed Apr 16 17:02:22 2014 @@ -154,7 +154,7 @@ @ stub EndFormPage @ stdcall EndPage(long) @ stdcall EndPath(long) -@ stub EngAcquireSemaphore +@ stdcall EngAcquireSemaphore(ptr) @ stub EngAlphaBlend @ stub EngAssociateSurface @ stub EngBitBlt @@ -166,31 +166,31 @@ @ stub EngCreateDeviceBitmap @ stub EngCreateDeviceSurface @ stub EngCreatePalette -@ stub EngCreateSemaphore +@ stdcall EngCreateSemaphore() @ stub EngDeleteClip @ stub EngDeletePalette @ stub EngDeletePath -@ stub EngDeleteSemaphore +@ stdcall EngDeleteSemaphore(ptr) @ stub EngDeleteSurface @ stub EngEraseSurface @ stub EngFillPath -@ stub EngFindResource -@ stub EngFreeModule -@ stub EngGetCurrentCodePage +@ stdcall EngFindResource(ptr long long ptr) +@ stdcall EngFreeModule(ptr) +@ stdcall EngGetCurrentCodePage(ptr ptr) @ stub EngGetDriverName @ stub EngGetPrinterDataFileName @ stub EngGradientFill @ stub EngLineTo -@ stub EngLoadModule +@ stdcall EngLoadModule(ptr) @ stub EngLockSurface @ stub EngMarkBandingSurface @ stub EngMultiByteToUnicodeN -@ stub EngMultiByteToWideChar +@ stdcall EngMultiByteToWideChar(long wstr long str long) @ stub EngPaint @ stub EngPlgBlt @ stub EngQueryEMFInfo -@ stub EngQueryLocalTime -@ stub EngReleaseSemaphore +@ stdcall EngQueryLocalTime(ptr) +@ stdcall EngReleaseSemaphore(ptr) @ stub EngStretchBlt @ stub EngStretchBltROP @ stub EngStrokeAndFillPath @@ -249,15 +249,15 @@ @ stdcall GdiComment(long long ptr) @ stub GdiConsoleTextOut @ stub GdiConvertAndCheckDC -@ stub GdiConvertBitmap +@ stdcall GdiConvertBitmap(ptr) @ stub GdiConvertBitmapV5 -@ stub GdiConvertBrush -@ stub GdiConvertDC +@ stdcall GdiConvertBrush(ptr) +@ stdcall GdiConvertDC(ptr) @ stub GdiConvertEnhMetaFile -@ stub GdiConvertFont +@ stdcall GdiConvertFont(ptr) @ stub GdiConvertMetaFilePict -@ stub GdiConvertPalette -@ stub GdiConvertRegion +@ stdcall GdiConvertPalette(ptr) +@ stdcall GdiConvertRegion(ptr) @ stdcall GdiConvertToDevmodeW(ptr) @ stub GdiCreateLocalBitmap @ stub GdiCreateLocalBrush @@ -335,7 +335,7 @@ @ stub GdiQueryTable @ stdcall GdiRealizationInfo(long ptr) @ stub GdiReleaseDC -@ stub GdiReleaseLocalDC +@ stdcall GdiReleaseLocalDC(ptr) @ stub GdiResetDCEMF @ stdcall GdiSetAttrs(ptr) @ stdcall GdiSetBatchLimit(long) @@ -405,7 +405,7 @@ @ stdcall GetFontData(long long long ptr long) @ stdcall GetFontLanguageInfo(long) @ stub GetFontResourceInfo -@ stub GetFontResourceInfoW +@ stdcall GetFontResourceInfoW(str ptr ptr long) @ stdcall GetFontUnicodeRanges(ptr ptr) @ stdcall GetGlyphIndicesA(long ptr long ptr long) @ stdcall GetGlyphIndicesW(long ptr long ptr long)
Modified: branches/arwinss/arwinss/client/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/le... ============================================================================== --- branches/arwinss/arwinss/client/user32/legacy.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/legacy.c [iso-8859-1] Wed Apr 16 17:02:22 2014 @@ -23,6 +23,14 @@ { }
+VOID +WINAPI +InitializeLpkHooks(FARPROC *hookfuncs) +{ + UNIMPLEMENTED; +} + + /* * Private calls for CSRSS */
Modified: branches/arwinss/arwinss/client/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/us... ============================================================================== --- branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] Wed Apr 16 17:02:22 2014 @@ -411,7 +411,7 @@ @ stdcall InflateRect(ptr long long) # @ stub InitSharedTable # @ stub InitTask -@ stub InitializeLpkHooks +@ stdcall InitializeLpkHooks(ptr) @ stub InitializeWin32EntryTable @ stdcall InsertMenuA(long long long long ptr) @ stdcall InsertMenuItemA(long long long ptr)
-
fireball＠svn.reactos.org