updates

diff --git a/CHANGES b/CHANGES
index cd1b59298d4b1b9bcbe3a4bec4aad1355c3a49bb..9c7c6ed14de29dfb4f6d825fcb1d68f7cda678cb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Fri Feb  1 14:55:00 CET 2002  Pekka Riikonen <priikone@silcnet.org>
+
+       * Defined DLLAPI into silcincludes.h and silcwin32.h for
+         Win32 DLL.  extern's in header files are now declared with
+         DLLAPI.
+
 Thu Jan 31 23:34:33 EET 2002  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed private message handling.  It used some old code that

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 56e265398869b3d974007957750c024df2965c16..d553e9055ca6eb014fae8b15a90290a2d7ac8f84 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -38,6 +38,10 @@
 #include "silcwin32.h"
 #endif
 
+#ifndef DLLAPI
+#define DLLAPI
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/includes/silcwin32.h b/includes/silcwin32.h
index 7871654e58a4761509b2f54b69c051c0c748fa07..88e103deacf1cc512d5838017cc9ef8e2417807e 100644 (file)
--- a/includes/silcwin32.h
+++ b/includes/silcwin32.h
@@ -34,6 +34,14 @@
 #define strncasecmp strncmp
 #endif
 
+#ifdef WIN32
+#ifndef DLL
+#define DLLAPI __declspec(dllimport)
+#else
+#define DLLAPI // Nada, we use .DEF
+#endif
+#endif
+
 #undef inline
 #define inline __inline
 

diff --git a/lib/silcclient/command_reply.h b/lib/silcclient/command_reply.h
index ea180ae273fe5965b6ec1052fdb46a89a3cae636..6fd03ff9f025ca092252c93092ab5e37f3a3618e 100644 (file)
--- a/lib/silcclient/command_reply.h
+++ b/lib/silcclient/command_reply.h
@@ -54,7 +54,7 @@ typedef struct {
 
 /* Status messages returned by the server */
 #define STAT(x) SILC_STATUS_ERR_##x
-extern const SilcCommandStatusMessage silc_command_status_messages[];
+DLLAPI extern const SilcCommandStatusMessage silc_command_status_messages[];
 
 /* Prototypes */
 

diff --git a/lib/silccrypt/silccipher.h b/lib/silccrypt/silccipher.h
index 7f951ee8dcc1cccdf732d4d8c2c6fb6092ed468a..47cfd3e03f12375b3bb379c5845f5465d59258a5 100644 (file)
--- a/lib/silccrypt/silccipher.h
+++ b/lib/silccrypt/silccipher.h
@@ -74,7 +74,7 @@ typedef struct SilcCipherStruct {
 #define SILC_ALL_CIPHERS ((SilcCipherObject *)1)
 
 /* Static list of ciphers for silc_cipher_register_default(). */
-extern SilcCipherObject silc_default_ciphers[];
+extern DLLAPI SilcCipherObject silc_default_ciphers[];
 
 /* Default cipher in the SILC protocol */
 #define SILC_DEFAULT_CIPHER "aes-256-cbc"

diff --git a/lib/silccrypt/silchash.h b/lib/silccrypt/silchash.h
index 8feb8e3402e4d7d0188ef3aabe27b0244b5d3252..26e1c0de589e9fdfd4a9808963498f0fdb39b220 100644 (file)
--- a/lib/silccrypt/silchash.h
+++ b/lib/silccrypt/silchash.h
@@ -49,7 +49,7 @@ typedef struct SilcHashStruct {
 #define SILC_ALL_HASH_FUNCTIONS ((SilcHashObject *)1)
 
 /* Default hash functions for silc_hash_register_default(). */
-extern SilcHashObject silc_default_hash[];
+extern DLLAPI SilcHashObject silc_default_hash[];
 
 /* Default HASH function in the SILC protocol */
 #define SILC_DEFAULT_HASH "sha1"

diff --git a/lib/silccrypt/silchmac.h b/lib/silccrypt/silchmac.h
index 624921691d31fad015d569ac03678e3136929ec8..888014884657b0b9bfe230090dde927e4bf73ea2 100644 (file)
--- a/lib/silccrypt/silchmac.h
+++ b/lib/silccrypt/silchmac.h
@@ -73,7 +73,7 @@ typedef struct {
 #define SILC_ALL_HMACS ((SilcHmacObject *)1)
 
 /* Default hmacs for silc_hmac_register_default(). */
-extern SilcHmacObject silc_default_hmacs[];
+extern DLLAPI SilcHmacObject silc_default_hmacs[];
 
 /* Default HMAC in the SILC protocol */
 #define SILC_DEFAULT_HMAC "hmac-sha1-96"

diff --git a/lib/silccrypt/silcpkcs.h b/lib/silccrypt/silcpkcs.h
index 5f291328f6a6037bcc3baee641278b3d8bc84ba6..57968af9deff967e081a52bebb14cee0eb138d5d 100644 (file)
--- a/lib/silccrypt/silcpkcs.h
+++ b/lib/silccrypt/silcpkcs.h
@@ -97,7 +97,7 @@ typedef struct {
 #define SILC_ALL_PKCS ((SilcPKCSObject *)1)
 
 /* Static list of PKCS for silc_pkcs_register_default(). */
-extern SilcPKCSObject silc_default_pkcs[];
+extern DLLAPI SilcPKCSObject silc_default_pkcs[];
 
 /* Default PKXS in the SILC protocol */
 #define SILC_DEFAULT_PKCS "rsa"

diff --git a/lib/silcutil/silclog.h b/lib/silcutil/silclog.h
index 6a476e6ecc621670e9a4ff054eef0458cd506b13..0d77480720d838673a608834e1ffdc94091f30f2 100644 (file)
--- a/lib/silcutil/silclog.h
+++ b/lib/silcutil/silclog.h
@@ -160,7 +160,7 @@ typedef bool (*SilcLogHexdumpCb)(char *file, char *function, int line,
  *    silc_log_flush_all() after setting this variable to TRUE.
  *
  ***/
-extern bool silc_log_quick;
+extern DLLAPI bool silc_log_quick;
 
 /****v* silcutil/SilcLogAPI/silc_log_flushdelay
  *
@@ -177,7 +177,7 @@ extern bool silc_log_quick;
  *    take effect.
  *
  ***/
-extern long silc_log_flushdelay;
+extern DLLAPI long silc_log_flushdelay;
 
 /****v* silcutil/SilcLogAPI/silc_debug
  *
@@ -196,7 +196,7 @@ extern long silc_log_flushdelay;
  *    SILC_LOG_DEBUG
  *
  ***/
-extern bool silc_debug;
+extern DLLAPI bool silc_debug;
 
 /****v* silcutil/SilcLogAPI/silc_debug_hexdump
  *
@@ -215,7 +215,7 @@ extern bool silc_debug;
  *    SILC_LOG_HEXDUMP
  *
  ***/
-extern bool silc_debug_hexdump;
+extern DLLAPI bool silc_debug_hexdump;
 
 /* Macros */
 

diff --git a/win32/Makefile.am b/win32/Makefile.am
index 93cd235e1c71ba9ac9aa2d290b91b1128fd9e776..734c64fb14ab6bee75e7f02ba72cb8c4bf850484 100644 (file)
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -20,6 +20,6 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 SUBDIRS = libsilc libsilcclient
 
-EXTRA_DIST = silcdefs.h silc.dsw copy_dll
+EXTRA_DIST = silcdefs.h silc.dsw copy_dll tests
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def
index 18581ffbb1d1fe07f17b9f3eda3b8c17e83363dd..81a750d89736e63b2f3667e6fab34a3a5587c590 100644 (file)
--- a/win32/libsilc/libsilc.def
+++ b/win32/libsilc/libsilc.def
@@ -108,12 +108,12 @@ EXPORTS
        silc_config_check_num_token @ 325 ; 
        silc_config_get_token @ 326 ; 
        silc_config_open @ 327 ; 
-       silc_debug @ 328 ; 
+       silc_debug @ 328 DATA ; 
        silc_decode_pem @ 329 ; 
-       silc_default_ciphers @ 330 ; 
-       silc_default_hash @ 331 ; 
-       silc_default_hmacs @ 332 ; 
-       silc_default_pkcs @ 333 ; 
+       silc_default_ciphers @ 330 DATA ; 
+       silc_default_hash @ 331 DATA ; 
+       silc_default_hmacs @ 332 DATA ; 
+       silc_default_pkcs @ 333 DATA ; 
        silc_encode_pem @ 334 ; 
        silc_encode_pem_file @ 335 ; 
        silc_file_readfile @ 336 ; 
@@ -553,6 +553,7 @@ EXPORTS
        silc_log_reset_all @ 844 ;
        silc_log_flush_all @ 845 ;
        silc_log_get_file @ 846 ;
-       silc_log_quick @ 847 ;
-       silc_log_flushdelay @ 848 ;
+       silc_log_quick @ 847 DATA ;
+       silc_log_flushdelay @ 848 DATA ;
        silc_hash_table_list_reset @ 849 ;
+       silc_debug_hexdump @ 850 DATA ;

diff --git a/win32/libsilc/libsilc.dsp b/win32/libsilc/libsilc.dsp
index 7c896d327577a7cfd601c4fbd3e8c77ba0e32edc..5c35110e46ca703a207e38da4599b161c664e62b 100644 (file)
--- a/win32/libsilc/libsilc.dsp
+++ b/win32/libsilc/libsilc.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /FD /c\r
+# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "DLL" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "SILC_DEBUG" /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcsftp" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILC_EXPORTS" /D "MP_API_COMPATIBLE" /D "SILC_DEBUG" /D "DLL" /FD /GZ /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r

diff --git a/win32/libsilcclient/libsilcclient.def b/win32/libsilcclient/libsilcclient.def
index 655b2ce84517413c37642f7107bad8a197c65aa1..8cea6bb7705044fb03d671b2e39261aa0b72700f 100644 (file)
--- a/win32/libsilcclient/libsilcclient.def
+++ b/win32/libsilcclient/libsilcclient.def
@@ -146,7 +146,7 @@ EXPORTS
        silc_client_send_private_message_key @ 129 ; 
        silc_client_start_key_exchange @ 131 ; 
        silc_client_stop @ 132 ; 
-       silc_command_status_messages @ 135 ; 
+       silc_command_status_messages @ 135 DATA ; 
        silc_idlist_get_channel_by_id @ 136 ; 
        silc_idlist_get_client @ 137 ; 
        silc_client_abort_key_agreement @ 138 ; 

diff --git a/win32/libsilcclient/libsilcclient.dsp b/win32/libsilcclient/libsilcclient.dsp
index 29ab2599daea0e60bbc302618592a3d9e36cd129..30165e84ff142c22e42cc7f312c1134f8d91596f 100644 (file)
--- a/win32/libsilcclient/libsilcclient.dsp
+++ b/win32/libsilcclient/libsilcclient.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /D "NDEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MT /W2 /GX /O2 /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /D "NDEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "DLL" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /D "_DEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "SILC_DEBUG" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W2 /Gm /GX /ZI /Od /I ".\\" /I "..\\" /I "..\..\\" /I "..\..\includes" /I "..\..\lib\silccore" /I "..\..\lib\silcske" /I "..\..\lib\silcmath" /I "..\..\lib\silcmath\mpi" /I "..\..\lib\silcutil" /I "..\..\lib\silccrypt" /I "..\..\lib\silcsim" /I "..\..\lib\trq" /I "..\..\lib\silcclient" /I "..\..\lib\silcsftp" /D "_DEBUG" /D "MP_API_COMPATIBLE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSILCCLIENT_EXPORTS" /D "SILC_DEBUG" /D "DLL" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r