[akhaldi] 60373: [RSAENH] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 26 16:41:19 2013
New Revision: 60373

URL: http://svn.reactos.org/svn/reactos?rev=60373&view=rev
Log:
[RSAENH]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/rsaenh/CMakeLists.txt
    trunk/reactos/dll/win32/rsaenh/mpi.c
    trunk/reactos/dll/win32/rsaenh/rsaenh.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeLists...
==============================================================================
--- trunk/reactos/dll/win32/rsaenh/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rsaenh/CMakeLists.txt	[iso-8859-1] Thu Sep 26 16:41:19 2013
@@ -1,7 +1,6 @@

add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(rsaenh.dll rsaenh.spec ADD_IMPORTLIB)

list(APPEND SOURCE
@@ -16,12 +15,11 @@
     rsa.c
     rsaenh.c
     sha2.c
-    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def)

-add_library(rsaenh SHARED ${SOURCE})
+add_library(rsaenh SHARED ${SOURCE} rsrc.rc)
 set_module_type(rsaenh win32dll)
-target_link_libraries(rsaenh uuid wine)
+target_link_libraries(rsaenh wine)
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
 add_pch(rsaenh tomcrypt.h)
 add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/rsaenh/mpi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev=...
==============================================================================
--- trunk/reactos/dll/win32/rsaenh/mpi.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rsaenh/mpi.c	[iso-8859-1] Thu Sep 26 16:41:19 2013
@@ -3519,8 +3519,8 @@
       return res;
     }

-      a->dp[0] |= *b++;
-      a->used += 1;
+    a->dp[0] |= *b++;
+    a->used += 1;
   }
   mp_clamp (a);
   return MP_OKAY;

Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?r...
==============================================================================
--- trunk/reactos/dll/win32/rsaenh/rsaenh.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rsaenh/rsaenh.c	[iso-8859-1] Thu Sep 26 16:41:19 2013
@@ -362,7 +362,7 @@
  *
  * Initializes and destroys the handle table for the CSP's handles.
  */
-int WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved)
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID reserved)
 {
     switch (fdwReason)
     {
@@ -373,10 +373,11 @@
             break;

case DLL_PROCESS_DETACH:
+            if (reserved) break;
             destroy_handle_table(&handle_table);
             break;
     }
-    return 1;
+    return TRUE;
 }

/******************************************************************************
@@ -1701,6 +1702,11 @@
 {
     DWORD i;

+    if (dwDataLen < 3)
+    {
+        SetLastError(NTE_BAD_DATA);
+        return FALSE;
+    }
     for (i=2; i<dwDataLen; i++)
         if (!abData[i])
             break;
@@ -2378,11 +2384,13 @@
                     *pdwDataLen -= pbData[*pdwDataLen-1];
                 else {
                     SetLastError(NTE_BAD_DATA);
+                    setup_key(pCryptKey);
                     return FALSE;
                 }
             }
             else {
                 SetLastError(NTE_BAD_DATA);
+                setup_key(pCryptKey);
                 return FALSE;
             }
         }

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Sep 26 16:41:19 2013
@@ -165,7 +165,7 @@
 reactos/dll/win32/riched32        # Synced to Wine-1.7.1
 reactos/dll/win32/rpcrt4          # Synced to Wine-1.3.26
 reactos/dll/win32/rsabase         # Autosync
-reactos/dll/win32/rsaenh          # Synced to Wine-1.5.4
+reactos/dll/win32/rsaenh          # Synced to Wine-1.7.1
 reactos/dll/win32/sccbase         # Synced to Wine-1.5.19
 reactos/dll/win32/schannel        # Synced to Wine-1.5.19
 reactos/dll/win32/scrrun          # Synced to Wine-1.7.1