[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit c62f71707495769607a88e978b21821e172c611f
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Sat Mar 10 19:42:43 2012 +1100

    mssign32: Add stubs PvkFreeCryptProv, PvkGetCryptProv, PvkPrivateKeyAcquireContextFromMemory.
    (cherry picked from commit 9e10eee67bd5e71c4f2c15cc9d16d1ab799d91bb)

diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec
index 95b42e4..07d7a99 100644
--- a/dlls/mssign32/mssign32.spec
+++ b/dlls/mssign32/mssign32.spec
@@ -2,11 +2,11 @@
 @ stub DllUnregisterServer
 @ stub FreeCryptProvFromCert
 @ stub GetCryptProvFromCert
-@ stub PvkFreeCryptProv
-@ stub PvkGetCryptProv
+@ stdcall PvkFreeCryptProv(ptr wstr long wstr)
+@ stdcall PvkGetCryptProv(ptr wstr wstr long wstr wstr ptr ptr ptr)
 @ stub PvkPrivateKeyAcquireContext
 @ stub PvkPrivateKeyAcquireContextA
-@ stub PvkPrivateKeyAcquireContextFromMemory
+@ stdcall PvkPrivateKeyAcquireContextFromMemory(wstr long ptr long ptr wstr ptr ptr ptr)
 @ stub PvkPrivateKeyAcquireContextFromMemoryA
 @ stub PvkPrivateKeyLoad
 @ stub PvkPrivateKeyLoadA
diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c
index 6b403bd..c58c1f0 100644
--- a/dlls/mssign32/mssign32_main.c
+++ b/dlls/mssign32/mssign32_main.c
@@ -24,7 +24,11 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "wincrypt.h"
 
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mssign);
 
 BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv )
 {
@@ -40,3 +44,33 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv )
     }
     return TRUE;
 }
+
+
+HRESULT WINAPI PvkGetCryptProv(HWND hwnd, LPCWSTR pwszCaption, LPCWSTR pwszCapiProvider,
+                    DWORD dwProviderType, LPCWSTR pwszPvkFile, LPCWSTR pwszKeyContainerName,
+                    DWORD *pdwKeySpec, LPWSTR *ppwszTmpContainer, HCRYPTPROV *phCryptProv)
+{
+    FIXME("%p %s %s %d %s %s %p %p %p stub", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider),
+                    dwProviderType, debugstr_w(pwszPvkFile), debugstr_w(pwszKeyContainerName),
+                    pdwKeySpec, ppwszTmpContainer, phCryptProv);
+
+    return E_FAIL;
+}
+
+BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dwProvType,
+                    BYTE *pbData, DWORD cbData, HWND hwndOwner, LPCWSTR pwszKeyName,
+                    DWORD *pdwKeySpec, HCRYPTPROV *phCryptProv, LPWSTR *ppwszTmpContainer)
+{
+    FIXME("%s %d %p %d %p %s %p %p %p stub", debugstr_w(pwszProvName), dwProvType,
+                    pbData, cbData, hwndOwner, debugstr_w(pwszKeyName), pdwKeySpec,
+                    phCryptProv, ppwszTmpContainer);
+
+    return FALSE;
+}
+
+void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD dwProviderType,
+                    LPWSTR pwszTmpContainer)
+{
+    FIXME("%08lx %s %d %s stub", hProv, debugstr_w(pwszCapiProvider), dwProviderType,
+                    debugstr_w(pwszTmpContainer));
+}

-- 
Debian Wine packaging