[ros-diffs] [jimtabor] 30212: - Implement GetGlyphIndicesA/W with update changes ported from Wine. - Tested with Abiword 2.4.1. I think the text file did not load the first time, now it does load.
jimtabor at svn.reactos.org
jimtabor at svn.reactos.org
Tue Nov 6 08:12:46 CET 2007
Author: jimtabor
Date: Tue Nov 6 10:12:45 2007
New Revision: 30212
URL: http://svn.reactos.org/svn/reactos?rev=30212&view=rev
Log:
- Implement GetGlyphIndicesA/W with update changes ported from Wine.
- Tested with Abiword 2.4.1. I think the text file did not load the first time, now it does load.
Modified:
trunk/reactos/dll/win32/gdi32/misc/stubsa.c
trunk/reactos/dll/win32/gdi32/misc/stubsw.c
trunk/reactos/dll/win32/gdi32/objects/font.c
trunk/reactos/subsystems/win32/win32k/objects/text.c
trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubsa.c?rev=30212&r1=30211&r2=30212&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Tue Nov 6 10:12:45 2007
@@ -233,24 +233,6 @@
UNIMPLEMENTED;
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
-}
-
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-GetGlyphIndicesA(
- HDC hdc,
- LPCSTR lpstr,
- int c,
- LPWORD pgi,
- DWORD fl
-)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
}
/*
Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubsw.c?rev=30212&r1=30211&r2=30212&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Tue Nov 6 10:12:45 2007
@@ -298,24 +298,6 @@
}
/*
- * @unimplemented
- */
-DWORD
-STDCALL
-GetGlyphIndicesW(
- HDC hdc,
- LPCWSTR lpstr,
- int c,
- LPWORD pgi,
- DWORD fl
-)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
* @implemented
*/
UINT
Modified: trunk/reactos/dll/win32/gdi32/objects/font.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/font.c?rev=30212&r1=30211&r2=30212&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/font.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/font.c Tue Nov 6 10:12:45 2007
@@ -90,15 +90,18 @@
/***********************************************************************
* FONT_mbtowc
*
- * Returns a Unicode translation of str. If count is -1 then str is
- * assumed to be '\0' terminated, otherwise it contains the number of
- * bytes to convert. If plenW is non-NULL, on return it will point to
- * the number of WCHARs that have been written. The caller should free
- * the returned LPWSTR from the process heap itself.
- */
-static LPWSTR FONT_mbtowc(LPCSTR str, INT count, INT *plenW)
-{
- UINT cp = CP_ACP;
+ * Returns a Unicode translation of str using the charset of the
+ * currently selected font in hdc. If count is -1 then str is assumed
+ * to be '\0' terminated, otherwise it contains the number of bytes to
+ * convert. If plenW is non-NULL, on return it will point to the
+ * number of WCHARs that have been written. If pCP is non-NULL, on
+ * return it will point to the codepage used in the conversion. The
+ * caller should free the returned LPWSTR from the process heap
+ * itself.
+ */
+static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP)
+{
+ UINT cp = CP_ACP; // GdiGetCodePage( hdc );
INT lenW;
LPWSTR strW;
@@ -108,6 +111,7 @@
MultiByteToWideChar(cp, 0, str, count, strW, lenW);
DPRINT1("mapped %s -> %s \n", str, strW);
if(plenW) *plenW = lenW;
+ if(pCP) *pCP = cp;
return strW;
}
@@ -458,7 +462,7 @@
for(i = 0; i < count; i++)
str[i] = (BYTE)(iFirstChar + i);
- wstr = FONT_mbtowc(str, count, &wlen);
+ wstr = FONT_mbtowc(NULL, str, count, &wlen, NULL);
for(i = 0; i < wlen; i++)
{
@@ -570,7 +574,7 @@
}
/*if(lpResults->lpGlyphs)
- GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0);*/
+ NtGdiGetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0);*/
if (GetTextExtentPoint32W(hdc, lpString, uCount, &size))
ret = MAKELONG(size.cx, size.cy);
@@ -632,6 +636,28 @@
return NtGdiGetCharABCWidthsFloat ( hdc, iFirstChar, iLastChar, lpABCF );
}
+/*
+ * @implemented
+ */
+DWORD
+STDCALL
+GetGlyphIndicesA(
+ HDC hdc,
+ LPCSTR lpstr,
+ INT count,
+ LPWORD pgi,
+ DWORD flags
+ )
+{
+ DWORD Ret;
+ WCHAR *lpstrW;
+ INT countW;
+
+ lpstrW = FONT_mbtowc(hdc, lpstr, count, &countW, NULL);
+ Ret = NtGdiGetGlyphIndicesW(hdc, lpstrW, countW, pgi, flags);
+ HeapFree(GetProcessHeap(), 0, lpstrW);
+ return Ret;
+}
/*
* @implemented
@@ -664,7 +690,7 @@
len = 1;
mbchs[0] = (uChar & 0xff);
}
- p = FONT_mbtowc(mbchs, len, NULL);
+ p = FONT_mbtowc(NULL, mbchs, len, NULL, NULL);
c = p[0];
} else
c = uChar;
Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/text.c?rev=30212&r1=30211&r2=30212&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Nov 6 10:12:45 2007
@@ -2389,6 +2389,121 @@
{
UNIMPLEMENTED;
return 0;
+}
+
+ /*
+ * @implemented
+ */
+DWORD
+STDCALL
+NtGdiGetGlyphIndicesW(
+ IN HDC hdc,
+ IN OPTIONAL LPWSTR UnSafepwc,
+ IN INT cwc,
+ OUT OPTIONAL LPWORD UnSafepgi,
+ IN DWORD iMode)
+{
+ PDC dc;
+ PTEXTOBJ TextObj;
+ PFONTGDI FontGDI;
+ HFONT hFont = 0;
+ NTSTATUS Status = STATUS_SUCCESS;
+ OUTLINETEXTMETRICW *potm;
+ INT i;
+ FT_Face face;
+ WCHAR DefChar = 0, tmDefaultChar;
+ PWSTR Buffer = NULL;
+ ULONG Size;
+
+ if ((!UnSafepwc) && (!UnSafepgi)) return cwc;
+
+ dc = DC_LockDc(hdc);
+ if (!dc)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return GDI_ERROR;
+ }
+ hFont = dc->Dc_Attr.hlfntNew;
+ TextObj = TEXTOBJ_LockText(hFont);
+ DC_UnlockDc(dc);
+ if (!TextObj)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return GDI_ERROR;
+ }
+
+ FontGDI = ObjToGDI(TextObj->Font, FONT);
+ TEXTOBJ_UnlockText(TextObj);
+
+ Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), TAG_GDITEXT);
+ if (!Buffer)
+ {
+ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+ return GDI_ERROR;
+ }
+
+ Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL);
+ potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT);
+ if (!potm)
+ {
+ Status = ERROR_NOT_ENOUGH_MEMORY;
+ goto ErrorRet;
+ }
+ IntGetOutlineTextMetrics(FontGDI, Size, potm);
+ tmDefaultChar = potm->otmTextMetrics.tmDefaultChar; // May need this.
+ ExFreePool(potm);
+
+ if (iMode & GGI_MARK_NONEXISTING_GLYPHS) DefChar = 0x001f; /* Indicate non existence */
+
+ _SEH_TRY
+ {
+ ProbeForRead(UnSafepwc,
+ sizeof(PWSTR),
+ 1);
+ }
+ _SEH_HANDLE
+ {
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+
+ if (!NT_SUCCESS(Status)) goto ErrorRet;
+
+ IntLockFreeType;
+ face = FontGDI->face;
+
+ for (i = 0; i < cwc; i++)
+ {
+ Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]);
+ if (Buffer[i] == 0)
+ {
+ if (!DefChar) DefChar = tmDefaultChar;
+ Buffer[i] = DefChar;
+ }
+ }
+
+ IntUnLockFreeType;
+
+ _SEH_TRY
+ {
+ ProbeForWrite(UnSafepgi,
+ sizeof(WORD),
+ 1);
+ RtlCopyMemory(UnSafepgi,
+ Buffer,
+ cwc*sizeof(WORD));
+ }
+ _SEH_HANDLE
+ {
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+
+ErrorRet:
+ ExFreePool(Buffer);
+ if (NT_SUCCESS(Status)) return cwc;
+ SetLastWin32Error(Status);
+ return GDI_ERROR;
}
static
Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/stubs/stubs.c?rev=30212&r1=30211&r2=30212&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original)
+++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Tue Nov 6 10:12:45 2007
@@ -2658,23 +2658,6 @@
return 0;
}
-
- /*
- * @unimplemented
- */
-DWORD
-STDCALL
-NtGdiGetGlyphIndicesW(
- IN HDC hdc,
- IN OPTIONAL LPWSTR pwc,
- IN INT cwc,
- OUT OPTIONAL LPWORD pgi,
- IN DWORD iMode)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
/*
* @unimplemented
*/
More information about the Ros-diffs
mailing list