From 1f723891285e7b10dcc9df2a99ae4f767c0b9a34 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Wed, 16 Dec 2015 14:45:19 +0000 Subject: [PATCH] [WINLOGON] Get rid of setup.h. svn path=/trunk/; revision=70361 --- reactos/base/system/winlogon/setup.h | 32 ------------------------- reactos/base/system/winlogon/winlogon.h | 9 +++++-- 2 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 reactos/base/system/winlogon/setup.h diff --git a/reactos/base/system/winlogon/setup.h b/reactos/base/system/winlogon/setup.h deleted file mode 100644 index 2c16c6526d6..00000000000 --- a/reactos/base/system/winlogon/setup.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS winlogon - * FILE: base/system/winlogon/setup.h - * PURPOSE: Setup support functions - * PROGRAMMER: Eric Kohl - */ - -#pragma once - -DWORD GetSetupType (VOID); -BOOL RunSetup (VOID); - -/* EOF */ diff --git a/reactos/base/system/winlogon/winlogon.h b/reactos/base/system/winlogon/winlogon.h index 877343cc087..640f80fcf41 100644 --- a/reactos/base/system/winlogon/winlogon.h +++ b/reactos/base/system/winlogon/winlogon.h @@ -46,7 +46,6 @@ #include WINE_DEFAULT_DEBUG_CHANNEL(winlogon); -#include "setup.h" #include "resource.h" typedef BOOL (WINAPI * PFWLXNEGOTIATE) (DWORD, DWORD *); @@ -306,8 +305,14 @@ InitializeScreenSaver(IN OUT PWLSESSION Session); VOID StartScreenSaver(IN PWLSESSION Session); -/* winlogon.c */ +/* setup.c */ +DWORD +GetSetupType(VOID); +BOOL +RunSetup(VOID); + +/* winlogon.c */ BOOL PlaySoundRoutine(IN LPCWSTR FileName, IN UINT Logon,