Author: tkreuzer Date: Mon May 30 22:15:04 2011 New Revision: 52017
URL: http://svn.reactos.org/svn/reactos?rev=52017&view=rev Log: fix field names of TMW_INTERNAL and TMDIFF
Modified: branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/text.c branches/GSoC_2011/GdiFontDriver/include/reactos/win32k/ntgdityp.h
Modified: branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/dll/win3... ============================================================================== --- branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/text.c [iso-8859-1] Mon May 30 22:15:04 2011 @@ -110,7 +110,7 @@ return FALSE; }
- FONT_TextMetricWToA(&tmwi.TextMetric, lptm); + FONT_TextMetricWToA(&tmwi.tmw, lptm); return TRUE; }
@@ -132,7 +132,7 @@ return FALSE; }
- *lptm = tmwi.TextMetric; + *lptm = tmwi.tmw; return TRUE; }
Modified: branches/GSoC_2011/GdiFontDriver/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/include/... ============================================================================== --- branches/GSoC_2011/GdiFontDriver/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/include/reactos/win32k/ntgdityp.h [iso-8859-1] Mon May 30 22:15:04 2011 @@ -332,14 +332,14 @@ ULONG cjotma; CHAR chFirst; CHAR chLast; - CHAR ChDefault; - CHAR ChBreak; + CHAR chDefault; + CHAR chBreak; } TMDIFF, *PTMDIFF;
typedef struct _TMW_INTERNAL { - TEXTMETRICW TextMetric; - TMDIFF Diff; + TEXTMETRICW tmw; + TMDIFF tmdiff; } TMW_INTERNAL, *PTMW_INTERNAL;
typedef struct _NTMW_INTERNAL @@ -548,7 +548,7 @@ // typedef struct _DRIVER_FUNCTIONS { - PFN_DrvEnablePDEV EnablePDEV; + PFN_DrvEnablePDEV EnablePDEV; PFN_DrvCompletePDEV CompletePDEV; PFN_DrvDisablePDEV DisablePDEV; PFN_DrvEnableSurface EnableSurface; @@ -584,10 +584,10 @@ PFN_DrvStartPage StartPage; PFN_DrvEndDoc EndDoc; PFN_DrvStartDoc StartDoc; - PVOID Unknown3; + PVOID Unknown3; PFN_DrvGetGlyphMode GetGlyphMode; PFN_DrvSynchronize Synchronize; - PVOID Unknown4; + PVOID Unknown4; PFN_DrvSaveScreenBits SaveScreenBits; PFN_DrvGetModes GetModes; PFN_DrvFree Free; @@ -641,7 +641,7 @@ PVOID Reserved9; PVOID Reserved10; PVOID Reserved11; /* 92 */ - + /* ReactOS specify */ PFN_DrvEnableDriver EnableDriver; //ReactOS Extra } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS;