Menu
▾
▴
xmule-svn — Mailing list for Subversion commit messages.
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(11) |
Oct
(8) |
Nov
|
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(3) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <av...@us...> - 2007-05-02 23:08:26
|
Revision: 138
http://svn.sourceforge.net/xmule/?rev=138&view=rev
Author: avivahl
Date: 2007-05-02 16:08:22 -0700 (Wed, 02 May 2007)
Log Message:
-----------
wxMSW v2.8.3 is used. Are we still alive?
Modified Paths:
--------------
trunk/docs/INSTALL
trunk/xMule.vcproj
Modified: trunk/docs/INSTALL
===================================================================
--- trunk/docs/INSTALL 2007-02-04 00:14:16 UTC (rev 137)
+++ trunk/docs/INSTALL 2007-05-02 23:08:22 UTC (rev 138)
@@ -1,10 +1,10 @@
xMule's Library Requirements:
----------------------------------
-wxWidgets 2.8.0
+wxWidgets 2.8.3
http://www.wxwidgets.org
* Use any of the flavors (wxGTK, wxMSW, wxCocoa...) depending on the platform you run.
* xMule only supports the latest wxWidgets in order to avoid
- bugs and get a much better looking GTK2 xMule interface.
+ bugs and get a much better looking graphical user interface.
Crypto++ 5.4 (Optional)
http://www.cryptopp.com/
* Use this if the integrated Crypto code (CryptoXMpp.cpp,
@@ -16,7 +16,7 @@
GNU Compiler Collection (GCC) 4.1.1
http://gcc.gnu.org/
-Microsoft Visual C++ 2005
+Microsoft Visual C++ 2005 SP1
http://msdn.microsoft.com/visualc/
* xMule supports the FREE express edition. Use the latest
Windows SDK to compile using it.
@@ -25,7 +25,7 @@
always suggest using the latest versions.
-Steps to compile wxWidgets:
+Steps to compile wxWidgets (on Unix-based systems):
----------------------------------
1. Extract wxWidgets
2. ./configure --enable-debug --disable-unicode
@@ -33,7 +33,7 @@
4. make install
-Steps to compile xMule:
+Steps to compile xMule (on Unix-based systems):
----------------------------------
1. Extract xMule
2. ./configure --enable-debug
Modified: trunk/xMule.vcproj
===================================================================
--- trunk/xMule.vcproj 2007-02-04 00:14:16 UTC (rev 137)
+++ trunk/xMule.vcproj 2007-05-02 23:08:22 UTC (rev 138)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.1\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.3\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CRYPTOPP;__NOGTK__;__WXDEBUG__;PRECOMP"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -66,7 +66,7 @@
AdditionalDependencies="xLibsd.lib comctl32.lib rpcrt4.lib winmm.lib wsock32.lib cryptlib.lib"
OutputFile="$(OutDir)\$(ProjectName)-Debug.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""C:\wxMSW-2.8.1\lib\vc_lib";"$(OutDir)";"xLibs\cryptopp\Win32\output\$(ConfigurationName)""
+ AdditionalLibraryDirectories=""C:\wxMSW-2.8.3\lib\vc_lib";"$(OutDir)";"xLibs\cryptopp\Win32\output\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -121,7 +121,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.1\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.3\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CRYPTOPP;__NOGTK__;PRECOMP"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -144,7 +144,7 @@
Name="VCLinkerTool"
AdditionalDependencies="xLibs.lib comctl32.lib rpcrt4.lib winmm.lib wsock32.lib cryptlib.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories=""C:\wxMSW-2.8.1\lib\vc_lib";"$(OutDir)";"xLibs\cryptopp\Win32\output\$(ConfigurationName)""
+ AdditionalLibraryDirectories=""C:\wxMSW-2.8.3\lib\vc_lib";"$(OutDir)";"xLibs\cryptopp\Win32\output\$(ConfigurationName)""
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-02-04 00:14:16
|
Revision: 137
http://svn.sourceforge.net/xmule/?rev=137&view=rev
Author: avivahl
Date: 2007-02-03 16:14:16 -0800 (Sat, 03 Feb 2007)
Log Message:
-----------
Updated to the eMule 0.47c MD5Sum class. I ported it nicely over to wxWidgets. Uses MD5 code directly from the the RFC document. I also made sure it will be formatted according to xMule's coding rules. ;)
Modified Paths:
--------------
trunk/src/MD5Sum.cpp
trunk/src/MD5Sum.h
Modified: trunk/src/MD5Sum.cpp
===================================================================
--- trunk/src/MD5Sum.cpp 2007-02-04 00:11:29 UTC (rev 136)
+++ trunk/src/MD5Sum.cpp 2007-02-04 00:14:16 UTC (rev 137)
@@ -20,13 +20,49 @@
#include "MD5Sum.h" // MD5Sum
-#include <sstream>
-#include <iomanip>
+wxString MD5Sum::Calculate(const wxString& sSource)
+{
+ return Calculate(reinterpret_cast<const wxByte*>(sSource.c_str()), sSource.length() * sizeof(wxChar));
+}
-using std::hex;
-using std::setfill;
-using std::setw;
+wxString MD5Sum::Calculate(const wxByte* pachSource, wxUint32 nLen)
+{
+ MD5_CTX context;
+ MD5Init(&context);
+ MD5Update(&context, pachSource, nLen);
+ MD5Final(m_rawHash, &context);
+
+ m_sHash.Clear();
+ for (int i = 0; i < 16; i++)
+ {
+ m_sHash += wxString::Format(wxT("%02x"), m_rawHash[i]);
+ }
+
+ return m_sHash;
+}
+
+/*
+Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+*/
+
+// Constants for MD5Transform routine.
#define S11 7
#define S12 12
#define S13 17
@@ -44,368 +80,231 @@
#define S43 15
#define S44 21
-typedef unsigned char *POINTER;
-typedef unsigned short int wxUint322;
-typedef unsigned long int wxUint324;
+static void MD5Transform (wxUint32 [4], const unsigned char [64]);
+static void Encode (unsigned char *, wxUint32 *, unsigned int);
+static void Decode (wxUint32 *, const unsigned char *, unsigned int);
-typedef struct
+static unsigned char PADDING[64] =
{
- wxUint324 state[4];
- wxUint324 count[2];
- char buffer[64];
-} MD5_CTX;
-
-void MD5Init(MD5_CTX *);
-
-void MD5Update(MD5_CTX *, const char *, unsigned int);
-
-void MD5Final(unsigned char [16], MD5_CTX *);
-
-MD5Sum::MD5Sum()
-{
- m_sHash = wxT("");
-}
-
-MD5Sum::MD5Sum(wxString sSource)
-{
- Calculate(sSource);
-}
-
-wxString MD5Sum::Calculate(wxString sSource)
-{
- MD5_CTX context;
- unsigned char digest[16];
- std::ostringstream internalbuffer;
- MD5Init( &context);
- MD5Update( &context, sSource.mb_str(*wxConvCurrent), sSource.Length());
- MD5Final(digest, &context);
- for (int i = 0 ; i < 16 ; i++)
- {
- internalbuffer << setw(2) << setfill('0') << hex << digest[i];
- }
- m_sHash = wxString(internalbuffer.str().c_str(), *wxConvCurrent);
- return m_sHash;
-}
-
-wxString MD5Sum::GetHash()
-{
- return m_sHash;
-}
-
-static void MD5Transform(wxUint324 [4], const char [64]);
-
-static void Encode(char *, wxUint324 *, unsigned int);
-
-static void Decode(wxUint324 *, const char *, unsigned int);
-
-static void MD5_memcpy(POINTER, POINTER, unsigned int);
-
-static void MD5_memset(POINTER, int, unsigned int);
-
-static char PADDING[64] =
-{
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-}
+};
-;
-
- /* F, G, H and I are basic MD5 functions.
- */
-
+// F, G, H and I are basic MD5 functions.
#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
#define H(x, y, z) ((x) ^ (y) ^ (z))
#define I(x, y, z) ((y) ^ ((x) | (~z)))
- /* ROTATE_LEFT rotates x left n bits.
- 15-April-2003 Sony: use MSVC intrinsic to save some cycles
- */
-
-#ifdef _MSC_VER
-#pragma intrinsic(_rotl)
-#define ROTATE_LEFT(x, n) _rotl((x), (n))
-#else
+// ROTATE_LEFT rotates x left n bits.
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-#endif
- /* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
- Rotation is separate from addition to prevent recomputation.
- */
+// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+// Rotation is separate from addition to prevent recomputation.
+#define FF(a, b, c, d, x, s, ac) { \
+ (a) += F ((b), (c), (d)) + (x) + (wxUint32)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+ }
+#define GG(a, b, c, d, x, s, ac) { \
+ (a) += G ((b), (c), (d)) + (x) + (wxUint32)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+ }
+#define HH(a, b, c, d, x, s, ac) { \
+ (a) += H ((b), (c), (d)) + (x) + (wxUint32)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+ }
+#define II(a, b, c, d, x, s, ac) { \
+ (a) += I ((b), (c), (d)) + (x) + (wxUint32)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+ }
- /* Defines must be on one line to work with GCC-2.95.3 */
-
-#define FF(a, b, c, d, x, s, ac) { (a) += F ((b), (c), (d)) + (x) + (wxUint324)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define GG(a, b, c, d, x, s, ac) { (a) += G ((b), (c), (d)) + (x) + (wxUint324)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define HH(a, b, c, d, x, s, ac) { (a) += H ((b), (c), (d)) + (x) + (wxUint324)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-#define II(a, b, c, d, x, s, ac) { (a) += I ((b), (c), (d)) + (x) + (wxUint324)(ac); (a) = ROTATE_LEFT ((a), (s)); (a) += (b); }
-
- /* MD5 initialization. Begins an MD5 operation, writing a new context.
- */
-
-void MD5Init(MD5_CTX *context)
+// MD5 initialization. Begins an MD5 operation, writing a new context.
+void MD5Init(MD5_CTX* context)
{
context->count[0] = context->count[1] = 0;
- /* Load magic initialization constants.
- */
+ // Load magic initialization constants.
context->state[0] = 0x67452301;
context->state[1] = 0xefcdab89;
context->state[2] = 0x98badcfe;
context->state[3] = 0x10325476;
}
- /* MD5 block update operation. Continues an MD5 message-digest
- operation, processing another message block, and updating the
- context.
- */
-
-void MD5Update(MD5_CTX *context, const char *input, unsigned int inputLen)
+// MD5 block update operation. Continues an MD5 message-digest
+// operation, processing another message block, and updating the context.
+void MD5Update(MD5_CTX* context, const unsigned char* input, unsigned int inputLen)
{
unsigned int i, index, partLen;
- /* Compute number of bytes mod 64 */
- index = (unsigned int)((context->count[0] >> 3) &0x3F);
- /* Update number of bits */
- if ((context->count[0] += ((wxUint324) inputLen << 3))
- < ((wxUint324) inputLen << 3))
- context->count[1]++;
- context->count[1] += ((wxUint324) inputLen >> 29);
+
+ // Compute number of bytes mod 64
+ index = (unsigned int)((context->count[0] >> 3) & 0x3F);
+
+ // Update number of bits
+ if ((context->count[0] += ((wxUint32)inputLen << 3)) < ((wxUint32)inputLen << 3))
+ {
+ context->count[1]++;
+ }
+ context->count[1] += ((wxUint32)inputLen >> 29);
+
partLen = 64 - index;
- /* Transform as many times as possible.
- */
+
+ // Transform as many times as possible.
if (inputLen >= partLen)
{
- MD5_memcpy
- ((POINTER) &context->buffer[index], (POINTER) input, partLen);
+ memcpy(&context->buffer[index], input, partLen);
MD5Transform(context->state, context->buffer);
- for (i = partLen ; i + 63 < inputLen ; i += 64)
- MD5Transform(context->state, &input[i]);
+
+ for (i = partLen; i + 63 < inputLen; i += 64)
+ {
+ MD5Transform (context->state, &input[i]);
+ }
index = 0;
}
else
- i = 0;
- /* Buffer remaining input */
- MD5_memcpy
- ((POINTER) &context->buffer[index], (POINTER) &input[i],
- inputLen - i);
+ {
+ i = 0;
+ }
+ // Buffer remaining input
+ memcpy(&context->buffer[index], &input[i], inputLen-i);
}
- /* MD5 finalization. Ends an MD5 message-digest operation, writing the
- the message digest and zeroizing the context.
- */
-
-void MD5Final(unsigned char digest[16], MD5_CTX *context)
+// MD5 finalization. Ends an MD5 message-digest operation, writing the
+// the message digest and zeroizing the context.
+void MD5Final(unsigned char digest[16], MD5_CTX* context)
{
- char bits[8];
+ unsigned char bits[8];
unsigned int index, padLen;
- /* Save number of bits */
- Encode(bits, context->count, 8);
- /* Pad out to 56 mod 64.
- */
- index = (unsigned int)((context->count[0] >> 3) &0x3f);
- padLen = (index < 56) ? (56 - index): (120 - index);
- MD5Update(context, PADDING, padLen);
- /* Append length (before padding) */
- MD5Update(context, bits, 8);
- /* Store state in digest */
- Encode((char *)digest, context->state, 16);
- /* Zeroize sensitive information.
- */
- MD5_memset((POINTER) context, 0, sizeof( *context));
-}
- /* MD5 basic transformation. Transforms state based on block.
- */
+ // Save number of bits
+ Encode (bits, context->count, 8);
-static void MD5Transform(wxUint324 state[4], const char block[64])
+ // Pad out to 56 mod 64.
+ index = (unsigned int)((context->count[0] >> 3) & 0x3f);
+ padLen = (index < 56) ? (56 - index) : (120 - index);
+ MD5Update (context, PADDING, padLen);
+
+ // Append length (before padding)
+ MD5Update (context, bits, 8);
+
+ // Store state in digest
+ Encode (digest, context->state, 16);
+
+ // Zeroize sensitive information.
+ memset(context, 0, sizeof(*context));
+}
+
+// MD5 basic transformation. Transforms state based on block.
+static void MD5Transform(wxUint32 state[4], const unsigned char block[64])
{
- wxUint324 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
- Decode(x, block, 64);
- /* Round 1 */
- FF(a, b, c, d, x[ 0], S11, 0xd76aa478);
- /* 1 */
- FF(d, a, b, c, x[ 1], S12, 0xe8c7b756);
- /* 2 */
- FF(c, d, a, b, x[ 2], S13, 0x242070db);
- /* 3 */
- FF(b, c, d, a, x[ 3], S14, 0xc1bdceee);
- /* 4 */
- FF(a, b, c, d, x[ 4], S11, 0xf57c0faf);
- /* 5 */
- FF(d, a, b, c, x[ 5], S12, 0x4787c62a);
- /* 6 */
- FF(c, d, a, b, x[ 6], S13, 0xa8304613);
- /* 7 */
- FF(b, c, d, a, x[ 7], S14, 0xfd469501);
- /* 8 */
- FF(a, b, c, d, x[ 8], S11, 0x698098d8);
- /* 9 */
- FF(d, a, b, c, x[ 9], S12, 0x8b44f7af);
- /* 10 */
- FF(c, d, a, b, x[10], S13, 0xffff5bb1);
- /* 11 */
- FF(b, c, d, a, x[11], S14, 0x895cd7be);
- /* 12 */
- FF(a, b, c, d, x[12], S11, 0x6b901122);
- /* 13 */
- FF(d, a, b, c, x[13], S12, 0xfd987193);
- /* 14 */
- FF(c, d, a, b, x[14], S13, 0xa679438e);
- /* 15 */
- FF(b, c, d, a, x[15], S14, 0x49b40821);
- /* 16 */
- /* Round 2 */
- GG(a, b, c, d, x[ 1], S21, 0xf61e2562);
- /* 17 */
- GG(d, a, b, c, x[ 6], S22, 0xc040b340);
- /* 18 */
- GG(c, d, a, b, x[11], S23, 0x265e5a51);
- /* 19 */
- GG(b, c, d, a, x[ 0], S24, 0xe9b6c7aa);
- /* 20 */
- GG(a, b, c, d, x[ 5], S21, 0xd62f105d);
- /* 21 */
- GG(d, a, b, c, x[10], S22, 0x2441453);
- /* 22 */
- GG(c, d, a, b, x[15], S23, 0xd8a1e681);
- /* 23 */
- GG(b, c, d, a, x[ 4], S24, 0xe7d3fbc8);
- /* 24 */
- GG(a, b, c, d, x[ 9], S21, 0x21e1cde6);
- /* 25 */
- GG(d, a, b, c, x[14], S22, 0xc33707d6);
- /* 26 */
- GG(c, d, a, b, x[ 3], S23, 0xf4d50d87);
- /* 27 */
- GG(b, c, d, a, x[ 8], S24, 0x455a14ed);
- /* 28 */
- GG(a, b, c, d, x[13], S21, 0xa9e3e905);
- /* 29 */
- GG(d, a, b, c, x[ 2], S22, 0xfcefa3f8);
- /* 30 */
- GG(c, d, a, b, x[ 7], S23, 0x676f02d9);
- /* 31 */
- GG(b, c, d, a, x[12], S24, 0x8d2a4c8a);
- /* 32 */
- /* Round 3 */
- HH(a, b, c, d, x[ 5], S31, 0xfffa3942);
- /* 33 */
- HH(d, a, b, c, x[ 8], S32, 0x8771f681);
- /* 34 */
- HH(c, d, a, b, x[11], S33, 0x6d9d6122);
- /* 35 */
- HH(b, c, d, a, x[14], S34, 0xfde5380c);
- /* 36 */
- HH(a, b, c, d, x[ 1], S31, 0xa4beea44);
- /* 37 */
- HH(d, a, b, c, x[ 4], S32, 0x4bdecfa9);
- /* 38 */
- HH(c, d, a, b, x[ 7], S33, 0xf6bb4b60);
- /* 39 */
- HH(b, c, d, a, x[10], S34, 0xbebfbc70);
- /* 40 */
- HH(a, b, c, d, x[13], S31, 0x289b7ec6);
- /* 41 */
- HH(d, a, b, c, x[ 0], S32, 0xeaa127fa);
- /* 42 */
- HH(c, d, a, b, x[ 3], S33, 0xd4ef3085);
- /* 43 */
- HH(b, c, d, a, x[ 6], S34, 0x4881d05);
- /* 44 */
- HH(a, b, c, d, x[ 9], S31, 0xd9d4d039);
- /* 45 */
- HH(d, a, b, c, x[12], S32, 0xe6db99e5);
- /* 46 */
- HH(c, d, a, b, x[15], S33, 0x1fa27cf8);
- /* 47 */
- HH(b, c, d, a, x[ 2], S34, 0xc4ac5665);
- /* 48 */
- /* Round 4 */
- II(a, b, c, d, x[ 0], S41, 0xf4292244);
- /* 49 */
- II(d, a, b, c, x[ 7], S42, 0x432aff97);
- /* 50 */
- II(c, d, a, b, x[14], S43, 0xab9423a7);
- /* 51 */
- II(b, c, d, a, x[ 5], S44, 0xfc93a039);
- /* 52 */
- II(a, b, c, d, x[12], S41, 0x655b59c3);
- /* 53 */
- II(d, a, b, c, x[ 3], S42, 0x8f0ccc92);
- /* 54 */
- II(c, d, a, b, x[10], S43, 0xffeff47d);
- /* 55 */
- II(b, c, d, a, x[ 1], S44, 0x85845dd1);
- /* 56 */
- II(a, b, c, d, x[ 8], S41, 0x6fa87e4f);
- /* 57 */
- II(d, a, b, c, x[15], S42, 0xfe2ce6e0);
- /* 58 */
- II(c, d, a, b, x[ 6], S43, 0xa3014314);
- /* 59 */
- II(b, c, d, a, x[13], S44, 0x4e0811a1);
- /* 60 */
- II(a, b, c, d, x[ 4], S41, 0xf7537e82);
- /* 61 */
- II(d, a, b, c, x[11], S42, 0xbd3af235);
- /* 62 */
- II(c, d, a, b, x[ 2], S43, 0x2ad7d2bb);
- /* 63 */
- II(b, c, d, a, x[ 9], S44, 0xeb86d391);
- /* 64 */
+ wxUint32 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+ Decode (x, block, 64);
+
+ // Round 1
+ FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+ FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+ FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+ FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+ FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+ FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+ FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+ FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+ FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+ FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+ FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+ FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+ FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+ FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+ FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+ FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+ // Round 2
+ GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+ GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+ GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+ GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+ GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+ GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */
+ GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+ GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+ GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+ GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+ GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+ GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+ GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+ GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+ GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+ GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+ // Round 3
+ HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+ HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+ HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+ HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+ HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+ HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+ HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+ HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+ HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+ HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+ HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+ HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
+ HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+ HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+ HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+ HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+ // Round 4
+ II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+ II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+ II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+ II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+ II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+ II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+ II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+ II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+ II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+ II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+ II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+ II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+ II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+ II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+ II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+ II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+
state[0] += a;
state[1] += b;
state[2] += c;
state[3] += d;
- /* Zeroize sensitive information.
- */
- MD5_memset((POINTER) x, 0, sizeof(x));
+
+ // Zeroize sensitive information.
+ memset(x, 0, sizeof(x));
}
- /* Encodes input (wxUint324) into output (unsigned char). Assumes len is
- a multiple of 4.
- */
-
-static void Encode(char *output, wxUint324 *input, unsigned int len)
+// Encodes input (wxUint32) into output (unsigned char). Assumes len is a multiple of 4.
+static void Encode (unsigned char* output, wxUint32* input, unsigned int len)
{
unsigned int i, j;
- for (i = 0, j = 0 ; j < len ; i++, j += 4)
+
+ for (i = 0, j = 0; j < len; i++, j += 4)
{
- output[j] = input[i] &0xff;
- output[j + 1] = (input[i] >> 8) &0xff;
- output[j + 2] = (input[i] >> 16) &0xff;
- output[j + 3] = (input[i] >> 24) &0xff;
+ output[j] = (unsigned char)(input[i] & 0xff);
+ output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
+ output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
+ output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
}
}
- /* Decodes input (unsigned char) into output (wxUint324). Assumes len is
- a multiple of 4.
- */
-
-static void Decode(wxUint324 *output, const char *input, unsigned int len)
+// Decodes input (unsigned char) into output (wxUint32). Assumes len is a multiple of 4.
+static void Decode(wxUint32* output, const unsigned char* input, unsigned int len)
{
unsigned int i, j;
- for (i = 0, j = 0 ; j < len ; i++, j += 4)
- output[i] = ((wxUint324) input[j]) | (((wxUint324) input[j + 1]) << 8) |
- (((wxUint324) input[j + 2]) << 16) | (((wxUint324) input[j + 3]) << 24);
+ for (i = 0, j = 0; j < len; i++, j += 4)
+ {
+ output[i] = ((wxUint32)input[j]) | (((wxUint32)input[j+1]) << 8) |
+ (((wxUint32)input[j+2]) << 16) | (((wxUint32)input[j+3]) << 24);
+ }
}
-
- /* Note: Replace "for loop" with standard memcpy if possible.
- */
-
-static void MD5_memcpy(POINTER output, POINTER input, unsigned int len)
-{
- unsigned int i;
- for (i = 0 ; i < len ; i++)
- output[i] = input[i];
-}
-
- /* Note: Replace "for loop" with standard memset if possible.
- */
-
-static void MD5_memset(POINTER output, int value, unsigned int len)
-{
- unsigned int i;
- for (i = 0 ; i < len ; i++)
- ((char *) output) [i] = (char) value;
-}
Modified: trunk/src/MD5Sum.h
===================================================================
--- trunk/src/MD5Sum.h 2007-02-04 00:11:29 UTC (rev 136)
+++ trunk/src/MD5Sum.h 2007-02-04 00:14:16 UTC (rev 137)
@@ -19,18 +19,57 @@
#ifndef _MD5SUM_H_
#define _MD5SUM_H_
+#include <wx/defs.h> // wxWidgets types
#include <wx/string.h> // wxString
class MD5Sum
{
public:
- MD5Sum();
- MD5Sum(wxString sSource);
- wxString Calculate(wxString sSource);
- wxString GetHash();
+ MD5Sum() { }
+ MD5Sum(const wxString& sSource) { Calculate(sSource); }
+ MD5Sum(const wxByte* pachSource, wxUint32 nLen) { Calculate(pachSource, nLen); }
+ wxString Calculate(const wxString& sSource);
+ wxString Calculate(const wxByte* pachSource, wxUint32 nLen);
+
+ wxString GetHash() const { return m_sHash; }
+ const wxByte* GetRawHash() const { return m_rawHash; }
+
private:
- wxString m_sHash;
+ wxString m_sHash;
+ wxByte m_rawHash[16];
};
+/*
+Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+*/
+
+/* MD5 context. */
+struct MD5_CTX
+{
+ wxUint32 state[4]; /* state (ABCD) */
+ wxUint32 count[2]; /* number of bits, modulo 2^64 (lsb first) */
+ wxByte buffer[64]; /* input buffer */
+};
+
+void MD5Init(MD5_CTX*);
+void MD5Update(MD5_CTX*, const unsigned char*, unsigned int);
+void MD5Final(unsigned char[16], MD5_CTX*);
+
#endif // _MD5SUM_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-02-04 00:11:29
|
Revision: 136
http://svn.sourceforge.net/xmule/?rev=136&view=rev
Author: avivahl
Date: 2007-02-03 16:11:29 -0800 (Sat, 03 Feb 2007)
Log Message:
-----------
Updated to using wxMSW 2.8.1.
Modified Paths:
--------------
trunk/xLibs/xLibs.vcproj
trunk/xMule.vcproj
Modified: trunk/xLibs/xLibs.vcproj
===================================================================
--- trunk/xLibs/xLibs.vcproj 2007-02-01 09:52:52 UTC (rev 135)
+++ trunk/xLibs/xLibs.vcproj 2007-02-04 00:11:29 UTC (rev 136)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.1\include""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.1\include""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Modified: trunk/xMule.vcproj
===================================================================
--- trunk/xMule.vcproj 2007-02-01 09:52:52 UTC (rev 135)
+++ trunk/xMule.vcproj 2007-02-04 00:11:29 UTC (rev 136)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.1\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CRYPTOPP;__NOGTK__;__WXDEBUG__;PRECOMP"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -48,7 +48,7 @@
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="xmule-headers.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
- WarningLevel="4"
+ WarningLevel="0"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
@@ -66,7 +66,7 @@
AdditionalDependencies="xLibsd.lib comctl32.lib rpcrt4.lib winmm.lib wsock32.lib cryptlib.lib"
OutputFile="$(OutDir)\$(ProjectName)-Debug.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""C:\wxMSW-2.8.0\lib\vc_lib";"$(OutDir)";"xLibs\cryptopp\Win32\output\$(ConfigurationName)""
+ AdditionalLibraryDirectories=""C:\wxMSW-2.8.1\lib\vc_lib";"$(OutDir)";"xLibs\cryptopp\Win32\output\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -121,7 +121,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.1\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CRYPTOPP;__NOGTK__;PRECOMP"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -144,7 +144,7 @@
Name="VCLinkerTool"
AdditionalDependencies="xLibs.lib comctl32.lib rpcrt4.lib winmm.lib wsock32.lib cryptlib.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories=""C:\wxMSW-2.8.0\lib\vc_lib";"$(OutDir)";"xLibs\cryptopp\Win32\output\$(ConfigurationName)""
+ AdditionalLibraryDirectories=""C:\wxMSW-2.8.1\lib\vc_lib";"$(OutDir)";"xLibs\cryptopp\Win32\output\$(ConfigurationName)""
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-02-01 09:52:53
|
Revision: 135
http://svn.sourceforge.net/xmule/?rev=135&view=rev
Author: avivahl
Date: 2007-02-01 01:52:52 -0800 (Thu, 01 Feb 2007)
Log Message:
-----------
This is what happens when you do a quick search/replace... ;) Fixed.
Modified Paths:
--------------
trunk/src/DownloadListCtrl.cpp
trunk/src/MD5Sum.cpp
trunk/src/QueueListCtrl.cpp
trunk/src/UploadListCtrl.cpp
trunk/src/wintypes.h
Modified: trunk/src/DownloadListCtrl.cpp
===================================================================
--- trunk/src/DownloadListCtrl.cpp 2007-01-21 00:47:19 UTC (rev 134)
+++ trunk/src/DownloadListCtrl.cpp 2007-02-01 09:52:52 UTC (rev 135)
@@ -1023,7 +1023,7 @@
}
}
// it's already centered by OnDrawItem() ...
- x::POwxInt32 point =
+ x::POINT point =
{
lpRect->left - 4, lpRect->top /*+3 */
};
@@ -1254,7 +1254,7 @@
x::RECT cur_rec;
memcpy( &cur_rec, lpRect, sizeof(x::RECT));
// +3 is added by OnDrawItem()... so take it off
- x::POwxInt32 point =
+ x::POINT point =
{
cur_rec.left, cur_rec.top /*+1 */
- 2
@@ -1308,7 +1308,7 @@
cur_rec.left += 20;
if (lpUpDownClient->IsFriend())
{
- x::POwxInt32 point2 =
+ x::POINT point2 =
{
cur_rec.left, cur_rec.top + 1
};
@@ -1317,7 +1317,7 @@
}
else if(lpUpDownClient->ExtProtocolAvailable())
{
- x::POwxInt32 point2 =
+ x::POINT point2 =
{
cur_rec.left, cur_rec.top + 1
};
@@ -1326,7 +1326,7 @@
}
else
{
- x::POwxInt32 point2 =
+ x::POINT point2 =
{
cur_rec.left, cur_rec.top + 1
};
Modified: trunk/src/MD5Sum.cpp
===================================================================
--- trunk/src/MD5Sum.cpp 2007-01-21 00:47:19 UTC (rev 134)
+++ trunk/src/MD5Sum.cpp 2007-02-01 09:52:52 UTC (rev 135)
@@ -44,7 +44,7 @@
#define S43 15
#define S44 21
-typedef unsigned char *POwxInt32ER;
+typedef unsigned char *POINTER;
typedef unsigned short int wxUint322;
typedef unsigned long int wxUint324;
@@ -98,9 +98,9 @@
static void Decode(wxUint324 *, const char *, unsigned int);
-static void MD5_memcpy(POwxInt32ER, POwxInt32ER, unsigned int);
+static void MD5_memcpy(POINTER, POINTER, unsigned int);
-static void MD5_memset(POwxInt32ER, int, unsigned int);
+static void MD5_memset(POINTER, int, unsigned int);
static char PADDING[64] =
{
@@ -176,7 +176,7 @@
if (inputLen >= partLen)
{
MD5_memcpy
- ((POwxInt32ER) &context->buffer[index], (POwxInt32ER) input, partLen);
+ ((POINTER) &context->buffer[index], (POINTER) input, partLen);
MD5Transform(context->state, context->buffer);
for (i = partLen ; i + 63 < inputLen ; i += 64)
MD5Transform(context->state, &input[i]);
@@ -186,7 +186,7 @@
i = 0;
/* Buffer remaining input */
MD5_memcpy
- ((POwxInt32ER) &context->buffer[index], (POwxInt32ER) &input[i],
+ ((POINTER) &context->buffer[index], (POINTER) &input[i],
inputLen - i);
}
@@ -211,7 +211,7 @@
Encode((char *)digest, context->state, 16);
/* Zeroize sensitive information.
*/
- MD5_memset((POwxInt32ER) context, 0, sizeof( *context));
+ MD5_memset((POINTER) context, 0, sizeof( *context));
}
/* MD5 basic transformation. Transforms state based on block.
@@ -359,7 +359,7 @@
state[3] += d;
/* Zeroize sensitive information.
*/
- MD5_memset((POwxInt32ER) x, 0, sizeof(x));
+ MD5_memset((POINTER) x, 0, sizeof(x));
}
/* Encodes input (wxUint324) into output (unsigned char). Assumes len is
@@ -393,7 +393,7 @@
/* Note: Replace "for loop" with standard memcpy if possible.
*/
-static void MD5_memcpy(POwxInt32ER output, POwxInt32ER input, unsigned int len)
+static void MD5_memcpy(POINTER output, POINTER input, unsigned int len)
{
unsigned int i;
for (i = 0 ; i < len ; i++)
@@ -403,7 +403,7 @@
/* Note: Replace "for loop" with standard memset if possible.
*/
-static void MD5_memset(POwxInt32ER output, int value, unsigned int len)
+static void MD5_memset(POINTER output, int value, unsigned int len)
{
unsigned int i;
for (i = 0 ; i < len ; i++)
Modified: trunk/src/QueueListCtrl.cpp
===================================================================
--- trunk/src/QueueListCtrl.cpp 2007-01-21 00:47:19 UTC (rev 134)
+++ trunk/src/QueueListCtrl.cpp 2007-02-01 09:52:52 UTC (rev 135)
@@ -315,7 +315,7 @@
// Added Thief Icon [BlackRat]
if (client->thief)
image = 9;
- //x::POwxInt32 point =
+ //x::POINT point =
//{
// cur_rec.left, cur_rec.top + 1
// };
Modified: trunk/src/UploadListCtrl.cpp
===================================================================
--- trunk/src/UploadListCtrl.cpp 2007-01-21 00:47:19 UTC (rev 134)
+++ trunk/src/UploadListCtrl.cpp 2007-02-01 09:52:52 UTC (rev 135)
@@ -441,7 +441,7 @@
// Added Thief icon [BlackRat]
if (client->thief)
image = 9;
- x::POwxInt32 point =
+ x::POINT point =
{
cur_rec.left, cur_rec.top + 1
};
Modified: trunk/src/wintypes.h
===================================================================
--- trunk/src/wintypes.h 2007-01-21 00:47:19 UTC (rev 134)
+++ trunk/src/wintypes.h 2007-02-01 09:52:52 UTC (rev 135)
@@ -32,7 +32,7 @@
typedef unsigned char* LPCTSTR;
typedef DWORD COLORREF;
- struct POwxInt32
+ struct POINT
{
wxUint32 x,y;
};
@@ -49,8 +49,8 @@
wxUint32 length;
wxUint32 flags;
wxUint32 showCmd;
- POwxInt32 ptMinPosition;
- POwxInt32 ptMaxPosition;
+ POINT ptMinPosition;
+ POINT ptMaxPosition;
RECT rcNormalPosition;
};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-21 00:47:19
|
Revision: 134
http://svn.sourceforge.net/xmule/?rev=134&view=rev
Author: avivahl
Date: 2007-01-20 16:47:19 -0800 (Sat, 20 Jan 2007)
Log Message:
-----------
Nicer TODO message.
Modified Paths:
--------------
trunk/src/otherfunctions.cpp
Modified: trunk/src/otherfunctions.cpp
===================================================================
--- trunk/src/otherfunctions.cpp 2007-01-20 22:42:14 UTC (rev 133)
+++ trunk/src/otherfunctions.cpp 2007-01-21 00:47:19 UTC (rev 134)
@@ -245,7 +245,7 @@
void ShellOpenFile(wxString name)
{
//ShellExecute(NULL, "open", name, NULL, NULL, SW_SHOW);
- cout << "TODO: shellopen" << endl;
+ cout << "TODO: ShellOpenFile()" << endl;
}
namespace
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-20 22:42:16
|
Revision: 133
http://svn.sourceforge.net/xmule/?rev=133&view=rev
Author: avivahl
Date: 2007-01-20 14:42:14 -0800 (Sat, 20 Jan 2007)
Log Message:
-----------
Compilation fix.
Modified Paths:
--------------
trunk/src/otherfunctions.h
Modified: trunk/src/otherfunctions.h
===================================================================
--- trunk/src/otherfunctions.h 2007-01-20 00:55:53 UTC (rev 132)
+++ trunk/src/otherfunctions.h 2007-01-20 22:42:14 UTC (rev 133)
@@ -21,9 +21,11 @@
#include "mfc.h" // wxString
+#include <wx/string.h>
#include <cmath>
-//#include <sys/time.h>
-#include <wx/string.h>
+#ifndef __WXMSW__
+#include <sys/time.h> // gettimeofday()
+#endif // __WXMSW__
#define ROUND(x) (floor((float)x+0.5f))
@@ -109,13 +111,12 @@
}
#ifndef __WXMSW__
-inline long GetTickCount()
-{
- struct timeval aika;
- gettimeofday(&aika,NULL);
- unsigned long secs=aika.tv_sec*1000;
- secs+=(aika.tv_usec/1000);
- return secs;
+inline wxUint32 GetTickCount()
+{
+ struct timeval currenttime;
+ gettimeofday(¤ttime, NULL);
+ // this will rollover ~ every 49.7 days
+ return (wxUint32)(currenttime.tv_sec * 1000 + currenttime.tv_usec / 1000);
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-20 00:55:53
|
Revision: 132
http://svn.sourceforge.net/xmule/?rev=132&view=rev
Author: avivahl
Date: 2007-01-19 16:55:53 -0800 (Fri, 19 Jan 2007)
Log Message:
-----------
Small change
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-01-18 19:34:09 UTC (rev 131)
+++ trunk/configure.ac 2007-01-20 00:55:53 UTC (rev 132)
@@ -151,8 +151,8 @@
# we have it anyway by now
DEFS="$DEFS -DHAVE_CONFIG_H"
-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY $DEFS"
-CFLAGS="$CFLAGS $WX_CFLAGS_ONLY $GTK_CFLAGS $GTK_DEFS $DEFS"
+CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS $DEFS"
+CFLAGS="$CFLAGS $WX_CFLAGS $GTK_CFLAGS $GTK_DEFS $DEFS"
LIBS="$LIBS $WX_LIBS"
AC_SUBST(CONFIG)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-18 19:34:15
|
Revision: 131
http://svn.sourceforge.net/xmule/?rev=131&view=rev
Author: avivahl
Date: 2007-01-18 11:34:09 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
We only use wxWidgets 2.8.0 now, so no need to test for v2.5.3 or above...
Modified Paths:
--------------
trunk/src/xmuleIPV4Address.h
Modified: trunk/src/xmuleIPV4Address.h
===================================================================
--- trunk/src/xmuleIPV4Address.h 2007-01-13 16:24:09 UTC (rev 130)
+++ trunk/src/xmuleIPV4Address.h 2007-01-18 19:34:09 UTC (rev 131)
@@ -47,10 +47,7 @@
struct in_addr inaddr;
inet_aton(static_cast<const char *>(addr.mb_str()), &inaddr);
-
- #if wxCHECK_VERSION(2, 5, 2)
- inaddr.s_addr = ntohl(inaddr.s_addr);
- #endif
+ inaddr.s_addr = ntohl(inaddr.s_addr);
return (GAddress_INET_SetHostAddress(m_address, inaddr.s_addr) == GSOCK_NOERROR);
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-13 16:24:10
|
Revision: 130
http://svn.sourceforge.net/xmule/?rev=130&view=rev
Author: avivahl
Date: 2007-01-13 08:24:09 -0800 (Sat, 13 Jan 2007)
Log Message:
-----------
Updated some stuff in the build system. Should fix various problems.
Modified Paths:
--------------
trunk/configure.ac
trunk/src/GNUmakefile.in
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-01-13 12:38:57 UTC (rev 129)
+++ trunk/configure.ac 2007-01-13 16:24:09 UTC (rev 130)
@@ -86,10 +86,10 @@
echo "Cryp name: -$cryp_name-"
AC_DEFINE_UNQUOTED(HAVE_CRYPTOPP, 1, [Define if you have the Crypto++ development headers and libraries.])
if test -n "$cryptopp_prefix"; then
- WX_CPPFLAGS="$WX_CPPFLAGS -I$withval/include"
- WX_LIBS="$WX_LIBS -L$withval/lib -l$cryp_name"
+ CXXFLAGS="$CXXFLAGS -I$cryptopp_prefix/include"
+ LIBS="$LIBS -L$cryptopp_prefix/lib -l$cryp_name"
else
- WX_LIBS="$WX_LIBS -l$cryp_name"
+ LIBS="$LIBS -l$cryp_name"
fi
fi
@@ -151,9 +151,9 @@
# we have it anyway by now
DEFS="$DEFS -DHAVE_CONFIG_H"
-LIBS="$LIBS $WX_LIBS $ZLIB_LIBS"
-CFLAGS="$CFLAGS $GTK_DEFS $GTK_CFLAGS $DEFS"
-CXXFLAGS="$CXXFLAGS $DEFS"
+CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY $DEFS"
+CFLAGS="$CFLAGS $WX_CFLAGS_ONLY $GTK_CFLAGS $GTK_DEFS $DEFS"
+LIBS="$LIBS $WX_LIBS"
AC_SUBST(CONFIG)
AC_SUBST(HAVE_XRC)
Modified: trunk/src/GNUmakefile.in
===================================================================
--- trunk/src/GNUmakefile.in 2007-01-13 12:38:57 UTC (rev 129)
+++ trunk/src/GNUmakefile.in 2007-01-13 16:24:09 UTC (rev 130)
@@ -11,21 +11,12 @@
CXXFLAGS := $(CXXFLAGS) @CXXFLAGS@
LDFLAGS := $(LDFLAGS) @LDFLAGS@
USE_PCH = @USE_PCH@
-LIBS = @LIBS@
+LIBS := $(LIBS) -L../xLibs -lDynPrefs -liniparser -lwxMultiTree -lz @LIBS@
-CFLAGS += -I../xLibs -I. @WX_CXXFLAGS@
-CXXFLAGS += $(CFLAGS)
-LIBS = -L../xLibs -lDynPrefs -liniparser -lwxMultiTree -lz @WX_LIBS@
-
ifeq ($(USE_PCH), yes)
- CXXFLAGS += -DPRECOMP -DWX_PRECOMP -Winvalid-pch -include xmule-headers.h
+ CXXFLAGS += -DPRECOMP -Winvalid-pch
endif
-ifeq ($(HAVE_XRC), no)
- CXXFLAGS += -I../xLibs/xrc
- LDFLAGS += -L$(LIBDIR) -lxrc
-endif
-
obj/%.o : %.cpp
-@if [ ! -d obj ]; then mkdir obj; fi
ifeq ($(VERBOSE),1)
@@ -137,12 +128,4 @@
@echo Cleaning xmule
-@rm -rf $(BINDIR)/$(TARGET) obj/*
-obj/CryptoXMpp.o:
-ifeq ($(VERBOSE),1)
- $(CXX) -DHAVE_CONFIG_H -c CryptoXMpp.cpp -o obj/CryptoXMpp.o
-else
- @echo CryptoXMpp.cpp
- @$(CXX) -DHAVE_CONFIG_H -c CryptoXMpp.cpp -o obj/CryptoXMpp.o
-endif
-
-include make.dep
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-13 12:38:57
|
Revision: 129
http://svn.sourceforge.net/xmule/?rev=129&view=rev
Author: avivahl
Date: 2007-01-13 04:38:57 -0800 (Sat, 13 Jan 2007)
Log Message:
-----------
Updated compilation information.
Modified Paths:
--------------
trunk/docs/INSTALL
Modified: trunk/docs/INSTALL
===================================================================
--- trunk/docs/INSTALL 2007-01-13 10:30:54 UTC (rev 128)
+++ trunk/docs/INSTALL 2007-01-13 12:38:57 UTC (rev 129)
@@ -1,10 +1,30 @@
-xMule's Requirements:
+xMule's Library Requirements:
----------------------------------
-wxGTK 2.8.0-RC3 (wxWidgets GTK Interface) - http://www.wxwidgets.org
-GNU Compiler Collection (GCC) 4.1.1 - http://gcc.gnu.org/
-Crypto++ 5.2.1 (Optional) - http://www.eskimo.com/~weidai/cryptlib.html
+wxWidgets 2.8.0
+ http://www.wxwidgets.org
+ * Use any of the flavors (wxGTK, wxMSW, wxCocoa...) depending on the platform you run.
+ * xMule only supports the latest wxWidgets in order to avoid
+ bugs and get a much better looking GTK2 xMule interface.
+Crypto++ 5.4 (Optional)
+ http://www.cryptopp.com/
+ * Use this if the integrated Crypto code (CryptoXMpp.cpp,
+ CryptoXMpp.h) doesn't compile or work well on your machine.
+Supported Compilers:
+----------------------------------
+GNU Compiler Collection (GCC) 4.1.1
+ http://gcc.gnu.org/
+
+Microsoft Visual C++ 2005
+ http://msdn.microsoft.com/visualc/
+ * xMule supports the FREE express edition. Use the latest
+ Windows SDK to compile using it.
+
+Note: Older versions of the above compilers may work, but we
+ always suggest using the latest versions.
+
+
Steps to compile wxWidgets:
----------------------------------
1. Extract wxWidgets
@@ -23,14 +43,10 @@
Notes:
----------------------------------
-1. Compilation should work on GCC 3.2 and above. Using the
- latest GCC is always recommended.
-2. Using the latest wxWidgets is recommended in order
- to avoid bugs and get a much better looking GTK2 xMule interface.
-3. Always use --enable-debug so that you'll be able to report
+1. If you are using the SVN trunk, make sure you run ./autogen.sh
+ so that a configure script will get generated (autoconf >= 2.57 is required).
+2. Always use --enable-debug so that you'll be able to report
useful backtraces.
-4. If you are using the SVN trunk, make sure you run ./autogen.sh
- so that a configure script will get generated (autoconf >= 2.57 is required).
Configure Script Advanced Options:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-13 10:30:58
|
Revision: 128
http://svn.sourceforge.net/xmule/?rev=128&view=rev
Author: avivahl
Date: 2007-01-13 02:30:54 -0800 (Sat, 13 Jan 2007)
Log Message:
-----------
Heh, this what happens when you do a lazy search-replace. Fixed.
Modified Paths:
--------------
trunk/src/CryptoXMpp.cpp
trunk/src/CryptoXMpp.h
Modified: trunk/src/CryptoXMpp.cpp
===================================================================
--- trunk/src/CryptoXMpp.cpp 2007-01-13 10:04:56 UTC (rev 127)
+++ trunk/src/CryptoXMpp.cpp 2007-01-13 10:30:54 UTC (rev 128)
@@ -766,7 +766,7 @@
{
BERSequenceDecoder privateKeyInfo(bt);
word32 version;
- BERDecodeUnsigned <word32 > (privateKeyInfo, version, wxInt32EGER, 0, 0);
+ BERDecodeUnsigned <word32 > (privateKeyInfo, version, INTEGER, 0, 0);
// check version
BERSequenceDecoder algorithm(privateKeyInfo);
GetAlgorithmID() .BERDecodeAndCheck(algorithm);
@@ -1351,7 +1351,7 @@
unsigned int messageCount;
do
{
- messageCount = wxUint32_MAX;
+ messageCount = UINT_MAX;
unsigned int blockedBytes = TransferMessagesTo2(target, messageCount, channel, blocking);
if (blockedBytes)
return blockedBytes;
@@ -1376,7 +1376,7 @@
else
{
assert(!NumberOfMessageSeries());
- while (CopyMessagesTo(target, wxUint32_MAX, channel))
+ while (CopyMessagesTo(target, UINT_MAX, channel))
{
}
}
@@ -1601,7 +1601,7 @@
{
BERSequenceDecoder seq(bt);
word32 version;
- BERDecodeUnsigned <word32 > (seq, version, wxInt32EGER, 1, 1);
+ BERDecodeUnsigned <word32 > (seq, version, INTEGER, 1, 1);
m_exponentBase.BERDecode(seq);
m_windowSize = m_exponentBase.BitCount() - 1;
m_bases.clear();
@@ -2353,9 +2353,9 @@
unsigned int Source::PumpAll2(bool blocking)
{
// TODO: switch length type
- unsigned long i = wxUint32_MAX;
+ unsigned long i = UINT_MAX;
RETURN_IF_NONZERO(Pump2(i, blocking));
- unsigned int j = wxUint32_MAX;
+ unsigned int j = UINT_MAX;
return PumpMessages2(j, blocking);
}
bool Store::GetNextMessage()
@@ -2506,7 +2506,7 @@
return true;
}
static int DummyAssignIntToInteger = (AssignIntToInteger = FunctionAssignIntToInteger, 0);
-#ifdef SSE2_wxInt32RINSICS_AVAILABLE
+#ifdef SSE2_INTRINSICS_AVAILABLE
template <class T >
AllocatorBase <T >::pointer AlignedAllocator <T >::allocate(size_type n, const void *)
{
@@ -3652,7 +3652,7 @@
inline void Multiply(word * R, word * T, const word * A, const word * B, unsigned int N)
{
-#ifdef SSE2_wxInt32RINSICS_AVAILABLE
+#ifdef SSE2_INTRINSICS_AVAILABLE
if (HasSSE2())
RecursiveMultiply <P4Optimized > (R, T, A, B, N);
else
@@ -3662,7 +3662,7 @@
inline void Square(word * R, word * T, const word * A, unsigned int N)
{
-#ifdef SSE2_wxInt32RINSICS_AVAILABLE
+#ifdef SSE2_INTRINSICS_AVAILABLE
if (HasSSE2())
RecursiveSquare <P4Optimized > (R, T, A, N);
else
@@ -3672,7 +3672,7 @@
inline void MultiplyBottom(word * R, word * T, const word * A, const word * B, unsigned int N)
{
-#ifdef SSE2_wxInt32RINSICS_AVAILABLE
+#ifdef SSE2_INTRINSICS_AVAILABLE
if (HasSSE2())
RecursiveMultiplyBottom <P4Optimized > (R, T, A, B, N);
else
@@ -3682,7 +3682,7 @@
inline void MultiplyTop(word * R, word * T, const word * L, const word * A, const word * B, unsigned int N)
{
-#ifdef SSE2_wxInt32RINSICS_AVAILABLE
+#ifdef SSE2_INTRINSICS_AVAILABLE
if (HasSSE2())
RecursiveMultiplyTop <P4Optimized > (R, T, L, A, B, N);
else
@@ -4473,7 +4473,7 @@
void Integer::DEREncode(BufferedTransformation & bt) const
{
- DERGeneralEncoder enc(bt, wxInt32EGER);
+ DERGeneralEncoder enc(bt, INTEGER);
Encode(enc, MinEncodedSize(SIGNED), SIGNED);
enc.MessageEnd();
}
@@ -4486,7 +4486,7 @@
void Integer::BERDecode(BufferedTransformation & bt)
{
- BERGeneralDecoder dec(bt, wxInt32EGER);
+ BERGeneralDecoder dec(bt, INTEGER);
if (!dec.IsDefiniteLength() || dec.MaxRetrievable() < dec.RemainingLength())
BERDecodeError();
Decode(dec, dec.RemainingLength(), SIGNED);
@@ -7754,7 +7754,7 @@
{
BERSequenceDecoder privateKey(bt);
word32 version;
- BERDecodeUnsigned <word32 > (privateKey, version, wxInt32EGER, 0, 0);
+ BERDecodeUnsigned <word32 > (privateKey, version, INTEGER, 0, 0);
// check version
m_n.BERDecode(privateKey);
m_e.BERDecode(privateKey);
@@ -8101,7 +8101,7 @@
{
{
unsigned int spaceSize = 1024;
- m_space = HelpCreatePutSpace(target, channel, 1, (unsigned int) STDMIN(size, (unsigned long) wxUint32_MAX), spaceSize);
+ m_space = HelpCreatePutSpace(target, channel, 1, (unsigned int) STDMIN(size, (unsigned long) UINT_MAX), spaceSize);
m_stream->read((char *) m_space, STDMIN(size, (unsigned long) spaceSize));
}
m_len = m_stream->gcount();
@@ -9358,7 +9358,7 @@
{
// on some systems /dev/random will block until all bytes
// are available, on others it will returns immediately
- int len = read(m_fd, output, STDMIN(size, (unsigned int) wxInt32_MAX));
+ int len = read(m_fd, output, STDMIN(size, (unsigned int) INT_MAX));
if (len == - 1)
throw OS_RNG_Err("read /dev/random");
size -= len;
Modified: trunk/src/CryptoXMpp.h
===================================================================
--- trunk/src/CryptoXMpp.h 2007-01-13 10:04:56 UTC (rev 127)
+++ trunk/src/CryptoXMpp.h 2007-01-13 10:30:54 UTC (rev 128)
@@ -114,7 +114,7 @@
// ***************** Less Important Settings ***************
// define this to retain (as much as possible) old deprecated function and class names
-// #define CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+// #define CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
#define GZIP_OS_CODE 0
@@ -168,7 +168,7 @@
//! BufferedTransformation received a Flush(true) signal but can't flush buffers
CANNOT_FLUSH,
//! data integerity check (such as CRC or MAC) failed
- DATA_wxInt32EGRITY_CHECK_FAILED,
+ DATA_INTEGRITY_CHECK_FAILED,
//! received input data that doesn't conform to expected format
INVALID_DATA_FORMAT,
//! error reading from input device or writing to output device
@@ -1310,7 +1310,7 @@
bool isValidCoding;
unsigned int messageLength;
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
operator unsigned int() const {return isValidCoding ? messageLength : 0;}
#endif
};
@@ -1478,7 +1478,7 @@
//! calls SetKey() with an NameValuePairs object that just specifies "IV"
void SetKeyWithIV(const byte *key, unsigned int length, const byte *iv);
- enum IV_Requirement {STRUCTURED_IV = 0, RANDOM_IV, UNPREDICTABLE_RANDOM_IV, wxInt32ERNALLY_GENERATED_IV, NOT_RESYNCHRONIZABLE};
+ enum IV_Requirement {STRUCTURED_IV = 0, RANDOM_IV, UNPREDICTABLE_RANDOM_IV, INTERNALLY_GENERATED_IV, NOT_RESYNCHRONIZABLE};
//! returns the minimal requirement for secure IVs
virtual IV_Requirement IVRequirement() const =0;
@@ -1697,7 +1697,7 @@
typedef SimpleKeyedTransformation<StreamTransformation> SymmetricCipher;
typedef SimpleKeyedTransformation<HashTransformation> MessageAuthenticationCode;
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
typedef SymmetricCipher StreamCipher;
#endif
@@ -1732,7 +1732,7 @@
std::iter_swap(begin, begin + GenerateWord32(0, end-begin-1));
}
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
byte GetByte() {return GenerateByte();}
unsigned int GetBit() {return GenerateBit();}
word32 GetLong(word32 a=0, word32 b=0xffffffffL) {return GenerateWord32(a, b);}
@@ -1880,7 +1880,7 @@
virtual int GetAutoSignalPropagation() const {return 0;}
public:
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
void Close() {MessageEnd();}
#endif
//@}
@@ -1931,7 +1931,7 @@
unsigned long CopyRangeTo(BufferedTransformation &target, unsigned long position, unsigned long copyMax=ULONG_MAX, const std::string &channel=NULL_CHANNEL) const
{unsigned long i = position; CopyRangeTo2(target, i, i+copyMax, channel); return i-position;}
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
unsigned long MaxRetrieveable() const {return MaxRetrievable();}
#endif
//@}
@@ -1951,12 +1951,12 @@
*/
virtual bool GetNextMessage();
//! skip count number of messages
- virtual unsigned int SkipMessages(unsigned int count=wxUint32_MAX);
+ virtual unsigned int SkipMessages(unsigned int count=UINT_MAX);
//!
- unsigned int TransferMessagesTo(BufferedTransformation &target, unsigned int count=wxUint32_MAX, const std::string &channel=NULL_CHANNEL)
+ unsigned int TransferMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=NULL_CHANNEL)
{TransferMessagesTo2(target, count, channel); return count;}
//!
- unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=wxUint32_MAX, const std::string &channel=NULL_CHANNEL) const;
+ unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=NULL_CHANNEL) const;
//!
virtual void SkipAll();
@@ -2210,7 +2210,7 @@
/*! \note This function returns 0 if plainTextLength is not valid (too long). */
virtual unsigned int CiphertextLength(unsigned int plainTextLength) const =0;
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
unsigned int MaxPlainTextLength(unsigned int cipherTextLength) const {return MaxPlaintextLength(cipherTextLength);}
unsigned int CipherTextLength(unsigned int plainTextLength) const {return CiphertextLength(plainTextLength);}
#endif
@@ -2274,7 +2274,7 @@
unsigned int MaxPlaintextLength(unsigned int cipherTextLength) const;
unsigned int CiphertextLength(unsigned int plainTextLength) const;
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
unsigned int MaxPlainTextLength(unsigned int cipherTextLength) const {return MaxPlaintextLength(cipherTextLength);}
unsigned int CipherTextLength(unsigned int plainTextLength) const {return CiphertextLength(plainTextLength);}
unsigned int MaxPlainTextLength() const {return FixedMaxPlaintextLength();}
@@ -2464,7 +2464,7 @@
*/
virtual bool Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey=true) const =0;
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
bool ValidateDomainParameters(RandomNumberGenerator &rng) const
{return GetCryptoParameters().Validate(rng, 2);}
#endif
@@ -2512,7 +2512,7 @@
const byte *staticOtherPublicKey, const byte *ephemeralOtherPublicKey,
bool validateStaticOtherPublicKey=true) const =0;
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
bool ValidateDomainParameters(RandomNumberGenerator &rng) const
{return GetCryptoParameters().Validate(rng, 2);}
#endif
@@ -2540,7 +2540,7 @@
virtual void BEREncode(BufferedTransformation &bt) const {DEREncode(bt);}
};
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
typedef PK_SignatureScheme PK_SignatureSystem
typedef PK_SignatureSchemeWithRecovery PK_SignatureSystemWithRecovery
typedef SimpleKeyAgreementDomain PK_SimpleKeyAgreementDomain
@@ -2727,7 +2727,7 @@
unsigned int NumberOfMessages() const {return m_messageEnd ? 0 : 1;}
bool GetNextMessage();
- unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=wxUint32_MAX, const std::string &channel=NULL_CHANNEL) const;
+ unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=NULL_CHANNEL) const;
protected:
virtual void StoreInitialize(const NameValuePairs ¶meters) =0;
@@ -4336,7 +4336,7 @@
unsigned int m_optimalBufferSize;
};
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
typedef StreamTransformationFilter StreamCipherFilter;
#endif
@@ -4366,7 +4366,7 @@
{
public:
HashVerificationFailed()
- : Exception(DATA_wxInt32EGRITY_CHECK_FAILED, "HashVerifier: message hash not valid") {}
+ : Exception(DATA_INTEGRITY_CHECK_FAILED, "HashVerifier: message hash not valid") {}
};
enum Flags {HASH_AT_BEGIN=1, PUT_MESSAGE=2, PUT_HASH=4, PUT_RESULT=8, THROW_EXCEPTION=16, DEFAULT_FLAGS = HASH_AT_BEGIN | PUT_RESULT};
@@ -4418,7 +4418,7 @@
{
public:
SignatureVerificationFailed()
- : Exception(DATA_wxInt32EGRITY_CHECK_FAILED, "VerifierFilter: digital signature not valid") {}
+ : Exception(DATA_INTEGRITY_CHECK_FAILED, "VerifierFilter: digital signature not valid") {}
};
enum Flags {SIGNATURE_AT_BEGIN=1, PUT_MESSAGE=2, PUT_SIGNATURE=4, PUT_RESULT=8, THROW_EXCEPTION=16, DEFAULT_FLAGS = SIGNATURE_AT_BEGIN | PUT_RESULT};
@@ -4664,7 +4664,7 @@
unsigned long Pump(unsigned long pumpMax=ULONG_MAX)
{Pump2(pumpMax); return pumpMax;}
- unsigned int PumpMessages(unsigned int count=wxUint32_MAX)
+ unsigned int PumpMessages(unsigned int count=UINT_MAX)
{PumpMessages2(count); return count;}
void PumpAll()
{PumpAll2();}
@@ -4853,7 +4853,7 @@
enum ASNTag
{
BOOLEAN = 0x01,
- wxInt32EGER = 0x02,
+ INTEGER = 0x02,
BIT_STRING = 0x03,
OCTET_STRING = 0x04,
TAG_NULL = 0x05,
@@ -4866,7 +4866,7 @@
SEQUENCE = 0x10,
SET = 0x11,
NUMERIC_STRING = 0x12,
- PRwxInt32ABLE_STRING = 0x13,
+ PRINTABLE_STRING = 0x13,
T61_STRING = 0x14,
VIDEOTEXT_STRING = 0x15,
IA5_STRING = 0x16,
@@ -5101,9 +5101,9 @@
// ********************************************************
//! DER Encode Unsigned
-/*! for wxInt32EGER, BOOLEAN, and ENUM */
+/*! for INTEGER, BOOLEAN, and ENUM */
template <class T>
-unsigned int DEREncodeUnsigned(BufferedTransformation &out, T w, byte asnTag = wxInt32EGER)
+unsigned int DEREncodeUnsigned(BufferedTransformation &out, T w, byte asnTag = INTEGER)
{
byte buf[sizeof(w)+1];
unsigned int bc;
@@ -5133,7 +5133,7 @@
// VC60 workaround: std::numeric_limits<T>::max conflicts with MFC max macro
// CW41 workaround: std::numeric_limits<T>::max causes a template error
template <class T>
-void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = wxInt32EGER,
+void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = INTEGER,
T minValue = 0, T maxValue = 0xffffffff)
{
byte b;
@@ -5176,18 +5176,18 @@
#endif
-#ifndef CRYPTOPP_wxInt32EGER_H
-#define CRYPTOPP_wxInt32EGER_H
+#ifndef CRYPTOPP_INTEGER_H
+#define CRYPTOPP_INTEGER_H
/** \file */
#ifdef _M_IX86
-# if (defined(__wxInt32EL_COMPILER) && (__wxInt32EL_COMPILER >= 500)) || (defined(__ICL) && (__ICL >= 500))
-# define SSE2_wxInt32RINSICS_AVAILABLE
+# if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 500)) || (defined(__ICL) && (__ICL >= 500))
+# define SSE2_INTRINSICS_AVAILABLE
# endif
#endif
-#ifdef SSE2_wxInt32RINSICS_AVAILABLE
+#ifdef SSE2_INTRINSICS_AVAILABLE
template <class T>
class AlignedAllocator : public AllocatorBase<T>
{
@@ -6085,7 +6085,7 @@
*/
// VC60 workaround: this macro is defined in shlobj.h and conflicts with a template parameter used in this file
-#undef wxInt32ERFACE
+#undef INTERFACE
Integer NR_EncodeDigest(unsigned int modulusBits, const byte *digest, unsigned int digestLen);
Integer DSA_EncodeDigest(unsigned int modulusBits, const byte *digest, unsigned int digestLen);
@@ -6181,8 +6181,8 @@
// ********************************************************
//! .
-template <class wxInt32ERFACE, class BASE>
-class TF_CryptoSystemBase : public wxInt32ERFACE, protected BASE
+template <class INTERFACE, class BASE>
+class TF_CryptoSystemBase : public INTERFACE, protected BASE
{
public:
unsigned int FixedMaxPlaintextLength() const {return this->GetMessageEncodingInterface().MaxUnpaddedLength(PaddedBlockBitLength());}
@@ -6309,8 +6309,8 @@
};
//! .
-template <class wxInt32ERFACE, class BASE>
-class TF_SignatureSchemeBase : public wxInt32ERFACE, protected BASE
+template <class INTERFACE, class BASE>
+class TF_SignatureSchemeBase : public INTERFACE, protected BASE
{
public:
unsigned int SignatureLength() const
@@ -6993,8 +6993,8 @@
};
//! .
-template <class wxInt32ERFACE, class KEY_wxInt32ERFACE>
-class DL_SignatureSchemeBase : public wxInt32ERFACE, public DL_Base<KEY_wxInt32ERFACE>
+template <class INTERFACE, class KEY_INTERFACE>
+class DL_SignatureSchemeBase : public INTERFACE, public DL_Base<KEY_INTERFACE>
{
public:
unsigned int SignatureLength() const
@@ -7018,7 +7018,7 @@
unsigned int MessageRepresentativeLength() const {return BitsToBytes(MessageRepresentativeBitLength());}
unsigned int MessageRepresentativeBitLength() const {return this->GetAbstractGroupParameters().GetSubgroupOrder().BitCount();}
- virtual const DL_ElgamalLikeSignatureAlgorithm<CPP_TYPENAME KEY_wxInt32ERFACE::Element> & GetSignatureAlgorithm() const =0;
+ virtual const DL_ElgamalLikeSignatureAlgorithm<CPP_TYPENAME KEY_INTERFACE::Element> & GetSignatureAlgorithm() const =0;
virtual const PK_SignatureMessageEncodingMethod & GetMessageEncodingInterface() const =0;
virtual HashIdentifier GetHashIdentifier() const =0;
virtual unsigned int GetDigestSize() const =0;
@@ -7964,7 +7964,7 @@
unsigned int NumberOfMessageSeries() const
{return m_messageCounts.size()-1;}
- unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=wxUint32_MAX, const std::string &channel=NULL_CHANNEL) const;
+ unsigned int CopyMessagesTo(BufferedTransformation &target, unsigned int count=UINT_MAX, const std::string &channel=NULL_CHANNEL) const;
const byte * Spy(unsigned int &contiguousSize) const;
@@ -7980,7 +7980,7 @@
class EqualityComparisonFilter : public Unflushable<Multichannel<Filter> >
{
public:
- struct MismatchDetected : public Exception {MismatchDetected() : Exception(DATA_wxInt32EGRITY_CHECK_FAILED, "EqualityComparisonFilter: did not receive the same data on two channels") {}};
+ struct MismatchDetected : public Exception {MismatchDetected() : Exception(DATA_INTEGRITY_CHECK_FAILED, "EqualityComparisonFilter: did not receive the same data on two channels") {}};
/*! if throwIfNotEqual is false, this filter will output a '\0' byte when it detects a mismatch, '\1' otherwise */
EqualityComparisonFilter(BufferedTransformation *attachment=NULL, bool throwIfNotEqual=true, const std::string &firstChannel="0", const std::string &secondChannel="1")
@@ -8271,8 +8271,8 @@
void AssertValidKeyLength(unsigned int length) {assert(GetValidKeyLength(length) == length);}
};
-template <class INFO, class wxInt32ERFACE = BlockCipher>
-class BlockCipherBaseTemplate : public AlgorithmImpl<SimpleKeyingInterfaceImpl<TwoBases<INFO, wxInt32ERFACE> > >
+template <class INFO, class INTERFACE = BlockCipher>
+class BlockCipherBaseTemplate : public AlgorithmImpl<SimpleKeyingInterfaceImpl<TwoBases<INFO, INTERFACE> > >
{
public:
unsigned int BlockSize() const {return this->BLOCKSIZE;}
@@ -8572,23 +8572,23 @@
#ifndef CRYPTOPP_STRCIPHR_H
#define CRYPTOPP_STRCIPHR_H
-template <class POLICY_wxInt32ERFACE, class BASE = Empty>
+template <class POLICY_INTERFACE, class BASE = Empty>
class AbstractPolicyHolder : public BASE
{
public:
- typedef POLICY_wxInt32ERFACE PolicyInterface;
+ typedef POLICY_INTERFACE PolicyInterface;
protected:
- virtual const POLICY_wxInt32ERFACE & GetPolicy() const =0;
- virtual POLICY_wxInt32ERFACE & AccessPolicy() =0;
+ virtual const POLICY_INTERFACE & GetPolicy() const =0;
+ virtual POLICY_INTERFACE & AccessPolicy() =0;
};
-template <class POLICY, class BASE, class POLICY_wxInt32ERFACE = CPP_TYPENAME BASE::PolicyInterface>
+template <class POLICY, class BASE, class POLICY_INTERFACE = CPP_TYPENAME BASE::PolicyInterface>
class ConcretePolicyHolder : public BASE, protected POLICY
{
protected:
- const POLICY_wxInt32ERFACE & GetPolicy() const {return *this;}
- POLICY_wxInt32ERFACE & AccessPolicy() {return *this;}
+ const POLICY_INTERFACE & GetPolicy() const {return *this;}
+ POLICY_INTERFACE & AccessPolicy() {return *this;}
};
enum KeystreamOperation {WRITE_KEYSTREAM, XOR_KEYSTREAM, XOR_KEYSTREAM_INPLACE};
@@ -8880,8 +8880,8 @@
SecByteBlock m_register;
};
-template <class POLICY_wxInt32ERFACE>
-class ModePolicyCommonTemplate : public CipherModeBase, public POLICY_wxInt32ERFACE
+template <class POLICY_INTERFACE>
+class ModePolicyCommonTemplate : public CipherModeBase, public POLICY_INTERFACE
{
unsigned int GetAlignment() const {return m_cipher->BlockAlignment();}
void CipherSetKey(const NameValuePairs ¶ms, const byte *key, unsigned int length)
@@ -9174,7 +9174,7 @@
typedef CipherModeFinalTemplate_ExternalCipher<CBC_CTS_Decryption> Decryption;
};
-#ifdef CRYPTOPP_MAwxInt32AIN_BACKWARDS_COMPATIBILITY
+#ifdef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY
typedef CFB_Mode_ExternalCipher::Encryption CFBEncryption;
typedef CFB_Mode_ExternalCipher::Decryption CFBDecryption;
typedef OFB_Mode_ExternalCipher::Encryption OFB;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-13 10:04:56
|
Revision: 127
http://svn.sourceforge.net/xmule/?rev=127&view=rev
Author: avivahl
Date: 2007-01-13 02:04:56 -0800 (Sat, 13 Jan 2007)
Log Message:
-----------
Fixed compilation. Code now uses wxWidgets...
Modified Paths:
--------------
trunk/src/endianswap.h
Modified: trunk/src/endianswap.h
===================================================================
--- trunk/src/endianswap.h 2007-01-12 20:41:22 UTC (rev 126)
+++ trunk/src/endianswap.h 2007-01-13 10:04:56 UTC (rev 127)
@@ -16,27 +16,12 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifndef ENDIANSWAP_H
-#define ENDIANSWAP_H
+#ifndef _ENDIANSWAP_H_
+#define _ENDIANSWAP_H_
-#ifdef HAVE_CONFIG_H
- #include <config.h>
-#endif // HAVE_CONFIG_H
+#include <wx/defs.h>
-#if !defined(__WIN32__)
- #if defined(__WXMAC__)
- #define __BIG_ENDIAN wxBIG_ENDIAN
- #define __LITTLE_ENDIAN wxLITTLE_ENDIAN
- #define __BYTE_ORDER wxBIG_ENDIAN
- #endif
- #if defined(__BSDBOX__)
- #include <machine/endian.h>
- #else
- #include <endian.h>
- #endif
-#endif
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+#if wxBYTE_ORDER == wxLITTLE_ENDIAN
#define ENDIAN_SWAP_16(x) (x)
#define ENDIAN_SWAP_I_16(x) {}
#define ENDIAN_SWAP_32(x) (x)
@@ -46,16 +31,14 @@
#define ENDIAN_SWAP_I_64(x) {}
#endif
#else
- #warning BIG ENDIAN BOX
- #define ENDIAN_SWAP_16(x) (wxwxUint3216_SWAP_ALWAYS(x))
- #define ENDIAN_SWAP_I_16(x) x = wxwxUint3216_SWAP_ALWAYS(x)
- #define ENDIAN_SWAP_32(x) (wxwxUint3232_SWAP_ALWAYS(x))
- #define ENDIAN_SWAP_I_32(x) x = wxwxUint3232_SWAP_ALWAYS(x)
+ #define ENDIAN_SWAP_16(x) (wxUINT16_SWAP_ALWAYS(x))
+ #define ENDIAN_SWAP_I_16(x) x = wxUINT16_SWAP_ALWAYS(x)
+ #define ENDIAN_SWAP_32(x) (wxUINT32_SWAP_ALWAYS(x))
+ #define ENDIAN_SWAP_I_32(x) x = wxUINT32_SWAP_ALWAYS(x)
#if defined __GNUC__ && __GNUC__ >= 2
- #define ENDIAN_SWAP_64(x) (wxwxUint3264_SWAP_ALWAYS(x))
- #define ENDIAN_SWAP_I_64(x) x = wxwxUint3264_FROM_LE(x)
+ #define ENDIAN_SWAP_64(x) (wxUINT64_SWAP_ALWAYS(x))
+ #define ENDIAN_SWAP_I_64(x) x = wxUINT64_FROM_LE(x)
#endif
#endif
-#endif // ENDIANSWAP_H
-
+#endif // _ENDIANSWAP_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-12 20:41:22
|
Revision: 126
http://svn.sourceforge.net/xmule/?rev=126&view=rev
Author: avivahl
Date: 2007-01-12 12:41:22 -0800 (Fri, 12 Jan 2007)
Log Message:
-----------
Updated so a custom LIBS="whatever" could be used.
Modified Paths:
--------------
trunk/xLibs/zlib/Makefile
Modified: trunk/xLibs/zlib/Makefile
===================================================================
--- trunk/xLibs/zlib/Makefile 2007-01-10 11:35:41 UTC (rev 125)
+++ trunk/xLibs/zlib/Makefile 2007-01-12 20:41:22 UTC (rev 126)
@@ -6,7 +6,7 @@
CC=cc
CFLAGS=-O
-LIBS=../libz.a
+LIBNAME=../libz.a
AR=ar rcs
OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
@@ -15,10 +15,10 @@
.c.o:
@$(CC) $(CFLAGS) -o $@ -c $<
-$(LIBS): $(OBJS)
+$(LIBNAME): $(OBJS)
@$(AR) $@ $(OBJS)
-all: $(LIBS)
+all: $(LIBNAME)
clean:
- @rm -f *.o ../libz.a
+ @rm -f *.o $(LIBNAME)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-10 11:35:45
|
Revision: 125
http://svn.sourceforge.net/xmule/?rev=125&view=rev
Author: avivahl
Date: 2007-01-10 03:35:41 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
1. Added PCH support for Windows :) Now compiles MUCH faster.
2. Moved xLibs to a different project file to keep things organized.
Modified Paths:
--------------
trunk/src/AddFileThread.cpp
trunk/src/AddFriend.cpp
trunk/src/BarShader.cpp
trunk/src/BaseClient.cpp
trunk/src/CFile.cpp
trunk/src/CatDialog.cpp
trunk/src/ChatWnd.cpp
trunk/src/ClientCredits.cpp
trunk/src/ClientDetailDialog.cpp
trunk/src/ClientList.cpp
trunk/src/ClientUDPSocket.cpp
trunk/src/CommentDialog.cpp
trunk/src/CommentDialogLst.cpp
trunk/src/CryptoXMpp.cpp
trunk/src/DownloadClient.cpp
trunk/src/DownloadListCtrl.cpp
trunk/src/DownloadQueue.cpp
trunk/src/ED2KLink.cpp
trunk/src/ED2KLinkParser.cpp
trunk/src/EMSocket.cpp
trunk/src/EditServerListDlg.cpp
trunk/src/FileDetailDialog.cpp
trunk/src/FlowChart.cpp
trunk/src/Friend.cpp
trunk/src/FriendList.cpp
trunk/src/FriendListCtrl.cpp
trunk/src/HTTPDownloadDlg.cpp
trunk/src/IPFilter.cpp
trunk/src/KnownFile.cpp
trunk/src/KnownFileList.cpp
trunk/src/ListenSocket.cpp
trunk/src/MD5Sum.cpp
trunk/src/MuleListCtrl.cpp
trunk/src/MuleNotebook.cpp
trunk/src/NewFunctions.cpp
trunk/src/NewSockets.cpp
trunk/src/OScopeCtrl.cpp
trunk/src/PPgDirectories.cpp
trunk/src/PPgSourcesDropping.cpp
trunk/src/PartFile.cpp
trunk/src/Preferences.cpp
trunk/src/PreferencesDlg.cpp
trunk/src/Preview.cpp
trunk/src/QueueListCtrl.cpp
trunk/src/SafeFile.cpp
trunk/src/SearchDlg.cpp
trunk/src/SearchList.cpp
trunk/src/ServerList.cpp
trunk/src/ServerListCtrl.cpp
trunk/src/ServerSocket.cpp
trunk/src/ServerWnd.cpp
trunk/src/SharedFileList.cpp
trunk/src/SharedFilesCtrl.cpp
trunk/src/SharedFilesWnd.cpp
trunk/src/StatisticsDlg.cpp
trunk/src/SysTray.cpp
trunk/src/TransferWnd.cpp
trunk/src/UDPSocket.cpp
trunk/src/UploadClient.cpp
trunk/src/UploadListCtrl.cpp
trunk/src/UploadQueue.cpp
trunk/src/VerifyUpload.cpp
trunk/src/filemem.cpp
trunk/src/ldaemon.cpp
trunk/src/listctrl.cpp
trunk/src/mfc.cpp
trunk/src/muuli_wdr.cpp
trunk/src/otherfunctions.cpp
trunk/src/packets.cpp
trunk/src/resource.cpp
trunk/src/server.cpp
trunk/src/sockets.cpp
trunk/src/splash.cpp
trunk/src/xmule-headers.h
trunk/src/xmule.cpp
trunk/src/xmuleDlg.cpp
trunk/xLibs/DynPrefs/DynPrefsCtrl.h
trunk/xLibs/DynPrefs/DynamicPreferencesCtrl.cpp
trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemBase.cpp
trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemNode.cpp
trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemRoot.cpp
trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemWindow.cpp
trunk/xLibs/wxTreeMultiCtrl/wxTreeMultiCtrl.cpp
trunk/xMule.sln
trunk/xMule.vcproj
Added Paths:
-----------
trunk/src/xmule-headers.cpp
trunk/xLibs/xLibs.vcproj
Modified: trunk/src/AddFileThread.cpp
===================================================================
--- trunk/src/AddFileThread.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/AddFileThread.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "AddFileThread.h" // Module's Prototype(s)
#include "KnownFile.h" // CKnownFile
Modified: trunk/src/AddFriend.cpp
===================================================================
--- trunk/src/AddFriend.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/AddFriend.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "AddFriend.h" // Module's Prototype(s)
Modified: trunk/src/BarShader.cpp
===================================================================
--- trunk/src/BarShader.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/BarShader.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "BarShader.h" // Module's Prototype(s)
#include "wintypes.h" // x::DWORD
Modified: trunk/src/BaseClient.cpp
===================================================================
--- trunk/src/BaseClient.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/BaseClient.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: trunk/src/CFile.cpp
===================================================================
--- trunk/src/CFile.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/CFile.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include <errno.h>
#include <string.h>
Modified: trunk/src/CatDialog.cpp
===================================================================
--- trunk/src/CatDialog.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/CatDialog.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "CatDialog.h" // Module's Prototype(s)
Modified: trunk/src/ChatWnd.cpp
===================================================================
--- trunk/src/ChatWnd.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ChatWnd.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ChatWnd.h" // Module's Prototype(s)
#include "muuli_wdr.h" // messageDlg
Modified: trunk/src/ClientCredits.cpp
===================================================================
--- trunk/src/ClientCredits.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ClientCredits.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ClientCredits.h" // Module's Prototype(s)
#include "NewFunctions.h" // MAP
Modified: trunk/src/ClientDetailDialog.cpp
===================================================================
--- trunk/src/ClientDetailDialog.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ClientDetailDialog.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ClientDetailDialog.h" // Module's Prototype(s)
Modified: trunk/src/ClientList.cpp
===================================================================
--- trunk/src/ClientList.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ClientList.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ClientList.h" // Module's Prototype(s)
Modified: trunk/src/ClientUDPSocket.cpp
===================================================================
--- trunk/src/ClientUDPSocket.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ClientUDPSocket.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ClientUDPSocket.h" // Module's Protype(s)
Modified: trunk/src/CommentDialog.cpp
===================================================================
--- trunk/src/CommentDialog.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/CommentDialog.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "CommentDialog.h" // Interface's Prototype
Modified: trunk/src/CommentDialogLst.cpp
===================================================================
--- trunk/src/CommentDialogLst.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/CommentDialogLst.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "CommentDialogLst.h"
#include "muuli_wdr.h"
Modified: trunk/src/CryptoXMpp.cpp
===================================================================
--- trunk/src/CryptoXMpp.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/CryptoXMpp.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -1,3 +1,5 @@
+#include "xmule-headers.h"
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif // HAVE_CONFIG_H
Modified: trunk/src/DownloadClient.cpp
===================================================================
--- trunk/src/DownloadClient.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/DownloadClient.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "updownclient.h"
#include "ClientList.h" // CClientList
Modified: trunk/src/DownloadListCtrl.cpp
===================================================================
--- trunk/src/DownloadListCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/DownloadListCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: trunk/src/DownloadQueue.cpp
===================================================================
--- trunk/src/DownloadQueue.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/DownloadQueue.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "DownloadQueue.h"
#include "ClientList.h"
Modified: trunk/src/ED2KLink.cpp
===================================================================
--- trunk/src/ED2KLink.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ED2KLink.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ED2KLink.h"
#include "otherfunctions.h"
Modified: trunk/src/ED2KLinkParser.cpp
===================================================================
--- trunk/src/ED2KLinkParser.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ED2KLinkParser.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,6 +16,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#include "xmule-headers.h"
+
#include <iostream> // std::cout, std::endl
#include <string> // std::string
@@ -27,8 +29,6 @@
using std::cout;
using std::endl;
-static const char* VERSION = "2.0";
-
void AddLink(const char* ed2klink)
{
FILE *ed2kfile;
Modified: trunk/src/EMSocket.cpp
===================================================================
--- trunk/src/EMSocket.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/EMSocket.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "EMSocket.h"
#include "opcodes.h"
Modified: trunk/src/EditServerListDlg.cpp
===================================================================
--- trunk/src/EditServerListDlg.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/EditServerListDlg.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "EditServerListDlg.h"
Modified: trunk/src/FileDetailDialog.cpp
===================================================================
--- trunk/src/FileDetailDialog.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/FileDetailDialog.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "CommentDialogLst.h"
#include "FileDetailDialog.h"
Modified: trunk/src/FlowChart.cpp
===================================================================
--- trunk/src/FlowChart.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/FlowChart.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "FlowChart.h" // this Interface's Prototype
Modified: trunk/src/Friend.cpp
===================================================================
--- trunk/src/Friend.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/Friend.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "Friend.h"
#include "packets.h"
Modified: trunk/src/FriendList.cpp
===================================================================
--- trunk/src/FriendList.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/FriendList.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "wintypes.h"
#include "FriendList.h"
Modified: trunk/src/FriendListCtrl.cpp
===================================================================
--- trunk/src/FriendListCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/FriendListCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "FriendListCtrl.h" // Interface Declarations
#include "AddFriend.h"
Modified: trunk/src/HTTPDownloadDlg.cpp
===================================================================
--- trunk/src/HTTPDownloadDlg.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/HTTPDownloadDlg.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "wintypes.h"
#include "xmule.h"
Modified: trunk/src/IPFilter.cpp
===================================================================
--- trunk/src/IPFilter.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/IPFilter.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "IPFilter.h"
#include "otherfunctions.h"
Modified: trunk/src/KnownFile.cpp
===================================================================
--- trunk/src/KnownFile.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/KnownFile.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "CMemFile.h" // CMemFile
#include "KnownFile.h"
Modified: trunk/src/KnownFileList.cpp
===================================================================
--- trunk/src/KnownFileList.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/KnownFileList.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "KnownFileList.h"
#include "KnownFile.h"
Modified: trunk/src/ListenSocket.cpp
===================================================================
--- trunk/src/ListenSocket.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ListenSocket.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ClientList.h"
#include "DownloadQueue.h"
Modified: trunk/src/MD5Sum.cpp
===================================================================
--- trunk/src/MD5Sum.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/MD5Sum.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,6 +16,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#include "xmule-headers.h"
+
#include "MD5Sum.h" // MD5Sum
#include <sstream>
@@ -407,4 +409,3 @@
for (i = 0 ; i < len ; i++)
((char *) output) [i] = (char) value;
}
-
Modified: trunk/src/MuleListCtrl.cpp
===================================================================
--- trunk/src/MuleListCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/MuleListCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "MuleListCtrl.h" // Interface's Prototype
#include "opcodes.h" // MP_LISTCOL_1
Modified: trunk/src/MuleNotebook.cpp
===================================================================
--- trunk/src/MuleNotebook.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/MuleNotebook.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "MuleNotebook.h" // Interface's Prototype
Modified: trunk/src/NewFunctions.cpp
===================================================================
--- trunk/src/NewFunctions.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/NewFunctions.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "xmule.h"
#include "ClientCredits.h"
Modified: trunk/src/NewSockets.cpp
===================================================================
--- trunk/src/NewSockets.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/NewSockets.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "NewSockets.h" // Interface's Prototype
Modified: trunk/src/OScopeCtrl.cpp
===================================================================
--- trunk/src/OScopeCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/OScopeCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "OScopeCtrl.h"
#include "wintypes.h"
Modified: trunk/src/PPgDirectories.cpp
===================================================================
--- trunk/src/PPgDirectories.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/PPgDirectories.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "PPgDirectories.h"
#include "otherfunctions.h"
Modified: trunk/src/PPgSourcesDropping.cpp
===================================================================
--- trunk/src/PPgSourcesDropping.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/PPgSourcesDropping.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "PPgSourcesDropping.h"
#include "Preferences.h" // CPreferences
Modified: trunk/src/PartFile.cpp
===================================================================
--- trunk/src/PartFile.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/PartFile.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "PartFile.h" // Module's Protype(s)
#include "AddFileThread.h" // CAddFileThread
Modified: trunk/src/Preferences.cpp
===================================================================
--- trunk/src/Preferences.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/Preferences.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "Preferences.h"
#include "opcodes.h"
Modified: trunk/src/PreferencesDlg.cpp
===================================================================
--- trunk/src/PreferencesDlg.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/PreferencesDlg.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "PreferencesDlg.h" // Interface's Prototype
#include "PPgDirectories.h" // CPPgDirectories
Modified: trunk/src/Preview.cpp
===================================================================
--- trunk/src/Preview.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/Preview.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "Preview.h"
#include "xmule.h"
Modified: trunk/src/QueueListCtrl.cpp
===================================================================
--- trunk/src/QueueListCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/QueueListCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "QueueListCtrl.h" // Interface Declarations
#include "ChatWnd.h"
Modified: trunk/src/SafeFile.cpp
===================================================================
--- trunk/src/SafeFile.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/SafeFile.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "wintypes.h"
#include "SafeFile.h"
Modified: trunk/src/SearchDlg.cpp
===================================================================
--- trunk/src/SearchDlg.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/SearchDlg.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "SearchDlg.h" // Interface declarations.
#include "SearchList.h"
Modified: trunk/src/SearchList.cpp
===================================================================
--- trunk/src/SearchList.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/SearchList.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "SearchList.h"
#include "muuli_wdr.h"
Modified: trunk/src/ServerList.cpp
===================================================================
--- trunk/src/ServerList.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ServerList.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: trunk/src/ServerListCtrl.cpp
===================================================================
--- trunk/src/ServerListCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ServerListCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ServerListCtrl.h"
#include "DownloadQueue.h"
Modified: trunk/src/ServerSocket.cpp
===================================================================
--- trunk/src/ServerSocket.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ServerSocket.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ServerSocket.h" // Needed for this Interface's Prototype
#include "PartFile.h" // Needed for CPartFile::GetStatus
Modified: trunk/src/ServerWnd.cpp
===================================================================
--- trunk/src/ServerWnd.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ServerWnd.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ServerWnd.h"
#include "HTTPDownloadDlg.h"
Modified: trunk/src/SharedFileList.cpp
===================================================================
--- trunk/src/SharedFileList.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/SharedFileList.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "SharedFileList.h" // Module's Prototype(s)
#include "AddFileThread.h" // CAddFileThread
Modified: trunk/src/SharedFilesCtrl.cpp
===================================================================
--- trunk/src/SharedFilesCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/SharedFilesCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "SharedFilesCtrl.h" // Interface Declarations
#include "CommentDialog.h"
Modified: trunk/src/SharedFilesWnd.cpp
===================================================================
--- trunk/src/SharedFilesWnd.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/SharedFilesWnd.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "SharedFilesWnd.h" // Interface Declarations
#include "KnownFileList.h" // CKnownFileList
Modified: trunk/src/StatisticsDlg.cpp
===================================================================
--- trunk/src/StatisticsDlg.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/StatisticsDlg.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "StatisticsDlg.h"
#include "ClientList.h"
Modified: trunk/src/SysTray.cpp
===================================================================
--- trunk/src/SysTray.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/SysTray.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -17,10 +17,10 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// TODO: Need to re-imp systray
+
+#include "xmule-headers.h"
+
#if 0
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
#include "SysTray.h" // Interface's Prototype
@@ -813,4 +813,3 @@
#endif // !__NOGTK__
#endif
-
Modified: trunk/src/TransferWnd.cpp
===================================================================
--- trunk/src/TransferWnd.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/TransferWnd.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "TransferWnd.h"
#include "CatDialog.h"
Modified: trunk/src/UDPSocket.cpp
===================================================================
--- trunk/src/UDPSocket.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/UDPSocket.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "UDPSocket.h"
#include "DownloadQueue.h"
Modified: trunk/src/UploadClient.cpp
===================================================================
--- trunk/src/UploadClient.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/UploadClient.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ClientCredits.h" // CClientCredits
#include "ClientUDPSocket.h"
Modified: trunk/src/UploadListCtrl.cpp
===================================================================
--- trunk/src/UploadListCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/UploadListCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "UploadListCtrl.h"
#include "ChatWnd.h"
Modified: trunk/src/UploadQueue.cpp
===================================================================
--- trunk/src/UploadQueue.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/UploadQueue.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "UploadQueue.h" // Module's Protype(s)
#include "ClientCredits.h" // CClientCredits
Modified: trunk/src/VerifyUpload.cpp
===================================================================
--- trunk/src/VerifyUpload.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/VerifyUpload.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ClientList.h"
#include "ListenSocket.h" // CClientReqSocket
Modified: trunk/src/filemem.cpp
===================================================================
--- trunk/src/filemem.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/filemem.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "CMemFile.h"
#include "wintypes.h" // wxByte
Modified: trunk/src/ldaemon.cpp
===================================================================
--- trunk/src/ldaemon.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/ldaemon.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "ldaemon.h" // Interface's Prototype
#include "xmule.h" // theApp
Modified: trunk/src/listctrl.cpp
===================================================================
--- trunk/src/listctrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/listctrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -12,6 +12,8 @@
// headers
// ----------------------------------------------------------------------------
+#include "xmule-headers.h"
+
#include "listctrl.h" // Interface Declarations
#include "wx/dynarray.h"
#include "wx/dcscreen.h" // wxDC?
Modified: trunk/src/mfc.cpp
===================================================================
--- trunk/src/mfc.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/mfc.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,8 +16,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "mfc.h"
Modified: trunk/src/muuli_wdr.cpp
===================================================================
--- trunk/src/muuli_wdr.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/muuli_wdr.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "muuli_wdr.h"
#include "wintypes.h"
Modified: trunk/src/otherfunctions.cpp
===================================================================
--- trunk/src/otherfunctions.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/otherfunctions.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "otherfunctions.h"
#include "PartFile.h"
Modified: trunk/src/packets.cpp
===================================================================
--- trunk/src/packets.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/packets.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "packets.h"
#include "otherfunctions.h"
Modified: trunk/src/resource.cpp
===================================================================
--- trunk/src/resource.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/resource.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include <wx/filesys.h>
#include <wx/fs_mem.h>
Modified: trunk/src/server.cpp
===================================================================
--- trunk/src/server.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/server.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "server.h"
#include "opcodes.h"
Modified: trunk/src/sockets.cpp
===================================================================
--- trunk/src/sockets.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/sockets.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include "sockets.h"
#include "ListenSocket.h"
Modified: trunk/src/splash.cpp
===================================================================
--- trunk/src/splash.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/splash.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#include <wx/filesys.h>
#include <wx/fs_mem.h>
Added: trunk/src/xmule-headers.cpp
===================================================================
--- trunk/src/xmule-headers.cpp (rev 0)
+++ trunk/src/xmule-headers.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -0,0 +1 @@
+#include "xmule-headers.h"
Modified: trunk/src/xmule-headers.h
===================================================================
--- trunk/src/xmule-headers.h 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/xmule-headers.h 2007-01-10 11:35:41 UTC (rev 125)
@@ -21,7 +21,9 @@
#ifndef __XMULE_HEADERS_H_
#define __XMULE_HEADERS_H_
-#define wX_PRECOMP 1
+
+#ifdef PRECOMP
+#define WX_PRECOMP 1
#include "wx/wx.h"
@@ -43,7 +45,6 @@
#include "DownloadQueue.h"
#include "ED2KLink.h"
#include "EditServerListDlg.h"
-//#include "eggtrayicon.h" // GTK2-Specific?
#include "EMSocket.h"
#include "endianswap.h"
#include "FileDetailDialog.h"
@@ -51,8 +52,6 @@
#include "Friend.h"
#include "FriendList.h"
#include "FriendListCtrl.h"
-//gtk2-funcs.h // GTK2-Specific?
-//gtkplugxembed.h // GTK2-Specific?
#include "HTTPDownloadDlg.h"
#include "IPFilter.h"
#include "KnownFile.h"
@@ -94,7 +93,6 @@
#include "SharedFilesWnd.h"
#include "sockets.h"
#include "StatisticsDlg.h"
-//#include "SysTray.h"
#include "TransferWnd.h"
#include "types.h"
#include "UDPSocket.h"
@@ -102,10 +100,11 @@
#include "UploadListCtrl.h"
#include "UploadQueue.h"
#include "wintypes.h"
-#include "xembed.h"
#include "xmule-headers.h"
#include "xmule.h"
#include "xmuleDlg.h"
#include "xmuleIPV4Address.h"
+#endif // PRECOMP
+
#endif // __XMULE_HEADERS_H_
Modified: trunk/src/xmule.cpp
===================================================================
--- trunk/src/xmule.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/xmule.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -790,21 +788,17 @@
// External helper function
wxColour GetColour(wxSystemColour what)
{
- static wxColour * _systemWindowColour = NULL;
- switch (what)
+ static wxColour* systemWindowColour = NULL;
+ if (what == wxSYS_COLOUR_WINDOW && !systemWindowColour)
{
- case wxSYS_COLOUR_WINDOW:
- if (!_systemWindowColour)
+ int red, green, blue;
+ if (!GetColourWidget(red, green, blue, wxGTK_WINDOW))
{
- int red, green, blue;
- if (!GetColourWidget(red, green, blue, wxGTK_WINDOW))
- {
- red = green = blue = 0x9c40;
- }
- _systemWindowColour = new wxColour(red >> SHIFT, green >> SHIFT, blue >> SHIFT);
+ red = green = blue = 0x9c40;
}
- return * _systemWindowColour;
+ systemWindowColour = new wxColour(red >> SHIFT, green >> SHIFT, blue >> SHIFT);
}
+ return *systemWindowColour;
}
void CxmuleApp::LoadCompatiblePrefs()
Modified: trunk/src/xmuleDlg.cpp
===================================================================
--- trunk/src/xmuleDlg.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/src/xmuleDlg.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -16,9 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifdef PRECOMP
- #include "xmule-headers.h"
-#endif
+#include "xmule-headers.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: trunk/xLibs/DynPrefs/DynPrefsCtrl.h
===================================================================
--- trunk/xLibs/DynPrefs/DynPrefsCtrl.h 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xLibs/DynPrefs/DynPrefsCtrl.h 2007-01-10 11:35:41 UTC (rev 125)
@@ -37,8 +37,7 @@
#ifndef _DYNPREFSCTRL_H
#define _DYNPREFSCTRL_H
-#include "wxTreeMultiCtrl/wxTreeMultiCtrl.h" // Needed for wxTreeMultiCtrl
-
+#include <wxTreeMultiCtrl/wxTreeMultiCtrl.h> // wxTreeMultiCtrl
#include <wx/xml/xml.h> // wxXmlNode
class DynamicPreferences;
Modified: trunk/xLibs/DynPrefs/DynamicPreferencesCtrl.cpp
===================================================================
--- trunk/xLibs/DynPrefs/DynamicPreferencesCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xLibs/DynPrefs/DynamicPreferencesCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -591,4 +591,3 @@
DynPrefs::Add(ControlName(name), pos);
}
-
Modified: trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemBase.cpp
===================================================================
--- trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemBase.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemBase.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -5,16 +5,7 @@
// Copyright: (c) Jorgen Bodde, based on wxWidgets License
/////////////////////////////////////////////////////////////////////////////
-
-/* for compilers that support precompilation
- includes "wx/wx.h" */
-
#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
#include "TreeMultiItemBase.h"
#include "TreeMultiItemNode.h"
Modified: trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemNode.cpp
===================================================================
--- trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemNode.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemNode.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -5,17 +5,7 @@
// Copyright: (c) Jorgen Bodde, based on wxWidgets License
/////////////////////////////////////////////////////////////////////////////
-
-/* for compilers that support precompilation
- includes "wx/wx.h" */
-
#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-
#include "TreeMultiItemNode.h"
#include "wx/arrimpl.cpp"
@@ -166,4 +156,3 @@
return value;
}
-
Modified: trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemRoot.cpp
===================================================================
--- trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemRoot.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemRoot.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -5,16 +5,7 @@
// Copyright: (c) Jorgen Bodde, based on wxWidgets License
/////////////////////////////////////////////////////////////////////////////
-
-/* for compilers that support precompilation
- includes "wx/wx.h" */
-
#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
#include "TreeMultiItemRoot.h"
/** TreeMultiItemRoot
@@ -35,5 +26,3 @@
{
// TODO: Enter your destructor code here
}
-
-
Modified: trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemWindow.cpp
===================================================================
--- trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemWindow.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xLibs/wxTreeMultiCtrl/TreeMultiItemWindow.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -5,17 +5,8 @@
// Copyright: (c) Jorgen Bodde, based on wxWidgets License
/////////////////////////////////////////////////////////////////////////////
-/* for compilers that support precompilation
- includes "wx/wx.h" */
-
#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
#include "TreeMultiItemWindow.h"
-
#include <wx/window.h> // Needed for wxWindow
/** TreeMultiItemWindow
Modified: trunk/xLibs/wxTreeMultiCtrl/wxTreeMultiCtrl.cpp
===================================================================
--- trunk/xLibs/wxTreeMultiCtrl/wxTreeMultiCtrl.cpp 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xLibs/wxTreeMultiCtrl/wxTreeMultiCtrl.cpp 2007-01-10 11:35:41 UTC (rev 125)
@@ -5,18 +5,8 @@
// Copyright: (c) Jorgen Bodde, based on wxWidgets License
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "wxTreeMultiCtrl.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include <wx/settings.h>
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
#include "wxTreeMultiCtrl.h"
// two pics for the expand / collapse buttons
Added: trunk/xLibs/xLibs.vcproj
===================================================================
--- trunk/xLibs/xLibs.vcproj (rev 0)
+++ trunk/xLibs/xLibs.vcproj 2007-01-10 11:35:41 UTC (rev 125)
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="xLibs"
+ ProjectGUID="{CF9D0451-FAC6-46F2-B18A-8022A0A396DA}"
+ RootNamespace="xLibs"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="0"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\$(ProjectName)d.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="0"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="DynPrefs"
+ >
+ <File
+ RelativePath=".\DynPrefs\DynamicPreferences.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\DynPrefs\DynamicPreferencesCtrl.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\DynPrefs\DynPrefs.h"
+ >
+ </File>
+ <File
+ RelativePath=".\DynPrefs\DynPrefsCtrl.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="ini"
+ >
+ <File
+ RelativePath=".\ini\dictionary.c"
+ >
+ </File>
+ <File
+ RelativePath=".\ini\dictionary.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ini\iniparser.c"
+ >
+ </File>
+ <File
+ RelativePath=".\ini\iniparser.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ini\strlib.c"
+ >
+ </File>
+ <File
+ RelativePath=".\ini\strlib.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="wxTreeMultiCtrl"
+ >
+ <File
+ RelativePath=".\wxTreeMultiCtrl\TreeMultiItemBase.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\TreeMultiItemBase.h"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\TreeMultiItemNode.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\TreeMultiItemNode.h"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\TreeMultiItemRoot.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\TreeMultiItemRoot.h"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\TreeMultiItemWindow.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\TreeMultiItemWindow.h"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\wxTreeMultiCtrl.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\wxTreeMultiCtrl\wxTreeMultiCtrl.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="xIni"
+ >
+ <File
+ RelativePath=".\xIni\xIni.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\xIni\xIni.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="zlib"
+ >
+ <File
+ RelativePath=".\zlib\adler32.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\compress.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\crc32.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\crc32.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\deflate.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\deflate.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\gzio.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\infback.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\inffast.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\inffast.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\inffixed.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\inflate.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\inflate.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\inftrees.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\inftrees.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\trees.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\trees.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\uncompr.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\zconf.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\zconf.in.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\zlib.h"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\zutil.c"
+ >
+ </File>
+ <File
+ RelativePath=".\zlib\zutil.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: trunk/xMule.sln
===================================================================
--- trunk/xMule.sln 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xMule.sln 2007-01-10 11:35:41 UTC (rev 125)
@@ -2,7 +2,12 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xMule", "xMule.vcproj", "{4D54EE63-4331-471B-B413-C45E0650F009}"
+ ProjectSection(ProjectDependencies) = postProject
+ {CF9D0451-FAC6-46F2-B18A-8022A0A396DA} = {CF9D0451-FAC6-46F2-B18A-8022A0A396DA}
+ EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xLibs", "xLibs\xLibs.vcproj", "{CF9D0451-FAC6-46F2-B18A-8022A0A396DA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -13,6 +18,10 @@
{4D54EE63-4331-471B-B413-C45E0650F009}.Debug|Win32.Build.0 = Debug|Win32
{4D54EE63-4331-471B-B413-C45E0650F009}.Release|Win32.ActiveCfg = Release|Win32
{4D54EE63-4331-471B-B413-C45E0650F009}.Release|Win32.Build.0 = Release|Win32
+ {CF9D0451-FAC6-46F2-B18A-8022A0A396DA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CF9D0451-FAC6-46F2-B18A-8022A0A396DA}.Debug|Win32.Build.0 = Debug|Win32
+ {CF9D0451-FAC6-46F2-B18A-8022A0A396DA}.Release|Win32.ActiveCfg = Release|Win32
+ {CF9D0451-FAC6-46F2-B18A-8022A0A396DA}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/xMule.vcproj
===================================================================
--- trunk/xMule.vcproj 2007-01-10 09:55:14 UTC (rev 124)
+++ trunk/xMule.vcproj 2007-01-10 11:35:41 UTC (rev 125)
@@ -41,12 +41,14 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CRYPTOPP;__NOGTK__;__WXDEBUG__"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CRYPTOPP;__NOGTK__;__WXDEBUG__;PRECOMP"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- Warning...
[truncated message content] |
|
From: <av...@us...> - 2007-01-10 09:55:16
|
Revision: 124
http://svn.sourceforge.net/xmule/?rev=124&view=rev
Author: avivahl
Date: 2007-01-10 01:55:14 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Enabled compilation using the built-in Crypo++ again (was broken after the Win32-compatibility commit).
Modified Paths:
--------------
trunk/src/ClientCredits.cpp
trunk/src/ClientCredits.h
trunk/src/CryptoXMpp.cpp
trunk/src/CryptoXMpp.h
trunk/src/ServerList.cpp
trunk/src/packets.cpp
Modified: trunk/src/ClientCredits.cpp
===================================================================
--- trunk/src/ClientCredits.cpp 2007-01-10 09:54:53 UTC (rev 123)
+++ trunk/src/ClientCredits.cpp 2007-01-10 09:55:14 UTC (rev 124)
@@ -20,10 +20,6 @@
#include "xmule-headers.h"
#endif
-#ifdef HAVE_CONFIG_H
- #include <config.h>
-#endif // HAVE_CONFIG_H
-
#include "ClientCredits.h" // Module's Prototype(s)
#include "NewFunctions.h" // MAP
#include "opcodes.h" // CREDITFILE_VERSION
@@ -56,10 +52,7 @@
using std::hex;
using std::setw;
-//#if !HAVE_CRYPTOPP
-#if 0
- #include "CryptoXMpp.h"
-#else
+#ifdef HAVE_CRYPTOPP
#include <cryptopp/config.h>
#include <cryptopp/osrng.h>
#include <cryptopp/base64.h>
Modified: trunk/src/ClientCredits.h
===================================================================
--- trunk/src/ClientCredits.h 2007-01-10 09:54:53 UTC (rev 123)
+++ trunk/src/ClientCredits.h 2007-01-10 09:55:14 UTC (rev 124)
@@ -31,8 +31,7 @@
#include <config.h>
#endif // HAVE_CONFIG_H
-//#if !HAVE_CRYPTOPP
-#if 0
+#ifndef HAVE_CRYPTOPP
#include "CryptoXMpp.h"
#else
#include <cryptopp/cryptlib.h>
Modified: trunk/src/CryptoXMpp.cpp
===================================================================
--- trunk/src/CryptoXMpp.cpp 2007-01-10 09:54:53 UTC (rev 123)
+++ trunk/src/CryptoXMpp.cpp 2007-01-10 09:55:14 UTC (rev 124)
@@ -1,9 +1,8 @@
#ifdef HAVE_CONFIG_H
- #include "config.h"
+ #include <config.h>
#endif // HAVE_CONFIG_H
-//#if HAVE_CRYPTOPP != 1
-#if 0
+#ifndef HAVE_CRYPTOPP
#warning Compiling built-in cryptography support.
#warning If xMule behaves erratically, consider installing libcrypto++ and recompiling xMule.
@@ -9390,5 +9389,5 @@
Put(seed, seedSize);
}
-}
-#endif
+} // namespace CryptoXMpp
+#endif // !HAVE_CRYPTOPP
Modified: trunk/src/CryptoXMpp.h
===================================================================
--- trunk/src/CryptoXMpp.h 2007-01-10 09:54:53 UTC (rev 123)
+++ trunk/src/CryptoXMpp.h 2007-01-10 09:55:14 UTC (rev 124)
@@ -1,9 +1,11 @@
#ifndef _CRYPTOXMPP_H_
#define _CRYPTOXMPP_H_
-//#include "config.h"
-#if 0
-//#if (HAVE_CRYPTOPP != 1)
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif // HAVE_CONFIG_H
+
+#ifndef HAVE_CRYPTOPP
/*
Compilation Copyright (c) 1995-2003 by Wei Dai. All rights reserved.
This copyright applies only to this software distribution package
@@ -9336,5 +9338,5 @@
}
#endif // CRYPTOPP_RANDPOOL_H
-#endif // HAVE_CRYPTOPP != 1
+#endif // !HAVE_CRYPTOPP
#endif // _CRYPTOXMPP_H_
Modified: trunk/src/ServerList.cpp
===================================================================
--- trunk/src/ServerList.cpp 2007-01-10 09:54:53 UTC (rev 123)
+++ trunk/src/ServerList.cpp 2007-01-10 09:55:14 UTC (rev 124)
@@ -59,8 +59,8 @@
#if defined(HAVE_SYS_PARAM_H)
#include <sys/param.h>
#endif
-//#if !HAVE_CRYPTOPP
-#if 0
+
+#ifndef HAVE_CRYPTOPP
#include "CryptoXMpp.h"
#else
#include <cryptopp/cryptlib.h>
Modified: trunk/src/packets.cpp
===================================================================
--- trunk/src/packets.cpp 2007-01-10 09:54:53 UTC (rev 123)
+++ trunk/src/packets.cpp 2007-01-10 09:55:14 UTC (rev 124)
@@ -34,8 +34,7 @@
#include <config.h>
#endif // HAVE_CONFIG_H
-//#if !HAVE_CRYPTOPP
-#if 0
+#ifndef HAVE_CRYPTOPP
#include "CryptoXMpp.h"
#else
#include <cryptopp/cryptlib.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-10 09:54:53
|
Revision: 123
http://svn.sourceforge.net/xmule/?rev=123&view=rev
Author: avivahl
Date: 2007-01-10 01:54:53 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Added HAVE_CRYPTOPP to the preprocessor definitions.
Modified Paths:
--------------
trunk/xMule.vcproj
Modified: trunk/xMule.vcproj
===================================================================
--- trunk/xMule.vcproj 2007-01-10 09:52:32 UTC (rev 122)
+++ trunk/xMule.vcproj 2007-01-10 09:54:53 UTC (rev 123)
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__NOGTK__;__WXDEBUG__"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CRYPTOPP;__NOGTK__;__WXDEBUG__"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__NOGTK__"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CRYPTOPP;__NOGTK__"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-10 09:52:33
|
Revision: 122
http://svn.sourceforge.net/xmule/?rev=122&view=rev
Author: avivahl
Date: 2007-01-10 01:52:32 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Woops, fixed.
Modified Paths:
--------------
trunk/src/BarShader.cpp
Modified: trunk/src/BarShader.cpp
===================================================================
--- trunk/src/BarShader.cpp 2007-01-10 09:42:32 UTC (rev 121)
+++ trunk/src/BarShader.cpp 2007-01-10 09:52:32 UTC (rev 122)
@@ -16,11 +16,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
#ifdef PRECOMP
#include "xmule-headers.h"
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-10 09:42:33
|
Revision: 121
http://svn.sourceforge.net/xmule/?rev=121&view=rev
Author: avivahl
Date: 2007-01-10 01:42:32 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Updated copyright headers to 2007.
Modified Paths:
--------------
trunk/src/AddFileThread.cpp
trunk/src/AddFileThread.h
trunk/src/AddFriend.cpp
trunk/src/AddFriend.h
trunk/src/BarShader.cpp
trunk/src/BarShader.h
trunk/src/BaseClient.cpp
trunk/src/CFile.cpp
trunk/src/CFile.h
trunk/src/CMemFile.h
trunk/src/CatDialog.cpp
trunk/src/CatDialog.h
trunk/src/ChatWnd.cpp
trunk/src/ChatWnd.h
trunk/src/ClientCredits.cpp
trunk/src/ClientCredits.h
trunk/src/ClientDetailDialog.cpp
trunk/src/ClientDetailDialog.h
trunk/src/ClientList.cpp
trunk/src/ClientList.h
trunk/src/ClientUDPSocket.cpp
trunk/src/ClientUDPSocket.h
trunk/src/CommentDialog.cpp
trunk/src/CommentDialog.h
trunk/src/CommentDialogLst.cpp
trunk/src/CommentDialogLst.h
trunk/src/DownloadClient.cpp
trunk/src/DownloadListCtrl.cpp
trunk/src/DownloadListCtrl.h
trunk/src/DownloadQueue.cpp
trunk/src/DownloadQueue.h
trunk/src/ED2KLink.cpp
trunk/src/ED2KLink.h
trunk/src/ED2KLinkParser.cpp
trunk/src/EMSocket.cpp
trunk/src/EMSocket.h
trunk/src/EditServerListDlg.cpp
trunk/src/EditServerListDlg.h
trunk/src/FileDetailDialog.cpp
trunk/src/FileDetailDialog.h
trunk/src/FlowChart.cpp
trunk/src/FlowChart.h
trunk/src/Friend.cpp
trunk/src/Friend.h
trunk/src/FriendList.cpp
trunk/src/FriendList.h
trunk/src/FriendListCtrl.cpp
trunk/src/FriendListCtrl.h
trunk/src/HTTPDownloadDlg.cpp
trunk/src/HTTPDownloadDlg.h
trunk/src/IPFilter.cpp
trunk/src/IPFilter.h
trunk/src/KnownFile.cpp
trunk/src/KnownFile.h
trunk/src/KnownFileList.cpp
trunk/src/KnownFileList.h
trunk/src/ListenSocket.cpp
trunk/src/ListenSocket.h
trunk/src/MD5Sum.cpp
trunk/src/MD5Sum.h
trunk/src/MapKey.h
trunk/src/MuleListCtrl.cpp
trunk/src/MuleListCtrl.h
trunk/src/MuleNotebook.cpp
trunk/src/MuleNotebook.h
trunk/src/NewFunctions.cpp
trunk/src/NewFunctions.h
trunk/src/NewSockets.cpp
trunk/src/NewSockets.h
trunk/src/OScopeCtrl.cpp
trunk/src/OScopeCtrl.h
trunk/src/PPgDirectories.cpp
trunk/src/PPgDirectories.h
trunk/src/PPgSourcesDropping.cpp
trunk/src/PPgSourcesDropping.h
trunk/src/PartFile.cpp
trunk/src/PartFile.h
trunk/src/Preferences.cpp
trunk/src/Preferences.h
trunk/src/PreferencesDlg.cpp
trunk/src/PreferencesDlg.h
trunk/src/Preview.cpp
trunk/src/Preview.h
trunk/src/QueueListCtrl.cpp
trunk/src/QueueListCtrl.h
trunk/src/SafeFile.cpp
trunk/src/SafeFile.h
trunk/src/SearchDlg.cpp
trunk/src/SearchDlg.h
trunk/src/SearchList.cpp
trunk/src/SearchList.h
trunk/src/ServerList.cpp
trunk/src/ServerList.h
trunk/src/ServerListCtrl.cpp
trunk/src/ServerListCtrl.h
trunk/src/ServerSocket.cpp
trunk/src/ServerSocket.h
trunk/src/ServerWnd.cpp
trunk/src/ServerWnd.h
trunk/src/SharedFileList.cpp
trunk/src/SharedFileList.h
trunk/src/SharedFilesCtrl.cpp
trunk/src/SharedFilesCtrl.h
trunk/src/SharedFilesWnd.cpp
trunk/src/SharedFilesWnd.h
trunk/src/StatisticsDlg.cpp
trunk/src/StatisticsDlg.h
trunk/src/SysTray.cpp
trunk/src/SysTray.h
trunk/src/TransferWnd.cpp
trunk/src/TransferWnd.h
trunk/src/UDPSocket.cpp
trunk/src/UDPSocket.h
trunk/src/UploadClient.cpp
trunk/src/UploadListCtrl.cpp
trunk/src/UploadListCtrl.h
trunk/src/UploadQueue.cpp
trunk/src/UploadQueue.h
trunk/src/VerifyUpload.cpp
trunk/src/endianswap.h
trunk/src/filemem.cpp
trunk/src/gtk2-funcs.c
trunk/src/inetdownload.h
trunk/src/ldaemon.cpp
trunk/src/ldaemon.h
trunk/src/mfc.cpp
trunk/src/mfc.h
trunk/src/muuli_wdr.cpp
trunk/src/muuli_wdr.h
trunk/src/opcodes.h
trunk/src/otherfunctions.cpp
trunk/src/otherfunctions.h
trunk/src/otherstructs.h
trunk/src/packets.cpp
trunk/src/packets.h
trunk/src/resource.cpp
trunk/src/resource.h
trunk/src/server.cpp
trunk/src/server.h
trunk/src/sockets.cpp
trunk/src/sockets.h
trunk/src/splash.cpp
trunk/src/types.h
trunk/src/updownclient.h
trunk/src/wintypes.h
trunk/src/xmule-headers.h
trunk/src/xmule.cpp
trunk/src/xmule.h
trunk/src/xmuleDlg.cpp
trunk/src/xmuleDlg.h
trunk/src/xmuleIPV4Address.h
trunk/xLibs/xIni/xIni.cpp
trunk/xLibs/xIni/xIni.h
Modified: trunk/src/AddFileThread.cpp
===================================================================
--- trunk/src/AddFileThread.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/AddFileThread.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/AddFileThread.h
===================================================================
--- trunk/src/AddFileThread.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/AddFileThread.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _ADDFILETHREAD_H_
#define _ADDFILETHREAD_H_
Modified: trunk/src/AddFriend.cpp
===================================================================
--- trunk/src/AddFriend.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/AddFriend.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/AddFriend.h
===================================================================
--- trunk/src/AddFriend.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/AddFriend.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _ADDFRIEND_H_
#define _ADDFRIEND_H_
Modified: trunk/src/BarShader.cpp
===================================================================
--- trunk/src/BarShader.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/BarShader.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,13 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
#ifdef PRECOMP
#include "xmule-headers.h"
#endif
Modified: trunk/src/BarShader.h
===================================================================
--- trunk/src/BarShader.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/BarShader.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _BARSHADER_H_
#define _BARSHADER_H_
Modified: trunk/src/BaseClient.cpp
===================================================================
--- trunk/src/BaseClient.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/BaseClient.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,22 +1,20 @@
-// This file is a part of the xMule Project.
+// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith (hop...@gm... / http://www.xmule.ws/)
-// DSA-1024 Fingerprint: 10A0 6372 9092 85A2 BB7F 907B CB8B 654B E33B F1ED
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
-//Copyright (C)2002 Merkur ( me...@us... / http://www.xmule-project.net )
-//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/CFile.cpp
===================================================================
--- trunk/src/CFile.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CFile.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/CFile.h
===================================================================
--- trunk/src/CFile.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CFile.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _CFILE_H_
#define _CFILE_H_
Modified: trunk/src/CMemFile.h
===================================================================
--- trunk/src/CMemFile.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CMemFile.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _CMEMFILE_H_
#define _CMEMFILE_H_
Modified: trunk/src/CatDialog.cpp
===================================================================
--- trunk/src/CatDialog.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CatDialog.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/CatDialog.h
===================================================================
--- trunk/src/CatDialog.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CatDialog.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _CATDIALOG_H_
#define _CATDIALOG_H_
Modified: trunk/src/ChatWnd.cpp
===================================================================
--- trunk/src/ChatWnd.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ChatWnd.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/ChatWnd.h
===================================================================
--- trunk/src/ChatWnd.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ChatWnd.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _CHATWND_H_
#define _CHATWND_H_
Modified: trunk/src/ClientCredits.cpp
===================================================================
--- trunk/src/ClientCredits.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ClientCredits.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/ClientCredits.h
===================================================================
--- trunk/src/ClientCredits.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ClientCredits.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _CLIENTCREDITS_H_
#define _CLIENTCREDITS_H_
Modified: trunk/src/ClientDetailDialog.cpp
===================================================================
--- trunk/src/ClientDetailDialog.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ClientDetailDialog.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/ClientDetailDialog.h
===================================================================
--- trunk/src/ClientDetailDialog.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ClientDetailDialog.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _CLIENTDETAILDIALOG_H_
#define _CLIENTDETAILDIALOG_H_
Modified: trunk/src/ClientList.cpp
===================================================================
--- trunk/src/ClientList.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ClientList.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/ClientList.h
===================================================================
--- trunk/src/ClientList.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ClientList.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef CLIENTLIST_H
#define CLIENTLIST_H
Modified: trunk/src/ClientUDPSocket.cpp
===================================================================
--- trunk/src/ClientUDPSocket.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ClientUDPSocket.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/ClientUDPSocket.h
===================================================================
--- trunk/src/ClientUDPSocket.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ClientUDPSocket.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef CLIENTUDP_H
#define CLIENTUDP_H
Modified: trunk/src/CommentDialog.cpp
===================================================================
--- trunk/src/CommentDialog.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CommentDialog.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/CommentDialog.h
===================================================================
--- trunk/src/CommentDialog.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CommentDialog.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _COMMENTDIALOG_H_
#define _COMMENTDIALOG_H_
Modified: trunk/src/CommentDialogLst.cpp
===================================================================
--- trunk/src/CommentDialogLst.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CommentDialogLst.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/CommentDialogLst.h
===================================================================
--- trunk/src/CommentDialogLst.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/CommentDialogLst.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef COMMENTDLGLIST_H
#define COMMENTDLGLIST_H
Modified: trunk/src/DownloadClient.cpp
===================================================================
--- trunk/src/DownloadClient.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/DownloadClient.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/DownloadListCtrl.cpp
===================================================================
--- trunk/src/DownloadListCtrl.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/DownloadListCtrl.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/DownloadListCtrl.h
===================================================================
--- trunk/src/DownloadListCtrl.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/DownloadListCtrl.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _DOWNLOADLISTCTRL_H_
#define _DOWNLOADLISTCTRL_H_
Modified: trunk/src/DownloadQueue.cpp
===================================================================
--- trunk/src/DownloadQueue.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/DownloadQueue.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/DownloadQueue.h
===================================================================
--- trunk/src/DownloadQueue.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/DownloadQueue.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _DOWNLOADQUEUE_H_
#define _DOWNLOADQUEUE_H_
Modified: trunk/src/ED2KLink.cpp
===================================================================
--- trunk/src/ED2KLink.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ED2KLink.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/ED2KLink.h
===================================================================
--- trunk/src/ED2KLink.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ED2KLink.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _ED2KLINK_H_
#define _ED2KLINK_H_
Modified: trunk/src/ED2KLinkParser.cpp
===================================================================
--- trunk/src/ED2KLinkParser.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/ED2KLinkParser.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <iostream> // std::cout, std::endl
#include <string> // std::string
Modified: trunk/src/EMSocket.cpp
===================================================================
--- trunk/src/EMSocket.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/EMSocket.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/EMSocket.h
===================================================================
--- trunk/src/EMSocket.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/EMSocket.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _EMSOCKET_H_
#define _EMSOCKET_H_
Modified: trunk/src/EditServerListDlg.cpp
===================================================================
--- trunk/src/EditServerListDlg.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/EditServerListDlg.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef PRECOMP
#include "xmule-headers.h"
Modified: trunk/src/EditServerListDlg.h
===================================================================
--- trunk/src/EditServerListDlg.h 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/EditServerListDlg.h 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _EDITSERVERLISTDLG_H_
#define _EDITSERVERLISTDLG_H_
Modified: trunk/src/FileDetailDialog.cpp
===================================================================
--- trunk/src/FileDetailDialog.cpp 2007-01-10 09:07:23 UTC (rev 120)
+++ trunk/src/FileDetailDialog.cpp 2007-01-10 09:42:32 UTC (rev 121)
@@ -1,11 +1,11 @@
// The xMule Project - A Peer-2-Peer File Sharing Program
//
-// Copyright (C) 2003-2006 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
+// Copyright (C) 2003-2007 Theodore R. Smith ( hop...@gm... / http://www.xmule.ws/ )
// Copyright (C) 2002 Merkur ( de...@em... / http://www.emule-project.net )
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of Version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
+// modify it under the terms of Version 2 of the GNU General Public License
+// as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifd...
[truncated message content] |
|
From: <av...@us...> - 2007-01-10 09:07:23
|
Revision: 120
http://svn.sourceforge.net/xmule/?rev=120&view=rev
Author: avivahl
Date: 2007-01-10 01:07:23 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Update project file to use relative paths for libs/include directories.
Modified Paths:
--------------
trunk/xMule.vcproj
Modified: trunk/xMule.vcproj
===================================================================
--- trunk/xMule.vcproj 2007-01-10 09:05:21 UTC (rev 119)
+++ trunk/xMule.vcproj 2007-01-10 09:07:23 UTC (rev 120)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="C:\xMuleTrunk\xLibs;"C:\wxMSW-2.8.0\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__NOGTK__;__WXDEBUG__"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib wsock32.lib cryptlib.lib"
OutputFile="$(OutDir)\$(ProjectName)-Debug.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""C:\wxMSW-2.8.0\lib\vc_lib";C:\xMuleTrunk\xLibs\cryptopp\Win32\output\debug"
+ AdditionalLibraryDirectories=""C:\wxMSW-2.8.0\lib\vc_lib";"$(SolutionDir)xLibs\cryptopp\Win32\output\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="C:\xMuleTrunk\xLibs;"C:\wxMSW-2.8.0\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)xLibs";"C:\wxMSW-2.8.0\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__NOGTK__"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -140,7 +140,7 @@
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib wsock32.lib cryptlib.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\wxMSW-2.8.0\lib\vc_lib;C:\xMuleTrunk\xLibs\cryptopp\Win32\output\release"
+ AdditionalLibraryDirectories=""C:\wxMSW-2.8.0\lib\vc_lib";"$(SolutionDir)xLibs\cryptopp\Win32\output\$(ConfigurationName)""
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
@@ -600,6 +600,14 @@
>
</File>
</Filter>
+ <Filter
+ Name="xIni"
+ >
+ <File
+ RelativePath=".\xLibs\xIni\xIni.cpp"
+ >
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter
@@ -1050,6 +1058,14 @@
>
</File>
</Filter>
+ <Filter
+ Name="xIni"
+ >
+ <File
+ RelativePath=".\xLibs\xIni\xIni.h"
+ >
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-10 09:05:21
|
Revision: 119
http://svn.sourceforge.net/xmule/?rev=119&view=rev
Author: avivahl
Date: 2007-01-10 01:05:21 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Fixed compilation.
Modified Paths:
--------------
trunk/xLibs/xIni/xIni.cpp
trunk/xLibs/xIni/xIni.h
Modified: trunk/xLibs/xIni/xIni.cpp
===================================================================
--- trunk/xLibs/xIni/xIni.cpp 2007-01-10 08:34:47 UTC (rev 118)
+++ trunk/xLibs/xIni/xIni.cpp 2007-01-10 09:05:21 UTC (rev 119)
@@ -18,15 +18,9 @@
#include "xIni.h" // Interface declarations
#include <wx/defs.h> // wxWidgets types
-#include <wx/gdicmn.h> // wxRect
#include <wx/textfile.h> // wxTextFile
#include <wx/tokenzr.h> // wxStringTokenizer
-xIni::xIni(wxString const& FileName)
-{
- LoadIni(FileName);
-}
-
bool xIni::LoadFile(wxString const& FileName)
{
if (!wxFileExists(FileName))
@@ -42,7 +36,7 @@
for (wxInt32 i=0; i < NumLines; i++)
{
wxString Line = iniFile.GetLine(i);
- if ((Line.length() < 3)
+ if (Line.length() < 3)
{
continue;
}
@@ -107,7 +101,7 @@
}
iniFile.AddLine(KeyLine);
std::map<wxString, wxString>::const_iterator Iter = Keys.at(keyID).Values.begin();
- while (Iter != Keys.at(keyID).Values.end();)
+ while (Iter != Keys.at(keyID).Values.end())
{
wxString ValueLine = Iter->first + wxT('=') + Iter->second;
iniFile.AddLine(ValueLine);
@@ -195,12 +189,12 @@
{
return defValue;
}
-
- if (Keys.at(keyID).Values.count(ValueName) == 0)
+ std::map<wxString, wxString>::const_iterator Iter = Keys.at(keyID).Values.find(ValueName);
+ if (Iter == Keys.at(keyID).Values.end())
{
return defValue;
}
- return Keys.at(keyID).Values[ValueName];
+ return Iter->second;
}
wxInt32 xIni::GetValue(wxString const& KeyName, wxString const& ValueName, wxInt32 const defValue) const
Modified: trunk/xLibs/xIni/xIni.h
===================================================================
--- trunk/xLibs/xIni/xIni.h 2007-01-10 08:34:47 UTC (rev 118)
+++ trunk/xLibs/xIni/xIni.h 2007-01-10 09:05:21 UTC (rev 119)
@@ -18,14 +18,16 @@
#ifndef XINI_H
#define XINI_H
+#include <wx/gdicmn.h> // wxRect
+#include <wx/string.h> // wxString
+#include <map> // std::map
#include <vector> // std::vector
-#include <map> // std::map
class xIni
{
public:
xIni() { }
- xIni(wxString const& FileName);
+ xIni(wxString const& FileName) { LoadFile(FileName); }
~xIni() { Keys.clear(); }
bool LoadFile(wxString const& FileName); // Loads data from a .ini file
@@ -56,7 +58,7 @@
{
wxString KeyName;
// The two vectors below are parallel to each other in size (every ValueName has a Value!)
- std::map<wxString, wxString> Values
+ std::map<wxString, wxString> Values;
};
std::vector<Key> Keys;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-10 08:34:48
|
Revision: 118
http://svn.sourceforge.net/xmule/?rev=118&view=rev
Author: avivahl
Date: 2007-01-10 00:34:47 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Added my xIni class... The .ini file parser. This is the most up-to-date implementation (uses std::vector and std::map. This is the first step toward moving to a new (completely portable) xPrefs class to manage xMule's preferences and save/load them to a file.
Added Paths:
-----------
trunk/xLibs/xIni/
trunk/xLibs/xIni/xIni.cpp
trunk/xLibs/xIni/xIni.h
Added: trunk/xLibs/xIni/xIni.cpp
===================================================================
--- trunk/xLibs/xIni/xIni.cpp (rev 0)
+++ trunk/xLibs/xIni/xIni.cpp 2007-01-10 08:34:47 UTC (rev 118)
@@ -0,0 +1,280 @@
+// The xMule Project - A Peer-2-Peer File Sharing Program
+//
+// Copyright (C) 2004-2007 Avi Vahl ( avivahl [AT] gmail.com )
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of Version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+#include "xIni.h" // Interface declarations
+
+#include <wx/defs.h> // wxWidgets types
+#include <wx/gdicmn.h> // wxRect
+#include <wx/textfile.h> // wxTextFile
+#include <wx/tokenzr.h> // wxStringTokenizer
+
+xIni::xIni(wxString const& FileName)
+{
+ LoadIni(FileName);
+}
+
+bool xIni::LoadFile(wxString const& FileName)
+{
+ if (!wxFileExists(FileName))
+ {
+ return false;
+ }
+ wxTextFile iniFile(FileName);
+ iniFile.Open();
+
+ wxString KeyName, ValueName, Value;
+ wxUint32 pLeft, pRight;
+ wxInt32 NumLines=iniFile.GetLineCount();
+ for (wxInt32 i=0; i < NumLines; i++)
+ {
+ wxString Line = iniFile.GetLine(i);
+ if ((Line.length() < 3)
+ {
+ continue;
+ }
+ pLeft = Line.find_first_of(wxT("[="));
+ if (pLeft != wxString::npos)
+ {
+ switch (Line.GetChar(pLeft))
+ {
+ case wxT('['):
+ {
+ pRight = Line.find_last_of(wxT(']'));
+ if ((pRight != wxString::npos) && (pRight > pLeft))
+ {
+ KeyName=Line.substr(pLeft + 1, pRight - pLeft - 1);
+ AddKeyName(KeyName);
+ }
+ break;
+ }
+ case wxT('='):
+ {
+ ValueName = Line.substr(0, pLeft);
+ Value = Line.substr(pLeft + 1);
+ SetValue(KeyName, ValueName, Value);
+ break;
+ }
+ } // Close switch statement
+ } // Close if statement
+ } // Close for loop
+ iniFile.Close();
+ if (Keys.size())
+ {
+ return true; // Found valid data
+ }
+ return false; // Nothing was read
+}
+
+bool xIni::SaveFile(wxString const& FileName)
+{
+ if (wxFileExists(FileName))
+ {
+ if (!wxRemoveFile(FileName))
+ {
+ return false;
+ }
+ }
+ if (Keys.size() == 0)
+ {
+ return false; // Nothing to write
+ }
+
+ wxTextFile iniFile(FileName);
+ iniFile.Create();
+
+ // Write Keys and Values.
+ wxInt32 NumKeys=Keys.size();
+ for (wxInt32 keyID = 0; keyID < NumKeys; keyID++)
+ {
+ wxString KeyLine = wxT('[') + Keys.at(keyID).KeyName + wxT(']');
+ if (keyID != 0)
+ {
+ iniFile.AddLine(wxT(""));
+ }
+ iniFile.AddLine(KeyLine);
+ std::map<wxString, wxString>::const_iterator Iter = Keys.at(keyID).Values.begin();
+ while (Iter != Keys.at(keyID).Values.end();)
+ {
+ wxString ValueLine = Iter->first + wxT('=') + Iter->second;
+ iniFile.AddLine(ValueLine);
+ Iter++;
+ }
+ }
+ return (iniFile.Write());
+}
+
+void xIni::Clear()
+{
+ Keys.clear();
+}
+
+wxInt32 xIni::AddKeyName(wxString const& aKeyName)
+{
+ wxInt32 Find=FindKeyID(aKeyName);
+ if (Find >= 0)
+ {
+ return Find;
+ }
+ Key NewKey;
+ NewKey.KeyName=aKeyName;
+ Keys.push_back(NewKey);
+ return (Keys.size() - 1);
+}
+
+wxInt32 xIni::FindKeyID(wxString const& aKeyName) const
+{
+ for (wxUint32 i = 0; i < Keys.size(); i++)
+ {
+ if (Keys.at(i).KeyName==aKeyName)
+ {
+ return i;
+ }
+ }
+ return ((wxInt32)-1);
+}
+
+// Value Mutators
+
+bool xIni::SetValue(wxString const& KeyName, wxString const& ValueName, wxString const& Value)
+{
+ wxInt32 keyID = FindKeyID(KeyName);
+ Keys.at(keyID).Values[ValueName] = Value;
+ return true;
+}
+
+bool xIni::SetValue(wxString const& KeyName, wxString const& ValueName, wxInt32 const Value)
+{
+ wxString ValueToSet= wxString::Format(wxT("%d"), Value);
+ return SetValue(KeyName, ValueName, ValueToSet);
+}
+
+bool xIni::SetValue(wxString const& KeyName, wxString const& ValueName, wxUint32 const Value)
+{
+ wxString ValueToSet= wxString::Format(wxT("%d"), Value);
+ return SetValue(KeyName, ValueName, ValueToSet);
+}
+
+bool xIni::SetValue(wxString const& KeyName, wxString const& ValueName, float const Value)
+{
+ wxString ValueToSet= wxString::Format(wxT("%f"), Value);
+ return SetValue(KeyName, ValueName, ValueToSet);
+}
+
+bool xIni::SetValue(wxString const& KeyName, wxString const& ValueName, double const Value)
+{
+ wxString ValueToSet= wxString::Format(wxT("%f"), Value);
+ return SetValue(KeyName, ValueName, ValueToSet);
+}
+
+bool xIni::SetValue(wxString const& KeyName, wxString const& ValueName, wxRect const& Value)
+{
+ wxString ValueToSet=wxString::Format(wxT("%d,%d,%d,%d"), Value.GetX(), Value.GetY(), Value.GetWidth(), Value.GetHeight());
+ return SetValue(KeyName, ValueName, ValueToSet);
+}
+
+// Values accessors
+
+wxString xIni::GetValue(wxString const& KeyName, wxString const& ValueName, wxString const& defValue) const
+{
+ wxInt32 keyID = FindKeyID(KeyName);
+ if (keyID == -1)
+ {
+ return defValue;
+ }
+
+ if (Keys.at(keyID).Values.count(ValueName) == 0)
+ {
+ return defValue;
+ }
+ return Keys.at(keyID).Values[ValueName];
+}
+
+wxInt32 xIni::GetValue(wxString const& KeyName, wxString const& ValueName, wxInt32 const defValue) const
+{
+ wxString defStValue=wxString::Format(wxT("%d"), defValue);
+ wxString value=GetValue(KeyName, ValueName, defStValue);
+ long result;
+ value.ToLong(&result);
+ return (wxInt32)result;
+}
+
+wxUint32 xIni::GetValue(wxString const& KeyName, wxString const& ValueName, wxUint32 const defValue) const
+{
+ wxString defStValue=wxString::Format(wxT("%d"), defValue);
+ wxString value=GetValue(KeyName, ValueName, defStValue);
+ unsigned long result;
+ value.ToULong(&result);
+ return (wxUint32)result;
+}
+
+float xIni::GetValue(wxString const& KeyName, wxString const& ValueName, float const defValue) const
+{
+ wxString defStValue=wxString::Format(wxT("%f"), defValue);
+ wxString value=GetValue(KeyName, ValueName, defStValue);
+ double result;
+ value.ToDouble(&result);
+ return (float)result;
+}
+
+double xIni::GetValue(wxString const& KeyName, wxString const& ValueName, double const defValue) const
+{
+ wxString defStValue=wxString::Format(wxT("%f"), defValue);
+ wxString value=GetValue(KeyName, ValueName, defStValue);
+ double result;
+ value.ToDouble(&result);
+ return result;
+}
+
+wxRect xIni::GetValue(wxString const& KeyName, wxString const& ValueName, wxRect const& defValue) const
+{
+ wxString defStValue=wxString::Format(wxT("%d,%d,%d,%d"), defValue.GetX(), defValue.GetY(), defValue.GetWidth(), defValue.GetHeight());
+ wxString value=GetValue(KeyName, ValueName, defStValue);
+ wxStringTokenizer tkz(value, wxT(","));
+ wxRect toReturn;
+ wxInt8 Flag=1;
+ while (tkz.HasMoreTokens())
+ {
+ wxString token = tkz.GetNextToken();
+ long Number;
+ token.ToLong(&Number);
+ switch (Flag)
+ {
+ case 1:
+ {
+ toReturn.SetX(Number);
+ break;
+ }
+ case 2:
+ {
+ toReturn.SetY(Number);
+ break;
+ }
+ case 3:
+ {
+ toReturn.SetWidth(Number);
+ break;
+ }
+ case 4:
+ {
+ toReturn.SetHeight(Number);
+ break;
+ }
+ }
+ Flag++;
+ }
+ return toReturn;
+}
Added: trunk/xLibs/xIni/xIni.h
===================================================================
--- trunk/xLibs/xIni/xIni.h (rev 0)
+++ trunk/xLibs/xIni/xIni.h 2007-01-10 08:34:47 UTC (rev 118)
@@ -0,0 +1,70 @@
+// The xMule Project - A Peer-2-Peer File Sharing Program
+//
+// Copyright (C) 2004-2007 Avi Vahl ( avivahl [AT] gmail.com )
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of Version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+#ifndef XINI_H
+#define XINI_H
+
+#include <vector> // std::vector
+#include <map> // std::map
+
+class xIni
+{
+public:
+ xIni() { }
+ xIni(wxString const& FileName);
+ ~xIni() { Keys.clear(); }
+
+ bool LoadFile(wxString const& FileName); // Loads data from a .ini file
+ bool SaveFile(wxString const& FileName); // Saves data to a .ini file
+
+ void Clear(); // Deletes all stored data
+
+ wxInt32 AddKeyName(wxString const& aKeyName); // Adds a new KeyName
+
+ wxInt32 FindKeyID(wxString const& aKeyName) const; // Finds KeyName's ID
+
+ bool SetValue(wxString const& KeyName, wxString const& ValueName, wxString const& Value);
+ bool SetValue(wxString const& KeyName, wxString const& ValueName, wxInt32 const Value);
+ bool SetValue(wxString const& KeyName, wxString const& ValueName, wxUint32 const Value);
+ bool SetValue(wxString const& KeyName, wxString const& ValueName, float const Value);
+ bool SetValue(wxString const& KeyName, wxString const& ValueName, double const Value);
+ bool SetValue(wxString const& KeyName, wxString const& ValueName, wxRect const& Value);
+
+ wxString GetValue(wxString const& KeyName, wxString const& ValueName, wxString const& defValue) const;
+ wxInt32 GetValue(wxString const& KeyName, wxString const& ValueName, wxInt32 const defValue) const;
+ wxUint32 GetValue(wxString const& KeyName, wxString const& ValueName, wxUint32 const defValue) const;
+ float GetValue(wxString const& KeyName, wxString const& ValueName, float const defValue) const;
+ double GetValue(wxString const& KeyName, wxString const& ValueName, double const defValue) const;
+ wxRect GetValue(wxString const& KeyName, wxString const& ValueName, wxRect const& defValue) const;
+
+private:
+ struct Key
+ {
+ wxString KeyName;
+ // The two vectors below are parallel to each other in size (every ValueName has a Value!)
+ std::map<wxString, wxString> Values
+ };
+ std::vector<Key> Keys;
+};
+
+//
+// For a little reference, this class refers to the ini file format like this:
+// [KeyName] <-- Stored inside Key::KeyName (as wxString)
+// ValueName=Value <-- Stored inside Key::Values (as std::map)
+//
+
+#endif // XINI_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-10 01:03:46
|
Revision: 117
http://svn.sourceforge.net/xmule/?rev=117&view=rev
Author: avivahl
Date: 2007-01-09 17:03:46 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
Woops :)
Modified Paths:
--------------
trunk/src/packets.cpp
trunk/src/packets.h
Modified: trunk/src/packets.cpp
===================================================================
--- trunk/src/packets.cpp 2007-01-10 00:59:39 UTC (rev 116)
+++ trunk/src/packets.cpp 2007-01-10 01:03:46 UTC (rev 117)
@@ -374,7 +374,7 @@
tag = new Tag_Struct;
memset(tag, 0, sizeof(Tag_Struct));
tag->tagname = nstrdup(name);
- tag->type = TAG_wxInt32EGER;
+ tag->type = TAG_INTEGER;
tag->intvalue = intvalue;
}
@@ -382,7 +382,7 @@
{
tag = new Tag_Struct;
memset(tag, 0, sizeof(Tag_Struct));
- tag->type = TAG_wxInt32EGER;
+ tag->type = TAG_INTEGER;
tag->intvalue = intvalue;
tag->specialtag = special;
}
@@ -475,7 +475,7 @@
delete tag;
}
}
- else if((TTagType) tag->type == TAG_wxInt32EGER)
+ else if((TTagType) tag->type == TAG_INTEGER)
{
if (4 != in_data->Read( &tag->intvalue, 4))
{
@@ -562,7 +562,7 @@
delete tag;
}
}
- else if((TTagType) tag->type == TAG_wxInt32EGER)
+ else if((TTagType) tag->type == TAG_INTEGER)
{
if (4 != in_data->Read( &tag->intvalue, 4))
{
@@ -646,7 +646,7 @@
tag->stringvalue[length] = 0;
}
- else if((TTagType) tag->type == TAG_wxInt32EGER)
+ else if((TTagType) tag->type == TAG_INTEGER)
{
if (1 != fread( &tag->intvalue, 4, 1, in_data))
{
@@ -700,7 +700,7 @@
file->Write(&w_len, 2);
file->Write(tag->stringvalue, len);
}
- else if ((TTagType) tag->type == TAG_wxInt32EGER)
+ else if ((TTagType) tag->type == TAG_INTEGER)
{
wxUint32 w_intvalue = LE_BE((CryptoXMpp::word32)tag->intvalue);
file->Write(&w_intvalue, 4);
@@ -735,7 +735,7 @@
file->Write(&w_len, 2);
file->Write(tag->stringvalue, len);
}
- else if ((TTagType) tag->type == TAG_wxInt32EGER)
+ else if ((TTagType) tag->type == TAG_INTEGER)
{
wxUint32 w_intvalue = LE_BE((CryptoXMpp::word32)tag->intvalue);
file->Write(&w_intvalue, 4);
@@ -770,7 +770,7 @@
fwrite(&w_len, 2, 1, file);
fwrite(tag->stringvalue, len, 1, file);
}
- else if ((TTagType) tag->type == TAG_wxInt32EGER)
+ else if ((TTagType) tag->type == TAG_INTEGER)
{
wxUint32 w_intvalue = LE_BE((CryptoXMpp::word32)tag->intvalue);
fwrite(&w_intvalue, 4, 1, file);
@@ -796,7 +796,7 @@
case TAG_STRING:
cout << " string='" << tag->stringvalue << "'" << endl;
break;
- case TAG_wxInt32EGER:
+ case TAG_INTEGER:
cout << " integer=" << static_cast<unsigned int>(tag->intvalue) << endl;
break;
default:
Modified: trunk/src/packets.h
===================================================================
--- trunk/src/packets.h 2007-01-10 00:59:39 UTC (rev 116)
+++ trunk/src/packets.h 2007-01-10 01:03:46 UTC (rev 117)
@@ -97,7 +97,7 @@
{
TAG_UNSPEC = -1,
TAG_STRING = 2,
- TAG_wxInt32EGER = 3
+ TAG_INTEGER = 3
};
class CTag {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2007-01-10 00:59:42
|
Revision: 116
http://svn.sourceforge.net/xmule/?rev=116&view=rev
Author: avivahl
Date: 2007-01-09 16:59:39 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
xMule Now Supports Win32 Compilation. It would even RUN! But not "work" yet... More work needs to be done.
Modified Paths:
--------------
trunk/ChangeLog-UNSTABLE
trunk/src/AddFileThread.cpp
trunk/src/AddFriend.cpp
trunk/src/AddFriend.h
trunk/src/BarShader.cpp
trunk/src/BarShader.h
trunk/src/BaseClient.cpp
trunk/src/CFile.cpp
trunk/src/CMemFile.h
trunk/src/CatDialog.cpp
trunk/src/CatDialog.h
trunk/src/ClientCredits.cpp
trunk/src/ClientCredits.h
trunk/src/ClientDetailDialog.cpp
trunk/src/ClientDetailDialog.h
trunk/src/ClientList.cpp
trunk/src/ClientList.h
trunk/src/ClientUDPSocket.cpp
trunk/src/ClientUDPSocket.h
trunk/src/CommentDialog.cpp
trunk/src/CommentDialog.h
trunk/src/CommentDialogLst.cpp
trunk/src/CommentDialogLst.h
trunk/src/CryptoXMpp.cpp
trunk/src/CryptoXMpp.h
trunk/src/DownloadClient.cpp
trunk/src/DownloadListCtrl.cpp
trunk/src/DownloadListCtrl.h
trunk/src/DownloadQueue.cpp
trunk/src/DownloadQueue.h
trunk/src/ED2KLink.cpp
trunk/src/ED2KLink.h
trunk/src/EMSocket.cpp
trunk/src/EMSocket.h
trunk/src/FileDetailDialog.h
trunk/src/FlowChart.cpp
trunk/src/FlowChart.h
trunk/src/Friend.cpp
trunk/src/Friend.h
trunk/src/FriendList.cpp
trunk/src/FriendList.h
trunk/src/FriendListCtrl.cpp
trunk/src/HTTPDownloadDlg.cpp
trunk/src/HTTPDownloadDlg.h
trunk/src/IPFilter.cpp
trunk/src/IPFilter.h
trunk/src/KnownFile.cpp
trunk/src/KnownFile.h
trunk/src/KnownFileList.cpp
trunk/src/KnownFileList.h
trunk/src/ListenSocket.cpp
trunk/src/ListenSocket.h
trunk/src/MD5Sum.cpp
trunk/src/MapKey.h
trunk/src/MuleListCtrl.cpp
trunk/src/NewFunctions.cpp
trunk/src/NewFunctions.h
trunk/src/OScopeCtrl.cpp
trunk/src/OScopeCtrl.h
trunk/src/PPgTweaks.cpp
trunk/src/PartFile.cpp
trunk/src/PartFile.h
trunk/src/Preferences.cpp
trunk/src/Preferences.h
trunk/src/Preview.h
trunk/src/QueueListCtrl.cpp
trunk/src/QueueListCtrl.h
trunk/src/SafeFile.cpp
trunk/src/SafeFile.h
trunk/src/SearchList.cpp
trunk/src/SearchList.h
trunk/src/ServerList.cpp
trunk/src/ServerList.h
trunk/src/ServerListCtrl.cpp
trunk/src/ServerListCtrl.h
trunk/src/ServerSocket.cpp
trunk/src/ServerSocket.h
trunk/src/ServerWnd.cpp
trunk/src/SharedFileList.cpp
trunk/src/SharedFileList.h
trunk/src/SharedFilesCtrl.cpp
trunk/src/SharedFilesCtrl.h
trunk/src/StatisticsDlg.cpp
trunk/src/StatisticsDlg.h
trunk/src/SysTray.cpp
trunk/src/SysTray.h
trunk/src/TransferWnd.cpp
trunk/src/TransferWnd.h
trunk/src/UDPSocket.cpp
trunk/src/UDPSocket.h
trunk/src/UploadClient.cpp
trunk/src/UploadListCtrl.cpp
trunk/src/UploadListCtrl.h
trunk/src/UploadQueue.cpp
trunk/src/UploadQueue.h
trunk/src/VerifyUpload.cpp
trunk/src/endianswap.h
trunk/src/filemem.cpp
trunk/src/ldaemon.cpp
trunk/src/ldaemon.h
trunk/src/listbase.h
trunk/src/listctrl.cpp
trunk/src/mfc.h
trunk/src/muuli_wdr.cpp
trunk/src/otherfunctions.cpp
trunk/src/otherfunctions.h
trunk/src/otherstructs.h
trunk/src/packets.cpp
trunk/src/packets.h
trunk/src/resource.h
trunk/src/server.cpp
trunk/src/server.h
trunk/src/sockets.cpp
trunk/src/sockets.h
trunk/src/updownclient.h
trunk/src/wintypes.h
trunk/src/xmule.cpp
trunk/src/xmule.h
trunk/src/xmuleDlg.cpp
trunk/src/xmuleDlg.h
trunk/src/xmuleIPV4Address.h
trunk/xLibs/DynPrefs/DynPrefsCtrl.h
trunk/xLibs/DynPrefs/DynamicPreferencesCtrl.cpp
trunk/xLibs/ini/dictionary.c
trunk/xLibs/ini/dictionary.h
trunk/xLibs/wxTreeMultiCtrl/wxTreeMultiCtrl.cpp
Added Paths:
-----------
trunk/xMule.sln
trunk/xMule.vcproj
Modified: trunk/ChangeLog-UNSTABLE
===================================================================
--- trunk/ChangeLog-UNSTABLE 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/ChangeLog-UNSTABLE 2007-01-10 00:59:39 UTC (rev 116)
@@ -1,9 +1,12 @@
Please read the IMPORTANT NOTE on xMule's versioning system below!
-Version 1.13.7
+Version 2.0.0
--------------
-2006-09-08
+2007-XX-XX
+ * Now compiles on Microsoft Windows using Visual Studio 2005 Express!
+ * Rewrote a lot to improve Windows compatibility.
+ * xMule can again be fully compiled with Unicode enabled.
* xMule now requires wxWidgets 2.8.0 or above. Make sure you update
yours from http://www.wxwidgets.org!
* FIXED: Crash on xMule's first startup due to faulty Unicode code.
@@ -21,7 +24,7 @@
easier program translation (using gettext).
* Huge amount of code cleanup (~15%), which means faster compilation
and dead code removal.
- * Removed many unused source files to make release smaller.
+ * Removed many unused source files and code to make release smaller.
Version 1.13.6
--------------
Modified: trunk/src/AddFileThread.cpp
===================================================================
--- trunk/src/AddFileThread.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/AddFileThread.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -21,7 +21,6 @@
#endif
#include "AddFileThread.h" // Module's Prototype(s)
-
#include "KnownFile.h" // CKnownFile
#include "opcodes.h" // ID_XMULEDLG
#include "otherfunctions.h" // nstrdup
Modified: trunk/src/AddFriend.cpp
===================================================================
--- trunk/src/AddFriend.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/AddFriend.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -32,42 +32,32 @@
#include <wx/sizer.h> // wxSizer
#include <wx/textctrl.h> // wxTextCtrl
-IMPLEMENT_DYNAMIC_CLASS(CAddFriend, wxDialog)
+#define GetDlgItem(a,b) wxStaticCast(FindWindowById((a)),b)
+BEGIN_EVENT_TABLE(CAddFriend, wxDialog)
+ EVT_BUTTON(ID_ADDFRIEND, CAddFriend::OnAddBtn)
+ EVT_BUTTON(ID_CLOSEDLG, CAddFriend::OnCloseBtn)
+END_EVENT_TABLE()
+
CAddFriend::CAddFriend(wxWindow *parent)
: wxDialog(parent, 9995, _("Add a Friend"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxSYSTEM_MENU)
{
addFriendDlg(this, true)->Show(this, true);
- OnInitDialog();
+ Localize();
}
CAddFriend::~CAddFriend()
{
}
-bool CAddFriend::OnInitDialog()
-{
- //CDialog::OnInitDialog();
- Localize();
- return true;
-}
-
-BEGIN_EVENT_TABLE(CAddFriend, wxDialog)
-EVT_BUTTON(ID_ADDFRIEND, CAddFriend::OnAddBtn)
-EVT_BUTTON(ID_CLOSEDLG, CAddFriend::OnCloseBtn)
-END_EVENT_TABLE()
-
-// CAddFriend message handlers
void CAddFriend::Localize()
{
}
-#define GetDlgItem(a,b) wxStaticCast(FindWindowById((a)),b)
-
void CAddFriend::OnAddBtn(wxCommandEvent &evt)
{
wxString name, userhash, fullip;
- uint32_t ip;
+ wxUint32 ip;
long port;
ip = port = 0;
if (GetDlgItem(ID_USERNAME, wxTextCtrl)->GetValue() .Length())
Modified: trunk/src/AddFriend.h
===================================================================
--- trunk/src/AddFriend.h 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/AddFriend.h 2007-01-10 00:59:39 UTC (rev 116)
@@ -26,17 +26,14 @@
class CAddFriend : public wxDialog
{
public:
- CAddFriend() {};
+ CAddFriend(wxWindow* parent);
+ virtual ~CAddFriend();
- CAddFriend(wxWindow* parent); // standard constructor
void Localize();
- virtual ~CAddFriend();
- virtual bool OnInitDialog();
// Dialog Data
enum { IDD = IDD_ADDFRIEND };
-private:
- DECLARE_DYNAMIC_CLASS(CAddFriend)
+protected:
DECLARE_EVENT_TABLE()
void OnAddBtn(wxCommandEvent& evt);
void OnCloseBtn(wxCommandEvent& evt);
Modified: trunk/src/BarShader.cpp
===================================================================
--- trunk/src/BarShader.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/BarShader.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -48,7 +48,7 @@
#define min(a,b) ((a)<(b)?(a):(b))
-CBarShader::CBarShader(uint32_t height, uint32_t width)
+CBarShader::CBarShader(wxUint32 height, wxUint32 width)
{
m_iWidth = width;
m_iHeight = height;
@@ -103,7 +103,7 @@
}
-void CBarShader::SetFileSize(uint32_t fileSize)
+void CBarShader::SetFileSize(wxUint32 fileSize)
{
if (m_uFileSize != fileSize)
{
@@ -112,7 +112,7 @@
}
}
-void CBarShader::FillRange(uint32_t start, uint32_t end, x::DWORD color)
+void CBarShader::FillRange(wxUint32 start, wxUint32 end, x::DWORD color)
{
if (end > m_uFileSize)
{
@@ -204,11 +204,11 @@
dc->SetPen( *wxTRANSPARENT_PEN);
int iBytesInOnePixel = (int)(m_dBytesPerPixel + 0.5f);
//bsCurrent->start;:
- uint32_t start = 0;
- uint32_t drawnItems = 0;
+ wxUint32 start = 0;
+ wxUint32 drawnItems = 0;
while (bsCurrent != NULL && rectSpan.right < static_cast<unsigned int>(iLeft + m_iWidth))
{
- uint32_t uSpan = bsCurrent->end - start;
+ wxUint32 uSpan = bsCurrent->end - start;
int iPixels = (int)(uSpan *m_dPixelsPerByte + 0.5f);
if (iPixels > 0)
{
@@ -223,7 +223,7 @@
float fRed = 0;
float fGreen = 0;
float fBlue = 0;
- uint32_t iEnd = start + iBytesInOnePixel;
+ wxUint32 iEnd = start + iBytesInOnePixel;
int iLast = start;
do
{
Modified: trunk/src/BarShader.h
===================================================================
--- trunk/src/BarShader.h 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/BarShader.h 2007-01-10 00:59:39 UTC (rev 116)
@@ -21,16 +21,20 @@
#include "wintypes.h" // x::DWORD
-#include <stdint.h> // uint32_t
#include <wx/dc.h>
#include <wx/dcmemory.h>
-#define RGB(a,b,c) ((a&0xff)<<16|(b&0xff)<<8|(c&0xff))
+#ifndef __WXMSW__
+ #define RGB(a,b,c) ((a&0xff)<<16|(b&0xff)<<8|(c&0xff))
+#else
+#include <windows.h> // RGB()
+#include <wx/msw/winundef.h>
+#endif
class CBarShader
{
public:
- CBarShader(uint32_t height = 1, uint32_t width = 1);
+ CBarShader(wxUint32 height = 1, wxUint32 width = 1);
~CBarShader();
//set the width of the bar
@@ -70,10 +74,10 @@
void Reset();
//sets new file size and resets the shader
- void SetFileSize(uint32_t fileSize);
+ void SetFileSize(wxUint32 fileSize);
//fills in a range with a certain color, new ranges overwrite old
- void FillRange(uint32_t start, uint32_t end, x::DWORD color);
+ void FillRange(wxUint32 start, wxUint32 end, x::DWORD color);
//fills in entire range with a certain color
void Fill(x::DWORD color);
@@ -91,17 +95,17 @@
int m_iHeight;
double m_dPixelsPerByte;
double m_dBytesPerPixel;
- uint32_t m_uFileSize;
+ wxUint32 m_uFileSize;
private:
struct BarSpan
{
- uint32_t start;
- uint32_t end;
+ wxUint32 start;
+ wxUint32 end;
x::DWORD color;
BarSpan *next;
- BarSpan(uint32_t s, uint32_t e, x::DWORD cr = RGB(0, 0, 0))
+ BarSpan(wxUint32 s, wxUint32 e, x::DWORD cr = RGB(0, 0, 0))
{
start = s;
end = e;
@@ -109,7 +113,7 @@
next = NULL;
}
- BarSpan(BarSpan* prev, uint32_t s, uint32_t e, x::DWORD cr)
+ BarSpan(BarSpan* prev, wxUint32 s, wxUint32 e, x::DWORD cr)
{
start = s;
end = e;
@@ -142,7 +146,7 @@
BarSpan* m_FirstSpan;
float* m_Modifiers;
- uint16_t m_used3dlevel;
+ wxUint16 m_used3dlevel;
};
#endif // _BARSHADER_H_
Modified: trunk/src/BaseClient.cpp
===================================================================
--- trunk/src/BaseClient.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/BaseClient.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -60,9 +60,11 @@
#include <sstream> // std::ostringstream
#include <iomanip> // outputstream flags
+#ifndef __WXMSW__
#include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/socket.h>
+#endif
using std::setprecision;
using std::setfill;
@@ -86,7 +88,7 @@
Init();
}
-CUpDownClient::CUpDownClient(uint16_t in_port, uint32_t in_userid, uint32_t in_serverip, uint16_t in_serverport, CPartFile *in_reqfile)
+CUpDownClient::CUpDownClient(wxUint16 in_port, wxUint32 in_userid, wxUint32 in_serverip, wxUint16 in_serverport, CPartFile *in_reqfile)
{
SpecialPerson = false;
socket = 0;
@@ -97,11 +99,11 @@
if (!HasLowID())
{
- uint8_t ip[4];
- ip[3] = static_cast<uint8_t>(m_nUserID >> 24);
- ip[2] = static_cast<uint8_t>(m_nUserID >> 16);
- ip[1] = static_cast<uint8_t>(m_nUserID >> 8);
- ip[0] = static_cast<uint8_t>(m_nUserID);
+ wxUint8 ip[4];
+ ip[3] = static_cast<wxUint8>(m_nUserID >> 24);
+ ip[2] = static_cast<wxUint8>(m_nUserID >> 16);
+ ip[1] = static_cast<wxUint8>(m_nUserID >> 8);
+ ip[0] = static_cast<wxUint8>(m_nUserID);
std::ostringstream in;
in << int(ip[0]) << "." << int(ip[1]) << "." << int(ip[2]) << "." << int(ip[3]);
@@ -290,13 +292,13 @@
SetUploadFileID(NULL);
}
-bool CUpDownClient::ProcessHelloPacket(char *pachPacket, uint32_t nSize)
+bool CUpDownClient::ProcessHelloPacket(wxByte* pachPacket, wxUint32 nSize)
{
- CSafeMemFile data((x::BYTE *) pachPacket, nSize);
- uint8_t hashsize;
- if (1 == data.Read( &hashsize, 1))
+ CSafeMemFile data(pachPacket, nSize);
+ wxUint8 hashsize;
+ if (1 == data.Read(&hashsize, 1))
{
- return ProcessHelloTypePacket( &data);
+ return ProcessHelloTypePacket(&data);
}
else
{
@@ -304,9 +306,9 @@
}
}
-bool CUpDownClient::ProcessHelloAnswer(char *pachPacket, uint32_t nSize)
+bool CUpDownClient::ProcessHelloAnswer(wxByte* pachPacket, wxUint32 nSize)
{
- CSafeMemFile data((x::BYTE *) pachPacket, nSize);
+ CSafeMemFile data(pachPacket, nSize);
return ProcessHelloTypePacket( &data);
}
@@ -319,7 +321,7 @@
if (data->Read( &m_achUserHash, 16) == 16)
{
- uint32_t nUserID;
+ wxUint32 nUserID;
if (data->Read( &nUserID, 4) == 4)
{
//fsch2010:if (!m_nUserID || nUserID < 16777216)
@@ -327,14 +329,14 @@
// hmm clientport is sent twice - why?:
if (data->Read( &m_nUserPort, 2) == 2)
{
- uint32_t tagcount;
+ wxUint32 tagcount;
if (data->Read( &tagcount, 4) == 4)
{
// TODO: Check if we get everything needed!
/* It seems that various Mules and Donkeys send tagcount 2, Old MLDonkey sends
tagcount 3, new mldonkeys 4. There are also some clients
sending tagcount 5 and 7, what are those? */
- for (uint32_t i = 0 ; i < tagcount ; i++)
+ for (wxUint32 i = 0 ; i < tagcount ; i++)
{
CTag *temptag = new CTag(data);
if (temptag->tag->tagname && !strcmp(temptag->tag->tagname, "pr"))
@@ -369,13 +371,13 @@
if ((bOldUser && (oldusername.CmpNoCase(wxString(m_pszUsername, *wxConvCurrent)) != 0))
&& !thief)
{
- uint64_t id = getUID();
+ wxUint64 id = getUID();
leechertype = 0;
if (theApp.listensocket->offensecounter.find(id) != theApp.listensocket->offensecounter.end())
theApp.listensocket->offensecounter[id]++;
else
- theApp.listensocket->offensecounter[id] = (uint32_t) 1;
+ theApp.listensocket->offensecounter[id] = (wxUint32) 1;
theApp.listensocket->offensecounter[0]++;
}
}
@@ -474,11 +476,11 @@
{
if (data->Read( &m_nServerPort, 2) == 2)
{
- // Hybrid now has an extra uint32_t.. What is it for?
+ // Hybrid now has an extra wxUint32.. What is it for?
// Also, many clients seem to send an extra 6? These are not eDonkeys or Hybrids..
if (data->GetLength() - data->GetPosition() == 4)
{
- uint32_t test;
+ wxUint32 test;
data->Read( &test, 4);
if (test == (long int) "KDLM")
{
@@ -549,7 +551,7 @@
if (!thief)
{
// Stolen Hash detection [BlackRat]
- uint64_t id = getUID();
+ wxUint64 id = getUID();
if (theApp.serverconnect->GetClientID() != m_nUserID &&memcmp(m_achUserHash, theApp.glob_prefs->GetUserHash(), 16) == 0)
{
// This is a hasl stealer !
@@ -559,15 +561,15 @@
if (theApp.listensocket->offensecounter.find(id) != theApp.listensocket->offensecounter.end())
theApp.listensocket->offensecounter[id]++;
else
- theApp.listensocket->offensecounter[id] = (uint32_t) 1;
+ theApp.listensocket->offensecounter[id] = (wxUint32) 1;
}
// Detection id change [BlackRat]
/*
There is still something to do here
Actually, due to problems with HashMap, everybody here is consider as id stealers...
*/
- uint64_t lasthash;
- uint64_t thishash = 0;
+ wxUint64 lasthash;
+ wxUint64 thishash = 0;
for (int i = 0 ; i < 8 ; i++)
thishash += GetUserHash() [i] << (i *8) ^ GetUserHash() [i + 8] << (i *8);
if ((theApp.listensocket->hashbase.find(id) != theApp.listensocket->hashbase.end()) &&
@@ -578,7 +580,7 @@
if (theApp.listensocket->offensecounter.find(id) != theApp.listensocket->offensecounter.end())
theApp.listensocket->offensecounter[id]++;
else
- theApp.listensocket->offensecounter[id] = (uint32_t) 1;
+ theApp.listensocket->offensecounter[id] = (wxUint32) 1;
theApp.listensocket->offensecounter[0]++;
}
theApp.listensocket->hashbase[id] = thishash;
@@ -637,7 +639,7 @@
return;
}
CMemFile *data = new CMemFile();
- uint8_t hashsize = 16;
+ wxUint8 hashsize = 16;
data->Write( &hashsize, 1);
SendHelloTypePacket(data);
NewSocket_SendPacketOPdata(2, OP_HELLO, data, reinterpret_cast<long>(this), 0);
@@ -651,12 +653,12 @@
if (socket)
{
CMemFile *data = new CMemFile();
- uint8_t version = CURRENT_VERSION_SHORT;
+ wxUint8 version = CURRENT_VERSION_SHORT;
data->Write( &version, 1);
- uint8_t protversion = EMULE_PROTOCOL;
+ wxUint8 protversion = EMULE_PROTOCOL;
data->Write( &protversion, 1);
-// uint32_t tagcount = 7;
- uint32_t tagcount = 8;
+// wxUint32 tagcount = 7;
+ wxUint32 tagcount = 8;
/* if (!newprefs01_opt[3])
{
@@ -668,7 +670,7 @@
tag.WriteTagToFile(data);
CTag tag2(ET_UDPVER, 3);
tag2.WriteTagToFile(data);
- CTag tag3(ET_UDPPORT, static_cast<uint16_t>(DynPrefs::Get<long>("tcp-port")));
+ CTag tag3(ET_UDPPORT, static_cast<wxUint16>(DynPrefs::Get<long>("tcp-port")));
tag3.WriteTagToFile(data);
CTag tag4(ET_SOURCEEXCHANGE, 2);
tag4.WriteTagToFile(data);
@@ -676,7 +678,7 @@
tag5.WriteTagToFile(data);
CTag tag6(ET_EXTENDEDREQUEST, 2);
tag6.WriteTagToFile(data);
- uint32_t dwTagValue = (theApp.clientcredits->CryptoAvailable() ? 3: 0);
+ wxUint32 dwTagValue = (theApp.clientcredits->CryptoAvailable() ? 3: 0);
CTag tag7(ET_FEATURES, dwTagValue);
tag7.WriteTagToFile(data);
@@ -702,11 +704,11 @@
}
}
-void CUpDownClient::ProcessMuleInfoPacket(char *pachPacket, uint32_t nSize)
+void CUpDownClient::ProcessMuleInfoPacket(wxByte* pachPacket, wxUint32 nSize)
{
- CSafeMemFile *data = new CSafeMemFile((x::BYTE *) pachPacket, nSize);
+ CSafeMemFile *data = new CSafeMemFile(pachPacket, nSize);
//The version number part of this packet will soon be useless since it is only able to go to v.99.
- //Why the version is a uint8_t and why it was not done as a tag like the eDonkey hello packet is not known..
+ //Why the version is a wxUint8 and why it was not done as a tag like the eDonkey hello packet is not known..
//Therefore, sooner or later, we are going to have to switch over to using the eDonkey hello packet to
//set the version.
//No sense making a third value sent for versions..
@@ -717,7 +719,7 @@
{
m_byEmuleVersion = 0x22;
}
- uint8_t protversion;
+ wxUint8 protversion;
if (data->Read( &protversion, 1) == 1)
{
//implicitly supported options by older clients
@@ -736,7 +738,7 @@
// MLdonkey currently does not support shared directories:
if (m_byEmuleVersion >= 0x28 && !m_bIsML) m_bSharedDirectories = true;
m_bEmuleProtocol = true;
- uint32_t tagcount;
+ wxUint32 tagcount;
if (data->Read( &tagcount, 4) == 4)
{
for (unsigned int i = 0 ; i < tagcount ; i++)
@@ -832,11 +834,11 @@
void CUpDownClient::SendHelloTypePacket(CMemFile *data)
{
data->Write(theApp.glob_prefs->GetUserHash(), 16);
- uint32_t clientid = theApp.serverconnect->GetClientID();
+ wxUint32 clientid = theApp.serverconnect->GetClientID();
data->Write( &clientid, 4);
- uint16_t nPort = static_cast<uint16_t>(DynPrefs::Get<long>("tcp-port"));
+ wxUint16 nPort = static_cast<wxUint16>(DynPrefs::Get<long>("tcp-port"));
data->Write( &nPort, 2);
- uint32_t tagcount = 5;
+ wxUint32 tagcount = 5;
data->Write( &tagcount, 4);
if (DynPrefs::Get<bool>("secure-ident"))
{
@@ -892,22 +894,22 @@
}
CTag tagVersion(CT_VERSION, EDONKEYVERSION);
tagVersion.WriteTagToFile(data);
- CTag tagUDPports(CT_EMULE_UDPPORTS, static_cast<uint32_t>(DynPrefs::Get<long>("udp-port")));
+ CTag tagUDPports(CT_EMULE_UDPPORTS, static_cast<wxUint32>(DynPrefs::Get<long>("udp-port")));
tagUDPports.WriteTagToFile(data);
- uint32_t uUdpVer;
- const uint32_t uDataCompVer = 1;
- const uint32_t uSupportSecIdent = theApp.clientcredits->CryptoAvailable() ? 3: 0;
- const uint32_t uSourceExchangeVer = 2;
- uint32_t uExtendedRequestsVer;
+ wxUint32 uUdpVer;
+ const wxUint32 uDataCompVer = 1;
+ const wxUint32 uSupportSecIdent = theApp.clientcredits->CryptoAvailable() ? 3: 0;
+ const wxUint32 uSourceExchangeVer = 2;
+ wxUint32 uExtendedRequestsVer;
uUdpVer = 3;
uExtendedRequestsVer = 0;
- const uint32_t uAcceptCommentVer = 1;
+ const wxUint32 uAcceptCommentVer = 1;
CTag tagMiscOptions(CT_EMULE_MISCOPTIONS1,
(uUdpVer << 4 *6) | (uDataCompVer << 4 *5) | (uSupportSecIdent << 4 *4) | (uSourceExchangeVer << 4 *3) |
(uExtendedRequestsVer << 4 *2) | (uAcceptCommentVer << 4));
tagMiscOptions.WriteTagToFile(data);
- uint32_t dwIP;
+ wxUint32 dwIP;
/*
10 0000001 0001001 010 0000001 base 2
client maj v minor v release revision
@@ -932,7 +934,7 @@
data->Write( &nPort, 2);
}
-void CUpDownClient::ProcessMuleCommentPacket(char *pachPacket, uint32_t nSize)
+void CUpDownClient::ProcessMuleCommentPacket(wxByte* pachPacket, wxUint32 nSize)
{
if (reqfile)
{
@@ -941,10 +943,10 @@
unsigned int length;
if (nSize > (sizeof(m_iRate) + sizeof(length) - 1))
{
- CSafeMemFile data((x::BYTE *) pachPacket, nSize);
- if (sizeof(m_iRate) == data.Read( &m_iRate, sizeof(m_iRate)))
+ CSafeMemFile data(pachPacket, nSize);
+ if (sizeof(m_iRate) == data.Read(&m_iRate, sizeof(m_iRate)))
{
- if (sizeof(length) == data.Read( &length, sizeof(length)))
+ if (sizeof(length) == data.Read(&length, sizeof(length)))
{
reqfile->SetHasRating(true);
if (length > data.GetLength() - data.GetPosition())
@@ -1317,9 +1319,9 @@
}
else
{
- uint32_t nClientMajVersion = (m_nClientVersion >> 17) & 0x7f;
- uint32_t nClientMinVersion = (m_nClientVersion >> 10) & 0x7f;
- uint32_t nClientUpVersion = (m_nClientVersion >> 7) & 0x07;
+ wxUint32 nClientMajVersion = (m_nClientVersion >> 17) & 0x7f;
+ wxUint32 nClientMinVersion = (m_nClientVersion >> 10) & 0x7f;
+ wxUint32 nClientUpVersion = (m_nClientVersion >> 7) & 0x07;
m_nClientVersion = form_version(nClientMajVersion, nClientMinVersion, nClientUpVersion);
if (m_clientSoft == SO_EMULE)
@@ -1368,7 +1370,7 @@
TryToConnect(true);
}
-void CUpDownClient::ProcessSharedFileList(char *pachPacket, uint32_t nSize)
+void CUpDownClient::ProcessSharedFileList(wxByte* pachPacket, wxUint32 nSize)
{
if (m_iFileListRequested > 0)
{
@@ -1381,7 +1383,7 @@
if (this == NULL) return wxT("");
wxString sRet;
// build info text and display it
- sRet.Printf(_("NickName: %s\n"), wxString(GetUserName(), *wxConvCurrent).GetData());
+ sRet.Printf(_("NickName: %s\n"), wxString(GetTheUserName(), *wxConvCurrent).GetData());
if (reqfile)
{
sRet += _("Requested: ") + wxString(reqfile->GetFileName(), *wxConvCurrent) + wxT("\n");
@@ -1404,7 +1406,7 @@
socket->Destroy();
}
-void CUpDownClient::SetUserHash(unsigned char *m_achTempUserHash)
+void CUpDownClient::SetUserHash(wxByte* m_achTempUserHash)
{
if (m_achTempUserHash == NULL)
{
@@ -1431,7 +1433,7 @@
}
}
-void CUpDownClient::ProcessSecIdentStatePacket(unsigned char *pachPacket, uint32_t nSize)
+void CUpDownClient::ProcessSecIdentStatePacket(wxByte* pachPacket, wxUint32 nSize)
{
if (nSize == 5)
{
@@ -1449,7 +1451,7 @@
m_SecureIdentState = IS_KEYANDSIGNEEDED;
break;
}
- uint32_t dwRandom;
+ wxUint32 dwRandom;
memcpy( &dwRandom, pachPacket+1, 4);
credits->m_dwCryptRndChallengeFrom = dwRandom;
}
@@ -1481,8 +1483,8 @@
{
bUseV2 = true;
}
- uint8_t byChaIPKind = 0;
- uint32_t ChallengeIP = 0;
+ wxUint8 byChaIPKind = 0;
+ wxUint32 ChallengeIP = 0;
if (bUseV2)
{
if (theApp.serverconnect->GetClientID() == 0 || theApp.serverconnect->IsLowID())
@@ -1499,7 +1501,7 @@
}
//end v2
unsigned char achBuffer[250];
- uint8_t siglen = theApp.clientcredits->CreateSignature(credits, achBuffer, 250, ChallengeIP,byChaIPKind);
+ wxUint8 siglen = theApp.clientcredits->CreateSignature(credits, achBuffer, 250, ChallengeIP,byChaIPKind);
theApp.clientcredits->VerifyIdent(credits, achBuffer, siglen, GetIP(),byChaIPKind);
if (siglen)
{
@@ -1541,7 +1543,7 @@
m_strComment = wxT("");
}
-void CUpDownClient::ProcessPublicKeyPacket(unsigned char *pachPacket, uint32_t nSize)
+void CUpDownClient::ProcessPublicKeyPacket(unsigned char *pachPacket, wxUint32 nSize)
{
//fsch2010removedtheApp.clientlist->AddTrackClient(this);
/// delete this line later
@@ -1571,7 +1573,7 @@
void CUpDownClient::SendSecIdentStatePacket()
{
// check if we need public key and signature
- uint8_t nValue = 0;
+ wxUint8 nValue = 0;
if (credits)
{
if (theApp.clientcredits->CryptoAvailable())
@@ -1588,7 +1590,7 @@
if (nValue)
{
// crypt: send random data to sign
- uint32_t dwRandom = rand() + 1;
+ wxUint32 dwRandom = rand() + 1;
credits->m_dwCryptRndChallengeFor = dwRandom;
Packet *packet = new Packet(OP_SECIDENTSTATE, 5, OP_EMULEPROT);
packet->pBuffer[0] = nValue;
@@ -1598,7 +1600,7 @@
}
}
-void CUpDownClient::ProcessSignaturePacket(unsigned char *pachPacket, uint32_t nSize)
+void CUpDownClient::ProcessSignaturePacket(unsigned char *pachPacket, wxUint32 nSize)
{
/// delete this line later
// here we spread the good guys from the bad ones ;)
@@ -1606,7 +1608,7 @@
{
return;
}
- uint8_t byChaIPKind;
+ wxUint8 byChaIPKind;
if (pachPacket[0] == nSize - 1)
{
byChaIPKind = 0;
Modified: trunk/src/CFile.cpp
===================================================================
--- trunk/src/CFile.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/CFile.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -23,7 +23,9 @@
#include <errno.h>
#include <string.h>
#include <iostream> // std::cout
+#include <cstdio>
+
using std::cout;
using std::endl;
@@ -392,6 +394,7 @@
// flush
bool CFile::Flush()
{
+#ifndef __WXMSW__
if (IsOpened())
{
if (fsync(m_fd) == - 1)
@@ -400,6 +403,7 @@
return false;
}
}
+#endif
return true;
}
Modified: trunk/src/CMemFile.h
===================================================================
--- trunk/src/CMemFile.h 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/CMemFile.h 2007-01-10 00:59:39 UTC (rev 116)
@@ -26,16 +26,18 @@
class CMemFile : public CFile {
public:
CMemFile(unsigned int growBytes=1024);
- CMemFile(unsigned char* buffer,unsigned int bufferSize,unsigned int growBytes=0);
- void Attach(unsigned char* buffer,unsigned int buffserSize,unsigned int growBytes=0);
- unsigned char* Detach();
+ CMemFile(wxByte* buffer, unsigned int bufferSize, unsigned int growBytes=0);
virtual ~CMemFile();
+
+ void Attach(wxByte* buffer, unsigned int buffserSize, unsigned int growBytes=0);
+ wxByte* Detach();
+
virtual unsigned long GetPosition() {return fPosition;};
virtual bool GetStatus(unsigned long none) const {return 1;};
off_t Seek(off_t offset,wxSeekMode from=wxFromStart);
virtual void SetLength(unsigned long newLen);
unsigned long GetLength() { return fFileSize; };
- off_t Read(void* buf,off_t length);
+ off_t Read(void* buf, off_t length);
size_t Write(const void* buf,size_t length);
virtual bool Close();
@@ -48,7 +50,7 @@
unsigned long fBufferSize;
unsigned long fFileSize;
int deleteBuffer;
- unsigned char* fBuffer;
+ wxByte* fBuffer;
};
#endif // _CMEMFILE_H_
Modified: trunk/src/CatDialog.cpp
===================================================================
--- trunk/src/CatDialog.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/CatDialog.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -64,8 +64,6 @@
#define GetBValue(rgb) ((rgb)&0xff)
#define RGB(a,b,c) ((a&0xff)<<16|(b&0xff)<<8|(c&0xff))
-IMPLEMENT_DYNAMIC_CLASS(CCatDialog, wxDialog)
-
BEGIN_EVENT_TABLE(CCatDialog, wxDialog)
EVT_BUTTON(wxID_OK, CCatDialog::OnBnClickedOk)
EVT_BUTTON(SMARTID(IDC_CATCOLOR), CCatDialog::OnBnClickColor)
@@ -157,10 +155,7 @@
Center();
m_myCat = theApp.glob_prefs->GetCategory(index);
-}
-bool CCatDialog::OnInitDialog()
-{
m_prio = GetDlgItem(IDC_PRIOCOMBO, wxComboBox);
m_ctlColor = GetDlgItem(IDC_CATCOLOR, wxButton);
@@ -177,8 +172,6 @@
m_prio->Append(_("Auto"));
m_prio->SetSelection(m_myCat->prio);
m_ctlColor->SetBackgroundColour(wxColour(GetBValue(newcolor), GetGValue(newcolor), GetRValue(newcolor)));
-
- return true;
}
void CCatDialog::OnBnClickedBrowse(wxCommandEvent &evt)
Modified: trunk/src/CatDialog.h
===================================================================
--- trunk/src/CatDialog.h 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/CatDialog.h 2007-01-10 00:59:39 UTC (rev 116)
@@ -28,26 +28,21 @@
class CCatDialog : public wxDialog
{
-private:
- Category_Struct* m_myCat;
- wxComboBox* m_prio;
- wxButton* m_ctlColor;
- unsigned long newcolor;
-
public:
- DECLARE_DYNAMIC_CLASS(CCatDialog)
-
- CCatDialog() {}
CCatDialog(wxWindow* parent,int catindex); // standard constructor
virtual ~CCatDialog() {}
- virtual bool OnInitDialog();
-private:
+protected:
DECLARE_EVENT_TABLE()
-
void OnBnClickedBrowse(wxCommandEvent& evt);
void OnBnClickedOk(wxCommandEvent& evt);
void OnBnClickColor(wxCommandEvent& evt);
+
+private:
+ Category_Struct* m_myCat;
+ wxComboBox* m_prio;
+ wxButton* m_ctlColor;
+ unsigned long newcolor;
};
#endif // _CATDIALOG_H_
Modified: trunk/src/ClientCredits.cpp
===================================================================
--- trunk/src/ClientCredits.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/ClientCredits.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -30,7 +30,7 @@
#include "otherfunctions.h" // md4cpy
#include "resource.h"
#include "sockets.h" // CServerConnect
-#include "wintypes.h" // x::BYTE
+#include "wintypes.h" // wxByte
#include "xmule.h" // theApp
#include "xmuleDlg.h" // theApp.xmuledlg
@@ -56,7 +56,8 @@
using std::hex;
using std::setw;
-#if !HAVE_CRYPTOPP
+//#if !HAVE_CRYPTOPP
+#if 0
#include "CryptoXMpp.h"
#else
#include <cryptopp/config.h>
@@ -67,11 +68,9 @@
#define CryptoXMpp CryptoPP
#endif
-#define CLIENTS_MET_FILENAME "clients.met"
-
MAP* mcc = NULL;
-uint32_t ldwForIP;
+wxUint32 ldwForIP;
using namespace CryptoXMpp;
@@ -100,7 +99,7 @@
delete m_pCredits;
}
-void CClientCredits::AddDownloaded(uint32_t bytes, uint32_t dwForIP)
+void CClientCredits::AddDownloaded(wxUint32 bytes, wxUint32 dwForIP)
{
if ((GetCurrentIdentState(dwForIP) == IS_IDFAILED || GetCurrentIdentState(dwForIP) == IS_IDBADGUY ||
GetCurrentIdentState(dwForIP) == IS_IDNEEDED) && theApp.clientcredits->CryptoAvailable())
@@ -108,14 +107,14 @@
return;
}
//encode
- uint64_t current = m_pCredits->nDownloadedHi;
+ wxUint64 current = m_pCredits->nDownloadedHi;
current = (current << 32) + m_pCredits->nDownloadedLo + bytes;
//recode
- m_pCredits->nDownloadedLo = (uint32_t) current;
- m_pCredits->nDownloadedHi = (uint32_t)(current >> 32);
+ m_pCredits->nDownloadedLo = (wxUint32) current;
+ m_pCredits->nDownloadedHi = (wxUint32)(current >> 32);
}
-void CClientCredits::ShowCHandPK(uint32_t challenge, unsigned char * pk, int length)
+void CClientCredits::ShowCHandPK(wxUint32 challenge, unsigned char * pk, int length)
{
std::ostringstream internalbuffer;
internalbuffer << " credits=" << this << " challenge=" << challenge << " length=" << length << " publickey=";
@@ -131,7 +130,7 @@
cout << internalbuffer.str().c_str();
}
-void CClientCredits::AddUploaded(uint32_t bytes, uint32_t dwForIP)
+void CClientCredits::AddUploaded(wxUint32 bytes, wxUint32 dwForIP)
{
if ((GetCurrentIdentState(dwForIP) == IS_IDFAILED || GetCurrentIdentState(dwForIP) == IS_IDBADGUY || GetCurrentIdentState(dwForIP) == IS_IDNEEDED) && theApp.clientcredits->CryptoAvailable())
{
@@ -139,24 +138,24 @@
}
else
{
- uint64_t current = m_pCredits->nUploadedHi;
+ wxUint64 current = m_pCredits->nUploadedHi;
current = (current << 32) + m_pCredits->nUploadedLo + bytes;
- m_pCredits->nUploadedLo = (uint32_t) current;
- m_pCredits->nUploadedHi = (uint32_t)(current >> 32);
+ m_pCredits->nUploadedLo = (wxUint32) current;
+ m_pCredits->nUploadedHi = (wxUint32)(current >> 32);
}
}
-uint64_t CClientCredits::GetUploadedTotal()
+wxUint64 CClientCredits::GetUploadedTotal()
{
- return((uint64_t) m_pCredits->nUploadedHi << 32) + m_pCredits->nUploadedLo;
+ return((wxUint64) m_pCredits->nUploadedHi << 32) + m_pCredits->nUploadedLo;
}
-uint64_t CClientCredits::GetDownloadedTotal()
+wxUint64 CClientCredits::GetDownloadedTotal()
{
- return((uint64_t) m_pCredits->nDownloadedHi << 32) + m_pCredits->nDownloadedLo;
+ return((wxUint64) m_pCredits->nDownloadedHi << 32) + m_pCredits->nDownloadedLo;
}
-float CClientCredits::GetScoreRatio(uint32_t dwForIP)
+float CClientCredits::GetScoreRatio(wxUint32 dwForIP)
{
// Check the client ident status
if ((GetCurrentIdentState(dwForIP) == IS_IDFAILED || GetCurrentIdentState(dwForIP) == IS_IDNEEDED) &&
@@ -168,7 +167,7 @@
else
{
// Cache value
- const uint64_t downloadTotal = GetDownloadedTotal();
+ const wxUint64 downloadTotal = GetDownloadedTotal();
// Check if this client has any credit (sent >1MB)
if (downloadTotal < 1000000)
{
@@ -177,7 +176,7 @@
else
{
// Cache value
- const uint64_t uploadTotal = GetUploadedTotal();
+ const wxUint64 uploadTotal = GetUploadedTotal();
// Factor 1
float result = (uploadTotal == 0) ?
10.0f: (float)(2 * downloadTotal) / (float) uploadTotal;
@@ -207,7 +206,7 @@
// Maella end
// added by sivka [VQB: -ownCredits-]
-float CClientCredits::GetMyScoreRatio(uint32_t dwForIP)
+float CClientCredits::GetMyScoreRatio(wxUint32 dwForIP)
{
// check the client ident status
if ((GetCurrentIdentState(dwForIP) == IS_IDFAILED || GetCurrentIdentState(dwForIP) == IS_IDNEEDED) && theApp.clientcredits->CryptoAvailable())
@@ -239,19 +238,18 @@
return result;
}
-CClientCreditsList::CClientCreditsList(CPreferences * in_prefs)
+CClientCreditsList::CClientCreditsList()
{
MapData_Init(mcc);
- m_pAppPrefs = in_prefs;
m_nLastSaved =::GetTickCount();
- LoadList();
+ Load();
InitalizeCrypting();
ldwForIP = 0;
}
-CClientCreditsList::~ CClientCreditsList()
+CClientCreditsList::~CClientCreditsList()
{
- SaveList();
+ Save();
MAP * pos = mcc->next;
while (pos->Key)
@@ -268,14 +266,14 @@
// VQB: ownCredits // Athlazan
-void CClientCreditsList::LoadList()
+void CClientCreditsList::Load()
{
- wxString strFileName(DynPrefs::Get<wxString>("app-directory") + wxString(CLIENTS_MET_FILENAME, *wxConvCurrent));
+ wxString strFileName(theApp.GetConfigDir() + wxT("clients.met"));
wxFile loadlist;
if (wxFileExists(strFileName) && loadlist.Open(strFileName, wxFile::read))
{
- uint8_t version;
+ wxUint8 version;
loadlist.Read(&version, 1);
if (version != CREDITFILE_VERSION && version != CREDITFILE_VERSION_29)
@@ -287,7 +285,7 @@
{
struct stat loadlistbuf;
fstat(loadlist.fd(), &loadlistbuf);
- wxString strBakFileName(strFileName + wxT(".BAK"));
+ wxString strBakFileName(strFileName + wxT(".bak"));
bool bCreateBackup = true;
wxFile hBakFile;
@@ -319,13 +317,13 @@
}
}
- uint32_t count;
+ wxUint32 count;
loadlist.Read(&count, 4);
// TODO: should be prime number...and 20% larger
- const uint32_t dwExpired = time(NULL) - 12960000;
+ const wxUint32 dwExpired = time(NULL) - 12960000;
// today - 150 day
- uint32_t cDeleted = 0;
- for (uint32_t i = 0 ; i < count ; i++)
+ wxUint32 cDeleted = 0;
+ for (wxUint32 i = 0 ; i < count ; i++)
{
CreditStruct * newcstruct = new CreditStruct;
memset(newcstruct, 0, sizeof(CreditStruct));
@@ -355,19 +353,19 @@
}
}
-void CClientCreditsList::SaveList()
+void CClientCreditsList::Save()
{
m_nLastSaved =::GetTickCount();
- wxString name(DynPrefs::Get<wxString>("app-directory") + wxString(CLIENTS_MET_FILENAME, *wxConvCurrent));
+ wxString strFileName(theApp.GetConfigDir() + wxT("clients.met"));
ofstream savelist;
- savelist.open(name.mb_str(*wxConvCurrent), ofstream::out | ofstream::binary);
+ savelist.open(strFileName.mb_str(*wxConvCurrent), ofstream::out | ofstream::binary);
if (savelist && (savelist.good() == true))
{
- x::BYTE* pBuffer = new x::BYTE[MapData_GetCount(mcc) * sizeof(CreditStruct)];
- uint32_t count = 0;
+ wxByte* pBuffer = new wxByte[MapData_GetCount(mcc) * sizeof(CreditStruct)];
+ wxUint32 count = 0;
CClientCredits* cur_client;
MAP* pos;
pos = mcc;
@@ -427,7 +425,7 @@
{
if (::GetTickCount() - m_nLastSaved > 13 * 60000)
{
- SaveList();
+ Save();
}
}
@@ -451,7 +449,7 @@
m_dwIdentIP = 0;
}
-void CClientCredits::Verified(uint32_t dwForIP)
+void CClientCredits::Verified(wxUint32 dwForIP)
{
m_dwIdentIP = dwForIP;
// client was verified, copy the keyto store him if not done already
@@ -472,7 +470,7 @@
IdentState = IS_IDENTIFIED;
}
-bool CClientCredits::SetSecureIdent(unsigned char * pachIdent, uint8_t nIdentLen)
+bool CClientCredits::SetSecureIdent(unsigned char * pachIdent, wxUint8 nIdentLen)
{
// verified Public key cannot change, use only if there is not public key yet
if (MAXPUBKEYSIZE < nIdentLen || m_pCredits->nKeySize != 0)
@@ -488,7 +486,7 @@
}
}
-EIdentState CClientCredits::GetCurrentIdentState(uint32_t dwForIP)
+EIdentState CClientCredits::GetCurrentIdentState(wxUint32 dwForIP)
{
if (ldwForIP != dwForIP)
{
@@ -548,10 +546,8 @@
}
CreateKeyPair();
}
-
- std::ostringstream erg;
- erg << getenv("HOME") << "/.xMule/cryptkey.dat";
- FileSource filesource(erg.str().c_str(), true, new Base64Decoder);
+ wxString KeyFile (theApp.GetConfigDir() + wxT("cryptkey.dat"));
+ FileSource filesource(KeyFile.mb_str(*wxConvCurrent), true, new Base64Decoder);
m_pSignkey = new RSASSA_PKCS1v15_SHA_Signer(filesource);
// calculate and store public key
RSASSA_PKCS1v15_SHA_Verifier pubkey(*m_pSignkey);
@@ -559,16 +555,6 @@
pubkey.DEREncode(asink);
m_nMyPublicKeyLen = asink.TotalPutLength();
asink.MessageEnd();
- cout << "PublicKey: keylen=" << m_nMyPublicKeyLen << endl;
- for (int i = 0 ; i < m_nMyPublicKeyLen ; i++)
- {
- if ((i >= 12) && (i < 28 || i >= (m_nMyPublicKeyLen - 16)))
- {
- internalbuffer << setfill('0') << setw(2) << hex << m_abyMyPublicKey[i];
- }
- }
- internalbuffer << endl;
- cout << internalbuffer.str().c_str();
}
}
@@ -582,7 +568,7 @@
privkeysink.MessageEnd();
}
-uint8_t CClientCreditsList::CreateSignature(CClientCredits * pTarget, unsigned char * pachOutput, uint8_t nMaxSize, uint32_t ChallengeIP, uint8_t byChaIPKind)
+wxUint8 CClientCreditsList::CreateSignature(CClientCredits * pTarget, unsigned char * pachOutput, wxUint8 nMaxSize, wxUint32 ChallengeIP, wxUint8 byChaIPKind)
{
RSASSA_PKCS1v15_SHA_Signer * sigkey = NULL;
StringSource ss_Pubkey((byte *) pTarget->GetSecureIdent(), pTarget->GetSecIDKeyLen(), true, 0);
@@ -592,12 +578,12 @@
SecByteBlock sbbSignature(sigkey->SignatureLength());
AutoSeededRandomPool rng;
byte abyBuffer[MAXPUBKEYSIZE + 9];
- uint32_t keylen = pTarget->GetSecIDKeyLen();
+ wxUint32 keylen = pTarget->GetSecIDKeyLen();
memcpy(abyBuffer, pTarget->GetSecureIdent(), keylen);
// 4 additional bytes random data send from this client
- uint32_t challenge = pTarget->m_dwCryptRndChallengeFrom;
+ wxUint32 challenge = pTarget->m_dwCryptRndChallengeFrom;
memcpy(abyBuffer + keylen, & challenge, 4);
- uint16_t ChIpLen = 4;
+ wxUint16 ChIpLen = 4;
if (byChaIPKind != 0)
{
memcpy(abyBuffer + keylen + 4, & ChallengeIP, 4);
@@ -617,10 +603,10 @@
{
pachOutput[i] = ((unsigned char *) sbbSignature.begin()) [i];
}
- return(uint8_t) nMaxSize;
+ return(wxUint8) nMaxSize;
}
-bool CClientCreditsList::VerifyIdent(CClientCredits * pTarget, unsigned char * pachSignature, uint8_t nInputSize, uint32_t dwForIP, uint8_t byChaIPKind)
+bool CClientCreditsList::VerifyIdent(CClientCredits * pTarget, unsigned char * pachSignature, wxUint8 nInputSize, wxUint32 dwForIP, wxUint8 byChaIPKind)
{
bool bResult;
StringSource ss_Pubkey((byte *) pTarget->GetSecureIdent(), pTarget->GetSecIDKeyLen(), true, 0);
@@ -628,14 +614,14 @@
// 4 additional bytes random data send from this client +5 bytes v2
byte abyBuffer[MAXPUBKEYSIZE + 9];
memcpy(abyBuffer, m_abyMyPublicKey, m_nMyPublicKeyLen);
- uint32_t challenge = pTarget->m_dwCryptRndChallengeFor;
+ wxUint32 challenge = pTarget->m_dwCryptRndChallengeFor;
memcpy(abyBuffer + m_nMyPublicKeyLen, & challenge, 4);
// v2 security improvments (not supported by 29b, not used as default by 29c)
- uint8_t nChIpSize = 0;
+ wxUint8 nChIpSize = 0;
if (byChaIPKind != 0)
{
nChIpSize = 5;
- uint32_t ChallengeIP = 0;
+ wxUint32 ChallengeIP = 0;
switch (byChaIPKind)
{
case CRYPT_CIP_LOCALCLIENT:
@@ -678,7 +664,7 @@
return(m_nMyPublicKeyLen > 0 && m_pSignkey != 0 && DynPrefs::Get<bool>("secure-ident"));
}
-uint32_t CClientCredits::GetSecureWaitStartTime(uint32_t dwForIP)
+wxUint32 CClientCredits::GetSecureWaitStartTime(wxUint32 dwForIP)
{
if (m_dwUnSecureWaitTime == 0 || m_dwSecureWaitTime == 0)
SetSecWaitStartTime(dwForIP);
@@ -714,7 +700,7 @@
}
}
-void CClientCredits::SetSecWaitStartTime(uint32_t dwForIP)
+void CClientCredits::SetSecWaitStartTime(wxUint32 dwForIP)
{
m_dwUnSecureWaitTime =::GetTickCount() - 1;
m_dwSecureWaitTime =::GetTickCount() - 1;
Modified: trunk/src/ClientCredits.h
===================================================================
--- trunk/src/ClientCredits.h 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/ClientCredits.h 2007-01-10 00:59:39 UTC (rev 116)
@@ -23,16 +23,16 @@
#define CRYPT_CIP_LOCALCLIENT 20
#define CRYPT_CIP_NONECLIENT 30
-#include "wintypes.h" // x::BYTE
+#include "wintypes.h" // wxByte
-#include <stdint.h> // uint16_t, uint32_t
#include <wx/defs.h> // wxByte
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif // HAVE_CONFIG_H
-#if !HAVE_CRYPTOPP
+//#if !HAVE_CRYPTOPP
+#if 0
#include "CryptoXMpp.h"
#else
#include <cryptopp/cryptlib.h>
@@ -43,29 +43,28 @@
#define MAXPUBKEYSIZE 80
class CPreferences;
-namespace Botan { class RSA_PrivateKey; }
#pragma pack(1)
struct CreditStruct_29a
{
wxByte abyKey[16];
- uint32_t nUploadedLo; // uploaded TO him
- uint32_t nDownloadedLo; // downloaded from him
- uint32_t nLastSeen;
- uint32_t nUploadedHi; // upload high 32
- uint32_t nDownloadedHi; // download high 32
- uint16_t nReserved3;
+ wxUint32 nUploadedLo; // uploaded TO him
+ wxUint32 nDownloadedLo; // downloaded from him
+ wxUint32 nLastSeen;
+ wxUint32 nUploadedHi; // upload high 32
+ wxUint32 nDownloadedHi; // download high 32
+ wxUint16 nReserved3;
};
-struct CreditStruct {
+struct CreditStruct{
wxByte abyKey[16];
- uint32_t nUploadedLo; // uploaded TO him
- uint32_t nDownloadedLo; // downloaded from him
- uint32_t nLastSeen;
- uint32_t nUploadedHi; // upload high 32
- uint32_t nDownloadedHi; // download high 32
- uint16_t nReserved3;
- uint8_t nKeySize;
+ wxUint32 nUploadedLo; // uploaded TO him
+ wxUint32 nDownloadedLo; // downloaded from him
+ wxUint32 nLastSeen;
+ wxUint32 nUploadedHi; // upload high 32
+ wxUint32 nDownloadedHi; // download high 32
+ wxUint16 nReserved3;
+ wxUint8 nKeySize;
wxByte abySecureIdent[MAXPUBKEYSIZE];
};
#pragma pack()
@@ -97,70 +96,69 @@
return m_abyPublicKey;
}
- uint8_t GetSecIDKeyLen() { return m_nPublicKeyLen; }
+ wxUint8 GetSecIDKeyLen() { return m_nPublicKeyLen; }
CreditStruct* GetDataStruct() { return m_pCredits; }
void ClearWaitStartTime();
- void AddDownloaded(uint32_t bytes, uint32_t dwForIP);
- void AddUploaded(uint32_t bytes, uint32_t dwForIP);
- uint64_t GetUploadedTotal();
- uint64_t GetDownloadedTotal();
- float GetScoreRatio(uint32_t dwForIP);
- float GetMyScoreRatio(uint32_t dwForIP); //added by sivka [VQB: -ownCredits-]
+ void AddDownloaded(wxUint32 bytes, wxUint32 dwForIP);
+ void AddUploaded(wxUint32 bytes, wxUint32 dwForIP);
+ wxUint64 GetUploadedTotal();
+ wxUint64 GetDownloadedTotal();
+ float GetScoreRatio(wxUint32 dwForIP);
+ float GetMyScoreRatio(wxUint32 dwForIP); //added by sivka [VQB: -ownCredits-]
void SetLastSeen() { m_pCredits->nLastSeen = time(NULL); }
- bool SetSecureIdent(wxByte* pachIdent,uint8_t nIdentLen);
- void ShowCHandPK(uint32_t challenge,wxByte* publickey,int length);
+ bool SetSecureIdent(wxByte* pachIdent,wxUint8 nIdentLen);
+ void ShowCHandPK(wxUint32 challenge,wxByte* publickey,int length);
- uint32_t m_dwCryptRndChallengeFor;
- uint32_t m_dwCryptRndChallengeFrom;
- EIdentState GetCurrentIdentState(uint32_t dwForIP);
+ wxUint32 m_dwCryptRndChallengeFor;
+ wxUint32 m_dwCryptRndChallengeFrom;
+ EIdentState GetCurrentIdentState(wxUint32 dwForIP);
- uint32_t GetSecureWaitStartTime(uint32_t dwForIP);
- void SetSecWaitStartTime(uint32_t dwForIP);
+ wxUint32 GetSecureWaitStartTime(wxUint32 dwForIP);
+ void SetSecWaitStartTime(wxUint32 dwForIP);
protected:
- void Verified(uint32_t dwForIP);
+ void Verified(wxUint32 dwForIP);
EIdentState IdentState;
private:
void InitalizeIdent();
CreditStruct* m_pCredits;
- x::BYTE m_abyPublicKey[80];
- uint8_t m_nPublicKeyLen;
- uint32_t m_dwIdentIP;
- uint32_t m_dwWaitTime;
- uint32_t m_dwSecureWaitTime;
- uint32_t m_dwUnSecureWaitTime;
- uint32_t m_dwWaitTimeIP;
+ wxByte m_abyPublicKey[80];
+ wxUint8 m_nPublicKeyLen;
+ wxUint32 m_dwIdentIP;
+ wxUint32 m_dwWaitTime;
+ wxUint32 m_dwSecureWaitTime;
+ wxUint32 m_dwUnSecureWaitTime;
+ wxUint32 m_dwWaitTimeIP;
};
class CClientCreditsList
{
public:
- CClientCreditsList(CPreferences* in_prefs);
+ CClientCreditsList();
~CClientCreditsList();
+ void Load();
+ void Save();
+
// return signature size, 0 = Failed | use sigkey param for debug only
- uint8_t CreateSignature(CClientCredits* pTarget, wxByte* pachOutput, uint8_t nMaxSize, uint32_t ChallengeIP, uint8_t byChaIPKind);
- //CryptoXMpp::RSASSA_PKCS1v15_SHA_Signer* sigkey = NULL);
- bool VerifyIdent(CClientCredits* pTarget, wxByte* pachSignature, uint8_t nInputSize, uint32_t dwForIP, uint8_t byChaIPKind);
+ wxUint8 CreateSignature(CClientCredits* pTarget, wxByte* pachOutput, wxUint8 nMaxSize, wxUint32 ChallengeIP, wxUint8 byChaIPKind);
+ bool VerifyIdent(CClientCredits* pTarget, wxByte* pachSignature, wxUint8 nInputSize, wxUint32 dwForIP, wxUint8 byChaIPKind);
+
CClientCredits* GetCredit(wxByte* key);
-
void Process();
- uint8_t GetPubKeyLen() { return m_nMyPublicKeyLen; }
- x::BYTE* GetPublicKey() { return m_abyMyPublicKey; }
+ wxUint8 GetPubKeyLen() { return m_nMyPublicKeyLen; }
+ wxByte* GetPublicKey() { return m_abyMyPublicKey; }
bool CryptoAvailable();
+
protected:
- void LoadList();
- void SaveList();
void InitalizeCrypting();
void CreateKeyPair();
private:
- CPreferences* m_pAppPrefs;
- Botan::RSA_PrivateKey* m_private_key;
- uint32_t m_nLastSaved;
+ wxUint32 m_nLastSaved;
CryptoXMpp::RSASSA_PKCS1v15_SHA_Signer* m_pSignkey;
- x::BYTE m_abyMyPublicKey[80];
- uint8_t m_nMyPublicKeyLen;
+ wxByte m_abyMyPublicKey[80];
+ wxUint8 m_nMyPublicKeyLen;
};
#endif // _CLIENTCREDITS_H_
Modified: trunk/src/ClientDetailDialog.cpp
===================================================================
--- trunk/src/ClientDetailDialog.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/ClientDetailDialog.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -32,17 +32,20 @@
#include "updownclient.h" // CUpDownClient
#include "xmule.h" // theApp
-#include <arpa/inet.h>
#include <iomanip> // std::setfill
-#include <netdb.h>
-#include <netinet/in.h>
#include <sstream> // std::ostringstream
#include <string> // std::string
-#include <sys/socket.h>
#include <wx/intl.h> // _()
#include <wx/sizer.h> // wxSizer
#include <wx/stattext.h> // wxStaticText
+#ifndef __WXMSW__
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#endif
+
#define GetDlgItem(a,b) wxStaticCast(FindWindowById((a)),b)
#define IsDlgButtonChecked(x) XRCCTRL(*this,#x,wxCheckBox)->GetValue()
#define CheckDlgButton(x,y) XRCCTRL(*this,#x,wxCheckBox)->SetValue(y)
@@ -58,36 +61,22 @@
wxSizer *content = clientDetails(this, true);
content->Show(this, true);
Centre();
- OnInitDialog();
-}
-
-CClientDetailDialog::~CClientDetailDialog()
-{
-}
-
-void CClientDetailDialog::OnBnClose(wxCommandEvent &evt)
-{
- EndModal(0);
-}
-
-bool CClientDetailDialog::OnInitDialog()
-{
Localize();
- if (m_client->GetUserName())
+ if (m_client->GetTheUserName())
{
- GetDlgItem(ID_DNAME, wxStaticText)->SetLabel(wxString(m_client->GetUserName(), *wxConvCurrent));
+ GetDlgItem(ID_DNAME, wxStaticText)->SetLabel(wxString(m_client->GetTheUserName(), *wxConvCurrent));
}
else
{
GetDlgItem(ID_DNAME, wxStaticText)->SetLabel(wxT("?"));
}
- if (m_client->GetUserName())
+ if (m_client->GetTheUserName())
{
std::stringstream in;
- for (uint16_t i = 0; i != 16; ++i)
+ for (wxUint16 i = 0; i != 16; ++i)
{
in << std::setfill('0') << std::setw(2) << std::hex << static_cast<unsigned int>(m_client->GetUserHash()[i]);
}
@@ -302,7 +291,7 @@
GetDlgItem(ID_DRATIO, wxStaticText)->SetLabel(wxT("?"));
}
- if (m_client->GetUserName())
+ if (m_client->GetTheUserName())
{
std::stringstream in;
in << std::fixed << std::setprecision(1) << m_client->GetScore(m_client->IsDownloading(), true);
@@ -323,10 +312,17 @@
{
GetDlgItem(ID_DSCORE, wxStaticText)->SetLabel(wxT("-"));
}
-
- return true;
}
+CClientDetailDialog::~CClientDetailDialog()
+{
+}
+
+void CClientDetailDialog::OnBnClose(wxCommandEvent &evt)
+{
+ EndModal(0);
+}
+
void CClientDetailDialog::Localize()
{
}
Modified: trunk/src/ClientDetailDialog.h
===================================================================
--- trunk/src/ClientDetailDialog.h 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/ClientDetailDialog.h 2007-01-10 00:59:39 UTC (rev 116)
@@ -21,7 +21,6 @@
#include "resource.h" // IDD_SOURCEDETAILWND
-#include <stdint.h> // uint16_t
#include <wx/dialog.h> // wxDialog
class CUpDownClient;
@@ -30,12 +29,11 @@
{
public:
CClientDetailDialog(wxWindow* parent, CUpDownClient* client); // standard constructor
- void Localize();
virtual ~CClientDetailDialog();
- virtual bool OnInitDialog();
- // Dialog Data
- enum { IDD = IDD_SOURCEDETAILWND };
+ void Localize();
+ enum { IDD = IDD_SOURCEDETAILWND }; // Dialog Data
+
protected:
void OnBnClose(wxCommandEvent& evt);
DECLARE_EVENT_TABLE()
Modified: trunk/src/ClientList.cpp
===================================================================
--- trunk/src/ClientList.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/ClientList.cpp 2007-01-10 00:59:39 UTC (rev 116)
@@ -36,7 +36,7 @@
{
}
-void CClientList::GetStatistics(uint32_t &totalclient, int stats[], std::map<uint16_t, uint32_t>* clientVersionEDonkey, std::map< uint16_t, uint32_t >* clientVersionEDonkeyHybrid, std::map< uint8_t, uint32_t >* clientVersionEMule)
+void CClientList::GetStatistics(wxUint32 &totalclient, int stats[], std::map<wxUint16, wxUint32>* clientVersionEDonkey, std::map< wxUint16, wxUint32 >* clientVersionEDonkeyHybrid, std::map< wxUint8, wxUint32 >* clientVersionEMule)
{
memset(stats, 0, 8 * sizeof(int));
totalclient = list.GetCount();
@@ -75,7 +75,7 @@
stats[2]++;
if (clientVersionEMule)
{
- uint8_t version = cur_client->GetMuleVersion();
+ wxUint8 version = cur_client->GetMuleVersion();
( *clientVersionEMule) [version]++;
}
break;
@@ -170,7 +170,7 @@
return false;
}
-CUpDownClient *CClientList::FindClientByIP(uint32_t clientip, uint16_t port)
+CUpDownClient *CClientList::FindClientByIP(wxUint32 clientip, wxUint16 port)
{
POSITION pos1, pos2;
for (pos1 = list.GetHeadPosition() ; (pos2 = pos1) != NULL ;)
@@ -183,7 +183,7 @@
return 0;
}
-CUpDownClient *CClientList::FindClientByUserHash(unsigned char *clienthash)
+CUpDownClient *CClientList::FindClientByUserHash(char *clienthash)
{
POSITION pos1, pos2;
for (pos1 = list.GetHeadPosition() ; (pos2 = pos1) != NULL ;)
Modified: trunk/src/ClientList.h
===================================================================
--- trunk/src/ClientList.h 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/ClientList.h 2007-01-10 00:59:39 UTC (rev 116)
@@ -22,7 +22,7 @@
#include "mfc.h" // CTypedPtrList
#include <map> // std::map
-#include <stdint.h> // uint8_t, uint16_t, uint32_t
+#include <wx/defs.h> // wxWidgets Types
class CClientReqSocket;
class CUpDownClient;
@@ -34,13 +34,13 @@
~CClientList();
void AddClient(CUpDownClient* toadd,bool bSkipDupTest = false);
void RemoveClient(CUpDownClient* toremove);
- void GetStatistics(uint32_t &totalclient, int stats[], std::map<uint16_t, uint32_t>* clientVersionEDonkey = NULL, std::map< uint16_t, uint32_t >* clientVersionEDonkeyHybrid = NULL, std::map< uint8_t, uint32_t >* clientVersionEMule = NULL);
+ void GetStatistics(wxUint32 &totalclient, int stats[], std::map<wxUint16, wxUint32>* clientVersionEDonkey = NULL, std::map< wxUint16, wxUint32 >* clientVersionEDonkeyHybrid = NULL, std::map< wxUint8, wxUint32 >* clientVersionEMule = NULL);
void DeleteAll();
bool AttachToAlreadyKnown(CUpDownClient** client, CClientReqSocket* sender);
- CUpDownClient* FindClientByIP(uint32_t clientip,uint16_t port);
- CUpDownClient* FindClientByUserHash(unsigned char* clienthash);
+ CUpDownClient* FindClientByIP(wxUint32 clientip,wxUint16 port);
+ CUpDownClient* FindClientByUserHash(char* clienthash);
CUpDownClient* VUGetRandomClient();
- bool VerifyUpload(uint32_t clientip,uint16_t port);
+ bool VerifyUpload(wxUint32 clientip,wxUint16 port);
bool Debug_IsValidClient(CUpDownClient* tocheck);
void Debug_SocketDeleted(CClientReqSocket* deleted);
Modified: trunk/src/ClientUDPSocket.cpp
===================================================================
--- trunk/src/ClientUDPSocket.cpp 2006-12-15 03:48:01 UTC (rev 115)
+++ trunk/src/ClientUDPSocket.cpp 2007-01-10 00:59:39 UTC (rev ...
[truncated message content] |
|
From: <hop...@us...> - 2006-12-15 03:48:06
|
Revision: 115
http://svn.sourceforge.net/xmule/?rev=115&view=rev
Author: hopeseekr
Date: 2006-12-14 19:48:01 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
Fixes, for real, precompiled header support.
Modified Paths:
--------------
trunk/src/GNUmakefile.in
trunk/src/xmule-headers.h
Modified: trunk/src/GNUmakefile.in
===================================================================
--- trunk/src/GNUmakefile.in 2006-12-14 22:09:48 UTC (rev 114)
+++ trunk/src/GNUmakefile.in 2006-12-15 03:48:01 UTC (rev 115)
@@ -18,7 +18,7 @@
LIBS = -L../xLibs -lDynPrefs -liniparser -lwxMultiTree -lz @WX_LIBS@
ifeq ($(USE_PCH), yes)
- CXXFLAGS += -DPRECOMP -DWX_PRECOMP -Winvalid-pch
+ CXXFLAGS += -DPRECOMP -DWX_PRECOMP -Winvalid-pch -include xmule-headers.h
endif
ifeq ($(HAVE_XRC), no)
Modified: trunk/src/xmule-headers.h
===================================================================
--- trunk/src/xmule-headers.h 2006-12-14 22:09:48 UTC (rev 114)
+++ trunk/src/xmule-headers.h 2006-12-15 03:48:01 UTC (rev 115)
@@ -21,7 +21,10 @@
#ifndef __XMULE_HEADERS_H_
#define __XMULE_HEADERS_H_
-#include <wx/wx.h>
+#define wX_PRECOMP 1
+#include "wx/wx.h"
+
+
#include "AddFileThread.h"
#include "AddFriend.h"
#include "BarShader.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hop...@us...> - 2006-12-14 22:10:06
|
Revision: 114
http://svn.sourceforge.net/xmule/?rev=114&view=rev
Author: hopeseekr
Date: 2006-12-14 14:09:48 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
wxListCtrl -> wxListView.
Modified Paths:
--------------
trunk/src/MuleListCtrl.cpp
trunk/src/MuleListCtrl.h
trunk/src/xmule-headers.h
Modified: trunk/src/MuleListCtrl.cpp
===================================================================
--- trunk/src/MuleListCtrl.cpp 2006-12-14 03:48:13 UTC (rev 113)
+++ trunk/src/MuleListCtrl.cpp 2006-12-14 22:09:48 UTC (rev 114)
@@ -68,7 +68,7 @@
}
CMuleListCtrl::CMuleListCtrl(std::string list_name, wxWindow *&parent, int id, const wxPoint &pos, wxSize siz, int flags)
-: wxListCtrl(parent, id, pos, siz, flags)
+: wxListView(parent, id, pos, siz, flags)
{
m_name = list_name;
m_bCustomDraw = false;
Modified: trunk/src/MuleListCtrl.h
===================================================================
--- trunk/src/MuleListCtrl.h 2006-12-14 03:48:13 UTC (rev 113)
+++ trunk/src/MuleListCtrl.h 2006-12-14 22:09:48 UTC (rev 114)
@@ -26,7 +26,7 @@
#include <wx/event.h> // DECLARE_DYNAMIC_CLASS
#include <wx/listctrl.h> // wxListCtrl
-class CMuleListCtrl : public wxListCtrl
+class CMuleListCtrl : public wxListView
{
DECLARE_DYNAMIC_CLASS(CMuleListCtrl)
Modified: trunk/src/xmule-headers.h
===================================================================
--- trunk/src/xmule-headers.h 2006-12-14 03:48:13 UTC (rev 113)
+++ trunk/src/xmule-headers.h 2006-12-14 22:09:48 UTC (rev 114)
@@ -21,7 +21,7 @@
#ifndef __XMULE_HEADERS_H_
#define __XMULE_HEADERS_H_
-
+#include <wx/wx.h>
#include "AddFileThread.h"
#include "AddFriend.h"
#include "BarShader.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|