[ros-diffs] [jimtabor] 31484: Fix GetkerningPairsA, so it can handle null count and pointer. Fix export problem for user32.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Sat Dec 29 09:27:19 2007
New Revision: 31484

URL: http://svn.reactos.org/svn/reactos?rev=31484&view=rev
Log:
Fix GetkerningPairsA, so it can handle null count and pointer. Fix export problem for user32.

Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.rbuild
    trunk/reactos/dll/win32/gdi32/objects/font.c
    trunk/reactos/dll/win32/gdi32/objects/palette.c

Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbuild?rev=31484&r1=31483&r2=31484&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Sat Dec 29 09:27:19 2007
@@ -6,6 +6,7 @@
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>
+	<library>user32</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>win32ksys</library>

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=31484&r1=31483&r2=31484&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/font.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/font.c Sat Dec 29 09:27:19 2007
@@ -1174,8 +1174,10 @@
     }
     DPRINT("charset %d => codepage %u\n", charset, csi.ciACP);
 
-    total_kern_pairs = GetKerningPairsW(hDC, 0, NULL);
+    total_kern_pairs = NtGdiGetKerningPairs(hDC, 0, NULL);
     if (!total_kern_pairs) return 0;
+
+    if (!cPairs && !kern_pairA) return total_kern_pairs;
 
     kern_pairW = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW));
     GetKerningPairsW(hDC, total_kern_pairs, kern_pairW);

Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/palette.c?rev=31484&r1=31483&r2=31484&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/palette.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/palette.c Sat Dec 29 09:27:19 2007
@@ -86,10 +86,7 @@
     }
  }
 #endif
-// return UserRealizePalette(hDC);
-
-//HACK!!!!!
- return  NtGdiRealizePalette(hDC);
+ return UserRealizePalette(hDC);
 }