Module: wine Branch: master Commit: 59873a3748cb786fc74b26039e8375df6ac1b854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59873a3748cb786fc74b26039e...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Nov 21 02:13:36 2007 +0100
hlink: Move common includes and function declarations to header file.
---
dlls/hlink/browse_ctx.c | 13 +------------ dlls/hlink/hlink_main.c | 16 ++-------------- dlls/hlink/hlink_private.h | 31 +++++++++++++++++++++++++++++++ dlls/hlink/link.c | 15 ++------------- 4 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index f36fd2f..bd9b6fc 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -18,20 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> - -#define COBJMACROS - -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "unknwn.h" -#include "objidl.h" +#include "hlink_private.h"
#include "wine/debug.h" -#include "hlink.h"
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 69e3cef..a68585f 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -18,28 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> +#include "hlink_private.h"
-#define COBJMACROS - -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winreg.h" -#include "ole2.h" -#include "unknwn.h" +#include "hlguids.h"
#include "wine/debug.h" #include "wine/unicode.h" -#include "hlink.h" -#include "hlguids.h"
WINE_DEFAULT_DEBUG_CHANNEL(hlink);
-extern HRESULT WINAPI HLink_Constructor(IUnknown *, REFIID, LPVOID*); -extern HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown *, REFIID, LPVOID*); - typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*);
typedef struct diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h new file mode 100644 index 0000000..0a765be --- /dev/null +++ b/dlls/hlink/hlink_private.h @@ -0,0 +1,31 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "hlink.h" + +extern HRESULT WINAPI HLink_Constructor(IUnknown*,REFIID,void**); +extern HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**); diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index c450951..e1eb6f9 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -18,25 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> +#include "hlink_private.h"
-#define COBJMACROS - -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "unknwn.h" -#include "objidl.h" #include "shellapi.h" +#include "hlguids.h"
#include "wine/debug.h" #include "wine/unicode.h"
-#include "hlink.h" -#include "hlguids.h" - WINE_DEFAULT_DEBUG_CHANNEL(hlink);
#define HLINK_SAVE_MAGIC 0x00000002