diff options
Diffstat (limited to 'plugins/!NotAdopted/Skype')
| -rwxr-xr-x[-rw-r--r--] | plugins/!NotAdopted/Skype/ezxml/ezxml.c | 40 | ||||
| -rwxr-xr-x | plugins/!NotAdopted/Skype/skype.c | 8 | ||||
| -rwxr-xr-x | plugins/!NotAdopted/Skype/skypeopt.c | 2 |
3 files changed, 25 insertions, 25 deletions
diff --git a/plugins/!NotAdopted/Skype/ezxml/ezxml.c b/plugins/!NotAdopted/Skype/ezxml/ezxml.c index 24c02fbd70..7f8f5ea17d 100644..100755 --- a/plugins/!NotAdopted/Skype/ezxml/ezxml.c +++ b/plugins/!NotAdopted/Skype/ezxml/ezxml.c @@ -21,36 +21,36 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -
-#if defined(WIN32) || defined(_WIN32)
-#include <io.h>
-#ifndef EZXML_NOMMAP
-#define EZXML_NOMMAP
-#endif
-#endif
+ +#if defined(WIN32) || defined(_WIN32) +#include <io.h> +#ifndef EZXML_NOMMAP +#define EZXML_NOMMAP +#endif +#endif #include <stdlib.h> #include <stdio.h> #include <stdarg.h> #include <string.h> -#include <ctype.h>
+#include <ctype.h> #if !defined(WIN32) && !defined(_WIN32) -#include <unistd.h>
+#include <unistd.h> #endif #include <sys/types.h> #ifndef EZXML_NOMMAP #include <sys/mman.h> #endif // EZXML_NOMMAP #include <sys/stat.h> -#include "ezxml.h"
-
-#if defined(WIN32) || defined(_WIN32)
-#define vsnprintf _vsnprintf
-#define snprintf _snprintf
-#define open _open
-#define read _read
-#define write _write
-#define close _close
+#include "ezxml.h" + +#if defined(WIN32) || defined(_WIN32) +#define vsnprintf _vsnprintf +#define snprintf _snprintf +#define open _open +#define read _read +#define write _write +#define close _close #endif #define EZXML_WS "\t\r\n " // whitespace @@ -322,7 +322,7 @@ void ezxml_proc_inst(ezxml_root_t root, char *s, size_t len) root->pi[i] = malloc(sizeof(char *) * 3); root->pi[i][0] = target; root->pi[i][1] = (char *)(root->pi[i + 1] = NULL); // terminate pi list - root->pi[i][2] = strdup(""); // empty document position list + root->pi[i][2] = _strdup(""); // empty document position list } while (root->pi[i][j]) j++; // find end of instruction list for this target @@ -943,7 +943,7 @@ ezxml_t ezxml_set_attr(ezxml_t xml, const char *name, const char *value) if (! value) return xml; // nothing to do if (xml->attr == EZXML_NIL) { // first attribute xml->attr = malloc(4 * sizeof(char *)); - xml->attr[1] = strdup(""); // empty list of malloced names/vals + xml->attr[1] = _strdup(""); // empty list of malloced names/vals } else xml->attr = realloc(xml->attr, (l + 4) * sizeof(char *)); diff --git a/plugins/!NotAdopted/Skype/skype.c b/plugins/!NotAdopted/Skype/skype.c index 11a78cceb4..d8c84f7342 100755 --- a/plugins/!NotAdopted/Skype/skype.c +++ b/plugins/!NotAdopted/Skype/skype.c @@ -33,9 +33,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF
#endif
-#ifdef _WIN64
+/*#ifdef _WIN64
#pragma comment (lib, "bufferoverflowU.lib")
-#endif
+#endif*/
#pragma warning (disable: 4706) // assignment within conditional expression
@@ -3285,7 +3285,7 @@ int PreShutdown(WPARAM wParam, LPARAM lParam) { int __declspec(dllexport) Load()
{
- PROTOCOLDESCRIPTOR pd;
+ PROTOCOLDESCRIPTOR pd = {0};
DWORD Buffsize;
HKEY MyKey;
BOOL SkypeInstalled;
@@ -3387,7 +3387,7 @@ int __declspec(dllexport) Load() /* Register the module */
ZeroMemory(&pd, sizeof(pd));
- pd.cbSize = sizeof(pd);
+ pd.cbSize = PROTOCOLDESCRIPTOR_V3_SIZE;
pd.szName = SKYPE_PROTONAME;
pd.type = PROTOTYPE_PROTOCOL;
CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
diff --git a/plugins/!NotAdopted/Skype/skypeopt.c b/plugins/!NotAdopted/Skype/skypeopt.c index 9d781aebc7..5c2795549b 100755 --- a/plugins/!NotAdopted/Skype/skypeopt.c +++ b/plugins/!NotAdopted/Skype/skypeopt.c @@ -472,7 +472,7 @@ INT_PTR CALLBACK OptionsAdvancedDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, for(i=0;i<sizeof(statusModes)/sizeof(statusModes[0]);i++) {
int k;
- k=SendDlgItemMessage(hwndDlg,IDC_SKYPEOUTSTAT,CB_ADDSTRING,0,(LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,statusModes[i],0));
+ k=SendDlgItemMessage(hwndDlg,IDC_SKYPEOUTSTAT,CB_ADDSTRING,0,(LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,statusModes[i], GSMDF_TCHAR));
SendDlgItemMessage(hwndDlg,IDC_SKYPEOUTSTAT,CB_SETITEMDATA,k,statusModes[i]);
if (statusModes[i]==j) SendDlgItemMessage(hwndDlg,IDC_SKYPEOUTSTAT,CB_SETCURSEL,i,0);
}
|