[ros-diffs] [akhaldi] 56610: [MSSIGN32] * Sync to Wine 1.5.4.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Sat May 19 09:26:02 2012
New Revision: 56610

URL: http://svn.reactos.org/svn/reactos?rev=56610&view=rev
Log:
[MSSIGN32]
* Sync to Wine 1.5.4.

Modified:
    trunk/reactos/dll/win32/mssign32/CMakeLists.txt
    trunk/reactos/dll/win32/mssign32/mssign32.spec
    trunk/reactos/dll/win32/mssign32/mssign32_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/mssign32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/CMakeLists.txt?rev=56610&r1=56609&r2=56610&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] Sat May 19 09:26:02 2012
@@ -10,11 +10,7 @@
     ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def)
 
 add_library(mssign32 SHARED ${SOURCE})
-
 set_module_type(mssign32 win32dll)
-
 target_link_libraries(mssign32 wine)
-
 add_importlibs(mssign32 msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET mssign32 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/mssign32/mssign32.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign32.spec?rev=56610&r1=56609&r2=56610&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mssign32/mssign32.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mssign32/mssign32.spec [iso-8859-1] Sat May 19 09:26:02 2012
@@ -2,11 +2,11 @@
 @ stub -private 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

Modified: trunk/reactos/dll/win32/mssign32/mssign32_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign32_main.c?rev=56610&r1=56609&r2=56610&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mssign32/mssign32_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mssign32/mssign32_main.c [iso-8859-1] Sat May 19 09:26:02 2012
@@ -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 @@
     }
     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\n", 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\n", 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\n", hProv, debugstr_w(pwszCapiProvider), dwProviderType,
+                    debugstr_w(pwszTmpContainer));
+}

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=56610&r1=56609&r2=56610&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 09:26:02 2012
@@ -109,7 +109,7 @@
 reactos/dll/win32/msisys.ocx      # Synced to Wine-1.3.37
 reactos/dll/win32/msnet32         # Synced to Wine-1.3.37
 reactos/dll/win32/msrle32         # Autosync
-reactos/dll/win32/mssign32        # Synced to Wine-1.3.37
+reactos/dll/win32/mssign32        # Synced to Wine-1.5.4
 reactos/dll/win32/mssip32         # Synced to Wine-1.3.37
 reactos/dll/win32/mstask          # Synced to Wine-1.3.37
 reactos/dll/win32/msvcrt20        # Autosync