reactos/subsys/win32k/objects
diff -u -r1.42 -r1.43
--- color.c 22 May 2004 22:07:42 -0000 1.42
+++ color.c 23 Jun 2004 15:30:20 -0000 1.43
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: color.c,v 1.42 2004/05/22 22:07:42 navaraf Exp $ */
+/* $Id: color.c,v 1.43 2004/06/23 15:30:20 weiden Exp $ */
#include <w32k.h>
// FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -519,7 +519,7 @@
{
HWND hWnd;
- hWnd = IntWindowFromDC(hDC);
+ hWnd = (HWND)NtUserCallOneParam((DWORD)hDC, ONEPARAM_ROUTINE_WINDOWFROMDC);
if (hWnd == NULL)
{
SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
reactos/subsys/win32k/objects
diff -u -r1.98 -r1.99
--- text.c 23 Jun 2004 07:31:22 -0000 1.98
+++ text.c 23 Jun 2004 15:30:21 -0000 1.99
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: text.c,v 1.98 2004/06/23 07:31:22 gvg Exp $ */
+/* $Id: text.c,v 1.99 2004/06/23 15:30:21 weiden Exp $ */
#include <w32k.h>
#include <ft2build.h>
@@ -284,7 +284,7 @@
if (!NT_SUCCESS(Status))
{
- DPRINT("Could not font file: %wZ\n", Filename);
+ DPRINT("Could not font file: %wZ\n", FileName);
NtGdiDeleteObject(NewFont);
return 0;
}