Module: wine Branch: master Commit: 7267c0772bb15416d0cebcb7f0b5693c4c7fbdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7267c0772bb15416d0cebcb7f0...
Author: Juan Lang juan.lang@gmail.com Date: Thu Apr 10 10:27:04 2008 -0700
softpub: Forward softpub functions to wintrust.
---
dlls/softpub/Makefile.in | 5 +--- dlls/softpub/main.c | 46 --------------------------------------------- dlls/softpub/softpub.spec | 42 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 71 deletions(-)
diff --git a/dlls/softpub/Makefile.in b/dlls/softpub/Makefile.in index b62dae7..8166939 100644 --- a/dlls/softpub/Makefile.in +++ b/dlls/softpub/Makefile.in @@ -3,10 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = softpub.dll -IMPORTS = kernel32 - -C_SRCS = \ - main.c +IMPORTS = wintrust kernel32
@MAKE_DLL_RULES@
diff --git a/dlls/softpub/main.c b/dlls/softpub/main.c deleted file mode 100644 index bf9a6f5..0000000 --- a/dlls/softpub/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2008 Maarten Lankhorst - * - * 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 "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(softpub); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - default: - break; - } - return TRUE; -} diff --git a/dlls/softpub/softpub.spec b/dlls/softpub/softpub.spec index 620ae27..5b2e20a 100644 --- a/dlls/softpub/softpub.spec +++ b/dlls/softpub/softpub.spec @@ -1,24 +1,24 @@ -1 stub GenericChainCertificateTrust -2 stub GenericChainFinalProv -3 stub HTTPSCertificateTrust -4 stub SoftpubDefCertInit +1 stdcall GenericChainCertificateTrust(ptr) wintrust.GenericChainCertificateTrust +2 stdcall GenericChainFinalProv(ptr) wintrust.GenericChainFinalProv +3 stdcall HTTPSCertificateTrust(ptr) wintrust.HTTPSCertificateTrust +4 stdcall SoftpubDefCertInit(ptr) wintrust.SoftpubDefCertInit 5 stub SoftpubFreeDefUsageCallData 6 stub SoftpubLoadDefUsageCallData 7 stub AddPersonalTrustDBPages -8 stub DllRegisterServer -9 stub DllUnregisterServer -10 stub DriverCleanupPolicy -11 stub DriverFinalPolicy -12 stub DriverInitializePolicy -13 stub FindCertsByIssuer -14 stub HTTPSFinalProv -15 stub OfficeCleanupPolicy -16 stub OfficeInitializePolicy -17 stub OpenPersonalTrustDBDialog -18 stub SoftpubAuthenticode -19 stub SoftpubCheckCert -20 stub SoftpubCleanup -21 stub SoftpubDumpStructure -22 stub SoftpubInitialize -23 stub SoftpubLoadMessage -24 stub SoftpubLoadSignature +8 stdcall -private DllRegisterServer() wintrust.SoftpubDllRegisterServer +9 stdcall -private DllUnregisterServer() wintrust.SoftpubDllUnregisterServer +10 stdcall DriverCleanupPolicy(ptr) wintrust.DriverCleanupPolicy +11 stdcall DriverFinalPolicy(ptr) wintrust.DriverFinalPolicy +12 stdcall DriverInitializePolicy(ptr) wintrust.DriverInitializePolicy +13 stdcall FindCertsByIssuer(ptr ptr ptr ptr long wstr long) wintrust.FindCertsByIssuer +14 stdcall HTTPSFinalProv(ptr) wintrust.HTTPSFinalProv +15 stdcall OfficeCleanupPolicy(ptr) wintrust.OfficeCleanupPolicy +16 stdcall OfficeInitializePolicy(ptr) wintrust.OfficeInitializePolicy +17 stdcall OpenPersonalTrustDBDialog(long) wintrust.OpenPersonalTrustDBDialog +18 stdcall SoftpubAuthenticode(ptr) wintrust.SoftpubAuthenticode +19 stdcall SoftpubCheckCert(ptr long long long) wintrust.SoftpubCheckCert +20 stdcall SoftpubCleanup(ptr) wintrust.SoftpubCleanup +21 stdcall SoftpubDumpStructure(ptr) wintrust.SoftpubDumpStructure +22 stdcall SoftpubInitialize(ptr) wintrust.SoftpubInitialize +23 stdcall SoftpubLoadMessage(ptr) wintrust.SoftpubLoadMessage +24 stdcall SoftpubLoadSignature(ptr) wintrust.SoftpubLoadSignature