[RSAENH] import from wine-10.0

Author: MishaProductions

configure.cmd

@@ -203,7 +203,7 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" (
 ) else if %USE_CLANG_CL% == 1 (
     cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DUSE_CLANG_CL:BOOL=1 %CMAKE_PARAMS% "%REACTOS_SOURCE_DIR%"
 ) else (
-    cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %CMAKE_PARAMS% "%REACTOS_SOURCE_DIR%"
+    cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %CMAKE_PARAMS% "%REACTOS_SOURCE_DIR%
 )
 
 if %ERRORLEVEL% NEQ 0 (

dll/win32/rsaenh/CMakeLists.txt

@@ -21,8 +21,8 @@ add_library(rsaenh MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def)
 
 set_module_type(rsaenh win32dll)
-target_link_libraries(rsaenh wine)
+target_link_libraries(rsaenh wine wine_dll_register wine_dll_canunload)
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
 add_pch(rsaenh tomcrypt.h SOURCE)
 add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all)
-set_wine_module(rsaenh)
+set_wine_module_FIXME(rsaenh)

dll/win32/rsaenh/handle.c

@@ -21,17 +21,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define WIN32_LEAN_AND_MEAN
-
-//#include <string.h>
+#include <string.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
-#include <windef.h>
-#include <winbase.h>
+#include "windef.h"
+#include "winbase.h"
 #include "handle.h"
 
-#include <wine/debug.h>
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(handle);
 
@@ -57,7 +55,7 @@ void init_handle_table(struct handle_table *lpTable)
     lpTable->paEntries = NULL;
     lpTable->iEntries = 0;
     lpTable->iFirstFree = 0;
-    InitializeCriticalSection(&lpTable->mutex);
+    InitializeCriticalSectionEx(&lpTable->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETABLE.mutex");
 }
 
@@ -73,7 +71,7 @@ void destroy_handle_table(struct handle_table *lpTable)
 {
     TRACE("(lpTable=%p)\n", lpTable);
 
-    HeapFree(GetProcessHeap(), 0, lpTable->paEntries);
+    free(lpTable->paEntries);
     lpTable->mutex.DebugInfo->Spare[0] = 0;
     DeleteCriticalSection(&lpTable->mutex);
 }
@@ -98,7 +96,7 @@ BOOL is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwTyp
     unsigned int index = HANDLE2INDEX(handle);
     BOOL ret = FALSE;
 
-    TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle);
+    TRACE("(lpTable=%p, handle=%Id)\n", lpTable, handle);
 
     EnterCriticalSection(&lpTable->mutex);
 
@@ -142,14 +140,14 @@ static BOOL grow_handle_table(struct handle_table *lpTable)
 
     newIEntries = lpTable->iEntries + TABLE_SIZE_INCREMENT;
 
-    newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(struct handle_table_entry)*newIEntries);
+    newEntries = malloc(sizeof(struct handle_table_entry)*newIEntries);
     if (!newEntries)
         return FALSE;
 
     if (lpTable->paEntries)
     {
         memcpy(newEntries, lpTable->paEntries, sizeof(struct handle_table_entry)*lpTable->iEntries);
-        HeapFree(GetProcessHeap(), 0, lpTable->paEntries);
+        free(lpTable->paEntries);
     }
 
     for (i=lpTable->iEntries; i<newIEntries; i++)
@@ -233,7 +231,7 @@ BOOL release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType
     OBJECTHDR *pObject;
     BOOL ret = FALSE;
 
-    TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle);
+    TRACE("(lpTable=%p, handle=%Id)\n", lpTable, handle);
 
     EnterCriticalSection(&lpTable->mutex);
 
@@ -243,7 +241,7 @@ BOOL release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType
     pObject = lpTable->paEntries[index].pObject;
     if (InterlockedDecrement(&pObject->refcount) == 0)
     {
-        TRACE("destroying handle %ld\n", handle);
+        TRACE("destroying handle %Id\n", handle);
         if (pObject->destructor)
             pObject->destructor(pObject);
     }
@@ -276,7 +274,7 @@ BOOL lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType,
 {
     BOOL ret = FALSE;
 
-    TRACE("(lpTable=%p, handle=%ld, lplpObject=%p)\n", lpTable, handle, lplpObject);
+    TRACE("(lpTable=%p, handle=%Id, lplpObject=%p)\n", lpTable, handle, lplpObject);
 
     EnterCriticalSection(&lpTable->mutex);
     if (!is_valid_handle(lpTable, handle, dwType)) 
@@ -312,7 +310,7 @@ BOOL copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, H
     OBJECTHDR *pObject;
     BOOL ret;
 
-    TRACE("(lpTable=%p, handle=%ld, copy=%p)\n", lpTable, handle, copy);
+    TRACE("(lpTable=%p, handle=%Id, copy=%p)\n", lpTable, handle, copy);
 
     EnterCriticalSection(&lpTable->mutex);
     if (!lookup_handle(lpTable, handle, dwType, &pObject)) 
@@ -359,7 +357,7 @@ HCRYPTKEY new_object(struct handle_table *lpTable, size_t cbSize, DWORD dwType,
     if (ppObject)
         *ppObject = NULL;
 
-    pObject = HeapAlloc(GetProcessHeap(), 0, cbSize);
+    pObject = malloc(cbSize);
     if (!pObject)
         return (HCRYPTKEY)INVALID_HANDLE_VALUE;
 
@@ -368,7 +366,7 @@ HCRYPTKEY new_object(struct handle_table *lpTable, size_t cbSize, DWORD dwType,
     pObject->destructor = destructor;
 
     if (!alloc_handle(lpTable, pObject, &hObject))
-        HeapFree(GetProcessHeap(), 0, pObject);
+        free(pObject);
     else
         if (ppObject)
             *ppObject = pObject;

dll/win32/rsaenh/handle.h

@@ -24,7 +24,7 @@
 #ifndef __WINE_HANDLE_H
 #define __WINE_HANDLE_H
 
-#include <wincrypt.h>
+#include "wincrypt.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,15 +56,15 @@ struct handle_table
     CRITICAL_SECTION mutex;
 };
 
-void init_handle_table   (struct handle_table *lpTable) DECLSPEC_HIDDEN;
-void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN;
-BOOL release_handle      (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN;
-BOOL copy_handle         (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN;
-BOOL lookup_handle       (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN;
-BOOL is_valid_handle     (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN;
+void init_handle_table   (struct handle_table *lpTable);
+void destroy_handle_table(struct handle_table *lpTable);
+BOOL release_handle      (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType);
+BOOL copy_handle         (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy);
+BOOL lookup_handle       (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject);
+BOOL is_valid_handle     (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType);
 
 HCRYPTKEY new_object     (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor,
-                           OBJECTHDR **ppObject) DECLSPEC_HIDDEN;
+                           OBJECTHDR **ppObject);
 
 #ifdef __cplusplus
 }