summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/FingerprintNG/fingerprint_ng_10.vcxproj8
-rw-r--r--plugins/FingerprintNG/fingerprint_ng_10.vcxproj.filters4
-rw-r--r--plugins/FingerprintNG/fingerprint_ng_11.vcxproj8
-rw-r--r--plugins/FingerprintNG/fingerprint_ng_11.vcxproj.filters4
-rw-r--r--plugins/FingerprintNG/res/version.rc4
-rw-r--r--plugins/FingerprintNG/src/fingerprint.cpp26
-rw-r--r--plugins/FingerprintNG/src/global.h25
-rw-r--r--plugins/FingerprintNG/src/version.h2
8 files changed, 30 insertions, 51 deletions
diff --git a/plugins/FingerprintNG/fingerprint_ng_10.vcxproj b/plugins/FingerprintNG/fingerprint_ng_10.vcxproj
index 1d7357c591..c3dea35c41 100644
--- a/plugins/FingerprintNG/fingerprint_ng_10.vcxproj
+++ b/plugins/FingerprintNG/fingerprint_ng_10.vcxproj
@@ -75,7 +75,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@@ -102,7 +102,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -133,7 +133,7 @@
<StringPooling>true</StringPooling>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>
<FunctionLevelLinking>true</FunctionLevelLinking>
<ExceptionHandling>false</ExceptionHandling>
@@ -157,7 +157,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
diff --git a/plugins/FingerprintNG/fingerprint_ng_10.vcxproj.filters b/plugins/FingerprintNG/fingerprint_ng_10.vcxproj.filters
index 936866f2ed..7fae864f91 100644
--- a/plugins/FingerprintNG/fingerprint_ng_10.vcxproj.filters
+++ b/plugins/FingerprintNG/fingerprint_ng_10.vcxproj.filters
@@ -27,7 +27,6 @@
<ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="res\resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\fingerprint.cpp">
@@ -50,9 +49,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="res\icons.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
<ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
diff --git a/plugins/FingerprintNG/fingerprint_ng_11.vcxproj b/plugins/FingerprintNG/fingerprint_ng_11.vcxproj
index c0d0c6e5bc..112a5b9f9b 100644
--- a/plugins/FingerprintNG/fingerprint_ng_11.vcxproj
+++ b/plugins/FingerprintNG/fingerprint_ng_11.vcxproj
@@ -79,7 +79,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@@ -106,7 +106,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -137,7 +137,7 @@
<StringPooling>true</StringPooling>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>
<FunctionLevelLinking>true</FunctionLevelLinking>
<ExceptionHandling>false</ExceptionHandling>
@@ -161,7 +161,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
diff --git a/plugins/FingerprintNG/fingerprint_ng_11.vcxproj.filters b/plugins/FingerprintNG/fingerprint_ng_11.vcxproj.filters
index 936866f2ed..7fae864f91 100644
--- a/plugins/FingerprintNG/fingerprint_ng_11.vcxproj.filters
+++ b/plugins/FingerprintNG/fingerprint_ng_11.vcxproj.filters
@@ -27,7 +27,6 @@
<ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="res\resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\fingerprint.cpp">
@@ -50,9 +49,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="res\icons.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
<ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
diff --git a/plugins/FingerprintNG/res/version.rc b/plugins/FingerprintNG/res/version.rc
index d741488c4f..5bfbab4754 100644
--- a/plugins/FingerprintNG/res/version.rc
+++ b/plugins/FingerprintNG/res/version.rc
@@ -7,10 +7,6 @@
#include "afxres.h"
#include "..\src\version.h"
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#endif //_WIN32
-
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
PRODUCTVERSION __FILEVERSION_STRING
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp
index 8c92a6e6e2..e6e1a520f3 100644
--- a/plugins/FingerprintNG/src/fingerprint.cpp
+++ b/plugins/FingerprintNG/src/fingerprint.cpp
@@ -42,7 +42,7 @@ static TCHAR* getSectionName(int flag)
return NULL;
}
-void FASTCALL Prepare(KN_FP_MASK* mask, bool bEnable)
+void __fastcall Prepare(KN_FP_MASK* mask, bool bEnable)
{
mask->szMaskUpper = NULL;
@@ -159,7 +159,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
* 3)Set ExtraImage for contact
*/
-int FASTCALL ApplyFingerprintImage(HANDLE hContact, LPTSTR szMirVer)
+int __fastcall ApplyFingerprintImage(HANDLE hContact, LPTSTR szMirVer)
{
if (hContact == NULL)
return 0;
@@ -283,7 +283,7 @@ int OnContactSettingChanged(WPARAM wParam, LPARAM lParam)
* IF Mask match - comparing stops as TRUE
* IF Mask does not not match comparing continue
*/
-BOOL FASTCALL WildCompareA(LPSTR szName, LPSTR szMask)
+BOOL __fastcall WildCompareA(LPSTR szName, LPSTR szMask)
{
if (*szMask != '|')
return WildCompareProcA(szName, szMask);
@@ -337,7 +337,7 @@ BOOL FASTCALL WildCompareA(LPSTR szName, LPSTR szMask)
* IF Mask match - comparing stops as TRUE
* IF Mask does not not match comparing continue
*/
-BOOL FASTCALL WildCompareW(LPWSTR wszName, LPWSTR wszMask)
+BOOL __fastcall WildCompareW(LPWSTR wszName, LPWSTR wszMask)
{
if (wszMask == NULL)
return NULL;
@@ -500,7 +500,7 @@ static void MatchMasks(TCHAR* szMirVer, short *base, short *overlay, short *over
* Retrieves Icons indexes by Mirver
*/
-void FASTCALL GetIconsIndexesA(LPSTR szMirVer, short *base, short *overlay, short *overlay2, short *overlay3, short *overlay4)
+void __fastcall GetIconsIndexesA(LPSTR szMirVer, short *base, short *overlay, short *overlay2, short *overlay3, short *overlay4)
{
if (strcmp(szMirVer, "?") == 0) {
*base = UNKNOWN_MASK_NUMBER;
@@ -521,7 +521,7 @@ void FASTCALL GetIconsIndexesA(LPSTR szMirVer, short *base, short *overlay, shor
* Retrieves Icons indexes by Mirver
*/
-void FASTCALL GetIconsIndexesW(LPWSTR wszMirVer, short *base, short *overlay, short *overlay2, short *overlay3, short *overlay4)
+void __fastcall GetIconsIndexesW(LPWSTR wszMirVer, short *base, short *overlay, short *overlay2, short *overlay3, short *overlay4)
{
if (wcscmp(wszMirVer, L"?") == 0)
{
@@ -543,7 +543,7 @@ void FASTCALL GetIconsIndexesW(LPWSTR wszMirVer, short *base, short *overlay, sh
* returns hIcon of joined icon by given indexes
*/
-HICON FASTCALL CreateIconFromIndexes(short base, short overlay, short overlay2, short overlay3, short overlay4)
+HICON __fastcall CreateIconFromIndexes(short base, short overlay, short overlay2, short overlay3, short overlay4)
{
HICON hIcon = NULL; // returned HICON
HICON hTmp = NULL;
@@ -800,7 +800,7 @@ HBITMAP __inline CreateBitmap32(int cx, int cy)
* CreateBitmap32 - Create DIB 32 bitmap with sizes cx*cy and put reference
* to new bitmap pixel image memory area to void ** bits
*/
-HBITMAP FASTCALL CreateBitmap32Point(int cx, int cy, LPVOID* bits)
+HBITMAP __fastcall CreateBitmap32Point(int cx, int cy, LPVOID* bits)
{
BITMAPINFO bmpi = { 0 };
LPVOID ptPixels = NULL;
@@ -831,7 +831,7 @@ HBITMAP FASTCALL CreateBitmap32Point(int cx, int cy, LPVOID* bits)
* checkHasAlfa - checks if image has at least one BYTE in alpha channel
* that is not a 0. (is image real 32 bit or just 24 bit)
*/
-BOOL FASTCALL checkHasAlfa(LPBYTE from, int width, int height)
+BOOL __fastcall checkHasAlfa(LPBYTE from, int width, int height)
{
LPDWORD pt = (LPDWORD)from;
LPDWORD lim = pt + width * height;
@@ -849,7 +849,7 @@ BOOL FASTCALL checkHasAlfa(LPBYTE from, int width, int height)
* checkMaskUsed - checks if mask image has at least one that is not a 0.
* Not sure is it required or not
*/
-BOOL FASTCALL checkMaskUsed(LPBYTE from)
+BOOL __fastcall checkMaskUsed(LPBYTE from)
{
int i;
for (i=0; i < 16 * 16 / 8; i++)
@@ -871,7 +871,7 @@ BOOL __inline GetMaskBit(LPBYTE line, int x)
* blend - alpha blend ARGB values of 2 pixels. X1 - underlaying,
* X2 - overlaying points.
*/
-DWORD FASTCALL blend(DWORD X1,DWORD X2)
+DWORD __fastcall blend(DWORD X1,DWORD X2)
{
RGBA* q1 = (RGBA*)&X1;
RGBA* q2 = (RGBA*)&X2;
@@ -900,7 +900,7 @@ DWORD FASTCALL blend(DWORD X1,DWORD X2)
/*
* CreateJoinedIcon - creates new icon by drawing hTop over hBottom.
*/
-HICON FASTCALL CreateJoinedIcon(HICON hBottom, HICON hTop)
+HICON __fastcall CreateJoinedIcon(HICON hBottom, HICON hTop)
{
BOOL drawn = FALSE;
HDC tempDC, tempDC2, tempDC3;
@@ -1075,7 +1075,7 @@ HICON FASTCALL CreateJoinedIcon(HICON hBottom, HICON hTop)
return res;
}
-HANDLE FASTCALL GetIconIndexFromFI(LPTSTR szMirVer)
+HANDLE __fastcall GetIconIndexFromFI(LPTSTR szMirVer)
{
short base, overlay, overlay2, overlay3, overlay4;
GetIconsIndexes(szMirVer, &base, &overlay, &overlay2, &overlay3, &overlay4);
diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h
index d6f860bed8..5212741a27 100644
--- a/plugins/FingerprintNG/src/global.h
+++ b/plugins/FingerprintNG/src/global.h
@@ -41,34 +41,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//Start of header
// Native include
#include <windows.h>
-#include <windowsx.h>
#include <malloc.h>
// Miranda IM SDK includes
#include <newpluginapi.h>
#include <win2k.h>
-#include <m_cluiframes.h>
#include <m_database.h>
-#include <m_options.h>
#include <m_langpack.h>
#include <m_icolib.h>
#include <m_protocols.h>
#include <m_userinfo.h>
#include <m_extraicons.h>
+#include <m_fingerprint.h>
+
//plugins header
#include "version.h"
-#include "m_fingerprint.h"
#include "resource.h"
#include "utilities.h"
-#if defined(__GNUC__)
-#define _alloca alloca
-//#define FASTCALL
-#else
-#define FASTCALL __fastcall
-#endif
-
typedef struct {
BYTE b;
BYTE g;
@@ -150,17 +141,17 @@ INT_PTR ServiceGetClientIconA(WPARAM wParam, LPARAM lParam);
INT_PTR ServiceSameClientsW(WPARAM wParam, LPARAM lParam);
INT_PTR ServiceGetClientIconW(WPARAM wParam, LPARAM lParam);
-HICON FASTCALL CreateJoinedIcon(HICON hBottom, HICON hTop);
+HICON __fastcall CreateJoinedIcon(HICON hBottom, HICON hTop);
HBITMAP __inline CreateBitmap32(int cx, int cy);
-HBITMAP FASTCALL CreateBitmap32Point(int cx, int cy, LPVOID* bits);
-HANDLE FASTCALL GetIconIndexFromFI(LPTSTR szMirVer);
+HBITMAP __fastcall CreateBitmap32Point(int cx, int cy, LPVOID* bits);
+HANDLE __fastcall GetIconIndexFromFI(LPTSTR szMirVer);
-BOOL FASTCALL WildCompareA(LPSTR name, LPSTR mask);
-BOOL FASTCALL WildCompareW(LPWSTR name, LPWSTR mask);
+BOOL __fastcall WildCompareA(LPSTR name, LPSTR mask);
+BOOL __fastcall WildCompareW(LPWSTR name, LPWSTR mask);
BOOL __inline WildCompareProcA(LPSTR name, LPSTR mask);
BOOL __inline WildCompareProcW(LPWSTR name, LPWSTR mask);
-void FASTCALL Prepare(KN_FP_MASK* mask);
+void __fastcall Prepare(KN_FP_MASK* mask);
void RegisterIcons();
#define WildCompare WildCompareW
diff --git a/plugins/FingerprintNG/src/version.h b/plugins/FingerprintNG/src/version.h
index 19b35a17f8..76f3adaa93 100644
--- a/plugins/FingerprintNG/src/version.h
+++ b/plugins/FingerprintNG/src/version.h
@@ -30,4 +30,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define __AUTHOR "faith_healer, ghazan, mataes"
#define __AUTHOREMAIL "faith_healer@miranda.im"
#define __AUTHORWEB "http://miranda-ng.org/"
-#define __COPYRIGHT "©2006-12 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
+#define __COPYRIGHT "© 2006-12 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 02:36:57 +0000