Attachment #10146 for bug #41745

View | Details | Raw Unified | Return to bug 41745
Collapse All | Expand All

Lines 39-45 std::shared_ptr<IHost> ConnectionsPool::Get(const std::string &id) Link Here

(-)a/NetRocks/src/ConnectionsPool.cpp (-1 lines)
39	{	39	{
40	std::shared_ptr<IHost> out;	40	std::shared_ptr<IHost> out;
41		41
42	std::vector<std::shared_ptr<IHost> > purgeds; // destroy hosts out of lock
43	std::lock_guard<std::mutex> locker(_mutex);	42	std::lock_guard<std::mutex> locker(_mutex);
44		43
45	auto it = _id_2_pooled_host.find(id);	44	auto it = _id_2_pooled_host.find(id);




#include <string>
#include <locale> 
#include <set> 
#include <vector>
#include <algorithm>
#include <iostream>
#include <fstream>
#include <mutex>

#include "WinCompat.h"
#include "WinPort.h"
#include "WinPortHandle.h"
#include "PathHelpers.h"

WINPORT_DECL(GlobalAlloc, HGLOBAL, ( UINT   uFlags, SIZE_T dwBytes))
{
	PVOID rv = malloc(dwBytes);
	if (rv && (uFlags&GMEM_ZEROINIT)==GMEM_ZEROINIT)
		memset(rv, 0, dwBytes);
	return rv;
}

WINPORT_DECL(GlobalFree, HGLOBAL, ( HGLOBAL hMem))
{
	free(hMem);
	return NULL;
}

WINPORT_DECL(GlobalLock, PVOID, ( HGLOBAL hMem))
{
	return hMem;
}

WINPORT_DECL(GlobalUnlock, BOOL, ( HGLOBAL hMem))
{
	return TRUE;
}


Lines 106-114 other possible license with no implications from the above license on them. Link Here

(-)a/far2l/far2sdk/farplug-wide.h (-3 lines)
106	#ifndef _WIN64	106	#ifndef _WIN64
107	#pragma pack(2)	107	#pragma pack(2)
108	#endif	108	#endif
109	#if defined(__LCC__)
110	#define _export __declspec(dllexport)
111	#endif
112	#else	109	#else
113	#ifndef _WIN64	110	#ifndef _WIN64
114	#pragma pack(push,2)	111	#pragma pack(push,2)

Lines 14-22 Link Here

(-)a/multiarc/src/fmt.hpp (-3 lines)
14	#pragma option -a2	14	#pragma option -a2
15	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	15	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
16	#pragma pack(2)	16	#pragma pack(2)
17	#if defined(__LCC__)
18	#define _export __declspec(dllexport)
19	#endif
20	#else	17	#else
21	#pragma pack(push,2)	18	#pragma pack(push,2)
22	#if _MSC_VER	19	#if _MSC_VER

Lines 34-42 using namespace oldfar; Link Here

(-)a/multiarc/src/formats/7z/7z.cpp (-3 lines)
34	#pragma option -a1	34	#pragma option -a1
35	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	35	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
36	#pragma pack(1)	36	#pragma pack(1)
37	#if defined(__LCC__)
38	#define _export __declspec(dllexport)
39	#endif
40	#else	37	#else
41	#pragma pack(push,1)	38	#pragma pack(push,1)
42	#if _MSC_VER	39	#if _MSC_VER

Lines 23-31 using namespace oldfar; Link Here

(-)a/multiarc/src/formats/ace/ace.cpp (-3 lines)
23	#pragma option -a1	23	#pragma option -a1
24	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	24	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
25	#pragma pack(1)	25	#pragma pack(1)
26	#if defined(__LCC__)
27	#define _export __declspec(dllexport)
28	#endif
29	#else	26	#else
30	#pragma pack(push,1)	27	#pragma pack(push,1)
31	#if _MSC_VER	28	#if _MSC_VER

Lines 18-26 using namespace oldfar; Link Here

(-)a/multiarc/src/formats/arc/arc.cpp (-3 lines)
18	#pragma option -a1	18	#pragma option -a1
19	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	19	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
20	#pragma pack(1)	20	#pragma pack(1)
21	#if defined(__LCC__)
22	#define _export __declspec(dllexport)
23	#endif
24	#else	21	#else
25	#pragma pack(push,1)	22	#pragma pack(push,1)
26	#if _MSC_VER	23	#if _MSC_VER

Lines 19-27 using namespace oldfar; Link Here

(-)a/multiarc/src/formats/arj/arj.cpp (-3 lines)
19	#pragma option -a1	19	#pragma option -a1
20	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	20	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
21	#pragma pack(1)	21	#pragma pack(1)
22	#if defined(__LCC__)
23	#define _export __declspec(dllexport)
24	#endif
25	#else	22	#else
26	#pragma pack(push,1)	23	#pragma pack(push,1)
27	#if _MSC_VER	24	#if _MSC_VER

Lines 21-29 using namespace oldfar; Link Here

(-)a/multiarc/src/formats/cab/cab.cpp (-3 lines)
21	#pragma option -a1	21	#pragma option -a1
22	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	22	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
23	#pragma pack(1)	23	#pragma pack(1)
24	#if defined(__LCC__)
25	#define _export __declspec(dllexport)
26	#endif
27	#else	24	#else
28	#pragma pack(push,1)	25	#pragma pack(push,1)
29	#if _MSC_VER	26	#if _MSC_VER

Lines 31-39 using namespace PCRE; Link Here

(-)a/multiarc/src/formats/custom/custom.cpp (-3 lines)
31	#pragma option -a1	31	#pragma option -a1
32	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	32	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
33	#pragma pack(1)	33	#pragma pack(1)
34	#if defined(__LCC__)
35	#define _export __declspec(dllexport)
36	#endif
37	#else	34	#else
38	#pragma pack(push,1)	35	#pragma pack(push,1)
39	#if _MSC_VER	36	#if _MSC_VER

Lines 19-27 using namespace oldfar; Link Here

(-)a/multiarc/src/formats/ha/ha.cpp (-3 lines)
19	#pragma option -a1	19	#pragma option -a1
20	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	20	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
21	#pragma pack(1)	21	#pragma pack(1)
22	#if defined(__LCC__)
23	#define _export __declspec(dllexport)
24	#endif
25	#else	22	#else
26	#pragma pack(push,1)	23	#pragma pack(push,1)
27	#if _MSC_VER	24	#if _MSC_VER

Lines 343-349 void md_listdat(void) { Link Here

(-)a/multiarc/src/formats/ha/ha/machine.c (-1 / +1 lines)
343		343
344	char *md_timestring(unsigned long t) {	344	char *md_timestring(unsigned long t) {
345		345
346	static char ts[22];	346	static char ts[40];
347	struct tm *tim;	347	struct tm *tim;
348		348
349	tim=localtime((long *)&t);	349	tim=localtime((long *)&t);

Lines 19-27 using namespace oldfar; Link Here

(-)a/multiarc/src/formats/lzh/lzh.cpp (-3 lines)
19	#pragma option -a1	19	#pragma option -a1
20	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	20	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
21	#pragma pack(1)	21	#pragma pack(1)
22	#if defined(__LCC__)
23	#define _export __declspec(dllexport)
24	#endif
25	#else	22	#else
26	#pragma pack(push,1)	23	#pragma pack(push,1)
27	#if _MSC_VER	24	#if _MSC_VER

Lines 21-29 using namespace oldfar; Link Here

(-)a/multiarc/src/formats/targz/targz.cpp (-3 lines)
21	#pragma option -a1	21	#pragma option -a1
22	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	22	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
23	#pragma pack(1)	23	#pragma pack(1)
24	#if defined(__LCC__)
25	#define _export __declspec(dllexport)
26	#endif
27	#else	24	#else
28	#pragma pack(push,1)	25	#pragma pack(push,1)
29	#if _MSC_VER	26	#if _MSC_VER

Lines 46-54 static BOOL CPToUTF8( UINT cp, LPCSTR s, LPSTR d, int dlen ) Link Here

(-)a/multiarc/src/formats/zip/zip.cpp (-4 lines)
46	#pragma option -a1	46	#pragma option -a1
47	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)	47	#elif defined(__GNUC__) \|\| (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) \|\| defined(__LCC__)
48	#pragma pack(1)	48	#pragma pack(1)
49	#if defined(__LCC__)
50	#define _export __declspec(dllexport)
51	#endif
52	#else	49	#else
53	#pragma pack(push,1)	50	#pragma pack(push,1)
54	#if _MSC_VER	51	#if _MSC_VER
55	-

Return to bug 41745

Lines 1-38 Link Here

(-)a/WinPort/src/APIMemory.cpp (-38 lines)
1	#include <string>
2	#include <locale>
3	#include <set>
4	#include <vector>
5	#include <algorithm>
6	#include <iostream>
7	#include <fstream>
8	#include <mutex>
9
10	#include "WinCompat.h"
11	#include "WinPort.h"
12	#include "WinPortHandle.h"
13	#include "PathHelpers.h"
14
15	WINPORT_DECL(GlobalAlloc, HGLOBAL, ( UINT uFlags, SIZE_T dwBytes))
16	{
17	PVOID rv = malloc(dwBytes);
18	if (rv && (uFlags&GMEM_ZEROINIT)==GMEM_ZEROINIT)
19	memset(rv, 0, dwBytes);
20	return rv;
21	}
22
23	WINPORT_DECL(GlobalFree, HGLOBAL, ( HGLOBAL hMem))
24	{
25	free(hMem);
26	return NULL;
27	}
28
29	WINPORT_DECL(GlobalLock, PVOID, ( HGLOBAL hMem))
30	{
31	return hMem;
32	}
33
34	WINPORT_DECL(GlobalUnlock, BOOL, ( HGLOBAL hMem))
35	{
36	return TRUE;
37	}
38