From 8e2a004d967dd3faea172fbed655b0b45c826d54 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 9 Jan 2015 19:38:12 +0000 Subject: SkypeClassic: Upmerge with leecher's repo: -Implemented Filetransfer extensions for receiving files and avatars via SkypeProxy (sending via SkypeProxy not working yet). -Added option to disable the check for SENT messages as newer Skype versions don't send this notification anymore. -Various little code fixes. Other changes: - Fixed memory leak - Fixed crash in x64 builds - Translation fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@11805 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeClassic/src/skypeproxy/skypeproxy.h | 35 ++++------------------ .../SkypeClassic/src/skypeproxy/skypeproxy_int.h | 32 ++++++++++++++++++++ 2 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 protocols/SkypeClassic/src/skypeproxy/skypeproxy_int.h (limited to 'protocols/SkypeClassic/src/skypeproxy') diff --git a/protocols/SkypeClassic/src/skypeproxy/skypeproxy.h b/protocols/SkypeClassic/src/skypeproxy/skypeproxy.h index 8ce122990b..75a5de42ab 100644 --- a/protocols/SkypeClassic/src/skypeproxy/skypeproxy.h +++ b/protocols/SkypeClassic/src/skypeproxy/skypeproxy.h @@ -1,36 +1,11 @@ -/*** Skype API ***/ -//Messages -#define SKYPECONTROLAPI_ATTACH_SUCCESS 0 -#define SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION 1 -#define SKYPECONTROLAPI_ATTACH_REFUSED 2 -#define SKYPECONTROLAPI_ATTACH_NOT_AVAILABLE 3 -#define SKYPECONTROLAPI_ATTACH_API_AVAILABLE 0x8001 - -// Errors -#define MISC_ERROR 1 -#define USER_NOT_FOUND 2 -#define USER_NOT_ONLINE 3 -#define USER_BLOCKED 4 -#define TYPE_UNSUPPORTED 5 -#define SENDER_NOT_FRIEND 6 -#define SENDER_NOT_AUTHORIZED 7 - - -/*** Debugging macros ***/ -#define OUTPUT(a) printf("* %s\n", a); -#define LOG(a, b) printf("- %s: %s\n", a, b); -#define LOGL(a, b) printf("- %s: %d\n", a, b); - /*** Program settings ***/ -#define PING_INTERVAL 10000 // Ping every 10000 msec to see if Skype is still available #define USE_AUTHENTICATION 0x01 // Program supports authentication -> Comment to disable! +#define USE_DATASLOTS 0x02 // Supports Commands >=3 /*** Commands ***/ #define AUTHENTICATE 0x01 #define CAPABILITIES 0x02 - -/*** Sockets ***/ -#pragma comment(lib, "ws2_32") - -/*** Prototypes ***/ -void WatchDogTimer(char *); \ No newline at end of file +#define MY_CAPABILITIES 0x03 +#define OPEN_SLOT 0x04 +#define DATA_SLOT 0x05 +#define CLOSE_SLOT 0x06 diff --git a/protocols/SkypeClassic/src/skypeproxy/skypeproxy_int.h b/protocols/SkypeClassic/src/skypeproxy/skypeproxy_int.h new file mode 100644 index 0000000000..f40b0b0e81 --- /dev/null +++ b/protocols/SkypeClassic/src/skypeproxy/skypeproxy_int.h @@ -0,0 +1,32 @@ +#include "skypeproxy.h" + +/*** Skype API ***/ +//Messages +#define SKYPECONTROLAPI_ATTACH_SUCCESS 0 +#define SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION 1 +#define SKYPECONTROLAPI_ATTACH_REFUSED 2 +#define SKYPECONTROLAPI_ATTACH_NOT_AVAILABLE 3 +#define SKYPECONTROLAPI_ATTACH_API_AVAILABLE 0x8001 + +// Errors +#define MISC_ERROR 1 +#define USER_NOT_FOUND 2 +#define USER_NOT_ONLINE 3 +#define USER_BLOCKED 4 +#define TYPE_UNSUPPORTED 5 +#define SENDER_NOT_FRIEND 6 +#define SENDER_NOT_AUTHORIZED 7 + + +/*** Debugging macros ***/ +#define OUTPUT(a) printf("* %s\n", a); +#define LOG(x) printf x + +/*** Program settings ***/ +#define PING_INTERVAL 10000 // Ping every 10000 msec to see if Skype is still available + +/*** Sockets ***/ +#pragma comment(lib, "ws2_32") + +/*** Prototypes ***/ +void WatchDogTimer(void *); \ No newline at end of file -- cgit v1.2.3