From 0d519bdfd78fa3c70bd2e05f36ac01dc2d253ee0 Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Thu, 21 Jan 2010 11:33:53 +0000 Subject: [PATCH] msdaps: Switch to using an entry prefix for the auto-generated dlldata routines. --- dlls/msdaps/Makefile.in | 4 ++- dlls/msdaps/main.c | 66 +++++++++++++++++++++++++++++++++++++++++ dlls/msdaps/regsvr.c | 61 +++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 dlls/msdaps/main.c create mode 100644 dlls/msdaps/regsvr.c diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 0f653430176..c81c6effaa9 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -4,12 +4,14 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msdaps.dll IMPORTS = oleaut32 ole32 rpcrt4 kernel32 ntdll -EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" +EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" -DENTRY_PREFIX=msdaps_ EXTRAIDLFLAGS = --win32-align=2 EXTRA_OBJS = dlldata.o C_SRCS = \ + main.c \ + regsvr.c \ usrmarshal.c IDL_I_SRCS = \ diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c new file mode 100644 index 00000000000..f8035077bff --- /dev/null +++ b/dlls/msdaps/main.c @@ -0,0 +1,66 @@ +/* + * msdaps initialisation. + * + * Copyright 2010 Huw Davies + * + * 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 +#include + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" +#include "oledb.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + +extern BOOL WINAPI msdaps_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllCanUnloadNow(void) DECLSPEC_HIDDEN; + +/***************************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + return msdaps_DllMain(instance, reason, reserved); +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) +{ + return msdaps_DllGetClassObject(clsid, iid, obj); +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return msdaps_DllCanUnloadNow(); +} diff --git a/dlls/msdaps/regsvr.c b/dlls/msdaps/regsvr.c new file mode 100644 index 00000000000..37946de953d --- /dev/null +++ b/dlls/msdaps/regsvr.c @@ -0,0 +1,61 @@ +/* + * self-registerable dll functions for msdaps.dll + * + * Copyright (C) 2004 Raphael Junqueira + * 2010 Huw Davies + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" + +#include +#include + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "ole2.h" +#include "olectl.h" +#include "oleauto.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + +extern HRESULT WINAPI msdaps_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllUnregisterServer(void) DECLSPEC_HIDDEN; + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return msdaps_DllRegisterServer(); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return msdaps_DllUnregisterServer(); +}