Author: fireball Date: Wed Oct 14 11:27:08 2015 New Revision: 69524
URL: http://svn.reactos.org/svn/reactos?rev=69524&view=rev Log: [ARWINSS] - Use proper winternl.h header from Wine. - metafile.c: No need to save font from the DC as it's not necessary to restore it (see recent Wine src code). - freetype.c: Comment out unused variable.
Modified: branches/arwinss/arwinss/client/gdi32/dc.c branches/arwinss/arwinss/client/gdi32/freetype.c branches/arwinss/arwinss/client/gdi32/gdiobj.c branches/arwinss/arwinss/client/gdi32/metafile.c branches/arwinss/arwinss/client/gdi32/opengl.c
Modified: branches/arwinss/arwinss/client/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/dc.... ============================================================================== --- branches/arwinss/arwinss/client/gdi32/dc.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/dc.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -28,7 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winerror.h" #include "gdi_private.h" #include "wine/unicode.h"
Modified: branches/arwinss/arwinss/client/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/fre... ============================================================================== --- branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -1653,7 +1653,7 @@ { HANDLE hkey; BOOL ret = FALSE; - DWORD type, max_val, max_data, val_len, data_len, index; + DWORD /*type,*/max_val, max_data, val_len, data_len, index; WCHAR *value, *data; WCHAR *entry, *next; SYSTEM_LINKS *font_link, *system_font_link; @@ -1729,7 +1729,7 @@ }
/* Copy type and data length */ - type = info->Type; + //type = info->Type; data_len = info->DataLength;
Modified: branches/arwinss/arwinss/client/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/gdi... ============================================================================== --- branches/arwinss/arwinss/client/gdi32/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/gdiobj.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -31,7 +31,7 @@ #include "winreg.h" #include "winnls.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h"
#include "gdi_private.h" #include "wine/debug.h"
Modified: branches/arwinss/arwinss/client/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/met... ============================================================================== --- branches/arwinss/arwinss/client/gdi32/metafile.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/metafile.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -56,7 +56,7 @@ #include "wingdi.h" #include "winreg.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "gdi_private.h" #include "wine/debug.h"
@@ -394,7 +394,6 @@ WORD i; HPEN hPen; HBRUSH hBrush; - HFONT hFont; HPALETTE hPal; HRGN hRgn; BOOL loaded = FALSE; @@ -409,7 +408,6 @@ /* save DC */ hPen = GetCurrentObject(hdc, OBJ_PEN); hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hFont = GetCurrentObject(hdc, OBJ_FONT); hPal = GetCurrentObject(hdc, OBJ_PAL);
hRgn = CreateRectRgn(0, 0, 0, 0);
Modified: branches/arwinss/arwinss/client/gdi32/opengl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/ope... ============================================================================== --- branches/arwinss/arwinss/client/gdi32/opengl.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/opengl.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -31,7 +31,7 @@ #include "winbase.h" #include "wingdi.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winnt.h" #include "gdi_private.h" #include "wine/debug.h"