From c82d56cc947631eb48105ea1f69ef18bd73a846d Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 1 Sep 2007 23:11:16 +0000
Subject: [PATCH] Revert wars! ;-) I talked with GL, he agrees, it is correct.

svn path=/trunk/; revision=28754
---
 reactos/dll/win32/gdi32/objects/font.c | 38 +++++++++++---------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/reactos/dll/win32/gdi32/objects/font.c b/reactos/dll/win32/gdi32/objects/font.c
index 13834ad1e56..78e932e448f 100644
--- a/reactos/dll/win32/gdi32/objects/font.c
+++ b/reactos/dll/win32/gdi32/objects/font.c
@@ -1091,17 +1091,13 @@ int
 STDCALL
 AddFontResourceExW ( LPCWSTR lpszFilename, DWORD fl, PVOID pvReserved )
 {
-    int retVal = 0;
-
-    if (fl & (FR_PRIVATE | FR_NOT_ENUM))
-    {
-        retVal = GdiAddFontResourceW(lpszFilename, fl,0);
-    }
-    else
+    if (fl & ~(FR_PRIVATE | FR_NOT_ENUM))
     {
         SetLastError( ERROR_INVALID_PARAMETER );
+        return 0;
     }
-    return retVal;
+
+    return GdiAddFontResourceW(lpszFilename, fl,0);
 }
 
 
@@ -1114,26 +1110,24 @@ AddFontResourceExA ( LPCSTR lpszFilename, DWORD fl, PVOID pvReserved )
 {
     NTSTATUS Status;
     PWSTR FilenameW;
-    int rc = 0;
+    int rc;
 
-    if (!(fl & (FR_PRIVATE | FR_NOT_ENUM)))
+    if (fl & ~(FR_PRIVATE | FR_NOT_ENUM))
     {
         SetLastError( ERROR_INVALID_PARAMETER );
+        return 0;
     }
-    else
+
+    Status = HEAP_strdupA2W ( &FilenameW, lpszFilename );
+    if ( !NT_SUCCESS (Status) )
     {
-        Status = HEAP_strdupA2W ( &FilenameW, lpszFilename );
-        if ( !NT_SUCCESS (Status) )
-        {
-            SetLastError (RtlNtStatusToDosError(Status));
-        }
-        else
-        {
-            rc = GdiAddFontResourceW ( FilenameW, fl, 0 );
-            HEAP_free ( FilenameW );
-        }
+        SetLastError (RtlNtStatusToDosError(Status));
+        return 0;
     }
-  return rc;
+
+    rc = GdiAddFontResourceW ( FilenameW, fl, 0 );
+    HEAP_free ( FilenameW );
+    return rc;
 }