[ros-diffs] [jimtabor] 22261: Implement Get & SetTextCharacterExtra. Does nothing ATM.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Wed Jun  7 05:22:47 2006
New Revision: 22261

URL: http://svn.reactos.ru/svn/reactos?rev=22261&view=rev
Log:
Implement Get & SetTextCharacterExtra. Does nothing ATM.

Modified:
    trunk/reactos/dll/win32/gdi32/misc/stubs.c
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/subsystems/win32/win32k/objects/text.c
    trunk/reactos/tools/nci/w32ksvc.db

Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Jun  7 05:22:47 2006
@@ -251,9 +251,7 @@
 	HDC	hDc
 	)
 {
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
+	return NtGdiGetSetTextCharExtra( hDc, 0, FALSE);
 }
 
 
@@ -390,13 +388,11 @@
 int
 STDCALL
 SetTextCharacterExtra(
-	HDC	a0,
-	int	a1
-	)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
+	HDC	hDC,
+	int	CharExtra
+	)
+{
+	return NtGdiGetSetTextCharExtra( hDC, CharExtra, TRUE);
 }
 
 

Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/win32k/ntgdibad.h?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Jun  7 05:22:47 2006
@@ -680,6 +680,11 @@
 INT STDCALL  NtGdiGetRelAbs(HDC  hDC);
 
 /* Should be done in user-mode using shared GDI Objects. */
+INT
+STDCALL
+NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set);
+
+/* Should be done in user-mode using shared GDI Objects. */
 INT STDCALL  NtGdiGetStretchBltMode(HDC  hDC);
 
 /* Use NtGdiDoPalette with GdiPalSetSystemEntries. */

Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/text.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c Wed Jun  7 05:22:47 2006
@@ -3267,4 +3267,26 @@
   return sizeof(LOGFONTW);
 }
 
+
+/* Remove this HAX! after the below function is done in GDI32.DLL! */
+INT
+STDCALL
+NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set)
+{
+  /* Ulta-Ugly Hax! */
+  INT Ret = 0x80000000;
+  DPRINT("TextCharacterExtra %d", CharExtra);
+  PDC dc = DC_LockDc ( hDC );
+  if (!dc)
+    {
+       SetLastWin32Error(ERROR_INVALID_HANDLE);
+    }
+  else
+    {  
+       Ret = dc->w.charExtra;
+       if( Set ) dc->w.charExtra = CharExtra;
+    }
+  return (Ret);
+}
+
 /* EOF */

Modified: trunk/reactos/tools/nci/w32ksvc.db
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- trunk/reactos/tools/nci/w32ksvc.db (original)
+++ trunk/reactos/tools/nci/w32ksvc.db Wed Jun  7 05:22:47 2006
@@ -150,6 +150,7 @@
 NtGdiGetRelAbs				1
 NtGdiGetRegionData			3
 NtGdiGetRgnBox				2
+NtGdiGetSetTextCharExtra		3
 NtGdiGetStockObject			1
 NtGdiGetStretchBltMode			1
 NtGdiGetSystemPaletteEntries		4