Commit 8457b7d6ce8ecd7ae3c4504e6aedc7017588fc18 - xrdp

~~Coding_Style.odt~~ less more

Binary diff not shown

+5

-1

Makefile.am less more

0		EXTRA_DIST = bootstrap COPYING design.txt faq-compile.txt faq-general.txt file-loc.txt install.txt prog_std.txt readme.txt
	0	ACLOCAL_AMFLAGS = -I m4
	1	AM_DISTCHECK_CONFIGURE_FLAGS = --without-systemdsystemunitdir
	2
	3	EXTRA_DIST = bootstrap COPYING coding_style.md design.txt faq-compile.txt \
	4	faq-general.txt file-loc.txt install.txt m4 prog_std.txt readme.txt
1	5
2	6	if XRDP_NEUTRINORDP
3	7	NEUTRINORDPDIR = neutrinordp

+0

-6

bootstrap less more

27	27	exit 1
28	28	fi
29	29
30		touch configure.ac
31		touch NEWS
32		touch AUTHORS
33		touch README
34		touch ChangeLog
35		ln -s ../config.c $PWD/sesman/tools/config.c
36	30	autoreconf -fvi

+195

-0

coding_style.md less more

	0	XRdp Coding Style
	1	=================
	2
	3	The coding style used by XRdp is described below.
	4
	5	The XRdp project uses astyle (artistic style) to format the code. Astyle
	6	requires a configuration file that describes how you want your code
	7	formatted. This file is present in the XRdp root directory and is named
	8	`astyle_config.as`.
	9
	10	Here is how we run the astyle command:
	11
	12	astyle --options=/path/to/file/astyle_config.as "*.c"
	13
	14	This coding style is a work in progress and is still evolving.
	15
	16
	17	Indentation
	18	-----------
	19
	20	* 4 spaces per indent
	21	* No tabs for any indents
	22
	23	☞
	24
	25	if (fd < 0)
	26	{
	27	return -1;
	28	}
	29
	30
	31	Line wrapping
	32	-------------
	33
	34	* Keep lines shorter than 80 chars
	35	* Align wrapped argument to the first argument
	36
	37	☞
	38
	39	log_message("connection aborted: error %d",
	40	ret);
	41
	42
	43	Variable names
	44	--------------
	45
	46	* Use lowercase with underscores as needed
	47	* Don't use camelCase
	48
	49	☞
	50
	51	int fd;
	52	int bytes_in_stream;
	53
	54
	55	Variable declaration
	56	--------------------
	57
	58	* Each variable is declared on a separate line
	59
	60	☞
	61
	62	int i;
	63	int j;
	64
	65
	66	Whitespace
	67	----------
	68
	69	* Use blank lines to group statements
	70	* Use at most one empty line between statements
	71	* For pointers and references, use a single space before * or & but not after
	72	* Use one space after a cast
	73	* No space before square brackets
	74
	75	☞
	76
	77	char *cptr;
	78	int *iptr;
	79	cptr = (char *) malloc(1024);
	80
	81	write(fd, &buf[12], 16);
	82
	83
	84	Function declarations
	85	---------------------
	86
	87	* Use newline before function name
	88
	89	☞
	90
	91	static int
	92	value_ok(int val)
	93	{
	94	return (val >= 0);
	95	}
	96
	97
	98	Braces
	99	------
	100
	101	* Opening brace is always on a separate line
	102	* Align braces with the line preceding the opening brace
	103
	104	☞
	105
	106	struct stream
	107	{
	108	int flags;
	109	char *data;
	110	};
	111
	112	void
	113	process_data(struct stream *s)
	114	{
	115	if (stream == NULL)
	116	{
	117	return;
	118	}
	119	}
	120
	121
	122	`if` statements
	123	---------------
	124
	125	* Always use braces
	126	* Put both braces on separate lines
	127
	128	☞
	129
	130	if (val <= 0xff)
	131	{
	132	out_uint8(s, val);
	133	}
	134	else if (val <= 0xffff)
	135	{
	136	out_uint16_le(s, val);
	137	}
	138	else
	139	{
	140	out_uint32_le(s, val);
	141	}
	142
	143
	144	`for` statements
	145	----------------
	146
	147	* Always use braces
	148	* Put both braces on separate lines
	149
	150	☞
	151
	152	for (i = 0; i < 10; i++)
	153	{
	154	printf("i = %d\n", i);
	155	}
	156
	157
	158	`while` and `do while` statements
	159	---------------------------------
	160
	161	* Always use braces
	162	* `while` after the closing brace is on the same line
	163
	164	☞
	165
	166	while (cptr)
	167	{
	168	cptr—;
	169	}
	170
	171	do
	172	{
	173	cptr--;
	174	} while (cptr);
	175
	176
	177	`switch` statements
	178	-------------------
	179
	180	* Indent `case` once
	181	* Indent statements under `case` one more time
	182	* Put both braces on separate lines
	183
	184	☞
	185
	186	switch (cmd)
	187	{
	188	case READ:
	189	read(fd, buf, 1024);
	190	break;
	191
	192	default:
	193	printf("bad cmd\n");
	194	}

+23

-25

common/Makefile.am less more

0		EXTRA_DIST = \
1		arch.h \
2		defines.h \
3		file.h \
4		file_loc.h \
5		list.h \
6		list16.h \
7		fifo.h \
8		log.h \
9		os_calls.h \
10		os_calls.h \
11		parse.h \
12		rail.h \
13		ssl_calls.h \
14		thread_calls.h \
15		trans.h \
16		xrdp_client_info.h \
17		xrdp_constants.h \
18		xrdp_rail.h \
19		crc16.h
20
21		AM_CFLAGS = \
	0	AM_CPPFLAGS = \
22	1	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
23	2	-DXRDP_SBIN_PATH=\"${sbindir}\" \
24	3	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
25	4	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
26	5	-DXRDP_LOG_PATH=\"${localstatedir}/log\"
27	6
28		lib_LTLIBRARIES = \
	7	module_LTLIBRARIES = \
29	8	libcommon.la
30	9
31	10	libcommon_la_SOURCES = \
	11	arch.h \
	12	crc16.h \
	13	defines.h \
	14	fifo.c \
	15	fifo.h \
32	16	file.c \
	17	file.h \
	18	file_loc.h \
33	19	list.c \
	20	list.h \
34	21	list16.c \
35		fifo.c \
	22	list16.h \
36	23	log.c \
	24	log.h \
37	25	os_calls.c \
	26	os_calls.h \
	27	os_calls.h \
	28	parse.h \
	29	rail.h \
38	30	ssl_calls.c \
	31	ssl_calls.h \
39	32	thread_calls.c \
40		trans.c
	33	thread_calls.h \
	34	trans.c \
	35	trans.h \
	36	xrdp_client_info.h \
	37	xrdp_constants.h \
	38	xrdp_rail.h
41	39
42	40	libcommon_la_LIBADD = \
43	41	-lcrypto \

+1

-1

common/arch.h less more

21	21	/* you can define L_ENDIAN or B_ENDIAN and NEED_ALIGN or NO_NEED_ALIGN
22	22	in the makefile to override */
23	23
24		/* check endianess */
	24	/* check endianness */
25	25	#if !(defined(L_ENDIAN) \|\| defined(B_ENDIAN))
26	26	#if !defined(__BYTE_ORDER) && defined(__linux__)
27	27	#include <endian.h>

+70

-88

common/file.c less more

25	25
26	26	#define FILE_MAX_LINE_BYTES 2048
27	27
	28	static int APP_CC
	29	file_read_ini_line(struct stream s, char text, int text_bytes);
	30
	31	/*****************************************************************************/
	32	/* look up for a section name within str (i.e. pattern [section_name])
	33	* if a section name is found, this function return 1 and copy the section
	34	* inplace of str. */
	35	static int APP_CC
	36	line_lookup_for_section_name(char *str, int str_bytes)
	37	{
	38	int name_index_start;
	39	int index;
	40	char c;
	41
	42	name_index_start = -1;
	43	index = 0;
	44	while ((c = str[index]) != 0)
	45	{
	46	if (c == '[')
	47	{
	48	name_index_start = index + 1;
	49	}
	50	else if (c == ']' && name_index_start > 0)
	51	{
	52	if (name_index_start + index >= str_bytes)
	53	{
	54	return 0;
	55	}
	56	for (index = index - name_index_start; index > 0; index--)
	57	{
	58	str[0] = str[name_index_start];
	59	str++;
	60	}
	61	str[0] = 0;
	62	return 1;
	63	}
	64	++index;
	65	}
	66	return 0;
	67	}
	68
	69
28	70	/*****************************************************************************/
29	71	/* returns error
30	72	returns 0 if everything is ok

34	76	{
35	77	struct stream *s;
36	78	char text[FILE_MAX_LINE_BYTES];
37		char c;
38		int in_it;
39		int in_it_index;
40	79	int len;
41		int index;
42	80	int rv;
43	81
44	82	rv = 0;
45	83	g_file_seek(fd, 0);
46		in_it_index = 0;
47		in_it = 0;
48	84	g_memset(text, 0, FILE_MAX_LINE_BYTES);
49	85	list_clear(names);
50	86	make_stream(s);

54	90	if (len > 0)
55	91	{
56	92	s->end = s->p + len;
57
58		for (index = 0; index < len; index++)
59		{
60		in_uint8(s, c);
61
62		if (c == '[')
63		{
64		in_it = 1;
65		}
66		else if (c == ']')
	93	while (file_read_ini_line(s, text, FILE_MAX_LINE_BYTES) == 0)
	94	{
	95	if (line_lookup_for_section_name(text, FILE_MAX_LINE_BYTES) != 0)
67	96	{
68	97	list_add_item(names, (tbus)g_strdup(text));
69		in_it = 0;
70		in_it_index = 0;
71		g_memset(text, 0, FILE_MAX_LINE_BYTES);
72		}
73		else if (in_it)
74		{
75		text[in_it_index] = c;
76		in_it_index++;
77	98	}
78	99	}
79	100	}

87	108	}
88	109
89	110	/*****************************************************************************/
90		/* returns error */
91		static int APP_CC
92		file_read_line(struct stream s, char text, int text_bytes)
	111	/* Read a line in the stream 's', removing comments.
	112	* returns error
	113	* returns 0 if everything is ok
	114	* returns 1 if problem reading file */
	115	static int APP_CC
	116	file_read_ini_line(struct stream s, char text, int text_bytes)
93	117	{
94	118	int i;
95	119	int skip_to_end;
96	120	int at_end;
97	121	char c;
98		char *hold;
99	122
100	123	skip_to_end = 0;
101	124

104	127	return 1;
105	128	}
106	129
107		hold = s->p;
108	130	i = 0;
109	131	in_uint8(s, c);
110	132

162	184
163	185	text[i] = 0;
164	186
165		if (text[0] == '[')
166		{
167		s->p = hold;
168		return 1;
169		}
170
171	187	return 0;
172	188	}
	189
173	190
174	191	/*****************************************************************************/
175	192	/* returns error */

226	243	char *name;
227	244	char *value;
228	245	char *lvalue;
229		char c;
230		int in_it;
231		int in_it_index;
232	246	int len;
233		int index;
234	247	int file_size;
235	248
236	249	data = (char ) g_malloc(FILE_MAX_LINE_BYTES 3, 0);

240	253
241	254	file_size = 32 * 1024; /* 32 K file size limit */
242	255	g_file_seek(fd, 0);
243		in_it_index = 0;
244		in_it = 0;
245	256	g_memset(text, 0, FILE_MAX_LINE_BYTES);
246	257	list_clear(names);
247	258	list_clear(values);

252	263	if (len > 0)
253	264	{
254	265	s->end = s->p + len;
255
256		for (index = 0; index < len; index++)
257		{
258		if (!s_check_rem(s, 1))
259		{
260		break;
261		}
262		in_uint8(s, c);
263		if ((c == '#') \|\| (c == ';'))
264		{
265		if (file_read_line(s, text, FILE_MAX_LINE_BYTES) != 0)
266		{
267		break;
268		}
269		in_it = 0;
270		in_it_index = 0;
271		g_memset(text, 0, FILE_MAX_LINE_BYTES);
272		continue;
273		}
274		if (c == '[')
275		{
276		in_it = 1;
277		}
278		else if (c == ']')
	266	while (file_read_ini_line(s, text, FILE_MAX_LINE_BYTES) == 0)
	267	{
	268	if (line_lookup_for_section_name(text, FILE_MAX_LINE_BYTES) != 0)
279	269	{
280	270	if (g_strcasecmp(section, text) == 0)
281	271	{
282		file_read_line(s, text, FILE_MAX_LINE_BYTES);
283		while (file_read_line(s, text, FILE_MAX_LINE_BYTES) == 0)
	272	while (file_read_ini_line(s, text,
	273	FILE_MAX_LINE_BYTES) == 0)
284	274	{
	275	if (line_lookup_for_section_name(text, FILE_MAX_LINE_BYTES) != 0)
	276	{
	277	break;
	278	}
	279
285	280	if (g_strlen(text) > 0)
286	281	{
287	282	file_split_name_value(text, name, value);

306	301	}
307	302	}
308	303	}
309
310	304	free_stream(s);
311	305	g_free(data);
312	306	return 0;
313	307	}
314
315		in_it = 0;
316		in_it_index = 0;
317		g_memset(text, 0, FILE_MAX_LINE_BYTES);
318		}
319		else if (in_it)
320		{
321		text[in_it_index] = c;
322		in_it_index++;
323		if (in_it_index >= FILE_MAX_LINE_BYTES)
324		{
325		break;
326		}
327		}
328		}
329		}
	308	}
	309	}
	310	}
	311
330	312	free_stream(s);
331	313	g_free(data);
332	314	return 1;

345	327
346	328	/*****************************************************************************/
347	329	/* return error */
348		/* this function should be prefered over file_read_sections because it can
	330	/* this function should be preferred over file_read_sections because it can
349	331	read any file size */
350	332	int APP_CC
351	333	file_by_name_read_sections(const char file_name, struct list names)

361	343	return 1;
362	344	}
363	345
364		fd = g_file_open(file_name);
	346	fd = g_file_open_ex(file_name, 1, 0, 0, 0);
365	347
366	348	if (fd < 0)
367	349	{

385	367
386	368	/*****************************************************************************/
387	369	/* return error */
388		/* this function should be prefered over file_read_section because it can
	370	/* this function should be preferred over file_read_section because it can
389	371	read any file size */
390	372	int APP_CC
391	373	file_by_name_read_section(const char file_name, const char section,

402	384	return 1;
403	385	}
404	386
405		fd = g_file_open(file_name);
	387	fd = g_file_open_ex(file_name, 1, 0, 0, 0);
406	388
407	389	if (fd < 0)
408	390	{

+2

-2

common/file_loc.h less more

36	36	#define XRDP_SHARE_PATH "/usr/local/share/xrdp"
37	37	#endif
38	38
39		#if !defined(XRDP_LIB_PATH)
40		#define XRDP_LIB_PATH "/usr/local/lib/xrdp"
	39	#if !defined(XRDP_MODULE_PATH)
	40	#define XRDP_MODULE_PATH "/usr/local/lib/xrdp"
41	41	#endif
42	42
43	43	#if !defined(XRDP_LOG_PATH)

+4

-4

common/list.c less more

191	191
192	192	/*****************************************************************************/
193	193	/* append one list to another using strdup for each item in the list */
194		/* begins copy at start_index, a zero based index on the soure list */
	194	/* begins copy at start_index, a zero based index on the source list */
195	195	void APP_CC
196	196	list_append_list_strdup(struct list self, struct list dest, int start_index)
197	197	{

220	220
221	221	for (index = 0; index < self->count; index++)
222	222	{
223		g_writeln("%d: %s", index, list_get_item(self, index));
224		}
225		}
	223	g_writeln("%d: 0x%lx", index, list_get_item(self, index));
	224	}
	225	}

+9

-2

common/log.c less more

57	57	ret = open(fname, O_WRONLY \| O_CREAT \| O_APPEND \| O_SYNC,
58	58	S_IRUSR \| S_IWUSR);
59	59	}
	60
	61	#ifdef FD_CLOEXEC
	62	if (ret != -1)
	63	{
	64	fcntl(ret, F_SETFD, FD_CLOEXEC);
	65	}
	66	#endif
60	67
61	68	return ret;
62	69	}

141	148	return ret;
142	149	}
143	150
144		/* if progname is NULL, we ureturn error */
	151	/* if progname is NULL, we return error */
145	152	if (0 == l_cfg->program_name)
146	153	{
147	154	g_writeln("program_name not properly assigned");

185	192	/* closing log file */
186	193	log_message(LOG_LEVEL_ALWAYS, "shutting down log subsystem...");
187	194
188		if (0 > l_cfg->fd)
	195	if (-1 != l_cfg->fd)
189	196	{
190	197	/* closing logfile... */
191	198	g_file_close(l_cfg->fd);

+1

-1

common/log.h less more

80	80	/**
81	81	*
82	82	* @brief Starts the logging subsystem
83		* @param l_cfg loggging system configuration
	83	* @param l_cfg logging system configuration
84	84	* @return
85	85	*
86	86	*/

+316

-360

common/os_calls.c less more

99	99	#define INADDR_NONE ((unsigned long)-1)
100	100	#endif
101	101
102		static char g_temp_base[128] = "";
103		static char g_temp_base_org[128] = "";
104
105	102	/*****************************************************************************/
106	103	int APP_CC
107	104	g_rm_temp_dir(void)
108	105	{
109		if (g_temp_base[0] != 0)
110		{
111		if (!g_remove_dir(g_temp_base))
112		{
113		printf("g_rm_temp_dir: removing temp directory [%s] failed\n", g_temp_base);
114		}
115
116		g_temp_base[0] = 0;
117		}
118
119	106	return 0;
120	107	}
121	108

123	110	int APP_CC
124	111	g_mk_temp_dir(const char *app_name)
125	112	{
126		if (app_name != 0)
127		{
128		if (app_name[0] != 0)
129		{
	113	if (!g_directory_exist("/tmp/.xrdp"))
	114	{
	115	if (!g_create_dir("/tmp/.xrdp"))
	116	{
	117	/* if failed, still check if it got created by someone else */
130	118	if (!g_directory_exist("/tmp/.xrdp"))
131	119	{
132		if (!g_create_dir("/tmp/.xrdp"))
133		{
134		/* if failed, still check if it got created by someone else */
135		if (!g_directory_exist("/tmp/.xrdp"))
136		{
137		printf("g_mk_temp_dir: g_create_dir failed\n");
138		return 1;
139		}
140		}
141
142		g_chmod_hex("/tmp/.xrdp", 0x1777);
143		}
144
145		snprintf(g_temp_base, sizeof(g_temp_base),
146		"/tmp/.xrdp/%s-XXXXXX", app_name);
147		snprintf(g_temp_base_org, sizeof(g_temp_base_org),
148		"/tmp/.xrdp/%s-XXXXXX", app_name);
149
150		if (mkdtemp(g_temp_base) == 0)
151		{
152		printf("g_mk_temp_dir: mkdtemp failed [%s]\n", g_temp_base);
	120	printf("g_mk_temp_dir: g_create_dir failed\n");
153	121	return 1;
154	122	}
155	123	}
156		else
157		{
158		printf("g_mk_temp_dir: bad app name\n");
159		return 1;
160		}
161		}
162		else
163		{
164		if (g_temp_base_org[0] == 0)
165		{
166		printf("g_mk_temp_dir: g_temp_base_org not set\n");
167		return 1;
168		}
169
170		g_strncpy(g_temp_base, g_temp_base_org, 127);
171
172		if (mkdtemp(g_temp_base) == 0)
173		{
174		printf("g_mk_temp_dir: mkdtemp failed [%s]\n", g_temp_base);
175		}
176		}
177
	124	g_chmod_hex("/tmp/.xrdp", 0x1777);
	125	}
178	126	return 0;
179	127	}
180	128

333	281	g_printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
334	282	}
335	283
336		g_writeln("");
	284	g_writeln("%s", "");
337	285	offset += thisline;
338	286	line += thisline;
339	287	}

462	410	unsigned int option_len;
463	411	#endif
464	412
465		#if defined(XRDP_ENABLE_IPV6) && !defined(NO_ARPA_INET_H_IP6)
	413	#if defined(XRDP_ENABLE_IPV6)
466	414	rv = (int)socket(AF_INET6, SOCK_STREAM, 0);
467	415	#else
468	416	rv = (int)socket(AF_INET, SOCK_STREAM, 0);

471	419	{
472	420	return -1;
473	421	}
474		#if defined(XRDP_ENABLE_IPV6) && !defined(NO_ARPA_INET_H_IP6)
	422	#if defined(XRDP_ENABLE_IPV6)
475	423	option_len = sizeof(option_value);
476	424	if (getsockopt(rv, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&option_value,
477	425	&option_len) == 0)
478	426	{
479	427	if (option_value != 0)
480	428	{
	429	#if defined(XRDP_ENABLE_IPV6ONLY)
	430	option_value = 1;
	431	#else
481	432	option_value = 0;
	433	#endif
482	434	option_len = sizeof(option_value);
483	435	if (setsockopt(rv, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&option_value,
484	436	option_len) < 0)

616	568
617	569	/*****************************************************************************/
618	570	int APP_CC
619		g_tcp_local_socket(void)
	571	g_sck_local_socket(void)
620	572	{
621	573	#if defined(_WIN32)
622	574	return 0;

690	642
691	643	/*****************************************************************************/
692	644	void APP_CC
693		g_tcp_close(int sck)
	645	g_sck_close(int sck)
694	646	{
695	647	char ip[256];
696	648

710	662
711	663	/*****************************************************************************/
712	664	/* returns error, zero is good */
713		#if defined(XRDP_ENABLE_IPV6) && !defined(NO_ARPA_INET_H_IP6)
	665	#if defined(XRDP_ENABLE_IPV6)
714	666	int APP_CC
715	667	g_tcp_connect(int sck, const char address, const char port)
716	668	{
717	669	int res = 0;
	670	char errorMsg[256];
718	671	struct addrinfo p;
719	672	struct addrinfo h = (struct addrinfo )NULL;
720	673	struct addrinfo rp = (struct addrinfo )NULL;

740	693	{
741	694	res = getaddrinfo(address, port, &p, &h);
742	695	}
	696	if (res != 0)
	697	{
	698	snprintf(errorMsg, 255, "g_tcp_connect: getaddrinfo() failed: %s",
	699	gai_strerror(res));
	700	log_message(LOG_LEVEL_ERROR, errorMsg);
	701	}
743	702	if (res > -1)
744	703	{
745	704	if (h != NULL)

762	721	int APP_CC
763	722	g_tcp_connect(int sck, const char* address, const char* port)
764	723	{
765		struct sockaddr_in s;
766		struct hostent* h;
767
768		g_memset(&s, 0, sizeof(struct sockaddr_in));
769		s.sin_family = AF_INET;
770		s.sin_port = htons((tui16)atoi(port));
771		s.sin_addr.s_addr = inet_addr(address);
772		if (s.sin_addr.s_addr == INADDR_NONE)
773		{
774		h = gethostbyname(address);
775		if (h != 0)
776		{
777		if (h->h_name != 0)
778		{
779		if (h->h_addr_list != 0)
780		{
781		if ((*(h->h_addr_list)) != 0)
782		{
783		s.sin_addr.s_addr = ((int)(*(h->h_addr_list)));
784		}
785		}
786		}
787		}
788		}
789		return connect(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
	724	struct sockaddr_in s;
	725	struct hostent* h;
	726
	727	g_memset(&s, 0, sizeof(struct sockaddr_in));
	728	s.sin_family = AF_INET;
	729	s.sin_port = htons((tui16)atoi(port));
	730	s.sin_addr.s_addr = inet_addr(address);
	731	if (s.sin_addr.s_addr == INADDR_NONE)
	732	{
	733	h = gethostbyname(address);
	734	if (h != 0)
	735	{
	736	if (h->h_name != 0)
	737	{
	738	if (h->h_addr_list != 0)
	739	{
	740	if ((*(h->h_addr_list)) != 0)
	741	{
	742	s.sin_addr.s_addr = ((int)(*(h->h_addr_list)));
	743	}
	744	}
	745	}
	746	}
	747	}
	748	return connect(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
790	749	}
791	750	#endif
792	751
793	752	/*****************************************************************************/
794	753	/* returns error, zero is good */
795	754	int APP_CC
796		g_tcp_local_connect(int sck, const char *port)
	755	g_sck_local_connect(int sck, const char *port)
797	756	{
798	757	#if defined(_WIN32)
799	758	return -1;

811	770
812	771	/*****************************************************************************/
813	772	int APP_CC
814		g_tcp_set_non_blocking(int sck)
	773	g_sck_set_non_blocking(int sck)
815	774	{
816	775	unsigned long i;
817	776

823	782	i = i \| O_NONBLOCK;
824	783	if (fcntl(sck, F_SETFL, i) < 0)
825	784	{
826		log_message(LOG_LEVEL_ERROR, "g_tcp_set_non_blocking: fcntl() failed\n");
	785	log_message(LOG_LEVEL_ERROR, "g_sck_set_non_blocking: fcntl() failed\n");
827	786	}
828	787	#endif
829	788	return 0;

943	902	int APP_CC
944	903	g_tcp_bind(int sck, const char* port)
945	904	{
946		struct sockaddr_in s;
947
948		memset(&s, 0, sizeof(struct sockaddr_in));
949		s.sin_family = AF_INET;
950		s.sin_port = htons((tui16)atoi(port));
951		s.sin_addr.s_addr = INADDR_ANY;
952		return bind(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
953		}
954		#endif
955
956		/*****************************************************************************/
957		int APP_CC
958		g_tcp_local_bind(int sck, const char *port)
	905	struct sockaddr_in s;
	906
	907	memset(&s, 0, sizeof(struct sockaddr_in));
	908	s.sin_family = AF_INET;
	909	s.sin_port = htons((tui16)atoi(port));
	910	s.sin_addr.s_addr = INADDR_ANY;
	911	return bind(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
	912	}
	913	#endif
	914
	915	/*****************************************************************************/
	916	int APP_CC
	917	g_sck_local_bind(int sck, const char *port)
959	918	{
960	919	#if defined(_WIN32)
961	920	return -1;

986	945	int APP_CC
987	946	g_tcp_bind_address(int sck, const char* port, const char* address)
988	947	{
989		struct sockaddr_in s;
990
991		memset(&s, 0, sizeof(struct sockaddr_in));
992		s.sin_family = AF_INET;
993		s.sin_port = htons((tui16)atoi(port));
994		s.sin_addr.s_addr = INADDR_ANY;
995		if (inet_aton(address, &s.sin_addr) < 0)
996		{
997		return -1; /* bad address */
998		}
999		return bind(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
	948	struct sockaddr_in s;
	949
	950	memset(&s, 0, sizeof(struct sockaddr_in));
	951	s.sin_family = AF_INET;
	952	s.sin_port = htons((tui16)atoi(port));
	953	s.sin_addr.s_addr = INADDR_ANY;
	954	if (inet_aton(address, &s.sin_addr) < 0)
	955	{
	956	return -1; /* bad address */
	957	}
	958	return bind(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
1000	959	}
1001	960	#endif
1002	961
1003	962	/*****************************************************************************/
1004	963	/* returns error, zero is good */
1005	964	int APP_CC
1006		g_tcp_listen(int sck)
	965	g_sck_listen(int sck)
1007	966	{
1008	967	return listen(sck, 2);
1009	968	}

1026	985	ret = accept(sck, (struct sockaddr *)&s, &i);
1027	986	if(ret>0)
1028	987	{
1029		snprintf(ipAddr,255,"A connection received from: %s port %d"
1030		,inet_ntoa(s.sin_addr),ntohs(s.sin_port));
	988	snprintf(ipAddr, 255, "A connection received from: %s port %d",
	989	inet_ntoa(s.sin_addr), ntohs(s.sin_port));
1031	990	log_message(LOG_LEVEL_INFO,ipAddr);
1032	991	}
1033	992	return ret ;

1119	1078
1120	1079	/*****************************************************************************/
1121	1080	int APP_CC
1122		g_tcp_last_error_would_block(int sck)
	1081	g_sck_last_error_would_block(int sck)
1123	1082	{
1124	1083	#if defined(_WIN32)
1125	1084	return WSAGetLastError() == WSAEWOULDBLOCK;

1130	1089
1131	1090	/*****************************************************************************/
1132	1091	int APP_CC
1133		g_tcp_recv(int sck, void *ptr, int len, int flags)
	1092	g_sck_recv(int sck, void *ptr, int len, int flags)
1134	1093	{
1135	1094	#if defined(_WIN32)
1136	1095	return recv(sck, (char *)ptr, len, flags);

1141	1100
1142	1101	/*****************************************************************************/
1143	1102	int APP_CC
1144		g_tcp_send(int sck, const void *ptr, int len, int flags)
	1103	g_sck_send(int sck, const void *ptr, int len, int flags)
1145	1104	{
1146	1105	#if defined(_WIN32)
1147	1106	return send(sck, (const char *)ptr, len, flags);

1153	1112	/*****************************************************************************/
1154	1113	/* returns boolean */
1155	1114	int APP_CC
1156		g_tcp_socket_ok(int sck)
	1115	g_sck_socket_ok(int sck)
1157	1116	{
1158	1117	#if defined(_WIN32)
1159	1118	int opt;

1180	1139	/* wait 'millis' milliseconds for the socket to be able to write */
1181	1140	/* returns boolean */
1182	1141	int APP_CC
1183		g_tcp_can_send(int sck, int millis)
	1142	g_sck_can_send(int sck, int millis)
1184	1143	{
1185	1144	fd_set wfds;
1186	1145	struct timeval time;

1197	1156
1198	1157	if (rv > 0)
1199	1158	{
1200		return g_tcp_socket_ok(sck);
	1159	return 1;
1201	1160	}
1202	1161	}
1203	1162

1208	1167	/* wait 'millis' milliseconds for the socket to be able to receive */
1209	1168	/* returns boolean */
1210	1169	int APP_CC
1211		g_tcp_can_recv(int sck, int millis)
	1170	g_sck_can_recv(int sck, int millis)
1212	1171	{
1213	1172	fd_set rfds;
1214	1173	struct timeval time;
1215	1174	int rv;
1216	1175
	1176	g_memset(&time, 0, sizeof(time));
1217	1177	time.tv_sec = millis / 1000;
1218	1178	time.tv_usec = (millis * 1000) % 1000000;
1219	1179	FD_ZERO(&rfds);

1225	1185
1226	1186	if (rv > 0)
1227	1187	{
1228		return g_tcp_socket_ok(sck);
1229		}
1230		}
1231
1232		return 0;
1233		}
1234
1235		/*****************************************************************************/
1236		int APP_CC
1237		g_tcp_select(int sck1, int sck2)
	1188	return 1;
	1189	}
	1190	}
	1191
	1192	return 0;
	1193	}
	1194
	1195	/*****************************************************************************/
	1196	int APP_CC
	1197	g_sck_select(int sck1, int sck2)
1238	1198	{
1239	1199	fd_set rfds;
1240	1200	struct timeval time;
1241		int max = 0;
1242		int rv = 0;
1243
1244		g_memset(&rfds, 0, sizeof(fd_set));
	1201	int max;
	1202	int rv;
	1203
1245	1204	g_memset(&time, 0, sizeof(struct timeval));
1246
1247		time.tv_sec = 0;
1248		time.tv_usec = 0;
1249	1205	FD_ZERO(&rfds);
1250	1206
1251	1207	if (sck1 > 0)

1290	1246	}
1291	1247
1292	1248	/*****************************************************************************/
	1249	/* returns boolean */
	1250	static int APP_CC
	1251	g_fd_can_read(int fd)
	1252	{
	1253	fd_set rfds;
	1254	struct timeval time;
	1255	int rv;
	1256
	1257	g_memset(&time, 0, sizeof(time));
	1258	FD_ZERO(&rfds);
	1259	FD_SET(((unsigned int)fd), &rfds);
	1260	rv = select(fd + 1, &rfds, 0, 0, &time);
	1261	if (rv == 1)
	1262	{
	1263	return 1;
	1264	}
	1265	return 0;
	1266	}
	1267
	1268	/*****************************************************************************/
	1269	/* returns error */
	1270	/* O_NONBLOCK = 0x00000800 */
	1271	static int APP_CC
	1272	g_set_nonblock(int fd)
	1273	{
	1274	int error;
	1275	int flags;
	1276
	1277	error = fcntl(fd, F_GETFL);
	1278	if (error < 0)
	1279	{
	1280	return 1;
	1281	}
	1282	flags = error;
	1283	if ((flags & O_NONBLOCK) != O_NONBLOCK)
	1284	{
	1285	flags \|= O_NONBLOCK;
	1286	error = fcntl(fd, F_SETFL, flags);
	1287	if (error < 0)
	1288	{
	1289	return 1;
	1290	}
	1291	}
	1292	return 0;
	1293	}
	1294
	1295	/*****************************************************************************/
1293	1296	/* returns 0 on error */
1294		tbus APP_CC
	1297	tintptr APP_CC
1295	1298	g_create_wait_obj(char *name)
1296	1299	{
1297	1300	#ifdef _WIN32
1298		tbus obj;
1299
1300		obj = (tbus)CreateEvent(0, 1, 0, name);
	1301	tintptr obj;
	1302
	1303	obj = (tintptr)CreateEvent(0, 1, 0, name);
1301	1304	return obj;
1302	1305	#else
1303		tbus obj;
1304		struct sockaddr_un sa;
1305		size_t len;
1306		tbus sck;
1307		int i;
1308		int safety;
1309		int unnamed;
1310
1311		if (g_temp_base[0] == 0)
	1306	int fds[2];
	1307	int error;
	1308
	1309	error = pipe(fds);
	1310	if (error != 0)
1312	1311	{
1313	1312	return 0;
1314	1313	}
1315
1316		sck = socket(PF_UNIX, SOCK_DGRAM, 0);
1317
1318		if (sck < 0)
1319		{
	1314	if (g_set_nonblock(fds[0]) != 0)
	1315	{
	1316	close(fds[0]);
	1317	close(fds[1]);
1320	1318	return 0;
1321	1319	}
1322
1323		safety = 0;
1324		g_memset(&sa, 0, sizeof(sa));
1325		sa.sun_family = AF_UNIX;
1326		unnamed = 1;
1327
1328		if (name != 0)
1329		{
1330		if (name[0] != 0)
1331		{
1332		unnamed = 0;
1333		}
1334		}
1335
1336		if (unnamed)
1337		{
1338		do
1339		{
1340		if (safety > 100)
1341		{
1342		break;
1343		}
1344
1345		safety++;
1346		g_random((char *)&i, sizeof(i));
1347		len = sizeof(sa.sun_path);
1348		g_snprintf(sa.sun_path, len, "%s/auto_%8.8x", g_temp_base, i);
1349		len = sizeof(sa);
1350		}
1351		while (bind(sck, (struct sockaddr *)&sa, len) < 0);
1352		}
1353		else
1354		{
1355		do
1356		{
1357		if (safety > 100)
1358		{
1359		break;
1360		}
1361
1362		safety++;
1363		g_random((char *)&i, sizeof(i));
1364		len = sizeof(sa.sun_path);
1365		g_snprintf(sa.sun_path, len, "%s/%s_%8.8x", g_temp_base, name, i);
1366		len = sizeof(sa);
1367		}
1368		while (bind(sck, (struct sockaddr *)&sa, len) < 0);
1369		}
1370
1371		obj = (tbus)sck;
1372		return obj;
	1320	if (g_set_nonblock(fds[1]) != 0)
	1321	{
	1322	close(fds[0]);
	1323	close(fds[1]);
	1324	return 0;
	1325	}
	1326	return (fds[1] << 16) \| fds[0];
1373	1327	#endif
1374	1328	}
1375	1329
1376	1330	/*****************************************************************************/
1377	1331	/* returns 0 on error */
1378		tbus APP_CC
1379		g_create_wait_obj_from_socket(tbus socket, int write)
	1332	tintptr APP_CC
	1333	g_create_wait_obj_from_socket(tintptr socket, int write)
1380	1334	{
1381	1335	#ifdef _WIN32
1382		/* Create and return corresponding event handle for WaitForMultipleObjets */
	1336	/* Create and return corresponding event handle for WaitForMultipleObjects */
1383	1337	WSAEVENT event;
1384	1338	long lnetevent = 0;
1385	1339

1404	1358
1405	1359	/*****************************************************************************/
1406	1360	void APP_CC
1407		g_delete_wait_obj_from_socket(tbus wait_obj)
	1361	g_delete_wait_obj_from_socket(tintptr wait_obj)
1408	1362	{
1409	1363	#ifdef _WIN32
1410	1364

1421	1375	/*****************************************************************************/
1422	1376	/* returns error */
1423	1377	int APP_CC
1424		g_set_wait_obj(tbus obj)
	1378	g_set_wait_obj(tintptr obj)
1425	1379	{
1426	1380	#ifdef _WIN32
1427
1428	1381	if (obj == 0)
1429	1382	{
1430	1383	return 0;
1431	1384	}
1432
1433	1385	SetEvent((HANDLE)obj);
1434	1386	return 0;
1435	1387	#else
1436		socklen_t sa_size;
1437		int s;
1438		struct sockaddr_un sa;
	1388	int error;
	1389	int fd;
	1390	int written;
	1391	int to_write;
	1392	char buf[4] = "sig";
1439	1393
1440	1394	if (obj == 0)
1441	1395	{
1442	1396	return 0;
1443	1397	}
1444
1445		if (g_tcp_can_recv((int)obj, 0))
	1398	fd = obj & 0xffff;
	1399	if (g_fd_can_read(fd))
1446	1400	{
1447	1401	/* already signalled */
1448	1402	return 0;
1449	1403	}
1450
1451		sa_size = sizeof(sa);
1452
1453		if (getsockname((int)obj, (struct sockaddr *)&sa, &sa_size) < 0)
	1404	fd = obj >> 16;
	1405	to_write = 4;
	1406	written = 0;
	1407	while (written < to_write)
	1408	{
	1409	error = write(fd, buf + written, to_write - written);
	1410	if (error == -1)
	1411	{
	1412	error = errno;
	1413	if ((error == EAGAIN) \|\| (error == EWOULDBLOCK) \|\|
	1414	(error == EINPROGRESS) \|\| (error == EINTR))
	1415	{
	1416	/* ok */
	1417	}
	1418	else
	1419	{
	1420	return 1;
	1421	}
	1422	}
	1423	else if (error > 0)
	1424	{
	1425	written += error;
	1426	}
	1427	else
	1428	{
	1429	return 1;
	1430	}
	1431	}
	1432	return 0;
	1433	#endif
	1434	}
	1435
	1436	/*****************************************************************************/
	1437	/* returns error */
	1438	int APP_CC
	1439	g_reset_wait_obj(tintptr obj)
	1440	{
	1441	#ifdef _WIN32
	1442	if (obj == 0)
	1443	{
	1444	return 0;
	1445	}
	1446	ResetEvent((HANDLE)obj);
	1447	return 0;
	1448	#else
	1449	char buf[4];
	1450	int error;
	1451	int fd;
	1452
	1453	if (obj == 0)
	1454	{
	1455	return 0;
	1456	}
	1457	fd = obj & 0xffff;
	1458	while (g_fd_can_read(fd))
	1459	{
	1460	error = read(fd, buf, 4);
	1461	if (error == -1)
	1462	{
	1463	error = errno;
	1464	if ((error == EAGAIN) \|\| (error == EWOULDBLOCK) \|\|
	1465	(error == EINPROGRESS) \|\| (error == EINTR))
	1466	{
	1467	/* ok */
	1468	}
	1469	else
	1470	{
	1471	return 1;
	1472	}
	1473	}
	1474	else if (error == 0)
	1475	{
	1476	return 1;
	1477	}
	1478	}
	1479	return 0;
	1480	#endif
	1481	}
	1482
	1483	/*****************************************************************************/
	1484	/* returns boolean */
	1485	int APP_CC
	1486	g_is_wait_obj_set(tintptr obj)
	1487	{
	1488	#ifdef _WIN32
	1489	if (obj == 0)
	1490	{
	1491	return 0;
	1492	}
	1493	if (WaitForSingleObject((HANDLE)obj, 0) == WAIT_OBJECT_0)
1454	1494	{
1455	1495	return 1;
1456	1496	}
1457
1458		s = socket(PF_UNIX, SOCK_DGRAM, 0);
1459
1460		if (s < 0)
1461		{
1462		return 1;
1463		}
1464
1465		if (sendto(s, "sig", 4, 0, (struct sockaddr *)&sa, sa_size) < 0)
1466		{
1467		close(s);
1468		return 1;
1469		}
1470
1471		close(s);
1472		return 0;
	1497	return 0;
	1498	#else
	1499	if (obj == 0)
	1500	{
	1501	return 0;
	1502	}
	1503	return g_fd_can_read(obj & 0xffff);
1473	1504	#endif
1474	1505	}
1475	1506
1476	1507	/*****************************************************************************/
1477	1508	/* returns error */
1478	1509	int APP_CC
1479		g_reset_wait_obj(tbus obj)
	1510	g_delete_wait_obj(tintptr obj)
1480	1511	{
1481	1512	#ifdef _WIN32
1482
1483	1513	if (obj == 0)
1484	1514	{
1485	1515	return 0;
1486	1516	}
1487
1488		ResetEvent((HANDLE)obj);
1489		return 0;
1490		#else
1491		char buf[64];
1492
1493		if (obj == 0)
1494		{
1495		return 0;
1496		}
1497
1498		while (g_tcp_can_recv((int)obj, 0))
1499		{
1500		recvfrom((int)obj, &buf, 64, 0, 0, 0);
1501		}
1502
1503		return 0;
1504		#endif
1505		}
1506
1507		/*****************************************************************************/
1508		/* returns boolean */
1509		int APP_CC
1510		g_is_wait_obj_set(tbus obj)
1511		{
1512		#ifdef _WIN32
1513
1514		if (obj == 0)
1515		{
1516		return 0;
1517		}
1518
1519		if (WaitForSingleObject((HANDLE)obj, 0) == WAIT_OBJECT_0)
1520		{
1521		return 1;
1522		}
1523
1524		return 0;
1525		#else
1526
1527		if (obj == 0)
1528		{
1529		return 0;
1530		}
1531
1532		return g_tcp_can_recv((int)obj, 0);
1533		#endif
1534		}
1535
1536		/*****************************************************************************/
1537		/* returns error */
1538		int APP_CC
1539		g_delete_wait_obj(tbus obj)
1540		{
1541		#ifdef _WIN32
1542
1543		if (obj == 0)
1544		{
1545		return 0;
1546		}
1547
1548	1517	/* Close event handle */
1549	1518	CloseHandle((HANDLE)obj);
1550	1519	return 0;
1551	1520	#else
1552		socklen_t sa_size;
1553		struct sockaddr_un sa;
1554
1555	1521	if (obj == 0)
1556	1522	{
1557	1523	return 0;
1558	1524	}
1559
1560		sa_size = sizeof(sa);
1561
1562		if (getsockname((int)obj, (struct sockaddr *)&sa, &sa_size) < 0)
1563		{
1564		return 1;
1565		}
1566
1567		close((int)obj);
1568		unlink(sa.sun_path);
	1525	close(obj & 0xffff);
	1526	close(obj >> 16);
1569	1527	return 0;
1570	1528	#endif
1571	1529	}
1572	1530
1573	1531	/*****************************************************************************/
1574	1532	/* returns error */
1575		/* close but do not delete the wait obj, used after fork */
1576		int APP_CC
1577		g_close_wait_obj(tbus obj)
1578		{
1579		#ifdef _WIN32
1580		#else
1581		close((int)obj);
1582		#endif
1583		return 0;
1584		}
1585
1586		/*****************************************************************************/
1587		/* returns error */
1588		int APP_CC
1589		g_obj_wait(tbus read_objs, int rcount, tbus write_objs, int wcount,
	1533	int APP_CC
	1534	g_obj_wait(tintptr read_objs, int rcount, tintptr write_objs, int wcount,
1590	1535	int mstimeout)
1591	1536	{
1592	1537	#ifdef _WIN32

1626	1571	fd_set rfds;
1627	1572	fd_set wfds;
1628	1573	struct timeval time;
1629		struct timeval ptime = (struct timeval )NULL;
	1574	struct timeval *ptime;
1630	1575	int i = 0;
1631	1576	int res = 0;
1632	1577	int max = 0;
1633	1578	int sck = 0;
1634	1579
1635		g_memset(&rfds, 0, sizeof(fd_set));
1636		g_memset(&wfds, 0, sizeof(fd_set));
1637		g_memset(&time, 0, sizeof(struct timeval));
1638
1639	1580	max = 0;
1640
1641	1581	if (mstimeout < 1)
1642	1582	{
1643		ptime = (struct timeval *)NULL;
	1583	ptime = 0;
1644	1584	}
1645	1585	else
1646	1586	{
	1587	g_memset(&time, 0, sizeof(struct timeval));
1647	1588	time.tv_sec = mstimeout / 1000;
1648	1589	time.tv_usec = (mstimeout % 1000) * 1000;
1649	1590	ptime = &time;

1657	1598	{
1658	1599	for (i = 0; i < rcount; i++)
1659	1600	{
1660		sck = (int)(read_objs[i]);
	1601	sck = read_objs[i] & 0xffff;
1661	1602
1662	1603	if (sck > 0)
1663	1604	{

1868	1809	}
1869	1810
1870	1811	/*****************************************************************************/
1871		/* write to file, returns the number of bytes writen or -1 on error */
	1812	/* write to file, returns the number of bytes written or -1 on error */
1872	1813	int APP_CC
1873	1814	g_file_write(int fd, char *ptr, int len)
1874	1815	{

2044	1985	{
2045	1986	#if defined(_WIN32)
2046	1987	return 0; // use GetFileAttributes and check return value
2047		// is not -1 and FILE_ATTRIBUT_DIRECTORY bit is set
	1988	// is not -1 and FILE_ATTRIBUTE_DIRECTORY bit is set
2048	1989	#else
2049	1990	struct stat st;
2050	1991

2265	2206
2266	2207	return p;
2267	2208	}
	2209
2268	2210	/*****************************************************************************/
2269	2211	/* if in = 0, return 0 else return newly alloced copy of input string
2270	2212	* if the input string is larger than maxlen the returned string will be

2296	2238
2297	2239	return p;
2298	2240	}
	2241
2299	2242	/*****************************************************************************/
2300	2243	int APP_CC
2301	2244	g_strcmp(const char c1, const char c2)

2318	2261	char c1;
2319	2262	char c2;
2320	2263
	2264	c1 = 0;
	2265	c2 = 0;
2321	2266	while (n > 0)
2322	2267	{
2323		c1 = *s1++;
2324		c2 = *s2++;
	2268	c1 = *(s1++);
	2269	c2 = *(s2++);
2325	2270	if ((c1 == 0) \|\| (c1 != c2) \|\| (c1 == delim) \|\| (c2 == delim))
2326	2271	{
2327	2272	return c1 - c2;

2782	2727	/*****************************************************************************/
2783	2728	/* does not work in win32 */
2784	2729	void APP_CC
2785		g_signal_kill(void (*func)(int))
2786		{
2787		#if defined(_WIN32)
2788		#else
2789		signal(SIGKILL, func);
2790		#endif
2791		}
2792
2793		/*****************************************************************************/
2794		/* does not work in win32 */
2795		void APP_CC
2796	2730	g_signal_terminate(void (*func)(int))
2797	2731	{
2798	2732	#if defined(_WIN32)

2905	2839	return 0;
2906	2840	#else
2907	2841	return setuid(pid);
	2842	#endif
	2843	}
	2844
	2845	/*****************************************************************************/
	2846	int APP_CC
	2847	g_setsid(void)
	2848	{
	2849	#if defined(_WIN32)
	2850	return -1;
	2851	#else
	2852	return setsid();
	2853	#endif
	2854	}
	2855
	2856	/*****************************************************************************/
	2857	int APP_CC
	2858	g_setlogin(const char *name)
	2859	{
	2860	#ifdef BSD
	2861	return setlogin(name);
	2862	#else
	2863	return -1;
2908	2864	#endif
2909	2865	}
2910	2866

+55

-30

common/os_calls.h less more

20	20	#if !defined(OS_CALLS_H)
21	21	#define OS_CALLS_H
22	22
	23	#if defined(HAVE_CONFIG_H)
	24	#include "config_ac.h"
	25	#endif
	26
23	27	#ifndef NULL
24	28	#define NULL 0
25	29	#endif
26	30
27	31	#include "arch.h"
	32
	33	#define g_tcp_can_recv g_sck_can_recv
	34	#define g_tcp_can_send g_sck_can_send
	35	#define g_tcp_recv g_sck_recv
	36	#define g_tcp_send g_sck_send
	37	#define g_tcp_close g_sck_close
	38	#define g_tcp_last_error_would_block g_sck_last_error_would_block
	39	#define g_tcp_set_non_blocking g_sck_set_non_blocking
	40	#define g_tcp_local_socket g_sck_local_socket
	41	#define g_tcp_local_connect g_sck_local_connect
	42	#define g_tcp_listen g_sck_listen
	43	#define g_tcp_local_bind g_sck_local_bind
	44	#define g_tcp_select g_sck_select
	45	#define g_close_wait_obj g_delete_wait_obj
	46
	47	#if defined(HAVE_FUNC_ATTRIBUTE_FORMAT)
	48	#define printflike(arg_format, arg_first_check) \
	49	__attribute__((__format__(__printf__, arg_format, arg_first_check)))
	50	#else
	51	#define printflike(arg_format, arg_first_check)
	52	#endif
28	53
29	54	int APP_CC g_rm_temp_dir(void);
30	55	int APP_CC g_mk_temp_dir(const char* app_name);

32	57	void APP_CC g_deinit(void);
33	58	void* APP_CC g_malloc(int size, int zero);
34	59	void APP_CC g_free(void* ptr);
35		void DEFAULT_CC g_printf(const char *format, ...);
36		void DEFAULT_CC g_sprintf(char* dest, const char* format, ...);
37		void DEFAULT_CC g_snprintf(char* dest, int len, const char* format, ...);
38		void DEFAULT_CC g_writeln(const char* format, ...);
39		void DEFAULT_CC g_write(const char* format, ...);
	60	void DEFAULT_CC g_printf(const char *format, ...) printflike(1, 2);
	61	void DEFAULT_CC g_sprintf(char* dest, const char* format, ...) \
	62	printflike(2, 3);
	63	void DEFAULT_CC g_snprintf(char* dest, int len, const char* format, ...) \
	64	printflike(3, 4);
	65	void DEFAULT_CC g_writeln(const char* format, ...) printflike(1, 2);
	66	void DEFAULT_CC g_write(const char* format, ...) printflike(1, 2);
40	67	void APP_CC g_hexdump(char* p, int len);
41	68	void APP_CC g_memset(void* ptr, int val, int size);
42	69	void APP_CC g_memcpy(void* d_ptr, const void* s_ptr, int size);

48	75	int APP_CC g_sck_get_send_buffer_bytes(int sck, int *bytes);
49	76	int APP_CC g_sck_set_recv_buffer_bytes(int sck, int bytes);
50	77	int APP_CC g_sck_get_recv_buffer_bytes(int sck, int *bytes);
51		int APP_CC g_tcp_local_socket(void);
	78	int APP_CC g_sck_local_socket(void);
52	79	int APP_CC g_sck_get_peer_cred(int sck, int pid, int uid, int *gid);
53		void APP_CC g_tcp_close(int sck);
	80	void APP_CC g_sck_close(int sck);
54	81	int APP_CC g_tcp_connect(int sck, const char* address, const char* port);
55		int APP_CC g_tcp_local_connect(int sck, const char* port);
56		int APP_CC g_tcp_force_send(int sck, char* data, int len);
57		int APP_CC g_tcp_force_recv(int sck, char* data, int len);
58		int APP_CC g_tcp_set_non_blocking(int sck);
	82	int APP_CC g_sck_local_connect(int sck, const char* port);
	83	int APP_CC g_sck_set_non_blocking(int sck);
59	84	int APP_CC g_tcp_bind(int sck, const char *port);
60		int APP_CC g_tcp_local_bind(int sck, const char* port);
	85	int APP_CC g_sck_local_bind(int sck, const char* port);
61	86	int APP_CC g_tcp_bind_address(int sck, const char* port, const char* address);
62		int APP_CC g_tcp_listen(int sck);
	87	int APP_CC g_sck_listen(int sck);
63	88	int APP_CC g_tcp_accept(int sck);
64	89	int APP_CC g_sck_accept(int sck, char *addr, int addr_bytes,
65	90	char *port, int port_bytes);
66		int APP_CC g_tcp_recv(int sck, void* ptr, int len, int flags);
67		int APP_CC g_tcp_send(int sck, const void* ptr, int len, int flags);
68		int APP_CC g_tcp_last_error_would_block(int sck);
69		int APP_CC g_tcp_socket_ok(int sck);
70		int APP_CC g_tcp_can_send(int sck, int millis);
71		int APP_CC g_tcp_can_recv(int sck, int millis);
72		int APP_CC g_tcp_select(int sck1, int sck2);
	91	int APP_CC g_sck_recv(int sck, void* ptr, int len, int flags);
	92	int APP_CC g_sck_send(int sck, const void* ptr, int len, int flags);
	93	int APP_CC g_sck_last_error_would_block(int sck);
	94	int APP_CC g_sck_socket_ok(int sck);
	95	int APP_CC g_sck_can_send(int sck, int millis);
	96	int APP_CC g_sck_can_recv(int sck, int millis);
	97	int APP_CC g_sck_select(int sck1, int sck2);
73	98	void APP_CC g_write_ip_address(int rcv_sck, char* ip_address, int bytes);
74	99	void APP_CC g_sleep(int msecs);
75		tbus APP_CC g_create_wait_obj(char* name);
76		tbus APP_CC g_create_wait_obj_from_socket(tbus socket, int write);
77		void APP_CC g_delete_wait_obj_from_socket(tbus wait_obj);
78		int APP_CC g_set_wait_obj(tbus obj);
79		int APP_CC g_reset_wait_obj(tbus obj);
80		int APP_CC g_is_wait_obj_set(tbus obj);
81		int APP_CC g_delete_wait_obj(tbus obj);
82		int APP_CC g_close_wait_obj(tbus obj);
83		int APP_CC g_obj_wait(tbus* read_objs, int rcount, tbus* write_objs,
	100	tintptr APP_CC g_create_wait_obj(char* name);
	101	tintptr APP_CC g_create_wait_obj_from_socket(tintptr socket, int write);
	102	void APP_CC g_delete_wait_obj_from_socket(tintptr wait_obj);
	103	int APP_CC g_set_wait_obj(tintptr obj);
	104	int APP_CC g_reset_wait_obj(tintptr obj);
	105	int APP_CC g_is_wait_obj_set(tintptr obj);
	106	int APP_CC g_delete_wait_obj(tintptr obj);
	107	int APP_CC g_obj_wait(tintptr* read_objs, int rcount, tintptr* write_objs,
84	108	int wcount,int mstimeout);
85	109	void APP_CC g_random(char* data, int len);
86	110	int APP_CC g_abs(int i);

135	159	void APP_CC g_signal_segfault(void (*func)(int));
136	160	void APP_CC g_signal_hang_up(void (*func)(int));
137	161	void APP_CC g_signal_user_interrupt(void (*func)(int));
138		void APP_CC g_signal_kill(void (*func)(int));
139	162	void APP_CC g_signal_terminate(void (*func)(int));
140	163	void APP_CC g_signal_pipe(void (*func)(int));
141	164	void APP_CC g_signal_usr1(void (*func)(int));

145	168	int APP_CC g_getuid(void);
146	169	int APP_CC g_getgid(void);
147	170	int APP_CC g_setuid(int pid);
	171	int APP_CC g_setsid(void);
	172	int APP_CC g_setlogin(const char *name);
148	173	int APP_CC g_waitchild(void);
149	174	int APP_CC g_waitpid(int pid);
150	175	void APP_CC g_clearenv(void);

+40

-32

common/ssl_calls.c less more

400	400	tui8 *lexp;
401	401	int error;
402	402	int len;
	403	int diff;
403	404
404	405	if ((exp_len != 4) \|\| ((mod_len != 64) && (mod_len != 256)) \|\|
405	406	((pri_len != 64) && (pri_len != 256)))

407	408	return 1;
408	409	}
409	410
410		lmod = (char *)g_malloc(mod_len, 0);
411		lpri = (char *)g_malloc(pri_len, 0);
	411	diff = 0;
	412	lmod = (char *)g_malloc(mod_len, 1);
	413	lpri = (char *)g_malloc(pri_len, 1);
412	414	lexp = (tui8 *)exp;
413	415	my_e = lexp[0];
414	416	my_e \|= lexp[1] << 8;

422	424	if (error == 0)
423	425	{
424	426	len = BN_num_bytes(my_key->n);
425		error = len != mod_len;
426		}
427
428		if (error == 0)
429		{
430		BN_bn2bin(my_key->n, (tui8 *)lmod);
	427	error = (len < 1) \|\| (len > mod_len);
	428	diff = mod_len - len;
	429	}
	430
	431	if (error == 0)
	432	{
	433	BN_bn2bin(my_key->n, (tui8 *)(lmod + diff));
431	434	ssl_reverse_it(lmod, mod_len);
432	435	}
433	436
434	437	if (error == 0)
435	438	{
436	439	len = BN_num_bytes(my_key->d);
437		error = len != pri_len;
438		}
439
440		if (error == 0)
441		{
442		BN_bn2bin(my_key->d, (tui8 *)lpri);
	440	error = (len < 1) \|\| (len > pri_len);
	441	diff = pri_len - len;
	442	}
	443
	444	if (error == 0)
	445	{
	446	BN_bn2bin(my_key->d, (tui8 *)(lpri + diff));
443	447	ssl_reverse_it(lpri, pri_len);
444	448	}
445	449

470	474	char *lpri;
471	475	int error;
472	476	int len;
	477	int diff;
473	478
474	479	if ((exp_len != 4) \|\| ((mod_len != 64) && (mod_len != 256)) \|\|
475	480	((pri_len != 64) && (pri_len != 256)))

477	482	return 1;
478	483	}
479	484
480		lexp = (char *)g_malloc(exp_len, 0);
481		lmod = (char *)g_malloc(mod_len, 0);
482		lpri = (char *)g_malloc(pri_len, 0);
	485	diff = 0;
	486	lexp = (char *)g_malloc(exp_len, 1);
	487	lmod = (char *)g_malloc(mod_len, 1);
	488	lpri = (char *)g_malloc(pri_len, 1);
483	489	g_memcpy(lexp, exp, exp_len);
484	490	ssl_reverse_it(lexp, exp_len);
485	491	my_e = BN_new();

490	496	if (error == 0)
491	497	{
492	498	len = BN_num_bytes(my_key->n);
493		error = len != mod_len;
494		}
495
496		if (error == 0)
497		{
498		BN_bn2bin(my_key->n, (tui8 *)lmod);
	499	error = (len < 1) \|\| (len > mod_len);
	500	diff = mod_len - len;
	501	}
	502
	503	if (error == 0)
	504	{
	505	BN_bn2bin(my_key->n, (tui8 *)(lmod + diff));
499	506	ssl_reverse_it(lmod, mod_len);
500	507	}
501	508
502	509	if (error == 0)
503	510	{
504	511	len = BN_num_bytes(my_key->d);
505		error = len != pri_len;
506		}
507
508		if (error == 0)
509		{
510		BN_bn2bin(my_key->d, (tui8 *)lpri);
	512	error = (len < 1) \|\| (len > pri_len);
	513	diff = pri_len - len;
	514	}
	515
	516	if (error == 0)
	517	{
	518	BN_bn2bin(my_key->d, (tui8 *)(lpri + diff));
511	519	ssl_reverse_it(lpri, pri_len);
512	520	}
513	521

840	848	return 1;
841	849	}
842	850	g_reset_wait_obj(tls->rwo);
843		return g_tcp_can_recv(sck, millis);
844		}
845
	851	return g_sck_can_recv(sck, millis);
	852	}
	853

+15

-0

common/thread_calls.c less more

19	19
20	20	#if defined(_WIN32)
21	21	#include <windows.h>
	22	#elif defined(__APPLE__)
	23	#include <pthread.h>
	24	#include <dispatch/dispatch.h>
	25	#include <dispatch/time.h>
22	26	#else
23	27	#include <pthread.h>
24	28	#include <semaphore.h>

158	162
159	163	sem = CreateSemaphore(0, init_count, init_count + 10, 0);
160	164	return (tbus)sem;
	165	#elif defined(__APPLE__)
	166	dispatch_semaphore_t sem = dispatch_semaphore_create(init_count);
	167	return (tbus)sem;
161	168	#else
162	169	sem_t sem = (sem_t )NULL;
163	170

173	180	{
174	181	#if defined(_WIN32)
175	182	CloseHandle((HANDLE)sem);
	183	#elif defined(__APPLE__)
	184	dispatch_release((dispatch_semaphore_t)sem);
176	185	#else
177	186	sem_t *lsem;
178	187

189	198	#if defined(_WIN32)
190	199	WaitForSingleObject((HANDLE)sem, INFINITE);
191	200	return 0;
	201	#elif defined(__APPLE__)
	202	dispatch_semaphore_wait((dispatch_semaphore_t)sem, DISPATCH_TIME_FOREVER);
	203	return 0;
192	204	#else
193	205	sem_wait((sem_t *)sem);
194	206	return 0;

202	214	#if defined(_WIN32)
203	215	ReleaseSemaphore((HANDLE)sem, 1, 0);
204	216	return 0;
	217	#elif defined(__APPLE__)
	218	dispatch_semaphore_signal((dispatch_semaphore_t)sem);
	219	return 0;
205	220	#else
206	221	sem_post((sem_t *)sem);
207	222	return 0;

+22

-15

common/trans.c less more

76	76	int APP_CC
77	77	trans_tcp_can_recv(struct trans *self, int sck, int millis)
78	78	{
79		return g_tcp_can_recv(sck, millis);
	79	return g_sck_can_recv(sck, millis);
80	80	}
81	81
82	82	/*****************************************************************************/

248	248	}
249	249	}
250	250	}
	251	else if (block)
	252	{
	253	/* check for term here */
	254	if (self->is_term != 0)
	255	{
	256	if (self->is_term())
	257	{
	258	/* term */
	259	return 1;
	260	}
	261	}
	262	}
251	263	}
252	264	else
253	265	{

284	296
285	297	if (self->type1 == TRANS_TYPE_LISTENER) /* listening */
286	298	{
287		if (g_tcp_can_recv(self->sck, 0))
	299	if (g_sck_can_recv(self->sck, 0))
288	300	{
289	301	in_sck = g_sck_accept(self->sck, self->addr, sizeof(self->addr),
290	302	self->port, sizeof(self->port));

317	329	sizeof(self->addr) - 1);
318	330	g_strncpy(in_trans->port, self->port,
319	331	sizeof(self->port) - 1);
320
	332	g_sck_set_non_blocking(in_sck);
321	333	if (self->trans_conn_in(self, in_trans) != 0)
322	334	{
323	335	trans_delete(in_trans);

411	423
412	424	return rv;
413	425	}
	426
414	427	/*****************************************************************************/
415	428	int APP_CC
416	429	trans_force_read_s(struct trans self, struct stream in_s, int size)

421	434	{
422	435	return 1;
423	436	}
424
425	437	while (size > 0)
426	438	{
427	439	/* make sure stream has room */

429	441	{
430	442	return 1;
431	443	}
432
433	444	rcvd = self->trans_recv(self, in_s->end, size);
434
435	445	if (rcvd == -1)
436	446	{
437	447	if (g_tcp_last_error_would_block(self->sck))
438	448	{
439		if (!g_tcp_can_recv(self->sck, 100))
	449	if (!self->trans_can_recv(self, self->sck, 100))
440	450	{
441	451	/* check for term here */
442	452	if (self->is_term != 0)

469	479	size -= rcvd;
470	480	}
471	481	}
472
473	482	return 0;
474	483	}
475	484

492	501	{
493	502	return 1;
494	503	}
495
496	504	size = (int) (out_s->end - out_s->data);
497	505	total = 0;
498
499	506	if (trans_send_waiting(self, 1) != 0)
500	507	{
501	508	self->status = TRANS_STATUS_DOWN;
502	509	return 1;
503	510	}
504
505	511	while (total < size)
506	512	{
507	513	sent = self->trans_send(self, out_s->data + total, size - total);
508
509	514	if (sent == -1)
510	515	{
511	516	if (g_tcp_last_error_would_block(self->sck))

542	547	total = total + sent;
543	548	}
544	549	}
545
546	550	return 0;
547	551	}
548	552

606	610	return 0;
607	611	}
608	612	/* did not send right away, have to copy */
609		make_stream(wait_s);
	613	make_stream(wait_s);
610	614	init_stream(wait_s, size);
611	615	if (self->si != 0)
612	616	{
613		if (self->si->cur_source != 0)
	617	if ((self->si->cur_source != 0) &&
	618	(self->si->cur_source != self->my_source))
614	619	{
615	620	self->si->source[self->si->cur_source] += size;
616	621	wait_s->source = self->si->source + self->si->cur_source;

871	876
872	877	return rv;
873	878	}
	879
874	880	/*****************************************************************************/
875	881	/* returns error */
876	882	int APP_CC

896	902
897	903	return 0;
898	904	}
	905
899	906	/*****************************************************************************/
900	907	/* returns error */
901	908	int APP_CC

+1

-0

common/xrdp_client_info.h less more

109	109	int multimon; /* 0 = deny , 1 = allow */
110	110	int monitorCount; /* number of monitors detected (max = 16) */
111	111	struct monitor_info minfo[16]; /* client monitor data */
	112	struct monitor_info minfo_wm[16]; /* client monitor data, non-negative values */
112	113
113	114	int keyboard_type;
114	115	int keyboard_subtype;

+6

-6

common/xrdp_constants.h less more

520	520	#define NO_BITMAP_COMPRESSION_HDR 0x0400
521	521	#define LONG_CREDENTIALS_SUPPORTED 0x0004
522	522	#define AUTORECONNECT_SUPPORTED 0x0008
523		#define ENC_SALTED_CHEKSUM 0x0010
	523	#define ENC_SALTED_CHECKSUM 0x0010
524	524	#define NEGOTIATEORDERSUPPORT 0x0002
525	525	#define ZEROBOUNDSDELTASUPPORT 0x0008
526	526	#define COLORINDEXSUPPORT 0x0020

540	540	#define SURCMDS_FRAMEMARKER 0x00000010
541	541	#define SURCMDS_STREAMSUFRACEBITS 0x00000040
542	542
543		/* CODEC_GUID_NSCODEC 0xCA8D1BB9000F154F589FAE2D1A87E2D6 */
	543	/* CODEC_GUID_NSCODEC CA8D1BB9-000F-154F-589FAE2D1A87E2D6 */
544	544	#define XR_CODEC_GUID_NSCODEC \
545	545	"\xb9\x1b\x8d\xca\x0f\x00\x4f\x15\x58\x9f\xae\x2d\x1a\x87\xe2\xd6"
546	546
547		/* CODEC_GUID_REMOTEFX 0x76772F12BD724463AFB3B73C9C6F7886 */
	547	/* CODEC_GUID_REMOTEFX 76772F12-BD72-4463-AFB3B73C9C6F7886 */
548	548	#define XR_CODEC_GUID_REMOTEFX \
549	549	"\x12\x2F\x77\x76\x72\xBD\x63\x44\xAF\xB3\xB7\x3C\x9C\x6F\x78\x86"
550	550
551		/* CODEC_GUID_JPEG 0x1BAF4CE6 9EED 430C 869ACB8B37B66237 */
	551	/* CODEC_GUID_JPEG 1BAF4CE6-9EED-430C-869ACB8B37B66237 */
552	552	#define XR_CODEC_GUID_JPEG \
553	553	"\xE6\x4C\xAF\x1B\xED\x9E\x0C\x43\x86\x9A\xCB\x8B\x37\xB6\x62\x37"
554	554
555		/* CODEC_GUID_PNG 0xOE0C858D 28E0 45DB ADAA0F83E57CC560 */
	555	/* CODEC_GUID_PNG 0E0C858D-28E0-45DB-ADAA0F83E57CC560 */
556	556	#define XR_CODEC_GUID_PNG \
557	557	"\x8D\x85\x0C\x0E\xE0\x28\xDB\x45\xAD\xAA\x0F\x83\xE5\x7C\xC5\x60"
558	558
559		/* MFVideoFormat_H264 ({34363248-0000-0010-8000-00AA00389B71}) */
	559	/* MFVideoFormat_H264 0x34363248-0000-0010-800000AA00389B71 */
560	560	#define XR_CODEC_GUID_H264 \
561	561	"\x48\x32\x36\x34\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71"
562	562

+34

-14

configure.ac less more

0	0	# Process this file with autoconf to produce a configure script
1	1
2		AC_PREREQ(2.59)
3		AC_INIT([xrdp], [0.9.0], [xrdp-devel@lists.sourceforge.net])
	2	AC_PREREQ(2.65)
	3	AC_INIT([xrdp], [0.9.0], [xrdp-devel@googlegroups.com])
4	4	AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
5		AM_INIT_AUTOMAKE([1.6 foreign])
	5	AM_INIT_AUTOMAKE([1.7.2 foreign])
	6	AC_CONFIG_MACRO_DIR([m4])
6	7	AC_PROG_CC
7	8	AC_C_CONST
8	9	AC_PROG_LIBTOOL
9	10	PKG_PROG_PKG_CONFIG
	11
	12	# Use silent rules by default if supported by Automake
	13	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
	14
	15	AX_CFLAGS_WARN_ALL
	16	AX_GCC_FUNC_ATTRIBUTE([format])
10	17
11	18	case $host_os in
12	19	linux)

52	59	AC_ARG_ENABLE(ipv6, AS_HELP_STRING([--enable-ipv6],
53	60	[Build IPv6 support (default: no, experimental)]),
54	61	[], [enable_ipv6=no])
	62	AC_ARG_ENABLE(ipv6only, AS_HELP_STRING([--enable-ipv6only],
	63	[Build IPv6-only (default: no)]),
	64	[], [enable_ipv6only=no])
55	65	AC_ARG_ENABLE(kerberos, AS_HELP_STRING([--enable-kerberos],
56	66	[Build kerberos support (default: no)]),
57	67	[], [enable_kerberos=no])

97	107	[], [enable_opus=no])
98	108	AM_CONDITIONAL(XRDP_OPUS, [test x$enable_opus = xyes])
99	109
100		AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"])
101
102	110	# checking for openssl
103	111	AC_CHECK_HEADER([openssl/rc4.h], [],
104	112	[AC_MSG_ERROR([please install libssl-dev or openssl-devel])],

126	134	fi
127	135	fi
128	136
	137	if test "x$enable_ipv6only" = "xyes"
	138	then
	139	enable_ipv6=yes
	140	AC_DEFINE([XRDP_ENABLE_IPV6ONLY],1,[Enable IPv6 only])
	141	fi
	142
129	143	if test "x$enable_ipv6" = "xyes"
130	144	then
131	145	AC_DEFINE([XRDP_ENABLE_IPV6],1,[Enable IPv6])
132	146	fi
133
134		AC_CHECK_MEMBER([struct in6_addr.s6_addr],
135		[],
136		[AC_DEFINE(NO_ARPA_INET_H_IP6, 1, [for IPv6])],
137		[#include <arpa/inet.h>])
138	147
139	148	if test "x$enable_pam" != "xyes" \|\| test "x$bsd" = "xtrue"
140	149	then

199	208	fi
200	209	fi
201	210
202		# checking for Xlib, Xfixes
203		AC_CHECK_HEADER([X11/Xlib.h], [],
204		[AC_MSG_ERROR([please install libx11-dev or libX11-devel])])
	211	AC_PATH_XTRA
	212	if test "x$no_x" == "xyes"; then
	213	AC_MSG_ERROR([please install libx11-dev or libX11-devel])
	214	fi
	215
	216	save_CFLAGS="$CFLAGS"
	217	CFLAGS="$CFLAGS $X_CFLAGS"
	218
	219	# checking for Xfixes
205	220	AC_CHECK_HEADER([X11/extensions/Xfixes.h], [],
206	221	[AC_MSG_ERROR([please install libx11-dev and libxfixes-dev or libXfixes-devel])],
207	222	[#include <X11/Xlib.h>])
	223
	224	# checking for Xrandr
208	225	AC_CHECK_HEADER([X11/extensions/Xrandr.h], [],
209	226	[AC_MSG_ERROR([please install libxrandr-dev or libXrandr-devel])],
210	227	[#include <X11/Xlib.h>])
211	228
212		libdir="${libdir}/xrdp";
	229	CFLAGS="$save_CFLAGS"
	230
	231	AC_SUBST([moduledir], '${libdir}/xrdp')
	232
213	233	if test "x${prefix}" = "xNONE" ; then
214	234	sysconfdir="/etc";
215	235	localstatedir="/var";

+1

-1

design.txt less more

30	30
31	31	For X11, start the XServer after the user is
32	32	authenticated. First check for the next available X11 display,
33		create a user session, start the XServer and set the DISPLAY enviromenet
	33	create a user session, start the XServer and set the DISPLAY environment
34	34	variable.

+2

-2

docs/man/Makefile.am less more

0		man_MANS = \
	0	dist_man_MANS = \
1	1	xrdp-dis.1 \
2	2	sesman.ini.5 \
3	3	xrdp.ini.5 \

13	13	noinst_man_MANS = \
14	14	xrdp-xcon.8
15	15
16		EXTRA_DIST = $(man_MANS) $(noinst_man_MANS)
	16	EXTRA_DIST = $(noinst_man_MANS)

+1

-1

docs/man/xrdp-sessvc.8 less more

2	2	xrdp\-sessvc \- \fBxrdp\fR session supervisor
3	3
4	4	.SH "SYNTAX"
5		.B xrdp\-sessman
	5	.B xrdp\-sessvc
6	6	.I x_pid wm_pid
7	7
8	8	.SH "DESCRIPTION"

+4

-0

docs/man/xrdp.ini.5 less more

213	213	.TP
214	214	\fBport\fR=\fI<number>\fR\|\fI\-1\fR
215	215	Specifies the port number to connect to. If set to \fI\-1\fR, the default port for the specified library is used.
	216
	217	.TP
	218	\fBcode\fR=\fI<number>\fR\|\fI\-1\fR
	219	Specifies the session type, the default, \fI\0\fR, is Xvnc, \fI\10\fR, is X11rdp, and \fI\20\fR, uses Xorg driver mode.
216	220
217	221	.SH "EXAMPLES"
218	222	This is an example \fBxrdp.ini\fR:

+1

-0

fontdump/.gitignore less more

0

!Makefile

+0

-0

fontdump/Makefile less more

(No changes)

+0

-0

fontdump/fontdump.c less more

(No changes)

+5

-2

genkeymap/Makefile.am less more

	0	AM_CFLAGS = $(X_CFLAGS)
0	1
1	2	bin_PROGRAMS = \
2	3	xrdp-genkeymap
3	4
4	5	xrdp_genkeymap_SOURCES = genkeymap.c evdev-map.c
5	6
	7	xrdp_genkeymap_LDFLAGS = \
	8	$(X_LIBS)
	9
6	10	xrdp_genkeymap_LDADD = \
7		-L/usr/X11R6/lib \
8		-lX11
	11	$(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)

+8

-8

genkeymap/genkeymap.c less more

20	20
21	21	Updated Jay Sorg 2009
22	22
23		cs czech 0x405
24		de german 0x407
25		en-us us english 0x409
26		fr french 0x40c
27		it italy 0x410
	23	cs Czech 0x405
	24	de German 0x407
	25	en-us US English 0x409
	26	fr French 0x40c
	27	it Italian 0x410
28	28	br Portuguese (Brazil) 0x416
29		ru russian 0x419
30		se swedish 0x41d
31		en-uk uk english 0x809
	29	ru Russian 0x419
	30	se Swedish 0x41d
	31	en-uk UK English 0x809
32	32	*/
33	33
34	34	#include <stdio.h>

+3

-3

install.txt less more

10	10	for that.
11	11	I also have a replacement ssl_calls.c to avoid the openssl dependency
12	12	email me(Jay) for it or see http://server1.xrdp.org/xrdp/openssl.
13		Due to the licence, I can't include it in this project.
	13	Due to the license, I can't include it in this project.
14	14
15	15	http://server1.xrdp.org/xrdp/openssl/
16	16
17		unpackage the tarball
	17	unpack the tarball
18	18
19	19	tar -zxvf xrdp-0.1.tar.gz
20	20

27	27	as root, run make install
28	28
29	29	This will install most of the files in /usr/local/xrdp.
30		Some files install in /etc/xrdp. These are configuation
	30	Some files install in /etc/xrdp. These are configuration
31	31	files.
32	32
33	33	files and location

+18

-21

instfiles/Makefile.am less more

0	0	EXTRA_DIST = \
1	1	xrdp.sh \
2	2	xrdp-sesman.service \
3		xrdp.service \
4		$(startscript_DATA)
	3	xrdp.service
5	4
6	5	#
7	6	# files for all platforms
8	7	#
9	8	startscriptdir=$(sysconfdir)/xrdp
10	9
11		startscript_DATA = \
	10	dist_startscript_DATA = \
12	11	km-0407.ini \
13	12	km-0409.ini \
14	13	km-040c.ini \

23	22	km-080c.ini \
24	23	km-0813.ini \
25	24	km-0816.ini \
	25	km-100c.ini \
26	26	km-e0010411.ini \
27	27	km-e0200411.ini \
28	28	km-e0210411.ini

30	30	#
31	31	# platform specific files
32	32	#
33		SUBDIRS=
	33	SUBDIRS =
34	34	if LINUX
35		SUBDIRS+= \
36		pam.d \
37		pulse
38		startscript_DATA+= xrdp.sh
	35	SUBDIRS += \
	36	pam.d \
	37	pulse
	38	dist_startscript_SCRIPTS = xrdp.sh
39	39	if HAVE_SYSTEMD
40		systemdsystemunit_DATA = \
41		xrdp-sesman.service \
42		xrdp.service
	40	dist_systemdsystemunit_DATA = \
	41	xrdp-sesman.service \
	42	xrdp.service
43	43	else
44		SUBDIRS+= \
45		default \
46		init.d
	44	SUBDIRS += \
	45	default \
	46	init.d
47	47	endif # HAVE_SYSTEMD
48	48	endif # LINUX
49	49
50	50	if FREEBSD
51		SUBDIRS+= \
52		pam.d \
53		rc.d \
54		pulse
	51	SUBDIRS += \
	52	pam.d \
	53	rc.d \
	54	pulse
55	55	endif
56	56
57	57	#

60	60	if LINUX
61	61	# must be tab below
62	62	install-data-hook:
63		chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
64	63	if [ -f $(DESTDIR)$(sysconfdir)/init.d/xrdp ]; then \
65		chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
66	64	sed -i 's\|__BASE__\|$(prefix)\|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
67	65	fi
68	66	endif

70	68	if FREEBSD
71	69	# must be tab below
72	70	install-data-hook:
73		chmod 755 $(DESTDIR)$(sysconfdir)/rc.d/xrdp
74	71	sed -i '' 's\|%%PREFIX%%\|$(prefix)\|g' $(DESTDIR)$(sysconfdir)/rc.d/xrdp
75	72	endif

+2

-3

instfiles/default/Makefile.am less more

0		EXTRA_DIST = xrdp
1		startscriptdir=$(sysconfdir)/default
2		startscript_DATA = xrdp
	0	startscriptdir = $(sysconfdir)/default
	1	dist_startscript_DATA = xrdp

+2

-4

instfiles/init.d/Makefile.am less more

0		EXTRA_DIST = xrdp
1		startscriptdir=$(sysconfdir)/init.d
2		startscript_DATA = xrdp
3
	0	startscriptdir = $(sysconfdir)/init.d
	1	dist_startscript_SCRIPTS = xrdp

+2

-15

instfiles/init.d/xrdp less more

17	17	BASE=__BASE__
18	18	DAEMON=${BASE}/sbin/xrdp
19	19	SDAEMON=${BASE}/sbin/xrdp-sesman
20		PIDDIR=/var/run/xrdp/
	20	PIDDIR=/var/run/
21	21	SESMAN_START=yes
22	22	#USERID=xrdp
23	23	# the X11rdp backend only works as root at the moment - GH 20/03/2013
24	24	USERID=root
25		RSAKEYS=/etc/xrdp/rsakeys.ini
26	25	NAME=xrdp
27	26	DESC="Remote Desktop Protocol server"
28	27

66	65	mkdir $PIDDIR
67	66	fi
68	67	chown $USERID:$USERID $PIDDIR
69
70		# Check for rsa key
71		if [ ! -f $RSAKEYS ] ; then
72		log_action_begin_msg "Generating xrdp RSA keys..."
73		(umask 077 ; xrdp-keygen xrdp $RSAKEYS)
74		chown $USERID:$USERID $RSAKEYS
75		if [ ! -f $RSAKEYS ] ; then
76		log_action_end_msg 1 "could not create $RSAKEYS"
77		exit 1
78		fi
79		log_action_end_msg 0 "done"
80		fi
81	68	fi
82	69
83	70

138	125	;;
139	126	force-stop)
140	127	$0 stop
141		# because it doesn't allways die the right way
	128	# because it doesn't always die the right way
142	129	force_stop
143	130	;;
144	131	restart\|force-reload)

+16

-16

instfiles/km-0411.ini less more

119	119	Key126=65469:61
120	120	Key127=0:0
121	121	Key128=0:0
122		Key129=0:0
	122	Key129=65315:0
123	123	Key130=0:0
124		Key131=0:0
	124	Key131=65314:0
125	125	Key132=0:0
126	126	Key133=165:165
127	127	Key134=0:0

251	251	Key126=65469:61
252	252	Key127=65515:0
253	253	Key128=65517:0
254		Key129=0:0
	254	Key129=65315:0
255	255	Key130=0:0
256		Key131=0:0
	256	Key131=65314:0
257	257	Key132=0:0
258	258	Key133=124:124
259	259	Key134=0:0

383	383	Key126=65469:61
384	384	Key127=0:0
385	385	Key128=0:0
386		Key129=0:0
	386	Key129=65315:0
387	387	Key130=0:0
388		Key131=0:0
	388	Key131=65314:0
389	389	Key132=0:0
390	390	Key133=165:165
391	391	Key134=0:0

515	515	Key126=65469:61
516	516	Key127=65515:0
517	517	Key128=65517:0
518		Key129=0:0
	518	Key129=65315:0
519	519	Key130=0:0
520		Key131=0:0
	520	Key131=65314:0
521	521	Key132=0:0
522	522	Key133=124:124
523	523	Key134=0:0

647	647	Key126=65469:61
648	648	Key127=0:0
649	649	Key128=0:0
650		Key129=0:0
	650	Key129=65315:0
651	651	Key130=0:0
652		Key131=0:0
	652	Key131=65314:0
653	653	Key132=0:0
654	654	Key133=165:165
655	655	Key134=0:0

779	779	Key126=65469:61
780	780	Key127=0:0
781	781	Key128=0:0
782		Key129=0:0
	782	Key129=65315:0
783	783	Key130=0:0
784		Key131=0:0
	784	Key131=65314:0
785	785	Key132=0:0
786	786	Key133=165:165
787	787	Key134=0:0

911	911	Key126=65469:61
912	912	Key127=65515:0
913	913	Key128=65517:0
914		Key129=0:0
	914	Key129=65315:0
915	915	Key130=0:0
916		Key131=0:0
	916	Key131=65314:0
917	917	Key132=0:0
918	918	Key133=124:124
919	919	Key134=0:0

1043	1043	Key126=65469:61
1044	1044	Key127=65515:0
1045	1045	Key128=65517:0
1046		Key129=0:0
	1046	Key129=65315:0
1047	1047	Key130=0:0
1048		Key131=0:0
	1048	Key131=65314:0
1049	1049	Key132=0:0
1050	1050	Key133=124:124
1051	1051	Key134=0:0

+659

-0

instfiles/km-100c.ini less more

	0	[noshift]
	1	Key8=0:0
	2	Key9=65307:27
	3	Key10=49:49
	4	Key11=50:50
	5	Key12=51:51
	6	Key13=52:52
	7	Key14=53:53
	8	Key15=54:54
	9	Key16=55:55
	10	Key17=56:56
	11	Key18=57:57
	12	Key19=48:48
	13	Key20=39:39
	14	Key21=65106:94
	15	Key22=65288:8
	16	Key23=65289:9
	17	Key24=113:113
	18	Key25=119:119
	19	Key26=101:101
	20	Key27=114:114
	21	Key28=116:116
	22	Key29=122:122
	23	Key30=117:117
	24	Key31=105:105
	25	Key32=111:111
	26	Key33=112:112
	27	Key34=232:232
	28	Key35=65111:168
	29	Key36=65293:13
	30	Key37=65507:0
	31	Key38=97:97
	32	Key39=115:115
	33	Key40=100:100
	34	Key41=102:102
	35	Key42=103:103
	36	Key43=104:104
	37	Key44=106:106
	38	Key45=107:107
	39	Key46=108:108
	40	Key47=233:233
	41	Key48=224:224
	42	Key49=167:167
	43	Key50=65505:0
	44	Key51=36:36
	45	Key52=121:121
	46	Key53=120:120
	47	Key54=99:99
	48	Key55=118:118
	49	Key56=98:98
	50	Key57=110:110
	51	Key58=109:109
	52	Key59=44:44
	53	Key60=46:46
	54	Key61=45:45
	55	Key62=65506:0
	56	Key63=65450:42
	57	Key64=65513:0
	58	Key65=32:32
	59	Key66=65509:0
	60	Key67=65470:0
	61	Key68=65471:0
	62	Key69=65472:0
	63	Key70=65473:0
	64	Key71=65474:0
	65	Key72=65475:0
	66	Key73=65476:0
	67	Key74=65477:0
	68	Key75=65478:0
	69	Key76=65479:0
	70	Key77=65407:0
	71	Key78=65300:0
	72	Key79=65429:0
	73	Key80=65431:0
	74	Key81=65434:0
	75	Key82=65453:45
	76	Key83=65430:0
	77	Key84=65437:0
	78	Key85=65432:0
	79	Key86=65451:43
	80	Key87=65436:0
	81	Key88=65433:0
	82	Key89=65435:0
	83	Key90=65438:0
	84	Key91=65439:0
	85	Key92=0:0
	86	Key93=65406:0
	87	Key94=60:60
	88	Key95=65480:0
	89	Key96=65481:0
	90	Key97=65360:0
	91	Key98=65362:0
	92	Key99=65365:0
	93	Key100=65361:0
	94	Key101=0:0
	95	Key102=65363:0
	96	Key103=65367:0
	97	Key104=65364:0
	98	Key105=65366:0
	99	Key106=65379:0
	100	Key107=65535:127
	101	Key108=65421:13
	102	Key109=65508:0
	103	Key110=65299:0
	104	Key111=65377:0
	105	Key112=65455:47
	106	Key113=65027:0
	107	Key114=0:0
	108	Key115=0:0
	109	Key116=0:0
	110	Key117=0:0
	111	Key118=0:0
	112	Key119=0:0
	113	Key120=0:0
	114	Key121=0:0
	115	Key122=0:0
	116	Key123=0:0
	117	Key124=65027:0
	118	Key125=0:0
	119	Key126=65469:61
	120	Key127=0:0
	121	Key128=0:0
	122	Key129=0:0
	123	Key130=0:0
	124	Key131=0:0
	125	Key132=0:0
	126	Key133=0:0
	127	Key134=0:0
	128	Key135=0:0
	129	Key136=0:0
	130	Key137=0:0
	131
	132	[shift]
	133	Key8=0:0
	134	Key9=65307:27
	135	Key10=43:43
	136	Key11=34:34
	137	Key12=42:42
	138	Key13=231:231
	139	Key14=37:37
	140	Key15=38:38
	141	Key16=47:47
	142	Key17=40:40
	143	Key18=41:41
	144	Key19=61:61
	145	Key20=63:63
	146	Key21=65104:96
	147	Key22=65288:8
	148	Key23=65056:0
	149	Key24=81:81
	150	Key25=87:87
	151	Key26=69:69
	152	Key27=82:82
	153	Key28=84:84
	154	Key29=90:90
	155	Key30=85:85
	156	Key31=73:73
	157	Key32=79:79
	158	Key33=80:80
	159	Key34=252:252
	160	Key35=33:33
	161	Key36=65293:13
	162	Key37=65507:0
	163	Key38=65:65
	164	Key39=83:83
	165	Key40=68:68
	166	Key41=70:70
	167	Key42=71:71
	168	Key43=72:72
	169	Key44=74:74
	170	Key45=75:75
	171	Key46=76:76
	172	Key47=246:246
	173	Key48=228:228
	174	Key49=176:176
	175	Key50=65505:0
	176	Key51=163:163
	177	Key52=89:89
	178	Key53=88:88
	179	Key54=67:67
	180	Key55=86:86
	181	Key56=66:66
	182	Key57=78:78
	183	Key58=77:77
	184	Key59=59:59
	185	Key60=58:58
	186	Key61=95:95
	187	Key62=65506:0
	188	Key63=65450:42
	189	Key64=65511:0
	190	Key65=32:32
	191	Key66=65509:0
	192	Key67=65470:0
	193	Key68=65471:0
	194	Key69=65472:0
	195	Key70=65473:0
	196	Key71=65474:0
	197	Key72=65475:0
	198	Key73=65476:0
	199	Key74=65477:0
	200	Key75=65478:0
	201	Key76=65479:0
	202	Key77=65273:0
	203	Key78=65300:0
	204	Key79=65463:55
	205	Key80=65464:56
	206	Key81=65465:57
	207	Key82=65453:45
	208	Key83=65460:52
	209	Key84=65461:53
	210	Key85=65462:54
	211	Key86=65451:43
	212	Key87=65457:49
	213	Key88=65458:50
	214	Key89=65459:51
	215	Key90=65456:48
	216	Key91=65454:46
	217	Key92=0:0
	218	Key93=65406:0
	219	Key94=62:62
	220	Key95=65480:0
	221	Key96=65481:0
	222	Key97=65360:0
	223	Key98=65362:0
	224	Key99=65365:0
	225	Key100=65361:0
	226	Key101=0:0
	227	Key102=65363:0
	228	Key103=65367:0
	229	Key104=65364:0
	230	Key105=65366:0
	231	Key106=65379:0
	232	Key107=65535:127
	233	Key108=65421:13
	234	Key109=65508:0
	235	Key110=65299:0
	236	Key111=65377:0
	237	Key112=65455:47
	238	Key113=65312:0
	239	Key114=0:0
	240	Key115=0:0
	241	Key116=0:0
	242	Key117=0:0
	243	Key118=0:0
	244	Key119=0:0
	245	Key120=0:0
	246	Key121=0:0
	247	Key122=0:0
	248	Key123=0:0
	249	Key124=65027:0
	250	Key125=65513:0
	251	Key126=65469:61
	252	Key127=65515:0
	253	Key128=65517:0
	254	Key129=0:0
	255	Key130=0:0
	256	Key131=0:0
	257	Key132=0:0
	258	Key133=0:0
	259	Key134=0:0
	260	Key135=0:0
	261	Key136=0:0
	262	Key137=0:0
	263
	264	[altgr]
	265	Key8=0:0
	266	Key9=65307:27
	267	Key10=124:124
	268	Key11=64:64
	269	Key12=35:35
	270	Key13=188:188
	271	Key14=189:189
	272	Key15=172:172
	273	Key16=166:166
	274	Key17=162:162
	275	Key18=93:93
	276	Key19=125:125
	277	Key20=65105:180
	278	Key21=65107:126
	279	Key22=65288:8
	280	Key23=65289:9
	281	Key24=64:64
	282	Key25=435:322
	283	Key26=8364:8364
	284	Key27=182:182
	285	Key28=956:359
	286	Key29=2299:8592
	287	Key30=2302:8595
	288	Key31=2301:8594
	289	Key32=248:248
	290	Key33=254:254
	291	Key34=91:91
	292	Key35=93:93
	293	Key36=65293:13
	294	Key37=65507:0
	295	Key38=230:230
	296	Key39=223:223
	297	Key40=240:240
	298	Key41=496:273
	299	Key42=959:331
	300	Key43=689:295
	301	Key44=106:106
	302	Key45=930:312
	303	Key46=435:322
	304	Key47=65105:180
	305	Key48=123:123
	306	Key49=172:172
	307	Key50=65505:0
	308	Key51=125:125
	309	Key52=171:171
	310	Key53=187:187
	311	Key54=162:162
	312	Key55=2770:8220
	313	Key56=2771:8221
	314	Key57=110:110
	315	Key58=181:181
	316	Key59=2211:0
	317	Key60=183:183
	318	Key61=65120:0
	319	Key62=65506:0
	320	Key63=65450:42
	321	Key64=65513:0
	322	Key65=32:32
	323	Key66=65509:0
	324	Key67=65470:0
	325	Key68=65471:0
	326	Key69=65472:0
	327	Key70=65473:0
	328	Key71=65474:0
	329	Key72=65475:0
	330	Key73=65476:0
	331	Key74=65477:0
	332	Key75=65478:0
	333	Key76=65479:0
	334	Key77=65407:0
	335	Key78=65300:0
	336	Key79=65429:0
	337	Key80=65431:0
	338	Key81=65434:0
	339	Key82=65453:45
	340	Key83=65430:0
	341	Key84=65437:0
	342	Key85=65432:0
	343	Key86=65451:43
	344	Key87=65436:0
	345	Key88=65433:0
	346	Key89=65435:0
	347	Key90=65438:0
	348	Key91=65439:0
	349	Key92=0:0
	350	Key93=65406:0
	351	Key94=92:92
	352	Key95=65480:0
	353	Key96=65481:0
	354	Key97=65360:0
	355	Key98=65362:0
	356	Key99=65365:0
	357	Key100=65361:0
	358	Key101=0:0
	359	Key102=65363:0
	360	Key103=65367:0
	361	Key104=65364:0
	362	Key105=65366:0
	363	Key106=65379:0
	364	Key107=65535:127
	365	Key108=65421:13
	366	Key109=65508:0
	367	Key110=65299:0
	368	Key111=0:0
	369	Key112=65455:47
	370	Key113=65027:0
	371	Key114=0:0
	372	Key115=0:0
	373	Key116=0:0
	374	Key117=0:0
	375	Key118=0:0
	376	Key119=0:0
	377	Key120=0:0
	378	Key121=0:0
	379	Key122=0:0
	380	Key123=0:0
	381	Key124=65027:0
	382	Key125=0:0
	383	Key126=65469:61
	384	Key127=0:0
	385	Key128=0:0
	386	Key129=0:0
	387	Key130=0:0
	388	Key131=0:0
	389	Key132=0:0
	390	Key133=0:0
	391	Key134=0:0
	392	Key135=0:0
	393	Key136=0:0
	394	Key137=0:0
	395
	396	[capslock]
	397	Key8=0:0
	398	Key9=65307:27
	399	Key10=49:49
	400	Key11=50:50
	401	Key12=51:51
	402	Key13=52:52
	403	Key14=53:53
	404	Key15=54:54
	405	Key16=55:55
	406	Key17=56:56
	407	Key18=57:57
	408	Key19=48:48
	409	Key20=39:39
	410	Key21=65106:94
	411	Key22=65288:8
	412	Key23=65289:9
	413	Key24=81:81
	414	Key25=87:87
	415	Key26=69:69
	416	Key27=82:82
	417	Key28=84:84
	418	Key29=90:90
	419	Key30=85:85
	420	Key31=73:73
	421	Key32=79:79
	422	Key33=80:80
	423	Key34=200:200
	424	Key35=65111:168
	425	Key36=65293:13
	426	Key37=65507:0
	427	Key38=65:65
	428	Key39=83:83
	429	Key40=68:68
	430	Key41=70:70
	431	Key42=71:71
	432	Key43=72:72
	433	Key44=74:74
	434	Key45=75:75
	435	Key46=76:76
	436	Key47=201:201
	437	Key48=192:192
	438	Key49=167:167
	439	Key50=65505:0
	440	Key51=36:36
	441	Key52=89:89
	442	Key53=88:88
	443	Key54=67:67
	444	Key55=86:86
	445	Key56=66:66
	446	Key57=78:78
	447	Key58=77:77
	448	Key59=44:44
	449	Key60=46:46
	450	Key61=45:45
	451	Key62=65506:0
	452	Key63=65450:42
	453	Key64=65513:0
	454	Key65=32:32
	455	Key66=65509:0
	456	Key67=65470:0
	457	Key68=65471:0
	458	Key69=65472:0
	459	Key70=65473:0
	460	Key71=65474:0
	461	Key72=65475:0
	462	Key73=65476:0
	463	Key74=65477:0
	464	Key75=65478:0
	465	Key76=65479:0
	466	Key77=65407:0
	467	Key78=65300:0
	468	Key79=65429:0
	469	Key80=65431:0
	470	Key81=65434:0
	471	Key82=65453:45
	472	Key83=65430:0
	473	Key84=65437:0
	474	Key85=65432:0
	475	Key86=65451:43
	476	Key87=65436:0
	477	Key88=65433:0
	478	Key89=65435:0
	479	Key90=65438:0
	480	Key91=65439:0
	481	Key92=0:0
	482	Key93=65406:0
	483	Key94=60:60
	484	Key95=65480:0
	485	Key96=65481:0
	486	Key97=65360:0
	487	Key98=65362:0
	488	Key99=65365:0
	489	Key100=65361:0
	490	Key101=0:0
	491	Key102=65363:0
	492	Key103=65367:0
	493	Key104=65364:0
	494	Key105=65366:0
	495	Key106=65379:0
	496	Key107=65535:127
	497	Key108=65421:13
	498	Key109=65508:0
	499	Key110=65299:0
	500	Key111=65377:0
	501	Key112=65455:47
	502	Key113=65027:0
	503	Key114=0:0
	504	Key115=0:0
	505	Key116=0:0
	506	Key117=0:0
	507	Key118=0:0
	508	Key119=0:0
	509	Key120=0:0
	510	Key121=0:0
	511	Key122=0:0
	512	Key123=0:0
	513	Key124=65027:0
	514	Key125=0:0
	515	Key126=65469:61
	516	Key127=0:0
	517	Key128=0:0
	518	Key129=0:0
	519	Key130=0:0
	520	Key131=0:0
	521	Key132=0:0
	522	Key133=0:0
	523	Key134=0:0
	524	Key135=0:0
	525	Key136=0:0
	526	Key137=0:0
	527
	528	[shiftcapslock]
	529	Key8=0:0
	530	Key9=65307:27
	531	Key10=43:43
	532	Key11=34:34
	533	Key12=42:42
	534	Key13=199:199
	535	Key14=37:37
	536	Key15=38:38
	537	Key16=47:47
	538	Key17=40:40
	539	Key18=41:41
	540	Key19=61:61
	541	Key20=63:63
	542	Key21=65104:96
	543	Key22=65288:8
	544	Key23=65056:0
	545	Key24=113:113
	546	Key25=119:119
	547	Key26=101:101
	548	Key27=114:114
	549	Key28=116:116
	550	Key29=122:122
	551	Key30=117:117
	552	Key31=105:105
	553	Key32=111:111
	554	Key33=112:112
	555	Key34=220:220
	556	Key35=33:33
	557	Key36=65293:13
	558	Key37=65507:0
	559	Key38=97:97
	560	Key39=115:115
	561	Key40=100:100
	562	Key41=102:102
	563	Key42=103:103
	564	Key43=104:104
	565	Key44=106:106
	566	Key45=107:107
	567	Key46=108:108
	568	Key47=214:214
	569	Key48=196:196
	570	Key49=176:176
	571	Key50=65505:0
	572	Key51=163:163
	573	Key52=121:121
	574	Key53=120:120
	575	Key54=99:99
	576	Key55=118:118
	577	Key56=98:98
	578	Key57=110:110
	579	Key58=109:109
	580	Key59=59:59
	581	Key60=58:58
	582	Key61=95:95
	583	Key62=65506:0
	584	Key63=65450:42
	585	Key64=65511:0
	586	Key65=32:32
	587	Key66=65509:0
	588	Key67=65470:0
	589	Key68=65471:0
	590	Key69=65472:0
	591	Key70=65473:0
	592	Key71=65474:0
	593	Key72=65475:0
	594	Key73=65476:0
	595	Key74=65477:0
	596	Key75=65478:0
	597	Key76=65479:0
	598	Key77=65273:0
	599	Key78=65300:0
	600	Key79=65463:55
	601	Key80=65464:56
	602	Key81=65465:57
	603	Key82=65453:45
	604	Key83=65460:52
	605	Key84=65461:53
	606	Key85=65462:54
	607	Key86=65451:43
	608	Key87=65457:49
	609	Key88=65458:50
	610	Key89=65459:51
	611	Key90=65456:48
	612	Key91=65454:46
	613	Key92=0:0
	614	Key93=65406:0
	615	Key94=62:62
	616	Key95=65480:0
	617	Key96=65481:0
	618	Key97=65360:0
	619	Key98=65362:0
	620	Key99=65365:0
	621	Key100=65361:0
	622	Key101=0:0
	623	Key102=65363:0
	624	Key103=65367:0
	625	Key104=65364:0
	626	Key105=65366:0
	627	Key106=65379:0
	628	Key107=65535:127
	629	Key108=65421:13
	630	Key109=65508:0
	631	Key110=65299:0
	632	Key111=65377:0
	633	Key112=65455:47
	634	Key113=65312:0
	635	Key114=0:0
	636	Key115=0:0
	637	Key116=0:0
	638	Key117=0:0
	639	Key118=0:0
	640	Key119=0:0
	641	Key120=0:0
	642	Key121=0:0
	643	Key122=0:0
	644	Key123=0:0
	645	Key124=65027:0
	646	Key125=65513:0
	647	Key126=65469:61
	648	Key127=65515:0
	649	Key128=65517:0
	650	Key129=0:0
	651	Key130=0:0
	652	Key131=0:0
	653	Key132=0:0
	654	Key133=0:0
	655	Key134=0:0
	656	Key135=0:0
	657	Key136=0:0
	658	Key137=0:0

+16

-16

instfiles/km-e0010411.ini less more

119	119	Key126=65469:61
120	120	Key127=0:0
121	121	Key128=0:0
122		Key129=0:0
	122	Key129=65315:0
123	123	Key130=0:0
124		Key131=0:0
	124	Key131=65314:0
125	125	Key132=0:0
126	126	Key133=165:165
127	127	Key134=0:0

251	251	Key126=65469:61
252	252	Key127=65515:0
253	253	Key128=65517:0
254		Key129=0:0
	254	Key129=65315:0
255	255	Key130=0:0
256		Key131=0:0
	256	Key131=65314:0
257	257	Key132=0:0
258	258	Key133=124:124
259	259	Key134=0:0

383	383	Key126=65469:61
384	384	Key127=0:0
385	385	Key128=0:0
386		Key129=0:0
	386	Key129=65315:0
387	387	Key130=0:0
388		Key131=0:0
	388	Key131=65314:0
389	389	Key132=0:0
390	390	Key133=165:165
391	391	Key134=0:0

515	515	Key126=65469:61
516	516	Key127=65515:0
517	517	Key128=65517:0
518		Key129=0:0
	518	Key129=65315:0
519	519	Key130=0:0
520		Key131=0:0
	520	Key131=65314:0
521	521	Key132=0:0
522	522	Key133=124:124
523	523	Key134=0:0

647	647	Key126=65469:61
648	648	Key127=0:0
649	649	Key128=0:0
650		Key129=0:0
	650	Key129=65315:0
651	651	Key130=0:0
652		Key131=0:0
	652	Key131=65314:0
653	653	Key132=0:0
654	654	Key133=165:165
655	655	Key134=0:0

779	779	Key126=65469:61
780	780	Key127=0:0
781	781	Key128=0:0
782		Key129=0:0
	782	Key129=65315:0
783	783	Key130=0:0
784		Key131=0:0
	784	Key131=65314:0
785	785	Key132=0:0
786	786	Key133=165:165
787	787	Key134=0:0

911	911	Key126=65469:61
912	912	Key127=65515:0
913	913	Key128=65517:0
914		Key129=0:0
	914	Key129=65315:0
915	915	Key130=0:0
916		Key131=0:0
	916	Key131=65314:0
917	917	Key132=0:0
918	918	Key133=124:124
919	919	Key134=0:0

1043	1043	Key126=65469:61
1044	1044	Key127=65515:0
1045	1045	Key128=65517:0
1046		Key129=0:0
	1046	Key129=65315:0
1047	1047	Key130=0:0
1048		Key131=0:0
	1048	Key131=65314:0
1049	1049	Key132=0:0
1050	1050	Key133=124:124
1051	1051	Key134=0:0

+16

-16

instfiles/km-e0200411.ini less more

119	119	Key126=65469:61
120	120	Key127=0:0
121	121	Key128=0:0
122		Key129=0:0
	122	Key129=65315:0
123	123	Key130=0:0
124		Key131=0:0
	124	Key131=65314:0
125	125	Key132=0:0
126	126	Key133=165:165
127	127	Key134=0:0

251	251	Key126=65469:61
252	252	Key127=65515:0
253	253	Key128=65517:0
254		Key129=0:0
	254	Key129=65315:0
255	255	Key130=0:0
256		Key131=0:0
	256	Key131=65314:0
257	257	Key132=0:0
258	258	Key133=124:124
259	259	Key134=0:0

383	383	Key126=65469:61
384	384	Key127=0:0
385	385	Key128=0:0
386		Key129=0:0
	386	Key129=65315:0
387	387	Key130=0:0
388		Key131=0:0
	388	Key131=65314:0
389	389	Key132=0:0
390	390	Key133=165:165
391	391	Key134=0:0

515	515	Key126=65469:61
516	516	Key127=65515:0
517	517	Key128=65517:0
518		Key129=0:0
	518	Key129=65315:0
519	519	Key130=0:0
520		Key131=0:0
	520	Key131=65314:0
521	521	Key132=0:0
522	522	Key133=124:124
523	523	Key134=0:0

647	647	Key126=65469:61
648	648	Key127=0:0
649	649	Key128=0:0
650		Key129=0:0
	650	Key129=65315:0
651	651	Key130=0:0
652		Key131=0:0
	652	Key131=65314:0
653	653	Key132=0:0
654	654	Key133=165:165
655	655	Key134=0:0

779	779	Key126=65469:61
780	780	Key127=0:0
781	781	Key128=0:0
782		Key129=0:0
	782	Key129=65315:0
783	783	Key130=0:0
784		Key131=0:0
	784	Key131=65314:0
785	785	Key132=0:0
786	786	Key133=165:165
787	787	Key134=0:0

911	911	Key126=65469:61
912	912	Key127=65515:0
913	913	Key128=65517:0
914		Key129=0:0
	914	Key129=65315:0
915	915	Key130=0:0
916		Key131=0:0
	916	Key131=65314:0
917	917	Key132=0:0
918	918	Key133=124:124
919	919	Key134=0:0

1043	1043	Key126=65469:61
1044	1044	Key127=65515:0
1045	1045	Key128=65517:0
1046		Key129=0:0
	1046	Key129=65315:0
1047	1047	Key130=0:0
1048		Key131=0:0
	1048	Key131=65314:0
1049	1049	Key132=0:0
1050	1050	Key133=124:124
1051	1051	Key134=0:0

+16

-16

instfiles/km-e0210411.ini less more

119	119	Key126=65469:61
120	120	Key127=0:0
121	121	Key128=0:0
122		Key129=0:0
	122	Key129=65315:0
123	123	Key130=0:0
124		Key131=0:0
	124	Key131=65314:0
125	125	Key132=0:0
126	126	Key133=165:165
127	127	Key134=0:0

251	251	Key126=65469:61
252	252	Key127=65515:0
253	253	Key128=65517:0
254		Key129=0:0
	254	Key129=65315:0
255	255	Key130=0:0
256		Key131=0:0
	256	Key131=65314:0
257	257	Key132=0:0
258	258	Key133=124:124
259	259	Key134=0:0

383	383	Key126=65469:61
384	384	Key127=0:0
385	385	Key128=0:0
386		Key129=0:0
	386	Key129=65315:0
387	387	Key130=0:0
388		Key131=0:0
	388	Key131=65314:0
389	389	Key132=0:0
390	390	Key133=165:165
391	391	Key134=0:0

515	515	Key126=65469:61
516	516	Key127=65515:0
517	517	Key128=65517:0
518		Key129=0:0
	518	Key129=65315:0
519	519	Key130=0:0
520		Key131=0:0
	520	Key131=65314:0
521	521	Key132=0:0
522	522	Key133=124:124
523	523	Key134=0:0

647	647	Key126=65469:61
648	648	Key127=0:0
649	649	Key128=0:0
650		Key129=0:0
	650	Key129=65315:0
651	651	Key130=0:0
652		Key131=0:0
	652	Key131=65314:0
653	653	Key132=0:0
654	654	Key133=165:165
655	655	Key134=0:0

779	779	Key126=65469:61
780	780	Key127=0:0
781	781	Key128=0:0
782		Key129=0:0
	782	Key129=65315:0
783	783	Key130=0:0
784		Key131=0:0
	784	Key131=65314:0
785	785	Key132=0:0
786	786	Key133=165:165
787	787	Key134=0:0

911	911	Key126=65469:61
912	912	Key127=65515:0
913	913	Key128=65517:0
914		Key129=0:0
	914	Key129=65315:0
915	915	Key130=0:0
916		Key131=0:0
	916	Key131=65314:0
917	917	Key132=0:0
918	918	Key133=124:124
919	919	Key134=0:0

1043	1043	Key126=65469:61
1044	1044	Key127=65515:0
1045	1045	Key128=65517:0
1046		Key129=0:0
	1046	Key129=65315:0
1047	1047	Key130=0:0
1048		Key131=0:0
	1048	Key131=65314:0
1049	1049	Key132=0:0
1050	1050	Key133=124:124
1051	1051	Key134=0:0

+19

-2

instfiles/pam.d/Makefile.am less more

0		EXTRA_DIST = xrdp-sesman
	0	EXTRA_DIST = \
	1	xrdp-sesman.common \
	2	xrdp-sesman.other \
	3	xrdp-sesman.password-auth
	4
	5	CLEANFILES = xrdp-sesman
1	6
2	7	if SESMAN_NOPAM
3	8	PAMFILE =

13	18	endif
14	19	endif
15	20
16		pamddir=$(sysconfdir)/pam.d
	21	pamddir = $(sysconfdir)/pam.d
17	22
18	23	pamd_DATA = \
19	24	$(PAMFILE)
	25
	26	xrdp-sesman:
	27	if test -e /etc/pam.d/password-auth; then \
	28	pamrules=xrdp-sesman.password-auth; \
	29	else \
	30	if test -e /etc/pam.d/common-auth; then \
	31	pamrules=xrdp-sesman.common; \
	32	else \
	33	pamrules=xrdp-sesman.other; \
	34	fi; \
	35	fi; \
	36	$(LN_S) $(srcdir)/$$pamrules $@

+0

-5

~~instfiles/pam.d/xrdp-sesman~~ less more

0		#%PAM-1.0
1		@include common-auth
2		@include common-account
3		@include common-session
4		@include common-password

+4

-0

instfiles/pam.d/xrdp-sesman.common less more

	0	#%PAM-1.0
	1	@include common-auth
	2	@include common-account
	3	@include common-session

+4

-0

instfiles/pam.d/xrdp-sesman.password-auth less more

	0	#%PAM-1.0
	1	auth include password-auth
	2	account include password-auth
	3	session include password-auth

+2

-3

instfiles/pulse/Makefile.am less more

0		EXTRA_DIST = default.pa
1		pulsedir=$(sysconfdir)/xrdp/pulse
2		pulse_DATA = default.pa
	0	pulsedir = $(sysconfdir)/xrdp/pulse
	1	dist_pulse_DATA = default.pa

+2

-4

instfiles/rc.d/Makefile.am less more

0		EXTRA_DIST = xrdp
1		startscriptdir=$(sysconfdir)/rc.d
2		startscript_DATA = xrdp
3
	0	startscriptdir = $(sysconfdir)/rc.d
	1	dist_startscript_SCRIPTS = xrdp

+23

-4

instfiles/rc.d/xrdp less more

0	0	#!/bin/sh
	1	#
	2	# Copyright (c) 1992-2015 The FreeBSD Project. All rights reserved.
	3	#
	4	# Redistribution and use in source and binary forms, with or without
	5	# modification, are permitted provided that the following conditions
	6	# are met:
	7	# 1. Redistributions of source code must retain the above copyright
	8	# notice, this list of conditions and the following disclaimer.
	9	# 2. Redistributions in binary form must reproduce the above copyright
	10	# notice, this list of conditions and the following disclaimer in the
	11	# documentation and/or other materials provided with the distribution.
	12	#
	13	# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	14	# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	15	# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	16	# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	17	# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	18	# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	19	# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	20	# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	21	# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	22	# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	23	# SUCH DAMAGE.
1	24	#
2	25	# $FreeBSD$
3	26	#

37	60	if [ "${rc_arg}" = "stop" ] ; then
38	61	xrdp_daemons=$(reverse_list ${xrdp_daemons})
39	62	fi
40		# Generate rsakeys.ini on start
41		if [ "${rc_arg}" = "start" -a ! -f %%PREFIX%%/etc/xrdp/rsakeys.ini ] ; then
42		%%PREFIX%%/bin/xrdp-keygen xrdp %%PREFIX%%/etc/xrdp/rsakeys.ini
43		fi
44	63
45	64	# Apply to all the daemons.
46	65	for name in ${xrdp_daemons}; do

+2

-1

instfiles/xrdp-sesman.service less more

6	6	[Service]
7	7	Type=forking
8	8	PIDFile=/var/run/xrdp-sesman.pid
9		EnvironmentFile=/etc/sysconfig/xrdp
	9	EnvironmentFile=-/etc/sysconfig/xrdp
	10	EnvironmentFile=-/etc/default/xrdp
10	11	ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
11	12	ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
12	13

+3

-2

instfiles/xrdp.service less more

5	5	[Service]
6	6	Type=forking
7	7	PIDFile=/var/run/xrdp.pid
8		EnvironmentFile=/etc/sysconfig/xrdp
9		ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
	8	EnvironmentFile=-/etc/sysconfig/xrdp
	9	EnvironmentFile=-/etc/default/xrdp
	10	ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
10	11	ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
11	12
12	13	[Install]

+11

-4

keygen/Makefile.am less more

0	0
1		AM_CFLAGS = \
	1	AM_CPPFLAGS = \
2	2	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
3	3	-DXRDP_SBIN_PATH=\"${sbindir}\" \
4	4	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
5		-DXRDP_PID_PATH=\"${localstatedir}/run\"
6
7		INCLUDES = \
	5	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
8	6	-I$(top_srcdir)/common
9	7
10	8	bin_PROGRAMS = \

14	12
15	13	xrdp_keygen_LDADD = \
16	14	$(top_builddir)/common/libcommon.la
	15
	16	xrdpsysconfdir = $(sysconfdir)/xrdp
	17
	18	install-data-hook:
	19	umask 077 && \
	20	./xrdp-keygen xrdp $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini
	21
	22	uninstall-hook:
	23	rm -f $(DESTDIR)$(xrdpsysconfdir)/rsakeys.ini

+10

-11

keygen/keygen.c less more

33	33	/* this is the signature size in bytes */
34	34	#define TSSK_KEY_LENGTH 64
35	35
36		/* default to 512 bit key size, can set changed, set */
37		static int g_key_size_bits = 512;
	36	/* default to 2048 bit key size, can set changed, set */
	37	static int g_key_size_bits = 2048;
38	38
39	39	static tui8 g_exponent[4] =
40	40	{

194	194	static int APP_CC
195	195	out_params(void)
196	196	{
197		g_writeln("");
	197	g_writeln("%s", "");
198	198	g_writeln("xrdp rsa key gen utility examples");
199	199	g_writeln(" xrdp-keygen xrdp ['path and file name' \| auto] [512 or 2048]");
200	200	g_writeln(" xrdp-keygen test");
201		g_writeln("");
	201	g_writeln("%s", "");
202	202	return 0;
203	203	}
204	204

350	350	}
351	351
352	352	g_writeln("saving to %s", filename);
353		g_writeln("");
	353	g_writeln("%s", "");
354	354
355	355	if (g_file_exist(filename))
356	356	{

410	410	d_len = n_len;
411	411	sign_len = 64;
412	412	error = 0;
413		g_writeln("");
	413	g_writeln("%s", "");
414	414	g_writeln("Generating %d bit rsa key...", g_key_size_bits);
415		g_writeln("");
	415	g_writeln("%s", "");
416	416
417	417	if (error == 0)
418	418	{
419	419	error = ssl_gen_key_xrdp1(g_key_size_bits, e_data, e_len, n_data, n_len,
420	420	d_data, d_len);
421
422	421	if (error != 0)
423	422	{
424	423	g_writeln("error %d in key_gen, ssl_gen_key_xrdp1", error);

428	427	if (error == 0)
429	428	{
430	429	g_writeln("ssl_gen_key_xrdp1 ok");
431		g_writeln("");
	430	g_writeln("%s", "");
432	431	error = sign_key(e_data, e_len, n_data, n_len, sign_data, sign_len);
433	432
434	433	if (error != 0)

588	587	}
589	588	else if (g_strcasecmp(argv[1], "test") == 0)
590	589	{
591		g_writeln("");
	590	g_writeln("%s", "");
592	591	g_writeln("testing 512 bit key");
593	592	key_test512();
594		g_writeln("");
	593	g_writeln("%s", "");
595	594	g_writeln("testing 2048 bit key");
596	595	key_test2048();
597	596	return 0;

+31

-0

librfxcodec/.gitignore less more

	0	*~
	1	aclocal.m4
	2	AUTHORS
	3	autom4te.cache/
	4	ChangeLog
	5	config_ac.h
	6	config_ac-h.in
	7	config.c
	8	config.guess
	9	config.log
	10	config.status
	11	config.sub
	12	configure
	13	compile
	14	depcomp
	15	.deps/
	16	install-sh
	17	*.la
	18	.libs
	19	libtool
	20	*.lo
	21	ltmain.sh
	22	Makefile
	23	Makefile.in
	24	missing
	25	NEWS
	26	*.o
	27	README
	28	stamp-h1
	29	rfxcodectest
	30	.dirstamp

+0

-12

~~librfxcodec/Makefile~~ less more

0
1		all: allmake
2
3		allmake:
4		cd src; $(MAKE) $(MFLAGS)
5		cd tests; $(MAKE) $(MFLAGS)
6
7		clean: allclean
8
9		allclean:
10		cd src; $(MAKE) clean
11		cd tests; $(MAKE) clean

+6

-0

librfxcodec/Makefile.am less more

	0	EXTRA_DIST = bootstrap readme.txt
	1
	2	SUBDIRS = \
	3	src \
	4	tests
	5

+137

-0

librfxcodec/acinclude.m4 less more

	0	# AC_PROG_NASM
	1	# --------------------------
	2	# Check that NASM exists and determine flags
	3	AC_DEFUN([AC_PROG_NASM],[
	4
	5	AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
	6	test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found])
	7
	8	AC_MSG_CHECKING([for object file format of host system])
	9	case "$host_os" in
	10	cygwin* \| mingw* \| pw32* \| interix*)
	11	case "$host_cpu" in
	12	x86_64)
	13	objfmt='Win64-COFF'
	14	;;
	15	*)
	16	objfmt='Win32-COFF'
	17	;;
	18	esac
	19	;;
	20	msdosdjgpp* \| go32*)
	21	objfmt='COFF'
	22	;;
	23	os2-emx*) # not tested
	24	objfmt='MSOMF' # obj
	25	;;
	26	linuxcoff \| linuxoldld)
	27	objfmt='COFF' # ???
	28	;;
	29	linuxaout)
	30	objfmt='a.out'
	31	;;
	32	linux*)
	33	case "$host_cpu" in
	34	x86_64)
	35	objfmt='ELF64'
	36	;;
	37	*)
	38	objfmt='ELF'
	39	;;
	40	esac
	41	;;
	42	freebsd* \| netbsd* \| openbsd*)
	43	if echo __ELF__ \| $CC -E - \| grep __ELF__ > /dev/null; then
	44	objfmt='BSD-a.out'
	45	else
	46	case "$host_cpu" in
	47	x86_64 \| amd64)
	48	objfmt='ELF64'
	49	;;
	50	*)
	51	objfmt='ELF'
	52	;;
	53	esac
	54	fi
	55	;;
	56	solaris* \| sunos* \| sysv* \| sco*)
	57	case "$host_cpu" in
	58	x86_64)
	59	objfmt='ELF64'
	60	;;
	61	*)
	62	objfmt='ELF'
	63	;;
	64	esac
	65	;;
	66	darwin* \| rhapsody* \| nextstep* \| openstep* \| macos*)
	67	case "$host_cpu" in
	68	x86_64)
	69	objfmt='Mach-O64'
	70	;;
	71	*)
	72	objfmt='Mach-O'
	73	;;
	74	esac
	75	;;
	76	*)
	77	objfmt='ELF ?'
	78	;;
	79	esac
	80
	81	AC_MSG_RESULT([$objfmt])
	82	if test "$objfmt" = 'ELF ?'; then
	83	objfmt='ELF'
	84	AC_MSG_WARN([unexpected host system. assumed that the format is $objfmt.])
	85	fi
	86
	87	AC_MSG_CHECKING([for object file format specifier (NAFLAGS) ])
	88	case "$objfmt" in
	89	MSOMF) NAFLAGS='-fobj -DOBJ32';;
	90	Win32-COFF) NAFLAGS='-fwin32 -DWIN32';;
	91	Win64-COFF) NAFLAGS='-fwin64 -DWIN64 -D__x86_64__';;
	92	COFF) NAFLAGS='-fcoff -DCOFF';;
	93	a.out) NAFLAGS='-faout -DAOUT';;
	94	BSD-a.out) NAFLAGS='-faoutb -DAOUT';;
	95	ELF) NAFLAGS='-felf -DELF';;
	96	ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';;
	97	RDF) NAFLAGS='-frdf -DRDF';;
	98	Mach-O) NAFLAGS='-fmacho -DMACHO';;
	99	Mach-O64) NAFLAGS='-fmacho64 -DMACHO -D__x86_64__';;
	100	esac
	101	AC_MSG_RESULT([$NAFLAGS])
	102	AC_SUBST([NAFLAGS])
	103
	104	AC_MSG_CHECKING([whether the assembler ($NASM $NAFLAGS) works])
	105	cat > conftest.asm <<EOF
	106	[%line __oline__ "configure"
	107	section .text
	108	global _main,main
	109	_main:
	110	main: xor eax,eax
	111	ret
	112	]EOF
	113	try_nasm='$NASM $NAFLAGS -o conftest.o conftest.asm'
	114	if AC_TRY_EVAL(try_nasm) && test -s conftest.o; then
	115	AC_MSG_RESULT(yes)
	116	else
	117	echo "configure: failed program was:" >&AC_FD_CC
	118	cat conftest.asm >&AC_FD_CC
	119	rm -rf conftest*
	120	AC_MSG_RESULT(no)
	121	AC_MSG_ERROR([installation or configuration problem: assembler cannot create object files.])
	122	fi
	123
	124	AC_MSG_CHECKING([whether the linker accepts assembler output])
	125	try_nasm='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.o $LIBS 1>&AC_FD_CC'
	126	if AC_TRY_EVAL(try_nasm) && test -s conftest${ac_exeext}; then
	127	rm -rf conftest*
	128	AC_MSG_RESULT(yes)
	129	else
	130	rm -rf conftest*
	131	AC_MSG_RESULT(no)
	132	AC_MSG_ERROR([configuration problem: maybe object file format mismatch.])
	133	fi
	134
	135	])
	136

+36

-0

librfxcodec/bootstrap less more

	0	#!/bin/sh
	1
	2	which autoconf
	3	if ! test $? -eq 0
	4	then
	5	echo "error, install autoconf"
	6	exit 1
	7	fi
	8
	9	which automake
	10	if ! test $? -eq 0
	11	then
	12	echo "error, install automake"
	13	exit 1
	14	fi
	15
	16	which libtool \|\| which libtoolize
	17	if ! test $? -eq 0
	18	then
	19	echo "error, install libtool"
	20	exit 1
	21	fi
	22
	23	which pkg-config
	24	if ! test $? -eq 0
	25	then
	26	echo "error, install pkg-config"
	27	exit 1
	28	fi
	29
	30	touch configure.ac
	31	touch NEWS
	32	touch AUTHORS
	33	touch README
	34	touch ChangeLog
	35	autoreconf -fvi

+55

-0

librfxcodec/configure.ac less more

	0	# Process this file with autoconf to produce a configure script
	1
	2	AC_PREREQ(2.59)
	3	AC_INIT([rfxcodec], [0.1.0], [jay.sorg@gmail.com])
	4	AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
	5	AM_INIT_AUTOMAKE([1.6 foreign])
	6	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
	7	AC_PROG_CC
	8	AC_C_CONST
	9	AC_PROG_LIBTOOL
	10
	11	AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"])
	12
	13	if test "x${prefix}" = "xNONE" ; then
	14	sysconfdir="/etc";
	15	fi
	16
	17	# SIMD is optional
	18	AC_ARG_WITH([simd],
	19	AC_HELP_STRING([--without-simd],[Omit SIMD extensions.]))
	20	if test "x${with_simd}" != "xno"; then
	21	# Check if we're on a supported CPU
	22	AC_MSG_CHECKING([if we have SIMD optimisations for cpu type])
	23	case "$host_cpu" in
	24	x86_64 \| amd64)
	25	AC_MSG_RESULT([yes (x86_64)])
	26	AC_PROG_NASM
	27	simd_arch=x86_64
	28	;;
	29	i*86 \| x86 \| ia32)
	30	AC_MSG_RESULT([yes (i386)])
	31	AC_PROG_NASM
	32	simd_arch=i386
	33	;;
	34	*)
	35	AC_MSG_RESULT([no ("$host_cpu")])
	36	AC_MSG_WARN([SIMD support not available for this CPU. Performance will suffer.])
	37	with_simd=no;
	38	;;
	39	esac
	40	if test "x${with_simd}" != "xno"; then
	41	AC_DEFINE([WITH_SIMD], [1], [Use accelerated SIMD routines.])
	42	fi
	43	fi
	44
	45	AM_CONDITIONAL(WITH_SIMD_AMD64, [test x$simd_arch = xx86_64])
	46	AM_CONDITIONAL(WITH_SIMD_X86, [test x$simd_arch = xi386])
	47
	48	AC_CONFIG_FILES([Makefile
	49	src/Makefile
	50	tests/Makefile
	51	])
	52
	53	AC_OUTPUT
	54

+40

-0

librfxcodec/include/rfxcodec_common.h less more

	0	/**
	1	* RFX codec
	2	*
	3	* Copyright 2015 Jay Sorg <jay.sorg@gmail.com>
	4	*
	5	* Licensed under the Apache License, Version 2.0 (the "License");
	6	* you may not use this file except in compliance with the License.
	7	* You may obtain a copy of the License at
	8	*
	9	* http://www.apache.org/licenses/LICENSE-2.0
	10	*
	11	* Unless required by applicable law or agreed to in writing, software
	12	* distributed under the License is distributed on an "AS IS" BASIS,
	13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	14	* See the License for the specific language governing permissions and
	15	* limitations under the License.
	16	*/
	17
	18	#ifndef __RFXCODEC_COMMON_H
	19	#define __RFXCODEC_COMMON_H
	20
	21	#define RFX_FORMAT_BGRA 0
	22	#define RFX_FORMAT_RGBA 1
	23	#define RFX_FORMAT_BGR 2
	24	#define RFX_FORMAT_RGB 3
	25	#define RFX_FORMAT_YUV 4 /* YUV444 linear tiled mode */
	26
	27	#define RFX_FLAGS_NONE 0 /* default RFX_FLAGS_RLGR3 and RFX_FLAGS_SAFE */
	28
	29	#define RFX_FLAGS_SAFE 0 /* default */
	30	#define RFX_FLAGS_OPT1 (1 << 3)
	31	#define RFX_FLAGS_OPT2 (1 << 4)
	32	#define RFX_FLAGS_NOACCEL (1 << 6)
	33
	34	#define RFX_FLAGS_RLGR3 0 /* default */
	35	#define RFX_FLAGS_RLGR1 1
	36
	37	#define RFX_FLAGS_ALPHAV1 1 /* used in flags for rfxcodec_encode */
	38
	39	#endif

+33

-0

librfxcodec/include/rfxcodec_decode.h less more

	0	/**
	1	* RFX codec decoder
	2	*
	3	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
	4	*
	5	* Licensed under the Apache License, Version 2.0 (the "License");
	6	* you may not use this file except in compliance with the License.
	7	* You may obtain a copy of the License at
	8	*
	9	* http://www.apache.org/licenses/LICENSE-2.0
	10	*
	11	* Unless required by applicable law or agreed to in writing, software
	12	* distributed under the License is distributed on an "AS IS" BASIS,
	13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	14	* See the License for the specific language governing permissions and
	15	* limitations under the License.
	16	*/
	17
	18	#ifndef __RFXCODEC_DECODE_H
	19	#define __RFXCODEC_DECODE_H
	20
	21	#include <rfxcodec_common.h>
	22
	23	int
	24	rfxcodec_decode_create(int width, int height, int format, int flags,
	25	void **handle);
	26	int
	27	rfxcodec_decode_destroy(void *handle);
	28	int
	29	rfxcodec_decode(void handle, char cdata, int cdata_bytes,
	30	char *data, int width, int height, int stride_bytes);
	31
	32	#endif

+19

-23

librfxcodec/include/rfxcodec_encode.h less more

0	0	/**
1	1	* RFX codec encoder
2	2	*
3		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	3	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

18	18	#ifndef __RFXCODEC_ENCODE_H
19	19	#define __RFXCODEC_ENCODE_H
20	20
21		#define RFX_FORMAT_BGRA 0
22		#define RFX_FORMAT_RGBA 1
23		#define RFX_FORMAT_BGR 2
24		#define RFX_FORMAT_RGB 3
25		#define RFX_FORMAT_YUV 4 /* YUV444 linear tiled mode */
26
27		#define RFX_FLAGS_NONE 0 /* default RFX_FLAGS_RLGR3 and RFX_FLAGS_SAFE */
28
29		#define RFX_FLAGS_RLGR3 0 /* default */
30		#define RFX_FLAGS_RLGR1 1
31
32		#define RFX_FLAGS_SAFE 0 /* default */
33		#define RFX_FLAGS_OPT1 (1 << 3)
34		#define RFX_FLAGS_OPT2 (1 << 4)
35		#define RFX_FLAGS_NOACCEL (1 << 6)
	21	#include <rfxcodec_common.h>
36	22
37	23	struct rfx_rect
38	24	{

46	32	{
47	33	int x; /* multiple of 64 */
48	34	int y; /* multiple of 64 */
49		int cx; /* must be 64 */
50		int cy; /* must be 64 */
	35	int cx; /* must be 64 or less */
	36	int cy; /* must be 64 or less */
51	37	int quant_y;
52	38	int quant_cb;
53	39	int quant_cr;

56	42	void *
57	43	rfxcodec_encode_create(int width, int height, int format, int flags);
58	44	int
59		rfxcodec_encode_destroy(void * handle);
60		/* quants, 10 ints per set, should be num_quants * 10 ints in quants)
	45	rfxcodec_encode_create_ex(int width, int height, int format, int flags,
	46	void **handle);
	47	int
	48	rfxcodec_encode_destroy(void *handle);
	49	/* quants, 5 ints per set, should be num_quants * 5 chars in quants)
	50	* each char is 2 quant values
61	51	* quantizer order is
62	52	* 0 - LL3
63	53	* 1 - LH3

72	62	int
73	63	rfxcodec_encode(void handle, char cdata, int *cdata_bytes,
74	64	char *buf, int width, int height, int stride_bytes,
75		struct rfx_rect *region, int num_region,
76		struct rfx_tile *tiles, int num_tiles,
77		const int *quants, int num_quants);
	65	const struct rfx_rect *region, int num_region,
	66	const struct rfx_tile *tiles, int num_tiles,
	67	const char *quants, int num_quants);
	68	int
	69	rfxcodec_encode_ex(void handle, char cdata, int *cdata_bytes,
	70	char *buf, int width, int height, int stride_bytes,
	71	const struct rfx_rect *region, int num_region,
	72	const struct rfx_tile *tiles, int num_tiles,
	73	const char *quants, int num_quants, int flags);
78	74
79	75	#endif

+0

-48

~~librfxcodec/src/Makefile~~ less more

0
1		OBJS = rfxencode.o rfxcompose.o rfxencode_tile.o rfxencode_dwt.o \
2		rfxencode_quantization.o rfxencode_differential.o \
3		rfxencode_rlgr1.o rfxencode_rlgr3.o
4
5		#OBJS += cpuid_x86.o rfxrlgr1_x86.o rfxrlgr3_x86.o rfxdwt_x86_sse2.o
6		#OBJS += cpuid_amd64.o rfxrlgr1_amd64.o rfxrlgr3_amd64.o rfxdwt_amd64_sse2.o
7
8		CFLAGS = $(PROFIL) -g -O2 -Wall -fPIC -I../include
9		#-DRFX_USE_ACCEL_X86
10		#-DRFX_USE_ACCEL_AMD64
11
12		LDFLAGS =
13
14		LIBS =
15
16		all: librfxencode.so
17
18		librfxencode.so: $(OBJS) Makefile
19		$(CC) -shared -o librfxencode.so $(LDFLAGS) $(OBJS) $(LIBS)
20		$(AR) -rv librfxencode.a $(OBJS)
21
22		cpuid_x86.o: x86/cpuid_x86.asm
23		yasm -f elf32 -g dwarf2 x86/cpuid_x86.asm
24
25		rfxrlgr1_x86.o: x86/rfxrlgr1_x86.asm
26		yasm -f elf32 -g dwarf2 x86/rfxrlgr1_x86.asm
27
28		rfxrlgr3_x86.o: x86/rfxrlgr3_x86.asm
29		yasm -f elf32 -g dwarf2 x86/rfxrlgr3_x86.asm
30
31		rfxdwt_x86_sse2.o: x86/rfxdwt_x86_sse2.asm
32		yasm -f elf32 -g dwarf2 x86/rfxdwt_x86_sse2.asm
33
34		cpuid_amd64.o: amd64/cpuid_amd64.asm
35		yasm -f elf64 -g dwarf2 amd64/cpuid_amd64.asm
36
37		rfxrlgr1_amd64.o: amd64/rfxrlgr1_amd64.asm
38		yasm -f elf64 -g dwarf2 amd64/rfxrlgr1_amd64.asm
39
40		rfxrlgr3_amd64.o: amd64/rfxrlgr3_amd64.asm
41		yasm -f elf64 -g dwarf2 amd64/rfxrlgr3_amd64.asm
42
43		rfxdwt_amd64_sse2.o: amd64/rfxdwt_amd64_sse2.asm
44		yasm -f elf64 -g dwarf2 amd64/rfxdwt_amd64_sse2.asm
45
46		clean:
47		rm -f $(OBJS) librfxencode.so librfxencode.a

+55

-0

librfxcodec/src/Makefile.am less more

	0	EXTRA_DIST =
	1
	2	EXTRA_DEFINES =
	3	EXTRA_INCLUDES =
	4	EXTRA_LIBS =
	5	EXTRA_FLAGS =
	6	EXTRA_SRC =
	7	EXTRA_ENCODE_SRC =
	8
	9	if WITH_SIMD_AMD64
	10	EXTRA_ENCODE_SRC += amd64/cpuid_amd64.asm \
	11	amd64/rfxcodec_encode_diff_rlgr1_amd64_sse2.asm \
	12	amd64/rfxcodec_encode_diff_rlgr3_amd64_sse2.asm \
	13	amd64/rfxcodec_encode_dwt_shift_amd64_sse2.asm \
	14	amd64/rfxcodec_encode_dwt_shift_amd64_sse41.asm
	15	EXTRA_DEFINES += -DSIMD_USE_ACCEL=1 -DRFX_USE_ACCEL_AMD64=1
	16	endif
	17
	18	if WITH_SIMD_X86
	19	EXTRA_ENCODE_SRC += x86/cpuid_x86.asm \
	20	x86/rfxcodec_encode_diff_rlgr1_x86_sse2.asm \
	21	x86/rfxcodec_encode_diff_rlgr3_x86_sse2.asm \
	22	x86/rfxcodec_encode_dwt_shift_x86_sse2.asm \
	23	x86/rfxcodec_encode_dwt_shift_x86_sse41.asm
	24	EXTRA_DEFINES += -DSIMD_USE_ACCEL=1 -DRFX_USE_ACCEL_X86=1
	25	endif
	26
	27	if GOT_PREFIX
	28	EXTRA_INCLUDES += -I$(prefix)/include
	29	EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib
	30	endif
	31
	32	AM_CFLAGS = -I../include $(EXTRA_DEFINES)
	33
	34	INCLUDES = $(EXTRA_INCLUDES)
	35
	36	lib_LTLIBRARIES = librfxencode.la
	37
	38	librfxencode_la_LDFLAGS = $(EXTRA_FLAGS)
	39
	40
	41	librfxencode_ladir = $(moduledir)
	42
	43	librfxencode_la_SOURCES = rfxencode.c \
	44	rfxcompose.c rfxencode_tile.c rfxencode_dwt.c \
	45	rfxencode_quantization.c rfxencode_differential.c \
	46	rfxencode_rlgr1.c rfxencode_rlgr3.c rfxencode_alpha.c $(EXTRA_ENCODE_SRC)
	47
	48	.asm.lo:
	49	$(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@
	50
	51	librfxencode_la_LIBADD =
	52
	53	include_HEADERS = ../include/rfxcodec_encode.h
	54

+7

-3

librfxcodec/src/amd64/cpuid_amd64.asm less more

12	12	;int
13	13	;cpuid_amd64(int eax_in, int ecx_in, int eax, int ebx, int ecx, int edx)
14	14
	15	%ifidn __OUTPUT_FORMAT__,elf64
15	16	PROC cpuid_amd64
	17	%else
	18	PROC _cpuid_amd64
	19	%endif
16	20	; save registers
17	21	push rbx
18
	22
19	23	push rdx
20	24	push rcx
21	25	push r8

32	36	mov [rdi], ebx
33	37	pop rdi
34	38	mov [rdi], eax
35		mov eax, 0
	39	mov rax, 0
36	40	; restore registers
37	41	pop rbx
38		ret;
	42	ret
39	43	align 16
40	44

+31

-5

librfxcodec/src/amd64/funcs_amd64.h less more

0	0	/*
1		Copyright 2014 Jay Sorg
	1	Copyright 2014-2015 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

25	25
26	26	int
27	27	cpuid_amd64(int eax_in, int ecx_in, int eax, int ebx, int ecx, int edx);
	28
28	29	int
29		dwt_shift_amd64_sse2(const int quantization_values, uint8 data,
30		sint16 dwt_buffer1, sint16 dwt_buffer);
	30	rfxcodec_encode_dwt_shift_amd64_sse2(const char *qtable,
	31	unsigned char *data,
	32	short *dwt_buffer1,
	33	short *dwt_buffer);
31	34	int
32		diff_rlgr1_amd64(sint16 co, int num_co, uint8 dst, int dst_bytes);
	35	rfxcodec_encode_dwt_shift_amd64_sse41(const char *qtable,
	36	unsigned char *data,
	37	short *dwt_buffer1,
	38	short *dwt_buffer);
33	39	int
34		diff_rlgr3_amd64(sint16 co, int num_co, uint8 dst, int dst_bytes);
	40	rfxcodec_encode_diff_rlgr1_amd64_sse2(short *co,
	41	void *dst, int dst_bytes);
	42	int
	43	rfxcodec_encode_diff_rlgr3_amd64_sse2(short *co,
	44	void *dst, int dst_bytes);
	45
	46	int
	47	rfxcodec_decode_rlgr1_diff_amd64_sse2(void *data, int data_bytes,
	48	short *out_data);
	49	int
	50	rfxcodec_decode_rlgr3_diff_amd64_sse2(void *data, int data_bytes,
	51	short *out_data);
	52	int
	53	rfxcodec_decode_shift_idwt_amd64_sse2(char qtable, short src, short *dst);
	54	int
	55	rfxcodec_decode_yuv2rgb_amd64_sse2(short ydata, short udata, short *vdata,
	56	unsigned int *rgbdata, int stride);
	57	int
	58	rfxcodec_decode_yuva2argb_amd64_sse2(short ydata, short udata,
	59	short vdata, char adata,
	60	unsigned int *rgbdata, int stride);
35	61
36	62	#endif
37	63

+33

-0

librfxcodec/src/amd64/rfxcodec_encode_diff_rlgr1_amd64_sse2.asm less more

	0
	1	section .data
	2	const1 times 8 dw 1
	3
	4	section .text
	5
	6	%macro PROC 1
	7	align 16
	8	global %1
	9	%1:
	10	%endmacro
	11
	12	;The first six integer or pointer arguments are passed in registers
	13	;RDI, RSI, RDX, RCX, R8, and R9
	14
	15	;int
	16	;rfxcodec_encode_diff_rlgr1_amd64_sse2(short *co,
	17	; void *dst, int dst_bytes);
	18
	19	%ifidn __OUTPUT_FORMAT__,elf64
	20	PROC rfxcodec_encode_diff_rlgr1_amd64_sse2
	21	%else
	22	PROC _rfxcodec_encode_diff_rlgr1_amd64_sse2
	23	%endif
	24	; save registers
	25	push rbx
	26
	27	mov rax, 0
	28	; restore registers
	29	pop rbx
	30	ret
	31	align 16
	32

+26

-0

librfxcodec/src/amd64/rfxcodec_encode_diff_rlgr3_amd64_sse2.asm less more

	0
	1	section .data
	2	const1 times 8 dw 1
	3
	4	%macro PROC 1
	5	align 16
	6	global %1
	7	%1:
	8	%endmacro
	9
	10	;int
	11	;rfxcodec_encode_diff_rlgr3_amd64_sse2(short *co,
	12	; void *dst, int dst_bytes);
	13
	14	%ifidn __OUTPUT_FORMAT__,elf64
	15	PROC rfxcodec_encode_diff_rlgr3_amd64_sse2
	16	%else
	17	PROC _rfxcodec_encode_diff_rlgr3_amd64_sse2
	18	%endif
	19	; save registers
	20	push rbx
	21	mov rax, 0
	22	pop rbx
	23	ret
	24	align 16
	25

+1499

-0

librfxcodec/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse2.asm less more

	0	;
	1	;Copyright 2016 Jay Sorg
	2	;
	3	;Permission to use, copy, modify, distribute, and sell this software and its
	4	;documentation for any purpose is hereby granted without fee, provided that
	5	;the above copyright notice appear in all copies and that both that
	6	;copyright notice and this permission notice appear in supporting
	7	;documentation.
	8	;
	9	;The above copyright notice and this permission notice shall be included in
	10	;all copies or substantial portions of the Software.
	11	;
	12	;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	13	;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	14	;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	15	;OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	16	;AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	17	;CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	18	;
	19	;amd64 asm dwt
	20
	21	section .data
	22	align 16
	23	cw128 times 8 dw 128
	24	cdFFFF times 4 dd 65535
	25	; these are 1 << (factor - 1) 0 to 15 is factor
	26	cwa0 times 8 dw 0 ; 0
	27	cwa1 times 8 dw 1 ; 1
	28	cwa2 times 8 dw 2 ; 2
	29	cwa4 times 8 dw 4 ; 3
	30	cwa8 times 8 dw 8 ; 4
	31	cwa16 times 8 dw 16 ; 5
	32	cwa32 times 8 dw 32 ; 6
	33	cwa64 times 8 dw 64 ; 7
	34	cwa128 times 8 dw 128 ; 8
	35	cwa256 times 8 dw 256 ; 9
	36	cwa512 times 8 dw 512 ; 10
	37	cwa1024 times 8 dw 1024 ; 11
	38	cwa2048 times 8 dw 2048 ; 12
	39	cwa4096 times 8 dw 4096 ; 13
	40	cwa8192 times 8 dw 8192 ; 14
	41	cwa16384 times 8 dw 16384 ; 15
	42
	43	section .text
	44
	45	%macro PROC 1
	46	align 16
	47	global %1
	48	%1:
	49	%endmacro
	50
	51	;******************************************************************************
	52	; source 16 bit signed, 16 pixel width
	53	rfx_dwt_2d_encode_block_horiz_16_16:
	54	mov ecx, 8
	55	loop1a:
	56	; pre / post
	57	movdqa xmm1, [rsi] ; src[2n]
	58	movdqa xmm2, [rsi + 16]
	59	movdqa xmm6, xmm1
	60	movdqa xmm7, xmm2
	61	pand xmm1, [rel cdFFFF]
	62	pand xmm2, [rel cdFFFF]
	63	pslld xmm1, 16
	64	pslld xmm2, 16
	65	psrad xmm1, 16
	66	psrad xmm2, 16
	67	packssdw xmm1, xmm2
	68	movdqa xmm2, xmm6 ; src[2n + 1]
	69	movdqa xmm3, xmm7
	70	psrldq xmm2, 2
	71	psrldq xmm3, 2
	72	pand xmm2, [rel cdFFFF]
	73	pand xmm3, [rel cdFFFF]
	74	pslld xmm2, 16
	75	pslld xmm3, 16
	76	psrad xmm2, 16
	77	psrad xmm3, 16
	78	packssdw xmm2, xmm3
	79	movdqa xmm3, xmm6 ; src[2n + 2]
	80	movdqa xmm4, xmm7
	81	psrldq xmm3, 4
	82	psrldq xmm4, 4
	83	movd eax, xmm7
	84	movd xmm5, eax
	85	pslldq xmm5, 12
	86	por xmm3, xmm5
	87	movdqa xmm5, xmm7
	88	psrldq xmm5, 12
	89	pslldq xmm5, 12
	90	por xmm4, xmm5
	91	pand xmm3, [rel cdFFFF]
	92	pand xmm4, [rel cdFFFF]
	93	pslld xmm3, 16
	94	pslld xmm4, 16
	95	psrad xmm3, 16
	96	psrad xmm4, 16
	97	packssdw xmm3, xmm4
	98	movdqa xmm4, xmm1
	99	movdqa xmm5, xmm2
	100	movdqa xmm6, xmm3
	101	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	102	paddw xmm4, xmm6
	103	psraw xmm4, 1
	104	psubw xmm5, xmm4
	105	psraw xmm5, 1
	106	movdqa xmm6, xmm5 ; out hi
	107	paddw xmm6, xmm8
	108	psraw xmm6, xmm9
	109	movdqa [rdi], xmm6
	110	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	111	movdqa xmm7, xmm5
	112	movd eax, xmm7
	113	pslldq xmm7, 2
	114	and eax, 0xFFFF
	115	movd xmm6, eax
	116	por xmm7, xmm6
	117	paddw xmm5, xmm7
	118	psraw xmm5, 1
	119	paddw xmm5, xmm1
	120
	121	movdqa xmm6, xmm5 ; out lo
	122	paddw xmm6, xmm10
	123	psraw xmm6, xmm11
	124	movdqa [rdx], xmm6
	125
	126	; move right
	127	lea rsi, [rsi + 16 * 2]
	128	lea rdi, [rdi + 8 * 2]
	129	lea rdx, [rdx + 8 * 2]
	130
	131	; move left
	132	lea rsi, [rsi - 16 * 2]
	133	lea rdi, [rdi - 8 * 2]
	134	lea rdx, [rdx - 8 * 2]
	135
	136	; move down
	137	lea rsi, [rsi + 16 * 2]
	138	lea rdi, [rdi + 8 * 2]
	139	lea rdx, [rdx + 8 * 2]
	140
	141	dec ecx
	142	jnz loop1a
	143
	144	ret
	145
	146	;******************************************************************************
	147	; source 16 bit signed, 16 pixel width
	148	rfx_dwt_2d_encode_block_verti_16_16:
	149	mov ecx, 2
	150	loop1b:
	151	; pre
	152	movdqa xmm1, [rsi] ; src[2n]
	153	movdqa xmm2, [rsi + 16 * 2] ; src[2n + 1]
	154	movdqa xmm3, [rsi + 16 * 2 * 2] ; src[2n + 2]
	155	movdqa xmm4, xmm1
	156	movdqa xmm5, xmm2
	157	movdqa xmm6, xmm3
	158	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	159	paddw xmm4, xmm6
	160	psraw xmm4, 1
	161	psubw xmm5, xmm4
	162	psraw xmm5, 1
	163	movdqa [rdi], xmm5 ; out hi
	164	movdqa xmm6, xmm5 ; save hi
	165	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	166	paddw xmm5, xmm1
	167	movdqa [rdx], xmm5 ; out lo
	168	movdqa xmm7, xmm6 ; save hi
	169	; move down
	170	lea rsi, [rsi + 16 * 2 * 2] ; 2 rows
	171	lea rdi, [rdi + 16 * 2] ; 1 row
	172	lea rdx, [rdx + 16 * 2] ; 1 row
	173
	174	; loop
	175	shl ecx, 16
	176	mov cx, 6
	177	loop2b:
	178	movdqa xmm1, xmm3 ; src[2n]
	179	movdqa xmm2, [rsi + 16 * 2] ; src[2n + 1]
	180	movdqa xmm3, [rsi + 16 * 2 * 2] ; src[2n + 2]
	181	movdqa xmm4, xmm1
	182	movdqa xmm5, xmm2
	183	movdqa xmm6, xmm3
	184	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	185	paddw xmm4, xmm6
	186	psraw xmm4, 1
	187	psubw xmm5, xmm4
	188	psraw xmm5, 1
	189	movdqa [rdi], xmm5 ; out hi
	190	movdqa xmm6, xmm5 ; save hi
	191	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	192	paddw xmm5, xmm7
	193	psraw xmm5, 1
	194	paddw xmm5, xmm1
	195	movdqa [rdx], xmm5 ; out lo
	196	movdqa xmm7, xmm6 ; save hi
	197	; move down
	198	lea rsi, [rsi + 16 * 2 * 2] ; 2 rows
	199	lea rdi, [rdi + 16 * 2] ; 1 row
	200	lea rdx, [rdx + 16 * 2] ; 1 row
	201
	202	dec cx
	203	jnz loop2b
	204	shr ecx, 16
	205
	206	; post
	207	movdqa xmm1, xmm3 ; src[2n]
	208	movdqa xmm2, [rsi + 16 * 2] ; src[2n + 1]
	209	movdqa xmm4, xmm1
	210	movdqa xmm5, xmm2
	211	movdqa xmm6, xmm3
	212	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	213	paddw xmm4, xmm6
	214	psraw xmm4, 1
	215	psubw xmm5, xmm4
	216	psraw xmm5, 1
	217	movdqa [rdi], xmm5 ; out hi
	218	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	219	paddw xmm5, xmm7
	220	psraw xmm5, 1
	221	paddw xmm5, xmm1
	222	movdqa [rdx], xmm5 ; out lo
	223	; move down
	224	lea rsi, [rsi + 16 * 2 * 2] ; 2 row
	225	lea rdi, [rdi + 16 * 2] ; 1 row
	226	lea rdx, [rdx + 16 * 2] ; 1 row
	227
	228	; move up
	229	lea rsi, [rsi - 16 * 16 * 2]
	230	lea rdi, [rdi - 8 * 16 * 2]
	231	lea rdx, [rdx - 8 * 16 * 2]
	232
	233	; move right
	234	lea rsi, [rsi + 16]
	235	lea rdi, [rdi + 16]
	236	lea rdx, [rdx + 16]
	237
	238	dec ecx
	239	jnz loop1b
	240
	241	ret
	242
	243	;******************************************************************************
	244	; source 16 bit signed, 32 pixel width
	245	rfx_dwt_2d_encode_block_horiz_16_32:
	246	mov ecx, 16
	247	loop1c:
	248	; pre
	249	movdqa xmm1, [rsi] ; src[2n]
	250	movdqa xmm2, [rsi + 16]
	251	movdqa xmm6, xmm1
	252	movdqa xmm7, xmm2
	253	pand xmm1, [rel cdFFFF]
	254	pand xmm2, [rel cdFFFF]
	255	pslld xmm1, 16
	256	pslld xmm2, 16
	257	psrad xmm1, 16
	258	psrad xmm2, 16
	259	packssdw xmm1, xmm2
	260	movdqa xmm2, xmm6 ; src[2n + 1]
	261	movdqa xmm3, xmm7
	262	psrldq xmm2, 2
	263	psrldq xmm3, 2
	264	pand xmm2, [rel cdFFFF]
	265	pand xmm3, [rel cdFFFF]
	266	pslld xmm2, 16
	267	pslld xmm3, 16
	268	psrad xmm2, 16
	269	psrad xmm3, 16
	270	packssdw xmm2, xmm3
	271	movdqa xmm3, xmm6 ; src[2n + 2]
	272	movdqa xmm4, xmm7
	273	psrldq xmm3, 4
	274	psrldq xmm4, 4
	275	movd eax, xmm7
	276	movd xmm5, eax
	277	pslldq xmm5, 12
	278	por xmm3, xmm5
	279	mov eax, [rsi + 32]
	280	movd xmm5, eax
	281	pslldq xmm5, 12
	282	por xmm4, xmm5
	283	pand xmm3, [rel cdFFFF]
	284	pand xmm4, [rel cdFFFF]
	285	pslld xmm3, 16
	286	pslld xmm4, 16
	287	psrad xmm3, 16
	288	psrad xmm4, 16
	289	packssdw xmm3, xmm4
	290	movdqa xmm4, xmm1
	291	movdqa xmm5, xmm2
	292	movdqa xmm6, xmm3
	293	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	294	paddw xmm4, xmm6
	295	psraw xmm4, 1
	296	psubw xmm5, xmm4
	297	psraw xmm5, 1
	298
	299	movdqa xmm6, xmm5 ; out hi
	300	paddw xmm6, xmm8
	301	psraw xmm6, xmm9
	302	movdqa [rdi], xmm6
	303	movdqa xmm2, xmm5 ; save hi
	304
	305	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	306	movdqa xmm7, xmm5
	307	movd eax, xmm7
	308	pslldq xmm7, 2
	309	and eax, 0xFFFF
	310	movd xmm6, eax
	311	por xmm7, xmm6
	312	paddw xmm5, xmm7
	313	psraw xmm5, 1
	314	paddw xmm5, xmm1
	315
	316	psrldq xmm2, 14
	317	movd ebx, xmm2 ; save hi
	318
	319	movdqa xmm6, xmm5 ; out lo
	320	paddw xmm6, xmm10
	321	psraw xmm6, xmm11
	322	movdqa [rdx], xmm6
	323
	324	; move right
	325	lea rsi, [rsi + 16 * 2]
	326	lea rdi, [rdi + 8 * 2]
	327	lea rdx, [rdx + 8 * 2]
	328
	329	; post
	330	movdqa xmm1, [rsi] ; src[2n]
	331	movdqa xmm2, [rsi + 16]
	332	movdqa xmm6, xmm1
	333	movdqa xmm7, xmm2
	334	pand xmm1, [rel cdFFFF]
	335	pand xmm2, [rel cdFFFF]
	336	pslld xmm1, 16
	337	pslld xmm2, 16
	338	psrad xmm1, 16
	339	psrad xmm2, 16
	340	packssdw xmm1, xmm2
	341	movdqa xmm2, xmm6 ; src[2n + 1]
	342	movdqa xmm3, xmm7
	343	psrldq xmm2, 2
	344	psrldq xmm3, 2
	345	pand xmm2, [rel cdFFFF]
	346	pand xmm3, [rel cdFFFF]
	347	pslld xmm2, 16
	348	pslld xmm3, 16
	349	psrad xmm2, 16
	350	psrad xmm3, 16
	351	packssdw xmm2, xmm3
	352	movdqa xmm3, xmm6 ; src[2n + 2]
	353	movdqa xmm4, xmm7
	354	psrldq xmm3, 4
	355	psrldq xmm4, 4
	356	movd eax, xmm7
	357	movd xmm5, eax
	358	pslldq xmm5, 12
	359	por xmm3, xmm5
	360	movdqa xmm5, xmm7
	361	psrldq xmm5, 12
	362	pslldq xmm5, 12
	363	por xmm4, xmm5
	364	pand xmm3, [rel cdFFFF]
	365	pand xmm4, [rel cdFFFF]
	366	pslld xmm3, 16
	367	pslld xmm4, 16
	368	psrad xmm3, 16
	369	psrad xmm4, 16
	370	packssdw xmm3, xmm4
	371	movdqa xmm4, xmm1
	372	movdqa xmm5, xmm2
	373	movdqa xmm6, xmm3
	374	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	375	paddw xmm4, xmm6
	376	psraw xmm4, 1
	377	psubw xmm5, xmm4
	378	psraw xmm5, 1
	379
	380	movdqa xmm6, xmm5 ; out hi
	381	paddw xmm6, xmm8
	382	psraw xmm6, xmm9
	383	movdqa [rdi], xmm6
	384
	385	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	386	movdqa xmm7, xmm5
	387	pslldq xmm7, 2
	388	movd xmm6, ebx
	389	por xmm7, xmm6
	390	paddw xmm5, xmm7
	391	psraw xmm5, 1
	392	paddw xmm5, xmm1
	393
	394	movdqa xmm6, xmm5 ; out lo
	395	paddw xmm6, xmm10
	396	psraw xmm6, xmm11
	397	movdqa [rdx], xmm6
	398
	399	; move right
	400	lea rsi, [rsi + 16 * 2]
	401	lea rdi, [rdi + 8 * 2]
	402	lea rdx, [rdx + 8 * 2]
	403
	404	; move left
	405	lea rsi, [rsi - 32 * 2]
	406	lea rdi, [rdi - 16 * 2]
	407	lea rdx, [rdx - 16 * 2]
	408
	409	; move down
	410	lea rsi, [rsi + 32 * 2]
	411	lea rdi, [rdi + 16 * 2]
	412	lea rdx, [rdx + 16 * 2]
	413
	414	dec ecx
	415	jnz loop1c
	416
	417	ret
	418
	419	;******************************************************************************
	420	; source 16 bit signed, 32 pixel width
	421	rfx_dwt_2d_encode_block_horiz_16_32_no_lo:
	422	mov ecx, 16
	423	loop1c1:
	424	; pre
	425	movdqa xmm1, [rsi] ; src[2n]
	426	movdqa xmm2, [rsi + 16]
	427	movdqa xmm6, xmm1
	428	movdqa xmm7, xmm2
	429	pand xmm1, [rel cdFFFF]
	430	pand xmm2, [rel cdFFFF]
	431	pslld xmm1, 16
	432	pslld xmm2, 16
	433	psrad xmm1, 16
	434	psrad xmm2, 16
	435	packssdw xmm1, xmm2
	436	movdqa xmm2, xmm6 ; src[2n + 1]
	437	movdqa xmm3, xmm7
	438	psrldq xmm2, 2
	439	psrldq xmm3, 2
	440	pand xmm2, [rel cdFFFF]
	441	pand xmm3, [rel cdFFFF]
	442	pslld xmm2, 16
	443	pslld xmm3, 16
	444	psrad xmm2, 16
	445	psrad xmm3, 16
	446	packssdw xmm2, xmm3
	447	movdqa xmm3, xmm6 ; src[2n + 2]
	448	movdqa xmm4, xmm7
	449	psrldq xmm3, 4
	450	psrldq xmm4, 4
	451	movd eax, xmm7
	452	movd xmm5, eax
	453	pslldq xmm5, 12
	454	por xmm3, xmm5
	455	mov eax, [rsi + 32]
	456	movd xmm5, eax
	457	pslldq xmm5, 12
	458	por xmm4, xmm5
	459	pand xmm3, [rel cdFFFF]
	460	pand xmm4, [rel cdFFFF]
	461	pslld xmm3, 16
	462	pslld xmm4, 16
	463	psrad xmm3, 16
	464	psrad xmm4, 16
	465	packssdw xmm3, xmm4
	466	movdqa xmm4, xmm1
	467	movdqa xmm5, xmm2
	468	movdqa xmm6, xmm3
	469	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	470	paddw xmm4, xmm6
	471	psraw xmm4, 1
	472	psubw xmm5, xmm4
	473	psraw xmm5, 1
	474
	475	movdqa xmm6, xmm5 ; out hi
	476	paddw xmm6, xmm8
	477	psraw xmm6, xmm9
	478	movdqa [rdi], xmm6
	479	movdqa xmm2, xmm5 ; save hi
	480
	481	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	482	movdqa xmm7, xmm5
	483	movd eax, xmm7
	484	pslldq xmm7, 2
	485	and eax, 0xFFFF
	486	movd xmm6, eax
	487	por xmm7, xmm6
	488	paddw xmm5, xmm7
	489	psraw xmm5, 1
	490	paddw xmm5, xmm1
	491
	492	psrldq xmm2, 14
	493	movd ebx, xmm2 ; save hi
	494
	495	movdqa [rdx], xmm5 ; out lo
	496
	497	; move right
	498	lea rsi, [rsi + 16 * 2]
	499	lea rdi, [rdi + 8 * 2]
	500	lea rdx, [rdx + 8 * 2]
	501
	502	; post
	503	movdqa xmm1, [rsi] ; src[2n]
	504	movdqa xmm2, [rsi + 16]
	505	movdqa xmm6, xmm1
	506	movdqa xmm7, xmm2
	507	pand xmm1, [rel cdFFFF]
	508	pand xmm2, [rel cdFFFF]
	509	pslld xmm1, 16
	510	pslld xmm2, 16
	511	psrad xmm1, 16
	512	psrad xmm2, 16
	513	packssdw xmm1, xmm2
	514	movdqa xmm2, xmm6 ; src[2n + 1]
	515	movdqa xmm3, xmm7
	516	psrldq xmm2, 2
	517	psrldq xmm3, 2
	518	pand xmm2, [rel cdFFFF]
	519	pand xmm3, [rel cdFFFF]
	520	pslld xmm2, 16
	521	pslld xmm3, 16
	522	psrad xmm2, 16
	523	psrad xmm3, 16
	524	packssdw xmm2, xmm3
	525	movdqa xmm3, xmm6 ; src[2n + 2]
	526	movdqa xmm4, xmm7
	527	psrldq xmm3, 4
	528	psrldq xmm4, 4
	529	movd eax, xmm7
	530	movd xmm5, eax
	531	pslldq xmm5, 12
	532	por xmm3, xmm5
	533	movdqa xmm5, xmm7
	534	psrldq xmm5, 12
	535	pslldq xmm5, 12
	536	por xmm4, xmm5
	537	pand xmm3, [rel cdFFFF]
	538	pand xmm4, [rel cdFFFF]
	539	pslld xmm3, 16
	540	pslld xmm4, 16
	541	psrad xmm3, 16
	542	psrad xmm4, 16
	543	packssdw xmm3, xmm4
	544	movdqa xmm4, xmm1
	545	movdqa xmm5, xmm2
	546	movdqa xmm6, xmm3
	547	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	548	paddw xmm4, xmm6
	549	psraw xmm4, 1
	550	psubw xmm5, xmm4
	551	psraw xmm5, 1
	552
	553	movdqa xmm6, xmm5 ; out hi
	554	paddw xmm6, xmm8
	555	psraw xmm6, xmm9
	556	movdqa [rdi], xmm6
	557
	558	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	559	movdqa xmm7, xmm5
	560	pslldq xmm7, 2
	561	movd xmm6, ebx
	562	por xmm7, xmm6
	563	paddw xmm5, xmm7
	564	psraw xmm5, 1
	565	paddw xmm5, xmm1
	566
	567	movdqa [rdx], xmm5 ; out lo
	568
	569	; move right
	570	lea rsi, [rsi + 16 * 2]
	571	lea rdi, [rdi + 8 * 2]
	572	lea rdx, [rdx + 8 * 2]
	573
	574	; move left
	575	lea rsi, [rsi - 32 * 2]
	576	lea rdi, [rdi - 16 * 2]
	577	lea rdx, [rdx - 16 * 2]
	578
	579	; move down
	580	lea rsi, [rsi + 32 * 2]
	581	lea rdi, [rdi + 16 * 2]
	582	lea rdx, [rdx + 16 * 2]
	583
	584	dec ecx
	585	jnz loop1c1
	586
	587	ret
	588
	589	;******************************************************************************
	590	; source 16 bit signed, 32 pixel width
	591	rfx_dwt_2d_encode_block_verti_16_32:
	592	mov ecx, 4
	593	loop1d:
	594	; pre
	595	movdqa xmm1, [rsi] ; src[2n]
	596	movdqa xmm2, [rsi + 32 * 2] ; src[2n + 1]
	597	movdqa xmm3, [rsi + 32 * 2 * 2] ; src[2n + 2]
	598	movdqa xmm4, xmm1
	599	movdqa xmm5, xmm2
	600	movdqa xmm6, xmm3
	601	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	602	paddw xmm4, xmm6
	603	psraw xmm4, 1
	604	psubw xmm5, xmm4
	605	psraw xmm5, 1
	606	movdqa [rdi], xmm5 ; out hi
	607	movdqa xmm6, xmm5 ; save hi
	608	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	609	paddw xmm5, xmm1
	610	movdqa [rdx], xmm5 ; out lo
	611	movdqa xmm7, xmm6 ; save hi
	612	; move down
	613	lea rsi, [rsi + 32 * 2 * 2] ; 2 rows
	614	lea rdi, [rdi + 32 * 2] ; 1 row
	615	lea rdx, [rdx + 32 * 2] ; 1 row
	616
	617	; loop
	618	shl ecx, 16
	619	mov cx, 14
	620	loop2d:
	621	movdqa xmm1, xmm3 ; src[2n]
	622	movdqa xmm2, [rsi + 32 * 2] ; src[2n + 1]
	623	movdqa xmm3, [rsi + 32 * 2 * 2] ; src[2n + 2]
	624	movdqa xmm4, xmm1
	625	movdqa xmm5, xmm2
	626	movdqa xmm6, xmm3
	627	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	628	paddw xmm4, xmm6
	629	psraw xmm4, 1
	630	psubw xmm5, xmm4
	631	psraw xmm5, 1
	632	movdqa [rdi], xmm5 ; out hi
	633	movdqa xmm6, xmm5 ; save hi
	634	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	635	paddw xmm5, xmm7
	636	psraw xmm5, 1
	637	paddw xmm5, xmm1
	638	movdqa [rdx], xmm5 ; out lo
	639	movdqa xmm7, xmm6 ; save hi
	640	; move down
	641	lea rsi, [rsi + 32 * 2 * 2] ; 2 rows
	642	lea rdi, [rdi + 32 * 2] ; 1 row
	643	lea rdx, [rdx + 32 * 2] ; 1 row
	644
	645	dec cx
	646	jnz loop2d
	647	shr ecx, 16
	648
	649	; post
	650	movdqa xmm1, xmm3 ; src[2n]
	651	movdqa xmm2, [rsi + 32 * 2] ; src[2n + 1]
	652	movdqa xmm4, xmm1
	653	movdqa xmm5, xmm2
	654	movdqa xmm6, xmm3
	655	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	656	paddw xmm4, xmm6
	657	psraw xmm4, 1
	658	psubw xmm5, xmm4
	659	psraw xmm5, 1
	660	movdqa [rdi], xmm5 ; out hi
	661	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	662	paddw xmm5, xmm7
	663	psraw xmm5, 1
	664	paddw xmm5, xmm1
	665	movdqa [rdx], xmm5 ; out lo
	666	; move down
	667	lea rsi, [rsi + 32 * 2 * 2] ; 2 row
	668	lea rdi, [rdi + 32 * 2] ; 1 row
	669	lea rdx, [rdx + 32 * 2] ; 1 row
	670
	671	; move up
	672	lea rsi, [rsi - 32 * 32 * 2]
	673	lea rdi, [rdi - 16 * 32 * 2]
	674	lea rdx, [rdx - 16 * 32 * 2]
	675
	676	; move right
	677	lea rsi, [rsi + 16]
	678	lea rdi, [rdi + 16]
	679	lea rdx, [rdx + 16]
	680
	681	dec ecx
	682	jnz loop1d
	683
	684	ret
	685
	686	;******************************************************************************
	687	; source 16 bit signed, 64 pixel width
	688	rfx_dwt_2d_encode_block_horiz_16_64:
	689	mov ecx, 32
	690	loop1e:
	691	; pre
	692	movdqa xmm1, [rsi] ; src[2n]
	693	movdqa xmm2, [rsi + 16]
	694	movdqa xmm6, xmm1
	695	movdqa xmm7, xmm2
	696	pand xmm1, [rel cdFFFF]
	697	pand xmm2, [rel cdFFFF]
	698	pslld xmm1, 16
	699	pslld xmm2, 16
	700	psrad xmm1, 16
	701	psrad xmm2, 16
	702	packssdw xmm1, xmm2
	703	movdqa xmm2, xmm6 ; src[2n + 1]
	704	movdqa xmm3, xmm7
	705	psrldq xmm2, 2
	706	psrldq xmm3, 2
	707	pand xmm2, [rel cdFFFF]
	708	pand xmm3, [rel cdFFFF]
	709	pslld xmm2, 16
	710	pslld xmm3, 16
	711	psrad xmm2, 16
	712	psrad xmm3, 16
	713	packssdw xmm2, xmm3
	714	movdqa xmm3, xmm6 ; src[2n + 2]
	715	movdqa xmm4, xmm7
	716	psrldq xmm3, 4
	717	psrldq xmm4, 4
	718	movd eax, xmm7
	719	movd xmm5, eax
	720	pslldq xmm5, 12
	721	por xmm3, xmm5
	722	mov eax, [rsi + 32]
	723	movd xmm5, eax
	724	pslldq xmm5, 12
	725	por xmm4, xmm5
	726	pand xmm3, [rel cdFFFF]
	727	pand xmm4, [rel cdFFFF]
	728	pslld xmm3, 16
	729	pslld xmm4, 16
	730	psrad xmm3, 16
	731	psrad xmm4, 16
	732	packssdw xmm3, xmm4
	733	movdqa xmm4, xmm1
	734	movdqa xmm5, xmm2
	735	movdqa xmm6, xmm3
	736	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	737	paddw xmm4, xmm6
	738	psraw xmm4, 1
	739	psubw xmm5, xmm4
	740	psraw xmm5, 1
	741
	742	movdqa xmm6, xmm5 ; out hi
	743	paddw xmm6, xmm8
	744	psraw xmm6, xmm9
	745	movdqa [rdi], xmm6
	746	movdqa xmm2, xmm5 ; save hi
	747
	748	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	749	movdqa xmm7, xmm5
	750	movd eax, xmm7
	751	pslldq xmm7, 2
	752	and eax, 0xFFFF
	753	movd xmm6, eax
	754	por xmm7, xmm6
	755	paddw xmm5, xmm7
	756	psraw xmm5, 1
	757	paddw xmm5, xmm1
	758
	759	psrldq xmm2, 14
	760	movd ebx, xmm2 ; save hi
	761
	762	movdqa xmm6, xmm5 ; out lo
	763	paddw xmm6, xmm10
	764	psraw xmm6, xmm11
	765	movdqa [rdx], xmm6
	766
	767	; move right
	768	lea rsi, [rsi + 16 * 2]
	769	lea rdi, [rdi + 8 * 2]
	770	lea rdx, [rdx + 8 * 2]
	771
	772	; loop
	773	shl ecx, 16
	774	mov cx, 2
	775	loop2e:
	776	movdqa xmm1, [rsi] ; src[2n]
	777	movdqa xmm2, [rsi + 16]
	778	movdqa xmm6, xmm1
	779	movdqa xmm7, xmm2
	780	pand xmm1, [rel cdFFFF]
	781	pand xmm2, [rel cdFFFF]
	782	pslld xmm1, 16
	783	pslld xmm2, 16
	784	psrad xmm1, 16
	785	psrad xmm2, 16
	786	packssdw xmm1, xmm2
	787	movdqa xmm2, xmm6 ; src[2n + 1]
	788	movdqa xmm3, xmm7
	789	psrldq xmm2, 2
	790	psrldq xmm3, 2
	791	pand xmm2, [rel cdFFFF]
	792	pand xmm3, [rel cdFFFF]
	793	pslld xmm2, 16
	794	pslld xmm3, 16
	795	psrad xmm2, 16
	796	psrad xmm3, 16
	797	packssdw xmm2, xmm3
	798	movdqa xmm3, xmm6 ; src[2n + 2]
	799	movdqa xmm4, xmm7
	800	psrldq xmm3, 4
	801	psrldq xmm4, 4
	802	movd eax, xmm7
	803	movd xmm5, eax
	804	pslldq xmm5, 12
	805	por xmm3, xmm5
	806	mov eax, [rsi + 32]
	807	movd xmm5, eax
	808	pslldq xmm5, 12
	809	por xmm4, xmm5
	810	pand xmm3, [rel cdFFFF]
	811	pand xmm4, [rel cdFFFF]
	812	pslld xmm3, 16
	813	pslld xmm4, 16
	814	psrad xmm3, 16
	815	psrad xmm4, 16
	816	packssdw xmm3, xmm4
	817	movdqa xmm4, xmm1
	818	movdqa xmm5, xmm2
	819	movdqa xmm6, xmm3
	820	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	821	paddw xmm4, xmm6
	822	psraw xmm4, 1
	823	psubw xmm5, xmm4
	824	psraw xmm5, 1
	825
	826	movdqa xmm6, xmm5 ; out hi
	827	paddw xmm6, xmm8
	828	psraw xmm6, xmm9
	829	movdqa [rdi], xmm6
	830	movdqa xmm2, xmm5 ; save hi
	831
	832	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	833	movdqa xmm7, xmm5
	834	pslldq xmm7, 2
	835	movd xmm6, ebx
	836	por xmm7, xmm6
	837	paddw xmm5, xmm7
	838	psraw xmm5, 1
	839	paddw xmm5, xmm1
	840
	841	psrldq xmm2, 14
	842	movd ebx, xmm2 ; save hi
	843
	844	movdqa xmm6, xmm5 ; out lo
	845	paddw xmm6, xmm10
	846	psraw xmm6, xmm11
	847	movdqa [rdx], xmm6
	848
	849	; move right
	850	lea rsi, [rsi + 16 * 2]
	851	lea rdi, [rdi + 8 * 2]
	852	lea rdx, [rdx + 8 * 2]
	853
	854	dec cx
	855	jnz loop2e
	856	shr ecx, 16
	857
	858	; post
	859	movdqa xmm1, [rsi] ; src[2n]
	860	movdqa xmm2, [rsi + 16]
	861	movdqa xmm6, xmm1
	862	movdqa xmm7, xmm2
	863	pand xmm1, [rel cdFFFF]
	864	pand xmm2, [rel cdFFFF]
	865	pslld xmm1, 16
	866	pslld xmm2, 16
	867	psrad xmm1, 16
	868	psrad xmm2, 16
	869	packssdw xmm1, xmm2
	870	movdqa xmm2, xmm6 ; src[2n + 1]
	871	movdqa xmm3, xmm7
	872	psrldq xmm2, 2
	873	psrldq xmm3, 2
	874	pand xmm2, [rel cdFFFF]
	875	pand xmm3, [rel cdFFFF]
	876	pslld xmm2, 16
	877	pslld xmm3, 16
	878	psrad xmm2, 16
	879	psrad xmm3, 16
	880	packssdw xmm2, xmm3
	881	movdqa xmm3, xmm6 ; src[2n + 2]
	882	movdqa xmm4, xmm7
	883	psrldq xmm3, 4
	884	psrldq xmm4, 4
	885	movd eax, xmm7
	886	movd xmm5, eax
	887	pslldq xmm5, 12
	888	por xmm3, xmm5
	889	movdqa xmm5, xmm7
	890	psrldq xmm5, 12
	891	pslldq xmm5, 12
	892	por xmm4, xmm5
	893	pand xmm3, [rel cdFFFF]
	894	pand xmm4, [rel cdFFFF]
	895	pslld xmm3, 16
	896	pslld xmm4, 16
	897	psrad xmm3, 16
	898	psrad xmm4, 16
	899	packssdw xmm3, xmm4
	900	movdqa xmm4, xmm1
	901	movdqa xmm5, xmm2
	902	movdqa xmm6, xmm3
	903	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	904	paddw xmm4, xmm6
	905	psraw xmm4, 1
	906	psubw xmm5, xmm4
	907	psraw xmm5, 1
	908
	909	movdqa xmm6, xmm5 ; out hi
	910	paddw xmm6, xmm8
	911	psraw xmm6, xmm9
	912	movdqa [rdi], xmm6
	913
	914	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	915	movdqa xmm7, xmm5
	916	pslldq xmm7, 2
	917	movd xmm6, ebx
	918	por xmm7, xmm6
	919	paddw xmm5, xmm7
	920	psraw xmm5, 1
	921	paddw xmm5, xmm1
	922
	923	movdqa xmm6, xmm5 ; out lo
	924	paddw xmm6, xmm10
	925	psraw xmm6, xmm11
	926	movdqa [rdx], xmm6
	927
	928	; move right
	929	lea rsi, [rsi + 16 * 2]
	930	lea rdi, [rdi + 8 * 2]
	931	lea rdx, [rdx + 8 * 2]
	932
	933	; move left
	934	lea rsi, [rsi - 64 * 2]
	935	lea rdi, [rdi - 32 * 2]
	936	lea rdx, [rdx - 32 * 2]
	937
	938	; move down
	939	lea rsi, [rsi + 64 * 2]
	940	lea rdi, [rdi + 32 * 2]
	941	lea rdx, [rdx + 32 * 2]
	942
	943	dec ecx
	944	jnz loop1e
	945
	946	ret
	947
	948	;******************************************************************************
	949	; source 16 bit signed, 64 pixel width
	950	rfx_dwt_2d_encode_block_horiz_16_64_no_lo:
	951	mov ecx, 32
	952	loop1e1:
	953	; pre
	954	movdqa xmm1, [rsi] ; src[2n]
	955	movdqa xmm2, [rsi + 16]
	956	movdqa xmm6, xmm1
	957	movdqa xmm7, xmm2
	958	pand xmm1, [rel cdFFFF]
	959	pand xmm2, [rel cdFFFF]
	960	pslld xmm1, 16
	961	pslld xmm2, 16
	962	psrad xmm1, 16
	963	psrad xmm2, 16
	964	packssdw xmm1, xmm2
	965	movdqa xmm2, xmm6 ; src[2n + 1]
	966	movdqa xmm3, xmm7
	967	psrldq xmm2, 2
	968	psrldq xmm3, 2
	969	pand xmm2, [rel cdFFFF]
	970	pand xmm3, [rel cdFFFF]
	971	pslld xmm2, 16
	972	pslld xmm3, 16
	973	psrad xmm2, 16
	974	psrad xmm3, 16
	975	packssdw xmm2, xmm3
	976	movdqa xmm3, xmm6 ; src[2n + 2]
	977	movdqa xmm4, xmm7
	978	psrldq xmm3, 4
	979	psrldq xmm4, 4
	980	movd eax, xmm7
	981	movd xmm5, eax
	982	pslldq xmm5, 12
	983	por xmm3, xmm5
	984	mov eax, [rsi + 32]
	985	movd xmm5, eax
	986	pslldq xmm5, 12
	987	por xmm4, xmm5
	988	pand xmm3, [rel cdFFFF]
	989	pand xmm4, [rel cdFFFF]
	990	pslld xmm3, 16
	991	pslld xmm4, 16
	992	psrad xmm3, 16
	993	psrad xmm4, 16
	994	packssdw xmm3, xmm4
	995	movdqa xmm4, xmm1
	996	movdqa xmm5, xmm2
	997	movdqa xmm6, xmm3
	998	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	999	paddw xmm4, xmm6
	1000	psraw xmm4, 1
	1001	psubw xmm5, xmm4
	1002	psraw xmm5, 1
	1003
	1004	movdqa xmm6, xmm5 ; out hi
	1005	paddw xmm6, xmm8
	1006	psraw xmm6, xmm9
	1007	movdqa [rdi], xmm6
	1008	movdqa xmm2, xmm5 ; save hi
	1009
	1010	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1011	movdqa xmm7, xmm5
	1012	movd eax, xmm7
	1013	pslldq xmm7, 2
	1014	and eax, 0xFFFF
	1015	movd xmm6, eax
	1016	por xmm7, xmm6
	1017	paddw xmm5, xmm7
	1018	psraw xmm5, 1
	1019	paddw xmm5, xmm1
	1020
	1021	psrldq xmm2, 14
	1022	movd ebx, xmm2 ; save hi
	1023
	1024	movdqa [rdx], xmm5 ; out lo
	1025
	1026	; move right
	1027	lea rsi, [rsi + 16 * 2]
	1028	lea rdi, [rdi + 8 * 2]
	1029	lea rdx, [rdx + 8 * 2]
	1030
	1031	; loop
	1032	shl ecx, 16
	1033	mov cx, 2
	1034	loop2e1:
	1035	movdqa xmm1, [rsi] ; src[2n]
	1036	movdqa xmm2, [rsi + 16]
	1037	movdqa xmm6, xmm1
	1038	movdqa xmm7, xmm2
	1039	pand xmm1, [rel cdFFFF]
	1040	pand xmm2, [rel cdFFFF]
	1041	pslld xmm1, 16
	1042	pslld xmm2, 16
	1043	psrad xmm1, 16
	1044	psrad xmm2, 16
	1045	packssdw xmm1, xmm2
	1046	movdqa xmm2, xmm6 ; src[2n + 1]
	1047	movdqa xmm3, xmm7
	1048	psrldq xmm2, 2
	1049	psrldq xmm3, 2
	1050	pand xmm2, [rel cdFFFF]
	1051	pand xmm3, [rel cdFFFF]
	1052	pslld xmm2, 16
	1053	pslld xmm3, 16
	1054	psrad xmm2, 16
	1055	psrad xmm3, 16
	1056	packssdw xmm2, xmm3
	1057	movdqa xmm3, xmm6 ; src[2n + 2]
	1058	movdqa xmm4, xmm7
	1059	psrldq xmm3, 4
	1060	psrldq xmm4, 4
	1061	movd eax, xmm7
	1062	movd xmm5, eax
	1063	pslldq xmm5, 12
	1064	por xmm3, xmm5
	1065	mov eax, [rsi + 32]
	1066	movd xmm5, eax
	1067	pslldq xmm5, 12
	1068	por xmm4, xmm5
	1069	pand xmm3, [rel cdFFFF]
	1070	pand xmm4, [rel cdFFFF]
	1071	pslld xmm3, 16
	1072	pslld xmm4, 16
	1073	psrad xmm3, 16
	1074	psrad xmm4, 16
	1075	packssdw xmm3, xmm4
	1076	movdqa xmm4, xmm1
	1077	movdqa xmm5, xmm2
	1078	movdqa xmm6, xmm3
	1079	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1080	paddw xmm4, xmm6
	1081	psraw xmm4, 1
	1082	psubw xmm5, xmm4
	1083	psraw xmm5, 1
	1084
	1085	movdqa xmm6, xmm5 ; out hi
	1086	paddw xmm6, xmm8
	1087	psraw xmm6, xmm9
	1088	movdqa [rdi], xmm6
	1089	movdqa xmm2, xmm5 ; save hi
	1090
	1091	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1092	movdqa xmm7, xmm5
	1093	pslldq xmm7, 2
	1094	movd xmm6, ebx
	1095	por xmm7, xmm6
	1096	paddw xmm5, xmm7
	1097	psraw xmm5, 1
	1098	paddw xmm5, xmm1
	1099
	1100	psrldq xmm2, 14
	1101	movd ebx, xmm2 ; save hi
	1102
	1103	movdqa [rdx], xmm5 ; out lo
	1104
	1105	; move right
	1106	lea rsi, [rsi + 16 * 2]
	1107	lea rdi, [rdi + 8 * 2]
	1108	lea rdx, [rdx + 8 * 2]
	1109
	1110	dec cx
	1111	jnz loop2e1
	1112	shr ecx, 16
	1113
	1114	; post
	1115	movdqa xmm1, [rsi] ; src[2n]
	1116	movdqa xmm2, [rsi + 16]
	1117	movdqa xmm6, xmm1
	1118	movdqa xmm7, xmm2
	1119	pand xmm1, [rel cdFFFF]
	1120	pand xmm2, [rel cdFFFF]
	1121	pslld xmm1, 16
	1122	pslld xmm2, 16
	1123	psrad xmm1, 16
	1124	psrad xmm2, 16
	1125	packssdw xmm1, xmm2
	1126	movdqa xmm2, xmm6 ; src[2n + 1]
	1127	movdqa xmm3, xmm7
	1128	psrldq xmm2, 2
	1129	psrldq xmm3, 2
	1130	pand xmm2, [rel cdFFFF]
	1131	pand xmm3, [rel cdFFFF]
	1132	pslld xmm2, 16
	1133	pslld xmm3, 16
	1134	psrad xmm2, 16
	1135	psrad xmm3, 16
	1136	packssdw xmm2, xmm3
	1137	movdqa xmm3, xmm6 ; src[2n + 2]
	1138	movdqa xmm4, xmm7
	1139	psrldq xmm3, 4
	1140	psrldq xmm4, 4
	1141	movd eax, xmm7
	1142	movd xmm5, eax
	1143	pslldq xmm5, 12
	1144	por xmm3, xmm5
	1145	movdqa xmm5, xmm7
	1146	psrldq xmm5, 12
	1147	pslldq xmm5, 12
	1148	por xmm4, xmm5
	1149	pand xmm3, [rel cdFFFF]
	1150	pand xmm4, [rel cdFFFF]
	1151	pslld xmm3, 16
	1152	pslld xmm4, 16
	1153	psrad xmm3, 16
	1154	psrad xmm4, 16
	1155	packssdw xmm3, xmm4
	1156	movdqa xmm4, xmm1
	1157	movdqa xmm5, xmm2
	1158	movdqa xmm6, xmm3
	1159	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1160	paddw xmm4, xmm6
	1161	psraw xmm4, 1
	1162	psubw xmm5, xmm4
	1163	psraw xmm5, 1
	1164
	1165	movdqa xmm6, xmm5 ; out hi
	1166	paddw xmm6, xmm8
	1167	psraw xmm6, xmm9
	1168	movdqa [rdi], xmm6
	1169
	1170	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1171	movdqa xmm7, xmm5
	1172	pslldq xmm7, 2
	1173	movd xmm6, ebx
	1174	por xmm7, xmm6
	1175	paddw xmm5, xmm7
	1176	psraw xmm5, 1
	1177	paddw xmm5, xmm1
	1178
	1179	movdqa [rdx], xmm5 ; out lo
	1180
	1181	; move right
	1182	lea rsi, [rsi + 16 * 2]
	1183	lea rdi, [rdi + 8 * 2]
	1184	lea rdx, [rdx + 8 * 2]
	1185
	1186	; move left
	1187	lea rsi, [rsi - 64 * 2]
	1188	lea rdi, [rdi - 32 * 2]
	1189	lea rdx, [rdx - 32 * 2]
	1190
	1191	; move down
	1192	lea rsi, [rsi + 64 * 2]
	1193	lea rdi, [rdi + 32 * 2]
	1194	lea rdx, [rdx + 32 * 2]
	1195
	1196	dec ecx
	1197	jnz loop1e1
	1198
	1199	ret
	1200
	1201	;******************************************************************************
	1202	; source 8 bit unsigned, 64 pixel width
	1203	rfx_dwt_2d_encode_block_verti_8_64:
	1204	mov ecx, 8
	1205	loop1f:
	1206	; pre
	1207	movq xmm1, [rsi] ; src[2n]
	1208	movq xmm2, [rsi + 64 * 1] ; src[2n + 1]
	1209	movq xmm3, [rsi + 64 * 1 * 2] ; src[2n + 2]
	1210	punpcklbw xmm1, xmm0
	1211	punpcklbw xmm2, xmm0
	1212	punpcklbw xmm3, xmm0
	1213	psubw xmm1, [rel cw128]
	1214	psubw xmm2, [rel cw128]
	1215	psubw xmm3, [rel cw128]
	1216	psllw xmm1, 5
	1217	psllw xmm2, 5
	1218	psllw xmm3, 5
	1219	movdqa xmm4, xmm1
	1220	movdqa xmm5, xmm2
	1221	movdqa xmm6, xmm3
	1222	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1223	paddw xmm4, xmm6
	1224	psraw xmm4, 1
	1225	psubw xmm5, xmm4
	1226	psraw xmm5, 1
	1227	movdqa [rdi], xmm5 ; out hi
	1228	movdqa xmm6, xmm5 ; save hi
	1229	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1230	paddw xmm5, xmm1
	1231	movdqa [rdx], xmm5 ; out lo
	1232	movdqa xmm7, xmm6 ; save hi
	1233	; move down
	1234	lea rsi, [rsi + 64 * 1 * 2] ; 2 rows
	1235	lea rdi, [rdi + 64 * 2] ; 1 row
	1236	lea rdx, [rdx + 64 * 2] ; 1 row
	1237
	1238	; loop
	1239	shl ecx, 16
	1240	mov cx, 30
	1241	loop2f:
	1242	movdqa xmm1, xmm3 ; src[2n]
	1243	movq xmm2, [rsi + 64 * 1] ; src[2n + 1]
	1244	movq xmm3, [rsi + 64 * 1 * 2] ; src[2n + 2]
	1245	punpcklbw xmm2, xmm0
	1246	punpcklbw xmm3, xmm0
	1247	psubw xmm2, [rel cw128]
	1248	psubw xmm3, [rel cw128]
	1249	psllw xmm2, 5
	1250	psllw xmm3, 5
	1251	movdqa xmm4, xmm1
	1252	movdqa xmm5, xmm2
	1253	movdqa xmm6, xmm3
	1254	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1255	paddw xmm4, xmm6
	1256	psraw xmm4, 1
	1257	psubw xmm5, xmm4
	1258	psraw xmm5, 1
	1259	movdqa [rdi], xmm5 ; out hi
	1260	movdqa xmm6, xmm5 ; save hi
	1261	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1262	paddw xmm5, xmm7
	1263	psraw xmm5, 1
	1264	paddw xmm5, xmm1
	1265	movdqa [rdx], xmm5 ; out lo
	1266	movdqa xmm7, xmm6 ; save hi
	1267	; move down
	1268	lea rsi, [rsi + 64 * 1 * 2] ; 2 rows
	1269	lea rdi, [rdi + 64 * 2] ; 1 row
	1270	lea rdx, [rdx + 64 * 2] ; 1 row
	1271
	1272	dec cx
	1273	jnz loop2f
	1274	shr ecx, 16
	1275
	1276	; post
	1277	movdqa xmm1, xmm3 ; src[2n]
	1278	movq xmm2, [rsi + 64 * 1] ; src[2n + 1]
	1279	punpcklbw xmm2, xmm0
	1280	psubw xmm2, [rel cw128]
	1281	psllw xmm2, 5
	1282	movdqa xmm4, xmm1
	1283	movdqa xmm5, xmm2
	1284	movdqa xmm6, xmm3
	1285	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1286	paddw xmm4, xmm6
	1287	psraw xmm4, 1
	1288	psubw xmm5, xmm4
	1289	psraw xmm5, 1
	1290	movdqa [rdi], xmm5 ; out hi
	1291	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1292	paddw xmm5, xmm7
	1293	psraw xmm5, 1
	1294	paddw xmm5, xmm1
	1295	movdqa [rdx], xmm5 ; out lo
	1296	; move down
	1297	lea rsi, [rsi + 64 * 1 * 2] ; 2 rows
	1298	lea rdi, [rdi + 64 * 2] ; 1 row
	1299	lea rdx, [rdx + 64 * 2] ; 1 row
	1300
	1301	; move up
	1302	lea rsi, [rsi - 64 * 1 * 64]
	1303	lea rdi, [rdi - 32 * 64 * 2]
	1304	lea rdx, [rdx - 32 * 64 * 2]
	1305
	1306	; move right
	1307	lea rsi, [rsi + 8]
	1308	lea rdi, [rdi + 16]
	1309	lea rdx, [rdx + 16]
	1310
	1311	dec ecx
	1312	jnz loop1f
	1313
	1314	ret
	1315
	1316	set_quants_hi:
	1317	sub rax, 6 - 5
	1318	movd xmm9, eax
	1319	imul rax, 16
	1320	lea rdx, [rel cwa0]
	1321	add rdx, rax
	1322	movdqa xmm8, [rdx]
	1323	ret
	1324
	1325	set_quants_lo:
	1326	sub rax, 6 - 5
	1327	movd xmm11, eax
	1328	imul rax, 16
	1329	lea rdx, [rel cwa0]
	1330	add rdx, rax
	1331	movdqa xmm10, [rdx]
	1332	ret
	1333
	1334	;The first six integer or pointer arguments are passed in registers
	1335	;RDI, RSI, RDX, RCX, R8, and R9
	1336
	1337	;int
	1338	;rfxcodec_encode_dwt_shift_amd64_sse2(const char *qtable,
	1339	; unsigned char *in_buffer,
	1340	; short *out_buffer,
	1341	; short *work_buffer);
	1342
	1343	;******************************************************************************
	1344	%ifidn __OUTPUT_FORMAT__,elf64
	1345	PROC rfxcodec_encode_dwt_shift_amd64_sse2
	1346	%else
	1347	PROC _rfxcodec_encode_dwt_shift_amd64_sse2
	1348	%endif
	1349	; save registers
	1350	push rbx
	1351	push rdx
	1352	push rcx
	1353	push rsi
	1354	push rdi
	1355	pxor xmm0, xmm0
	1356
	1357	; verical DWT to work buffer, level 1
	1358	mov rsi, [rsp + 8] ; src
	1359	mov rdi, [rsp + 16] ; dst hi
	1360	lea rdi, [rdi + 64 * 32 * 2] ; dst hi
	1361	mov rdx, [rsp + 16] ; dst lo
	1362	call rfx_dwt_2d_encode_block_verti_8_64
	1363
	1364	; horizontal DWT to out buffer, level 1, part 1
	1365	xor rax, rax
	1366	mov rdx, [rsp]
	1367	mov al, [rdx + 4]
	1368	and al, 0xF
	1369	call set_quants_hi
	1370	mov rsi, [rsp + 16] ; src
	1371	mov rdi, [rsp + 24] ; dst hi - HL1
	1372	mov rdx, [rsp + 24] ; dst lo - LL1
	1373	lea rdx, [rdx + 32 * 32 * 6] ; dst lo - LL1
	1374	call rfx_dwt_2d_encode_block_horiz_16_64_no_lo
	1375
	1376	; horizontal DWT to out buffer, level 1, part 2
	1377	xor rax, rax
	1378	mov rdx, [rsp]
	1379	mov al, [rdx + 4]
	1380	shr al, 4
	1381	call set_quants_hi
	1382	xor rax, rax
	1383	mov rdx, [rsp]
	1384	mov al, [rdx + 3]
	1385	shr al, 4
	1386	call set_quants_lo
	1387	mov rsi, [rsp + 16] ; src
	1388	lea rsi, [rsi + 64 * 32 * 2] ; src
	1389	mov rdi, [rsp + 24] ; dst hi - HH1
	1390	lea rdi, [rdi + 32 * 32 * 4] ; dst hi - HH1
	1391	mov rdx, [rsp + 24] ; dst lo - LH1
	1392	lea rdx, [rdx + 32 * 32 * 2] ; dst lo - LH1
	1393	call rfx_dwt_2d_encode_block_horiz_16_64
	1394
	1395	; verical DWT to work buffer, level 2
	1396	mov rsi, [rsp + 24] ; src
	1397	lea rsi, [rsi + 32 * 32 * 6] ; src
	1398	mov rdi, [rsp + 16] ; dst hi
	1399	lea rdi, [rdi + 32 * 16 * 2] ; dst hi
	1400	mov rdx, [rsp + 16] ; dst lo
	1401	call rfx_dwt_2d_encode_block_verti_16_32
	1402
	1403	; horizontal DWT to out buffer, level 2, part 1
	1404	xor rax, rax
	1405	mov rdx, [rsp]
	1406	mov al, [rdx + 2]
	1407	shr al, 4
	1408	call set_quants_hi
	1409	mov rsi, [rsp + 16] ; src
	1410	; 32 * 32 * 6 + 16 * 16 * 0 = 6144
	1411	mov rdi, [rsp + 24] ; dst hi - HL2
	1412	lea rdi, [rdi + 6144] ; dst hi - HL2
	1413	; 32 * 32 * 6 + 16 * 16 * 6 = 7680
	1414	mov rdx, [rsp + 24] ; dst lo - LL2
	1415	lea rdx, [rdx + 7680] ; dst lo - LL2
	1416	call rfx_dwt_2d_encode_block_horiz_16_32_no_lo
	1417
	1418	; horizontal DWT to out buffer, level 2, part 2
	1419	xor rax, rax
	1420	mov rdx, [rsp]
	1421	mov al, [rdx + 3]
	1422	and al, 0xF
	1423	call set_quants_hi
	1424	xor rax, rax
	1425	mov rdx, [rsp]
	1426	mov al, [rdx + 2]
	1427	and al, 0xF
	1428	call set_quants_lo
	1429	mov rsi, [rsp + 16] ; src
	1430	lea rsi, [rsi + 32 * 16 * 2] ; src
	1431	; 32 * 32 * 6 + 16 * 16 * 4 = 7168
	1432	mov rdi, [rsp + 24] ; dst hi - HH2
	1433	lea rdi, [rdi + 7168] ; dst hi - HH2
	1434	; 32 * 32 * 6 + 16 * 16 * 2 = 6656
	1435	mov rdx, [rsp + 24] ; dst lo - LH2
	1436	lea rdx, [rdx + 6656] ; dst lo - LH2
	1437	call rfx_dwt_2d_encode_block_horiz_16_32
	1438
	1439	; verical DWT to work buffer, level 3
	1440	; 32 * 32 * 6 + 16 * 16 * 6 = 7680
	1441	mov rsi, [rsp + 24] ; src
	1442	lea rsi, [rsi + 7680] ; src
	1443	mov rdi, [rsp + 16] ; dst hi
	1444	lea rdi, [rdi + 16 * 8 * 2] ; dst hi
	1445	mov rdx, [rsp + 16] ; dst lo
	1446	call rfx_dwt_2d_encode_block_verti_16_16
	1447
	1448	; horizontal DWT to out buffer, level 3, part 1
	1449	xor rax, rax
	1450	mov rdx, [rsp]
	1451	mov al, [rdx + 1]
	1452	and al, 0xF
	1453	call set_quants_hi
	1454	xor rax, rax
	1455	mov rdx, [rsp]
	1456	mov al, [rdx + 0]
	1457	and al, 0xF
	1458	call set_quants_lo
	1459	mov rsi, [rsp + 16] ; src
	1460	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 0 = 7680
	1461	mov rdi, [rsp + 24] ; dst hi - HL3
	1462	lea rdi, [rdi + 7680] ; dst hi - HL3
	1463	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 6 = 8064
	1464	mov rdx, [rsp + 24] ; dst lo - LL3
	1465	lea rdx, [rdx + 8064] ; dst lo - LL3
	1466	call rfx_dwt_2d_encode_block_horiz_16_16
	1467
	1468	; horizontal DWT to out buffer, level 3, part 2
	1469	xor rax, rax
	1470	mov rdx, [rsp]
	1471	mov al, [rdx + 1]
	1472	shr al, 4
	1473	call set_quants_hi
	1474	xor rax, rax
	1475	mov rdx, [rsp]
	1476	mov al, [rdx + 0]
	1477	shr al, 4
	1478	call set_quants_lo
	1479	mov rsi, [rsp + 16] ; src
	1480	lea rsi, [rsi + 16 * 8 * 2] ; src
	1481	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 4 = 7936
	1482	mov rdi, [rsp + 24] ; dst hi - HH3
	1483	lea rdi, [rdi + 7936] ; dst hi - HH3
	1484	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 2 = 7808
	1485	mov rdx, [rsp + 24] ; dst lo - LH3
	1486	lea rdx, [rdx + 7808] ; dst lo - LH3
	1487	call rfx_dwt_2d_encode_block_horiz_16_16
	1488
	1489	mov rax, 0
	1490	; restore registers
	1491	pop rdi
	1492	pop rsi
	1493	pop rcx
	1494	pop rdx
	1495	pop rbx
	1496	ret
	1497	align 16
	1498

+1367

-0

librfxcodec/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse41.asm less more

	0	;
	1	;Copyright 2016 Jay Sorg
	2	;
	3	;Permission to use, copy, modify, distribute, and sell this software and its
	4	;documentation for any purpose is hereby granted without fee, provided that
	5	;the above copyright notice appear in all copies and that both that
	6	;copyright notice and this permission notice appear in supporting
	7	;documentation.
	8	;
	9	;The above copyright notice and this permission notice shall be included in
	10	;all copies or substantial portions of the Software.
	11	;
	12	;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	13	;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	14	;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	15	;OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	16	;AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	17	;CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	18	;
	19	;amd64 asm dwt
	20
	21	section .data
	22	align 16
	23	cw128 times 8 dw 128
	24	cdFFFF times 4 dd 65535
	25	; these are 1 << (factor - 1) 0 to 15 is factor
	26	cwa0 times 8 dw 0 ; 0
	27	cwa1 times 8 dw 1 ; 1
	28	cwa2 times 8 dw 2 ; 2
	29	cwa4 times 8 dw 4 ; 3
	30	cwa8 times 8 dw 8 ; 4
	31	cwa16 times 8 dw 16 ; 5
	32	cwa32 times 8 dw 32 ; 6
	33	cwa64 times 8 dw 64 ; 7
	34	cwa128 times 8 dw 128 ; 8
	35	cwa256 times 8 dw 256 ; 9
	36	cwa512 times 8 dw 512 ; 10
	37	cwa1024 times 8 dw 1024 ; 11
	38	cwa2048 times 8 dw 2048 ; 12
	39	cwa4096 times 8 dw 4096 ; 13
	40	cwa8192 times 8 dw 8192 ; 14
	41	cwa16384 times 8 dw 16384 ; 15
	42
	43	section .text
	44
	45	%macro PROC 1
	46	align 16
	47	global %1
	48	%1:
	49	%endmacro
	50
	51	;******************************************************************************
	52	; source 16 bit signed, 16 pixel width
	53	rfx_dwt_2d_encode_block_horiz_16_16:
	54	mov ecx, 8
	55	loop1a:
	56	; pre / post
	57	movdqa xmm1, [rsi] ; src[2n]
	58	movdqa xmm2, [rsi + 16]
	59	movdqa xmm6, xmm1
	60	movdqa xmm7, xmm2
	61	pand xmm1, [rel cdFFFF]
	62	pand xmm2, [rel cdFFFF]
	63	packusdw xmm1, xmm2
	64	movdqa xmm2, xmm6 ; src[2n + 1]
	65	movdqa xmm3, xmm7
	66	psrldq xmm2, 2
	67	psrldq xmm3, 2
	68	pand xmm2, [rel cdFFFF]
	69	pand xmm3, [rel cdFFFF]
	70	packusdw xmm2, xmm3
	71	movdqa xmm3, xmm6 ; src[2n + 2]
	72	movdqa xmm4, xmm7
	73	psrldq xmm3, 4
	74	psrldq xmm4, 4
	75	movd eax, xmm7
	76	movd xmm5, eax
	77	pslldq xmm5, 12
	78	por xmm3, xmm5
	79	movdqa xmm5, xmm7
	80	psrldq xmm5, 12
	81	pslldq xmm5, 12
	82	por xmm4, xmm5
	83	pand xmm3, [rel cdFFFF]
	84	pand xmm4, [rel cdFFFF]
	85	packusdw xmm3, xmm4
	86	movdqa xmm4, xmm1
	87	movdqa xmm5, xmm2
	88	movdqa xmm6, xmm3
	89	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	90	paddw xmm4, xmm6
	91	psraw xmm4, 1
	92	psubw xmm5, xmm4
	93	psraw xmm5, 1
	94	movdqa xmm6, xmm5 ; out hi
	95	paddw xmm6, xmm8
	96	psraw xmm6, xmm9
	97	movdqa [rdi], xmm6
	98	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	99	movdqa xmm7, xmm5
	100	movd eax, xmm7
	101	pslldq xmm7, 2
	102	and eax, 0xFFFF
	103	movd xmm6, eax
	104	por xmm7, xmm6
	105	paddw xmm5, xmm7
	106	psraw xmm5, 1
	107	paddw xmm5, xmm1
	108
	109	movdqa xmm6, xmm5 ; out lo
	110	paddw xmm6, xmm10
	111	psraw xmm6, xmm11
	112	movdqa [rdx], xmm6
	113
	114	; move right
	115	lea rsi, [rsi + 16 * 2]
	116	lea rdi, [rdi + 8 * 2]
	117	lea rdx, [rdx + 8 * 2]
	118
	119	; move left
	120	lea rsi, [rsi - 16 * 2]
	121	lea rdi, [rdi - 8 * 2]
	122	lea rdx, [rdx - 8 * 2]
	123
	124	; move down
	125	lea rsi, [rsi + 16 * 2]
	126	lea rdi, [rdi + 8 * 2]
	127	lea rdx, [rdx + 8 * 2]
	128
	129	dec ecx
	130	jnz loop1a
	131
	132	ret
	133
	134	;******************************************************************************
	135	; source 16 bit signed, 16 pixel width
	136	rfx_dwt_2d_encode_block_verti_16_16:
	137	mov ecx, 2
	138	loop1b:
	139	; pre
	140	movdqa xmm1, [rsi] ; src[2n]
	141	movdqa xmm2, [rsi + 16 * 2] ; src[2n + 1]
	142	movdqa xmm3, [rsi + 16 * 2 * 2] ; src[2n + 2]
	143	movdqa xmm4, xmm1
	144	movdqa xmm5, xmm2
	145	movdqa xmm6, xmm3
	146	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	147	paddw xmm4, xmm6
	148	psraw xmm4, 1
	149	psubw xmm5, xmm4
	150	psraw xmm5, 1
	151	movdqa [rdi], xmm5 ; out hi
	152	movdqa xmm6, xmm5 ; save hi
	153	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	154	paddw xmm5, xmm1
	155	movdqa [rdx], xmm5 ; out lo
	156	movdqa xmm7, xmm6 ; save hi
	157	; move down
	158	lea rsi, [rsi + 16 * 2 * 2] ; 2 rows
	159	lea rdi, [rdi + 16 * 2] ; 1 row
	160	lea rdx, [rdx + 16 * 2] ; 1 row
	161
	162	; loop
	163	shl ecx, 16
	164	mov cx, 6
	165	loop2b:
	166	movdqa xmm1, xmm3 ; src[2n]
	167	movdqa xmm2, [rsi + 16 * 2] ; src[2n + 1]
	168	movdqa xmm3, [rsi + 16 * 2 * 2] ; src[2n + 2]
	169	movdqa xmm4, xmm1
	170	movdqa xmm5, xmm2
	171	movdqa xmm6, xmm3
	172	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	173	paddw xmm4, xmm6
	174	psraw xmm4, 1
	175	psubw xmm5, xmm4
	176	psraw xmm5, 1
	177	movdqa [rdi], xmm5 ; out hi
	178	movdqa xmm6, xmm5 ; save hi
	179	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	180	paddw xmm5, xmm7
	181	psraw xmm5, 1
	182	paddw xmm5, xmm1
	183	movdqa [rdx], xmm5 ; out lo
	184	movdqa xmm7, xmm6 ; save hi
	185	; move down
	186	lea rsi, [rsi + 16 * 2 * 2] ; 2 rows
	187	lea rdi, [rdi + 16 * 2] ; 1 row
	188	lea rdx, [rdx + 16 * 2] ; 1 row
	189
	190	dec cx
	191	jnz loop2b
	192	shr ecx, 16
	193
	194	; post
	195	movdqa xmm1, xmm3 ; src[2n]
	196	movdqa xmm2, [rsi + 16 * 2] ; src[2n + 1]
	197	movdqa xmm4, xmm1
	198	movdqa xmm5, xmm2
	199	movdqa xmm6, xmm3
	200	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	201	paddw xmm4, xmm6
	202	psraw xmm4, 1
	203	psubw xmm5, xmm4
	204	psraw xmm5, 1
	205	movdqa [rdi], xmm5 ; out hi
	206	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	207	paddw xmm5, xmm7
	208	psraw xmm5, 1
	209	paddw xmm5, xmm1
	210	movdqa [rdx], xmm5 ; out lo
	211	; move down
	212	lea rsi, [rsi + 16 * 2 * 2] ; 2 row
	213	lea rdi, [rdi + 16 * 2] ; 1 row
	214	lea rdx, [rdx + 16 * 2] ; 1 row
	215
	216	; move up
	217	lea rsi, [rsi - 16 * 16 * 2]
	218	lea rdi, [rdi - 8 * 16 * 2]
	219	lea rdx, [rdx - 8 * 16 * 2]
	220
	221	; move right
	222	lea rsi, [rsi + 16]
	223	lea rdi, [rdi + 16]
	224	lea rdx, [rdx + 16]
	225
	226	dec ecx
	227	jnz loop1b
	228
	229	ret
	230
	231	;******************************************************************************
	232	; source 16 bit signed, 32 pixel width
	233	rfx_dwt_2d_encode_block_horiz_16_32:
	234	mov ecx, 16
	235	loop1c:
	236	; pre
	237	movdqa xmm1, [rsi] ; src[2n]
	238	movdqa xmm2, [rsi + 16]
	239	movdqa xmm6, xmm1
	240	movdqa xmm7, xmm2
	241	pand xmm1, [rel cdFFFF]
	242	pand xmm2, [rel cdFFFF]
	243	packusdw xmm1, xmm2
	244	movdqa xmm2, xmm6 ; src[2n + 1]
	245	movdqa xmm3, xmm7
	246	psrldq xmm2, 2
	247	psrldq xmm3, 2
	248	pand xmm2, [rel cdFFFF]
	249	pand xmm3, [rel cdFFFF]
	250	packusdw xmm2, xmm3
	251	movdqa xmm3, xmm6 ; src[2n + 2]
	252	movdqa xmm4, xmm7
	253	psrldq xmm3, 4
	254	psrldq xmm4, 4
	255	movd eax, xmm7
	256	movd xmm5, eax
	257	pslldq xmm5, 12
	258	por xmm3, xmm5
	259	mov eax, [rsi + 32]
	260	movd xmm5, eax
	261	pslldq xmm5, 12
	262	por xmm4, xmm5
	263	pand xmm3, [rel cdFFFF]
	264	pand xmm4, [rel cdFFFF]
	265	packusdw xmm3, xmm4
	266	movdqa xmm4, xmm1
	267	movdqa xmm5, xmm2
	268	movdqa xmm6, xmm3
	269	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	270	paddw xmm4, xmm6
	271	psraw xmm4, 1
	272	psubw xmm5, xmm4
	273	psraw xmm5, 1
	274
	275	movdqa xmm6, xmm5 ; out hi
	276	paddw xmm6, xmm8
	277	psraw xmm6, xmm9
	278	movdqa [rdi], xmm6
	279	movdqa xmm2, xmm5 ; save hi
	280
	281	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	282	movdqa xmm7, xmm5
	283	movd eax, xmm7
	284	pslldq xmm7, 2
	285	and eax, 0xFFFF
	286	movd xmm6, eax
	287	por xmm7, xmm6
	288	paddw xmm5, xmm7
	289	psraw xmm5, 1
	290	paddw xmm5, xmm1
	291
	292	psrldq xmm2, 14
	293	movd ebx, xmm2 ; save hi
	294
	295	movdqa xmm6, xmm5 ; out lo
	296	paddw xmm6, xmm10
	297	psraw xmm6, xmm11
	298	movdqa [rdx], xmm6
	299
	300	; move right
	301	lea rsi, [rsi + 16 * 2]
	302	lea rdi, [rdi + 8 * 2]
	303	lea rdx, [rdx + 8 * 2]
	304
	305	; post
	306	movdqa xmm1, [rsi] ; src[2n]
	307	movdqa xmm2, [rsi + 16]
	308	movdqa xmm6, xmm1
	309	movdqa xmm7, xmm2
	310	pand xmm1, [rel cdFFFF]
	311	pand xmm2, [rel cdFFFF]
	312	packusdw xmm1, xmm2
	313	movdqa xmm2, xmm6 ; src[2n + 1]
	314	movdqa xmm3, xmm7
	315	psrldq xmm2, 2
	316	psrldq xmm3, 2
	317	pand xmm2, [rel cdFFFF]
	318	pand xmm3, [rel cdFFFF]
	319	packusdw xmm2, xmm3
	320	movdqa xmm3, xmm6 ; src[2n + 2]
	321	movdqa xmm4, xmm7
	322	psrldq xmm3, 4
	323	psrldq xmm4, 4
	324	movd eax, xmm7
	325	movd xmm5, eax
	326	pslldq xmm5, 12
	327	por xmm3, xmm5
	328	movdqa xmm5, xmm7
	329	psrldq xmm5, 12
	330	pslldq xmm5, 12
	331	por xmm4, xmm5
	332	pand xmm3, [rel cdFFFF]
	333	pand xmm4, [rel cdFFFF]
	334	packusdw xmm3, xmm4
	335	movdqa xmm4, xmm1
	336	movdqa xmm5, xmm2
	337	movdqa xmm6, xmm3
	338	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	339	paddw xmm4, xmm6
	340	psraw xmm4, 1
	341	psubw xmm5, xmm4
	342	psraw xmm5, 1
	343
	344	movdqa xmm6, xmm5 ; out hi
	345	paddw xmm6, xmm8
	346	psraw xmm6, xmm9
	347	movdqa [rdi], xmm6
	348
	349	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	350	movdqa xmm7, xmm5
	351	pslldq xmm7, 2
	352	movd xmm6, ebx
	353	por xmm7, xmm6
	354	paddw xmm5, xmm7
	355	psraw xmm5, 1
	356	paddw xmm5, xmm1
	357
	358	movdqa xmm6, xmm5 ; out lo
	359	paddw xmm6, xmm10
	360	psraw xmm6, xmm11
	361	movdqa [rdx], xmm6
	362
	363	; move right
	364	lea rsi, [rsi + 16 * 2]
	365	lea rdi, [rdi + 8 * 2]
	366	lea rdx, [rdx + 8 * 2]
	367
	368	; move left
	369	lea rsi, [rsi - 32 * 2]
	370	lea rdi, [rdi - 16 * 2]
	371	lea rdx, [rdx - 16 * 2]
	372
	373	; move down
	374	lea rsi, [rsi + 32 * 2]
	375	lea rdi, [rdi + 16 * 2]
	376	lea rdx, [rdx + 16 * 2]
	377
	378	dec ecx
	379	jnz loop1c
	380
	381	ret
	382
	383	;******************************************************************************
	384	; source 16 bit signed, 32 pixel width
	385	rfx_dwt_2d_encode_block_horiz_16_32_no_lo:
	386	mov ecx, 16
	387	loop1c1:
	388	; pre
	389	movdqa xmm1, [rsi] ; src[2n]
	390	movdqa xmm2, [rsi + 16]
	391	movdqa xmm6, xmm1
	392	movdqa xmm7, xmm2
	393	pand xmm1, [rel cdFFFF]
	394	pand xmm2, [rel cdFFFF]
	395	packusdw xmm1, xmm2
	396	movdqa xmm2, xmm6 ; src[2n + 1]
	397	movdqa xmm3, xmm7
	398	psrldq xmm2, 2
	399	psrldq xmm3, 2
	400	pand xmm2, [rel cdFFFF]
	401	pand xmm3, [rel cdFFFF]
	402	packusdw xmm2, xmm3
	403	movdqa xmm3, xmm6 ; src[2n + 2]
	404	movdqa xmm4, xmm7
	405	psrldq xmm3, 4
	406	psrldq xmm4, 4
	407	movd eax, xmm7
	408	movd xmm5, eax
	409	pslldq xmm5, 12
	410	por xmm3, xmm5
	411	mov eax, [rsi + 32]
	412	movd xmm5, eax
	413	pslldq xmm5, 12
	414	por xmm4, xmm5
	415	pand xmm3, [rel cdFFFF]
	416	pand xmm4, [rel cdFFFF]
	417	packusdw xmm3, xmm4
	418	movdqa xmm4, xmm1
	419	movdqa xmm5, xmm2
	420	movdqa xmm6, xmm3
	421	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	422	paddw xmm4, xmm6
	423	psraw xmm4, 1
	424	psubw xmm5, xmm4
	425	psraw xmm5, 1
	426
	427	movdqa xmm6, xmm5 ; out hi
	428	paddw xmm6, xmm8
	429	psraw xmm6, xmm9
	430	movdqa [rdi], xmm6
	431	movdqa xmm2, xmm5 ; save hi
	432
	433	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	434	movdqa xmm7, xmm5
	435	movd eax, xmm7
	436	pslldq xmm7, 2
	437	and eax, 0xFFFF
	438	movd xmm6, eax
	439	por xmm7, xmm6
	440	paddw xmm5, xmm7
	441	psraw xmm5, 1
	442	paddw xmm5, xmm1
	443
	444	psrldq xmm2, 14
	445	movd ebx, xmm2 ; save hi
	446
	447	movdqa [rdx], xmm5 ; out lo
	448
	449	; move right
	450	lea rsi, [rsi + 16 * 2]
	451	lea rdi, [rdi + 8 * 2]
	452	lea rdx, [rdx + 8 * 2]
	453
	454	; post
	455	movdqa xmm1, [rsi] ; src[2n]
	456	movdqa xmm2, [rsi + 16]
	457	movdqa xmm6, xmm1
	458	movdqa xmm7, xmm2
	459	pand xmm1, [rel cdFFFF]
	460	pand xmm2, [rel cdFFFF]
	461	packusdw xmm1, xmm2
	462	movdqa xmm2, xmm6 ; src[2n + 1]
	463	movdqa xmm3, xmm7
	464	psrldq xmm2, 2
	465	psrldq xmm3, 2
	466	pand xmm2, [rel cdFFFF]
	467	pand xmm3, [rel cdFFFF]
	468	packusdw xmm2, xmm3
	469	movdqa xmm3, xmm6 ; src[2n + 2]
	470	movdqa xmm4, xmm7
	471	psrldq xmm3, 4
	472	psrldq xmm4, 4
	473	movd eax, xmm7
	474	movd xmm5, eax
	475	pslldq xmm5, 12
	476	por xmm3, xmm5
	477	movdqa xmm5, xmm7
	478	psrldq xmm5, 12
	479	pslldq xmm5, 12
	480	por xmm4, xmm5
	481	pand xmm3, [rel cdFFFF]
	482	pand xmm4, [rel cdFFFF]
	483	packusdw xmm3, xmm4
	484	movdqa xmm4, xmm1
	485	movdqa xmm5, xmm2
	486	movdqa xmm6, xmm3
	487	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	488	paddw xmm4, xmm6
	489	psraw xmm4, 1
	490	psubw xmm5, xmm4
	491	psraw xmm5, 1
	492
	493	movdqa xmm6, xmm5 ; out hi
	494	paddw xmm6, xmm8
	495	psraw xmm6, xmm9
	496	movdqa [rdi], xmm6
	497
	498	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	499	movdqa xmm7, xmm5
	500	pslldq xmm7, 2
	501	movd xmm6, ebx
	502	por xmm7, xmm6
	503	paddw xmm5, xmm7
	504	psraw xmm5, 1
	505	paddw xmm5, xmm1
	506
	507	movdqa [rdx], xmm5 ; out lo
	508
	509	; move right
	510	lea rsi, [rsi + 16 * 2]
	511	lea rdi, [rdi + 8 * 2]
	512	lea rdx, [rdx + 8 * 2]
	513
	514	; move left
	515	lea rsi, [rsi - 32 * 2]
	516	lea rdi, [rdi - 16 * 2]
	517	lea rdx, [rdx - 16 * 2]
	518
	519	; move down
	520	lea rsi, [rsi + 32 * 2]
	521	lea rdi, [rdi + 16 * 2]
	522	lea rdx, [rdx + 16 * 2]
	523
	524	dec ecx
	525	jnz loop1c1
	526
	527	ret
	528
	529	;******************************************************************************
	530	; source 16 bit signed, 32 pixel width
	531	rfx_dwt_2d_encode_block_verti_16_32:
	532	mov ecx, 4
	533	loop1d:
	534	; pre
	535	movdqa xmm1, [rsi] ; src[2n]
	536	movdqa xmm2, [rsi + 32 * 2] ; src[2n + 1]
	537	movdqa xmm3, [rsi + 32 * 2 * 2] ; src[2n + 2]
	538	movdqa xmm4, xmm1
	539	movdqa xmm5, xmm2
	540	movdqa xmm6, xmm3
	541	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	542	paddw xmm4, xmm6
	543	psraw xmm4, 1
	544	psubw xmm5, xmm4
	545	psraw xmm5, 1
	546	movdqa [rdi], xmm5 ; out hi
	547	movdqa xmm6, xmm5 ; save hi
	548	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	549	paddw xmm5, xmm1
	550	movdqa [rdx], xmm5 ; out lo
	551	movdqa xmm7, xmm6 ; save hi
	552	; move down
	553	lea rsi, [rsi + 32 * 2 * 2] ; 2 rows
	554	lea rdi, [rdi + 32 * 2] ; 1 row
	555	lea rdx, [rdx + 32 * 2] ; 1 row
	556
	557	; loop
	558	shl ecx, 16
	559	mov cx, 14
	560	loop2d:
	561	movdqa xmm1, xmm3 ; src[2n]
	562	movdqa xmm2, [rsi + 32 * 2] ; src[2n + 1]
	563	movdqa xmm3, [rsi + 32 * 2 * 2] ; src[2n + 2]
	564	movdqa xmm4, xmm1
	565	movdqa xmm5, xmm2
	566	movdqa xmm6, xmm3
	567	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	568	paddw xmm4, xmm6
	569	psraw xmm4, 1
	570	psubw xmm5, xmm4
	571	psraw xmm5, 1
	572	movdqa [rdi], xmm5 ; out hi
	573	movdqa xmm6, xmm5 ; save hi
	574	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	575	paddw xmm5, xmm7
	576	psraw xmm5, 1
	577	paddw xmm5, xmm1
	578	movdqa [rdx], xmm5 ; out lo
	579	movdqa xmm7, xmm6 ; save hi
	580	; move down
	581	lea rsi, [rsi + 32 * 2 * 2] ; 2 rows
	582	lea rdi, [rdi + 32 * 2] ; 1 row
	583	lea rdx, [rdx + 32 * 2] ; 1 row
	584
	585	dec cx
	586	jnz loop2d
	587	shr ecx, 16
	588
	589	; post
	590	movdqa xmm1, xmm3 ; src[2n]
	591	movdqa xmm2, [rsi + 32 * 2] ; src[2n + 1]
	592	movdqa xmm4, xmm1
	593	movdqa xmm5, xmm2
	594	movdqa xmm6, xmm3
	595	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	596	paddw xmm4, xmm6
	597	psraw xmm4, 1
	598	psubw xmm5, xmm4
	599	psraw xmm5, 1
	600	movdqa [rdi], xmm5 ; out hi
	601	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	602	paddw xmm5, xmm7
	603	psraw xmm5, 1
	604	paddw xmm5, xmm1
	605	movdqa [rdx], xmm5 ; out lo
	606	; move down
	607	lea rsi, [rsi + 32 * 2 * 2] ; 2 row
	608	lea rdi, [rdi + 32 * 2] ; 1 row
	609	lea rdx, [rdx + 32 * 2] ; 1 row
	610
	611	; move up
	612	lea rsi, [rsi - 32 * 32 * 2]
	613	lea rdi, [rdi - 16 * 32 * 2]
	614	lea rdx, [rdx - 16 * 32 * 2]
	615
	616	; move right
	617	lea rsi, [rsi + 16]
	618	lea rdi, [rdi + 16]
	619	lea rdx, [rdx + 16]
	620
	621	dec ecx
	622	jnz loop1d
	623
	624	ret
	625
	626	;******************************************************************************
	627	; source 16 bit signed, 64 pixel width
	628	rfx_dwt_2d_encode_block_horiz_16_64:
	629	mov ecx, 32
	630	loop1e:
	631	; pre
	632	movdqa xmm1, [rsi] ; src[2n]
	633	movdqa xmm2, [rsi + 16]
	634	movdqa xmm6, xmm1
	635	movdqa xmm7, xmm2
	636	pand xmm1, [rel cdFFFF]
	637	pand xmm2, [rel cdFFFF]
	638	packusdw xmm1, xmm2
	639	movdqa xmm2, xmm6 ; src[2n + 1]
	640	movdqa xmm3, xmm7
	641	psrldq xmm2, 2
	642	psrldq xmm3, 2
	643	pand xmm2, [rel cdFFFF]
	644	pand xmm3, [rel cdFFFF]
	645	packusdw xmm2, xmm3
	646	movdqa xmm3, xmm6 ; src[2n + 2]
	647	movdqa xmm4, xmm7
	648	psrldq xmm3, 4
	649	psrldq xmm4, 4
	650	movd eax, xmm7
	651	movd xmm5, eax
	652	pslldq xmm5, 12
	653	por xmm3, xmm5
	654	mov eax, [rsi + 32]
	655	movd xmm5, eax
	656	pslldq xmm5, 12
	657	por xmm4, xmm5
	658	pand xmm3, [rel cdFFFF]
	659	pand xmm4, [rel cdFFFF]
	660	packusdw xmm3, xmm4
	661	movdqa xmm4, xmm1
	662	movdqa xmm5, xmm2
	663	movdqa xmm6, xmm3
	664	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	665	paddw xmm4, xmm6
	666	psraw xmm4, 1
	667	psubw xmm5, xmm4
	668	psraw xmm5, 1
	669
	670	movdqa xmm6, xmm5 ; out hi
	671	paddw xmm6, xmm8
	672	psraw xmm6, xmm9
	673	movdqa [rdi], xmm6
	674	movdqa xmm2, xmm5 ; save hi
	675
	676	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	677	movdqa xmm7, xmm5
	678	movd eax, xmm7
	679	pslldq xmm7, 2
	680	and eax, 0xFFFF
	681	movd xmm6, eax
	682	por xmm7, xmm6
	683	paddw xmm5, xmm7
	684	psraw xmm5, 1
	685	paddw xmm5, xmm1
	686
	687	psrldq xmm2, 14
	688	movd ebx, xmm2 ; save hi
	689
	690	movdqa xmm6, xmm5 ; out lo
	691	paddw xmm6, xmm10
	692	psraw xmm6, xmm11
	693	movdqa [rdx], xmm6
	694
	695	; move right
	696	lea rsi, [rsi + 16 * 2]
	697	lea rdi, [rdi + 8 * 2]
	698	lea rdx, [rdx + 8 * 2]
	699
	700	; loop
	701	shl ecx, 16
	702	mov cx, 2
	703	loop2e:
	704	movdqa xmm1, [rsi] ; src[2n]
	705	movdqa xmm2, [rsi + 16]
	706	movdqa xmm6, xmm1
	707	movdqa xmm7, xmm2
	708	pand xmm1, [rel cdFFFF]
	709	pand xmm2, [rel cdFFFF]
	710	packusdw xmm1, xmm2
	711	movdqa xmm2, xmm6 ; src[2n + 1]
	712	movdqa xmm3, xmm7
	713	psrldq xmm2, 2
	714	psrldq xmm3, 2
	715	pand xmm2, [rel cdFFFF]
	716	pand xmm3, [rel cdFFFF]
	717	packusdw xmm2, xmm3
	718	movdqa xmm3, xmm6 ; src[2n + 2]
	719	movdqa xmm4, xmm7
	720	psrldq xmm3, 4
	721	psrldq xmm4, 4
	722	movd eax, xmm7
	723	movd xmm5, eax
	724	pslldq xmm5, 12
	725	por xmm3, xmm5
	726	mov eax, [rsi + 32]
	727	movd xmm5, eax
	728	pslldq xmm5, 12
	729	por xmm4, xmm5
	730	pand xmm3, [rel cdFFFF]
	731	pand xmm4, [rel cdFFFF]
	732	packusdw xmm3, xmm4
	733	movdqa xmm4, xmm1
	734	movdqa xmm5, xmm2
	735	movdqa xmm6, xmm3
	736	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	737	paddw xmm4, xmm6
	738	psraw xmm4, 1
	739	psubw xmm5, xmm4
	740	psraw xmm5, 1
	741
	742	movdqa xmm6, xmm5 ; out hi
	743	paddw xmm6, xmm8
	744	psraw xmm6, xmm9
	745	movdqa [rdi], xmm6
	746	movdqa xmm2, xmm5 ; save hi
	747
	748	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	749	movdqa xmm7, xmm5
	750	pslldq xmm7, 2
	751	movd xmm6, ebx
	752	por xmm7, xmm6
	753	paddw xmm5, xmm7
	754	psraw xmm5, 1
	755	paddw xmm5, xmm1
	756
	757	psrldq xmm2, 14
	758	movd ebx, xmm2 ; save hi
	759
	760	movdqa xmm6, xmm5 ; out lo
	761	paddw xmm6, xmm10
	762	psraw xmm6, xmm11
	763	movdqa [rdx], xmm6
	764
	765	; move right
	766	lea rsi, [rsi + 16 * 2]
	767	lea rdi, [rdi + 8 * 2]
	768	lea rdx, [rdx + 8 * 2]
	769
	770	dec cx
	771	jnz loop2e
	772	shr ecx, 16
	773
	774	; post
	775	movdqa xmm1, [rsi] ; src[2n]
	776	movdqa xmm2, [rsi + 16]
	777	movdqa xmm6, xmm1
	778	movdqa xmm7, xmm2
	779	pand xmm1, [rel cdFFFF]
	780	pand xmm2, [rel cdFFFF]
	781	packusdw xmm1, xmm2
	782	movdqa xmm2, xmm6 ; src[2n + 1]
	783	movdqa xmm3, xmm7
	784	psrldq xmm2, 2
	785	psrldq xmm3, 2
	786	pand xmm2, [rel cdFFFF]
	787	pand xmm3, [rel cdFFFF]
	788	packusdw xmm2, xmm3
	789	movdqa xmm3, xmm6 ; src[2n + 2]
	790	movdqa xmm4, xmm7
	791	psrldq xmm3, 4
	792	psrldq xmm4, 4
	793	movd eax, xmm7
	794	movd xmm5, eax
	795	pslldq xmm5, 12
	796	por xmm3, xmm5
	797	movdqa xmm5, xmm7
	798	psrldq xmm5, 12
	799	pslldq xmm5, 12
	800	por xmm4, xmm5
	801	pand xmm3, [rel cdFFFF]
	802	pand xmm4, [rel cdFFFF]
	803	packusdw xmm3, xmm4
	804	movdqa xmm4, xmm1
	805	movdqa xmm5, xmm2
	806	movdqa xmm6, xmm3
	807	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	808	paddw xmm4, xmm6
	809	psraw xmm4, 1
	810	psubw xmm5, xmm4
	811	psraw xmm5, 1
	812
	813	movdqa xmm6, xmm5 ; out hi
	814	paddw xmm6, xmm8
	815	psraw xmm6, xmm9
	816	movdqa [rdi], xmm6
	817
	818	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	819	movdqa xmm7, xmm5
	820	pslldq xmm7, 2
	821	movd xmm6, ebx
	822	por xmm7, xmm6
	823	paddw xmm5, xmm7
	824	psraw xmm5, 1
	825	paddw xmm5, xmm1
	826
	827	movdqa xmm6, xmm5 ; out lo
	828	paddw xmm6, xmm10
	829	psraw xmm6, xmm11
	830	movdqa [rdx], xmm6
	831
	832	; move right
	833	lea rsi, [rsi + 16 * 2]
	834	lea rdi, [rdi + 8 * 2]
	835	lea rdx, [rdx + 8 * 2]
	836
	837	; move left
	838	lea rsi, [rsi - 64 * 2]
	839	lea rdi, [rdi - 32 * 2]
	840	lea rdx, [rdx - 32 * 2]
	841
	842	; move down
	843	lea rsi, [rsi + 64 * 2]
	844	lea rdi, [rdi + 32 * 2]
	845	lea rdx, [rdx + 32 * 2]
	846
	847	dec ecx
	848	jnz loop1e
	849
	850	ret
	851
	852	;******************************************************************************
	853	; source 16 bit signed, 64 pixel width
	854	rfx_dwt_2d_encode_block_horiz_16_64_no_lo:
	855	mov ecx, 32
	856	loop1e1:
	857	; pre
	858	movdqa xmm1, [rsi] ; src[2n]
	859	movdqa xmm2, [rsi + 16]
	860	movdqa xmm6, xmm1
	861	movdqa xmm7, xmm2
	862	pand xmm1, [rel cdFFFF]
	863	pand xmm2, [rel cdFFFF]
	864	packusdw xmm1, xmm2
	865	movdqa xmm2, xmm6 ; src[2n + 1]
	866	movdqa xmm3, xmm7
	867	psrldq xmm2, 2
	868	psrldq xmm3, 2
	869	pand xmm2, [rel cdFFFF]
	870	pand xmm3, [rel cdFFFF]
	871	packusdw xmm2, xmm3
	872	movdqa xmm3, xmm6 ; src[2n + 2]
	873	movdqa xmm4, xmm7
	874	psrldq xmm3, 4
	875	psrldq xmm4, 4
	876	movd eax, xmm7
	877	movd xmm5, eax
	878	pslldq xmm5, 12
	879	por xmm3, xmm5
	880	mov eax, [rsi + 32]
	881	movd xmm5, eax
	882	pslldq xmm5, 12
	883	por xmm4, xmm5
	884	pand xmm3, [rel cdFFFF]
	885	pand xmm4, [rel cdFFFF]
	886	packusdw xmm3, xmm4
	887	movdqa xmm4, xmm1
	888	movdqa xmm5, xmm2
	889	movdqa xmm6, xmm3
	890	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	891	paddw xmm4, xmm6
	892	psraw xmm4, 1
	893	psubw xmm5, xmm4
	894	psraw xmm5, 1
	895
	896	movdqa xmm6, xmm5 ; out hi
	897	paddw xmm6, xmm8
	898	psraw xmm6, xmm9
	899	movdqa [rdi], xmm6
	900	movdqa xmm2, xmm5 ; save hi
	901
	902	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	903	movdqa xmm7, xmm5
	904	movd eax, xmm7
	905	pslldq xmm7, 2
	906	and eax, 0xFFFF
	907	movd xmm6, eax
	908	por xmm7, xmm6
	909	paddw xmm5, xmm7
	910	psraw xmm5, 1
	911	paddw xmm5, xmm1
	912
	913	psrldq xmm2, 14
	914	movd ebx, xmm2 ; save hi
	915
	916	movdqa [rdx], xmm5 ; out lo
	917
	918	; move right
	919	lea rsi, [rsi + 16 * 2]
	920	lea rdi, [rdi + 8 * 2]
	921	lea rdx, [rdx + 8 * 2]
	922
	923	; loop
	924	shl ecx, 16
	925	mov cx, 2
	926	loop2e1:
	927	movdqa xmm1, [rsi] ; src[2n]
	928	movdqa xmm2, [rsi + 16]
	929	movdqa xmm6, xmm1
	930	movdqa xmm7, xmm2
	931	pand xmm1, [rel cdFFFF]
	932	pand xmm2, [rel cdFFFF]
	933	packusdw xmm1, xmm2
	934	movdqa xmm2, xmm6 ; src[2n + 1]
	935	movdqa xmm3, xmm7
	936	psrldq xmm2, 2
	937	psrldq xmm3, 2
	938	pand xmm2, [rel cdFFFF]
	939	pand xmm3, [rel cdFFFF]
	940	packusdw xmm2, xmm3
	941	movdqa xmm3, xmm6 ; src[2n + 2]
	942	movdqa xmm4, xmm7
	943	psrldq xmm3, 4
	944	psrldq xmm4, 4
	945	movd eax, xmm7
	946	movd xmm5, eax
	947	pslldq xmm5, 12
	948	por xmm3, xmm5
	949	mov eax, [rsi + 32]
	950	movd xmm5, eax
	951	pslldq xmm5, 12
	952	por xmm4, xmm5
	953	pand xmm3, [rel cdFFFF]
	954	pand xmm4, [rel cdFFFF]
	955	packusdw xmm3, xmm4
	956	movdqa xmm4, xmm1
	957	movdqa xmm5, xmm2
	958	movdqa xmm6, xmm3
	959	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	960	paddw xmm4, xmm6
	961	psraw xmm4, 1
	962	psubw xmm5, xmm4
	963	psraw xmm5, 1
	964
	965	movdqa xmm6, xmm5 ; out hi
	966	paddw xmm6, xmm8
	967	psraw xmm6, xmm9
	968	movdqa [rdi], xmm6
	969	movdqa xmm2, xmm5 ; save hi
	970
	971	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	972	movdqa xmm7, xmm5
	973	pslldq xmm7, 2
	974	movd xmm6, ebx
	975	por xmm7, xmm6
	976	paddw xmm5, xmm7
	977	psraw xmm5, 1
	978	paddw xmm5, xmm1
	979
	980	psrldq xmm2, 14
	981	movd ebx, xmm2 ; save hi
	982
	983	movdqa [rdx], xmm5 ; out lo
	984
	985	; move right
	986	lea rsi, [rsi + 16 * 2]
	987	lea rdi, [rdi + 8 * 2]
	988	lea rdx, [rdx + 8 * 2]
	989
	990	dec cx
	991	jnz loop2e1
	992	shr ecx, 16
	993
	994	; post
	995	movdqa xmm1, [rsi] ; src[2n]
	996	movdqa xmm2, [rsi + 16]
	997	movdqa xmm6, xmm1
	998	movdqa xmm7, xmm2
	999	pand xmm1, [rel cdFFFF]
	1000	pand xmm2, [rel cdFFFF]
	1001	packusdw xmm1, xmm2
	1002	movdqa xmm2, xmm6 ; src[2n + 1]
	1003	movdqa xmm3, xmm7
	1004	psrldq xmm2, 2
	1005	psrldq xmm3, 2
	1006	pand xmm2, [rel cdFFFF]
	1007	pand xmm3, [rel cdFFFF]
	1008	packusdw xmm2, xmm3
	1009	movdqa xmm3, xmm6 ; src[2n + 2]
	1010	movdqa xmm4, xmm7
	1011	psrldq xmm3, 4
	1012	psrldq xmm4, 4
	1013	movd eax, xmm7
	1014	movd xmm5, eax
	1015	pslldq xmm5, 12
	1016	por xmm3, xmm5
	1017	movdqa xmm5, xmm7
	1018	psrldq xmm5, 12
	1019	pslldq xmm5, 12
	1020	por xmm4, xmm5
	1021	pand xmm3, [rel cdFFFF]
	1022	pand xmm4, [rel cdFFFF]
	1023	packusdw xmm3, xmm4
	1024	movdqa xmm4, xmm1
	1025	movdqa xmm5, xmm2
	1026	movdqa xmm6, xmm3
	1027	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1028	paddw xmm4, xmm6
	1029	psraw xmm4, 1
	1030	psubw xmm5, xmm4
	1031	psraw xmm5, 1
	1032
	1033	movdqa xmm6, xmm5 ; out hi
	1034	paddw xmm6, xmm8
	1035	psraw xmm6, xmm9
	1036	movdqa [rdi], xmm6
	1037
	1038	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1039	movdqa xmm7, xmm5
	1040	pslldq xmm7, 2
	1041	movd xmm6, ebx
	1042	por xmm7, xmm6
	1043	paddw xmm5, xmm7
	1044	psraw xmm5, 1
	1045	paddw xmm5, xmm1
	1046
	1047	movdqa [rdx], xmm5 ; out lo
	1048
	1049	; move right
	1050	lea rsi, [rsi + 16 * 2]
	1051	lea rdi, [rdi + 8 * 2]
	1052	lea rdx, [rdx + 8 * 2]
	1053
	1054	; move left
	1055	lea rsi, [rsi - 64 * 2]
	1056	lea rdi, [rdi - 32 * 2]
	1057	lea rdx, [rdx - 32 * 2]
	1058
	1059	; move down
	1060	lea rsi, [rsi + 64 * 2]
	1061	lea rdi, [rdi + 32 * 2]
	1062	lea rdx, [rdx + 32 * 2]
	1063
	1064	dec ecx
	1065	jnz loop1e1
	1066
	1067	ret
	1068
	1069	;******************************************************************************
	1070	; source 8 bit unsigned, 64 pixel width
	1071	rfx_dwt_2d_encode_block_verti_8_64:
	1072	mov ecx, 8
	1073	loop1f:
	1074	; pre
	1075	movq xmm1, [rsi] ; src[2n]
	1076	movq xmm2, [rsi + 64 * 1] ; src[2n + 1]
	1077	movq xmm3, [rsi + 64 * 1 * 2] ; src[2n + 2]
	1078	punpcklbw xmm1, xmm0
	1079	punpcklbw xmm2, xmm0
	1080	punpcklbw xmm3, xmm0
	1081	psubw xmm1, [rel cw128]
	1082	psubw xmm2, [rel cw128]
	1083	psubw xmm3, [rel cw128]
	1084	psllw xmm1, 5
	1085	psllw xmm2, 5
	1086	psllw xmm3, 5
	1087	movdqa xmm4, xmm1
	1088	movdqa xmm5, xmm2
	1089	movdqa xmm6, xmm3
	1090	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1091	paddw xmm4, xmm6
	1092	psraw xmm4, 1
	1093	psubw xmm5, xmm4
	1094	psraw xmm5, 1
	1095	movdqa [rdi], xmm5 ; out hi
	1096	movdqa xmm6, xmm5 ; save hi
	1097	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1098	paddw xmm5, xmm1
	1099	movdqa [rdx], xmm5 ; out lo
	1100	movdqa xmm7, xmm6 ; save hi
	1101	; move down
	1102	lea rsi, [rsi + 64 * 1 * 2] ; 2 rows
	1103	lea rdi, [rdi + 64 * 2] ; 1 row
	1104	lea rdx, [rdx + 64 * 2] ; 1 row
	1105
	1106	; loop
	1107	shl ecx, 16
	1108	mov cx, 30
	1109	loop2f:
	1110	movdqa xmm1, xmm3 ; src[2n]
	1111	movq xmm2, [rsi + 64 * 1] ; src[2n + 1]
	1112	movq xmm3, [rsi + 64 * 1 * 2] ; src[2n + 2]
	1113	punpcklbw xmm2, xmm0
	1114	punpcklbw xmm3, xmm0
	1115	psubw xmm2, [rel cw128]
	1116	psubw xmm3, [rel cw128]
	1117	psllw xmm2, 5
	1118	psllw xmm3, 5
	1119	movdqa xmm4, xmm1
	1120	movdqa xmm5, xmm2
	1121	movdqa xmm6, xmm3
	1122	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1123	paddw xmm4, xmm6
	1124	psraw xmm4, 1
	1125	psubw xmm5, xmm4
	1126	psraw xmm5, 1
	1127	movdqa [rdi], xmm5 ; out hi
	1128	movdqa xmm6, xmm5 ; save hi
	1129	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1130	paddw xmm5, xmm7
	1131	psraw xmm5, 1
	1132	paddw xmm5, xmm1
	1133	movdqa [rdx], xmm5 ; out lo
	1134	movdqa xmm7, xmm6 ; save hi
	1135	; move down
	1136	lea rsi, [rsi + 64 * 1 * 2] ; 2 rows
	1137	lea rdi, [rdi + 64 * 2] ; 1 row
	1138	lea rdx, [rdx + 64 * 2] ; 1 row
	1139
	1140	dec cx
	1141	jnz loop2f
	1142	shr ecx, 16
	1143
	1144	; post
	1145	movdqa xmm1, xmm3 ; src[2n]
	1146	movq xmm2, [rsi + 64 * 1] ; src[2n + 1]
	1147	punpcklbw xmm2, xmm0
	1148	psubw xmm2, [rel cw128]
	1149	psllw xmm2, 5
	1150	movdqa xmm4, xmm1
	1151	movdqa xmm5, xmm2
	1152	movdqa xmm6, xmm3
	1153	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1154	paddw xmm4, xmm6
	1155	psraw xmm4, 1
	1156	psubw xmm5, xmm4
	1157	psraw xmm5, 1
	1158	movdqa [rdi], xmm5 ; out hi
	1159	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1160	paddw xmm5, xmm7
	1161	psraw xmm5, 1
	1162	paddw xmm5, xmm1
	1163	movdqa [rdx], xmm5 ; out lo
	1164	; move down
	1165	lea rsi, [rsi + 64 * 1 * 2] ; 2 rows
	1166	lea rdi, [rdi + 64 * 2] ; 1 row
	1167	lea rdx, [rdx + 64 * 2] ; 1 row
	1168
	1169	; move up
	1170	lea rsi, [rsi - 64 * 1 * 64]
	1171	lea rdi, [rdi - 32 * 64 * 2]
	1172	lea rdx, [rdx - 32 * 64 * 2]
	1173
	1174	; move right
	1175	lea rsi, [rsi + 8]
	1176	lea rdi, [rdi + 16]
	1177	lea rdx, [rdx + 16]
	1178
	1179	dec ecx
	1180	jnz loop1f
	1181
	1182	ret
	1183
	1184	set_quants_hi:
	1185	sub rax, 6 - 5
	1186	movd xmm9, eax
	1187	imul rax, 16
	1188	lea rdx, [rel cwa0]
	1189	add rdx, rax
	1190	movdqa xmm8, [rdx]
	1191	ret
	1192
	1193	set_quants_lo:
	1194	sub rax, 6 - 5
	1195	movd xmm11, eax
	1196	imul rax, 16
	1197	lea rdx, [rel cwa0]
	1198	add rdx, rax
	1199	movdqa xmm10, [rdx]
	1200	ret
	1201
	1202	;The first six integer or pointer arguments are passed in registers
	1203	;RDI, RSI, RDX, RCX, R8, and R9
	1204
	1205	;int
	1206	;rfxcodec_encode_dwt_shift_amd64_sse41(const char *qtable,
	1207	; unsigned char *in_buffer,
	1208	; short *out_buffer,
	1209	; short *work_buffer);
	1210
	1211	;******************************************************************************
	1212	%ifidn __OUTPUT_FORMAT__,elf64
	1213	PROC rfxcodec_encode_dwt_shift_amd64_sse41
	1214	%else
	1215	PROC _rfxcodec_encode_dwt_shift_amd64_sse41
	1216	%endif
	1217	; save registers
	1218	push rbx
	1219	push rdx
	1220	push rcx
	1221	push rsi
	1222	push rdi
	1223	pxor xmm0, xmm0
	1224
	1225	; verical DWT to work buffer, level 1
	1226	mov rsi, [rsp + 8] ; src
	1227	mov rdi, [rsp + 16] ; dst hi
	1228	lea rdi, [rdi + 64 * 32 * 2] ; dst hi
	1229	mov rdx, [rsp + 16] ; dst lo
	1230	call rfx_dwt_2d_encode_block_verti_8_64
	1231
	1232	; horizontal DWT to out buffer, level 1, part 1
	1233	xor rax, rax
	1234	mov rdx, [rsp]
	1235	mov al, [rdx + 4]
	1236	and al, 0xF
	1237	call set_quants_hi
	1238	mov rsi, [rsp + 16] ; src
	1239	mov rdi, [rsp + 24] ; dst hi - HL1
	1240	mov rdx, [rsp + 24] ; dst lo - LL1
	1241	lea rdx, [rdx + 32 * 32 * 6] ; dst lo - LL1
	1242	call rfx_dwt_2d_encode_block_horiz_16_64_no_lo
	1243
	1244	; horizontal DWT to out buffer, level 1, part 2
	1245	xor rax, rax
	1246	mov rdx, [rsp]
	1247	mov al, [rdx + 4]
	1248	shr al, 4
	1249	call set_quants_hi
	1250	xor rax, rax
	1251	mov rdx, [rsp]
	1252	mov al, [rdx + 3]
	1253	shr al, 4
	1254	call set_quants_lo
	1255	mov rsi, [rsp + 16] ; src
	1256	lea rsi, [rsi + 64 * 32 * 2] ; src
	1257	mov rdi, [rsp + 24] ; dst hi - HH1
	1258	lea rdi, [rdi + 32 * 32 * 4] ; dst hi - HH1
	1259	mov rdx, [rsp + 24] ; dst lo - LH1
	1260	lea rdx, [rdx + 32 * 32 * 2] ; dst lo - LH1
	1261	call rfx_dwt_2d_encode_block_horiz_16_64
	1262
	1263	; verical DWT to work buffer, level 2
	1264	mov rsi, [rsp + 24] ; src
	1265	lea rsi, [rsi + 32 * 32 * 6] ; src
	1266	mov rdi, [rsp + 16] ; dst hi
	1267	lea rdi, [rdi + 32 * 16 * 2] ; dst hi
	1268	mov rdx, [rsp + 16] ; dst lo
	1269	call rfx_dwt_2d_encode_block_verti_16_32
	1270
	1271	; horizontal DWT to out buffer, level 2, part 1
	1272	xor rax, rax
	1273	mov rdx, [rsp]
	1274	mov al, [rdx + 2]
	1275	shr al, 4
	1276	call set_quants_hi
	1277	mov rsi, [rsp + 16] ; src
	1278	; 32 * 32 * 6 + 16 * 16 * 0 = 6144
	1279	mov rdi, [rsp + 24] ; dst hi - HL2
	1280	lea rdi, [rdi + 6144] ; dst hi - HL2
	1281	; 32 * 32 * 6 + 16 * 16 * 6 = 7680
	1282	mov rdx, [rsp + 24] ; dst lo - LL2
	1283	lea rdx, [rdx + 7680] ; dst lo - LL2
	1284	call rfx_dwt_2d_encode_block_horiz_16_32_no_lo
	1285
	1286	; horizontal DWT to out buffer, level 2, part 2
	1287	xor rax, rax
	1288	mov rdx, [rsp]
	1289	mov al, [rdx + 3]
	1290	and al, 0xF
	1291	call set_quants_hi
	1292	xor rax, rax
	1293	mov rdx, [rsp]
	1294	mov al, [rdx + 2]
	1295	and al, 0xF
	1296	call set_quants_lo
	1297	mov rsi, [rsp + 16] ; src
	1298	lea rsi, [rsi + 32 * 16 * 2] ; src
	1299	; 32 * 32 * 6 + 16 * 16 * 4 = 7168
	1300	mov rdi, [rsp + 24] ; dst hi - HH2
	1301	lea rdi, [rdi + 7168] ; dst hi - HH2
	1302	; 32 * 32 * 6 + 16 * 16 * 2 = 6656
	1303	mov rdx, [rsp + 24] ; dst lo - LH2
	1304	lea rdx, [rdx + 6656] ; dst lo - LH2
	1305	call rfx_dwt_2d_encode_block_horiz_16_32
	1306
	1307	; verical DWT to work buffer, level 3
	1308	; 32 * 32 * 6 + 16 * 16 * 6 = 7680
	1309	mov rsi, [rsp + 24] ; src
	1310	lea rsi, [rsi + 7680] ; src
	1311	mov rdi, [rsp + 16] ; dst hi
	1312	lea rdi, [rdi + 16 * 8 * 2] ; dst hi
	1313	mov rdx, [rsp + 16] ; dst lo
	1314	call rfx_dwt_2d_encode_block_verti_16_16
	1315
	1316	; horizontal DWT to out buffer, level 3, part 1
	1317	xor rax, rax
	1318	mov rdx, [rsp]
	1319	mov al, [rdx + 1]
	1320	and al, 0xF
	1321	call set_quants_hi
	1322	xor rax, rax
	1323	mov rdx, [rsp]
	1324	mov al, [rdx + 0]
	1325	and al, 0xF
	1326	call set_quants_lo
	1327	mov rsi, [rsp + 16] ; src
	1328	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 0 = 7680
	1329	mov rdi, [rsp + 24] ; dst hi - HL3
	1330	lea rdi, [rdi + 7680] ; dst hi - HL3
	1331	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 6 = 8064
	1332	mov rdx, [rsp + 24] ; dst lo - LL3
	1333	lea rdx, [rdx + 8064] ; dst lo - LL3
	1334	call rfx_dwt_2d_encode_block_horiz_16_16
	1335
	1336	; horizontal DWT to out buffer, level 3, part 2
	1337	xor rax, rax
	1338	mov rdx, [rsp]
	1339	mov al, [rdx + 1]
	1340	shr al, 4
	1341	call set_quants_hi
	1342	xor rax, rax
	1343	mov rdx, [rsp]
	1344	mov al, [rdx + 0]
	1345	shr al, 4
	1346	call set_quants_lo
	1347	mov rsi, [rsp + 16] ; src
	1348	lea rsi, [rsi + 16 * 8 * 2] ; src
	1349	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 4 = 7936
	1350	mov rdi, [rsp + 24] ; dst hi - HH3
	1351	lea rdi, [rdi + 7936] ; dst hi - HH3
	1352	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 2 = 7808
	1353	mov rdx, [rsp + 24] ; dst lo - LH3
	1354	lea rdx, [rdx + 7808] ; dst lo - LH3
	1355	call rfx_dwt_2d_encode_block_horiz_16_16
	1356
	1357	mov rax, 0
	1358	; restore registers
	1359	pop rdi
	1360	pop rsi
	1361	pop rcx
	1362	pop rdx
	1363	pop rbx
	1364	ret
	1365	align 16
	1366

+0

-22

~~librfxcodec/src/amd64/rfxdwt_amd64_sse2.asm~~ less more

0
1		section .data
2		const1 times 8 dw 1
3
4		%macro PROC 1
5		align 16
6		global %1
7		%1:
8		%endmacro
9
10		;int
11		;dwt_shift_amd64_sse2(const int quantization_values, uint8 data,
12		; sint16 dwt_buffer1, sint16 dwt_buffer);
13
14		PROC dwt_shift_amd64_sse2
15		; save registers
16		push rbx
17		mov rax, 0
18		pop rbx
19		ret
20		align 16
21

+0

-21

~~librfxcodec/src/amd64/rfxrlgr1_amd64.asm~~ less more

0
1		section .data
2		const1 times 8 dw 1
3
4		%macro PROC 1
5		align 16
6		global %1
7		%1:
8		%endmacro
9
10		;int
11		;diff_rlgr1_amd64(sint16 co, int num_co, uint8 dst, int dst_bytes);
12
13		PROC diff_rlgr1_amd64
14		; save registers
15		push rbx
16		mov rax, 0
17		pop rbx
18		ret
19		align 16
20

+0

-21

~~librfxcodec/src/amd64/rfxrlgr3_amd64.asm~~ less more

0
1		section .data
2		const1 times 8 dw 1
3
4		%macro PROC 1
5		align 16
6		global %1
7		%1:
8		%endmacro
9
10		;int
11		;diff_rlgr3_amd64(sint16 co, int num_co, uint8 dst, int dst_bytes);
12
13		PROC diff_rlgr3_amd64
14		; save registers
15		push rbx
16		mov rax, 0
17		pop rbx
18		ret
19		align 16
20

+57

-0

librfxcodec/src/nasm_lt.sh less more

	0	#! /bin/sh
	1	command=""
	2	infile=""
	3	o_opt=no
	4	pic=no
	5	while [ $# -gt 0 ]; do
	6	case "$1" in
	7	-DPIC\|-fPIC\|-fpic\|-Kpic\|-KPIC)
	8	if [ "$pic" != "yes" ] ; then
	9	command="$command -DPIC"
	10	pic=yes
	11	fi
	12	;;
	13	-f\|-fbin\|-faout\|-faoutb\|-fcoff\|-felf\|-felf64\|-fas86\| \
	14	-fobj\|-fwin32\|-fwin64\|-frdf\|-fieee\|-fmacho\|-fmacho64)
	15	# it's a file format specifier for nasm.
	16	command="$command $1"
	17	;;
	18	-f*)
	19	# maybe a code-generation flag for gcc.
	20	;;
	21	-[Ii]*)
	22	incdir=`echo "$1" \| sed 's/^-[Ii]//'`
	23	if [ "x$incdir" = x -a "x$2" != x ] ; then
	24	case "$2" in
	25	-*) ;;
	26	*) incdir="$2"; shift;;
	27	esac
	28	fi
	29	if [ "x$incdir" != x ] ; then
	30	# In the case of NASM, the trailing slash is necessary.
	31	incdir=`echo "$incdir" \| sed 's%/*$%/%'`
	32	command="$command -I$incdir"
	33	fi
	34	;;
	35	-o*)
	36	o_opt=yes
	37	command="$command $1"
	38	;;
	39	*.asm)
	40	infile=$1
	41	command="$command $1"
	42	;;
	43	*)
	44	command="$command $1"
	45	;;
	46	esac
	47	shift
	48	done
	49	if [ "$o_opt" != yes ] ; then
	50	# By default, NASM creates an output file
	51	# in the same directory as the input file.
	52	outfile="-o `echo $infile \| sed -e 's%^./%%' -e 's%\.[^.]$%%'`.o"
	53	command="$command $outfile"
	54	fi
	55	echo $command
	56	exec $command

+3

-1

librfxcodec/src/rfxcommon.h less more

0	0	/**
1	1	* RFX codec
2	2	*
3		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	3	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

21	21	#define MIN(_val1, _val2) (_val1) < (_val2) ? (_val1) : (_val2)
22	22	#define MAX(_val1, _val2) (_val1) > (_val2) ? (_val1) : (_val2)
23	23	#define MINMAX(_v, _l, _h) ((_v) < (_l) ? (_l) : ((_v) > (_h) ? (_h) : (_v)))
	24
	25	#define DWT_FACTOR 5
24	26
25	27	typedef signed char sint8;
26	28	typedef unsigned char uint8;

+212

-59

librfxcodec/src/rfxcompose.c less more

2	2	* RemoteFX Codec Library
3	3	*
4	4	* Copyright 2011 Vic Lee
	5	* Copyright 2015 Jay Sorg <jay.sorg@gmail.com>
5	6	*
6	7	* Licensed under the Apache License, Version 2.0 (the "License");
7	8	* you may not use this file except in compliance with the License.

27	28	#include "rfxconstants.h"
28	29	#include "rfxencode_tile.h"
29	30
	31	#define LLOG_LEVEL 1
	32	#define LLOGLN(_level, _args) \
	33	do { if (_level < LLOG_LEVEL) { printf _args ; printf("\n"); } } while (0)
	34
30	35	/*
31	36	* LL3, LH3, HL3, HH3, LH2, HL2, HH2, LH1, HL1, HH1
32	37	*/
33		static const int g_rfx_default_quantization_values[] =
34		{
35		6, 6, 6, 6, 7, 7, 8, 8, 8, 9
	38	static const unsigned char g_rfx_default_quantization_values[] =
	39	{
	40	0x66, 0x66, 0x77, 0x88, 0x98
36	41	};
37	42
38	43	/******************************************************************************/

64	69	stream_write_uint16(s, WBT_CONTEXT); /* CodecChannelT.blockType */
65	70	stream_write_uint32(s, 13); /* CodecChannelT.blockLen */
66	71	stream_write_uint8(s, 1); /* CodecChannelT.codecId */
67		stream_write_uint8(s, 0); /* CodecChannelT.channelId */
	72	stream_write_uint8(s, 255); /* CodecChannelT.channelId */
68	73	stream_write_uint8(s, 0); /* ctxId */
69	74	stream_write_uint16(s, CT_TILE_64x64); /* tileSize */
70	75

167	172	/******************************************************************************/
168	173	static int
169	174	rfx_compose_message_region(struct rfxencode* enc, STREAM* s,
170		struct rfx_rect *regions, int num_regions)
	175	const struct rfx_rect *regions, int num_regions)
171	176	{
172	177	int size;
173	178	int i;

199	204	static int
200	205	rfx_compose_message_tile_yuv(struct rfxencode enc, STREAM s,
201	206	char *tile_data, int tile_width, int tile_height,
202		int stride_bytes, const int *quantVals,
	207	int stride_bytes, const char *quantVals,
203	208	int quantIdxY, int quantIdxCb, int quantIdxCr,
204	209	int xIdx, int yIdx)
205	210	{

220	225	stream_seek(s, 6); /* YLen, CbLen, CrLen */
221	226	if (rfx_encode_yuv(enc, tile_data, tile_width, tile_height,
222	227	stride_bytes,
223		quantVals + quantIdxY * 10,
224		quantVals + quantIdxCb * 10,
225		quantVals + quantIdxCr * 10,
	228	quantVals + quantIdxY * 5,
	229	quantVals + quantIdxCb * 5,
	230	quantVals + quantIdxCr * 5,
226	231	s, &YLen, &CbLen, &CrLen) != 0)
227	232	{
228	233	return 1;

240	245
241	246	/******************************************************************************/
242	247	static int
	248	rfx_compose_message_tile_yuva(struct rfxencode enc, STREAM s,
	249	char *tile_data, int tile_width, int tile_height,
	250	int stride_bytes, const char *quantVals,
	251	int quantIdxY, int quantIdxCb, int quantIdxCr,
	252	int xIdx, int yIdx)
	253	{
	254	int YLen = 0;
	255	int CbLen = 0;
	256	int CrLen = 0;
	257	int ALen = 0;
	258	int start_pos;
	259	int end_pos;
	260
	261	start_pos = stream_get_pos(s);
	262	stream_write_uint16(s, CBT_TILE); /* BlockT.blockType */
	263	stream_seek_uint32(s); /* set BlockT.blockLen later */
	264	stream_write_uint8(s, quantIdxY);
	265	stream_write_uint8(s, quantIdxCb);
	266	stream_write_uint8(s, quantIdxCr);
	267	stream_write_uint16(s, xIdx);
	268	stream_write_uint16(s, yIdx);
	269	stream_seek(s, 8); /* YLen, CbLen, CrLen, ALen */
	270	if (rfx_encode_yuva(enc, tile_data, tile_width, tile_height,
	271	stride_bytes,
	272	quantVals + quantIdxY * 5,
	273	quantVals + quantIdxCb * 5,
	274	quantVals + quantIdxCr * 5,
	275	s, &YLen, &CbLen, &CrLen, &ALen) != 0)
	276	{
	277	return 1;
	278	}
	279	end_pos = stream_get_pos(s);
	280	stream_set_pos(s, start_pos + 2);
	281	stream_write_uint32(s, 19 + YLen + CbLen + CrLen + ALen); /* BlockT.blockLen */
	282	stream_set_pos(s, start_pos + 13);
	283	stream_write_uint16(s, YLen);
	284	stream_write_uint16(s, CbLen);
	285	stream_write_uint16(s, CrLen);
	286	stream_write_uint16(s, ALen);
	287	stream_set_pos(s, end_pos);
	288	return 0;
	289	}
	290
	291	/******************************************************************************/
	292	static int
243	293	rfx_compose_message_tile_rgb(struct rfxencode enc, STREAM s,
244	294	char *tile_data, int tile_width, int tile_height,
245		int stride_bytes, const int *quantVals,
	295	int stride_bytes, const char *quantVals,
246	296	int quantIdxY, int quantIdxCb, int quantIdxCr,
247	297	int xIdx, int yIdx)
248	298	{

263	313	stream_seek(s, 6); /* YLen, CbLen, CrLen */
264	314	if (rfx_encode_rgb(enc, tile_data, tile_width, tile_height,
265	315	stride_bytes,
266		quantVals + quantIdxY * 10,
267		quantVals + quantIdxCb * 10,
268		quantVals + quantIdxCr * 10,
	316	quantVals + quantIdxY * 5,
	317	quantVals + quantIdxCb * 5,
	318	quantVals + quantIdxCr * 5,
269	319	s, &YLen, &CbLen, &CrLen) != 0)
270	320	{
271	321	return 1;

283	333
284	334	/******************************************************************************/
285	335	static int
	336	rfx_compose_message_tile_argb(struct rfxencode enc, STREAM s,
	337	char *tile_data, int tile_width, int tile_height,
	338	int stride_bytes, const char *quantVals,
	339	int quantIdxY, int quantIdxCb, int quantIdxCr,
	340	int xIdx, int yIdx)
	341	{
	342	int YLen = 0;
	343	int CbLen = 0;
	344	int CrLen = 0;
	345	int ALen = 0;
	346	int start_pos;
	347	int end_pos;
	348
	349	LLOGLN(10, ("rfx_compose_message_tile_argb:"));
	350	start_pos = stream_get_pos(s);
	351	stream_write_uint16(s, CBT_TILE); /* BlockT.blockType */
	352	stream_seek_uint32(s); /* set BlockT.blockLen later */
	353	stream_write_uint8(s, quantIdxY);
	354	stream_write_uint8(s, quantIdxCb);
	355	stream_write_uint8(s, quantIdxCr);
	356	stream_write_uint16(s, xIdx);
	357	stream_write_uint16(s, yIdx);
	358	stream_seek(s, 8); /* YLen, CbLen, CrLen, ALen */
	359	if (rfx_encode_argb(enc, tile_data, tile_width, tile_height,
	360	stride_bytes,
	361	quantVals + quantIdxY * 5,
	362	quantVals + quantIdxCb * 5,
	363	quantVals + quantIdxCr * 5,
	364	s, &YLen, &CbLen, &CrLen, &ALen) != 0)
	365	{
	366	LLOGLN(10, ("rfx_compose_message_tile_argb: rfx_encode_argb failed"));
	367	return 1;
	368	}
	369	end_pos = stream_get_pos(s);
	370	stream_set_pos(s, start_pos + 2);
	371	stream_write_uint32(s, 19 + YLen + CbLen + CrLen + ALen); /* BlockT.blockLen */
	372	stream_set_pos(s, start_pos + 13);
	373	stream_write_uint16(s, YLen);
	374	stream_write_uint16(s, CbLen);
	375	stream_write_uint16(s, CrLen);
	376	stream_write_uint16(s, ALen);
	377	stream_set_pos(s, end_pos);
	378	return 0;
	379	}
	380
	381	/******************************************************************************/
	382	static int
286	383	rfx_compose_message_tileset(struct rfxencode* enc, STREAM* s,
287	384	char* buf, int width, int height,
288	385	int stride_bytes,
289		struct rfx_tile *tiles, int num_tiles,
290		const int *quants, int num_quants)
	386	const struct rfx_tile *tiles, int num_tiles,
	387	const char *quants, int num_quants,
	388	int flags)
291	389	{
292	390	int size;
293	391	int start_pos;
294	392	int end_pos;
295	393	int index;
296	394	int numQuants;
297		const int *quantVals;
298		const int *quantValsPtr;
	395	const char *quantVals;
299	396	int quantIdxY;
300	397	int quantIdxCb;
301	398	int quantIdxCr;

307	404	int cy;
308	405	char *tile_data;
309	406
	407	LLOGLN(10, ("rfx_compose_message_tileset:"));
310	408	if (quants == 0)
311	409	{
312	410	numQuants = 1;
313		quantVals = g_rfx_default_quantization_values;
	411	quantVals = (const char *) g_rfx_default_quantization_values;
314	412	}
315	413	else
316	414	{

320	418	numTiles = num_tiles;
321	419	size = 22 + numQuants * 5;
322	420	start_pos = stream_get_pos(s);
323		stream_write_uint16(s, WBT_EXTENSION); /* CodecChannelT.blockType */
	421	if (flags & RFX_FLAGS_ALPHAV1)
	422	{
	423	LLOGLN(10, ("rfx_compose_message_tileset: RFX_FLAGS_ALPHAV1 set"));
	424	stream_write_uint16(s, WBT_EXTENSION_PLUS); /* CodecChannelT.blockType */
	425	}
	426	else
	427	{
	428	stream_write_uint16(s, WBT_EXTENSION); /* CodecChannelT.blockType */
	429	}
324	430	stream_seek_uint32(s); /* set CodecChannelT.blockLen later */
325	431	stream_write_uint8(s, 1); /* CodecChannelT.codecId */
326	432	stream_write_uint8(s, 0); /* CodecChannelT.channelId */

331	437	stream_write_uint8(s, 0x40); /* tileSize */
332	438	stream_write_uint16(s, numTiles); /* numTiles */
333	439	stream_seek_uint32(s); /* set tilesDataSize later */
334		quantValsPtr = quantVals;
335		for (index = 0; index < numQuants * 5; index++)
336		{
337		stream_write_uint8(s, quantValsPtr[0] + (quantValsPtr[1] << 4));
338		quantValsPtr += 2;
339		}
	440	memcpy(s->p, quantVals, numQuants * 5);
	441	s->p += numQuants * 5;
340	442	end_pos = stream_get_pos(s);
341	443	if (enc->format == RFX_FORMAT_YUV)
342	444	{
343		for (index = 0; index < numTiles; index++)
	445	if (flags & RFX_FLAGS_ALPHAV1)
344	446	{
345		x = tiles[index].x;
346		y = tiles[index].y;
347		cx = tiles[index].cx;
348		cy = tiles[index].cy;
349		quantIdxY = tiles[index].quant_y;
350		quantIdxCb = tiles[index].quant_cb;
351		quantIdxCr = tiles[index].quant_cr;
352		tile_data = buf + (y << 8) * (stride_bytes >> 8) + (x << 8);
353		if (rfx_compose_message_tile_yuv(enc, s,
354		tile_data, cx, cy, stride_bytes,
355		quantVals,
356		quantIdxY, quantIdxCb, quantIdxCr,
357		x / 64, y / 64) != 0)
	447	for (index = 0; index < numTiles; index++)
358	448	{
359		return 1;
	449	x = tiles[index].x;
	450	y = tiles[index].y;
	451	cx = tiles[index].cx;
	452	cy = tiles[index].cy;
	453	quantIdxY = tiles[index].quant_y;
	454	quantIdxCb = tiles[index].quant_cb;
	455	quantIdxCr = tiles[index].quant_cr;
	456	tile_data = buf + (y << 8) * (stride_bytes >> 8) + (x << 8);
	457	if (rfx_compose_message_tile_yuva(enc, s,
	458	tile_data, cx, cy, stride_bytes,
	459	quantVals,
	460	quantIdxY, quantIdxCb, quantIdxCr,
	461	x / 64, y / 64) != 0)
	462	{
	463	return 1;
	464	}
360	465	}
361	466	}
	467	else
	468	{
	469	for (index = 0; index < numTiles; index++)
	470	{
	471	x = tiles[index].x;
	472	y = tiles[index].y;
	473	cx = tiles[index].cx;
	474	cy = tiles[index].cy;
	475	quantIdxY = tiles[index].quant_y;
	476	quantIdxCb = tiles[index].quant_cb;
	477	quantIdxCr = tiles[index].quant_cr;
	478	tile_data = buf + (y << 8) * (stride_bytes >> 8) + (x << 8);
	479	if (rfx_compose_message_tile_yuv(enc, s,
	480	tile_data, cx, cy, stride_bytes,
	481	quantVals,
	482	quantIdxY, quantIdxCb, quantIdxCr,
	483	x / 64, y / 64) != 0)
	484	{
	485	return 1;
	486	}
	487	}
	488	}
362	489	}
363	490	else
364	491	{
365		for (index = 0; index < numTiles; index++)
	492	if (flags & RFX_FLAGS_ALPHAV1)
366	493	{
367		x = tiles[index].x;
368		y = tiles[index].y;
369		cx = tiles[index].cx;
370		cy = tiles[index].cy;
371		quantIdxY = tiles[index].quant_y;
372		quantIdxCb = tiles[index].quant_cb;
373		quantIdxCr = tiles[index].quant_cr;
374		tile_data = buf + y * stride_bytes + x * (enc->bits_per_pixel / 8);
375		if (rfx_compose_message_tile_rgb(enc, s,
376		tile_data, cx, cy, stride_bytes,
377		quantVals,
378		quantIdxY, quantIdxCb, quantIdxCr,
379		x / 64, y / 64) != 0)
	494	for (index = 0; index < numTiles; index++)
380	495	{
381		return 1;
	496	x = tiles[index].x;
	497	y = tiles[index].y;
	498	cx = tiles[index].cx;
	499	cy = tiles[index].cy;
	500	quantIdxY = tiles[index].quant_y;
	501	quantIdxCb = tiles[index].quant_cb;
	502	quantIdxCr = tiles[index].quant_cr;
	503	tile_data = buf + y * stride_bytes + x * (enc->bits_per_pixel / 8);
	504	if (rfx_compose_message_tile_argb(enc, s,
	505	tile_data, cx, cy, stride_bytes,
	506	quantVals,
	507	quantIdxY, quantIdxCb, quantIdxCr,
	508	x / 64, y / 64) != 0)
	509	{
	510	return 1;
	511	}
	512	}
	513	}
	514	else
	515	{
	516	for (index = 0; index < numTiles; index++)
	517	{
	518	x = tiles[index].x;
	519	y = tiles[index].y;
	520	cx = tiles[index].cx;
	521	cy = tiles[index].cy;
	522	quantIdxY = tiles[index].quant_y;
	523	quantIdxCb = tiles[index].quant_cb;
	524	quantIdxCr = tiles[index].quant_cr;
	525	tile_data = buf + y * stride_bytes + x * (enc->bits_per_pixel / 8);
	526	if (rfx_compose_message_tile_rgb(enc, s,
	527	tile_data, cx, cy, stride_bytes,
	528	quantVals,
	529	quantIdxY, quantIdxCb, quantIdxCr,
	530	x / 64, y / 64) != 0)
	531	{
	532	return 1;
	533	}
382	534	}
383	535	}
384	536	}

411	563	/******************************************************************************/
412	564	int
413	565	rfx_compose_message_data(struct rfxencode* enc, STREAM* s,
414		struct rfx_rect *regions, int num_regions,
	566	const struct rfx_rect *regions, int num_regions,
415	567	char *buf, int width, int height, int stride_bytes,
416		struct rfx_tile *tiles, int num_tiles,
417		const int *quants, int num_quants)
	568	const struct rfx_tile *tiles, int num_tiles,
	569	const char *quants, int num_quants, int flags)
418	570	{
419	571	if (rfx_compose_message_frame_begin(enc, s) != 0)
420	572	{

425	577	return 1;
426	578	}
427	579	if (rfx_compose_message_tileset(enc, s, buf, width, height, stride_bytes,
428		tiles, num_tiles, quants, num_quants) != 0)
	580	tiles, num_tiles, quants, num_quants,
	581	flags) != 0)
429	582	{
430	583	return 1;
431	584	}

+4

-4

librfxcodec/src/rfxcompose.h less more

0	0	/**
1	1	* RFX codec encoder
2	2	*
3		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	3	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

24	24	rfx_compose_message_header(struct rfxencode* enc, STREAM* s);
25	25	int
26	26	rfx_compose_message_data(struct rfxencode* enc, STREAM* s,
27		struct rfx_rect *regions, int num_regions,
	27	const struct rfx_rect *regions, int num_regions,
28	28	char *buf, int width, int height, int stride_bytes,
29		struct rfx_tile *tiles, int num_tiles,
30		const int *quants, int num_quants);
	29	const struct rfx_tile *tiles, int num_tiles,
	30	const char *quants, int num_quants, int flags);
31	31
32	32	#endif

+1

-0

librfxcodec/src/rfxconstants.h less more

38	38	#define WBT_FRAME_END 0xCCC5
39	39	#define WBT_REGION 0xCCC6
40	40	#define WBT_EXTENSION 0xCCC7
	41	#define WBT_EXTENSION_PLUS 0xDDD7
41	42	#define CBT_REGION 0xCAC1
42	43	#define CBT_TILESET 0xCAC2
43	44	#define CBT_TILE 0xCAC3

+148

-45

librfxcodec/src/rfxencode.c less more

0	0	/**
1	1	* RFX codec encoder
2	2	*
3		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	3	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

36	36	#endif
37	37
38	38	/******************************************************************************/
39		void *
40		rfxcodec_encode_create(int width, int height, int format, int flags)
	39	int
	40	rfxcodec_encode_create_ex(int width, int height, int format, int flags,
	41	void **handle)
41	42	{
42	43	struct rfxencode *enc;
43	44	int ax;

48	49	enc = (struct rfxencode *) malloc(sizeof(struct rfxencode));
49	50	if (enc == 0)
50	51	{
51		return 0;
	52	return 1;
52	53	}
53	54	memset(enc, 0, sizeof(struct rfxencode));
	55
	56	enc->dwt_buffer = (sint16*)(((size_t)(enc->dwt_buffer_a)) & ~15);
	57	enc->dwt_buffer1 = (sint16*)(((size_t)(enc->dwt_buffer1_a)) & ~15);
	58	enc->dwt_buffer2 = (sint16*)(((size_t)(enc->dwt_buffer2_a)) & ~15);
	59
54	60	#if defined(RFX_USE_ACCEL_X86)
55	61	cpuid_x86(1, 0, &ax, &bx, &cx, &dx);
56	62	#elif defined(RFX_USE_ACCEL_AMD64)

114	120	{
115	121	enc->mode = RLGR1;
116	122	}
117		switch (format)
	123	switch (format)
118	124	{
119	125	case RFX_FORMAT_BGRA:
120	126	enc->bits_per_pixel = 32;

133	139	break;
134	140	default:
135	141	free(enc);
136		return NULL;
	142	return 2;
137	143	}
138	144	enc->format = format;
139	145	/* assign encoding functions */

141	147	{
142	148	if (enc->mode == RLGR3)
143	149	{
	150	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr3\n");
144	151	enc->rfx_encode = rfx_encode_component_rlgr3; /* rfxencode_tile.c */
145	152	}
146	153	else
147	154	{
	155	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr1\n");
148	156	enc->rfx_encode = rfx_encode_component_rlgr1; /* rfxencode_tile.c */
149	157	}
150	158	}
151	159	else
152	160	{
153	161	#if defined(RFX_USE_ACCEL_X86)
154		if (enc->mode == RLGR3)
155		{
156		enc->rfx_encode = rfx_encode_component_rlgr3_x86_sse2; /* rfxencode_tile.c */
	162	if (enc->got_sse41)
	163	{
	164	if (enc->mode == RLGR3)
	165	{
	166	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr3_x86_sse41\n");
	167	enc->rfx_encode = rfx_encode_component_rlgr3_x86_sse41; /* rfxencode_tile.c */
	168	}
	169	else
	170	{
	171	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr1_x86_sse41\n");
	172	enc->rfx_encode = rfx_encode_component_rlgr1_x86_sse41; /* rfxencode_tile.c */
	173	}
	174	}
	175	else if (enc->got_sse2)
	176	{
	177	if (enc->mode == RLGR3)
	178	{
	179	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr3_x86_sse2\n");
	180	enc->rfx_encode = rfx_encode_component_rlgr3_x86_sse2; /* rfxencode_tile.c */
	181	}
	182	else
	183	{
	184	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr1_x86_sse2\n");
	185	enc->rfx_encode = rfx_encode_component_rlgr1_x86_sse2; /* rfxencode_tile.c */
	186	}
157	187	}
158	188	else
159	189	{
160		enc->rfx_encode = rfx_encode_component_rlgr1_x86_sse2; /* rfxencode_tile.c */
	190	if (enc->mode == RLGR3)
	191	{
	192	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr3\n");
	193	enc->rfx_encode = rfx_encode_component_rlgr3; /* rfxencode_tile.c */
	194	}
	195	else
	196	{
	197	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr1\n");
	198	enc->rfx_encode = rfx_encode_component_rlgr1; /* rfxencode_tile.c */
	199	}
161	200	}
162	201	#elif defined(RFX_USE_ACCEL_AMD64)
163		if (enc->mode == RLGR3)
164		{
165		enc->rfx_encode = rfx_encode_component_rlgr3_amd64_sse2; /* rfxencode_tile.c */
	202	if (enc->got_sse41)
	203	{
	204	if (enc->mode == RLGR3)
	205	{
	206	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr3_amd64_sse41\n");
	207	enc->rfx_encode = rfx_encode_component_rlgr3_amd64_sse41; /* rfxencode_tile.c */
	208	}
	209	else
	210	{
	211	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr1_amd64_sse41\n");
	212	enc->rfx_encode = rfx_encode_component_rlgr1_amd64_sse41; /* rfxencode_tile.c */
	213	}
	214	}
	215	else if (enc->got_sse2)
	216	{
	217	if (enc->mode == RLGR3)
	218	{
	219	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr3_amd64_sse2\n");
	220	enc->rfx_encode = rfx_encode_component_rlgr3_amd64_sse2; /* rfxencode_tile.c */
	221	}
	222	else
	223	{
	224	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr1_amd64_sse2\n");
	225	enc->rfx_encode = rfx_encode_component_rlgr1_amd64_sse2; /* rfxencode_tile.c */
	226	}
166	227	}
167	228	else
168	229	{
169		enc->rfx_encode = rfx_encode_component_rlgr1_amd64_sse2; /* rfxencode_tile.c */
	230	if (enc->mode == RLGR3)
	231	{
	232	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr3\n");
	233	enc->rfx_encode = rfx_encode_component_rlgr3; /* rfxencode_tile.c */
	234	}
	235	else
	236	{
	237	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr1\n");
	238	enc->rfx_encode = rfx_encode_component_rlgr1; /* rfxencode_tile.c */
	239	}
170	240	}
171	241	#else
172	242	if (enc->mode == RLGR3)
173	243	{
	244	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr3\n");
174	245	enc->rfx_encode = rfx_encode_component_rlgr3; /* rfxencode_tile.c */
175	246	}
176	247	else
177	248	{
	249	printf("rfxcodec_encode_create: rfx_encode set to rfx_encode_component_rlgr1\n");
178	250	enc->rfx_encode = rfx_encode_component_rlgr1; /* rfxencode_tile.c */
179	251	}
180	252	#endif

185	257	if (bx == 0)
186	258	{
187	259	}
188		return enc;
	260	*handle = enc;
	261	return 0;
	262	}
	263
	264	/******************************************************************************/
	265	void *
	266	rfxcodec_encode_create(int width, int height, int format, int flags)
	267	{
	268	int error;
	269	void *handle;
	270
	271	error = rfxcodec_encode_create_ex(width, height, format, flags, &handle);
	272	if (error == 0)
	273	{
	274	return handle;
	275	}
	276	return 0;
189	277	}
190	278
191	279	/******************************************************************************/

200	288	return 0;
201	289	}
202	290	free(enc);
	291	return 0;
	292	}
	293
	294	/******************************************************************************/
	295	int
	296	rfxcodec_encode_ex(void handle, char cdata, int *cdata_bytes,
	297	char *buf, int width, int height, int stride_bytes,
	298	const struct rfx_rect *regions, int num_regions,
	299	const struct rfx_tile *tiles, int num_tiles,
	300	const char *quants, int num_quants, int flags)
	301	{
	302	struct rfxencode *enc;
	303	STREAM s;
	304
	305	enc = (struct rfxencode *) handle;
	306
	307	s.data = (uint8 *) cdata;
	308	s.p = s.data;
	309	s.size = *cdata_bytes;
	310
	311	/* Only the first frame should send the RemoteFX header */
	312	if ((enc->frame_idx == 0) && (enc->header_processed == 0))
	313	{
	314	if (rfx_compose_message_header(enc, &s) != 0)
	315	{
	316	return 1;
	317	}
	318	}
	319	if (rfx_compose_message_data(enc, &s, regions, num_regions,
	320	buf, width, height, stride_bytes,
	321	tiles, num_tiles, quants, num_quants,
	322	flags) != 0)
	323	{
	324	return 1;
	325	}
	326	*cdata_bytes = (int) (s.p - s.data);
203	327	return 0;
204	328	}
205	329

207	331	int
208	332	rfxcodec_encode(void handle, char cdata, int *cdata_bytes,
209	333	char *buf, int width, int height, int stride_bytes,
210		struct rfx_rect *regions, int num_regions,
211		struct rfx_tile *tiles, int num_tiles,
212		const int *quants, int num_quants)
213		{
214		struct rfxencode *enc;
215		STREAM s;
216
217		enc = (struct rfxencode *) handle;
218
219		s.data = (uint8 *) cdata;
220		s.p = s.data;
221		s.size = *cdata_bytes;
222
223		/* Only the first frame should send the RemoteFX header */
224		if ((enc->frame_idx == 0) && (enc->header_processed == 0))
225		{
226		if (rfx_compose_message_header(enc, &s) != 0)
227		{
228		return 1;
229		}
230		}
231		if (rfx_compose_message_data(enc, &s, regions, num_regions,
232		buf, width, height, stride_bytes,
233		tiles, num_tiles, quants, num_quants) != 0)
234		{
235		return 1;
236		}
237		*cdata_bytes = (int) (s.p - s.data);
238		return 0;
239		}
	334	const struct rfx_rect *regions, int num_regions,
	335	const struct rfx_tile *tiles, int num_tiles,
	336	const char *quants, int num_quants)
	337	{
	338	return rfxcodec_encode_ex(handle, cdata, cdata_bytes, buf, width, height,
	339	stride_bytes, regions, num_regions, tiles,
	340	num_tiles, quants, num_quants, 0);
	341	}
	342

+13

-10

librfxcodec/src/rfxencode.h less more

0	0	/**
1	1	* RFX codec encoder
2	2	*
3		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	3	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

20	20
21	21	struct rfxencode;
22	22
23		typedef int (rfx_encode_proc)(struct rfxencode enc,
24		const int *quantization_values,
	23	typedef int (rfx_encode_proc)(struct rfxencode enc, const char *qtable,
25	24	uint8 data, uint8 buffer,
26	25	int buffer_size, int *size);
27	26

38	37	int format;
39	38	int pad0[7];
40	39
	40	uint8 a_buffer[4096];
41	41	uint8 y_r_buffer[4096];
42		uint8 cb_g_buffer[4096];
43		uint8 cr_b_buffer[4096];
44
45		sint16 dwt_buffer[4096];
46		sint16 dwt_buffer1[4096];
47
	42	uint8 u_g_buffer[4096];
	43	uint8 v_b_buffer[4096];
	44	uint8 pad1[16];
	45	sint16 dwt_buffer_a[4096];
	46	sint16 dwt_buffer1_a[4096];
	47	sint16 dwt_buffer2_a[4096];
	48	uint8 pad2[16];
	49	sint16* dwt_buffer;
	50	sint16* dwt_buffer1;
	51	sint16* dwt_buffer2;
48	52	rfx_encode_proc rfx_encode;
49	53
50	54	int got_sse2;

55	59	int got_popcnt;
56	60	int got_lzcnt;
57	61	int got_neon;
58
59	62	};
60	63
61	64	#endif

+279

-0

librfxcodec/src/rfxencode_alpha.c less more

	0	/**
	1	* librfxcodec: A Remote Desktop Protocol client.
	2	* RemoteFX Codec Library
	3	*
	4	* Copyright 2015 Jay Sorg <jay.sorg@gmail.com>
	5	*
	6	* Licensed under the Apache License, Version 2.0 (the "License");
	7	* you may not use this file except in compliance with the License.
	8	* You may obtain a copy of the License at
	9	*
	10	* http://www.apache.org/licenses/LICENSE-2.0
	11	*
	12	* Unless required by applicable law or agreed to in writing, software
	13	* distributed under the License is distributed on an "AS IS" BASIS,
	14	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	15	* See the License for the specific language governing permissions and
	16	* limitations under the License.
	17	*/
	18
	19	#include <stdio.h>
	20	#include <stdlib.h>
	21	#include <string.h>
	22
	23	#include <rfxcodec_encode.h>
	24
	25	#include "rfxcommon.h"
	26	#include "rfxencode.h"
	27	#include "rfxconstants.h"
	28	#include "rfxencode_tile.h"
	29
	30	#define LLOG_LEVEL 1
	31	#define LLOGLN(_level, _args) \
	32	do { if (_level < LLOG_LEVEL) { printf _args ; printf("\n"); } } while (0)
	33
	34	#if 1
	35	/*****************************************************************************/
	36	static int
	37	fdelta(char in_plane, char out_plane, int cx, int cy)
	38	{
	39	char delta;
	40	char *src8;
	41	char *dst8;
	42	int index;
	43	int jndex;
	44
	45	memcpy(out_plane, in_plane, cx);
	46	src8 = in_plane;
	47	dst8 = out_plane;
	48	for (jndex = 1; jndex < cy; jndex++)
	49	{
	50	for (index = 0; index < cx; index++)
	51	{
	52	delta = src8[cx] - src8[0];
	53	if (delta & 0x80)
	54	{
	55	delta = (((~delta) + 1) << 1) - 1;
	56	}
	57	else
	58	{
	59	delta = delta << 1;
	60	}
	61	dst8[cx] = delta;
	62	src8++;
	63	dst8++;
	64	}
	65	}
	66	return 0;
	67	}
	68	#endif
	69
	70	#if 0
	71	/*****************************************************************************/
	72	#define DELTA_ONE \
	73	do { \
	74	delta = src8[cx] - src8[0]; \
	75	is_neg = (delta >> 7) & 1; \
	76	dst8[cx] = (((delta ^ -is_neg) + is_neg) << 1) - is_neg; \
	77	src8++; \
	78	dst8++; \
	79	} while (0)
	80
	81	/*****************************************************************************/
	82	static int
	83	fdelta(char in_plane, char out_plane, int cx, int cy)
	84	{
	85	char delta;
	86	char is_neg;
	87	char *src8;
	88	char *dst8;
	89	char *src8_end;
	90
	91	memcpy(out_plane, in_plane, cx);
	92	src8 = in_plane;
	93	dst8 = out_plane;
	94	src8_end = src8 + (cx * cy - cx);
	95	while (src8 + 8 <= src8_end)
	96	{
	97	DELTA_ONE;
	98	DELTA_ONE;
	99	DELTA_ONE;
	100	DELTA_ONE;
	101	DELTA_ONE;
	102	DELTA_ONE;
	103	DELTA_ONE;
	104	DELTA_ONE;
	105	}
	106	while (src8 < src8_end)
	107	{
	108	DELTA_ONE;
	109	}
	110	return 0;
	111	}
	112	#endif
	113
	114	/*****************************************************************************/
	115	static int
	116	fout(int collen, int replen, char colptr, STREAM s)
	117	{
	118	int code;
	119	int lcollen;
	120	int lreplen;
	121	int cont;
	122
	123	LLOGLN(10, ("fout: collen %d replen %d", collen, replen));
	124	cont = collen > 13;
	125	while (cont)
	126	{
	127	lcollen = collen;
	128	if (lcollen > 15)
	129	{
	130	lcollen = 15;
	131	}
	132	code = lcollen << 4;
	133	stream_write_uint8(s, code);
	134	memcpy(s->p, colptr, lcollen);
	135	s->p += lcollen;
	136	colptr += lcollen;
	137	collen -= lcollen;
	138	cont = collen > 13;
	139	}
	140	cont = (collen > 0) \|\| (replen > 0);
	141	while (cont)
	142	{
	143	lreplen = replen;
	144	if ((collen == 0) && (lreplen > 15))
	145	{
	146	/* big run */
	147	if (lreplen > 47)
	148	{
	149	lreplen = 47;
	150	}
	151	LLOGLN(10, ("fout: big run lreplen %d", lreplen));
	152	replen -= lreplen;
	153	code = ((lreplen & 0xF) << 4) \| ((lreplen & 0xF0) >> 4);
	154	stream_write_uint8(s, code);
	155	colptr += lreplen;
	156	}
	157	else
	158	{
	159	if (lreplen > 15)
	160	{
	161	lreplen = 15;
	162	}
	163	replen -= lreplen;
	164	if (lreplen < 3)
	165	{
	166	collen += lreplen;
	167	lreplen = 0;
	168	}
	169	code = (collen << 4) \| lreplen;
	170	stream_write_uint8(s, code);
	171	memcpy(s->p, colptr, collen);
	172	s->p += collen;
	173	colptr += collen + lreplen;
	174	collen = 0;
	175	}
	176	cont = replen > 0;
	177	}
	178	return 0;
	179	}
	180
	181	/*****************************************************************************/
	182	static int
	183	fpack(char plane, int cx, int cy, STREAM s)
	184	{
	185	char *ptr8;
	186	char *colptr;
	187	char *lend;
	188	uint8 *holdp;
	189	int jndex;
	190	int collen;
	191	int replen;
	192
	193	LLOGLN(10, ("fpack:"));
	194	holdp = s->p;
	195	for (jndex = 0; jndex < cy; jndex++)
	196	{
	197	LLOGLN(10, ("line start line %d cx %d cy %d", jndex, cx, cy));
	198	ptr8 = (char ) (plane + jndex cx);
	199	lend = ptr8 + (cx - 1);
	200	colptr = ptr8;
	201	if (colptr[0] == 0)
	202	{
	203	collen = 0;
	204	replen = 1;
	205	}
	206	else
	207	{
	208	collen = 1;
	209	replen = 0;
	210	}
	211	while (ptr8 < lend)
	212	{
	213	if (ptr8[0] == ptr8[1])
	214	{
	215	replen++;
	216	}
	217	else
	218	{
	219	if (replen > 0)
	220	{
	221	if (replen < 3)
	222	{
	223	collen += replen + 1;
	224	replen = 0;
	225	}
	226	else
	227	{
	228	fout(collen, replen, colptr, s);
	229	colptr = ptr8 + 1;
	230	replen = 0;
	231	collen = 1;
	232	}
	233	}
	234	else
	235	{
	236	collen++;
	237	}
	238	}
	239	ptr8++;
	240	}
	241	/* end of line */
	242	fout(collen, replen, colptr, s);
	243	}
	244	return (int) (s->p - holdp);
	245	}
	246
	247	/*****************************************************************************/
	248	int
	249	rfx_encode_plane(struct rfxencode enc, uint8 plane, int cx, int cy,
	250	STREAM *s)
	251	{
	252	char *org_plane;
	253	char *delta_plane;
	254	int bytes;
	255	uint8 *holdp;
	256
	257	org_plane = (char *) plane;
	258	delta_plane = (char *) (enc->dwt_buffer1);
	259	fdelta(org_plane, delta_plane, cx, cy);
	260	holdp = s->p;
	261	stream_write_uint8(s, 0x10); /* flags, RLE */
	262	bytes = fpack(delta_plane, cx, cy, s);
	263	if (bytes > cx * cy)
	264	{
	265	LLOGLN(10, ("rfx_encode_plane: too big bytes %d", bytes));
	266	s->p = holdp;
	267	stream_write_uint8(s, 0); /* flags */
	268	memcpy(s->p, plane, cx * cy);
	269	s->p += cx * cy;
	270	stream_write_uint8(s, 0); /* pad if not RLE */
	271	bytes = cx * cy + 2;
	272	}
	273	else
	274	{
	275	LLOGLN(10, ("rfx_encode_plane: ok bytes %d", bytes));
	276	}
	277	return bytes;
	278	}

+28

-0

librfxcodec/src/rfxencode_alpha.h less more

	0	/**
	1	* librfxcodec: A Remote Desktop Protocol client.
	2	* RemoteFX Codec Library
	3	*
	4	* Copyright 2015 Jay Sorg <jay.sorg@gmail.com>
	5	*
	6	* Licensed under the Apache License, Version 2.0 (the "License");
	7	* you may not use this file except in compliance with the License.
	8	* You may obtain a copy of the License at
	9	*
	10	* http://www.apache.org/licenses/LICENSE-2.0
	11	*
	12	* Unless required by applicable law or agreed to in writing, software
	13	* distributed under the License is distributed on an "AS IS" BASIS,
	14	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	15	* See the License for the specific language governing permissions and
	16	* limitations under the License.
	17	*/
	18
	19	#ifndef __RFXCODEC_ENCODE_ALPHA_H
	20	#define __RFXCODEC_ENCODE_ALPHA_H
	21
	22	int
	23	rfx_encode_plane(struct rfxencode enc, uint8 plane, int cx, int cy,
	24	STREAM *s);
	25
	26	#endif
	27

+20

-7

librfxcodec/src/rfxencode_dwt.c less more

2	2	* RemoteFX Codec Library - DWT
3	3	*
4	4	* Copyright 2011 Vic Lee
5		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	5	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
6	6	*
7	7	* Licensed under the Apache License, Version 2.0 (the "License");
8	8	* you may not use this file except in compliance with the License.

150	150	{
151	151	uint8 *src;
152	152	sint16 l, h;
	153	sint16 s1, s2, s3;
153	154	int total_width;
154	155	int x, y;
155	156	int n;

165	166	l = dwt + x;
166	167	h = l + subband_width * total_width;
167	168	src = in_buffer + x;
168		h = ((src[total_width] - 128) - (((src[0] - 128) + (src[2 total_width] - 128)) >> 1)) >> 1;
169		l = (src[0] - 128) + h;
	169	s1 = (src[total_width] - 128) << DWT_FACTOR;
	170	s2 = (src[0] - 128) << DWT_FACTOR;
	171	s3 = (src[2 * total_width] - 128) << DWT_FACTOR;
	172	*h = (s1 - ((s2 + s3) >> 1)) >> 1;
	173	s1 = (src[0] - 128) << DWT_FACTOR;
	174	l = s1 + h;
170	175
171	176	/* loop */
172	177	for (n = 1; n < subband_width - 1; n++)

175	180	l = dwt + n * total_width + x;
176	181	h = l + subband_width * total_width;
177	182	src = in_buffer + y * total_width + x;
178		h = ((src[total_width] - 128) - (((src[0] - 128) + (src[2 total_width] - 128)) >> 1)) >> 1;
179		l = (src[0] - 128) + (((h - total_width) + *h) >> 1);
	183	s1 = (src[total_width] - 128) << DWT_FACTOR;
	184	s2 = (src[0] - 128) << DWT_FACTOR;
	185	s3 = (src[2 * total_width] - 128) << DWT_FACTOR;
	186	*h = (s1 - ((s2 + s3) >> 1)) >> 1;
	187	s1 = (src[0] - 128) << DWT_FACTOR;
	188	l = s1 + (((h - total_width) + *h) >> 1);
180	189	}
181	190
182	191	/* post */

185	194	l = dwt + n * total_width + x;
186	195	h = l + subband_width * total_width;
187	196	src = in_buffer + y * total_width + x;
188		*h = ((src[total_width] - 128) - (((src[0] - 128) + (src[0] - 128)) >> 1)) >> 1;
189		l = (src[0] - 128) + (((h - total_width) + *h) >> 1);
	197	s1 = (src[total_width] - 128) << DWT_FACTOR;
	198	s2 = (src[0] - 128) << DWT_FACTOR;
	199	s3 = (src[0] - 128) << DWT_FACTOR;
	200	*h = (s1 - ((s2 + s3) >> 1)) >> 1;
	201	s1 = (src[0] - 128) << DWT_FACTOR;
	202	l = s1 + (((h - total_width) + *h) >> 1);
190	203
191	204	}
192	205

+1

-1

librfxcodec/src/rfxencode_dwt.h less more

0	0	/**
1	1	* RFX codec encoder
2	2	*
3		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	3	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

+47

-13

librfxcodec/src/rfxencode_quantization.c less more

2	2	* RemoteFX Codec Library - Quantization
3	3	*
4	4	* Copyright 2011 Vic Lee
5		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	5	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
6	6	*
7	7	* Licensed under the Apache License, Version 2.0 (the "License");
8	8	* you may not use this file except in compliance with the License.

87	87	}
88	88	#endif
89	89
90		#if 1
	90	#if 0
91	91	/******************************************************************************/
92	92	static int
93	93	rfx_quantization_encode_block(sint16* buffer, int buffer_size, uint32 factor)

109	109	}
110	110	#endif
111	111
	112	#if 1
	113	/******************************************************************************/
	114	static int
	115	rfx_quantization_encode_block(sint16* buffer, int buffer_size, uint32 factor)
	116	{
	117	sint16* dst;
	118	sint16 half;
	119
	120	factor += DWT_FACTOR;
	121	if (factor == 0)
	122	{
	123	return 1;
	124	}
	125	half = (1 << (factor - 1));
	126	for (dst = buffer; buffer_size > 0; dst++, buffer_size--)
	127	{
	128	dst = (dst + half) >> factor;
	129	}
	130	return 0;
	131	}
	132	#endif
	133
112	134	/******************************************************************************/
113	135	int
114		rfx_quantization_encode(sint16* buffer, const int* quantization_values)
	136	rfx_quantization_encode(sint16* buffer, const char* qtable)
115	137	{
116		rfx_quantization_encode_block(buffer, 1024, quantization_values[8] - 6); /* HL1 */
117		rfx_quantization_encode_block(buffer + 1024, 1024, quantization_values[7] - 6); /* LH1 */
118		rfx_quantization_encode_block(buffer + 2048, 1024, quantization_values[9] - 6); /* HH1 */
119		rfx_quantization_encode_block(buffer + 3072, 256, quantization_values[5] - 6); /* HL2 */
120		rfx_quantization_encode_block(buffer + 3328, 256, quantization_values[4] - 6); /* LH2 */
121		rfx_quantization_encode_block(buffer + 3584, 256, quantization_values[6] - 6); /* HH2 */
122		rfx_quantization_encode_block(buffer + 3840, 64, quantization_values[2] - 6); /* HL3 */
123		rfx_quantization_encode_block(buffer + 3904, 64, quantization_values[1] - 6); /* LH3 */
124		rfx_quantization_encode_block(buffer + 3968, 64, quantization_values[3] - 6); /* HH3 */
125		rfx_quantization_encode_block(buffer + 4032, 64, quantization_values[0] - 6); /* LL3 */
	138	uint32 factor;
	139
	140	factor = ((qtable[4] >> 0) & 0xf) - 6;
	141	rfx_quantization_encode_block(buffer, 1024, factor); /* HL1 */
	142	factor = ((qtable[3] >> 4) & 0xf) - 6;
	143	rfx_quantization_encode_block(buffer + 1024, 1024, factor); /* LH1 */
	144	factor = ((qtable[4] >> 4) & 0xf) - 6;
	145	rfx_quantization_encode_block(buffer + 2048, 1024, factor); /* HH1 */
	146	factor = ((qtable[2] >> 4) & 0xf) - 6;
	147	rfx_quantization_encode_block(buffer + 3072, 256, factor); /* HL2 */
	148	factor = ((qtable[2] >> 0) & 0xf) - 6;
	149	rfx_quantization_encode_block(buffer + 3328, 256, factor); /* LH2 */
	150	factor = ((qtable[3] >> 0) & 0xf) - 6;
	151	rfx_quantization_encode_block(buffer + 3584, 256, factor); /* HH2 */
	152	factor = ((qtable[1] >> 0) & 0xf) - 6;
	153	rfx_quantization_encode_block(buffer + 3840, 64, factor); /* HL3 */
	154	factor = ((qtable[0] >> 4) & 0xf) - 6;
	155	rfx_quantization_encode_block(buffer + 3904, 64, factor); /* LH3 */
	156	factor = ((qtable[1] >> 4) & 0xf) - 6;
	157	rfx_quantization_encode_block(buffer + 3968, 64, factor); /* HH3 */
	158	factor = ((qtable[0] >> 0) & 0xf) - 6;
	159	rfx_quantization_encode_block(buffer + 4032, 64, factor); /* LL3 */
126	160	return 0;
127	161	}
128	162

+1

-1

librfxcodec/src/rfxencode_quantization.h less more

22	22	#include "rfxcommon.h"
23	23
24	24	int
25		rfx_quantization_encode(sint16* buffer, const int* quantization_values);
	25	rfx_quantization_encode(sint16 buffer, const char quantization_values);
26	26
27	27	#endif /* __RFX_QUANTIZATION_H */

+3

-1

librfxcodec/src/rfxencode_rlgr1.c less more

123	123	} while (0)
124	124
125	125	int
126		rfx_rlgr1_encode(const sint16* data, int data_size, uint8* buffer, int buffer_size)
	126	rfx_rlgr1_encode(const sint16* data, uint8* buffer, int buffer_size)
127	127	{
128	128	int k;
129	129	int kp;

136	136	int sign;
137	137	int processed_size;
138	138	int lmag;
	139	int data_size;
139	140
140	141	RFX_BITSTREAM bs;
141	142

149	150	krp = 1 << LSGR;
150	151
151	152	/* process all the input coefficients */
	153	data_size = 4096;
152	154	while (data_size > 0)
153	155	{
154	156	if (k)

+1

-1

librfxcodec/src/rfxencode_rlgr1.h less more

22	22	#include "rfxcommon.h"
23	23
24	24	int
25		rfx_rlgr1_encode(const sint16* data, int data_size, uint8* buffer, int buffer_size);
	25	rfx_rlgr1_encode(const sint16* data, uint8* buffer, int buffer_size);
26	26
27	27	#endif /* __RFX_RLGR_H */

+3

-1

librfxcodec/src/rfxencode_rlgr3.c less more

123	123	} while (0)
124	124
125	125	int
126		rfx_rlgr3_encode(const sint16* data, int data_size, uint8* buffer, int buffer_size)
	126	rfx_rlgr3_encode(const sint16* data, uint8* buffer, int buffer_size)
127	127	{
128	128	int k;
129	129	int kp;

136	136	int sign;
137	137	int processed_size;
138	138	int lmag;
	139	int data_size;
139	140
140	141	RFX_BITSTREAM bs;
141	142

152	153	krp = 1 << LSGR;
153	154
154	155	/* process all the input coefficients */
	156	data_size = 4096;
155	157	while (data_size > 0)
156	158	{
157	159	if (k)

+1

-1

librfxcodec/src/rfxencode_rlgr3.h less more

22	22	#include "rfxcommon.h"
23	23
24	24	int
25		rfx_rlgr3_encode(const sint16* data, int data_size, uint8* buffer, int buffer_size);
	25	rfx_rlgr3_encode(const sint16* data, uint8* buffer, int buffer_size);
26	26
27	27	#endif /* __RFX_RLGR_H */

+640

-143

librfxcodec/src/rfxencode_tile.c less more

2	2	* RemoteFX Codec Library - Encode
3	3	*
4	4	* Copyright 2011 Vic Lee
5		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	5	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
6	6	*
7	7	* Licensed under the Apache License, Version 2.0 (the "License");
8	8	* you may not use this file except in compliance with the License.

32	32	#include "rfxencode_differential.h"
33	33	#include "rfxencode_rlgr1.h"
34	34	#include "rfxencode_rlgr3.h"
	35	#include "rfxencode_alpha.h"
35	36
36	37	#ifdef RFX_USE_ACCEL_X86
37	38	#include "x86/funcs_x86.h"

57	58	uint8 r;
58	59	uint8 g;
59	60	uint8 b;
60
	61	uint8 *lr_buf;
	62	uint8 *lg_buf;
	63	uint8 *lb_buf;
	64
	65	LLOGLN(10, ("rfx_encode_format_rgb: pixel_format %d", pixel_format));
	66	b = 0;
	67	g = 0;
	68	r = 0;
61	69	switch (pixel_format)
62	70	{
63	71	case RFX_FORMAT_BGRA:
64	72	for (y = 0; y < height; y++)
65	73	{
66	74	src = (uint8) (rgb_data + y stride_bytes);
	75	lr_buf = r_buf + y * 64;
	76	lg_buf = g_buf + y * 64;
	77	lb_buf = b_buf + y * 64;
67	78	for (x = 0; x < width; x++)
68	79	{
69	80	b = *src++;
70		*b_buf++ = b;
	81	*lb_buf++ = b;
71	82	g = *src++;
72		*g_buf++ = g;
	83	*lg_buf++ = g;
73	84	r = *src++;
74		*r_buf++ = r;
	85	*lr_buf++ = r;
75	86	src++;
76	87	}
	88	while (x < 64)
	89	{
	90	*lr_buf++ = r;
	91	*lg_buf++ = g;
	92	*lb_buf++ = r;
	93	x++;
	94	}
	95	}
	96	while (y < 64)
	97	{
	98	lr_buf = r_buf + y * 64;
	99	lg_buf = g_buf + y * 64;
	100	lb_buf = b_buf + y * 64;
	101	memcpy(lr_buf, lr_buf - 64, 64);
	102	memcpy(lg_buf, lg_buf - 64, 64);
	103	memcpy(lb_buf, lb_buf - 64, 64);
	104	y++;
77	105	}
78	106	break;
79	107	case RFX_FORMAT_RGBA:
80	108	for (y = 0; y < height; y++)
81	109	{
82	110	src = (uint8) (rgb_data + y stride_bytes);
	111	lr_buf = r_buf + y * 64;
	112	lg_buf = g_buf + y * 64;
	113	lb_buf = b_buf + y * 64;
83	114	for (x = 0; x < width; x++)
84	115	{
85	116	r = *src++;
86		*r_buf++ = r;
	117	*lr_buf++ = r;
87	118	g = *src++;
88		*g_buf++ = g;
	119	*lg_buf++ = g;
89	120	b = *src++;
90		*b_buf++ = b;
	121	*lb_buf++ = b;
91	122	src++;
92	123	}
	124	while (x < 64)
	125	{
	126	*lr_buf++ = r;
	127	*lg_buf++ = g;
	128	*lb_buf++ = b;
	129	x++;
	130	}
	131	}
	132	while (y < 64)
	133	{
	134	lr_buf = r_buf + y * 64;
	135	lg_buf = g_buf + y * 64;
	136	lb_buf = b_buf + y * 64;
	137	memcpy(lr_buf, lr_buf - 64, 64);
	138	memcpy(lg_buf, lg_buf - 64, 64);
	139	memcpy(lb_buf, lb_buf - 64, 64);
	140	y++;
93	141	}
94	142	break;
95	143	case RFX_FORMAT_BGR:
96	144	for (y = 0; y < height; y++)
97	145	{
98	146	src = (uint8) (rgb_data + y stride_bytes);
	147	lr_buf = r_buf + y * 64;
	148	lg_buf = g_buf + y * 64;
	149	lb_buf = b_buf + y * 64;
99	150	for (x = 0; x < width; x++)
100	151	{
101	152	b = *src++;
102		*b_buf++ = b;
	153	*lb_buf++ = b;
103	154	g = *src++;
104		*g_buf++ = g;
	155	*lg_buf++ = g;
105	156	r = *src++;
106		*r_buf++ = r;
107		}
	157	*lr_buf++ = r;
	158	}
	159	while (x < 64)
	160	{
	161	*lr_buf++ = r;
	162	*lg_buf++ = g;
	163	*lb_buf++ = b;
	164	x++;
	165	}
	166	}
	167	while (y < 64)
	168	{
	169	lr_buf = r_buf + y * 64;
	170	lg_buf = g_buf + y * 64;
	171	lb_buf = b_buf + y * 64;
	172	memcpy(lr_buf, lr_buf - 64, 64);
	173	memcpy(lg_buf, lg_buf - 64, 64);
	174	memcpy(lb_buf, lb_buf - 64, 64);
	175	y++;
108	176	}
109	177	break;
110	178	case RFX_FORMAT_RGB:
111	179	for (y = 0; y < height; y++)
112	180	{
113	181	src = (uint8) (rgb_data + y stride_bytes);
	182	lr_buf = r_buf + y * 64;
	183	lg_buf = g_buf + y * 64;
	184	lb_buf = b_buf + y * 64;
114	185	for (x = 0; x < width; x++)
115	186	{
116	187	r = *src++;
117		*r_buf++ = r;
	188	*lr_buf++ = r;
118	189	g = *src++;
119		*g_buf++ = g;
	190	*lg_buf++ = g;
120	191	b = *src++;
121		*b_buf++ = b;
122		}
	192	*lb_buf++ = b;
	193	}
	194	while (x < 64)
	195	{
	196	*lr_buf++ = r;
	197	*lg_buf++ = g;
	198	*lb_buf++ = b;
	199	x++;
	200	}
	201	}
	202	while (y < 64)
	203	{
	204	lr_buf = r_buf + y * 64;
	205	lg_buf = g_buf + y * 64;
	206	lb_buf = b_buf + y * 64;
	207	memcpy(lr_buf, lr_buf - 64, 64);
	208	memcpy(lg_buf, lg_buf - 64, 64);
	209	memcpy(lb_buf, lb_buf - 64, 64);
	210	y++;
	211	}
	212	break;
	213	}
	214	return 0;
	215	}
	216
	217	/******************************************************************************/
	218	static int
	219	rfx_encode_format_argb(char *argb_data, int width, int height,
	220	int stride_bytes, int pixel_format,
	221	uint8 a_buf, uint8 r_buf, uint8 g_buf, uint8 b_buf)
	222	{
	223	int x;
	224	int y;
	225	const uint8 *src;
	226	uint8 a;
	227	uint8 r;
	228	uint8 g;
	229	uint8 b;
	230	uint8 *la_buf;
	231	uint8 *lr_buf;
	232	uint8 *lg_buf;
	233	uint8 *lb_buf;
	234
	235	LLOGLN(10, ("rfx_encode_format_argb: pixel_format %d", pixel_format));
	236	b = 0;
	237	g = 0;
	238	r = 0;
	239	a = 0;
	240	switch (pixel_format)
	241	{
	242	case RFX_FORMAT_BGRA:
	243	for (y = 0; y < height; y++)
	244	{
	245	src = (uint8) (argb_data + y stride_bytes);
	246	la_buf = a_buf + y * 64;
	247	lr_buf = r_buf + y * 64;
	248	lg_buf = g_buf + y * 64;
	249	lb_buf = b_buf + y * 64;
	250	for (x = 0; x < width; x++)
	251	{
	252	b = *src++;
	253	*lb_buf++ = b;
	254	g = *src++;
	255	*lg_buf++ = g;
	256	r = *src++;
	257	*lr_buf++ = r;
	258	a = *src++;
	259	*la_buf++ = a;
	260	}
	261	while (x < 64)
	262	{
	263	*la_buf++ = a;
	264	*lr_buf++ = r;
	265	*lg_buf++ = g;
	266	*lb_buf++ = r;
	267	x++;
	268	}
	269	}
	270	while (y < 64)
	271	{
	272	la_buf = a_buf + y * 64;
	273	lr_buf = r_buf + y * 64;
	274	lg_buf = g_buf + y * 64;
	275	lb_buf = b_buf + y * 64;
	276	memcpy(la_buf, la_buf - 64, 64);
	277	memcpy(lr_buf, lr_buf - 64, 64);
	278	memcpy(lg_buf, lg_buf - 64, 64);
	279	memcpy(lb_buf, lb_buf - 64, 64);
	280	y++;
	281	}
	282	break;
	283	case RFX_FORMAT_RGBA:
	284	for (y = 0; y < height; y++)
	285	{
	286	src = (uint8) (argb_data + y stride_bytes);
	287	la_buf = a_buf + y * 64;
	288	lr_buf = r_buf + y * 64;
	289	lg_buf = g_buf + y * 64;
	290	lb_buf = b_buf + y * 64;
	291	for (x = 0; x < width; x++)
	292	{
	293	r = *src++;
	294	*lr_buf++ = r;
	295	g = *src++;
	296	*lg_buf++ = g;
	297	b = *src++;
	298	*lb_buf++ = b;
	299	a = *src++;
	300	*la_buf++ = a;
	301	}
	302	while (x < 64)
	303	{
	304	*la_buf++ = a;
	305	*lr_buf++ = r;
	306	*lg_buf++ = g;
	307	*lb_buf++ = b;
	308	x++;
	309	}
	310	}
	311	while (y < 64)
	312	{
	313	la_buf = a_buf + y * 64;
	314	lr_buf = r_buf + y * 64;
	315	lg_buf = g_buf + y * 64;
	316	lb_buf = b_buf + y * 64;
	317	memcpy(la_buf, la_buf - 64, 64);
	318	memcpy(lr_buf, lr_buf - 64, 64);
	319	memcpy(lg_buf, lg_buf - 64, 64);
	320	memcpy(lb_buf, lb_buf - 64, 64);
	321	y++;
	322	}
	323	break;
	324	case RFX_FORMAT_BGR:
	325	for (y = 0; y < height; y++)
	326	{
	327	src = (uint8) (argb_data + y stride_bytes);
	328	lr_buf = r_buf + y * 64;
	329	lg_buf = g_buf + y * 64;
	330	lb_buf = b_buf + y * 64;
	331	for (x = 0; x < width; x++)
	332	{
	333	b = *src++;
	334	*lb_buf++ = b;
	335	g = *src++;
	336	*lg_buf++ = g;
	337	r = *src++;
	338	*lr_buf++ = r;
	339	}
	340	while (x < 64)
	341	{
	342	*lr_buf++ = r;
	343	*lg_buf++ = g;
	344	*lb_buf++ = b;
	345	x++;
	346	}
	347	}
	348	while (y < 64)
	349	{
	350	lr_buf = r_buf + y * 64;
	351	lg_buf = g_buf + y * 64;
	352	lb_buf = b_buf + y * 64;
	353	memcpy(lr_buf, lr_buf - 64, 64);
	354	memcpy(lg_buf, lg_buf - 64, 64);
	355	memcpy(lb_buf, lb_buf - 64, 64);
	356	y++;
	357	}
	358	break;
	359	case RFX_FORMAT_RGB:
	360	for (y = 0; y < height; y++)
	361	{
	362	src = (uint8) (argb_data + y stride_bytes);
	363	lr_buf = r_buf + y * 64;
	364	lg_buf = g_buf + y * 64;
	365	lb_buf = b_buf + y * 64;
	366	for (x = 0; x < width; x++)
	367	{
	368	r = *src++;
	369	*lr_buf++ = r;
	370	g = *src++;
	371	*lg_buf++ = g;
	372	b = *src++;
	373	*lb_buf++ = b;
	374	}
	375	while (x < 64)
	376	{
	377	*lr_buf++ = r;
	378	*lg_buf++ = g;
	379	*lb_buf++ = b;
	380	x++;
	381	}
	382	}
	383	while (y < 64)
	384	{
	385	lr_buf = r_buf + y * 64;
	386	lg_buf = g_buf + y * 64;
	387	lb_buf = b_buf + y * 64;
	388	memcpy(lr_buf, lr_buf - 64, 64);
	389	memcpy(lg_buf, lg_buf - 64, 64);
	390	memcpy(lb_buf, lb_buf - 64, 64);
	391	y++;
123	392	}
124	393	break;
125	394	}

138	407	-11071 -21736 32807
139	408	32756 -27429 -5327 */
140	409	static int
141		rfx_encode_rgb_to_ycbcr(uint8 y_r_buf, uint8 cb_g_buf, uint8 *cr_b_buf)
	410	rfx_encode_rgb_to_yuv(uint8 y_r_buf, uint8 u_g_buf, uint8 *v_b_buf)
142	411	{
143	412	int i;
144	413	sint32 r, g, b;
145		sint32 y, cb, cr;
	414	sint32 y, u, v;
146	415
147	416	for (i = 0; i < 4096; i++)
148	417	{
149	418	r = y_r_buf[i];
150		g = cb_g_buf[i];
151		b = cr_b_buf[i];
152
153		y = (r * 19595 + g * 38470 + b * 7471) >> 16;
154		cb = (r * -11071 + g * -21736 + b * 32807) >> 16;
155		cr = (r * 32756 + g * -27429 + b * -5327) >> 16;
	419	g = u_g_buf[i];
	420	b = v_b_buf[i];
	421
	422	y = (r * 19595 + g * 38470 + b * 7471) >> 16;
	423	u = (r * -11071 + g * -21736 + b * 32807) >> 16;
	424	v = (r * 32756 + g * -27429 + b * -5327) >> 16;
156	425
157	426	y_r_buf[i] = MINMAX(y, 0, 255);
158		cb_g_buf[i] = MINMAX(cb + 128, 0, 255);
159		cr_b_buf[i] = MINMAX(cr + 128, 0, 255);
160
161		}
162		return 0;
163		}
164
165		/******************************************************************************/
166		int
167		rfx_encode_component_rlgr1(struct rfxencode enc, const int quantization_values,
	427	u_g_buf[i] = MINMAX(u + 128, 0, 255);
	428	v_b_buf[i] = MINMAX(v + 128, 0, 255);
	429
	430	}
	431	return 0;
	432	}
	433
	434	/******************************************************************************/
	435	int
	436	rfx_encode_component_rlgr1(struct rfxencode enc, const char qtable,
168	437	uint8 data, uint8 buffer, int buffer_size, int *size)
169	438	{
	439	LLOGLN(10, ("rfx_encode_component_rlgr1:"));
170	440	if (rfx_dwt_2d_encode(data, enc->dwt_buffer1, enc->dwt_buffer) != 0)
171	441	{
172	442	return 1;
173	443	}
174		if (rfx_quantization_encode(enc->dwt_buffer1, quantization_values) != 0)
175		{
176		return 1;
177		}
178		if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
179		{
180		return 1;
181		}
182		*size = rfx_rlgr1_encode(enc->dwt_buffer1, 4096, buffer, buffer_size);
183		return 0;
184		}
185
186		/******************************************************************************/
187		int
188		rfx_encode_component_rlgr3(struct rfxencode enc, const int quantization_values,
	444	if (rfx_quantization_encode(enc->dwt_buffer1, qtable) != 0)
	445	{
	446	return 1;
	447	}
	448	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	449	{
	450	return 1;
	451	}
	452	*size = rfx_rlgr1_encode(enc->dwt_buffer1, buffer, buffer_size);
	453	return 0;
	454	}
	455
	456	/******************************************************************************/
	457	int
	458	rfx_encode_component_rlgr3(struct rfxencode enc, const char qtable,
189	459	uint8 data, uint8 buffer, int buffer_size, int *size)
190	460	{
	461	LLOGLN(10, ("rfx_encode_component_rlgr3:"));
191	462	if (rfx_dwt_2d_encode(data, enc->dwt_buffer1, enc->dwt_buffer) != 0)
192	463	{
193	464	return 1;
194	465	}
195		if (rfx_quantization_encode(enc->dwt_buffer1, quantization_values) != 0)
196		{
197		return 1;
198		}
199		if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
200		{
201		return 1;
202		}
203		*size = rfx_rlgr3_encode(enc->dwt_buffer1, 4096, buffer, buffer_size);
204		return 0;
205		}
206
207		/******************************************************************************/
208		int
209		rfx_encode_component_rlgr1_x86_sse2(struct rfxencode *enc,
210		const int *quantization_values,
	466	if (rfx_quantization_encode(enc->dwt_buffer1, qtable) != 0)
	467	{
	468	return 1;
	469	}
	470	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	471	{
	472	return 1;
	473	}
	474	*size = rfx_rlgr3_encode(enc->dwt_buffer1, buffer, buffer_size);
	475	return 0;
	476	}
	477
	478	/******************************************************************************/
	479	int
	480	rfx_encode_component_rlgr1_x86_sse2(struct rfxencode enc, const char qtable,
211	481	uint8 *data,
212	482	uint8 buffer, int buffer_size, int size)
213	483	{
214	484	LLOGLN(10, ("rfx_encode_component_rlgr1_x86_sse2:"));
215	485	#if defined(RFX_USE_ACCEL_X86)
216		if (dwt_shift_x86_sse2(quantization_values, data, enc->dwt_buffer1,
217		enc->dwt_buffer) != 0)
218		{
219		return 1;
220		}
221		*size = diff_rlgr1_x86(enc->dwt_buffer1, 4096, buffer, buffer_size);
222		#endif
223		return 0;
224		}
225
226		/******************************************************************************/
227		int
228		rfx_encode_component_rlgr3_x86_sse2(struct rfxencode *enc,
229		const int *quantization_values,
	486	if (rfxcodec_encode_dwt_shift_x86_sse2(qtable, data, enc->dwt_buffer1,
	487	enc->dwt_buffer) != 0)
	488	{
	489	return 1;
	490	}
	491	//*size = rfxcodec_encode_diff_rlgr1_x86_sse2(enc->dwt_buffer1,
	492	// buffer, buffer_size);
	493	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	494	{
	495	return 1;
	496	}
	497	*size = rfx_rlgr1_encode(enc->dwt_buffer1, buffer, buffer_size);
	498	#endif
	499	return 0;
	500	}
	501
	502	/******************************************************************************/
	503	int
	504	rfx_encode_component_rlgr3_x86_sse2(struct rfxencode enc, const char qtable,
230	505	uint8 *data,
231	506	uint8 buffer, int buffer_size, int size)
232	507	{
233	508	LLOGLN(10, ("rfx_encode_component_rlgr3_x86_sse2:"));
234	509	#if defined(RFX_USE_ACCEL_X86)
235		if (dwt_shift_x86_sse2(quantization_values, data, enc->dwt_buffer1,
236		enc->dwt_buffer) != 0)
237		{
238		return 1;
239		}
240		*size = diff_rlgr3_x86(enc->dwt_buffer1, 4096, buffer, buffer_size);
241		#endif
242		return 0;
243		}
244
245		/******************************************************************************/
246		int
247		rfx_encode_component_rlgr1_amd64_sse2(struct rfxencode *enc,
248		const int *quantization_values,
	510	if (rfxcodec_encode_dwt_shift_x86_sse2(qtable, data, enc->dwt_buffer1,
	511	enc->dwt_buffer) != 0)
	512	{
	513	return 1;
	514	}
	515	//*size = rfxcodec_encode_diff_rlgr3_x86_sse2(enc->dwt_buffer1,
	516	// buffer, buffer_size);
	517	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	518	{
	519	return 1;
	520	}
	521	*size = rfx_rlgr3_encode(enc->dwt_buffer1, buffer, buffer_size);
	522	#endif
	523	return 0;
	524	}
	525
	526	/******************************************************************************/
	527	int
	528	rfx_encode_component_rlgr1_x86_sse41(struct rfxencode enc, const char qtable,
	529	uint8 *data,
	530	uint8 buffer, int buffer_size, int size)
	531	{
	532	LLOGLN(10, ("rfx_encode_component_rlgr1_x86_sse41:"));
	533	#if defined(RFX_USE_ACCEL_X86)
	534	if (rfxcodec_encode_dwt_shift_x86_sse41(qtable, data, enc->dwt_buffer1,
	535	enc->dwt_buffer) != 0)
	536	{
	537	return 1;
	538	}
	539	//*size = rfxcodec_encode_diff_rlgr1_x86_sse2(enc->dwt_buffer1,
	540	// buffer, buffer_size);
	541	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	542	{
	543	return 1;
	544	}
	545	*size = rfx_rlgr1_encode(enc->dwt_buffer1, buffer, buffer_size);
	546	#endif
	547	return 0;
	548	}
	549
	550	/******************************************************************************/
	551	int
	552	rfx_encode_component_rlgr3_x86_sse41(struct rfxencode enc, const char qtable,
	553	uint8 *data,
	554	uint8 buffer, int buffer_size, int size)
	555	{
	556	LLOGLN(10, ("rfx_encode_component_rlgr3_x86_sse41:"));
	557	#if defined(RFX_USE_ACCEL_X86)
	558	if (rfxcodec_encode_dwt_shift_x86_sse41(qtable, data, enc->dwt_buffer1,
	559	enc->dwt_buffer) != 0)
	560	{
	561	return 1;
	562	}
	563	//*size = rfxcodec_encode_diff_rlgr3_x86_sse(enc->dwt_buffer1,
	564	// buffer, buffer_size);
	565	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	566	{
	567	return 1;
	568	}
	569	*size = rfx_rlgr3_encode(enc->dwt_buffer1, buffer, buffer_size);
	570	#endif
	571	return 0;
	572	}
	573
	574	/******************************************************************************/
	575	int
	576	rfx_encode_component_rlgr1_amd64_sse2(struct rfxencode enc, const char qtable,
249	577	uint8 *data,
250	578	uint8 buffer, int buffer_size, int size)
251	579	{
252	580	LLOGLN(10, ("rfx_encode_component_rlgr1_amd64_sse2:"));
253	581	#if defined(RFX_USE_ACCEL_AMD64)
254		if (dwt_shift_amd64_sse2(quantization_values, data, enc->dwt_buffer1,
255		enc->dwt_buffer) != 0)
256		{
257		return 1;
258		}
259		*size = diff_rlgr1_amd64(enc->dwt_buffer1, 4096, buffer, buffer_size);
260		#endif
261		return 0;
262		}
263
264		/******************************************************************************/
265		int
266		rfx_encode_component_rlgr3_amd64_sse2(struct rfxencode *enc,
267		const int *quantization_values,
	582	if (rfxcodec_encode_dwt_shift_amd64_sse2(qtable, data, enc->dwt_buffer1,
	583	enc->dwt_buffer) != 0)
	584	{
	585	return 1;
	586	}
	587	//*size = rfxcodec_encode_diff_rlgr1_amd64_sse2(enc->dwt_buffer1,
	588	// buffer, buffer_size);
	589	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	590	{
	591	return 1;
	592	}
	593	*size = rfx_rlgr1_encode(enc->dwt_buffer1, buffer, buffer_size);
	594	#endif
	595	return 0;
	596	}
	597
	598	/******************************************************************************/
	599	int
	600	rfx_encode_component_rlgr3_amd64_sse2(struct rfxencode enc, const char qtable,
268	601	uint8 *data,
269	602	uint8 buffer, int buffer_size, int size)
270	603	{
271	604	LLOGLN(10, ("rfx_encode_component_rlgr3_amd64_sse2:"));
272	605	#if defined(RFX_USE_ACCEL_AMD64)
273		if (dwt_shift_amd64_sse2(quantization_values, data, enc->dwt_buffer1,
274		enc->dwt_buffer) != 0)
275		{
276		return 1;
277		}
278		*size = diff_rlgr3_amd64(enc->dwt_buffer1, 4096, buffer, buffer_size);
	606	if (rfxcodec_encode_dwt_shift_amd64_sse2(qtable, data, enc->dwt_buffer1,
	607	enc->dwt_buffer) != 0)
	608	{
	609	return 1;
	610	}
	611	//*size = rfxcodec_encode_diff_rlgr3_amd64_sse2(enc->dwt_buffer1,
	612	// buffer, buffer_size);
	613	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	614	{
	615	return 1;
	616	}
	617	*size = rfx_rlgr3_encode(enc->dwt_buffer1, buffer, buffer_size);
	618	#endif
	619	return 0;
	620	}
	621
	622	/******************************************************************************/
	623	int
	624	rfx_encode_component_rlgr1_amd64_sse41(struct rfxencode enc, const char qtable,
	625	uint8 *data,
	626	uint8 buffer, int buffer_size, int size)
	627	{
	628	LLOGLN(10, ("rfx_encode_component_rlgr1_amd64_sse2:"));
	629	#if defined(RFX_USE_ACCEL_AMD64)
	630	if (rfxcodec_encode_dwt_shift_amd64_sse41(qtable, data, enc->dwt_buffer1,
	631	enc->dwt_buffer) != 0)
	632	{
	633	return 1;
	634	}
	635	//*size = rfxcodec_encode_diff_rlgr1_amd64_sse2(enc->dwt_buffer1,
	636	// buffer, buffer_size);
	637	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	638	{
	639	return 1;
	640	}
	641	*size = rfx_rlgr1_encode(enc->dwt_buffer1, buffer, buffer_size);
	642	#endif
	643	return 0;
	644	}
	645
	646	/******************************************************************************/
	647	int
	648	rfx_encode_component_rlgr3_amd64_sse41(struct rfxencode enc, const char qtable,
	649	uint8 *data,
	650	uint8 buffer, int buffer_size, int size)
	651	{
	652	LLOGLN(10, ("rfx_encode_component_rlgr3_amd64_sse2:"));
	653	#if defined(RFX_USE_ACCEL_AMD64)
	654	if (rfxcodec_encode_dwt_shift_amd64_sse41(qtable, data, enc->dwt_buffer1,
	655	enc->dwt_buffer) != 0)
	656	{
	657	return 1;
	658	}
	659	//*size = rfxcodec_encode_diff_rlgr3_amd64_sse2(enc->dwt_buffer1,
	660	// buffer, buffer_size);
	661	if (rfx_differential_encode(enc->dwt_buffer1 + 4032, 64) != 0)
	662	{
	663	return 1;
	664	}
	665	*size = rfx_rlgr3_encode(enc->dwt_buffer1, buffer, buffer_size);
279	666	#endif
280	667	return 0;
281	668	}

284	671	int
285	672	rfx_encode_rgb(struct rfxencode enc, char rgb_data,
286	673	int width, int height, int stride_bytes,
287		const int y_quants, const int cb_quants, const int *cr_quants,
288		STREAM data_out, int y_size, int cb_size, int cr_size)
	674	const char y_quants, const char u_quants,
	675	const char *v_quants,
	676	STREAM data_out, int y_size, int u_size, int v_size)
289	677	{
290	678	uint8 *y_r_buffer;
291		uint8 *cb_g_buffer;
292		uint8 *cr_b_buffer;
	679	uint8 *u_g_buffer;
	680	uint8 *v_b_buffer;
293	681
294	682	y_r_buffer = enc->y_r_buffer;
295		cb_g_buffer = enc->cb_g_buffer;
296		cr_b_buffer = enc->cr_b_buffer;
	683	u_g_buffer = enc->u_g_buffer;
	684	v_b_buffer = enc->v_b_buffer;
297	685	if (rfx_encode_format_rgb(rgb_data, width, height, stride_bytes,
298	686	enc->format,
299		y_r_buffer, cb_g_buffer, cr_b_buffer) != 0)
300		{
301		return 1;
302		}
303		if (rfx_encode_rgb_to_ycbcr(y_r_buffer, cb_g_buffer, cr_b_buffer) != 0)
	687	y_r_buffer, u_g_buffer, v_b_buffer) != 0)
	688	{
	689	return 1;
	690	}
	691	if (rfx_encode_rgb_to_yuv(y_r_buffer, u_g_buffer, v_b_buffer) != 0)
304	692	{
305	693	return 1;
306	694	}

313	701	}
314	702	LLOGLN(10, ("rfx_encode_rgb: y_size %d", *y_size));
315	703	stream_seek(data_out, *y_size);
316		if (enc->rfx_encode(enc, cb_quants, cb_g_buffer,
317		stream_get_tail(data_out),
318		stream_get_left(data_out),
319		cb_size) != 0)
320		{
321		return 1;
322		}
323		LLOGLN(10, ("rfx_encode_rgb: cb_size %d", *cb_size));
324		stream_seek(data_out, *cb_size);
325		if (enc->rfx_encode(enc, cr_quants, cr_b_buffer,
326		stream_get_tail(data_out),
327		stream_get_left(data_out),
328		cr_size) != 0)
329		{
330		return 1;
331		}
332		LLOGLN(10, ("rfx_encode_rgb: cr_size %d", *cr_size));
333		stream_seek(data_out, *cr_size);
	704	if (enc->rfx_encode(enc, u_quants, u_g_buffer,
	705	stream_get_tail(data_out),
	706	stream_get_left(data_out),
	707	u_size) != 0)
	708	{
	709	return 1;
	710	}
	711	LLOGLN(10, ("rfx_encode_rgb: u_size %d", *u_size));
	712	stream_seek(data_out, *u_size);
	713	if (enc->rfx_encode(enc, v_quants, v_b_buffer,
	714	stream_get_tail(data_out),
	715	stream_get_left(data_out),
	716	v_size) != 0)
	717	{
	718	return 1;
	719	}
	720	LLOGLN(10, ("rfx_encode_rgb: v_size %d", *v_size));
	721	stream_seek(data_out, *v_size);
	722	return 0;
	723	}
	724
	725	/******************************************************************************/
	726	int
	727	rfx_encode_argb(struct rfxencode enc, char rgb_data,
	728	int width, int height, int stride_bytes,
	729	const char y_quants, const char u_quants,
	730	const char *v_quants,
	731	STREAM data_out, int y_size, int *u_size,
	732	int v_size, int a_size)
	733	{
	734	uint8 *a_buffer;
	735	uint8 *y_r_buffer;
	736	uint8 *u_g_buffer;
	737	uint8 *v_b_buffer;
	738
	739	LLOGLN(10, ("rfx_encode_argb:"));
	740	a_buffer = enc->a_buffer;
	741	y_r_buffer = enc->y_r_buffer;
	742	u_g_buffer = enc->u_g_buffer;
	743	v_b_buffer = enc->v_b_buffer;
	744	if (rfx_encode_format_argb(rgb_data, width, height, stride_bytes,
	745	enc->format,
	746	a_buffer, y_r_buffer,
	747	u_g_buffer, v_b_buffer) != 0)
	748	{
	749	return 1;
	750	}
	751	if (rfx_encode_rgb_to_yuv(y_r_buffer, u_g_buffer, v_b_buffer) != 0)
	752	{
	753	return 1;
	754	}
	755	if (enc->rfx_encode(enc, y_quants, y_r_buffer,
	756	stream_get_tail(data_out),
	757	stream_get_left(data_out),
	758	y_size) != 0)
	759	{
	760	return 1;
	761	}
	762	LLOGLN(10, ("rfx_encode_rgb: y_size %d", *y_size));
	763	stream_seek(data_out, *y_size);
	764	if (enc->rfx_encode(enc, u_quants, u_g_buffer,
	765	stream_get_tail(data_out),
	766	stream_get_left(data_out),
	767	u_size) != 0)
	768	{
	769	return 1;
	770	}
	771	LLOGLN(10, ("rfx_encode_rgb: u_size %d", *u_size));
	772	stream_seek(data_out, *u_size);
	773	if (enc->rfx_encode(enc, v_quants, v_b_buffer,
	774	stream_get_tail(data_out),
	775	stream_get_left(data_out),
	776	v_size) != 0)
	777	{
	778	return 1;
	779	}
	780	LLOGLN(10, ("rfx_encode_rgb: v_size %d", *v_size));
	781	stream_seek(data_out, *v_size);
	782	*a_size = rfx_encode_plane(enc, a_buffer, 64, 64, data_out);
334	783	return 0;
335	784	}
336	785

338	787	int
339	788	rfx_encode_yuv(struct rfxencode enc, char yuv_data,
340	789	int width, int height, int stride_bytes,
341		const int y_quants, const int u_quants, const int *v_quants,
	790	const char y_quants, const char u_quants,
	791	const char *v_quants,
342	792	STREAM data_out, int y_size, int u_size, int v_size)
343	793	{
344	794	uint8 *y_buffer;

374	824	stream_seek(data_out, *v_size);
375	825	return 0;
376	826	}
	827
	828	/******************************************************************************/
	829	int
	830	rfx_encode_yuva(struct rfxencode enc, char yuva_data,
	831	int width, int height, int stride_bytes,
	832	const char y_quants, const char u_quants,
	833	const char *v_quants,
	834	STREAM data_out, int y_size, int *u_size,
	835	int v_size, int a_size)
	836	{
	837	uint8 *y_buffer;
	838	uint8 *u_buffer;
	839	uint8 *v_buffer;
	840	uint8 *a_buffer;
	841
	842	y_buffer = (uint8 *) yuva_data;
	843	u_buffer = (uint8 *) (yuva_data + RFX_YUV_BTES);
	844	v_buffer = (uint8 ) (yuva_data + RFX_YUV_BTES 2);
	845	a_buffer = (uint8 ) (yuva_data + RFX_YUV_BTES 3);
	846	if (enc->rfx_encode(enc, y_quants, y_buffer,
	847	stream_get_tail(data_out),
	848	stream_get_left(data_out),
	849	y_size) != 0)
	850	{
	851	return 1;
	852	}
	853	stream_seek(data_out, *y_size);
	854	if (enc->rfx_encode(enc, u_quants, u_buffer,
	855	stream_get_tail(data_out),
	856	stream_get_left(data_out),
	857	u_size) != 0)
	858	{
	859	return 1;
	860	}
	861	stream_seek(data_out, *u_size);
	862	if (enc->rfx_encode(enc, v_quants, v_buffer,
	863	stream_get_tail(data_out),
	864	stream_get_left(data_out),
	865	v_size) != 0)
	866	{
	867	return 1;
	868	}
	869	stream_seek(data_out, *v_size);
	870	*a_size = rfx_encode_plane(enc, a_buffer, 64, 64, data_out);
	871	return 0;
	872	}
	873

+48

-21

librfxcodec/src/rfxencode_tile.h less more

2	2	* RemoteFX Codec Library - Encode
3	3	*
4	4	* Copyright 2011 Vic Lee
5		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	5	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
6	6	*
7	7	* Licensed under the Apache License, Version 2.0 (the "License");
8	8	* you may not use this file except in compliance with the License.

26	26	#define RFX_YUV_BTES (64 * 64)
27	27
28	28	int
29		rfx_encode_component_rlgr1(struct rfxencode *enc,
30		const int *quantization_values,
	29	rfx_encode_component_rlgr1(struct rfxencode enc, const char qtable,
31	30	uint8 *data,
32	31	uint8 buffer, int buffer_size, int size);
33	32	int
34		rfx_encode_component_rlgr3(struct rfxencode *enc,
35		const int *quantization_values,
	33	rfx_encode_component_rlgr3(struct rfxencode enc, const char qtable,
36	34	uint8 *data,
37	35	uint8 buffer, int buffer_size, int size);
38	36	int
39		rfx_encode_component_rlgr1_x86_sse2(struct rfxencode *enc,
40		const int *quantization_values,
	37	rfx_encode_rgb(struct rfxencode enc, char rgb_data,
	38	int width, int height, int stride_bytes,
	39	const char y_quants, const char u_quants,
	40	const char *v_quants,
	41	STREAM data_out, int y_size, int cb_size, int cr_size);
	42	int
	43	rfx_encode_argb(struct rfxencode enc, char argb_data,
	44	int width, int height, int stride_bytes,
	45	const char y_quants, const char cb_quants,
	46	const char *cr_quants,
	47	STREAM data_out, int y_size, int *u_size,
	48	int v_size, int a_size);
	49	int
	50	rfx_encode_yuv(struct rfxencode enc, char yuv_data,
	51	int width, int height, int stride_bytes,
	52	const char y_quants, const char u_quants,
	53	const char *v_quants,
	54	STREAM data_out, int y_size, int u_size, int v_size);
	55	int
	56	rfx_encode_yuva(struct rfxencode enc, char yuv_data,
	57	int width, int height, int stride_bytes,
	58	const char y_quants, const char u_quants,
	59	const char *v_quants,
	60	STREAM data_out, int y_size, int *u_size,
	61	int v_size, int a_size);
	62
	63	int
	64	rfx_encode_component_rlgr1_x86_sse2(struct rfxencode enc, const char qtable,
41	65	uint8 *data,
42	66	uint8 buffer, int buffer_size, int size);
43	67	int
44		rfx_encode_component_rlgr3_x86_sse2(struct rfxencode *enc,
45		const int *quantization_values,
	68	rfx_encode_component_rlgr3_x86_sse2(struct rfxencode enc, const char qtable,
46	69	uint8 *data,
47	70	uint8 buffer, int buffer_size, int size);
48	71	int
49		rfx_encode_component_rlgr1_amd64_sse2(struct rfxencode *enc,
50		const int *quantization_values,
	72	rfx_encode_component_rlgr1_x86_sse41(struct rfxencode enc, const char qtable,
	73	uint8 *data,
	74	uint8 buffer, int buffer_size, int size);
	75	int
	76	rfx_encode_component_rlgr3_x86_sse41(struct rfxencode enc, const char qtable,
	77	uint8 *data,
	78	uint8 buffer, int buffer_size, int size);
	79	int
	80	rfx_encode_component_rlgr1_amd64_sse2(struct rfxencode enc, const char qtable,
51	81	uint8 *data,
52	82	uint8 buffer, int buffer_size, int size);
53	83	int
54		rfx_encode_component_rlgr3_amd64_sse2(struct rfxencode *enc,
55		const int *quantization_values,
	84	rfx_encode_component_rlgr3_amd64_sse2(struct rfxencode enc, const char qtable,
56	85	uint8 *data,
57	86	uint8 buffer, int buffer_size, int size);
58	87	int
59		rfx_encode_rgb(struct rfxencode enc, char rgb_data,
60		int width, int height, int stride_bytes,
61		const int y_quants, const int cb_quants, const int *cr_quants,
62		STREAM data_out, int y_size, int cb_size, int cr_size);
	88	rfx_encode_component_rlgr1_amd64_sse41(struct rfxencode enc, const char qtable,
	89	uint8 *data,
	90	uint8 buffer, int buffer_size, int size);
63	91	int
64		rfx_encode_yuv(struct rfxencode enc, char yuv_data,
65		int width, int height, int stride_bytes,
66		const int y_quants, const int u_quants, const int *v_quants,
67		STREAM data_out, int y_size, int u_size, int v_size);
	92	rfx_encode_component_rlgr3_amd64_sse41(struct rfxencode enc, const char qtable,
	93	uint8 *data,
	94	uint8 buffer, int buffer_size, int size);
68	95
69	96	#endif

+4

-0

librfxcodec/src/x86/cpuid_x86.asm less more

9	9	;int
10	10	;cpuid_x86(int eax_in, int ecx_in, int eax, int ebx, int ecx, int edx)
11	11
	12	%ifidn __OUTPUT_FORMAT__,elf
12	13	PROC cpuid_x86
	14	%else
	15	PROC _cpuid_x86
	16	%endif
13	17	; save registers
14	18	push ebx
15	19	push ecx

+26

-5

librfxcodec/src/x86/funcs_x86.h less more

0	0	/*
1		Copyright 2014 Jay Sorg
	1	Copyright 2014-2015 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

25	25
26	26	int
27	27	cpuid_x86(int eax_in, int ecx_in, int eax, int ebx, int ecx, int edx);
	28
28	29	int
29		dwt_shift_x86_sse2(const int quantization_values, uint8 data,
30		sint16 dwt_buffer1, sint16 dwt_buffer);
	30	rfxcodec_encode_dwt_shift_x86_sse2(const char *qtable,
	31	unsigned char *data,
	32	short *dwt_buffer1,
	33	short *dwt_buffer);
31	34	int
32		diff_rlgr1_x86(sint16 co, int num_co, uint8 dst, int dst_bytes);
	35	rfxcodec_encode_diff_rlgr1_x86_sse2(short *co,
	36	void *dst, int dst_bytes);
33	37	int
34		diff_rlgr3_x86(sint16 co, int num_co, uint8 dst, int dst_bytes);
	38	rfxcodec_encode_diff_rlgr3_x86_sse2(short *co,
	39	void *dst, int dst_bytes);
	40
	41	int
	42	rfxcodec_decode_rlgr1_diff_x86_sse2(void *data, int data_bytes,
	43	short *out_data);
	44	int
	45	rfxcodec_decode_rlgr3_diff_x86_sse2(void *data, int data_bytes,
	46	short *out_data);
	47	int
	48	rfxcodec_decode_shift_idwt_x86_sse2(const char qtable, short src, short *dst);
	49	int
	50	rfxcodec_decode_yuv2rgb_x86_sse2(short ydata, short udata, short *vdata,
	51	unsigned int *rgbdata, int stride);
	52	int
	53	rfxcodec_decode_yuva2argb_x86_sse2(short ydata, short udata,
	54	short vdata, char adata,
	55	unsigned int *rgbdata, int stride);
35	56
36	57	#endif
37	58

+0

-0

~~librfxcodec/src/x86/readme.txt~~ less more

(Empty file)

+30

-0

librfxcodec/src/x86/rfxcodec_encode_diff_rlgr1_x86_sse2.asm less more

	0
	1	section .data
	2	const1 times 8 dw 1
	3
	4	%macro PROC 1
	5	align 16
	6	global %1
	7	%1:
	8	%endmacro
	9
	10	;int
	11	;rfxcodec_encode_diff_rlgr1_x86_sse2(short *co,
	12	; void *dst, int dst_bytes);
	13
	14	%ifidn __OUTPUT_FORMAT__,elf
	15	PROC rfxcodec_encode_diff_rlgr1_x86_sse2
	16	%else
	17	PROC _rfxcodec_encode_diff_rlgr1_x86_sse2
	18	%endif
	19	push ebx
	20	push esi
	21	push edi
	22
	23	mov eax, 0
	24	pop edi
	25	pop esi
	26	pop ebx
	27	ret
	28	align 16
	29

+30

-0

librfxcodec/src/x86/rfxcodec_encode_diff_rlgr3_x86_sse2.asm less more

	0
	1	section .data
	2	const1 times 8 dw 1
	3
	4	%macro PROC 1
	5	align 16
	6	global %1
	7	%1:
	8	%endmacro
	9
	10	;int
	11	;rfxcodec_encode_diff_rlgr3_x86_sse2(short *co,
	12	; void *dst, int dst_bytes);
	13
	14	%ifidn __OUTPUT_FORMAT__,elf
	15	PROC rfxcodec_encode_diff_rlgr3_x86_sse2
	16	%else
	17	PROC _rfxcodec_encode_diff_rlgr3_x86_sse2
	18	%endif
	19	push ebx
	20	push esi
	21	push edi
	22
	23	mov eax, 0
	24	pop edi
	25	pop esi
	26	pop ebx
	27	ret
	28	align 16
	29

+1529

-0

librfxcodec/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm less more

	0	;
	1	;Copyright 2016 Jay Sorg
	2	;
	3	;Permission to use, copy, modify, distribute, and sell this software and its
	4	;documentation for any purpose is hereby granted without fee, provided that
	5	;the above copyright notice appear in all copies and that both that
	6	;copyright notice and this permission notice appear in supporting
	7	;documentation.
	8	;
	9	;The above copyright notice and this permission notice shall be included in
	10	;all copies or substantial portions of the Software.
	11	;
	12	;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	13	;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	14	;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	15	;OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	16	;AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	17	;CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	18	;
	19	;x86 asm dwt
	20
	21	section .data
	22	align 16
	23	cw128 times 8 dw 128
	24	cdFFFF times 4 dd 65535
	25	; these are 1 << (factor - 1) 0 to 15 is factor
	26	cwa0 times 8 dw 0 ; 0
	27	cwa1 times 8 dw 1 ; 1
	28	cwa2 times 8 dw 2 ; 2
	29	cwa4 times 8 dw 4 ; 3
	30	cwa8 times 8 dw 8 ; 4
	31	cwa16 times 8 dw 16 ; 5
	32	cwa32 times 8 dw 32 ; 6
	33	cwa64 times 8 dw 64 ; 7
	34	cwa128 times 8 dw 128 ; 8
	35	cwa256 times 8 dw 256 ; 9
	36	cwa512 times 8 dw 512 ; 10
	37	cwa1024 times 8 dw 1024 ; 11
	38	cwa2048 times 8 dw 2048 ; 12
	39	cwa4096 times 8 dw 4096 ; 13
	40	cwa8192 times 8 dw 8192 ; 14
	41	cwa16384 times 8 dw 16384 ; 15
	42
	43	section .text
	44
	45	%macro PROC 1
	46	align 16
	47	global %1
	48	%1:
	49	%endmacro
	50
	51	%define LHI_ADD [esp + 1 * 16 + 4]
	52	%define LHI_SFT [esp + 2 * 16 + 4]
	53	%define LLO_ADD [esp + 3 * 16 + 4]
	54	%define LLO_SFT [esp + 4 * 16 + 4]
	55
	56	;******************************************************************************
	57	; source 16 bit signed, 16 pixel width
	58	rfx_dwt_2d_encode_block_horiz_16_16:
	59	mov ecx, 8
	60	loop1a:
	61	; pre / post
	62	movdqa xmm1, [esi] ; src[2n]
	63	movdqa xmm2, [esi + 16]
	64	movdqa xmm6, xmm1
	65	movdqa xmm7, xmm2
	66	pand xmm1, [cdFFFF]
	67	pand xmm2, [cdFFFF]
	68	pslld xmm1, 16
	69	pslld xmm2, 16
	70	psrad xmm1, 16
	71	psrad xmm2, 16
	72	packssdw xmm1, xmm2
	73	movdqa xmm2, xmm6 ; src[2n + 1]
	74	movdqa xmm3, xmm7
	75	psrldq xmm2, 2
	76	psrldq xmm3, 2
	77	pand xmm2, [cdFFFF]
	78	pand xmm3, [cdFFFF]
	79	pslld xmm2, 16
	80	pslld xmm3, 16
	81	psrad xmm2, 16
	82	psrad xmm3, 16
	83	packssdw xmm2, xmm3
	84	movdqa xmm3, xmm6 ; src[2n + 2]
	85	movdqa xmm4, xmm7
	86	psrldq xmm3, 4
	87	psrldq xmm4, 4
	88	movd eax, xmm7
	89	movd xmm5, eax
	90	pslldq xmm5, 12
	91	por xmm3, xmm5
	92	movdqa xmm5, xmm7
	93	psrldq xmm5, 12
	94	pslldq xmm5, 12
	95	por xmm4, xmm5
	96	pand xmm3, [cdFFFF]
	97	pand xmm4, [cdFFFF]
	98	pslld xmm3, 16
	99	pslld xmm4, 16
	100	psrad xmm3, 16
	101	psrad xmm4, 16
	102	packssdw xmm3, xmm4
	103	movdqa xmm4, xmm1
	104	movdqa xmm5, xmm2
	105	movdqa xmm6, xmm3
	106	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	107	paddw xmm4, xmm6
	108	psraw xmm4, 1
	109	psubw xmm5, xmm4
	110	psraw xmm5, 1
	111	movdqa xmm6, xmm5 ; out hi
	112	paddw xmm6, LHI_ADD
	113	psraw xmm6, LHI_SFT
	114	movdqa [edi], xmm6
	115	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	116	movdqa xmm7, xmm5
	117	movd eax, xmm7
	118	pslldq xmm7, 2
	119	and eax, 0xFFFF
	120	movd xmm6, eax
	121	por xmm7, xmm6
	122	paddw xmm5, xmm7
	123	psraw xmm5, 1
	124	paddw xmm5, xmm1
	125
	126	movdqa xmm6, xmm5 ; out lo
	127	paddw xmm6, LLO_ADD
	128	psraw xmm6, LLO_SFT
	129	movdqa [edx], xmm6
	130
	131	; move right
	132	lea esi, [esi + 16 * 2]
	133	lea edi, [edi + 8 * 2]
	134	lea edx, [edx + 8 * 2]
	135
	136	; move left
	137	lea esi, [esi - 16 * 2]
	138	lea edi, [edi - 8 * 2]
	139	lea edx, [edx - 8 * 2]
	140
	141	; move down
	142	lea esi, [esi + 16 * 2]
	143	lea edi, [edi + 8 * 2]
	144	lea edx, [edx + 8 * 2]
	145
	146	dec ecx
	147	jnz loop1a
	148
	149	ret
	150
	151	;******************************************************************************
	152	; source 16 bit signed, 16 pixel width
	153	rfx_dwt_2d_encode_block_verti_16_16:
	154	mov ecx, 2
	155	loop1b:
	156	; pre
	157	movdqa xmm1, [esi] ; src[2n]
	158	movdqa xmm2, [esi + 16 * 2] ; src[2n + 1]
	159	movdqa xmm3, [esi + 16 * 2 * 2] ; src[2n + 2]
	160	movdqa xmm4, xmm1
	161	movdqa xmm5, xmm2
	162	movdqa xmm6, xmm3
	163	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	164	paddw xmm4, xmm6
	165	psraw xmm4, 1
	166	psubw xmm5, xmm4
	167	psraw xmm5, 1
	168	movdqa [edi], xmm5 ; out hi
	169	movdqa xmm6, xmm5 ; save hi
	170	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	171	paddw xmm5, xmm1
	172	movdqa [edx], xmm5 ; out lo
	173	movdqa xmm7, xmm6 ; save hi
	174	; move down
	175	lea esi, [esi + 16 * 2 * 2] ; 2 rows
	176	lea edi, [edi + 16 * 2] ; 1 row
	177	lea edx, [edx + 16 * 2] ; 1 row
	178
	179	; loop
	180	shl ecx, 16
	181	mov cx, 6
	182	loop2b:
	183	movdqa xmm1, xmm3 ; src[2n]
	184	movdqa xmm2, [esi + 16 * 2] ; src[2n + 1]
	185	movdqa xmm3, [esi + 16 * 2 * 2] ; src[2n + 2]
	186	movdqa xmm4, xmm1
	187	movdqa xmm5, xmm2
	188	movdqa xmm6, xmm3
	189	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	190	paddw xmm4, xmm6
	191	psraw xmm4, 1
	192	psubw xmm5, xmm4
	193	psraw xmm5, 1
	194	movdqa [edi], xmm5 ; out hi
	195	movdqa xmm6, xmm5 ; save hi
	196	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	197	paddw xmm5, xmm7
	198	psraw xmm5, 1
	199	paddw xmm5, xmm1
	200	movdqa [edx], xmm5 ; out lo
	201	movdqa xmm7, xmm6 ; save hi
	202	; move down
	203	lea esi, [esi + 16 * 2 * 2] ; 2 rows
	204	lea edi, [edi + 16 * 2] ; 1 row
	205	lea edx, [edx + 16 * 2] ; 1 row
	206
	207	dec cx
	208	jnz loop2b
	209	shr ecx, 16
	210
	211	; post
	212	movdqa xmm1, xmm3 ; src[2n]
	213	movdqa xmm2, [esi + 16 * 2] ; src[2n + 1]
	214	movdqa xmm4, xmm1
	215	movdqa xmm5, xmm2
	216	movdqa xmm6, xmm3
	217	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	218	paddw xmm4, xmm6
	219	psraw xmm4, 1
	220	psubw xmm5, xmm4
	221	psraw xmm5, 1
	222	movdqa [edi], xmm5 ; out hi
	223	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	224	paddw xmm5, xmm7
	225	psraw xmm5, 1
	226	paddw xmm5, xmm1
	227	movdqa [edx], xmm5 ; out lo
	228	; move down
	229	lea esi, [esi + 16 * 2 * 2] ; 2 row
	230	lea edi, [edi + 16 * 2] ; 1 row
	231	lea edx, [edx + 16 * 2] ; 1 row
	232
	233	; move up
	234	lea esi, [esi - 16 * 16 * 2]
	235	lea edi, [edi - 8 * 16 * 2]
	236	lea edx, [edx - 8 * 16 * 2]
	237
	238	; move right
	239	lea esi, [esi + 16]
	240	lea edi, [edi + 16]
	241	lea edx, [edx + 16]
	242
	243	dec ecx
	244	jnz loop1b
	245
	246	ret
	247
	248	;******************************************************************************
	249	; source 16 bit signed, 32 pixel width
	250	rfx_dwt_2d_encode_block_horiz_16_32:
	251	mov ecx, 16
	252	loop1c:
	253	; pre
	254	movdqa xmm1, [esi] ; src[2n]
	255	movdqa xmm2, [esi + 16]
	256	movdqa xmm6, xmm1
	257	movdqa xmm7, xmm2
	258	pand xmm1, [cdFFFF]
	259	pand xmm2, [cdFFFF]
	260	pslld xmm1, 16
	261	pslld xmm2, 16
	262	psrad xmm1, 16
	263	psrad xmm2, 16
	264	packssdw xmm1, xmm2
	265	movdqa xmm2, xmm6 ; src[2n + 1]
	266	movdqa xmm3, xmm7
	267	psrldq xmm2, 2
	268	psrldq xmm3, 2
	269	pand xmm2, [cdFFFF]
	270	pand xmm3, [cdFFFF]
	271	pslld xmm2, 16
	272	pslld xmm3, 16
	273	psrad xmm2, 16
	274	psrad xmm3, 16
	275	packssdw xmm2, xmm3
	276	movdqa xmm3, xmm6 ; src[2n + 2]
	277	movdqa xmm4, xmm7
	278	psrldq xmm3, 4
	279	psrldq xmm4, 4
	280	movd eax, xmm7
	281	movd xmm5, eax
	282	pslldq xmm5, 12
	283	por xmm3, xmm5
	284	mov eax, [esi + 32]
	285	movd xmm5, eax
	286	pslldq xmm5, 12
	287	por xmm4, xmm5
	288	pand xmm3, [cdFFFF]
	289	pand xmm4, [cdFFFF]
	290	pslld xmm3, 16
	291	pslld xmm4, 16
	292	psrad xmm3, 16
	293	psrad xmm4, 16
	294	packssdw xmm3, xmm4
	295	movdqa xmm4, xmm1
	296	movdqa xmm5, xmm2
	297	movdqa xmm6, xmm3
	298	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	299	paddw xmm4, xmm6
	300	psraw xmm4, 1
	301	psubw xmm5, xmm4
	302	psraw xmm5, 1
	303
	304	movdqa xmm6, xmm5 ; out hi
	305	paddw xmm6, LHI_ADD
	306	psraw xmm6, LHI_SFT
	307	movdqa [edi], xmm6
	308	movdqa xmm2, xmm5 ; save hi
	309
	310	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	311	movdqa xmm7, xmm5
	312	movd eax, xmm7
	313	pslldq xmm7, 2
	314	and eax, 0xFFFF
	315	movd xmm6, eax
	316	por xmm7, xmm6
	317	paddw xmm5, xmm7
	318	psraw xmm5, 1
	319	paddw xmm5, xmm1
	320
	321	psrldq xmm2, 14
	322	movd ebx, xmm2 ; save hi
	323
	324	movdqa xmm6, xmm5 ; out lo
	325	paddw xmm6, LLO_ADD
	326	psraw xmm6, LLO_SFT
	327	movdqa [edx], xmm6
	328
	329	; move right
	330	lea esi, [esi + 16 * 2]
	331	lea edi, [edi + 8 * 2]
	332	lea edx, [edx + 8 * 2]
	333
	334	; post
	335	movdqa xmm1, [esi] ; src[2n]
	336	movdqa xmm2, [esi + 16]
	337	movdqa xmm6, xmm1
	338	movdqa xmm7, xmm2
	339	pand xmm1, [cdFFFF]
	340	pand xmm2, [cdFFFF]
	341	pslld xmm1, 16
	342	pslld xmm2, 16
	343	psrad xmm1, 16
	344	psrad xmm2, 16
	345	packssdw xmm1, xmm2
	346	movdqa xmm2, xmm6 ; src[2n + 1]
	347	movdqa xmm3, xmm7
	348	psrldq xmm2, 2
	349	psrldq xmm3, 2
	350	pand xmm2, [cdFFFF]
	351	pand xmm3, [cdFFFF]
	352	pslld xmm2, 16
	353	pslld xmm3, 16
	354	psrad xmm2, 16
	355	psrad xmm3, 16
	356	packssdw xmm2, xmm3
	357	movdqa xmm3, xmm6 ; src[2n + 2]
	358	movdqa xmm4, xmm7
	359	psrldq xmm3, 4
	360	psrldq xmm4, 4
	361	movd eax, xmm7
	362	movd xmm5, eax
	363	pslldq xmm5, 12
	364	por xmm3, xmm5
	365	movdqa xmm5, xmm7
	366	psrldq xmm5, 12
	367	pslldq xmm5, 12
	368	por xmm4, xmm5
	369	pand xmm3, [cdFFFF]
	370	pand xmm4, [cdFFFF]
	371	pslld xmm3, 16
	372	pslld xmm4, 16
	373	psrad xmm3, 16
	374	psrad xmm4, 16
	375	packssdw xmm3, xmm4
	376	movdqa xmm4, xmm1
	377	movdqa xmm5, xmm2
	378	movdqa xmm6, xmm3
	379	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	380	paddw xmm4, xmm6
	381	psraw xmm4, 1
	382	psubw xmm5, xmm4
	383	psraw xmm5, 1
	384
	385	movdqa xmm6, xmm5 ; out hi
	386	paddw xmm6, LHI_ADD
	387	psraw xmm6, LHI_SFT
	388	movdqa [edi], xmm6
	389
	390	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	391	movdqa xmm7, xmm5
	392	pslldq xmm7, 2
	393	movd xmm6, ebx
	394	por xmm7, xmm6
	395	paddw xmm5, xmm7
	396	psraw xmm5, 1
	397	paddw xmm5, xmm1
	398
	399	movdqa xmm6, xmm5 ; out lo
	400	paddw xmm6, LLO_ADD
	401	psraw xmm6, LLO_SFT
	402	movdqa [edx], xmm6
	403
	404	; move right
	405	lea esi, [esi + 16 * 2]
	406	lea edi, [edi + 8 * 2]
	407	lea edx, [edx + 8 * 2]
	408
	409	; move left
	410	lea esi, [esi - 32 * 2]
	411	lea edi, [edi - 16 * 2]
	412	lea edx, [edx - 16 * 2]
	413
	414	; move down
	415	lea esi, [esi + 32 * 2]
	416	lea edi, [edi + 16 * 2]
	417	lea edx, [edx + 16 * 2]
	418
	419	dec ecx
	420	jnz loop1c
	421
	422	ret
	423
	424	;******************************************************************************
	425	; source 16 bit signed, 32 pixel width
	426	rfx_dwt_2d_encode_block_horiz_16_32_no_lo:
	427	mov ecx, 16
	428	loop1c1:
	429	; pre
	430	movdqa xmm1, [esi] ; src[2n]
	431	movdqa xmm2, [esi + 16]
	432	movdqa xmm6, xmm1
	433	movdqa xmm7, xmm2
	434	pand xmm1, [cdFFFF]
	435	pand xmm2, [cdFFFF]
	436	pslld xmm1, 16
	437	pslld xmm2, 16
	438	psrad xmm1, 16
	439	psrad xmm2, 16
	440	packssdw xmm1, xmm2
	441	movdqa xmm2, xmm6 ; src[2n + 1]
	442	movdqa xmm3, xmm7
	443	psrldq xmm2, 2
	444	psrldq xmm3, 2
	445	pand xmm2, [cdFFFF]
	446	pand xmm3, [cdFFFF]
	447	pslld xmm2, 16
	448	pslld xmm3, 16
	449	psrad xmm2, 16
	450	psrad xmm3, 16
	451	packssdw xmm2, xmm3
	452	movdqa xmm3, xmm6 ; src[2n + 2]
	453	movdqa xmm4, xmm7
	454	psrldq xmm3, 4
	455	psrldq xmm4, 4
	456	movd eax, xmm7
	457	movd xmm5, eax
	458	pslldq xmm5, 12
	459	por xmm3, xmm5
	460	mov eax, [esi + 32]
	461	movd xmm5, eax
	462	pslldq xmm5, 12
	463	por xmm4, xmm5
	464	pand xmm3, [cdFFFF]
	465	pand xmm4, [cdFFFF]
	466	pslld xmm3, 16
	467	pslld xmm4, 16
	468	psrad xmm3, 16
	469	psrad xmm4, 16
	470	packssdw xmm3, xmm4
	471	movdqa xmm4, xmm1
	472	movdqa xmm5, xmm2
	473	movdqa xmm6, xmm3
	474	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	475	paddw xmm4, xmm6
	476	psraw xmm4, 1
	477	psubw xmm5, xmm4
	478	psraw xmm5, 1
	479
	480	movdqa xmm6, xmm5 ; out hi
	481	paddw xmm6, LHI_ADD
	482	psraw xmm6, LHI_SFT
	483	movdqa [edi], xmm6
	484	movdqa xmm2, xmm5 ; save hi
	485
	486	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	487	movdqa xmm7, xmm5
	488	movd eax, xmm7
	489	pslldq xmm7, 2
	490	and eax, 0xFFFF
	491	movd xmm6, eax
	492	por xmm7, xmm6
	493	paddw xmm5, xmm7
	494	psraw xmm5, 1
	495	paddw xmm5, xmm1
	496
	497	psrldq xmm2, 14
	498	movd ebx, xmm2 ; save hi
	499
	500	movdqa [edx], xmm5 ; out lo
	501
	502	; move right
	503	lea esi, [esi + 16 * 2]
	504	lea edi, [edi + 8 * 2]
	505	lea edx, [edx + 8 * 2]
	506
	507	; post
	508	movdqa xmm1, [esi] ; src[2n]
	509	movdqa xmm2, [esi + 16]
	510	movdqa xmm6, xmm1
	511	movdqa xmm7, xmm2
	512	pand xmm1, [cdFFFF]
	513	pand xmm2, [cdFFFF]
	514	pslld xmm1, 16
	515	pslld xmm2, 16
	516	psrad xmm1, 16
	517	psrad xmm2, 16
	518	packssdw xmm1, xmm2
	519	movdqa xmm2, xmm6 ; src[2n + 1]
	520	movdqa xmm3, xmm7
	521	psrldq xmm2, 2
	522	psrldq xmm3, 2
	523	pand xmm2, [cdFFFF]
	524	pand xmm3, [cdFFFF]
	525	pslld xmm2, 16
	526	pslld xmm3, 16
	527	psrad xmm2, 16
	528	psrad xmm3, 16
	529	packssdw xmm2, xmm3
	530	movdqa xmm3, xmm6 ; src[2n + 2]
	531	movdqa xmm4, xmm7
	532	psrldq xmm3, 4
	533	psrldq xmm4, 4
	534	movd eax, xmm7
	535	movd xmm5, eax
	536	pslldq xmm5, 12
	537	por xmm3, xmm5
	538	movdqa xmm5, xmm7
	539	psrldq xmm5, 12
	540	pslldq xmm5, 12
	541	por xmm4, xmm5
	542	pand xmm3, [cdFFFF]
	543	pand xmm4, [cdFFFF]
	544	pslld xmm3, 16
	545	pslld xmm4, 16
	546	psrad xmm3, 16
	547	psrad xmm4, 16
	548	packssdw xmm3, xmm4
	549	movdqa xmm4, xmm1
	550	movdqa xmm5, xmm2
	551	movdqa xmm6, xmm3
	552	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	553	paddw xmm4, xmm6
	554	psraw xmm4, 1
	555	psubw xmm5, xmm4
	556	psraw xmm5, 1
	557
	558	movdqa xmm6, xmm5 ; out hi
	559	paddw xmm6, LHI_ADD
	560	psraw xmm6, LHI_SFT
	561	movdqa [edi], xmm6
	562
	563	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	564	movdqa xmm7, xmm5
	565	pslldq xmm7, 2
	566	movd xmm6, ebx
	567	por xmm7, xmm6
	568	paddw xmm5, xmm7
	569	psraw xmm5, 1
	570	paddw xmm5, xmm1
	571
	572	movdqa [edx], xmm5 ; out lo
	573
	574	; move right
	575	lea esi, [esi + 16 * 2]
	576	lea edi, [edi + 8 * 2]
	577	lea edx, [edx + 8 * 2]
	578
	579	; move left
	580	lea esi, [esi - 32 * 2]
	581	lea edi, [edi - 16 * 2]
	582	lea edx, [edx - 16 * 2]
	583
	584	; move down
	585	lea esi, [esi + 32 * 2]
	586	lea edi, [edi + 16 * 2]
	587	lea edx, [edx + 16 * 2]
	588
	589	dec ecx
	590	jnz loop1c1
	591
	592	ret
	593
	594	;******************************************************************************
	595	; source 16 bit signed, 32 pixel width
	596	rfx_dwt_2d_encode_block_verti_16_32:
	597	mov ecx, 4
	598	loop1d:
	599	; pre
	600	movdqa xmm1, [esi] ; src[2n]
	601	movdqa xmm2, [esi + 32 * 2] ; src[2n + 1]
	602	movdqa xmm3, [esi + 32 * 2 * 2] ; src[2n + 2]
	603	movdqa xmm4, xmm1
	604	movdqa xmm5, xmm2
	605	movdqa xmm6, xmm3
	606	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	607	paddw xmm4, xmm6
	608	psraw xmm4, 1
	609	psubw xmm5, xmm4
	610	psraw xmm5, 1
	611	movdqa [edi], xmm5 ; out hi
	612	movdqa xmm6, xmm5 ; save hi
	613	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	614	paddw xmm5, xmm1
	615	movdqa [edx], xmm5 ; out lo
	616	movdqa xmm7, xmm6 ; save hi
	617	; move down
	618	lea esi, [esi + 32 * 2 * 2] ; 2 rows
	619	lea edi, [edi + 32 * 2] ; 1 row
	620	lea edx, [edx + 32 * 2] ; 1 row
	621
	622	; loop
	623	shl ecx, 16
	624	mov cx, 14
	625	loop2d:
	626	movdqa xmm1, xmm3 ; src[2n]
	627	movdqa xmm2, [esi + 32 * 2] ; src[2n + 1]
	628	movdqa xmm3, [esi + 32 * 2 * 2] ; src[2n + 2]
	629	movdqa xmm4, xmm1
	630	movdqa xmm5, xmm2
	631	movdqa xmm6, xmm3
	632	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	633	paddw xmm4, xmm6
	634	psraw xmm4, 1
	635	psubw xmm5, xmm4
	636	psraw xmm5, 1
	637	movdqa [edi], xmm5 ; out hi
	638	movdqa xmm6, xmm5 ; save hi
	639	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	640	paddw xmm5, xmm7
	641	psraw xmm5, 1
	642	paddw xmm5, xmm1
	643	movdqa [edx], xmm5 ; out lo
	644	movdqa xmm7, xmm6 ; save hi
	645	; move down
	646	lea esi, [esi + 32 * 2 * 2] ; 2 rows
	647	lea edi, [edi + 32 * 2] ; 1 row
	648	lea edx, [edx + 32 * 2] ; 1 row
	649
	650	dec cx
	651	jnz loop2d
	652	shr ecx, 16
	653
	654	; post
	655	movdqa xmm1, xmm3 ; src[2n]
	656	movdqa xmm2, [esi + 32 * 2] ; src[2n + 1]
	657	movdqa xmm4, xmm1
	658	movdqa xmm5, xmm2
	659	movdqa xmm6, xmm3
	660	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	661	paddw xmm4, xmm6
	662	psraw xmm4, 1
	663	psubw xmm5, xmm4
	664	psraw xmm5, 1
	665	movdqa [edi], xmm5 ; out hi
	666	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	667	paddw xmm5, xmm7
	668	psraw xmm5, 1
	669	paddw xmm5, xmm1
	670	movdqa [edx], xmm5 ; out lo
	671	; move down
	672	lea esi, [esi + 32 * 2 * 2] ; 2 row
	673	lea edi, [edi + 32 * 2] ; 1 row
	674	lea edx, [edx + 32 * 2] ; 1 row
	675
	676	; move up
	677	lea esi, [esi - 32 * 32 * 2]
	678	lea edi, [edi - 16 * 32 * 2]
	679	lea edx, [edx - 16 * 32 * 2]
	680
	681	; move right
	682	lea esi, [esi + 16]
	683	lea edi, [edi + 16]
	684	lea edx, [edx + 16]
	685
	686	dec ecx
	687	jnz loop1d
	688
	689	ret
	690
	691	;******************************************************************************
	692	; source 16 bit signed, 64 pixel width
	693	rfx_dwt_2d_encode_block_horiz_16_64:
	694	mov ecx, 32
	695	loop1e:
	696	; pre
	697	movdqa xmm1, [esi] ; src[2n]
	698	movdqa xmm2, [esi + 16]
	699	movdqa xmm6, xmm1
	700	movdqa xmm7, xmm2
	701	pand xmm1, [cdFFFF]
	702	pand xmm2, [cdFFFF]
	703	pslld xmm1, 16
	704	pslld xmm2, 16
	705	psrad xmm1, 16
	706	psrad xmm2, 16
	707	packssdw xmm1, xmm2
	708	movdqa xmm2, xmm6 ; src[2n + 1]
	709	movdqa xmm3, xmm7
	710	psrldq xmm2, 2
	711	psrldq xmm3, 2
	712	pand xmm2, [cdFFFF]
	713	pand xmm3, [cdFFFF]
	714	pslld xmm2, 16
	715	pslld xmm3, 16
	716	psrad xmm2, 16
	717	psrad xmm3, 16
	718	packssdw xmm2, xmm3
	719	movdqa xmm3, xmm6 ; src[2n + 2]
	720	movdqa xmm4, xmm7
	721	psrldq xmm3, 4
	722	psrldq xmm4, 4
	723	movd eax, xmm7
	724	movd xmm5, eax
	725	pslldq xmm5, 12
	726	por xmm3, xmm5
	727	mov eax, [esi + 32]
	728	movd xmm5, eax
	729	pslldq xmm5, 12
	730	por xmm4, xmm5
	731	pand xmm3, [cdFFFF]
	732	pand xmm4, [cdFFFF]
	733	pslld xmm3, 16
	734	pslld xmm4, 16
	735	psrad xmm3, 16
	736	psrad xmm4, 16
	737	packssdw xmm3, xmm4
	738	movdqa xmm4, xmm1
	739	movdqa xmm5, xmm2
	740	movdqa xmm6, xmm3
	741	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	742	paddw xmm4, xmm6
	743	psraw xmm4, 1
	744	psubw xmm5, xmm4
	745	psraw xmm5, 1
	746
	747	movdqa xmm6, xmm5 ; out hi
	748	paddw xmm6, LHI_ADD
	749	psraw xmm6, LHI_SFT
	750	movdqa [edi], xmm6
	751	movdqa xmm2, xmm5 ; save hi
	752
	753	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	754	movdqa xmm7, xmm5
	755	movd eax, xmm7
	756	pslldq xmm7, 2
	757	and eax, 0xFFFF
	758	movd xmm6, eax
	759	por xmm7, xmm6
	760	paddw xmm5, xmm7
	761	psraw xmm5, 1
	762	paddw xmm5, xmm1
	763
	764	psrldq xmm2, 14
	765	movd ebx, xmm2 ; save hi
	766
	767	movdqa xmm6, xmm5 ; out lo
	768	paddw xmm6, LLO_ADD
	769	psraw xmm6, LLO_SFT
	770	movdqa [edx], xmm6
	771
	772	; move right
	773	lea esi, [esi + 16 * 2]
	774	lea edi, [edi + 8 * 2]
	775	lea edx, [edx + 8 * 2]
	776
	777	; loop
	778	shl ecx, 16
	779	mov cx, 2
	780	loop2e:
	781	movdqa xmm1, [esi] ; src[2n]
	782	movdqa xmm2, [esi + 16]
	783	movdqa xmm6, xmm1
	784	movdqa xmm7, xmm2
	785	pand xmm1, [cdFFFF]
	786	pand xmm2, [cdFFFF]
	787	pslld xmm1, 16
	788	pslld xmm2, 16
	789	psrad xmm1, 16
	790	psrad xmm2, 16
	791	packssdw xmm1, xmm2
	792	movdqa xmm2, xmm6 ; src[2n + 1]
	793	movdqa xmm3, xmm7
	794	psrldq xmm2, 2
	795	psrldq xmm3, 2
	796	pand xmm2, [cdFFFF]
	797	pand xmm3, [cdFFFF]
	798	pslld xmm2, 16
	799	pslld xmm3, 16
	800	psrad xmm2, 16
	801	psrad xmm3, 16
	802	packssdw xmm2, xmm3
	803	movdqa xmm3, xmm6 ; src[2n + 2]
	804	movdqa xmm4, xmm7
	805	psrldq xmm3, 4
	806	psrldq xmm4, 4
	807	movd eax, xmm7
	808	movd xmm5, eax
	809	pslldq xmm5, 12
	810	por xmm3, xmm5
	811	mov eax, [esi + 32]
	812	movd xmm5, eax
	813	pslldq xmm5, 12
	814	por xmm4, xmm5
	815	pand xmm3, [cdFFFF]
	816	pand xmm4, [cdFFFF]
	817	pslld xmm3, 16
	818	pslld xmm4, 16
	819	psrad xmm3, 16
	820	psrad xmm4, 16
	821	packssdw xmm3, xmm4
	822	movdqa xmm4, xmm1
	823	movdqa xmm5, xmm2
	824	movdqa xmm6, xmm3
	825	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	826	paddw xmm4, xmm6
	827	psraw xmm4, 1
	828	psubw xmm5, xmm4
	829	psraw xmm5, 1
	830
	831	movdqa xmm6, xmm5 ; out hi
	832	paddw xmm6, LHI_ADD
	833	psraw xmm6, LHI_SFT
	834	movdqa [edi], xmm6
	835	movdqa xmm2, xmm5 ; save hi
	836
	837	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	838	movdqa xmm7, xmm5
	839	pslldq xmm7, 2
	840	movd xmm6, ebx
	841	por xmm7, xmm6
	842	paddw xmm5, xmm7
	843	psraw xmm5, 1
	844	paddw xmm5, xmm1
	845
	846	psrldq xmm2, 14
	847	movd ebx, xmm2 ; save hi
	848
	849	movdqa xmm6, xmm5 ; out lo
	850	paddw xmm6, LLO_ADD
	851	psraw xmm6, LLO_SFT
	852	movdqa [edx], xmm6
	853
	854	; move right
	855	lea esi, [esi + 16 * 2]
	856	lea edi, [edi + 8 * 2]
	857	lea edx, [edx + 8 * 2]
	858
	859	dec cx
	860	jnz loop2e
	861	shr ecx, 16
	862
	863	; post
	864	movdqa xmm1, [esi] ; src[2n]
	865	movdqa xmm2, [esi + 16]
	866	movdqa xmm6, xmm1
	867	movdqa xmm7, xmm2
	868	pand xmm1, [cdFFFF]
	869	pand xmm2, [cdFFFF]
	870	pslld xmm1, 16
	871	pslld xmm2, 16
	872	psrad xmm1, 16
	873	psrad xmm2, 16
	874	packssdw xmm1, xmm2
	875	movdqa xmm2, xmm6 ; src[2n + 1]
	876	movdqa xmm3, xmm7
	877	psrldq xmm2, 2
	878	psrldq xmm3, 2
	879	pand xmm2, [cdFFFF]
	880	pand xmm3, [cdFFFF]
	881	pslld xmm2, 16
	882	pslld xmm3, 16
	883	psrad xmm2, 16
	884	psrad xmm3, 16
	885	packssdw xmm2, xmm3
	886	movdqa xmm3, xmm6 ; src[2n + 2]
	887	movdqa xmm4, xmm7
	888	psrldq xmm3, 4
	889	psrldq xmm4, 4
	890	movd eax, xmm7
	891	movd xmm5, eax
	892	pslldq xmm5, 12
	893	por xmm3, xmm5
	894	movdqa xmm5, xmm7
	895	psrldq xmm5, 12
	896	pslldq xmm5, 12
	897	por xmm4, xmm5
	898	pand xmm3, [cdFFFF]
	899	pand xmm4, [cdFFFF]
	900	pslld xmm3, 16
	901	pslld xmm4, 16
	902	psrad xmm3, 16
	903	psrad xmm4, 16
	904	packssdw xmm3, xmm4
	905	movdqa xmm4, xmm1
	906	movdqa xmm5, xmm2
	907	movdqa xmm6, xmm3
	908	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	909	paddw xmm4, xmm6
	910	psraw xmm4, 1
	911	psubw xmm5, xmm4
	912	psraw xmm5, 1
	913
	914	movdqa xmm6, xmm5 ; out hi
	915	paddw xmm6, LHI_ADD
	916	psraw xmm6, LHI_SFT
	917	movdqa [edi], xmm6
	918
	919	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	920	movdqa xmm7, xmm5
	921	pslldq xmm7, 2
	922	movd xmm6, ebx
	923	por xmm7, xmm6
	924	paddw xmm5, xmm7
	925	psraw xmm5, 1
	926	paddw xmm5, xmm1
	927
	928	movdqa xmm6, xmm5 ; out lo
	929	paddw xmm6, LLO_ADD
	930	psraw xmm6, LLO_SFT
	931	movdqa [edx], xmm6
	932
	933	; move right
	934	lea esi, [esi + 16 * 2]
	935	lea edi, [edi + 8 * 2]
	936	lea edx, [edx + 8 * 2]
	937
	938	; move left
	939	lea esi, [esi - 64 * 2]
	940	lea edi, [edi - 32 * 2]
	941	lea edx, [edx - 32 * 2]
	942
	943	; move down
	944	lea esi, [esi + 64 * 2]
	945	lea edi, [edi + 32 * 2]
	946	lea edx, [edx + 32 * 2]
	947
	948	dec ecx
	949	jnz loop1e
	950
	951	ret
	952
	953	;******************************************************************************
	954	; source 16 bit signed, 64 pixel width
	955	rfx_dwt_2d_encode_block_horiz_16_64_no_lo:
	956	mov ecx, 32
	957	loop1e1:
	958	; pre
	959	movdqa xmm1, [esi] ; src[2n]
	960	movdqa xmm2, [esi + 16]
	961	movdqa xmm6, xmm1
	962	movdqa xmm7, xmm2
	963	pand xmm1, [cdFFFF]
	964	pand xmm2, [cdFFFF]
	965	pslld xmm1, 16
	966	pslld xmm2, 16
	967	psrad xmm1, 16
	968	psrad xmm2, 16
	969	packssdw xmm1, xmm2
	970	movdqa xmm2, xmm6 ; src[2n + 1]
	971	movdqa xmm3, xmm7
	972	psrldq xmm2, 2
	973	psrldq xmm3, 2
	974	pand xmm2, [cdFFFF]
	975	pand xmm3, [cdFFFF]
	976	pslld xmm2, 16
	977	pslld xmm3, 16
	978	psrad xmm2, 16
	979	psrad xmm3, 16
	980	packssdw xmm2, xmm3
	981	movdqa xmm3, xmm6 ; src[2n + 2]
	982	movdqa xmm4, xmm7
	983	psrldq xmm3, 4
	984	psrldq xmm4, 4
	985	movd eax, xmm7
	986	movd xmm5, eax
	987	pslldq xmm5, 12
	988	por xmm3, xmm5
	989	mov eax, [esi + 32]
	990	movd xmm5, eax
	991	pslldq xmm5, 12
	992	por xmm4, xmm5
	993	pand xmm3, [cdFFFF]
	994	pand xmm4, [cdFFFF]
	995	pslld xmm3, 16
	996	pslld xmm4, 16
	997	psrad xmm3, 16
	998	psrad xmm4, 16
	999	packssdw xmm3, xmm4
	1000	movdqa xmm4, xmm1
	1001	movdqa xmm5, xmm2
	1002	movdqa xmm6, xmm3
	1003	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1004	paddw xmm4, xmm6
	1005	psraw xmm4, 1
	1006	psubw xmm5, xmm4
	1007	psraw xmm5, 1
	1008
	1009	movdqa xmm6, xmm5 ; out hi
	1010	paddw xmm6, LHI_ADD
	1011	psraw xmm6, LHI_SFT
	1012	movdqa [edi], xmm6
	1013	movdqa xmm2, xmm5 ; save hi
	1014
	1015	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1016	movdqa xmm7, xmm5
	1017	movd eax, xmm7
	1018	pslldq xmm7, 2
	1019	and eax, 0xFFFF
	1020	movd xmm6, eax
	1021	por xmm7, xmm6
	1022	paddw xmm5, xmm7
	1023	psraw xmm5, 1
	1024	paddw xmm5, xmm1
	1025
	1026	psrldq xmm2, 14
	1027	movd ebx, xmm2 ; save hi
	1028
	1029	movdqa [edx], xmm5 ; out lo
	1030
	1031	; move right
	1032	lea esi, [esi + 16 * 2]
	1033	lea edi, [edi + 8 * 2]
	1034	lea edx, [edx + 8 * 2]
	1035
	1036	; loop
	1037	shl ecx, 16
	1038	mov cx, 2
	1039	loop2e1:
	1040	movdqa xmm1, [esi] ; src[2n]
	1041	movdqa xmm2, [esi + 16]
	1042	movdqa xmm6, xmm1
	1043	movdqa xmm7, xmm2
	1044	pand xmm1, [cdFFFF]
	1045	pand xmm2, [cdFFFF]
	1046	pslld xmm1, 16
	1047	pslld xmm2, 16
	1048	psrad xmm1, 16
	1049	psrad xmm2, 16
	1050	packssdw xmm1, xmm2
	1051	movdqa xmm2, xmm6 ; src[2n + 1]
	1052	movdqa xmm3, xmm7
	1053	psrldq xmm2, 2
	1054	psrldq xmm3, 2
	1055	pand xmm2, [cdFFFF]
	1056	pand xmm3, [cdFFFF]
	1057	pslld xmm2, 16
	1058	pslld xmm3, 16
	1059	psrad xmm2, 16
	1060	psrad xmm3, 16
	1061	packssdw xmm2, xmm3
	1062	movdqa xmm3, xmm6 ; src[2n + 2]
	1063	movdqa xmm4, xmm7
	1064	psrldq xmm3, 4
	1065	psrldq xmm4, 4
	1066	movd eax, xmm7
	1067	movd xmm5, eax
	1068	pslldq xmm5, 12
	1069	por xmm3, xmm5
	1070	mov eax, [esi + 32]
	1071	movd xmm5, eax
	1072	pslldq xmm5, 12
	1073	por xmm4, xmm5
	1074	pand xmm3, [cdFFFF]
	1075	pand xmm4, [cdFFFF]
	1076	pslld xmm3, 16
	1077	pslld xmm4, 16
	1078	psrad xmm3, 16
	1079	psrad xmm4, 16
	1080	packssdw xmm3, xmm4
	1081	movdqa xmm4, xmm1
	1082	movdqa xmm5, xmm2
	1083	movdqa xmm6, xmm3
	1084	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1085	paddw xmm4, xmm6
	1086	psraw xmm4, 1
	1087	psubw xmm5, xmm4
	1088	psraw xmm5, 1
	1089
	1090	movdqa xmm6, xmm5 ; out hi
	1091	paddw xmm6, LHI_ADD
	1092	psraw xmm6, LHI_SFT
	1093	movdqa [edi], xmm6
	1094	movdqa xmm2, xmm5 ; save hi
	1095
	1096	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1097	movdqa xmm7, xmm5
	1098	pslldq xmm7, 2
	1099	movd xmm6, ebx
	1100	por xmm7, xmm6
	1101	paddw xmm5, xmm7
	1102	psraw xmm5, 1
	1103	paddw xmm5, xmm1
	1104
	1105	psrldq xmm2, 14
	1106	movd ebx, xmm2 ; save hi
	1107
	1108	movdqa [edx], xmm5 ; out lo
	1109
	1110	; move right
	1111	lea esi, [esi + 16 * 2]
	1112	lea edi, [edi + 8 * 2]
	1113	lea edx, [edx + 8 * 2]
	1114
	1115	dec cx
	1116	jnz loop2e1
	1117	shr ecx, 16
	1118
	1119	; post
	1120	movdqa xmm1, [esi] ; src[2n]
	1121	movdqa xmm2, [esi + 16]
	1122	movdqa xmm6, xmm1
	1123	movdqa xmm7, xmm2
	1124	pand xmm1, [cdFFFF]
	1125	pand xmm2, [cdFFFF]
	1126	pslld xmm1, 16
	1127	pslld xmm2, 16
	1128	psrad xmm1, 16
	1129	psrad xmm2, 16
	1130	packssdw xmm1, xmm2
	1131	movdqa xmm2, xmm6 ; src[2n + 1]
	1132	movdqa xmm3, xmm7
	1133	psrldq xmm2, 2
	1134	psrldq xmm3, 2
	1135	pand xmm2, [cdFFFF]
	1136	pand xmm3, [cdFFFF]
	1137	pslld xmm2, 16
	1138	pslld xmm3, 16
	1139	psrad xmm2, 16
	1140	psrad xmm3, 16
	1141	packssdw xmm2, xmm3
	1142	movdqa xmm3, xmm6 ; src[2n + 2]
	1143	movdqa xmm4, xmm7
	1144	psrldq xmm3, 4
	1145	psrldq xmm4, 4
	1146	movd eax, xmm7
	1147	movd xmm5, eax
	1148	pslldq xmm5, 12
	1149	por xmm3, xmm5
	1150	movdqa xmm5, xmm7
	1151	psrldq xmm5, 12
	1152	pslldq xmm5, 12
	1153	por xmm4, xmm5
	1154	pand xmm3, [cdFFFF]
	1155	pand xmm4, [cdFFFF]
	1156	pslld xmm3, 16
	1157	pslld xmm4, 16
	1158	psrad xmm3, 16
	1159	psrad xmm4, 16
	1160	packssdw xmm3, xmm4
	1161	movdqa xmm4, xmm1
	1162	movdqa xmm5, xmm2
	1163	movdqa xmm6, xmm3
	1164	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1165	paddw xmm4, xmm6
	1166	psraw xmm4, 1
	1167	psubw xmm5, xmm4
	1168	psraw xmm5, 1
	1169
	1170	movdqa xmm6, xmm5 ; out hi
	1171	paddw xmm6, LHI_ADD
	1172	psraw xmm6, LHI_SFT
	1173	movdqa [edi], xmm6
	1174
	1175	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1176	movdqa xmm7, xmm5
	1177	pslldq xmm7, 2
	1178	movd xmm6, ebx
	1179	por xmm7, xmm6
	1180	paddw xmm5, xmm7
	1181	psraw xmm5, 1
	1182	paddw xmm5, xmm1
	1183
	1184	movdqa [edx], xmm5 ; out lo
	1185
	1186	; move right
	1187	lea esi, [esi + 16 * 2]
	1188	lea edi, [edi + 8 * 2]
	1189	lea edx, [edx + 8 * 2]
	1190
	1191	; move left
	1192	lea esi, [esi - 64 * 2]
	1193	lea edi, [edi - 32 * 2]
	1194	lea edx, [edx - 32 * 2]
	1195
	1196	; move down
	1197	lea esi, [esi + 64 * 2]
	1198	lea edi, [edi + 32 * 2]
	1199	lea edx, [edx + 32 * 2]
	1200
	1201	dec ecx
	1202	jnz loop1e1
	1203
	1204	ret
	1205
	1206	;******************************************************************************
	1207	; source 8 bit unsigned, 64 pixel width
	1208	rfx_dwt_2d_encode_block_verti_8_64:
	1209	mov ecx, 8
	1210	loop1f:
	1211	; pre
	1212	movq xmm1, [esi] ; src[2n]
	1213	movq xmm2, [esi + 64 * 1] ; src[2n + 1]
	1214	movq xmm3, [esi + 64 * 1 * 2] ; src[2n + 2]
	1215	punpcklbw xmm1, xmm0
	1216	punpcklbw xmm2, xmm0
	1217	punpcklbw xmm3, xmm0
	1218	psubw xmm1, [cw128]
	1219	psubw xmm2, [cw128]
	1220	psubw xmm3, [cw128]
	1221	psllw xmm1, 5
	1222	psllw xmm2, 5
	1223	psllw xmm3, 5
	1224	movdqa xmm4, xmm1
	1225	movdqa xmm5, xmm2
	1226	movdqa xmm6, xmm3
	1227	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1228	paddw xmm4, xmm6
	1229	psraw xmm4, 1
	1230	psubw xmm5, xmm4
	1231	psraw xmm5, 1
	1232	movdqa [edi], xmm5 ; out hi
	1233	movdqa xmm6, xmm5 ; save hi
	1234	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1235	paddw xmm5, xmm1
	1236	movdqa [edx], xmm5 ; out lo
	1237	movdqa xmm7, xmm6 ; save hi
	1238	; move down
	1239	lea esi, [esi + 64 * 1 * 2] ; 2 rows
	1240	lea edi, [edi + 64 * 2] ; 1 row
	1241	lea edx, [edx + 64 * 2] ; 1 row
	1242
	1243	; loop
	1244	shl ecx, 16
	1245	mov cx, 30
	1246	loop2f:
	1247	movdqa xmm1, xmm3 ; src[2n]
	1248	movq xmm2, [esi + 64 * 1] ; src[2n + 1]
	1249	movq xmm3, [esi + 64 * 1 * 2] ; src[2n + 2]
	1250	punpcklbw xmm2, xmm0
	1251	punpcklbw xmm3, xmm0
	1252	psubw xmm2, [cw128]
	1253	psubw xmm3, [cw128]
	1254	psllw xmm2, 5
	1255	psllw xmm3, 5
	1256	movdqa xmm4, xmm1
	1257	movdqa xmm5, xmm2
	1258	movdqa xmm6, xmm3
	1259	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1260	paddw xmm4, xmm6
	1261	psraw xmm4, 1
	1262	psubw xmm5, xmm4
	1263	psraw xmm5, 1
	1264	movdqa [edi], xmm5 ; out hi
	1265	movdqa xmm6, xmm5 ; save hi
	1266	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1267	paddw xmm5, xmm7
	1268	psraw xmm5, 1
	1269	paddw xmm5, xmm1
	1270	movdqa [edx], xmm5 ; out lo
	1271	movdqa xmm7, xmm6 ; save hi
	1272	; move down
	1273	lea esi, [esi + 64 * 1 * 2] ; 2 rows
	1274	lea edi, [edi + 64 * 2] ; 1 row
	1275	lea edx, [edx + 64 * 2] ; 1 row
	1276
	1277	dec cx
	1278	jnz loop2f
	1279	shr ecx, 16
	1280
	1281	; post
	1282	movdqa xmm1, xmm3 ; src[2n]
	1283	movq xmm2, [esi + 64 * 1] ; src[2n + 1]
	1284	punpcklbw xmm2, xmm0
	1285	psubw xmm2, [cw128]
	1286	psllw xmm2, 5
	1287	movdqa xmm4, xmm1
	1288	movdqa xmm5, xmm2
	1289	movdqa xmm6, xmm3
	1290	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1291	paddw xmm4, xmm6
	1292	psraw xmm4, 1
	1293	psubw xmm5, xmm4
	1294	psraw xmm5, 1
	1295	movdqa [edi], xmm5 ; out hi
	1296	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1297	paddw xmm5, xmm7
	1298	psraw xmm5, 1
	1299	paddw xmm5, xmm1
	1300	movdqa [edx], xmm5 ; out lo
	1301	; move down
	1302	lea esi, [esi + 64 * 1 * 2] ; 2 rows
	1303	lea edi, [edi + 64 * 2] ; 1 row
	1304	lea edx, [edx + 64 * 2] ; 1 row
	1305
	1306	; move up
	1307	lea esi, [esi - 64 * 1 * 64]
	1308	lea edi, [edi - 32 * 64 * 2]
	1309	lea edx, [edx - 32 * 64 * 2]
	1310
	1311	; move right
	1312	lea esi, [esi + 8]
	1313	lea edi, [edi + 16]
	1314	lea edx, [edx + 16]
	1315
	1316	dec ecx
	1317	jnz loop1f
	1318
	1319	ret
	1320
	1321	set_quants_hi:
	1322	sub eax, 6 - 5
	1323	movd xmm1, eax
	1324	movdqa LHI_SFT, xmm1
	1325	imul eax, 16
	1326	lea edx, [cwa0]
	1327	add edx, eax
	1328	movdqa xmm1, [edx]
	1329	movdqa LHI_ADD, xmm1
	1330	ret
	1331
	1332	set_quants_lo:
	1333	sub eax, 6 - 5
	1334	movd xmm1, eax
	1335	movdqa LLO_SFT, xmm1
	1336	imul eax, 16
	1337	lea edx, [cwa0]
	1338	add edx, eax
	1339	movdqa xmm1, [edx]
	1340	movdqa LLO_ADD, xmm1
	1341	ret
	1342
	1343	%define LQTABLE [esp + 144] ; qtable
	1344	%define LIN_BUFFER [esp + 148] ; in_buffer
	1345	%define LOUT_BUFFER [esp + 152] ; out_buffer
	1346	%define LWORK_BUFFER [esp + 156] ; work_buffer
	1347
	1348	;int
	1349	;rfxcodec_encode_dwt_shift_x86_sse2(const char *qtable,
	1350	; unsigned char *in_buffer,
	1351	; short *out_buffer,
	1352	; short *work_buffer);
	1353
	1354	;******************************************************************************
	1355	%ifidn __OUTPUT_FORMAT__,elf
	1356	PROC rfxcodec_encode_dwt_shift_x86_sse2
	1357	%else
	1358	PROC _rfxcodec_encode_dwt_shift_x86_sse2
	1359	%endif
	1360	; align stack
	1361	mov eax, esp
	1362	sub eax, 0x10
	1363	and eax, 0x0F
	1364	sub esp, eax
	1365	push eax
	1366	sub esp, 3 * 4
	1367	sub esp, 4 * 4
	1368	; copy params to after align
	1369	movdqu xmm0, [esp + eax + 4 * 4 + 3 * 4 + 4 + 4]
	1370	movdqu [esp], xmm0
	1371	; save registers
	1372	push ebx
	1373	push esi
	1374	push edi
	1375	push ebp
	1376	sub esp, 16 * 8
	1377	pxor xmm0, xmm0
	1378
	1379	; verical DWT to work buffer, level 1
	1380	mov esi, LIN_BUFFER ; src
	1381	mov edi, LWORK_BUFFER ; dst hi
	1382	lea edi, [edi + 64 * 32 * 2] ; dst hi
	1383	mov edx, LWORK_BUFFER ; dst lo
	1384	call rfx_dwt_2d_encode_block_verti_8_64
	1385
	1386	; horizontal DWT to out buffer, level 1, part 1
	1387	xor eax, eax
	1388	mov edx, LQTABLE
	1389	mov al, [edx + 4]
	1390	and al, 0xF
	1391	call set_quants_hi
	1392	mov esi, LWORK_BUFFER ; src
	1393	mov edi, LOUT_BUFFER ; dst hi - HL1
	1394	mov edx, LOUT_BUFFER ; dst lo - LL1
	1395	lea edx, [edx + 32 * 32 * 6] ; dst lo - LL1
	1396	call rfx_dwt_2d_encode_block_horiz_16_64_no_lo
	1397
	1398	; horizontal DWT to out buffer, level 1, part 2
	1399	xor eax, eax
	1400	mov edx, LQTABLE
	1401	mov al, [edx + 4]
	1402	shr al, 4
	1403	call set_quants_hi
	1404	xor eax, eax
	1405	mov edx, LQTABLE
	1406	mov al, [edx + 3]
	1407	shr al, 4
	1408	call set_quants_lo
	1409	mov esi, LWORK_BUFFER ; src
	1410	lea esi, [esi + 64 * 32 * 2] ; src
	1411	mov edi, LOUT_BUFFER ; dst hi - HH1
	1412	lea edi, [edi + 32 * 32 * 4] ; dst hi - HH1
	1413	mov edx, LOUT_BUFFER ; dst lo - LH1
	1414	lea edx, [edx + 32 * 32 * 2] ; dst lo - LH1
	1415	call rfx_dwt_2d_encode_block_horiz_16_64
	1416
	1417	; verical DWT to work buffer, level 2
	1418	mov esi, LOUT_BUFFER ; src
	1419	lea esi, [esi + 32 * 32 * 6] ; src
	1420	mov edi, LWORK_BUFFER ; dst hi
	1421	lea edi, [edi + 32 * 16 * 2] ; dst hi
	1422	mov edx, LWORK_BUFFER ; dst lo
	1423	call rfx_dwt_2d_encode_block_verti_16_32
	1424
	1425	; horizontal DWT to out buffer, level 2, part 1
	1426	xor eax, eax
	1427	mov edx, LQTABLE
	1428	mov al, [edx + 2]
	1429	shr al, 4
	1430	call set_quants_hi
	1431	mov esi, LWORK_BUFFER ; src
	1432	; 32 * 32 * 6 + 16 * 16 * 0 = 6144
	1433	mov edi, LOUT_BUFFER ; dst hi - HL2
	1434	lea edi, [edi + 6144] ; dst hi - HL2
	1435	; 32 * 32 * 6 + 16 * 16 * 6 = 7680
	1436	mov edx, LOUT_BUFFER ; dst lo - LL2
	1437	lea edx, [edx + 7680] ; dst lo - LL2
	1438	call rfx_dwt_2d_encode_block_horiz_16_32_no_lo
	1439
	1440	; horizontal DWT to out buffer, level 2, part 2
	1441	xor eax, eax
	1442	mov edx, LQTABLE
	1443	mov al, [edx + 3]
	1444	and al, 0xF
	1445	call set_quants_hi
	1446	xor eax, eax
	1447	mov edx, LQTABLE
	1448	mov al, [edx + 2]
	1449	and al, 0xF
	1450	call set_quants_lo
	1451	mov esi, LWORK_BUFFER ; src
	1452	lea esi, [esi + 32 * 16 * 2] ; src
	1453	; 32 * 32 * 6 + 16 * 16 * 4 = 7168
	1454	mov edi, LOUT_BUFFER ; dst hi - HH2
	1455	lea edi, [edi + 7168] ; dst hi - HH2
	1456	; 32 * 32 * 6 + 16 * 16 * 2 = 6656
	1457	mov edx, LOUT_BUFFER ; dst lo - LH2
	1458	lea edx, [edx + 6656] ; dst lo - LH2
	1459	call rfx_dwt_2d_encode_block_horiz_16_32
	1460
	1461	; verical DWT to work buffer, level 3
	1462	; 32 * 32 * 6 + 16 * 16 * 6 = 7680
	1463	mov esi, LOUT_BUFFER ; src
	1464	lea esi, [esi + 7680] ; src
	1465	mov edi, LWORK_BUFFER ; dst hi
	1466	lea edi, [edi + 16 * 8 * 2] ; dst hi
	1467	mov edx, LWORK_BUFFER ; dst lo
	1468	call rfx_dwt_2d_encode_block_verti_16_16
	1469
	1470	; horizontal DWT to out buffer, level 3, part 1
	1471	xor eax, eax
	1472	mov edx, LQTABLE
	1473	mov al, [edx + 1]
	1474	and al, 0xF
	1475	call set_quants_hi
	1476	xor eax, eax
	1477	mov edx, LQTABLE
	1478	mov al, [edx + 0]
	1479	and al, 0xF
	1480	call set_quants_lo
	1481	mov esi, LWORK_BUFFER ; src
	1482	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 0 = 7680
	1483	mov edi, LOUT_BUFFER ; dst hi - HL3
	1484	lea edi, [edi + 7680] ; dst hi - HL3
	1485	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 6 = 8064
	1486	mov edx, LOUT_BUFFER ; dst lo - LL3
	1487	lea edx, [edx + 8064] ; dst lo - LL3
	1488	call rfx_dwt_2d_encode_block_horiz_16_16
	1489
	1490	; horizontal DWT to out buffer, level 3, part 2
	1491	xor eax, eax
	1492	mov edx, LQTABLE
	1493	mov al, [edx + 1]
	1494	shr al, 4
	1495	call set_quants_hi
	1496	xor eax, eax
	1497	mov edx, LQTABLE
	1498	mov al, [edx + 0]
	1499	shr al, 4
	1500	call set_quants_lo
	1501	mov esi, LWORK_BUFFER ; src
	1502	lea esi, [esi + 16 * 8 * 2] ; src
	1503	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 4 = 7936
	1504	mov edi, LOUT_BUFFER ; dst hi - HH3
	1505	lea edi, [edi + 7936] ; dst hi - HH3
	1506	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 2 = 7808
	1507	mov edx, LOUT_BUFFER ; dst lo - LH3
	1508	lea edx, [edx + 7808] ; dst lo - LH3
	1509	call rfx_dwt_2d_encode_block_horiz_16_16
	1510
	1511	; quants
	1512	add esp, 16 * 8
	1513	; restore registers
	1514	pop ebp
	1515	pop edi
	1516	pop esi
	1517	pop ebx
	1518	; params
	1519	add esp, 3 * 4
	1520	add esp, 4 * 4
	1521	; align
	1522	pop eax
	1523	add esp, eax
	1524	; return value
	1525	mov eax, 0
	1526	ret
	1527	align 16
	1528

+1397

-0

librfxcodec/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm less more

	0	;
	1	;Copyright 2016 Jay Sorg
	2	;
	3	;Permission to use, copy, modify, distribute, and sell this software and its
	4	;documentation for any purpose is hereby granted without fee, provided that
	5	;the above copyright notice appear in all copies and that both that
	6	;copyright notice and this permission notice appear in supporting
	7	;documentation.
	8	;
	9	;The above copyright notice and this permission notice shall be included in
	10	;all copies or substantial portions of the Software.
	11	;
	12	;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	13	;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	14	;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	15	;OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	16	;AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	17	;CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	18	;
	19	;x86 asm dwt
	20
	21	section .data
	22	align 16
	23	cw128 times 8 dw 128
	24	cdFFFF times 4 dd 65535
	25	; these are 1 << (factor - 1) 0 to 15 is factor
	26	cwa0 times 8 dw 0 ; 0
	27	cwa1 times 8 dw 1 ; 1
	28	cwa2 times 8 dw 2 ; 2
	29	cwa4 times 8 dw 4 ; 3
	30	cwa8 times 8 dw 8 ; 4
	31	cwa16 times 8 dw 16 ; 5
	32	cwa32 times 8 dw 32 ; 6
	33	cwa64 times 8 dw 64 ; 7
	34	cwa128 times 8 dw 128 ; 8
	35	cwa256 times 8 dw 256 ; 9
	36	cwa512 times 8 dw 512 ; 10
	37	cwa1024 times 8 dw 1024 ; 11
	38	cwa2048 times 8 dw 2048 ; 12
	39	cwa4096 times 8 dw 4096 ; 13
	40	cwa8192 times 8 dw 8192 ; 14
	41	cwa16384 times 8 dw 16384 ; 15
	42
	43	section .text
	44
	45	%macro PROC 1
	46	align 16
	47	global %1
	48	%1:
	49	%endmacro
	50
	51	%define LHI_ADD [esp + 1 * 16 + 4]
	52	%define LHI_SFT [esp + 2 * 16 + 4]
	53	%define LLO_ADD [esp + 3 * 16 + 4]
	54	%define LLO_SFT [esp + 4 * 16 + 4]
	55
	56	;******************************************************************************
	57	; source 16 bit signed, 16 pixel width
	58	rfx_dwt_2d_encode_block_horiz_16_16:
	59	mov ecx, 8
	60	loop1a:
	61	; pre / post
	62	movdqa xmm1, [esi] ; src[2n]
	63	movdqa xmm2, [esi + 16]
	64	movdqa xmm6, xmm1
	65	movdqa xmm7, xmm2
	66	pand xmm1, [cdFFFF]
	67	pand xmm2, [cdFFFF]
	68	packusdw xmm1, xmm2
	69	movdqa xmm2, xmm6 ; src[2n + 1]
	70	movdqa xmm3, xmm7
	71	psrldq xmm2, 2
	72	psrldq xmm3, 2
	73	pand xmm2, [cdFFFF]
	74	pand xmm3, [cdFFFF]
	75	packusdw xmm2, xmm3
	76	movdqa xmm3, xmm6 ; src[2n + 2]
	77	movdqa xmm4, xmm7
	78	psrldq xmm3, 4
	79	psrldq xmm4, 4
	80	movd eax, xmm7
	81	movd xmm5, eax
	82	pslldq xmm5, 12
	83	por xmm3, xmm5
	84	movdqa xmm5, xmm7
	85	psrldq xmm5, 12
	86	pslldq xmm5, 12
	87	por xmm4, xmm5
	88	pand xmm3, [cdFFFF]
	89	pand xmm4, [cdFFFF]
	90	packusdw xmm3, xmm4
	91	movdqa xmm4, xmm1
	92	movdqa xmm5, xmm2
	93	movdqa xmm6, xmm3
	94	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	95	paddw xmm4, xmm6
	96	psraw xmm4, 1
	97	psubw xmm5, xmm4
	98	psraw xmm5, 1
	99	movdqa xmm6, xmm5 ; out hi
	100	paddw xmm6, LHI_ADD
	101	psraw xmm6, LHI_SFT
	102	movdqa [edi], xmm6
	103	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	104	movdqa xmm7, xmm5
	105	movd eax, xmm7
	106	pslldq xmm7, 2
	107	and eax, 0xFFFF
	108	movd xmm6, eax
	109	por xmm7, xmm6
	110	paddw xmm5, xmm7
	111	psraw xmm5, 1
	112	paddw xmm5, xmm1
	113
	114	movdqa xmm6, xmm5 ; out lo
	115	paddw xmm6, LLO_ADD
	116	psraw xmm6, LLO_SFT
	117	movdqa [edx], xmm6
	118
	119	; move right
	120	lea esi, [esi + 16 * 2]
	121	lea edi, [edi + 8 * 2]
	122	lea edx, [edx + 8 * 2]
	123
	124	; move left
	125	lea esi, [esi - 16 * 2]
	126	lea edi, [edi - 8 * 2]
	127	lea edx, [edx - 8 * 2]
	128
	129	; move down
	130	lea esi, [esi + 16 * 2]
	131	lea edi, [edi + 8 * 2]
	132	lea edx, [edx + 8 * 2]
	133
	134	dec ecx
	135	jnz loop1a
	136
	137	ret
	138
	139	;******************************************************************************
	140	; source 16 bit signed, 16 pixel width
	141	rfx_dwt_2d_encode_block_verti_16_16:
	142	mov ecx, 2
	143	loop1b:
	144	; pre
	145	movdqa xmm1, [esi] ; src[2n]
	146	movdqa xmm2, [esi + 16 * 2] ; src[2n + 1]
	147	movdqa xmm3, [esi + 16 * 2 * 2] ; src[2n + 2]
	148	movdqa xmm4, xmm1
	149	movdqa xmm5, xmm2
	150	movdqa xmm6, xmm3
	151	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	152	paddw xmm4, xmm6
	153	psraw xmm4, 1
	154	psubw xmm5, xmm4
	155	psraw xmm5, 1
	156	movdqa [edi], xmm5 ; out hi
	157	movdqa xmm6, xmm5 ; save hi
	158	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	159	paddw xmm5, xmm1
	160	movdqa [edx], xmm5 ; out lo
	161	movdqa xmm7, xmm6 ; save hi
	162	; move down
	163	lea esi, [esi + 16 * 2 * 2] ; 2 rows
	164	lea edi, [edi + 16 * 2] ; 1 row
	165	lea edx, [edx + 16 * 2] ; 1 row
	166
	167	; loop
	168	shl ecx, 16
	169	mov cx, 6
	170	loop2b:
	171	movdqa xmm1, xmm3 ; src[2n]
	172	movdqa xmm2, [esi + 16 * 2] ; src[2n + 1]
	173	movdqa xmm3, [esi + 16 * 2 * 2] ; src[2n + 2]
	174	movdqa xmm4, xmm1
	175	movdqa xmm5, xmm2
	176	movdqa xmm6, xmm3
	177	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	178	paddw xmm4, xmm6
	179	psraw xmm4, 1
	180	psubw xmm5, xmm4
	181	psraw xmm5, 1
	182	movdqa [edi], xmm5 ; out hi
	183	movdqa xmm6, xmm5 ; save hi
	184	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	185	paddw xmm5, xmm7
	186	psraw xmm5, 1
	187	paddw xmm5, xmm1
	188	movdqa [edx], xmm5 ; out lo
	189	movdqa xmm7, xmm6 ; save hi
	190	; move down
	191	lea esi, [esi + 16 * 2 * 2] ; 2 rows
	192	lea edi, [edi + 16 * 2] ; 1 row
	193	lea edx, [edx + 16 * 2] ; 1 row
	194
	195	dec cx
	196	jnz loop2b
	197	shr ecx, 16
	198
	199	; post
	200	movdqa xmm1, xmm3 ; src[2n]
	201	movdqa xmm2, [esi + 16 * 2] ; src[2n + 1]
	202	movdqa xmm4, xmm1
	203	movdqa xmm5, xmm2
	204	movdqa xmm6, xmm3
	205	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	206	paddw xmm4, xmm6
	207	psraw xmm4, 1
	208	psubw xmm5, xmm4
	209	psraw xmm5, 1
	210	movdqa [edi], xmm5 ; out hi
	211	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	212	paddw xmm5, xmm7
	213	psraw xmm5, 1
	214	paddw xmm5, xmm1
	215	movdqa [edx], xmm5 ; out lo
	216	; move down
	217	lea esi, [esi + 16 * 2 * 2] ; 2 row
	218	lea edi, [edi + 16 * 2] ; 1 row
	219	lea edx, [edx + 16 * 2] ; 1 row
	220
	221	; move up
	222	lea esi, [esi - 16 * 16 * 2]
	223	lea edi, [edi - 8 * 16 * 2]
	224	lea edx, [edx - 8 * 16 * 2]
	225
	226	; move right
	227	lea esi, [esi + 16]
	228	lea edi, [edi + 16]
	229	lea edx, [edx + 16]
	230
	231	dec ecx
	232	jnz loop1b
	233
	234	ret
	235
	236	;******************************************************************************
	237	; source 16 bit signed, 32 pixel width
	238	rfx_dwt_2d_encode_block_horiz_16_32:
	239	mov ecx, 16
	240	loop1c:
	241	; pre
	242	movdqa xmm1, [esi] ; src[2n]
	243	movdqa xmm2, [esi + 16]
	244	movdqa xmm6, xmm1
	245	movdqa xmm7, xmm2
	246	pand xmm1, [cdFFFF]
	247	pand xmm2, [cdFFFF]
	248	packusdw xmm1, xmm2
	249	movdqa xmm2, xmm6 ; src[2n + 1]
	250	movdqa xmm3, xmm7
	251	psrldq xmm2, 2
	252	psrldq xmm3, 2
	253	pand xmm2, [cdFFFF]
	254	pand xmm3, [cdFFFF]
	255	packusdw xmm2, xmm3
	256	movdqa xmm3, xmm6 ; src[2n + 2]
	257	movdqa xmm4, xmm7
	258	psrldq xmm3, 4
	259	psrldq xmm4, 4
	260	movd eax, xmm7
	261	movd xmm5, eax
	262	pslldq xmm5, 12
	263	por xmm3, xmm5
	264	mov eax, [esi + 32]
	265	movd xmm5, eax
	266	pslldq xmm5, 12
	267	por xmm4, xmm5
	268	pand xmm3, [cdFFFF]
	269	pand xmm4, [cdFFFF]
	270	packusdw xmm3, xmm4
	271	movdqa xmm4, xmm1
	272	movdqa xmm5, xmm2
	273	movdqa xmm6, xmm3
	274	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	275	paddw xmm4, xmm6
	276	psraw xmm4, 1
	277	psubw xmm5, xmm4
	278	psraw xmm5, 1
	279
	280	movdqa xmm6, xmm5 ; out hi
	281	paddw xmm6, LHI_ADD
	282	psraw xmm6, LHI_SFT
	283	movdqa [edi], xmm6
	284	movdqa xmm2, xmm5 ; save hi
	285
	286	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	287	movdqa xmm7, xmm5
	288	movd eax, xmm7
	289	pslldq xmm7, 2
	290	and eax, 0xFFFF
	291	movd xmm6, eax
	292	por xmm7, xmm6
	293	paddw xmm5, xmm7
	294	psraw xmm5, 1
	295	paddw xmm5, xmm1
	296
	297	psrldq xmm2, 14
	298	movd ebx, xmm2 ; save hi
	299
	300	movdqa xmm6, xmm5 ; out lo
	301	paddw xmm6, LLO_ADD
	302	psraw xmm6, LLO_SFT
	303	movdqa [edx], xmm6
	304
	305	; move right
	306	lea esi, [esi + 16 * 2]
	307	lea edi, [edi + 8 * 2]
	308	lea edx, [edx + 8 * 2]
	309
	310	; post
	311	movdqa xmm1, [esi] ; src[2n]
	312	movdqa xmm2, [esi + 16]
	313	movdqa xmm6, xmm1
	314	movdqa xmm7, xmm2
	315	pand xmm1, [cdFFFF]
	316	pand xmm2, [cdFFFF]
	317	packusdw xmm1, xmm2
	318	movdqa xmm2, xmm6 ; src[2n + 1]
	319	movdqa xmm3, xmm7
	320	psrldq xmm2, 2
	321	psrldq xmm3, 2
	322	pand xmm2, [cdFFFF]
	323	pand xmm3, [cdFFFF]
	324	packusdw xmm2, xmm3
	325	movdqa xmm3, xmm6 ; src[2n + 2]
	326	movdqa xmm4, xmm7
	327	psrldq xmm3, 4
	328	psrldq xmm4, 4
	329	movd eax, xmm7
	330	movd xmm5, eax
	331	pslldq xmm5, 12
	332	por xmm3, xmm5
	333	movdqa xmm5, xmm7
	334	psrldq xmm5, 12
	335	pslldq xmm5, 12
	336	por xmm4, xmm5
	337	pand xmm3, [cdFFFF]
	338	pand xmm4, [cdFFFF]
	339	packusdw xmm3, xmm4
	340	movdqa xmm4, xmm1
	341	movdqa xmm5, xmm2
	342	movdqa xmm6, xmm3
	343	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	344	paddw xmm4, xmm6
	345	psraw xmm4, 1
	346	psubw xmm5, xmm4
	347	psraw xmm5, 1
	348
	349	movdqa xmm6, xmm5 ; out hi
	350	paddw xmm6, LHI_ADD
	351	psraw xmm6, LHI_SFT
	352	movdqa [edi], xmm6
	353
	354	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	355	movdqa xmm7, xmm5
	356	pslldq xmm7, 2
	357	movd xmm6, ebx
	358	por xmm7, xmm6
	359	paddw xmm5, xmm7
	360	psraw xmm5, 1
	361	paddw xmm5, xmm1
	362
	363	movdqa xmm6, xmm5 ; out lo
	364	paddw xmm6, LLO_ADD
	365	psraw xmm6, LLO_SFT
	366	movdqa [edx], xmm6
	367
	368	; move right
	369	lea esi, [esi + 16 * 2]
	370	lea edi, [edi + 8 * 2]
	371	lea edx, [edx + 8 * 2]
	372
	373	; move left
	374	lea esi, [esi - 32 * 2]
	375	lea edi, [edi - 16 * 2]
	376	lea edx, [edx - 16 * 2]
	377
	378	; move down
	379	lea esi, [esi + 32 * 2]
	380	lea edi, [edi + 16 * 2]
	381	lea edx, [edx + 16 * 2]
	382
	383	dec ecx
	384	jnz loop1c
	385
	386	ret
	387
	388	;******************************************************************************
	389	; source 16 bit signed, 32 pixel width
	390	rfx_dwt_2d_encode_block_horiz_16_32_no_lo:
	391	mov ecx, 16
	392	loop1c1:
	393	; pre
	394	movdqa xmm1, [esi] ; src[2n]
	395	movdqa xmm2, [esi + 16]
	396	movdqa xmm6, xmm1
	397	movdqa xmm7, xmm2
	398	pand xmm1, [cdFFFF]
	399	pand xmm2, [cdFFFF]
	400	packusdw xmm1, xmm2
	401	movdqa xmm2, xmm6 ; src[2n + 1]
	402	movdqa xmm3, xmm7
	403	psrldq xmm2, 2
	404	psrldq xmm3, 2
	405	pand xmm2, [cdFFFF]
	406	pand xmm3, [cdFFFF]
	407	packusdw xmm2, xmm3
	408	movdqa xmm3, xmm6 ; src[2n + 2]
	409	movdqa xmm4, xmm7
	410	psrldq xmm3, 4
	411	psrldq xmm4, 4
	412	movd eax, xmm7
	413	movd xmm5, eax
	414	pslldq xmm5, 12
	415	por xmm3, xmm5
	416	mov eax, [esi + 32]
	417	movd xmm5, eax
	418	pslldq xmm5, 12
	419	por xmm4, xmm5
	420	pand xmm3, [cdFFFF]
	421	pand xmm4, [cdFFFF]
	422	packusdw xmm3, xmm4
	423	movdqa xmm4, xmm1
	424	movdqa xmm5, xmm2
	425	movdqa xmm6, xmm3
	426	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	427	paddw xmm4, xmm6
	428	psraw xmm4, 1
	429	psubw xmm5, xmm4
	430	psraw xmm5, 1
	431
	432	movdqa xmm6, xmm5 ; out hi
	433	paddw xmm6, LHI_ADD
	434	psraw xmm6, LHI_SFT
	435	movdqa [edi], xmm6
	436	movdqa xmm2, xmm5 ; save hi
	437
	438	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	439	movdqa xmm7, xmm5
	440	movd eax, xmm7
	441	pslldq xmm7, 2
	442	and eax, 0xFFFF
	443	movd xmm6, eax
	444	por xmm7, xmm6
	445	paddw xmm5, xmm7
	446	psraw xmm5, 1
	447	paddw xmm5, xmm1
	448
	449	psrldq xmm2, 14
	450	movd ebx, xmm2 ; save hi
	451
	452	movdqa [edx], xmm5 ; out lo
	453
	454	; move right
	455	lea esi, [esi + 16 * 2]
	456	lea edi, [edi + 8 * 2]
	457	lea edx, [edx + 8 * 2]
	458
	459	; post
	460	movdqa xmm1, [esi] ; src[2n]
	461	movdqa xmm2, [esi + 16]
	462	movdqa xmm6, xmm1
	463	movdqa xmm7, xmm2
	464	pand xmm1, [cdFFFF]
	465	pand xmm2, [cdFFFF]
	466	packusdw xmm1, xmm2
	467	movdqa xmm2, xmm6 ; src[2n + 1]
	468	movdqa xmm3, xmm7
	469	psrldq xmm2, 2
	470	psrldq xmm3, 2
	471	pand xmm2, [cdFFFF]
	472	pand xmm3, [cdFFFF]
	473	packusdw xmm2, xmm3
	474	movdqa xmm3, xmm6 ; src[2n + 2]
	475	movdqa xmm4, xmm7
	476	psrldq xmm3, 4
	477	psrldq xmm4, 4
	478	movd eax, xmm7
	479	movd xmm5, eax
	480	pslldq xmm5, 12
	481	por xmm3, xmm5
	482	movdqa xmm5, xmm7
	483	psrldq xmm5, 12
	484	pslldq xmm5, 12
	485	por xmm4, xmm5
	486	pand xmm3, [cdFFFF]
	487	pand xmm4, [cdFFFF]
	488	packusdw xmm3, xmm4
	489	movdqa xmm4, xmm1
	490	movdqa xmm5, xmm2
	491	movdqa xmm6, xmm3
	492	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	493	paddw xmm4, xmm6
	494	psraw xmm4, 1
	495	psubw xmm5, xmm4
	496	psraw xmm5, 1
	497
	498	movdqa xmm6, xmm5 ; out hi
	499	paddw xmm6, LHI_ADD
	500	psraw xmm6, LHI_SFT
	501	movdqa [edi], xmm6
	502
	503	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	504	movdqa xmm7, xmm5
	505	pslldq xmm7, 2
	506	movd xmm6, ebx
	507	por xmm7, xmm6
	508	paddw xmm5, xmm7
	509	psraw xmm5, 1
	510	paddw xmm5, xmm1
	511
	512	movdqa [edx], xmm5 ; out lo
	513
	514	; move right
	515	lea esi, [esi + 16 * 2]
	516	lea edi, [edi + 8 * 2]
	517	lea edx, [edx + 8 * 2]
	518
	519	; move left
	520	lea esi, [esi - 32 * 2]
	521	lea edi, [edi - 16 * 2]
	522	lea edx, [edx - 16 * 2]
	523
	524	; move down
	525	lea esi, [esi + 32 * 2]
	526	lea edi, [edi + 16 * 2]
	527	lea edx, [edx + 16 * 2]
	528
	529	dec ecx
	530	jnz loop1c1
	531
	532	ret
	533
	534	;******************************************************************************
	535	; source 16 bit signed, 32 pixel width
	536	rfx_dwt_2d_encode_block_verti_16_32:
	537	mov ecx, 4
	538	loop1d:
	539	; pre
	540	movdqa xmm1, [esi] ; src[2n]
	541	movdqa xmm2, [esi + 32 * 2] ; src[2n + 1]
	542	movdqa xmm3, [esi + 32 * 2 * 2] ; src[2n + 2]
	543	movdqa xmm4, xmm1
	544	movdqa xmm5, xmm2
	545	movdqa xmm6, xmm3
	546	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	547	paddw xmm4, xmm6
	548	psraw xmm4, 1
	549	psubw xmm5, xmm4
	550	psraw xmm5, 1
	551	movdqa [edi], xmm5 ; out hi
	552	movdqa xmm6, xmm5 ; save hi
	553	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	554	paddw xmm5, xmm1
	555	movdqa [edx], xmm5 ; out lo
	556	movdqa xmm7, xmm6 ; save hi
	557	; move down
	558	lea esi, [esi + 32 * 2 * 2] ; 2 rows
	559	lea edi, [edi + 32 * 2] ; 1 row
	560	lea edx, [edx + 32 * 2] ; 1 row
	561
	562	; loop
	563	shl ecx, 16
	564	mov cx, 14
	565	loop2d:
	566	movdqa xmm1, xmm3 ; src[2n]
	567	movdqa xmm2, [esi + 32 * 2] ; src[2n + 1]
	568	movdqa xmm3, [esi + 32 * 2 * 2] ; src[2n + 2]
	569	movdqa xmm4, xmm1
	570	movdqa xmm5, xmm2
	571	movdqa xmm6, xmm3
	572	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	573	paddw xmm4, xmm6
	574	psraw xmm4, 1
	575	psubw xmm5, xmm4
	576	psraw xmm5, 1
	577	movdqa [edi], xmm5 ; out hi
	578	movdqa xmm6, xmm5 ; save hi
	579	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	580	paddw xmm5, xmm7
	581	psraw xmm5, 1
	582	paddw xmm5, xmm1
	583	movdqa [edx], xmm5 ; out lo
	584	movdqa xmm7, xmm6 ; save hi
	585	; move down
	586	lea esi, [esi + 32 * 2 * 2] ; 2 rows
	587	lea edi, [edi + 32 * 2] ; 1 row
	588	lea edx, [edx + 32 * 2] ; 1 row
	589
	590	dec cx
	591	jnz loop2d
	592	shr ecx, 16
	593
	594	; post
	595	movdqa xmm1, xmm3 ; src[2n]
	596	movdqa xmm2, [esi + 32 * 2] ; src[2n + 1]
	597	movdqa xmm4, xmm1
	598	movdqa xmm5, xmm2
	599	movdqa xmm6, xmm3
	600	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	601	paddw xmm4, xmm6
	602	psraw xmm4, 1
	603	psubw xmm5, xmm4
	604	psraw xmm5, 1
	605	movdqa [edi], xmm5 ; out hi
	606	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	607	paddw xmm5, xmm7
	608	psraw xmm5, 1
	609	paddw xmm5, xmm1
	610	movdqa [edx], xmm5 ; out lo
	611	; move down
	612	lea esi, [esi + 32 * 2 * 2] ; 2 row
	613	lea edi, [edi + 32 * 2] ; 1 row
	614	lea edx, [edx + 32 * 2] ; 1 row
	615
	616	; move up
	617	lea esi, [esi - 32 * 32 * 2]
	618	lea edi, [edi - 16 * 32 * 2]
	619	lea edx, [edx - 16 * 32 * 2]
	620
	621	; move right
	622	lea esi, [esi + 16]
	623	lea edi, [edi + 16]
	624	lea edx, [edx + 16]
	625
	626	dec ecx
	627	jnz loop1d
	628
	629	ret
	630
	631	;******************************************************************************
	632	; source 16 bit signed, 64 pixel width
	633	rfx_dwt_2d_encode_block_horiz_16_64:
	634	mov ecx, 32
	635	loop1e:
	636	; pre
	637	movdqa xmm1, [esi] ; src[2n]
	638	movdqa xmm2, [esi + 16]
	639	movdqa xmm6, xmm1
	640	movdqa xmm7, xmm2
	641	pand xmm1, [cdFFFF]
	642	pand xmm2, [cdFFFF]
	643	packusdw xmm1, xmm2
	644	movdqa xmm2, xmm6 ; src[2n + 1]
	645	movdqa xmm3, xmm7
	646	psrldq xmm2, 2
	647	psrldq xmm3, 2
	648	pand xmm2, [cdFFFF]
	649	pand xmm3, [cdFFFF]
	650	packusdw xmm2, xmm3
	651	movdqa xmm3, xmm6 ; src[2n + 2]
	652	movdqa xmm4, xmm7
	653	psrldq xmm3, 4
	654	psrldq xmm4, 4
	655	movd eax, xmm7
	656	movd xmm5, eax
	657	pslldq xmm5, 12
	658	por xmm3, xmm5
	659	mov eax, [esi + 32]
	660	movd xmm5, eax
	661	pslldq xmm5, 12
	662	por xmm4, xmm5
	663	pand xmm3, [cdFFFF]
	664	pand xmm4, [cdFFFF]
	665	packusdw xmm3, xmm4
	666	movdqa xmm4, xmm1
	667	movdqa xmm5, xmm2
	668	movdqa xmm6, xmm3
	669	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	670	paddw xmm4, xmm6
	671	psraw xmm4, 1
	672	psubw xmm5, xmm4
	673	psraw xmm5, 1
	674
	675	movdqa xmm6, xmm5 ; out hi
	676	paddw xmm6, LHI_ADD
	677	psraw xmm6, LHI_SFT
	678	movdqa [edi], xmm6
	679	movdqa xmm2, xmm5 ; save hi
	680
	681	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	682	movdqa xmm7, xmm5
	683	movd eax, xmm7
	684	pslldq xmm7, 2
	685	and eax, 0xFFFF
	686	movd xmm6, eax
	687	por xmm7, xmm6
	688	paddw xmm5, xmm7
	689	psraw xmm5, 1
	690	paddw xmm5, xmm1
	691
	692	psrldq xmm2, 14
	693	movd ebx, xmm2 ; save hi
	694
	695	movdqa xmm6, xmm5 ; out lo
	696	paddw xmm6, LLO_ADD
	697	psraw xmm6, LLO_SFT
	698	movdqa [edx], xmm6
	699
	700	; move right
	701	lea esi, [esi + 16 * 2]
	702	lea edi, [edi + 8 * 2]
	703	lea edx, [edx + 8 * 2]
	704
	705	; loop
	706	shl ecx, 16
	707	mov cx, 2
	708	loop2e:
	709	movdqa xmm1, [esi] ; src[2n]
	710	movdqa xmm2, [esi + 16]
	711	movdqa xmm6, xmm1
	712	movdqa xmm7, xmm2
	713	pand xmm1, [cdFFFF]
	714	pand xmm2, [cdFFFF]
	715	packusdw xmm1, xmm2
	716	movdqa xmm2, xmm6 ; src[2n + 1]
	717	movdqa xmm3, xmm7
	718	psrldq xmm2, 2
	719	psrldq xmm3, 2
	720	pand xmm2, [cdFFFF]
	721	pand xmm3, [cdFFFF]
	722	packusdw xmm2, xmm3
	723	movdqa xmm3, xmm6 ; src[2n + 2]
	724	movdqa xmm4, xmm7
	725	psrldq xmm3, 4
	726	psrldq xmm4, 4
	727	movd eax, xmm7
	728	movd xmm5, eax
	729	pslldq xmm5, 12
	730	por xmm3, xmm5
	731	mov eax, [esi + 32]
	732	movd xmm5, eax
	733	pslldq xmm5, 12
	734	por xmm4, xmm5
	735	pand xmm3, [cdFFFF]
	736	pand xmm4, [cdFFFF]
	737	packusdw xmm3, xmm4
	738	movdqa xmm4, xmm1
	739	movdqa xmm5, xmm2
	740	movdqa xmm6, xmm3
	741	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	742	paddw xmm4, xmm6
	743	psraw xmm4, 1
	744	psubw xmm5, xmm4
	745	psraw xmm5, 1
	746
	747	movdqa xmm6, xmm5 ; out hi
	748	paddw xmm6, LHI_ADD
	749	psraw xmm6, LHI_SFT
	750	movdqa [edi], xmm6
	751	movdqa xmm2, xmm5 ; save hi
	752
	753	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	754	movdqa xmm7, xmm5
	755	pslldq xmm7, 2
	756	movd xmm6, ebx
	757	por xmm7, xmm6
	758	paddw xmm5, xmm7
	759	psraw xmm5, 1
	760	paddw xmm5, xmm1
	761
	762	psrldq xmm2, 14
	763	movd ebx, xmm2 ; save hi
	764
	765	movdqa xmm6, xmm5 ; out lo
	766	paddw xmm6, LLO_ADD
	767	psraw xmm6, LLO_SFT
	768	movdqa [edx], xmm6
	769
	770	; move right
	771	lea esi, [esi + 16 * 2]
	772	lea edi, [edi + 8 * 2]
	773	lea edx, [edx + 8 * 2]
	774
	775	dec cx
	776	jnz loop2e
	777	shr ecx, 16
	778
	779	; post
	780	movdqa xmm1, [esi] ; src[2n]
	781	movdqa xmm2, [esi + 16]
	782	movdqa xmm6, xmm1
	783	movdqa xmm7, xmm2
	784	pand xmm1, [cdFFFF]
	785	pand xmm2, [cdFFFF]
	786	packusdw xmm1, xmm2
	787	movdqa xmm2, xmm6 ; src[2n + 1]
	788	movdqa xmm3, xmm7
	789	psrldq xmm2, 2
	790	psrldq xmm3, 2
	791	pand xmm2, [cdFFFF]
	792	pand xmm3, [cdFFFF]
	793	packusdw xmm2, xmm3
	794	movdqa xmm3, xmm6 ; src[2n + 2]
	795	movdqa xmm4, xmm7
	796	psrldq xmm3, 4
	797	psrldq xmm4, 4
	798	movd eax, xmm7
	799	movd xmm5, eax
	800	pslldq xmm5, 12
	801	por xmm3, xmm5
	802	movdqa xmm5, xmm7
	803	psrldq xmm5, 12
	804	pslldq xmm5, 12
	805	por xmm4, xmm5
	806	pand xmm3, [cdFFFF]
	807	pand xmm4, [cdFFFF]
	808	packusdw xmm3, xmm4
	809	movdqa xmm4, xmm1
	810	movdqa xmm5, xmm2
	811	movdqa xmm6, xmm3
	812	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	813	paddw xmm4, xmm6
	814	psraw xmm4, 1
	815	psubw xmm5, xmm4
	816	psraw xmm5, 1
	817
	818	movdqa xmm6, xmm5 ; out hi
	819	paddw xmm6, LHI_ADD
	820	psraw xmm6, LHI_SFT
	821	movdqa [edi], xmm6
	822
	823	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	824	movdqa xmm7, xmm5
	825	pslldq xmm7, 2
	826	movd xmm6, ebx
	827	por xmm7, xmm6
	828	paddw xmm5, xmm7
	829	psraw xmm5, 1
	830	paddw xmm5, xmm1
	831
	832	movdqa xmm6, xmm5 ; out lo
	833	paddw xmm6, LLO_ADD
	834	psraw xmm6, LLO_SFT
	835	movdqa [edx], xmm6
	836
	837	; move right
	838	lea esi, [esi + 16 * 2]
	839	lea edi, [edi + 8 * 2]
	840	lea edx, [edx + 8 * 2]
	841
	842	; move left
	843	lea esi, [esi - 64 * 2]
	844	lea edi, [edi - 32 * 2]
	845	lea edx, [edx - 32 * 2]
	846
	847	; move down
	848	lea esi, [esi + 64 * 2]
	849	lea edi, [edi + 32 * 2]
	850	lea edx, [edx + 32 * 2]
	851
	852	dec ecx
	853	jnz loop1e
	854
	855	ret
	856
	857	;******************************************************************************
	858	; source 16 bit signed, 64 pixel width
	859	rfx_dwt_2d_encode_block_horiz_16_64_no_lo:
	860	mov ecx, 32
	861	loop1e1:
	862	; pre
	863	movdqa xmm1, [esi] ; src[2n]
	864	movdqa xmm2, [esi + 16]
	865	movdqa xmm6, xmm1
	866	movdqa xmm7, xmm2
	867	pand xmm1, [cdFFFF]
	868	pand xmm2, [cdFFFF]
	869	packusdw xmm1, xmm2
	870	movdqa xmm2, xmm6 ; src[2n + 1]
	871	movdqa xmm3, xmm7
	872	psrldq xmm2, 2
	873	psrldq xmm3, 2
	874	pand xmm2, [cdFFFF]
	875	pand xmm3, [cdFFFF]
	876	packusdw xmm2, xmm3
	877	movdqa xmm3, xmm6 ; src[2n + 2]
	878	movdqa xmm4, xmm7
	879	psrldq xmm3, 4
	880	psrldq xmm4, 4
	881	movd eax, xmm7
	882	movd xmm5, eax
	883	pslldq xmm5, 12
	884	por xmm3, xmm5
	885	mov eax, [esi + 32]
	886	movd xmm5, eax
	887	pslldq xmm5, 12
	888	por xmm4, xmm5
	889	pand xmm3, [cdFFFF]
	890	pand xmm4, [cdFFFF]
	891	packusdw xmm3, xmm4
	892	movdqa xmm4, xmm1
	893	movdqa xmm5, xmm2
	894	movdqa xmm6, xmm3
	895	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	896	paddw xmm4, xmm6
	897	psraw xmm4, 1
	898	psubw xmm5, xmm4
	899	psraw xmm5, 1
	900
	901	movdqa xmm6, xmm5 ; out hi
	902	paddw xmm6, LHI_ADD
	903	psraw xmm6, LHI_SFT
	904	movdqa [edi], xmm6
	905	movdqa xmm2, xmm5 ; save hi
	906
	907	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	908	movdqa xmm7, xmm5
	909	movd eax, xmm7
	910	pslldq xmm7, 2
	911	and eax, 0xFFFF
	912	movd xmm6, eax
	913	por xmm7, xmm6
	914	paddw xmm5, xmm7
	915	psraw xmm5, 1
	916	paddw xmm5, xmm1
	917
	918	psrldq xmm2, 14
	919	movd ebx, xmm2 ; save hi
	920
	921	movdqa [edx], xmm5 ; out lo
	922
	923	; move right
	924	lea esi, [esi + 16 * 2]
	925	lea edi, [edi + 8 * 2]
	926	lea edx, [edx + 8 * 2]
	927
	928	; loop
	929	shl ecx, 16
	930	mov cx, 2
	931	loop2e1:
	932	movdqa xmm1, [esi] ; src[2n]
	933	movdqa xmm2, [esi + 16]
	934	movdqa xmm6, xmm1
	935	movdqa xmm7, xmm2
	936	pand xmm1, [cdFFFF]
	937	pand xmm2, [cdFFFF]
	938	packusdw xmm1, xmm2
	939	movdqa xmm2, xmm6 ; src[2n + 1]
	940	movdqa xmm3, xmm7
	941	psrldq xmm2, 2
	942	psrldq xmm3, 2
	943	pand xmm2, [cdFFFF]
	944	pand xmm3, [cdFFFF]
	945	packusdw xmm2, xmm3
	946	movdqa xmm3, xmm6 ; src[2n + 2]
	947	movdqa xmm4, xmm7
	948	psrldq xmm3, 4
	949	psrldq xmm4, 4
	950	movd eax, xmm7
	951	movd xmm5, eax
	952	pslldq xmm5, 12
	953	por xmm3, xmm5
	954	mov eax, [esi + 32]
	955	movd xmm5, eax
	956	pslldq xmm5, 12
	957	por xmm4, xmm5
	958	pand xmm3, [cdFFFF]
	959	pand xmm4, [cdFFFF]
	960	packusdw xmm3, xmm4
	961	movdqa xmm4, xmm1
	962	movdqa xmm5, xmm2
	963	movdqa xmm6, xmm3
	964	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	965	paddw xmm4, xmm6
	966	psraw xmm4, 1
	967	psubw xmm5, xmm4
	968	psraw xmm5, 1
	969
	970	movdqa xmm6, xmm5 ; out hi
	971	paddw xmm6, LHI_ADD
	972	psraw xmm6, LHI_SFT
	973	movdqa [edi], xmm6
	974	movdqa xmm2, xmm5 ; save hi
	975
	976	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	977	movdqa xmm7, xmm5
	978	pslldq xmm7, 2
	979	movd xmm6, ebx
	980	por xmm7, xmm6
	981	paddw xmm5, xmm7
	982	psraw xmm5, 1
	983	paddw xmm5, xmm1
	984
	985	psrldq xmm2, 14
	986	movd ebx, xmm2 ; save hi
	987
	988	movdqa [edx], xmm5 ; out lo
	989
	990	; move right
	991	lea esi, [esi + 16 * 2]
	992	lea edi, [edi + 8 * 2]
	993	lea edx, [edx + 8 * 2]
	994
	995	dec cx
	996	jnz loop2e1
	997	shr ecx, 16
	998
	999	; post
	1000	movdqa xmm1, [esi] ; src[2n]
	1001	movdqa xmm2, [esi + 16]
	1002	movdqa xmm6, xmm1
	1003	movdqa xmm7, xmm2
	1004	pand xmm1, [cdFFFF]
	1005	pand xmm2, [cdFFFF]
	1006	packusdw xmm1, xmm2
	1007	movdqa xmm2, xmm6 ; src[2n + 1]
	1008	movdqa xmm3, xmm7
	1009	psrldq xmm2, 2
	1010	psrldq xmm3, 2
	1011	pand xmm2, [cdFFFF]
	1012	pand xmm3, [cdFFFF]
	1013	packusdw xmm2, xmm3
	1014	movdqa xmm3, xmm6 ; src[2n + 2]
	1015	movdqa xmm4, xmm7
	1016	psrldq xmm3, 4
	1017	psrldq xmm4, 4
	1018	movd eax, xmm7
	1019	movd xmm5, eax
	1020	pslldq xmm5, 12
	1021	por xmm3, xmm5
	1022	movdqa xmm5, xmm7
	1023	psrldq xmm5, 12
	1024	pslldq xmm5, 12
	1025	por xmm4, xmm5
	1026	pand xmm3, [cdFFFF]
	1027	pand xmm4, [cdFFFF]
	1028	packusdw xmm3, xmm4
	1029	movdqa xmm4, xmm1
	1030	movdqa xmm5, xmm2
	1031	movdqa xmm6, xmm3
	1032	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1033	paddw xmm4, xmm6
	1034	psraw xmm4, 1
	1035	psubw xmm5, xmm4
	1036	psraw xmm5, 1
	1037
	1038	movdqa xmm6, xmm5 ; out hi
	1039	paddw xmm6, LHI_ADD
	1040	psraw xmm6, LHI_SFT
	1041	movdqa [edi], xmm6
	1042
	1043	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1044	movdqa xmm7, xmm5
	1045	pslldq xmm7, 2
	1046	movd xmm6, ebx
	1047	por xmm7, xmm6
	1048	paddw xmm5, xmm7
	1049	psraw xmm5, 1
	1050	paddw xmm5, xmm1
	1051
	1052	movdqa [edx], xmm5 ; out lo
	1053
	1054	; move right
	1055	lea esi, [esi + 16 * 2]
	1056	lea edi, [edi + 8 * 2]
	1057	lea edx, [edx + 8 * 2]
	1058
	1059	; move left
	1060	lea esi, [esi - 64 * 2]
	1061	lea edi, [edi - 32 * 2]
	1062	lea edx, [edx - 32 * 2]
	1063
	1064	; move down
	1065	lea esi, [esi + 64 * 2]
	1066	lea edi, [edi + 32 * 2]
	1067	lea edx, [edx + 32 * 2]
	1068
	1069	dec ecx
	1070	jnz loop1e1
	1071
	1072	ret
	1073
	1074	;******************************************************************************
	1075	; source 8 bit unsigned, 64 pixel width
	1076	rfx_dwt_2d_encode_block_verti_8_64:
	1077	mov ecx, 8
	1078	loop1f:
	1079	; pre
	1080	movq xmm1, [esi] ; src[2n]
	1081	movq xmm2, [esi + 64 * 1] ; src[2n + 1]
	1082	movq xmm3, [esi + 64 * 1 * 2] ; src[2n + 2]
	1083	punpcklbw xmm1, xmm0
	1084	punpcklbw xmm2, xmm0
	1085	punpcklbw xmm3, xmm0
	1086	psubw xmm1, [cw128]
	1087	psubw xmm2, [cw128]
	1088	psubw xmm3, [cw128]
	1089	psllw xmm1, 5
	1090	psllw xmm2, 5
	1091	psllw xmm3, 5
	1092	movdqa xmm4, xmm1
	1093	movdqa xmm5, xmm2
	1094	movdqa xmm6, xmm3
	1095	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1096	paddw xmm4, xmm6
	1097	psraw xmm4, 1
	1098	psubw xmm5, xmm4
	1099	psraw xmm5, 1
	1100	movdqa [edi], xmm5 ; out hi
	1101	movdqa xmm6, xmm5 ; save hi
	1102	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1103	paddw xmm5, xmm1
	1104	movdqa [edx], xmm5 ; out lo
	1105	movdqa xmm7, xmm6 ; save hi
	1106	; move down
	1107	lea esi, [esi + 64 * 1 * 2] ; 2 rows
	1108	lea edi, [edi + 64 * 2] ; 1 row
	1109	lea edx, [edx + 64 * 2] ; 1 row
	1110
	1111	; loop
	1112	shl ecx, 16
	1113	mov cx, 30
	1114	loop2f:
	1115	movdqa xmm1, xmm3 ; src[2n]
	1116	movq xmm2, [esi + 64 * 1] ; src[2n + 1]
	1117	movq xmm3, [esi + 64 * 1 * 2] ; src[2n + 2]
	1118	punpcklbw xmm2, xmm0
	1119	punpcklbw xmm3, xmm0
	1120	psubw xmm2, [cw128]
	1121	psubw xmm3, [cw128]
	1122	psllw xmm2, 5
	1123	psllw xmm3, 5
	1124	movdqa xmm4, xmm1
	1125	movdqa xmm5, xmm2
	1126	movdqa xmm6, xmm3
	1127	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1128	paddw xmm4, xmm6
	1129	psraw xmm4, 1
	1130	psubw xmm5, xmm4
	1131	psraw xmm5, 1
	1132	movdqa [edi], xmm5 ; out hi
	1133	movdqa xmm6, xmm5 ; save hi
	1134	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1135	paddw xmm5, xmm7
	1136	psraw xmm5, 1
	1137	paddw xmm5, xmm1
	1138	movdqa [edx], xmm5 ; out lo
	1139	movdqa xmm7, xmm6 ; save hi
	1140	; move down
	1141	lea esi, [esi + 64 * 1 * 2] ; 2 rows
	1142	lea edi, [edi + 64 * 2] ; 1 row
	1143	lea edx, [edx + 64 * 2] ; 1 row
	1144
	1145	dec cx
	1146	jnz loop2f
	1147	shr ecx, 16
	1148
	1149	; post
	1150	movdqa xmm1, xmm3 ; src[2n]
	1151	movq xmm2, [esi + 64 * 1] ; src[2n + 1]
	1152	punpcklbw xmm2, xmm0
	1153	psubw xmm2, [cw128]
	1154	psllw xmm2, 5
	1155	movdqa xmm4, xmm1
	1156	movdqa xmm5, xmm2
	1157	movdqa xmm6, xmm3
	1158	; h[n] = (src[2n + 1] - ((src[2n] + src[2n + 2]) >> 1)) >> 1
	1159	paddw xmm4, xmm6
	1160	psraw xmm4, 1
	1161	psubw xmm5, xmm4
	1162	psraw xmm5, 1
	1163	movdqa [edi], xmm5 ; out hi
	1164	; l[n] = src[2n] + ((h[n - 1] + h[n]) >> 1)
	1165	paddw xmm5, xmm7
	1166	psraw xmm5, 1
	1167	paddw xmm5, xmm1
	1168	movdqa [edx], xmm5 ; out lo
	1169	; move down
	1170	lea esi, [esi + 64 * 1 * 2] ; 2 rows
	1171	lea edi, [edi + 64 * 2] ; 1 row
	1172	lea edx, [edx + 64 * 2] ; 1 row
	1173
	1174	; move up
	1175	lea esi, [esi - 64 * 1 * 64]
	1176	lea edi, [edi - 32 * 64 * 2]
	1177	lea edx, [edx - 32 * 64 * 2]
	1178
	1179	; move right
	1180	lea esi, [esi + 8]
	1181	lea edi, [edi + 16]
	1182	lea edx, [edx + 16]
	1183
	1184	dec ecx
	1185	jnz loop1f
	1186
	1187	ret
	1188
	1189	set_quants_hi:
	1190	sub eax, 6 - 5
	1191	movd xmm1, eax
	1192	movdqa LHI_SFT, xmm1
	1193	imul eax, 16
	1194	lea edx, [cwa0]
	1195	add edx, eax
	1196	movdqa xmm1, [edx]
	1197	movdqa LHI_ADD, xmm1
	1198	ret
	1199
	1200	set_quants_lo:
	1201	sub eax, 6 - 5
	1202	movd xmm1, eax
	1203	movdqa LLO_SFT, xmm1
	1204	imul eax, 16
	1205	lea edx, [cwa0]
	1206	add edx, eax
	1207	movdqa xmm1, [edx]
	1208	movdqa LLO_ADD, xmm1
	1209	ret
	1210
	1211	%define LQTABLE [esp + 144] ; qtable
	1212	%define LIN_BUFFER [esp + 148] ; in_buffer
	1213	%define LOUT_BUFFER [esp + 152] ; out_buffer
	1214	%define LWORK_BUFFER [esp + 156] ; work_buffer
	1215
	1216	;int
	1217	;rfxcodec_encode_dwt_shift_x86_sse41(const char *qtable,
	1218	; unsigned char *in_buffer,
	1219	; short *out_buffer,
	1220	; short *work_buffer);
	1221
	1222	;******************************************************************************
	1223	%ifidn __OUTPUT_FORMAT__,elf
	1224	PROC rfxcodec_encode_dwt_shift_x86_sse41
	1225	%else
	1226	PROC _rfxcodec_encode_dwt_shift_x86_sse41
	1227	%endif
	1228	; align stack
	1229	mov eax, esp
	1230	sub eax, 0x10
	1231	and eax, 0x0F
	1232	sub esp, eax
	1233	push eax
	1234	sub esp, 3 * 4
	1235	sub esp, 4 * 4
	1236	; copy params to after align
	1237	movdqu xmm0, [esp + eax + 4 * 4 + 3 * 4 + 4 + 4]
	1238	movdqu [esp], xmm0
	1239	; save registers
	1240	push ebx
	1241	push esi
	1242	push edi
	1243	push ebp
	1244	sub esp, 16 * 8
	1245	pxor xmm0, xmm0
	1246
	1247	; verical DWT to work buffer, level 1
	1248	mov esi, LIN_BUFFER ; src
	1249	mov edi, LWORK_BUFFER ; dst hi
	1250	lea edi, [edi + 64 * 32 * 2] ; dst hi
	1251	mov edx, LWORK_BUFFER ; dst lo
	1252	call rfx_dwt_2d_encode_block_verti_8_64
	1253
	1254	; horizontal DWT to out buffer, level 1, part 1
	1255	xor eax, eax
	1256	mov edx, LQTABLE
	1257	mov al, [edx + 4]
	1258	and al, 0xF
	1259	call set_quants_hi
	1260	mov esi, LWORK_BUFFER ; src
	1261	mov edi, LOUT_BUFFER ; dst hi - HL1
	1262	mov edx, LOUT_BUFFER ; dst lo - LL1
	1263	lea edx, [edx + 32 * 32 * 6] ; dst lo - LL1
	1264	call rfx_dwt_2d_encode_block_horiz_16_64_no_lo
	1265
	1266	; horizontal DWT to out buffer, level 1, part 2
	1267	xor eax, eax
	1268	mov edx, LQTABLE
	1269	mov al, [edx + 4]
	1270	shr al, 4
	1271	call set_quants_hi
	1272	xor eax, eax
	1273	mov edx, LQTABLE
	1274	mov al, [edx + 3]
	1275	shr al, 4
	1276	call set_quants_lo
	1277	mov esi, LWORK_BUFFER ; src
	1278	lea esi, [esi + 64 * 32 * 2] ; src
	1279	mov edi, LOUT_BUFFER ; dst hi - HH1
	1280	lea edi, [edi + 32 * 32 * 4] ; dst hi - HH1
	1281	mov edx, LOUT_BUFFER ; dst lo - LH1
	1282	lea edx, [edx + 32 * 32 * 2] ; dst lo - LH1
	1283	call rfx_dwt_2d_encode_block_horiz_16_64
	1284
	1285	; verical DWT to work buffer, level 2
	1286	mov esi, LOUT_BUFFER ; src
	1287	lea esi, [esi + 32 * 32 * 6] ; src
	1288	mov edi, LWORK_BUFFER ; dst hi
	1289	lea edi, [edi + 32 * 16 * 2] ; dst hi
	1290	mov edx, LWORK_BUFFER ; dst lo
	1291	call rfx_dwt_2d_encode_block_verti_16_32
	1292
	1293	; horizontal DWT to out buffer, level 2, part 1
	1294	xor eax, eax
	1295	mov edx, LQTABLE
	1296	mov al, [edx + 2]
	1297	shr al, 4
	1298	call set_quants_hi
	1299	mov esi, LWORK_BUFFER ; src
	1300	; 32 * 32 * 6 + 16 * 16 * 0 = 6144
	1301	mov edi, LOUT_BUFFER ; dst hi - HL2
	1302	lea edi, [edi + 6144] ; dst hi - HL2
	1303	; 32 * 32 * 6 + 16 * 16 * 6 = 7680
	1304	mov edx, LOUT_BUFFER ; dst lo - LL2
	1305	lea edx, [edx + 7680] ; dst lo - LL2
	1306	call rfx_dwt_2d_encode_block_horiz_16_32_no_lo
	1307
	1308	; horizontal DWT to out buffer, level 2, part 2
	1309	xor eax, eax
	1310	mov edx, LQTABLE
	1311	mov al, [edx + 3]
	1312	and al, 0xF
	1313	call set_quants_hi
	1314	xor eax, eax
	1315	mov edx, LQTABLE
	1316	mov al, [edx + 2]
	1317	and al, 0xF
	1318	call set_quants_lo
	1319	mov esi, LWORK_BUFFER ; src
	1320	lea esi, [esi + 32 * 16 * 2] ; src
	1321	; 32 * 32 * 6 + 16 * 16 * 4 = 7168
	1322	mov edi, LOUT_BUFFER ; dst hi - HH2
	1323	lea edi, [edi + 7168] ; dst hi - HH2
	1324	; 32 * 32 * 6 + 16 * 16 * 2 = 6656
	1325	mov edx, LOUT_BUFFER ; dst lo - LH2
	1326	lea edx, [edx + 6656] ; dst lo - LH2
	1327	call rfx_dwt_2d_encode_block_horiz_16_32
	1328
	1329	; verical DWT to work buffer, level 3
	1330	; 32 * 32 * 6 + 16 * 16 * 6 = 7680
	1331	mov esi, LOUT_BUFFER ; src
	1332	lea esi, [esi + 7680] ; src
	1333	mov edi, LWORK_BUFFER ; dst hi
	1334	lea edi, [edi + 16 * 8 * 2] ; dst hi
	1335	mov edx, LWORK_BUFFER ; dst lo
	1336	call rfx_dwt_2d_encode_block_verti_16_16
	1337
	1338	; horizontal DWT to out buffer, level 3, part 1
	1339	xor eax, eax
	1340	mov edx, LQTABLE
	1341	mov al, [edx + 1]
	1342	and al, 0xF
	1343	call set_quants_hi
	1344	xor eax, eax
	1345	mov edx, LQTABLE
	1346	mov al, [edx + 0]
	1347	and al, 0xF
	1348	call set_quants_lo
	1349	mov esi, LWORK_BUFFER ; src
	1350	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 0 = 7680
	1351	mov edi, LOUT_BUFFER ; dst hi - HL3
	1352	lea edi, [edi + 7680] ; dst hi - HL3
	1353	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 6 = 8064
	1354	mov edx, LOUT_BUFFER ; dst lo - LL3
	1355	lea edx, [edx + 8064] ; dst lo - LL3
	1356	call rfx_dwt_2d_encode_block_horiz_16_16
	1357
	1358	; horizontal DWT to out buffer, level 3, part 2
	1359	xor eax, eax
	1360	mov edx, LQTABLE
	1361	mov al, [edx + 1]
	1362	shr al, 4
	1363	call set_quants_hi
	1364	xor eax, eax
	1365	mov edx, LQTABLE
	1366	mov al, [edx + 0]
	1367	shr al, 4
	1368	call set_quants_lo
	1369	mov esi, LWORK_BUFFER ; src
	1370	lea esi, [esi + 16 * 8 * 2] ; src
	1371	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 4 = 7936
	1372	mov edi, LOUT_BUFFER ; dst hi - HH3
	1373	lea edi, [edi + 7936] ; dst hi - HH3
	1374	; 32 * 32 * 6 + 16 * 16 * 6 + 8 * 8 * 2 = 7808
	1375	mov edx, LOUT_BUFFER ; dst lo - LH3
	1376	lea edx, [edx + 7808] ; dst lo - LH3
	1377	call rfx_dwt_2d_encode_block_horiz_16_16
	1378
	1379	; quants
	1380	add esp, 16 * 8
	1381	; restore registers
	1382	pop ebp
	1383	pop edi
	1384	pop esi
	1385	pop ebx
	1386	; params
	1387	add esp, 3 * 4
	1388	add esp, 4 * 4
	1389	; align
	1390	pop eax
	1391	add esp, eax
	1392	; return value
	1393	mov eax, 0
	1394	ret
	1395	align 16
	1396

+0

-26

~~librfxcodec/src/x86/rfxdwt_x86_sse2.asm~~ less more

0
1		section .data
2		const1 times 8 dw 1
3
4		%macro PROC 1
5		align 16
6		global %1
7		%1:
8		%endmacro
9
10		;int
11		;dwt_shift_x86_sse2(const int quantization_values, uint8 data,
12		; sint16 dwt_buffer1, sint16 dwt_buffer);
13
14		PROC dwt_shift_x86_sse2
15		push ebx
16		push esi
17		push edi
18
19		mov eax, 0
20		pop edi
21		pop esi
22		pop ebx
23		ret
24		align 16
25

+0

-25

~~librfxcodec/src/x86/rfxrlgr1_x86.asm~~ less more

0
1		section .data
2		const1 times 8 dw 1
3
4		%macro PROC 1
5		align 16
6		global %1
7		%1:
8		%endmacro
9
10		;int
11		;diff_rlgr1_x86(sint16 co, int num_co, uint8 dst, int dst_bytes);
12
13		PROC diff_rlgr1_x86
14		push ebx
15		push esi
16		push edi
17
18		mov eax, 0
19		pop edi
20		pop esi
21		pop ebx
22		ret
23		align 16
24

+0

-25

~~librfxcodec/src/x86/rfxrlgr3_x86.asm~~ less more

0
1		section .data
2		const1 times 8 dw 1
3
4		%macro PROC 1
5		align 16
6		global %1
7		%1:
8		%endmacro
9
10		;int
11		;diff_rlgr3_x86(sint16 co, int num_co, uint8 dst, int dst_bytes);
12
13		PROC diff_rlgr3_x86
14		push ebx
15		push esi
16		push edi
17
18		mov eax, 0
19		pop edi
20		pop esi
21		pop ebx
22		ret
23		align 16
24

+0

-22

~~librfxcodec/tests/Makefile~~ less more

0
1		OBJS = rfxcodectest.o
2
3		CFLAGS = -g -O2 -Wall -fPIC -I../include
4
5		# this for linking to .so
6		#LDFLAGS = $(PROFIL) -L../src -Wl,-rpath=../src
7		# this if using .a
8		LDFLAGS = $(PROFIL)
9
10		# this for linking to .so
11		#LIBS = -lrfxencode
12		# this for using .a
13		LIBS = ../src/librfxencode.a
14
15		all: rfxcodectest
16
17		rfxcodectest: $(OBJS) Makefile
18		$(CC) -o rfxcodectest $(LDFLAGS) $(OBJS) $(LIBS)
19
20		clean:
21		rm -f $(OBJS) rfxcodectest

+25

-0

librfxcodec/tests/Makefile.am less more

	0
	1	EXTRA_DIST = readme.txt
	2
	3	EXTRA_INCLUDES =
	4	EXTRA_LIBS =
	5	EXTRA_FLAGS =
	6
	7	if GOT_PREFIX
	8	EXTRA_INCLUDES += -I$(prefix)/include
	9	EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib
	10	endif
	11
	12	INCLUDES = \
	13	-I$(top_srcdir)/include \
	14	$(EXTRA_INCLUDES)
	15
	16	bin_PROGRAMS = rfxcodectest
	17
	18	rfxcodectest_SOURCES = rfxcodectest.c
	19
	20	rfxcodectest_LDADD = \
	21	$(top_builddir)/src/librfxencode.la $(EXTRA_LIBS)
	22
	23	rfxcodectest_LDFLAGS = $(EXTRA_FLAGS)
	24

+51

-32

librfxcodec/tests/rfxcodectest.c less more

0	0	/**
1	1	* RFX codec encoder test
2	2	*
3		* Copyright 2014 Jay Sorg <jay.sorg@gmail.com>
	3	* Copyright 2014-2015 Jay Sorg <jay.sorg@gmail.com>
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

26	26
27	27	#include <rfxcodec_encode.h>
28	28
29		static const int g_rfx_default_quantization_values[] =
	29	static const unsigned char g_rfx_default_quantization_values[] =
30	30	{
31	31	/* LL3 LH3 HL3 HH3 LH2 HL2 HH2 LH1 HL1 HH1 */
32		6, 6, 6, 6, 7, 7, 8, 8, 8, 9,
33		9, 9, 9, 9, 10, 10, 12, 12, 12, 13
	32	0x66, 0x66, 0x77, 0x88, 0x98,
	33	0x99, 0x99, 0xaa, 0xcc, 0xdc
34	34	};
35	35
36	36	/*****************************************************************************/

45	45
46	46	/******************************************************************************/
47	47	static int
48		speed_random(int count, const int *quants)
	48	speed_random(int count, const char *quants)
49	49	{
50	50	void *han;
51	51	int error;

55	55	char *cdata;
56	56	char *buf;
57	57	struct rfx_rect regions[1];
58		struct rfx_tile tiles[1];
	58	struct rfx_tile tiles[2];
59	59	int stime;
60	60	int etime;
61	61	int tiles_per_second;
62	62	int num_regions;
63	63	int num_tiles;
64	64	int num_quants;
	65	int flags;
65	66
66	67	printf("speed_random:\n");
67		han = rfxcodec_encode_create(1920, 1024, RFX_FORMAT_BGRA, RFX_FLAGS_RLGR1);
68		if (han == 0)
69		{
70		printf("speed_random: rfxcodec_encode_create failed\n");
71		return 1;
72		}
73		printf("speed_random: rfxcodec_encode_create ok\n");
74		cdata = (char ) malloc(64 64 * 4);
75		cdata_bytes = 64 * 64 * 4;
76		buf = (char ) malloc(64 64 * 4);
	68	//flags = RFX_FLAGS_RLGR1 \| RFX_FLAGS_NOACCEL;
	69	flags = RFX_FLAGS_RLGR1;
	70	//flags = RFX_FLAGS_RLGR3;
	71	//flags = RFX_FLAGS_RLGR1 \| RFX_FLAGS_ALPHAV1;
	72	error = rfxcodec_encode_create_ex(1920, 1024, RFX_FORMAT_BGRA, flags, &han);
	73	if (error != 0)
	74	{
	75	printf("speed_random: rfxcodec_encode_create_ex failed\n");
	76	return 1;
	77	}
	78	printf("speed_random: rfxcodec_encode_create_ex ok\n");
	79	cdata = (char ) malloc(128 64 * 4);
	80	cdata_bytes = 128 * 64 * 4;
	81	buf = (char ) malloc(128 64 * 4);
	82	#if 1
77	83	fd = open("/dev/urandom", O_RDONLY);
78		if (read(fd, buf, 64 * 64 * 4) != 64 * 64 * 4)
	84	//fd = open("/dev/zero", O_RDONLY);
	85	if (read(fd, buf, 128 * 64 * 4) != 128 * 64 * 4)
79	86	{
80	87	printf("speed_random: read error\n");
81	88	}
82	89	close(fd);
	90	#else
	91	memset(buf, 0x7f, 128 * 64 * 4);
	92	#endif
83	93	regions[0].x = 0;
84	94	regions[0].y = 0;
85		regions[0].cx = 64;
	95	regions[0].cx = 128;
86	96	regions[0].cy = 64;
87	97	num_regions = 1;
88	98	tiles[0].x = 0;

92	102	tiles[0].quant_y = 0;
93	103	tiles[0].quant_cb = 0;
94	104	tiles[0].quant_cr = 0;
	105	tiles[1].x = 64;
	106	tiles[1].y = 0;
	107	tiles[1].cx = 64;
	108	tiles[1].cy = 64;
	109	tiles[1].quant_y = 0;
	110	tiles[1].quant_cb = 0;
	111	tiles[1].quant_cr = 0;
95	112	num_tiles = 1;
96	113	num_quants = 1;
97	114	error = 0;
98	115	stime = get_mstime();
	116	flags = 0;
	117	//flags = RFX_FLAGS_ALPHAV1;
99	118	for (index = 0; index < count; index++)
100	119	{
101		error = rfxcodec_encode(han, cdata, &cdata_bytes, buf, 64, 64, 64 * 4,
102		regions, num_regions, tiles, num_tiles,
103		quants, num_quants);
	120	error = rfxcodec_encode_ex(han, cdata, &cdata_bytes, buf, 64, 64, 64 * 4,
	121	regions, num_regions, tiles, num_tiles,
	122	quants, num_quants, flags);
104	123	if (error != 0)
105	124	{
106	125	break;
107	126	}
108	127	}
109	128	etime = get_mstime();
110		tiles_per_second = count * 1000 / (etime - stime);
	129	tiles_per_second = count * num_tiles * 1000 / (etime - stime + 1);
111	130	printf("speed_random: cdata_bytes %d count %d ms time %d "
112	131	"tiles_per_second %d\n",
113	132	cdata_bytes, count, etime - stime, tiles_per_second);

220	239	/******************************************************************************/
221	240	static int
222	241	encode_file(char data, int width, int height, char cdata, int *cdata_bytes,
223		const int *quants, int num_quants)
	242	const char *quants, int num_quants)
224	243	{
225	244	int awidth;
226	245	int aheight;

234	253	void *han;
235	254	struct rfx_rect regions[1];
236	255
237		han = rfxcodec_encode_create(1920, 1024, RFX_FORMAT_BGRA, RFX_FLAGS_RLGR1);
238		if (han == 0)
239		{
240		printf("encode_file: rfxcodec_encode_create failed\n");
	256	error = rfxcodec_encode_create_ex(1920, 1024, RFX_FORMAT_BGRA, RFX_FLAGS_RLGR1, &han);
	257	if (error != 0)
	258	{
	259	printf("encode_file: rfxcodec_encode_create_ex failed\n");
241	260	return 1;
242	261	}
243	262

268	287	regions[0].cy = height;
269	288	num_regions = 1;
270	289
271		error = rfxcodec_encode(han, cdata, cdata_bytes, data, width, height, width * 4,
272		regions, num_regions, tiles, num_tiles,
273		quants, num_quants);
	290	error = rfxcodec_encode_ex(han, cdata, cdata_bytes, data, width, height, width * 4,
	291	regions, num_regions, tiles, num_tiles,
	292	quants, num_quants, 0);
274	293	if (error != 0)
275	294	{
276	295	printf("encode_file: rfxcodec_encode failed error %d\n", error);

286	305
287	306	/******************************************************************************/
288	307	static int
289		read_file(int count, const int *quants, int num_quants,
	308	read_file(int count, const char *quants, int num_quants,
290	309	const char in_file, const char out_file)
291	310	{
292	311	int in_fd;

379	398	int count;
380	399	char in_file[256];
381	400	char out_file[256];
382		const int *quants = g_rfx_default_quantization_values;
	401	const char quants = (const char ) g_rfx_default_quantization_values;
383	402
384	403	do_speed = 0;
385	404	do_read = 0;

+14

-20

libxrdp/Makefile.am less more

0		EXTRA_DIST = libxrdp.h libxrdpinc.h xrdp_orders_rail.h
1
2	0	EXTRA_DEFINES =
3	1	EXTRA_INCLUDES =
4	2	EXTRA_LIBS =

27	25	endif
28	26	endif
29	27
30		if GOT_PREFIX
31		EXTRA_INCLUDES += -I$(prefix)/include
32		EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib
33		endif
34
35		AM_CFLAGS = \
	28	AM_CPPFLAGS = \
36	29	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
37	30	-DXRDP_SBIN_PATH=\"${sbindir}\" \
38	31	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
39	32	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
40		$(EXTRA_DEFINES)
41
42		INCLUDES = \
	33	$(EXTRA_DEFINES) \
43	34	-I$(top_srcdir)/common \
44	35	$(EXTRA_INCLUDES)
45	36
46		lib_LTLIBRARIES = \
	37	module_LTLIBRARIES = \
47	38	libxrdp.la
48	39
49	40	libxrdp_la_SOURCES = \
50	41	libxrdp.c \
	42	libxrdp.h \
	43	libxrdpinc.h \
	44	xrdp_bitmap32_compress.c \
	45	xrdp_bitmap_compress.c \
	46	xrdp_caps.c \
51	47	xrdp_channel.c \
	48	xrdp_fastpath.c \
52	49	xrdp_iso.c \
	50	xrdp_jpeg_compress.c \
53	51	xrdp_mcs.c \
	52	xrdp_mppc_enc.c \
54	53	xrdp_orders.c \
	54	xrdp_orders_rail.c \
	55	xrdp_orders_rail.h \
55	56	xrdp_rdp.c \
56		xrdp_sec.c \
57		xrdp_bitmap_compress.c \
58		xrdp_bitmap32_compress.c \
59		xrdp_jpeg_compress.c \
60		xrdp_orders_rail.c \
61		xrdp_mppc_enc.c \
62		xrdp_fastpath.c \
63		xrdp_caps.c
	57	xrdp_sec.c
64	58
65	59	libxrdp_la_LDFLAGS = \
66	60	$(EXTRA_FLAGS)

+6

-7

libxrdp/libxrdp.c less more

65	65
66	66	/******************************************************************************/
67	67	int EXPORT_CC
68		libxrdp_process_incomming(struct xrdp_session *session)
	68	libxrdp_process_incoming(struct xrdp_session *session)
69	69	{
70	70	int rv;
71	71

104	104	}
105	105
106	106	/******************************************************************************/
107		/* only used durring connection */
	107	/* only used during connection */
108	108	struct stream * APP_CC
109	109	libxrdp_force_read(struct trans* trans)
110	110	{

252	252	{
253	253	/This situation can happen and this is a workaround/
254	254	cont = 0;
255		g_writeln("Serious programming error we were locked in a deadly loop") ;
256		g_writeln("remaining :%d", s->end - s->next_packet);
	255	g_writeln("Serious programming error: we were locked in a deadly loop");
	256	g_writeln("Remaining: %d", (int) (s->end - s->next_packet));
257	257	s->next_packet = 0;
258	258	}
259	259

970	970	}
971	971
972	972	/* shut down the rdp client */
973		if (xrdp_rdp_send_deactive((struct xrdp_rdp *)session->rdp) != 0)
	973	if (xrdp_rdp_send_deactivate((struct xrdp_rdp *)session->rdp) != 0)
974	974	{
975	975	return 1;
976	976	}

1073	1073	}
1074	1074
1075	1075	/*****************************************************************************/
1076		/* returns a zero based index of the channel, -1 if error or it dosen't
	1076	/* returns a zero based index of the channel, -1 if error or it doesn't
1077	1077	exist */
1078	1078	int EXPORT_CC
1079	1079	libxrdp_get_channel_id(struct xrdp_session session, char name)

1297	1297	struct stream ls;
1298	1298	struct stream *s;
1299	1299	struct xrdp_rdp *rdp;
1300		int rv;
1301	1300	int sec_bytes;
1302	1301	int rdp_bytes;
1303	1302	int max_bytes;

+2

-2

libxrdp/libxrdp.h less more

280	280	char outputBuffer; / contains compressed data */
281	281	char *outputBufferPlus;
282	282	int historyOffset; /* next free slot in historyBuffer */
283		int buf_len; /* length of historyBuffer, protocol dependant */
	283	int buf_len; /* length of historyBuffer, protocol dependent */
284	284	int bytes_in_opb; /* compressed bytes available in outputBuffer */
285	285	int flags; /* PACKET_COMPRESSED, PACKET_AT_FRONT, PACKET_FLUSHED etc */
286	286	int flagsHold;

400	400	int APP_CC
401	401	xrdp_rdp_disconnect(struct xrdp_rdp *self);
402	402	int APP_CC
403		xrdp_rdp_send_deactive(struct xrdp_rdp *self);
	403	xrdp_rdp_send_deactivate(struct xrdp_rdp *self);
404	404
405	405	/* xrdp_orders.c */
406	406	struct xrdp_orders * APP_CC

+3

-3

libxrdp/libxrdpinc.h less more

26	26
27	27	struct xrdp_brush
28	28	{
29		int x_orgin;
30		int y_orgin;
	29	int x_origin;
	30	int y_origin;
31	31	int style;
32	32	char pattern[8];
33	33	};

82	82	int DEFAULT_CC
83	83	libxrdp_disconnect(struct xrdp_session *session);
84	84	int DEFAULT_CC
85		libxrdp_process_incomming(struct xrdp_session *session);
	85	libxrdp_process_incoming(struct xrdp_session *session);
86	86	int EXPORT_CC
87	87	libxrdp_get_pdu_bytes(const char *aheader);
88	88	struct stream * APP_CC

+11

-5

libxrdp/xrdp_caps.c less more

184	184	i = MAX(i, 0);
185	185	self->client_info.cache2_entries = i;
186	186	in_uint16_le(s, self->client_info.cache2_size);
187		/* caceh 3 */
	187	/* cache 3 */
188	188	in_uint16_le(s, i);
189	189	i = MIN(i, XRDP_MAX_BITMAP_CACHE_IDX);
190	190	i = MAX(i, 0);

507	507
508	508	/*****************************************************************************/
509	509	static int APP_CC
510		xrdp_caps_process_multifragmetupdate(struct xrdp_rdp self, struct stream s,
511		int len)
	510	xrdp_caps_process_multifragmentupdate(struct xrdp_rdp self, struct stream s,
	511	int len)
512	512	{
513	513	int MaxRequestSize;
514	514

549	549	in_uint16_le(s, num_caps);
550	550	in_uint8s(s, 2); /* pad */
551	551
	552	if ((cap_len < 0) \|\| (cap_len > 1024 * 1024))
	553	{
	554	return 1;
	555	}
	556
552	557	for (index = 0; index < num_caps; index++)
553	558	{
554	559	p = s->p;

561	566	in_uint16_le(s, len);
562	567	if ((len < 4) \|\| !s_check_rem(s, len - 4))
563	568	{
564		g_writeln("xrdp_caps_process_confirm_active: error len %d", len, s->end - s->p);
	569	g_writeln("xrdp_caps_process_confirm_active: error: len %d, "
	570	"remaining %d", len, (int) (s->end - s->p));
565	571	return 1;
566	572	}
567	573	len -= 4;

640	646	xrdp_caps_process_window(self, s, len);
641	647	break;
642	648	case 0x001A: /* 26 CAPSETTYPE_MULTIFRAGMENTUPDATE */
643		xrdp_caps_process_multifragmetupdate(self, s, len);
	649	xrdp_caps_process_multifragmentupdate(self, s, len);
644	650	break;
645	651	case RDP_CAPSET_BMPCODECS: /* 0x1d(29) */
646	652	xrdp_caps_process_codecs(self, s, len);

+1

-1

libxrdp/xrdp_channel.c less more

172	172
173	173	/*****************************************************************************/
174	174	/* returns error */
175		/* This is called from the secure layer to process an incomming non global
	175	/* This is called from the secure layer to process an incoming non global
176	176	channel packet.
177	177	'chanid' passed in here is the mcs channel id so it MCS_GLOBAL_CHANNEL
178	178	plus something. */

+2

-2

libxrdp/xrdp_fastpath.c less more

96	96	}
97	97
98	98	/*****************************************************************************/
99		/* no fragmenation */
	99	/* no fragmentation */
100	100	int APP_CC
101	101	xrdp_fastpath_init(struct xrdp_fastpath self, struct stream s)
102	102	{

132	132	}
133	133
134	134	/*****************************************************************************/
135		/* no fragmenation */
	135	/* no fragmentation */
136	136	int APP_CC
137	137	xrdp_fastpath_send(struct xrdp_fastpath self, struct stream s)
138	138	{

+8

-1

libxrdp/xrdp_iso.c less more

98	98	default:
99	99	if (self->requestedProtocol & PROTOCOL_SSL)
100	100	{
101		/* thats a patch since we don't support CredSSP for now */
	101	/* that's a patch since we don't support CredSSP for now */
102	102	self->selectedProtocol = PROTOCOL_SSL;
103	103	}
104	104	else

354	354	{
355	355	text[cookie_index] = cc_type;
356	356	cookie_index++;
	357	if (cookie_index > 255)
	358	{
	359	cookie_index = 255;
	360	}
357	361	if ((s->p[0] == 0x0D) && (s->p[1] == 0x0A))
358	362	{
359	363	in_uint8s(s, 2);
360	364	text[cookie_index] = 0;
361	365	cookie_index = 0;
	366	if (g_strlen(text) > 0)
	367	{
	368	}
362	369	break;
363	370	}
364	371	in_uint8(s, cc_type);

+1

-1

libxrdp/xrdp_jpeg_compress.c less more

219	219	};
220	220
221	221	/*****************************************************************************/
222		/* called at begining */
	222	/* called at beginning */
223	223	static void DEFAULT_CC
224	224	my_init_destination(j_compress_ptr cinfo)
225	225	{

+2

-2

libxrdp/xrdp_mcs.c less more

182	182	}
183	183	else
184	184	{
185		log_message(LOG_LEVEL_DEBUG,"Recieved an unhandled appid:%d",appid);
	185	log_message(LOG_LEVEL_DEBUG,"Received an unhandled appid:%d",appid);
186	186	}
187	187
188	188	break;

760	760	out_uint8(s, 0);
761	761	if (self->mcs_layer->iso_layer->rdpNegData)
762	762	{
763		/* ReqeustedProtocol */
	763	/* RequestedProtocol */
764	764	out_uint32_le(s, self->mcs_layer->iso_layer->requestedProtocol);
765	765	}
766	766	out_uint16_le(s, SEC_TAG_SRV_CHANNELS);

+21

-13

libxrdp/xrdp_orders.c less more

285	285	}
286	286
287	287	/*****************************************************************************/
288		/* check if all coords are withing 256 bytes */
	288	/* check if all coords are within 256 bytes */
289	289	/* returns boolean */
290	290	static int APP_CC
291	291	xrdp_orders_send_delta(struct xrdp_orders self, int vals, int count)

1013	1013	brush = &blank_brush;
1014	1014	}
1015	1015
1016		if (brush->x_orgin != self->orders_state.pat_blt_brush.x_orgin)
	1016	if (brush->x_origin != self->orders_state.pat_blt_brush.x_origin)
1017	1017	{
1018	1018	present \|= 0x0080;
1019		out_uint8(self->out_s, brush->x_orgin);
1020		self->orders_state.pat_blt_brush.x_orgin = brush->x_orgin;
1021		}
1022
1023		if (brush->y_orgin != self->orders_state.pat_blt_brush.y_orgin)
	1019	out_uint8(self->out_s, brush->x_origin);
	1020	self->orders_state.pat_blt_brush.x_origin = brush->x_origin;
	1021	}
	1022
	1023	if (brush->y_origin != self->orders_state.pat_blt_brush.y_origin)
1024	1024	{
1025	1025	present \|= 0x0100;
1026		out_uint8(self->out_s, brush->y_orgin);
1027		self->orders_state.pat_blt_brush.y_orgin = brush->y_orgin;
	1026	out_uint8(self->out_s, brush->y_origin);
	1027	self->orders_state.pat_blt_brush.y_origin = brush->y_origin;
1028	1028	}
1029	1029
1030	1030	if (brush->style != self->orders_state.pat_blt_brush.style)

2640	2640	return 0;
2641	2641	}
2642	2642
	2643	#if defined(XRDP_JPEG)
2643	2644	/*****************************************************************************/
2644	2645	static int
2645	2646	xrdp_orders_send_as_jpeg(struct xrdp_orders *self,

2662	2663
2663	2664	return 1;
2664	2665	}
	2666	#endif
2665	2667
2666	2668	#if defined(XRDP_NEUTRINORDP)
2667	2669	/*****************************************************************************/

2692	2694	}
2693	2695	#endif
2694	2696
	2697	#if defined(XRDP_JPEG) \|\| defined(XRDP_NEUTRINORDP)
2695	2698	/*****************************************************************************/
2696	2699	static int APP_CC
2697	2700	xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx,

2718	2721	out_uint8(self->out_s, RDP_ORDER_BMPCACHE3); /* type */
2719	2722	/* cache index */
2720	2723	out_uint16_le(self->out_s, cache_idx);
2721		/* persistant cache key 1/2 */
	2724	/* persistent cache key 1/2 */
2722	2725	out_uint32_le(self->out_s, 0);
2723	2726	out_uint32_le(self->out_s, 0);
2724	2727	/* bitmap data */

2732	2735	out_uint8a(self->out_s, buf, bufsize);
2733	2736	return 0;
2734	2737	}
	2738	#endif
2735	2739
2736	2740	/*****************************************************************************/
2737	2741	/* secondary drawing order (bitmap v3) using remotefx compression */

2740	2744	int width, int height, int bpp, char *data,
2741	2745	int cache_id, int cache_idx, int hints)
2742	2746	{
	2747	struct xrdp_client_info *ci;
	2748	#if defined(XRDP_JPEG) \|\| defined(XRDP_NEUTRINORDP)
	2749	int bufsize;
	2750	struct stream xr_s; / xrdp stream */
	2751	#endif
	2752	#if defined(XRDP_JPEG)
2743	2753	int e;
2744		int bufsize;
2745	2754	int quality;
2746		struct stream xr_s; / xrdp stream */
2747	2755	struct stream temp_s; / xrdp stream */
2748		struct xrdp_client_info *ci;
	2756	#endif
2749	2757	#if defined(XRDP_NEUTRINORDP)
2750	2758	STREAM fr_s; / FreeRDP stream */
2751	2759	RFX_CONTEXT *context;

+6

-0

libxrdp/xrdp_orders_rail.c less more

332	332	order_size += 8 * window_state->num_visibility_rects;
333	333	}
334	334
	335	if (order_size < 12)
	336	{
	337	/* no flags set */
	338	return 0;
	339	}
	340
335	341	if (xrdp_orders_check(self, order_size) != 0)
336	342	{
337	343	return 1;

+14

-18

libxrdp/xrdp_rdp.c less more

97	97	}
98	98	else
99	99	{
100		log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured crypt level is"
101		"undefined 'high' will be used");
	100	log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured crypt level is "
	101	"undefined, 'high' will be used");
102	102	client_info->crypt_level = 3;
103	103	}
104	104	}

961	961	static int APP_CC
962	962	xrdp_rdp_process_screen_update(struct xrdp_rdp self, struct stream s)
963	963	{
964		int op;
965	964	int left;
966	965	int top;
967	966	int right;

969	968	int cx;
970	969	int cy;
971	970
972		in_uint32_le(s, op);
	971	in_uint8s(s, 4); /* op */
973	972	in_uint16_le(s, left);
974	973	in_uint16_le(s, top);
975	974	in_uint16_le(s, right);

1128	1127	int APP_CC
1129	1128	xrdp_rdp_process_data(struct xrdp_rdp self, struct stream s)
1130	1129	{
1131		int len;
1132	1130	int data_type;
1133		int ctype;
1134		int clen;
1135	1131
1136	1132	in_uint8s(s, 6);
1137		in_uint16_le(s, len);
	1133	in_uint8s(s, 2); /* len */
1138	1134	in_uint8(s, data_type);
1139		in_uint8(s, ctype);
1140		in_uint16_le(s, clen);
	1135	in_uint8s(s, 1); /* ctype */
	1136	in_uint8s(s, 2); /* clen */
1141	1137	DEBUG(("xrdp_rdp_process_data code %d", data_type));
1142	1138
1143	1139	switch (data_type)

1158	1154	xrdp_rdp_process_screen_update(self, s);
1159	1155	break;
1160	1156	case 35: /* 35(0x23) */
1161		/* 35 ?? this comes when minimuzing a full screen mstsc.exe 2600 */
	1157	/* 35 ?? this comes when minimizing a full screen mstsc.exe 2600 */
1162	1158	/* I think this is saying the client no longer wants screen */
1163	1159	/* updates and it will issue a 33 above to catch up */
1164	1160	/* so minimized apps don't take bandwidth */

1196	1192
1197	1193	/*****************************************************************************/
1198	1194	int APP_CC
1199		xrdp_rdp_send_deactive(struct xrdp_rdp *self)
	1195	xrdp_rdp_send_deactivate(struct xrdp_rdp *self)
1200	1196	{
1201	1197	struct stream *s;
1202	1198
1203		DEBUG(("in xrdp_rdp_send_deactive"));
	1199	DEBUG(("in xrdp_rdp_send_deactivate"));
1204	1200	make_stream(s);
1205	1201	init_stream(s, 8192);
1206	1202
1207	1203	if (xrdp_rdp_init(self, s) != 0)
1208	1204	{
1209	1205	free_stream(s);
1210		DEBUG(("out xrdp_rdp_send_deactive error"));
	1206	DEBUG(("out xrdp_rdp_send_deactivate error"));
1211	1207	return 1;
1212	1208	}
1213	1209

1216	1212	if (xrdp_rdp_send(self, s, RDP_PDU_DEACTIVATE) != 0)
1217	1213	{
1218	1214	free_stream(s);
1219		DEBUG(("out xrdp_rdp_send_deactive error"));
	1215	DEBUG(("out xrdp_rdp_send_deactivate error"));
1220	1216	return 1;
1221	1217	}
1222	1218
1223	1219	free_stream(s);
1224		DEBUG(("out xrdp_rdp_send_deactive"));
1225		return 0;
1226		}
	1220	DEBUG(("out xrdp_rdp_send_deactivate"));
	1221	return 0;
	1222	}

+55

-13

libxrdp/xrdp_sec.c less more

418	418	}
419	419	else
420	420	{
421		LLOGLN(0, ("xrdp_load_keyboard_layout: error opening %d",
	421	LLOGLN(0, ("xrdp_load_keyboard_layout: error opening %s",
422	422	keyboard_cfg_file));
423	423	}
424	424	}

647	647	int len_directory = 0;
648	648	int len_ip = 0;
649	649	int len_dll = 0;
650		int tzone = 0;
651	650	char tmpdata[256];
652	651
653	652	/* initialize (zero out) local variables */

836	835	{
837	836	return 1;
838	837	}
839		in_uint32_le(s, tzone); /* len of timezone */
	838	in_uint8s(s, 4); /* len of timezone */
840	839	in_uint8s(s, 62); /* skip */
841	840	in_uint8s(s, 22); /* skip misc. */
842	841	in_uint8s(s, 62); /* skip */

1813	1812	{
1814	1813	int num_channels;
1815	1814	int index;
1816		struct mcs_channel_item *channel_item;
1817	1815	struct xrdp_client_info client_info = (struct xrdp_client_info )NULL;
1818	1816
1819	1817	client_info = &(self->rdp_layer->client_info);

1874	1872	int y1;
1875	1873	int x2;
1876	1874	int y2;
	1875	int got_primary;
1877	1876	struct xrdp_client_info client_info = (struct xrdp_client_info )NULL;
1878	1877
1879	1878	client_info = &(self->rdp_layer->client_info);
1880	1879
1881		DEBUG(("processing monitors data, allow_multimon is %d", client_info->multimon));
	1880	LLOGLN(10, ("xrdp_sec_process_mcs_data_monitors: processing monitors data, allow_multimon is %d", client_info->multimon));
1882	1881	/* this is an option set in xrdp.ini */
1883	1882	if (client_info->multimon != 1) /* are multi-monitors allowed ? */
1884	1883	{
1885		DEBUG(("[INFO] xrdp_sec_process_mcs_data_monitors: multimon is not "
	1884	LLOGLN(0, ("[INFO] xrdp_sec_process_mcs_data_monitors: multimon is not "
1886	1885	"allowed, skipping"));
1887	1886	return 0;
1888	1887	}

1890	1889	//verify flags - must be 0x0
1891	1890	if (flags != 0)
1892	1891	{
1893		DEBUG(("[ERROR] xrdp_sec_process_mcs_data_monitors: flags MUST be "
	1892	LLOGLN(0, ("[ERROR] xrdp_sec_process_mcs_data_monitors: flags MUST be "
1894	1893	"zero, detected: %d", flags));
1895	1894	return 1;
1896	1895	}

1898	1897	//verify monitorCount - max 16
1899	1898	if (monitorCount > 16)
1900	1899	{
1901		DEBUG(("[ERROR] xrdp_sec_process_mcs_data_monitors: max allowed "
	1900	LLOGLN(0, ("[ERROR] xrdp_sec_process_mcs_data_monitors: max allowed "
1902	1901	"monitors is 16, detected: %d", monitorCount));
1903	1902	return 1;
1904	1903	}
1905	1904
1906		g_writeln("monitorCount= %d", monitorCount); // for debugging only
	1905	LLOGLN(10, ("xrdp_sec_process_mcs_data_monitors: monitorCount= %d", monitorCount));
1907	1906
1908	1907	client_info->monitorCount = monitorCount;
1909	1908

1911	1910	y1 = 0;
1912	1911	x2 = 0;
1913	1912	y2 = 0;
	1913	got_primary = 0;
1914	1914	/* Add client_monitor_data to client_info struct, will later pass to X11rdp */
1915	1915	for (index = 0; index < monitorCount; index++)
1916	1916	{

1934	1934	y2 = MAX(y2, client_info->minfo[index].bottom);
1935	1935	}
1936	1936
1937		g_writeln("got a monitor: left= %d, top= %d, right= %d, bottom= %d, is_primary?= %d", client_info->minfo[index].left,
1938		client_info->minfo[index].top, client_info->minfo[index].right, client_info->minfo[index].bottom, client_info->minfo[index].is_primary);
1939		}
1940
	1937	if (client_info->minfo[index].is_primary)
	1938	{
	1939	got_primary = 1;
	1940	}
	1941
	1942	LLOGLN(10, ("xrdp_sec_process_mcs_data_monitors: got a monitor [%d]: left= %d, top= %d, right= %d, bottom= %d, is_primary?= %d",
	1943	index,
	1944	client_info->minfo[index].left,
	1945	client_info->minfo[index].top,
	1946	client_info->minfo[index].right,
	1947	client_info->minfo[index].bottom,
	1948	client_info->minfo[index].is_primary));
	1949	}
	1950
	1951	if (!got_primary)
	1952	{
	1953	/* no primary monitor was set, choose the leftmost monitor as primary */
	1954	for (index = 0; index < monitorCount; index++)
	1955	{
	1956	if (client_info->minfo[index].left == x1 &&
	1957	client_info->minfo[index].top == y1)
	1958	{
	1959	client_info->minfo[index].is_primary = 1;
	1960	break;
	1961	}
	1962	}
	1963	}
	1964
	1965	/* set wm geometry */
1941	1966	if ((x2 > x1) && (y2 > y1))
1942	1967	{
1943	1968	client_info->width = (x2 - x1) + 1;
1944	1969	client_info->height = (y2 - y1) + 1;
	1970	}
	1971	/* make sure virtual desktop size is ok */
	1972	if (client_info->width > 0x7FFE \|\| client_info->width < 0xC8 \|\|
	1973	client_info->height > 0x7FFE \|\| client_info->height < 0xC8)
	1974	{
	1975	LLOGLN(0, ("[ERROR] xrdp_sec_process_mcs_data_monitors: error, virtual desktop width / height is too large"));
	1976	return 1; /* error */
	1977	}
	1978
	1979	/* keep a copy of non negative monitor info values for xrdp_wm usage */
	1980	for (index = 0; index < monitorCount; index++)
	1981	{
	1982	client_info->minfo_wm[index].left = client_info->minfo[index].left - x1;
	1983	client_info->minfo_wm[index].top = client_info->minfo[index].top - y1;
	1984	client_info->minfo_wm[index].right = client_info->minfo[index].right - x1;
	1985	client_info->minfo_wm[index].bottom = client_info->minfo[index].bottom - y1;
	1986	client_info->minfo_wm[index].is_primary = client_info->minfo[index].is_primary;
1945	1987	}
1946	1988
1947	1989	return 0;

+2

-0

m4/.gitignore less more

	0	libtool.m4
	1	lt*.m4

+71

-0

m4/ax_append_flag.m4 less more

	0	# ===========================================================================
	1	# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
	2	# ===========================================================================
	3	#
	4	# SYNOPSIS
	5	#
	6	# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
	7	#
	8	# DESCRIPTION
	9	#
	10	# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
	11	# added in between.
	12	#
	13	# If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
	14	# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains
	15	# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly
	16	# FLAG.
	17	#
	18	# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
	19	#
	20	# LICENSE
	21	#
	22	# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
	23	# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
	24	#
	25	# This program is free software: you can redistribute it and/or modify it
	26	# under the terms of the GNU General Public License as published by the
	27	# Free Software Foundation, either version 3 of the License, or (at your
	28	# option) any later version.
	29	#
	30	# This program is distributed in the hope that it will be useful, but
	31	# WITHOUT ANY WARRANTY; without even the implied warranty of
	32	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
	33	# Public License for more details.
	34	#
	35	# You should have received a copy of the GNU General Public License along
	36	# with this program. If not, see <http://www.gnu.org/licenses/>.
	37	#
	38	# As a special exception, the respective Autoconf Macro's copyright owner
	39	# gives unlimited permission to copy, distribute and modify the configure
	40	# scripts that are the output of Autoconf when processing the Macro. You
	41	# need not follow the terms of the GNU General Public License when using
	42	# or distributing such scripts, even though portions of the text of the
	43	# Macro appear in them. The GNU General Public License (GPL) does govern
	44	# all other use of the material that constitutes the Autoconf Macro.
	45	#
	46	# This special exception to the GPL applies to versions of the Autoconf
	47	# Macro released by the Autoconf Archive. When you make and distribute a
	48	# modified version of the Autoconf Macro, you may extend this special
	49	# exception to the GPL to apply to your modified version as well.
	50
	51	#serial 6
	52
	53	AC_DEFUN([AX_APPEND_FLAG],
	54	[dnl
	55	AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
	56	AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
	57	AS_VAR_SET_IF(FLAGS,[
	58	AS_CASE([" AS_VAR_GET(FLAGS) "],
	59	[" $1 "], [AC_RUN_LOG([: FLAGS already contains $1])],
	60	[
	61	AS_VAR_APPEND(FLAGS,[" $1"])
	62	AC_RUN_LOG([: FLAGS="$FLAGS"])
	63	])
	64	],
	65	[
	66	AS_VAR_SET(FLAGS,[$1])
	67	AC_RUN_LOG([: FLAGS="$FLAGS"])
	68	])
	69	AS_VAR_POPDEF([FLAGS])dnl
	70	])dnl AX_APPEND_FLAG

+122

-0

m4/ax_cflags_warn_all.m4 less more

	0	# ===========================================================================
	1	# http://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html
	2	# ===========================================================================
	3	#
	4	# SYNOPSIS
	5	#
	6	# AX_CFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])]
	7	# AX_CXXFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])]
	8	# AX_FCFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])]
	9	#
	10	# DESCRIPTION
	11	#
	12	# Try to find a compiler option that enables most reasonable warnings.
	13	#
	14	# For the GNU compiler it will be -Wall (and -ansi -pedantic) The result
	15	# is added to the shellvar being CFLAGS, CXXFLAGS, or FCFLAGS by default.
	16	#
	17	# Currently this macro knows about the GCC, Solaris, Digital Unix, AIX,
	18	# HP-UX, IRIX, NEC SX-5 (Super-UX 10), Cray J90 (Unicos 10.0.0.8), and
	19	# Intel compilers. For a given compiler, the Fortran flags are much more
	20	# experimental than their C equivalents.
	21	#
	22	# - $1 shell-variable-to-add-to : CFLAGS, CXXFLAGS, or FCFLAGS
	23	# - $2 add-value-if-not-found : nothing
	24	# - $3 action-if-found : add value to shellvariable
	25	# - $4 action-if-not-found : nothing
	26	#
	27	# NOTE: These macros depend on AX_APPEND_FLAG.
	28	#
	29	# LICENSE
	30	#
	31	# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
	32	# Copyright (c) 2010 Rhys Ulerich <rhys.ulerich@gmail.com>
	33	#
	34	# This program is free software; you can redistribute it and/or modify it
	35	# under the terms of the GNU General Public License as published by the
	36	# Free Software Foundation; either version 3 of the License, or (at your
	37	# option) any later version.
	38	#
	39	# This program is distributed in the hope that it will be useful, but
	40	# WITHOUT ANY WARRANTY; without even the implied warranty of
	41	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
	42	# Public License for more details.
	43	#
	44	# You should have received a copy of the GNU General Public License along
	45	# with this program. If not, see <http://www.gnu.org/licenses/>.
	46	#
	47	# As a special exception, the respective Autoconf Macro's copyright owner
	48	# gives unlimited permission to copy, distribute and modify the configure
	49	# scripts that are the output of Autoconf when processing the Macro. You
	50	# need not follow the terms of the GNU General Public License when using
	51	# or distributing such scripts, even though portions of the text of the
	52	# Macro appear in them. The GNU General Public License (GPL) does govern
	53	# all other use of the material that constitutes the Autoconf Macro.
	54	#
	55	# This special exception to the GPL applies to versions of the Autoconf
	56	# Macro released by the Autoconf Archive. When you make and distribute a
	57	# modified version of the Autoconf Macro, you may extend this special
	58	# exception to the GPL to apply to your modified version as well.
	59
	60	#serial 15
	61
	62	AC_DEFUN([AX_FLAGS_WARN_ALL],[dnl
	63	AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
	64	AS_VAR_PUSHDEF([VAR],[ac_cv_[]_AC_LANG_ABBREV[]flags_warn_all])dnl
	65	AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings],
	66	VAR,[VAR="no, unknown"
	67	ac_save_[]FLAGS="$[]FLAGS"
	68	for ac_arg dnl
	69	in "-warn all % -warn all" dnl Intel
	70	"-pedantic % -Wall" dnl GCC
	71	"-xstrconst % -v" dnl Solaris C
	72	"-std1 % -verbose -w0 -warnprotos" dnl Digital Unix
	73	"-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX
	74	"-ansi -ansiE % -fullwarn" dnl IRIX
	75	"+ESlit % +w1" dnl HP-UX C
	76	"-Xc % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10)
	77	"-h conform % -h msglevel 2" dnl Cray C (Unicos)
	78	#
	79	do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg \| sed -e 's,%%.*,,' -e 's,%,,'`
	80	AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
	81	[VAR=`echo $ac_arg \| sed -e 's,.% ,,'` ; break])
	82	done
	83	FLAGS="$ac_save_[]FLAGS"
	84	])
	85	AS_VAR_POPDEF([FLAGS])dnl
	86	AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
	87	case ".$VAR" in
	88	.ok\|.ok,*) m4_ifvaln($3,$3) ;;
	89	.\|.no\|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;;
	90	*) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;;
	91	esac
	92	AS_VAR_POPDEF([VAR])dnl
	93	])dnl AX_FLAGS_WARN_ALL
	94	dnl implementation tactics:
	95	dnl the for-argument contains a list of options. The first part of
	96	dnl these does only exist to detect the compiler - usually it is
	97	dnl a global option to enable -ansi or -extrawarnings. All other
	98	dnl compilers will fail about it. That was needed since a lot of
	99	dnl compilers will give false positives for some option-syntax
	100	dnl like -Woption or -Xoption as they think of it is a pass-through
	101	dnl to later compile stages or something. The "%" is used as a
	102	dnl delimiter. A non-option comment can be given after "%%" marks
	103	dnl which will be shown but not added to the respective C/CXXFLAGS.
	104
	105	AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl
	106	AC_LANG_PUSH([C])
	107	AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])
	108	AC_LANG_POP([C])
	109	])
	110
	111	AC_DEFUN([AX_CXXFLAGS_WARN_ALL],[dnl
	112	AC_LANG_PUSH([C++])
	113	AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])
	114	AC_LANG_POP([C++])
	115	])
	116
	117	AC_DEFUN([AX_FCFLAGS_WARN_ALL],[dnl
	118	AC_LANG_PUSH([Fortran])
	119	AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])
	120	AC_LANG_POP([Fortran])
	121	])

+223

-0

m4/ax_gcc_func_attribute.m4 less more

	0	# ===========================================================================
	1	# http://www.gnu.org/software/autoconf-archive/ax_gcc_func_attribute.html
	2	# ===========================================================================
	3	#
	4	# SYNOPSIS
	5	#
	6	# AX_GCC_FUNC_ATTRIBUTE(ATTRIBUTE)
	7	#
	8	# DESCRIPTION
	9	#
	10	# This macro checks if the compiler supports one of GCC's function
	11	# attributes; many other compilers also provide function attributes with
	12	# the same syntax. Compiler warnings are used to detect supported
	13	# attributes as unsupported ones are ignored by default so quieting
	14	# warnings when using this macro will yield false positives.
	15	#
	16	# The ATTRIBUTE parameter holds the name of the attribute to be checked.
	17	#
	18	# If ATTRIBUTE is supported define HAVE_FUNC_ATTRIBUTE_<ATTRIBUTE>.
	19	#
	20	# The macro caches its result in the ax_cv_have_func_attribute_<attribute>
	21	# variable.
	22	#
	23	# The macro currently supports the following function attributes:
	24	#
	25	# alias
	26	# aligned
	27	# alloc_size
	28	# always_inline
	29	# artificial
	30	# cold
	31	# const
	32	# constructor
	33	# constructor_priority for constructor attribute with priority
	34	# deprecated
	35	# destructor
	36	# dllexport
	37	# dllimport
	38	# error
	39	# externally_visible
	40	# flatten
	41	# format
	42	# format_arg
	43	# gnu_inline
	44	# hot
	45	# ifunc
	46	# leaf
	47	# malloc
	48	# noclone
	49	# noinline
	50	# nonnull
	51	# noreturn
	52	# nothrow
	53	# optimize
	54	# pure
	55	# unused
	56	# used
	57	# visibility
	58	# warning
	59	# warn_unused_result
	60	# weak
	61	# weakref
	62	#
	63	# Unsuppored function attributes will be tested with a prototype returning
	64	# an int and not accepting any arguments and the result of the check might
	65	# be wrong or meaningless so use with care.
	66	#
	67	# LICENSE
	68	#
	69	# Copyright (c) 2013 Gabriele Svelto <gabriele.svelto@gmail.com>
	70	#
	71	# Copying and distribution of this file, with or without modification, are
	72	# permitted in any medium without royalty provided the copyright notice
	73	# and this notice are preserved. This file is offered as-is, without any
	74	# warranty.
	75
	76	#serial 3
	77
	78	AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
	79	AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1])
	80
	81	AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [
	82	AC_LINK_IFELSE([AC_LANG_PROGRAM([
	83	m4_case([$1],
	84	[alias], [
	85	int foo( void ) { return 0; }
	86	int bar( void ) __attribute__(($1("foo")));
	87	],
	88	[aligned], [
	89	int foo( void ) __attribute__(($1(32)));
	90	],
	91	[alloc_size], [
	92	void *foo(int a) __attribute__(($1(1)));
	93	],
	94	[always_inline], [
	95	inline __attribute__(($1)) int foo( void ) { return 0; }
	96	],
	97	[artificial], [
	98	inline __attribute__(($1)) int foo( void ) { return 0; }
	99	],
	100	[cold], [
	101	int foo( void ) __attribute__(($1));
	102	],
	103	[const], [
	104	int foo( void ) __attribute__(($1));
	105	],
	106	[constructor_priority], [
	107	int foo( void ) __attribute__((__constructor__(65535/2)));
	108	],
	109	[constructor], [
	110	int foo( void ) __attribute__(($1));
	111	],
	112	[deprecated], [
	113	int foo( void ) __attribute__(($1("")));
	114	],
	115	[destructor], [
	116	int foo( void ) __attribute__(($1));
	117	],
	118	[dllexport], [
	119	__attribute__(($1)) int foo( void ) { return 0; }
	120	],
	121	[dllimport], [
	122	int foo( void ) __attribute__(($1));
	123	],
	124	[error], [
	125	int foo( void ) __attribute__(($1("")));
	126	],
	127	[externally_visible], [
	128	int foo( void ) __attribute__(($1));
	129	],
	130	[flatten], [
	131	int foo( void ) __attribute__(($1));
	132	],
	133	[format], [
	134	int foo(const char *p, ...) __attribute__(($1(printf, 1, 2)));
	135	],
	136	[format_arg], [
	137	char foo(const char p) __attribute__(($1(1)));
	138	],
	139	[gnu_inline], [
	140	inline __attribute__(($1)) int foo( void ) { return 0; }
	141	],
	142	[hot], [
	143	int foo( void ) __attribute__(($1));
	144	],
	145	[ifunc], [
	146	int my_foo( void ) { return 0; }
	147	static int (*resolve_foo(void))(void) { return my_foo; }
	148	int foo( void ) __attribute__(($1("resolve_foo")));
	149	],
	150	[leaf], [
	151	__attribute__(($1)) int foo( void ) { return 0; }
	152	],
	153	[malloc], [
	154	void *foo( void ) __attribute__(($1));
	155	],
	156	[noclone], [
	157	int foo( void ) __attribute__(($1));
	158	],
	159	[noinline], [
	160	__attribute__(($1)) int foo( void ) { return 0; }
	161	],
	162	[nonnull], [
	163	int foo(char *p) __attribute__(($1(1)));
	164	],
	165	[noreturn], [
	166	void foo( void ) __attribute__(($1));
	167	],
	168	[nothrow], [
	169	int foo( void ) __attribute__(($1));
	170	],
	171	[optimize], [
	172	__attribute__(($1(3))) int foo( void ) { return 0; }
	173	],
	174	[pure], [
	175	int foo( void ) __attribute__(($1));
	176	],
	177	[unused], [
	178	int foo( void ) __attribute__(($1));
	179	],
	180	[used], [
	181	int foo( void ) __attribute__(($1));
	182	],
	183	[visibility], [
	184	int foo_def( void ) __attribute__(($1("default")));
	185	int foo_hid( void ) __attribute__(($1("hidden")));
	186	int foo_int( void ) __attribute__(($1("internal")));
	187	int foo_pro( void ) __attribute__(($1("protected")));
	188	],
	189	[warning], [
	190	int foo( void ) __attribute__(($1("")));
	191	],
	192	[warn_unused_result], [
	193	int foo( void ) __attribute__(($1));
	194	],
	195	[weak], [
	196	int foo( void ) __attribute__(($1));
	197	],
	198	[weakref], [
	199	static int foo( void ) { return 0; }
	200	static int bar( void ) __attribute__(($1("foo")));
	201	],
	202	[
	203	m4_warn([syntax], [Unsupported attribute $1, the test may fail])
	204	int foo( void ) __attribute__(($1));
	205	]
	206	)], [])
	207	],
	208	dnl GCC doesn't exit with an error if an unknown attribute is
	209	dnl provided but only outputs a warning, so accept the attribute
	210	dnl only if no warning were issued.
	211	[AS_IF([test -s conftest.err],
	212	[AS_VAR_SET([ac_var], [no])],
	213	[AS_VAR_SET([ac_var], [yes])])],
	214	[AS_VAR_SET([ac_var], [no])])
	215	])
	216
	217	AS_IF([test yes = AS_VAR_GET([ac_var])],
	218	[AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FUNC_ATTRIBUTE_$1), 1,
	219	[Define to 1 if the system has the `$1' function attribute])], [])
	220
	221	AS_VAR_POPDEF([ac_var])
	222	])

+37

-0

m4/ax_require_defined.m4 less more

	0	# ===========================================================================
	1	# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
	2	# ===========================================================================
	3	#
	4	# SYNOPSIS
	5	#
	6	# AX_REQUIRE_DEFINED(MACRO)
	7	#
	8	# DESCRIPTION
	9	#
	10	# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
	11	# been defined and thus are available for use. This avoids random issues
	12	# where a macro isn't expanded. Instead the configure script emits a
	13	# non-fatal:
	14	#
	15	# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
	16	#
	17	# It's like AC_REQUIRE except it doesn't expand the required macro.
	18	#
	19	# Here's an example:
	20	#
	21	# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
	22	#
	23	# LICENSE
	24	#
	25	# Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
	26	#
	27	# Copying and distribution of this file, with or without modification, are
	28	# permitted in any medium without royalty provided the copyright notice
	29	# and this notice are preserved. This file is offered as-is, without any
	30	# warranty.
	31
	32	#serial 1
	33
	34	AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
	35	m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
	36	])dnl AX_REQUIRE_DEFINED

+6

-8

mc/Makefile.am less more

0		EXTRA_DIST = mc.h
1
2		AM_CFLAGS = \
	0	AM_CPPFLAGS = \
3	1	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
4	2	-DXRDP_SBIN_PATH=\"${sbindir}\" \
5	3	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
6		-DXRDP_PID_PATH=\"${localstatedir}/run\"
7
8		INCLUDES = \
	4	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
9	5	-I$(top_srcdir)/common
10	6
11		lib_LTLIBRARIES = \
	7	module_LTLIBRARIES = \
12	8	libmc.la
13	9
14		libmc_la_SOURCES = mc.c
	10	libmc_la_SOURCES = \
	11	mc.c \
	12	mc.h
15	13
16	14	libmc_la_LIBADD = \
17	15	$(top_builddir)/common/libcommon.la

+2

-2

mc/mc.h less more

61	61	int (server_set_bgcolor)(struct mod v, int bgcolor);
62	62	int (server_set_opcode)(struct mod v, int opcode);
63	63	int (server_set_mixmode)(struct mod v, int mixmode);
64		int (server_set_brush)(struct mod v, int x_orgin, int y_orgin,
	64	int (server_set_brush)(struct mod v, int x_origin, int y_origin,
65	65	int style, char* pattern);
66	66	int (server_set_pen)(struct mod v, int style,
67	67	int width);
68	68	int (server_draw_line)(struct mod v, int x1, int y1, int x2, int y2);
69		int (server_add_char)(struct mod v, int font, int charactor,
	69	int (server_add_char)(struct mod v, int font, int character,
70	70	int offset, int baseline,
71	71	int width, int height, char* data);
72	72	int (server_draw_text)(struct mod v, int font,

+7

-7

neutrinordp/Makefile.am less more

0		EXTRA_DIST = xrdp-neutrinordp.h
1	0	EXTRA_DEFINES =
2	1
3	2	if XRDP_DEBUG

6	5	EXTRA_DEFINES += -DXRDP_NODEBUG
7	6	endif
8	7
9		AM_CFLAGS = \
	8	AM_CPPFLAGS = \
10	9	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
11	10	-DXRDP_SBIN_PATH=\"${sbindir}\" \
12	11	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
13	12	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
14		$(EXTRA_DEFINES)
15
16		INCLUDES = \
	13	$(EXTRA_DEFINES) \
17	14	-I$(top_srcdir)/common \
18	15	$(FREERDP_CFLAGS)
19	16
20		lib_LTLIBRARIES = \
	17	module_LTLIBRARIES = \
21	18	libxrdpneutrinordp.la
22	19
23		libxrdpneutrinordp_la_SOURCES = xrdp-neutrinordp.c xrdp-color.c
	20	libxrdpneutrinordp_la_SOURCES = \
	21	xrdp-color.c \
	22	xrdp-neutrinordp.c \
	23	xrdp-neutrinordp.h
24	24
25	25	libxrdpneutrinordp_la_LIBADD = \
26	26	$(top_builddir)/common/libcommon.la \

+30

-0

neutrinordp/xrdp-color.c less more

212	212	return bmpdata;
213	213	}
214	214
	215	if ((in_bpp == 16) && (out_bpp == 32))
	216	{
	217	out = (char )g_malloc(width height * 4, 0);
	218	src = bmpdata;
	219	dst = out;
	220
	221	for (i = 0; i < height; i++)
	222	{
	223	for (j = 0; j < width; j++)
	224	{
	225	pixel = ((tui16 )src);
	226	SPLITCOLOR16(red, green, blue, pixel);
	227	pixel = COLOR24RGB(red, green, blue);
	228	((tui32 )dst) = pixel;
	229	src += 2;
	230	dst += 4;
	231	}
	232	}
	233
	234	return out;
	235	}
	236
215	237	g_writeln("convert_bitmap: error unknown conversion from %d to %d",
216	238	in_bpp, out_bpp);
217	239	return 0;

291	313	return pixel;
292	314	}
293	315
	316	if ((in_bpp == 16) && (out_bpp == 32))
	317	{
	318	pixel = in_color;
	319	SPLITCOLOR16(red, green, blue, pixel);
	320	pixel = COLOR24BGR(red, green, blue);
	321	return pixel;
	322	}
	323
294	324	if ((in_bpp == 24) && (out_bpp == 24))
295	325	{
296	326	return in_color;

+4

-4

neutrinordp/xrdp-color.h less more

19	19	#ifndef __XRDP_COLOR_H
20	20	#define __XRDP_COLOR_H
21	21
22		char* APP_CC
23		convert_bitmap(int in_bpp, int out_bpp, char* bmpdata,
24		int width, int height, int* palette);
	22	char *APP_CC
	23	convert_bitmap(int in_bpp, int out_bpp, char *bmpdata,
	24	int width, int height, int *palette);
25	25	int APP_CC
26		convert_color(int in_bpp, int out_bpp, int in_color, int* palette);
	26	convert_color(int in_bpp, int out_bpp, int in_color, int *palette);
27	27
28	28	#endif

+163

-99

neutrinordp/xrdp-neutrinordp.c less more

47	47	{
48	48	int i;
49	49
50		for(i = 0; i < 255; i++)
	50	for (i = 0; i < 255; i++)
51	51	{
52	52	if (mod->colormap[i] != 0)
53	53	{
54	54	return ;
55	55	}
56	56	}
	57
57	58	LLOGLN(0, ("The colormap is all NULL"));
58	59	}
59	60

113	114	{
114	115	case PREECONNECTERROR:
115	116	g_snprintf(buf, 128, "The error code from connect is "
116		"PREECONNECTERROR");
	117	"PREECONNECTERROR");
117	118	break;
	119
118	120	case UNDEFINEDCONNECTERROR:
119	121	g_snprintf(buf, 128, "The error code from connect is "
120		"UNDEFINEDCONNECTERROR");
	122	"UNDEFINEDCONNECTERROR");
121	123	break;
	124
122	125	case POSTCONNECTERROR:
123	126	g_snprintf(buf, 128, "The error code from connect is "
124		"POSTCONNECTERROR");
	127	"POSTCONNECTERROR");
125	128	break;
	129
126	130	case DNSERROR:
127	131	g_snprintf(buf, 128, "The DNS system generated an error");
128	132	break;
	133
129	134	case DNSNAMENOTFOUND:
130	135	g_snprintf(buf, 128, "The DNS system could not find the "
131		"specified name");
	136	"specified name");
132	137	break;
	138
133	139	case CONNECTERROR:
134	140	g_snprintf(buf, 128, "A general connect error was returned");
135	141	break;
	142
136	143	case MCSCONNECTINITIALERROR:
137	144	g_snprintf(buf, 128, "The error code from connect is "
138		"MCSCONNECTINITIALERROR");
	145	"MCSCONNECTINITIALERROR");
139	146	break;
	147
140	148	case TLSCONNECTERROR:
141	149	g_snprintf(buf, 128, "Error in TLS handshake");
142	150	break;
	151
143	152	case AUTHENTICATIONERROR:
144	153	g_snprintf(buf, 128, "Authentication error check your password "
145		"and username");
	154	"and username");
146	155	break;
	156
	157	case INSUFFICIENTPRIVILEGESERROR:
	158	g_snprintf(buf, 128, "Insufficent privileges on target server");
	159	break;
	160
147	161	default:
148	162	g_snprintf(buf, 128, "Unhandled Errorcode from connect : %d",
149		connectErrorCode);
	163	connectErrorCode);
150	164	break;
151	165	}
152	166	}
153		log_message(LOG_LEVEL_INFO,buf);
	167
	168	log_message(LOG_LEVEL_INFO, buf);
154	169	mod->server_msg(mod, buf, 0);
155	170	}
156	171

194	209	switch (msg)
195	210	{
196	211	case 15: /* key down */
	212
197	213	/* Before we handle the first character we synchronize
198	214	capslock and numlock. */
199	215	/* We collect the state during the first synchronize

204	220	mod->inst->input->SynchronizeEvent(mod->inst->input, mod->keyBoardLockInfo);
205	221	mod->bool_keyBoardSynced = 1;
206	222	}
	223
207	224	mod->inst->input->KeyboardEvent(mod->inst->input, param4, param3);
208	225	break;
	226
209	227	case 16: /* key up */
210	228	mod->inst->input->KeyboardEvent(mod->inst->input, param4, param3);
211	229	break;
	230
212	231	case 17: /* Synchronize */
213		LLOGLN(11, ("Synchronized event handled : %d",param1));
	232	LLOGLN(11, ("Synchronized event handled : %d", param1));
214	233	/* In some situations the Synchronize event come to early.
215	234	Therefore we store this information and use it when we
216	235	receive the first keyboard event
217	236	Without this fix numlock and capslock can come
218	237	out of sync. */
219	238	mod->inst->input->SynchronizeEvent(mod->inst->input, param1);
	239
220	240	if (!mod->bool_keyBoardSynced)
221	241	{
222	242	mod->keyBoardLockInfo = param1;
223	243	}
	244
224	245	break;
	246
225	247	case 100: /* mouse move */
226	248	LLOGLN(12, ("mouse move %d %d", param1, param2));
227	249	x = param1;

229	251	flags = PTR_FLAGS_MOVE;
230	252	mod->inst->input->MouseEvent(mod->inst->input, flags, x, y);
231	253	break;
	254
232	255	case 101: /* left button up */
233	256	LLOGLN(12, ("left button up %d %d", param1, param2));
234	257	x = param1;

236	259	flags = PTR_FLAGS_BUTTON1;
237	260	mod->inst->input->MouseEvent(mod->inst->input, flags, x, y);
238	261	break;
	262
239	263	case 102: /* left button down */
240	264	LLOGLN(12, ("left button down %d %d", param1, param2));
241	265	x = param1;

243	267	flags = PTR_FLAGS_BUTTON1 \| PTR_FLAGS_DOWN;
244	268	mod->inst->input->MouseEvent(mod->inst->input, flags, x, y);
245	269	break;
	270
246	271	case 103: /* right button up */
247	272	LLOGLN(12, ("right button up %d %d", param1, param2));
248	273	x = param1;

250	275	flags = PTR_FLAGS_BUTTON2;
251	276	mod->inst->input->MouseEvent(mod->inst->input, flags, x, y);
252	277	break;
	278
253	279	case 104: /* right button down */
254	280	LLOGLN(12, ("right button down %d %d", param1, param2));
255	281	x = param1;

257	283	flags = PTR_FLAGS_BUTTON2 \| PTR_FLAGS_DOWN;
258	284	mod->inst->input->MouseEvent(mod->inst->input, flags, x, y);
259	285	break;
	286
260	287	case 105: /* middle button up */
261	288	LLOGLN(12, ("middle button up %d %d", param1, param2));
262	289	x = param1;

264	291	flags = PTR_FLAGS_BUTTON3;
265	292	mod->inst->input->MouseEvent(mod->inst->input, flags, x, y);
266	293	break;
	294
267	295	case 106: /* middle button down */
268	296	LLOGLN(12, ("middle button down %d %d", param1, param2));
269	297	x = param1;

271	299	flags = PTR_FLAGS_BUTTON3 \| PTR_FLAGS_DOWN;
272	300	mod->inst->input->MouseEvent(mod->inst->input, flags, x, y);
273	301	break;
	302
274	303	case 107: /* wheel up */
275	304	flags = PTR_FLAGS_WHEEL \| 0x0078;
276	305	mod->inst->input->MouseEvent(mod->inst->input, flags, 0, 0);
277	306	break;
	307
278	308	case 108:
279	309	break;
	310
280	311	case 109: /* wheel down */
281	312	flags = PTR_FLAGS_WHEEL \| PTR_FLAGS_WHEEL_NEGATIVE \| 0x0088;
282	313	mod->inst->input->MouseEvent(mod->inst->input, flags, 0, 0);
283	314	break;
	315
284	316	case 110:
285	317	break;
	318
286	319	case 200:
287	320	LLOGLN(10, ("Invalidate request sent from client"));
288	321	x = (param1 >> 16) & 0xffff;

291	324	cy = (param2 >> 0) & 0xffff;
292	325	mod->inst->SendInvalidate(mod->inst, -1, x, y, cx, cy);
293	326	break;
	327
294	328	case 0x5555:
295	329	chanid = LOWORD(param1);
296	330	flags = HIWORD(param1);

299	333	total_size = (int)param4;
300	334
301	335	LLOGLN(12, ("lxrdp_event: client to server ,chanid= %d flags= %d", chanid, flags));
	336
302	337	if ((chanid < 0) \|\| (chanid >= mod->inst->settings->num_channels))
303	338	{
304	339	LLOGLN(0, ("lxrdp_event: error chanid %d", chanid));

312	347	case 3:
313	348	mod->inst->SendChannelData(mod->inst, lchid, (tui8 *)data, total_size);
314	349	break;
	350
315	351	case 2:
316	352	/* end */
317	353	g_memcpy(mod->chan_buf + mod->chan_buf_valid, data, size);

323	359	mod->chan_buf_bytes = 0;
324	360	mod->chan_buf_valid = 0;
325	361	break;
	362
326	363	case 1:
327	364	/* start */
328	365	g_free(mod->chan_buf);

332	369	g_memcpy(mod->chan_buf + mod->chan_buf_valid, data, size);
333	370	mod->chan_buf_valid += size;
334	371	break;
	372
335	373	default:
336	374	/* middle */
337	375	g_memcpy(mod->chan_buf + mod->chan_buf_valid, data, size);

340	378	}
341	379
342	380	break;
	381
343	382	default:
344	383	LLOGLN(0, ("Unhandled message type in eventhandler %d", msg));
345	384	break;

419	458	{
420	459	g_strncpy(mod->username, value, 255);
421	460	}
	461	else if (g_strcmp(name, "domain") == 0)
	462	{
	463	g_strncpy(mod->domain, value, 255);
	464	}
422	465	else if (g_strcmp(name, "password") == 0)
423	466	{
424	467	g_strncpy(mod->password, value, 255);

428	471	g_memcpy(&(mod->client_info), value, sizeof(mod->client_info));
429	472	/* This is a Struct and cannot be printed in next else*/
430	473	LLOGLN(10, ("Client_info struct ignored"));
	474	}
	475	else if (g_strcmp(name, "program") == 0)
	476	{
	477	settings->shell = g_strdup(value);
	478	}
	479	else if (g_strcmp(name, "nla") == 0)
	480	{
	481	settings->nla_security = g_text2bool(value);
431	482	}
432	483	else
433	484	{

571	622
572	623	if (bd->compressed)
573	624	{
574		LLOGLN(20,("decompress size : %d",bd->bitmapLength));
575		if(!bitmap_decompress(bd->bitmapDataStream, (tui8 *)dst_data, bd->width,
576		bd->height, bd->bitmapLength, server_bpp, server_bpp)){
577		LLOGLN(0,("Failure to decompress the bitmap"));
	625	LLOGLN(20, ("decompress size : %d", bd->bitmapLength));
	626
	627	if (!bitmap_decompress(bd->bitmapDataStream, (tui8 *)dst_data, bd->width,
	628	bd->height, bd->bitmapLength, server_bpp, server_bpp))
	629	{
	630	LLOGLN(0, ("Failure to decompress the bitmap"));
578	631	}
579	632	}
580	633	else
581	634	{
582	635	/* bitmap is upside down */
583		LLOGLN(10,("bitmap upside down"));
	636	LLOGLN(10, ("bitmap upside down"));
584	637	src = (char *)(bd->bitmapDataStream);
585	638	dst = dst_data + bd->height * line_bytes;
586	639

645	698	patblt->backColor, mod->colormap);
646	699
647	700	LLOGLN(10, ("lfreerdp_pat_blt: nLeftRect %d nTopRect %d "
648		"nWidth %d nHeight %d fgcolor 0x%8.8x bgcolor 0x%8.8x",
649		patblt->nLeftRect, patblt->nTopRect,
650		patblt->nWidth, patblt->nHeight, fgcolor, bgcolor));
	701	"nWidth %d nHeight %d fgcolor 0x%8.8x bgcolor 0x%8.8x",
	702	patblt->nLeftRect, patblt->nTopRect,
	703	patblt->nWidth, patblt->nHeight, fgcolor, bgcolor));
651	704
652	705	if (fgcolor == bgcolor)
653	706	{
654	707	LLOGLN(0, ("Warning same color on both bg and fg"));
655	708	}
	709
656	710	mod->server_set_mixmode(mod, 1);
657	711	mod->server_set_opcode(mod, patblt->bRop);
658	712	mod->server_set_fgcolor(mod, fgcolor);

717	771	fgcolor = convert_color(server_bpp, client_bpp,
718	772	opaque_rect->color, mod->colormap);
719	773	LLOGLN(10, ("lfreerdp_opaque_rect: nLeftRect %d nTopRect %d "
720		"nWidth %d nHeight %d fgcolor 0x%8.8x",
721		opaque_rect->nLeftRect, opaque_rect->nTopRect,
722		opaque_rect->nWidth, opaque_rect->nHeight, fgcolor));
	774	"nWidth %d nHeight %d fgcolor 0x%8.8x",
	775	opaque_rect->nLeftRect, opaque_rect->nTopRect,
	776	opaque_rect->nWidth, opaque_rect->nHeight, fgcolor));
723	777	mod->server_set_fgcolor(mod, fgcolor);
724	778	mod->server_fill_rect(mod, opaque_rect->nLeftRect, opaque_rect->nTopRect,
725	779	opaque_rect->nWidth, opaque_rect->nHeight);

792	846	bgcolor = convert_color(server_bpp, client_bpp,
793	847	glyph_index->backColor, mod->colormap);
794	848	LLOGLN(10, ("lfreerdp_glyph_index: "
795		"bkLeft %d bkTop %d width %d height %d "
796		"opLeft %d opTop %d width %d height %d "
797		"cbData %d fgcolor 0x%8.8x bgcolor 0x%8.8x fOpRedundant %d",
798		glyph_index->bkLeft, glyph_index->bkTop,
799		glyph_index->bkRight - glyph_index->bkLeft,
800		glyph_index->bkBottom - glyph_index->bkTop,
801		glyph_index->opLeft, glyph_index->opTop,
802		glyph_index->opRight - glyph_index->opLeft,
803		glyph_index->opBottom - glyph_index->opTop,
804		glyph_index->cbData, fgcolor, bgcolor, glyph_index->fOpRedundant));
	849	"bkLeft %d bkTop %d width %d height %d "
	850	"opLeft %d opTop %d width %d height %d "
	851	"cbData %d fgcolor 0x%8.8x bgcolor 0x%8.8x fOpRedundant %d",
	852	glyph_index->bkLeft, glyph_index->bkTop,
	853	glyph_index->bkRight - glyph_index->bkLeft,
	854	glyph_index->bkBottom - glyph_index->bkTop,
	855	glyph_index->opLeft, glyph_index->opTop,
	856	glyph_index->opRight - glyph_index->opLeft,
	857	glyph_index->opBottom - glyph_index->opTop,
	858	glyph_index->cbData, fgcolor, bgcolor, glyph_index->fOpRedundant));
805	859	mod->server_set_bgcolor(mod, fgcolor);
806	860	mod->server_set_fgcolor(mod, bgcolor);
807	861	opLeft = glyph_index->opLeft;

809	863	opRight = glyph_index->opRight;
810	864	opBottom = glyph_index->opBottom;
811	865	#if 1
	866
812	867	/* workarounds for freerdp not using fOpRedundant in
813	868	glyph.c::update_gdi_glyph_index */
814	869	if (glyph_index->fOpRedundant)

816	871	opLeft = glyph_index->bkLeft;
817	872	opTop = glyph_index->bkTop;
818	873	opRight = glyph_index->bkRight;
819		opBottom =glyph_index->bkBottom;
820		}
	874	opBottom = glyph_index->bkBottom;
	875	}
	876
821	877	#endif
822	878	mod->server_draw_text(mod, glyph_index->cacheId, glyph_index->flAccel,
823	879	glyph_index->fOpRedundant,

865	921	/******************************************************************************/
866	922	/* Turn the bitmap upside down*/
867	923	static void DEFAULT_CC
868		lfreerdp_upsidedown(uint8* destination, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2_order, int server_Bpp)
	924	lfreerdp_upsidedown(uint8 destination, CACHE_BITMAP_V2_ORDER cache_bitmap_v2_order, int server_Bpp)
869	925	{
870	926	tui8 *src;
871	927	tui8 *dst;

1078	1134	lfreerdp_pointer_system(rdpContext *context,
1079	1135	POINTER_SYSTEM_UPDATE *pointer_system)
1080	1136	{
1081		LLOGLN(0, ("lfreerdp_pointer_system: - no code here type value = %d",pointer_system->type));
	1137	LLOGLN(0, ("lfreerdp_pointer_system: - no code here type value = %d", pointer_system->type));
1082	1138	}
1083	1139
1084	1140	/******************************************************************************/

1111	1167	{
1112	1168	src8 = (tui8 *)bits;
1113	1169	src8 += y * delta + x * 4;
1114		pixel = ((int*)(src8))[0];
	1170	pixel = ((int *)(src8))[0];
1115	1171	return pixel;
1116	1172	}
1117	1173	else

1158	1214	{
1159	1215	dst8 = (tui8 *)bits;
1160	1216	dst8 += y * delta + x * 4;
1161		((int*)(dst8))[0] = pixel;
	1217	((int *)(dst8))[0] = pixel;
1162	1218	}
1163	1219	else
1164	1220	{

1209	1265	LLOGLN(20, ("lfreerdp_pointer_new:"));
1210	1266	LLOGLN(20, (" bpp %d", pointer_new->xorBpp));
1211	1267	LLOGLN(20, (" width %d height %d", pointer_new->colorPtrAttr.width,
1212		pointer_new->colorPtrAttr.height));
	1268	pointer_new->colorPtrAttr.height));
1213	1269
1214	1270	LLOGLN(20, (" lengthXorMask %d lengthAndMask %d",
1215		pointer_new->colorPtrAttr.lengthXorMask,
1216		pointer_new->colorPtrAttr.lengthAndMask));
	1271	pointer_new->colorPtrAttr.lengthXorMask,
	1272	pointer_new->colorPtrAttr.lengthAndMask));
1217	1273
1218	1274	index = pointer_new->colorPtrAttr.cacheIndex;
	1275
1219	1276	if (index >= 32)
1220	1277	{
1221	1278	LLOGLN(0, ("lfreerdp_pointer_new: pointer index too big"));
1222	1279	return ;
1223	1280	}
	1281
1224	1282	if (pointer_new->xorBpp == 1 &&
1225		pointer_new->colorPtrAttr.width == 32 &&
1226		pointer_new->colorPtrAttr.height == 32)
	1283	pointer_new->colorPtrAttr.width == 32 &&
	1284	pointer_new->colorPtrAttr.height == 32)
1227	1285	{
1228	1286	LLOGLN(10, ("lfreerdp_pointer_new:"));
1229	1287	mod->pointer_cache[index].hotx = pointer_new->colorPtrAttr.xPos;

1240	1298	lfreerdp_convert_color_image(dst, 32, 32, 1, 32 / -8,
1241	1299	src, 32, 32, 1, 32 / 8);
1242	1300	}
1243		else if(pointer_new->xorBpp >= 8 &&
1244		pointer_new->colorPtrAttr.width == 32 &&
1245		pointer_new->colorPtrAttr.height == 32)
	1301	else if (pointer_new->xorBpp >= 8 &&
	1302	pointer_new->colorPtrAttr.width == 32 &&
	1303	pointer_new->colorPtrAttr.height == 32)
1246	1304	{
1247	1305	bytes_per_pixel = (pointer_new->xorBpp + 7) / 8;
1248	1306	bits_per_pixel = pointer_new->xorBpp;
1249	1307	LLOGLN(10, ("lfreerdp_pointer_new: bpp %d Bpp %d", bits_per_pixel,
1250		bytes_per_pixel));
	1308	bytes_per_pixel));
1251	1309	mod->pointer_cache[index].hotx = pointer_new->colorPtrAttr.xPos;
1252	1310	mod->pointer_cache[index].hoty = pointer_new->colorPtrAttr.yPos;
1253	1311	mod->pointer_cache[index].bpp = bits_per_pixel;

1262	1320	{
1263	1321	LLOGLN(0, ("lfreerdp_pointer_new: error bpp %d width %d height %d index: %d",
1264	1322	pointer_new->xorBpp, pointer_new->colorPtrAttr.width,
1265		pointer_new->colorPtrAttr.height,index));
	1323	pointer_new->colorPtrAttr.height, index));
1266	1324	}
1267	1325
1268	1326	mod->server_set_pointer_ex(mod, mod->pointer_cache[index].hotx,

1298	1356
1299	1357	/******************************************************************************/
1300	1358	static void DEFAULT_CC
1301		lfreerdp_polygon_cb(rdpContext* context, POLYGON_CB_ORDER* polygon_cb)
	1359	lfreerdp_polygon_cb(rdpContext context, POLYGON_CB_ORDER polygon_cb)
1302	1360	{
1303	1361	LLOGLN(0, ("lfreerdp_polygon_sc called:- not supported!!!!!!!!!!!!!!!!!!!!"));
1304	1362	}
1305	1363
1306	1364	/******************************************************************************/
1307	1365	static void DEFAULT_CC
1308		lfreerdp_polygon_sc(rdpContext* context, POLYGON_SC_ORDER* polygon_sc)
	1366	lfreerdp_polygon_sc(rdpContext context, POLYGON_SC_ORDER polygon_sc)
1309	1367	{
1310	1368	struct mod *mod;
1311	1369	int i, npoints;

1315	1373
1316	1374	mod = ((struct mod_context *)context)->modi;
1317	1375	LLOGLN(10, ("lfreerdp_polygon_sc :%d(points) %d(color) %d(fillmode) "
1318		"%d(bRop) %d(cbData) %d(x) %d(y)",
1319		polygon_sc->nDeltaEntries, polygon_sc->brushColor,
1320		polygon_sc->fillMode, polygon_sc->bRop2,
1321		polygon_sc->cbData, polygon_sc->xStart,
1322		polygon_sc->yStart));
	1376	"%d(bRop) %d(cbData) %d(x) %d(y)",
	1377	polygon_sc->nDeltaEntries, polygon_sc->brushColor,
	1378	polygon_sc->fillMode, polygon_sc->bRop2,
	1379	polygon_sc->cbData, polygon_sc->xStart,
	1380	polygon_sc->yStart));
	1381
1323	1382	if (polygon_sc->nDeltaEntries == 3)
1324	1383	{
1325	1384	server_bpp = mod->inst->settings->color_depth;

1333	1392	points[i + 1].x = 0; // polygon_sc->points[i].x;
1334	1393	points[i + 1].y = 0; // polygon_sc->points[i].y;
1335	1394	}
	1395
1336	1396	fgcolor = convert_color(server_bpp, client_bpp,
1337	1397	polygon_sc->brushColor, mod->colormap);
1338	1398

1342	1402	mod->server_set_pen(mod, 1, 1); // style, width
1343	1403	// TODO replace with correct brush; this is a workaround
1344	1404	// This workaround handles the text cursor in microsoft word.
1345		mod->server_draw_line(mod,polygon_sc->xStart,polygon_sc->yStart,polygon_sc->xStart,polygon_sc->yStart+points[2].y);
1346		// mod->server_fill_rect(mod, points[0].x, points[0].y,
1347		// points[0].x-points[3].x, points[0].y-points[2].y);
1348		// mod->server_set_brush(mod,); // howto use this on our indata??
	1405	mod->server_draw_line(mod, polygon_sc->xStart, polygon_sc->yStart, polygon_sc->xStart, polygon_sc->yStart + points[2].y);
	1406	// mod->server_fill_rect(mod, points[0].x, points[0].y,
	1407	// points[0].x-points[3].x, points[0].y-points[2].y);
	1408	// mod->server_set_brush(mod,); // howto use this on our indata??
1349	1409	mod->server_set_opcode(mod, 0xcc);
1350	1410	}
1351	1411	else

1356	1416
1357	1417	/******************************************************************************/
1358	1418	static void DEFAULT_CC
1359		lfreerdp_syncronize(rdpContext* context)
	1419	lfreerdp_synchronize(rdpContext *context)
1360	1420	{
1361	1421	struct mod *mod;
1362	1422	mod = ((struct mod_context *)context)->modi;

1454	1514
1455	1515	instance->settings->username = g_strdup(mod->username);
1456	1516	instance->settings->password = g_strdup(mod->password);
	1517	instance->settings->domain = g_strdup(mod->domain);
1457	1518
1458	1519	if (mod->client_info.rail_support_level > 0)
1459	1520	{

1471	1532	{
1472	1533	LLOGLN(10, ("Special PerformanceFlags changed"));
1473	1534	instance->settings->performance_flags = PERF_DISABLE_WALLPAPER \|
1474		PERF_DISABLE_FULLWINDOWDRAG \| PERF_DISABLE_MENUANIMATIONS \|
1475		PERF_DISABLE_THEMING;
1476		// \| PERF_DISABLE_CURSOR_SHADOW \| PERF_DISABLE_CURSORSETTINGS;
1477		}
	1535	PERF_DISABLE_FULLWINDOWDRAG \| PERF_DISABLE_MENUANIMATIONS \|
	1536	PERF_DISABLE_THEMING;
	1537	// \| PERF_DISABLE_CURSOR_SHADOW \| PERF_DISABLE_CURSORSETTINGS;
	1538	}
	1539
1478	1540	instance->settings->compression = 0;
1479	1541	instance->settings->ignore_certificate = 1;
1480	1542
1481	1543	// Multi Monitor Settings
1482	1544	instance->settings->num_monitors = mod->client_info.monitorCount;
	1545
1483	1546	for (index = 0; index < mod->client_info.monitorCount; index++)
1484	1547	{
1485		instance->settings->monitors[index].x = mod->client_info.minfo[index].left;
1486		instance->settings->monitors[index].y = mod->client_info.minfo[index].top;
1487		instance->settings->monitors[index].width = mod->client_info.minfo[index].right;
1488		instance->settings->monitors[index].height = mod->client_info.minfo[index].bottom;
1489		instance->settings->monitors[index].is_primary = mod->client_info.minfo[index].is_primary;
	1548	instance->settings->monitors[index].x = mod->client_info.minfo[index].left;
	1549	instance->settings->monitors[index].y = mod->client_info.minfo[index].top;
	1550	instance->settings->monitors[index].width = mod->client_info.minfo[index].right;
	1551	instance->settings->monitors[index].height = mod->client_info.minfo[index].bottom;
	1552	instance->settings->monitors[index].is_primary = mod->client_info.minfo[index].is_primary;
1490	1553	}
1491	1554
1492	1555	instance->update->BeginPaint = lfreerdp_begin_paint;
1493	1556	instance->update->EndPaint = lfreerdp_end_paint;
1494	1557	instance->update->SetBounds = lfreerdp_set_bounds;
1495	1558	instance->update->BitmapUpdate = lfreerdp_bitmap_update;
1496		instance->update->Synchronize = lfreerdp_syncronize ;
	1559	instance->update->Synchronize = lfreerdp_synchronize;
1497	1560	instance->update->primary->DstBlt = lfreerdp_dst_blt;
1498	1561	instance->update->primary->PatBlt = lfreerdp_pat_blt;
1499	1562	instance->update->primary->ScrBlt = lfreerdp_scr_blt;

1535	1598	int index;
1536	1599	struct mod *mod;
1537	1600	struct rail_window_state_order wso;
1538		UNICONV* uniconv;
1539
1540		LLOGLN(0, ("llrail_WindowCreate:"));
	1601	UNICONV *uniconv;
	1602
	1603	LLOGLN(10, ("lrail_WindowCreate:"));
1541	1604	uniconv = freerdp_uniconv_new();
1542	1605	mod = ((struct mod_context *)context)->modi;
1543	1606	memset(&wso, 0, sizeof(wso));

1550	1613	if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_TITLE)
1551	1614	{
1552	1615	wso.title_info = freerdp_uniconv_in(uniconv,
1553		window_state->titleInfo.string, window_state->titleInfo.length);
1554		}
1555
1556		LLOGLN(0, ("lrail_WindowCreate: %s", wso.title_info));
	1616	window_state->titleInfo.string, window_state->titleInfo.length);
	1617	}
	1618
	1619	LLOGLN(10, ("lrail_WindowCreate: %s", wso.title_info));
1557	1620	wso.client_offset_x = window_state->clientOffsetX;
1558	1621	wso.client_offset_y = window_state->clientOffsetY;
1559	1622	wso.client_area_width = window_state->clientAreaWidth;

1613	1676	lrail_WindowUpdate(rdpContext context, WINDOW_ORDER_INFO orderInfo,
1614	1677	WINDOW_STATE_ORDER *window_state)
1615	1678	{
1616		LLOGLN(0, ("lrail_WindowUpdate:"));
	1679	LLOGLN(10, ("lrail_WindowUpdate:"));
1617	1680	lrail_WindowCreate(context, orderInfo, window_state);
1618	1681	}
1619	1682

1623	1686	{
1624	1687	struct mod *mod;
1625	1688
1626		LLOGLN(0, ("lrail_WindowDelete:"));
	1689	LLOGLN(10, ("lrail_WindowDelete:"));
1627	1690	mod = ((struct mod_context *)context)->modi;
1628	1691	mod->server_window_delete(mod, orderInfo->windowId);
1629	1692	}

1636	1699	struct mod *mod;
1637	1700	struct rail_icon_info rii;
1638	1701
1639		LLOGLN(0, ("lrail_WindowIcon:"));
	1702	LLOGLN(10, ("lrail_WindowIcon:"));
1640	1703	mod = ((struct mod_context *)context)->modi;
1641	1704	memset(&rii, 0, sizeof(rii));
1642	1705	rii.bpp = window_icon->iconInfo->bpp;

1661	1724	{
1662	1725	struct mod *mod;
1663	1726
1664		LLOGLN(0, ("lrail_WindowCachedIcon:"));
	1727	LLOGLN(10, ("lrail_WindowCachedIcon:"));
1665	1728	mod = ((struct mod_context *)context)->modi;
1666	1729	mod->server_window_cached_icon(mod, orderInfo->windowId,
1667	1730	window_cached_icon->cachedIcon.cacheEntry,

1676	1739	{
1677	1740	struct mod *mod;
1678	1741	struct rail_notify_state_order rnso;
1679		UNICONV* uniconv;
1680
1681		LLOGLN(0, ("lrail_NotifyIconCreate:"));
	1742	UNICONV *uniconv;
	1743
	1744	LLOGLN(10, ("lrail_NotifyIconCreate:"));
1682	1745	uniconv = freerdp_uniconv_new();
1683	1746	mod = ((struct mod_context *)context)->modi;
1684	1747

1687	1750
1688	1751	if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_NOTIFY_TIP)
1689	1752	{
1690		rnso.tool_tip = freerdp_uniconv_in(uniconv,
1691		notify_icon_state->toolTip.string, notify_icon_state->toolTip.length);
1692		}
	1753	rnso.tool_tip = freerdp_uniconv_in(uniconv,
	1754	notify_icon_state->toolTip.string, notify_icon_state->toolTip.length);
	1755	}
	1756
1693	1757	if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_NOTIFY_INFO_TIP)
1694	1758	{
1695		rnso.infotip.timeout = notify_icon_state->infoTip.timeout;
1696		rnso.infotip.flags = notify_icon_state->infoTip.flags;
1697		rnso.infotip.text = freerdp_uniconv_in(uniconv,
1698		notify_icon_state->infoTip.text.string,
1699		notify_icon_state->infoTip.text.length);
1700		rnso.infotip.title = freerdp_uniconv_in(uniconv,
1701		notify_icon_state->infoTip.title.string,
1702		notify_icon_state->infoTip.title.length);
	1759	rnso.infotip.timeout = notify_icon_state->infoTip.timeout;
	1760	rnso.infotip.flags = notify_icon_state->infoTip.flags;
	1761	rnso.infotip.text = freerdp_uniconv_in(uniconv,
	1762	notify_icon_state->infoTip.text.string,
	1763	notify_icon_state->infoTip.text.length);
	1764	rnso.infotip.title = freerdp_uniconv_in(uniconv,
	1765	notify_icon_state->infoTip.title.string,
	1766	notify_icon_state->infoTip.title.length);
1703	1767	}
1704	1768
1705	1769	rnso.state = notify_icon_state->state;

1730	1794	lrail_NotifyIconUpdate(rdpContext context, WINDOW_ORDER_INFO orderInfo,
1731	1795	NOTIFY_ICON_STATE_ORDER *notify_icon_state)
1732	1796	{
1733		LLOGLN(0, ("lrail_NotifyIconUpdate:"));
	1797	LLOGLN(10, ("lrail_NotifyIconUpdate:"));
1734	1798	lrail_NotifyIconCreate(context, orderInfo, notify_icon_state);
1735	1799	}
1736	1800

1740	1804	{
1741	1805	struct mod *mod;
1742	1806
1743		LLOGLN(0, ("lrail_NotifyIconDelete:"));
	1807	LLOGLN(10, ("lrail_NotifyIconDelete:"));
1744	1808	mod = ((struct mod_context *)context)->modi;
1745	1809	mod->server_notify_delete(mod, orderInfo->windowId,
1746	1810	orderInfo->notifyIconId);

1755	1819	struct mod *mod;
1756	1820	struct rail_monitored_desktop_order rmdo;
1757	1821
1758		LLOGLN(0, ("lrail_MonitoredDesktop:"));
	1822	LLOGLN(10, ("lrail_MonitoredDesktop:"));
1759	1823	mod = ((struct mod_context *)context)->modi;
1760	1824	memset(&rmdo, 0, sizeof(rmdo));
1761	1825	rmdo.active_window_id = monitored_desktop->activeWindowId;

1785	1849	struct mod *mod;
1786	1850	struct rail_monitored_desktop_order rmdo;
1787	1851
1788		LLOGLN(0, ("lrail_NonMonitoredDesktop:"));
	1852	LLOGLN(10, ("lrail_NonMonitoredDesktop:"));
1789	1853	mod = ((struct mod_context *)context)->modi;
1790	1854	memset(&rmdo, 0, sizeof(rmdo));
1791	1855	mod->server_monitored_desktop(mod, &rmdo, orderInfo->fieldFlags);

1797	1861	{
1798	1862	struct mod *mod;
1799	1863
1800		LLOGLN(0, ("lfreerdp_post_connect:"));
	1864	LLOGLN(10, ("lfreerdp_post_connect:"));
1801	1865	mod = ((struct mod_context *)(instance->context))->modi;
1802	1866	g_memset(mod->password, 0, sizeof(mod->password));
1803	1867

+130

-128

neutrinordp/xrdp-neutrinordp.h less more

34	34
35	35	struct bitmap_item
36	36	{
37		int width;
38		int height;
39		char* data;
	37	int width;
	38	int height;
	39	char *data;
40	40	};
41	41
42	42	struct brush_item
43	43	{
44		int bpp;
45		int width;
46		int height;
47		char* data;
48		char b8x8[8];
	44	int bpp;
	45	int width;
	46	int height;
	47	char *data;
	48	char b8x8[8];
49	49	};
50	50
51	51	struct pointer_item
52	52	{
53		int hotx;
54		int hoty;
55		char data[32 * 32 * 4];
56		char mask[32 * 32 / 8];
57		int bpp;
	53	int hotx;
	54	int hoty;
	55	char data[32 * 32 * 4];
	56	char mask[32 * 32 / 8];
	57	int bpp;
58	58	};
59	59
60	60	#define CURRENT_MOD_VER 3
61	61
62	62	struct mod
63	63	{
64		int size; /* size of this struct */
65		int version; /* internal version */
66		/* client functions */
67		int (mod_start)(struct mod v, int w, int h, int bpp);
68		int (mod_connect)(struct mod v);
69		int (mod_event)(struct mod v, int msg, long param1, long param2,
70		long param3, long param4);
71		int (mod_signal)(struct mod v);
72		int (mod_end)(struct mod v);
73		int (mod_set_param)(struct mod v, char* name, char* value);
74		int (mod_session_change)(struct mod v, int, int);
75		int (mod_get_wait_objs)(struct mod v, tbus* read_objs, int* rcount,
76		tbus* write_objs, int* wcount, int* timeout);
77		int (mod_check_wait_objs)(struct mod v);
78		tintptr mod_dumby[100 - 9]; /* align, 100 minus the number of mod
	64	int size; /* size of this struct */
	65	int version; /* internal version */
	66	/* client functions */
	67	int (mod_start)(struct mod v, int w, int h, int bpp);
	68	int (mod_connect)(struct mod v);
	69	int (mod_event)(struct mod v, int msg, long param1, long param2,
	70	long param3, long param4);
	71	int (mod_signal)(struct mod v);
	72	int (mod_end)(struct mod v);
	73	int (mod_set_param)(struct mod v, char name, char value);
	74	int (mod_session_change)(struct mod v, int, int);
	75	int (mod_get_wait_objs)(struct mod v, tbus read_objs, int rcount,
	76	tbus write_objs, int wcount, int *timeout);
	77	int (mod_check_wait_objs)(struct mod v);
	78	tintptr mod_dumby[100 - 9]; /* align, 100 minus the number of mod
79	79	functions above */
80		/* server functions */
81		int (server_begin_update)(struct mod v);
82		int (server_end_update)(struct mod v);
83		int (server_fill_rect)(struct mod v, int x, int y, int cx, int cy);
84		int (server_screen_blt)(struct mod v, int x, int y, int cx, int cy,
85		int srcx, int srcy);
86		int (server_paint_rect)(struct mod v, int x, int y, int cx, int cy,
87		char* data, int width, int height, int srcx, int srcy);
88		int (server_set_pointer)(struct mod v, int x, int y, char* data, char* mask);
89		int (server_palette)(struct mod v, int* palette);
90		int (server_msg)(struct mod v, char* msg, int code);
91		int (server_is_term)(struct mod v);
92		int (server_set_clip)(struct mod v, int x, int y, int cx, int cy);
93		int (server_reset_clip)(struct mod v);
94		int (server_set_fgcolor)(struct mod v, int fgcolor);
95		int (server_set_bgcolor)(struct mod v, int bgcolor);
96		int (server_set_opcode)(struct mod v, int opcode);
97		int (server_set_mixmode)(struct mod v, int mixmode);
98		int (server_set_brush)(struct mod v, int x_orgin, int y_orgin,
99		int style, char* pattern);
100		int (server_set_pen)(struct mod v, int style,
101		int width);
102		int (server_draw_line)(struct mod v, int x1, int y1, int x2, int y2);
103		int (server_add_char)(struct mod v, int font, int charactor,
104		int offset, int baseline,
105		int width, int height, char* data);
106		int (server_draw_text)(struct mod v, int font,
107		int flags, int mixmode, int clip_left, int clip_top,
108		int clip_right, int clip_bottom,
109		int box_left, int box_top,
110		int box_right, int box_bottom,
111		int x, int y, char* data, int data_len);
112		int (server_reset)(struct mod v, int width, int height, int bpp);
113		int (server_query_channel)(struct mod v, int index,
114		char* channel_name,
115		int* channel_flags);
116		int (server_get_channel_id)(struct mod v, char* name);
117		int (server_send_to_channel)(struct mod v, int channel_id,
118		char* data, int data_len,
119		int total_data_len, int flags);
120		int (server_bell_trigger)(struct mod v);
121		/* off screen bitmaps */
122		int (server_create_os_surface)(struct mod v, int rdpindex,
123		int width, int height);
124		int (server_switch_os_surface)(struct mod v, int rdpindex);
125		int (server_delete_os_surface)(struct mod v, int rdpindex);
126		int (server_paint_rect_os)(struct mod mod, int x, int y,
127		int cx, int cy,
128		int rdpindex, int srcx, int srcy);
129		int (server_set_hints)(struct mod mod, int hints, int mask);
130		/* rail */
131		int (server_window_new_update)(struct mod mod, int window_id,
132		struct rail_window_state_order* window_state,
133		int flags);
134		int (server_window_delete)(struct mod mod, int window_id);
135		int (server_window_icon)(struct mod mod,
136		int window_id, int cache_entry, int cache_id,
137		struct rail_icon_info* icon_info,
138		int flags);
139		int (server_window_cached_icon)(struct mod mod,
140		int window_id, int cache_entry,
141		int cache_id, int flags);
142		int (server_notify_new_update)(struct mod mod,
143		int window_id, int notify_id,
144		struct rail_notify_state_order* notify_state,
145		int flags);
146		int (server_notify_delete)(struct mod mod, int window_id,
147		int notify_id);
148		int (server_monitored_desktop)(struct mod mod,
149		struct rail_monitored_desktop_order* mdo,
150		int flags);
151		int (server_set_pointer_ex)(struct mod mod, int x, int y, char* data,
152		char* mask, int bpp);
	80	/* server functions */
	81	int (server_begin_update)(struct mod v);
	82	int (server_end_update)(struct mod v);
	83	int (server_fill_rect)(struct mod v, int x, int y, int cx, int cy);
	84	int (server_screen_blt)(struct mod v, int x, int y, int cx, int cy,
	85	int srcx, int srcy);
	86	int (server_paint_rect)(struct mod v, int x, int y, int cx, int cy,
	87	char *data, int width, int height, int srcx, int srcy);
	88	int (server_set_pointer)(struct mod v, int x, int y, char data, char mask);
	89	int (server_palette)(struct mod v, int *palette);
	90	int (server_msg)(struct mod v, char *msg, int code);
	91	int (server_is_term)(struct mod v);
	92	int (server_set_clip)(struct mod v, int x, int y, int cx, int cy);
	93	int (server_reset_clip)(struct mod v);
	94	int (server_set_fgcolor)(struct mod v, int fgcolor);
	95	int (server_set_bgcolor)(struct mod v, int bgcolor);
	96	int (server_set_opcode)(struct mod v, int opcode);
	97	int (server_set_mixmode)(struct mod v, int mixmode);
	98	int (server_set_brush)(struct mod v, int x_origin, int y_origin,
	99	int style, char *pattern);
	100	int (server_set_pen)(struct mod v, int style,
	101	int width);
	102	int (server_draw_line)(struct mod v, int x1, int y1, int x2, int y2);
	103	int (server_add_char)(struct mod v, int font, int character,
	104	int offset, int baseline,
	105	int width, int height, char *data);
	106	int (server_draw_text)(struct mod v, int font,
	107	int flags, int mixmode, int clip_left, int clip_top,
	108	int clip_right, int clip_bottom,
	109	int box_left, int box_top,
	110	int box_right, int box_bottom,
	111	int x, int y, char *data, int data_len);
	112	int (server_reset)(struct mod v, int width, int height, int bpp);
	113	int (server_query_channel)(struct mod v, int index,
	114	char *channel_name,
	115	int *channel_flags);
	116	int (server_get_channel_id)(struct mod v, char *name);
	117	int (server_send_to_channel)(struct mod v, int channel_id,
	118	char *data, int data_len,
	119	int total_data_len, int flags);
	120	int (server_bell_trigger)(struct mod v);
	121	/* off screen bitmaps */
	122	int (server_create_os_surface)(struct mod v, int rdpindex,
	123	int width, int height);
	124	int (server_switch_os_surface)(struct mod v, int rdpindex);
	125	int (server_delete_os_surface)(struct mod v, int rdpindex);
	126	int (server_paint_rect_os)(struct mod mod, int x, int y,
	127	int cx, int cy,
	128	int rdpindex, int srcx, int srcy);
	129	int (server_set_hints)(struct mod mod, int hints, int mask);
	130	/* rail */
	131	int (server_window_new_update)(struct mod mod, int window_id,
	132	struct rail_window_state_order *window_state,
	133	int flags);
	134	int (server_window_delete)(struct mod mod, int window_id);
	135	int (server_window_icon)(struct mod mod,
	136	int window_id, int cache_entry, int cache_id,
	137	struct rail_icon_info *icon_info,
	138	int flags);
	139	int (server_window_cached_icon)(struct mod mod,
	140	int window_id, int cache_entry,
	141	int cache_id, int flags);
	142	int (server_notify_new_update)(struct mod mod,
	143	int window_id, int notify_id,
	144	struct rail_notify_state_order *notify_state,
	145	int flags);
	146	int (server_notify_delete)(struct mod mod, int window_id,
	147	int notify_id);
	148	int (server_monitored_desktop)(struct mod mod,
	149	struct rail_monitored_desktop_order *mdo,
	150	int flags);
	151	int (server_set_pointer_ex)(struct mod mod, int x, int y, char *data,
	152	char *mask, int bpp);
153	153
154		tintptr server_dumby[100 - 37]; /* align, 100 minus the number of server
	154	tintptr server_dumby[100 - 37]; /* align, 100 minus the number of server
155	155	functions above */
156		/* common */
157		tintptr handle; /* pointer to self as long */
158		tintptr wm;
159		tintptr painter;
160		tintptr si;
161		/* mod data */
162		int sck;
163		int width;
164		int height;
165		int bpp;
166		int colormap[256];
167		char* chan_buf;
168		int chan_buf_valid;
169		int chan_buf_bytes;
170		int vmaj;
171		int vmin;
172		int vrev;
173		char username[256];
174		char password[256];
175		int bool_keyBoardSynced ; /* Numlock can be out of sync, we hold state here to resolve */
176		int keyBoardLockInfo ; /* Holds initial numlock capslock state */
	156	/* common */
	157	tintptr handle; /* pointer to self as long */
	158	tintptr wm;
	159	tintptr painter;
	160	tintptr si;
177	161
178		struct xrdp_client_info client_info;
	162	/* mod data */
	163	int sck;
	164	int width;
	165	int height;
	166	int bpp;
	167	int colormap[256];
	168	char *chan_buf;
	169	int chan_buf_valid;
	170	int chan_buf_bytes;
	171	int vmaj;
	172	int vmin;
	173	int vrev;
	174	char username[256];
	175	char password[256];
	176	char domain[256];
	177	int bool_keyBoardSynced ; /* Numlock can be out of sync, we hold state here to resolve */
	178	int keyBoardLockInfo ; /* Holds initial numlock capslock state */
179	179
180		struct rdp_freerdp* inst;
181		struct bitmap_item bitmap_cache[4][4096];
182		struct brush_item brush_cache[64];
183		struct pointer_item pointer_cache[32];
	180	struct xrdp_client_info client_info;
	181
	182	struct rdp_freerdp *inst;
	183	struct bitmap_item bitmap_cache[4][4096];
	184	struct brush_item brush_cache[64];
	185	struct pointer_item pointer_cache[32];
184	186
185	187	};

+1

-1

prog_std.txt less more

0	0
1		This is an atempt to explain my odd programming standard used for this project.
	1	This is an attempt to explain my odd programming standard used for this project.
2	2	Not to defend any of these but its my default standard and make it easy
3	3	for me to read.
4	4	Some files break these rules, they will be updated eventually.

+4

-6

rdp/Makefile.am less more

0		EXTRA_DIST = rdp.h
1	0	EXTRA_DEFINES =
2	1
3	2	if XRDP_DEBUG

6	5	EXTRA_DEFINES += -DXRDP_NODEBUG
7	6	endif
8	7
9		AM_CFLAGS = \
	8	AM_CPPFLAGS = \
10	9	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
11	10	-DXRDP_SBIN_PATH=\"${sbindir}\" \
12	11	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
13	12	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
14		$(EXTRA_DEFINES)
15
16		INCLUDES = \
	13	$(EXTRA_DEFINES) \
17	14	-I$(top_srcdir)/common
18	15
19		lib_LTLIBRARIES = \
	16	module_LTLIBRARIES = \
20	17	librdp.la
21	18
22	19	librdp_la_SOURCES = \
23	20	rdp.c \
	21	rdp.h \
24	22	rdp_bitmap.c \
25	23	rdp_iso.c \
26	24	rdp_lic.c \

+2

-2

rdp/rdp.h less more

286	286	int (server_set_bgcolor)(struct mod v, int bgcolor);
287	287	int (server_set_opcode)(struct mod v, int opcode);
288	288	int (server_set_mixmode)(struct mod v, int mixmode);
289		int (server_set_brush)(struct mod v, int x_orgin, int y_orgin,
	289	int (server_set_brush)(struct mod v, int x_origin, int y_origin,
290	290	int style, char* pattern);
291	291	int (server_set_pen)(struct mod v, int style,
292	292	int width);
293	293	int (server_draw_line)(struct mod v, int x1, int y1, int x2, int y2);
294		int (server_add_char)(struct mod v, int font, int charactor,
	294	int (server_add_char)(struct mod v, int font, int character,
295	295	int offset, int baseline,
296	296	int width, int height, char* data);
297	297	int (server_draw_text)(struct mod v, int font,

+10

-7

rdp/rdp_lic.c less more

72	72	LICENCE_HWID_SIZE - 4);
73	73	}
74	74
	75	#if 0
75	76	/*****************************************************************************/
76	77	/* Present an existing licence to the server */
77	78	static void APP_CC

111	112	rdp_sec_send(self->sec_layer, s, sec_flags);
112	113	free_stream(s);
113	114	}
	115	#endif
114	116
115	117	/*****************************************************************************/
116	118	/* Send a licence request packet */

160	162	{
161	163	char null_data[SEC_MODULUS_SIZE];
162	164	char *server_random;
163		char signature[LICENCE_SIGNATURE_SIZE];
164		char hwid[LICENCE_HWID_SIZE];
165		char *licence_data;
166		int licence_size;
167		void *crypt_key;
168
169		licence_data = 0;
	165
170	166	/* Retrieve the server random from the incoming packet */
171	167	in_uint8p(s, server_random, SEC_RANDOM_SIZE);
172	168	/* We currently use null client keys. This is a bit naughty but, hey,

175	171	rdp_lic_generate_keys(self, null_data, server_random, null_data);
176	172
177	173	#if 0
	174	int licence_size;
	175	char *licence_data;
	176
178	177	licence_size = 0; /* todo load_licence(&licence_data); */
179	178
180	179	if (licence_size > 0)
181	180	{
	181	void *crypt_key;
	182	char hwid[LICENCE_HWID_SIZE];
	183	char signature[LICENCE_SIGNATURE_SIZE];
	184
182	185	/* Generate a signature for the HWID buffer */
183	186	rdp_lic_generate_hwid(self, hwid);
184	187	rdp_sec_sign(signature, 16, self->licence_sign_key, 16,

+1

-1

rdp/rdp_mcs.c less more

18	18	*/
19	19
20	20	#include "rdp.h"
21		#include "common/log.h"
	21	#include "log.h"
22	22
23	23	/*****************************************************************************/
24	24	struct rdp_mcs *APP_CC

+8

-13

rdp/rdp_orders.c less more

224	224	int flags)
225	225	{
226	226	int cache_idx = 0;
227		int bufsize = 0;
228	227	int cache_id = 0;
229	228	int width = 0;
230	229	int height = 0;

243	242	in_uint8(s, height);
244	243	in_uint8(s, bpp);
245	244	Bpp = (bpp + 7) / 8;
246		in_uint16_le(s, bufsize);
	245	in_uint8s(s, 2); /* bufsize */
247	246	in_uint16_le(s, cache_idx);
248	247	inverted = (char )g_malloc(width height * Bpp, 0);
249	248

325	324	int bpp = 0;
326	325	int Bpp = 0;
327	326	int bufsize = 0;
328		int pad1 = 0;
329		int pad2 = 0;
330		int row_size = 0;
331		int final_size = 0;
332	327	struct rdp_bitmap bitmap = (struct rdp_bitmap )NULL;
333	328	struct stream rec_s = (struct stream )NULL;
334	329
335	330	in_uint8(s, cache_id);
336		in_uint8(s, pad1);
	331	in_uint8s(s, 1); /* pad */
337	332	in_uint8(s, width);
338	333	in_uint8(s, height);
339	334	in_uint8(s, bpp);

347	342	}
348	343	else
349	344	{
350		in_uint16_le(s, pad2);
	345	in_uint8s(s, 2); /* pad */
351	346	in_uint16_le(s, size);
352		in_uint16_le(s, row_size);
353		in_uint16_le(s, final_size);
	347	in_uint8s(s, 2); /* row_size */
	348	in_uint8s(s, 2); /* final_size */
354	349	}
355	350
356	351	in_uint8p(s, data, size);

1114	1109	rdp_orders_process_desksave(struct rdp_orders self, struct stream s,
1115	1110	int present, int delta)
1116	1111	{
1117		int width = 0;
1118		int height = 0;
	1112	//int width = 0;
	1113	//int height = 0;
1119	1114
1120	1115	if (present & 0x01)
1121	1116	{

1434	1429	}
1435	1430
1436	1431	/*****************************************************************************/
1437		/* returns pointer, it might return bmpdata if the data dosen't need to
	1432	/* returns pointer, it might return bmpdata if the data doesn't need to
1438	1433	be converted, else it mallocs it. The calling function must free
1439	1434	it if needed */
1440	1435	char *APP_CC

+6

-12

rdp/rdp_rdp.c less more

505	505	rdp_rdp_process_pointer_pdu(struct rdp_rdp self, struct stream s)
506	506	{
507	507	int message_type;
508		int x;
509		int y;
510	508	int rv;
511	509
512	510	rv = 0;

516	514	switch (message_type)
517	515	{
518	516	case RDP_POINTER_MOVE:
519		in_uint16_le(s, x);
520		in_uint16_le(s, y);
	517	in_uint8s(s, 2); /* x */
	518	in_uint8s(s, 2); /* y */
521	519	break;
522	520	case RDP_POINTER_COLOR:
523	521	rv = rdp_rdp_process_color_pointer_pdu(self, s);

933	931	rdp_rdp_process_data_pdu(struct rdp_rdp self, struct stream s)
934	932	{
935	933	int data_pdu_type;
936		int ctype;
937		int len;
938	934	int rv;
939	935
940	936	rv = 0;
941	937	in_uint8s(s, 6); /* shareid, pad, streamid */
942		in_uint16_le(s, len);
	938	in_uint8s(s, 2); /* len */
943	939	in_uint8(s, data_pdu_type);
944		in_uint8(s, ctype);
	940	in_uint8s(s, 1); /* ctype */
945	941	in_uint8s(s, 2); /* clen */
946	942
947	943	switch (data_pdu_type)

982	978	static void APP_CC
983	979	rdp_rdp_process_bitmap_caps(struct rdp_rdp self, struct stream s)
984	980	{
985		int width = 0;
986		int height = 0;
987	981	int bpp = 0;
988	982
989	983	in_uint16_le(s, bpp);
990	984	in_uint8s(s, 6);
991		in_uint16_le(s, width);
992		in_uint16_le(s, height);
	985	in_uint8s(s, 2); /* width */
	986	in_uint8s(s, 2); /* height */
993	987	self->mod->rdp_bpp = bpp;
994	988	/* todo, call reset if needed and use width and height */
995	989	}

+3

-3

rdp/rdp_tcp.c less more

54	54	{
55	55	int rcvd;
56	56
57		DEBUG((" in rdp_tcp_recv gota get %d bytes on sck %d",
	57	DEBUG((" in rdp_tcp_recv will get %d bytes on sck %d",
58	58	len, self->sck));
59	59
60	60	if (self->sck_closed)

73	73	{
74	74	if (g_tcp_last_error_would_block(self->sck))
75	75	{
76		g_tcp_can_recv(self->sck, 10);
	76	g_sck_can_recv(self->sck, 10);
77	77	}
78	78	else
79	79	{

114	114	}
115	115
116	116	len = s->end - s->data;
117		DEBUG((" in rdp_tcp_send gota send %d bytes on sck %d", len,
	117	DEBUG((" in rdp_tcp_send will send %d bytes on sck %d", len,
118	118	self->sck));
119	119	total = 0;
120	120

+6

-6

readme.txt less more

8	8	Mark from up 19.9 was the first to work with rdp server code.
9	9
10	10	Tested with linux on i386, x64, sparc, and ppc.
11		I've got it compiling and working in windows with borland free tools.
12		Non of the sesman or Xserver stuff works in windows of course.
	11	I've got it compiling and working in windows with Borland free tools.
	12	None of the sesman or Xserver stuff works in windows of course.
13	13
14	14	xrdp directory is the main server code
15	15	vnc directory is a simple vnc client module for xrdp

18	18	rdp is an rdp client module for connecting to another rdp server
19	19	xup is a module used to connect to an rdp specific X11 server
20	20	Xserver is the files needed to build an rdp specific X11 server
21		COPYING is the licence file
22		design.txt is an attempt to expain the project design
23		prog_std.txt is an attemp to explain the programming standard used
	21	COPYING is the license file
	22	design.txt is an attempt to explain the project design
	23	prog_std.txt is an attempt to explain the programming standard used
24	24
25		since version 0.5.0 we switch to autotool to build xrdp
	25	since version 0.5.0 we switch to autotools to build xrdp
26	26
27	27	to build and install
28	28

+20

-17

sesman/Makefile.am less more

0		EXTRA_DIST = sesman.ini startwm.sh sesman.h access.h auth.h config.h env.h lock.h scp.h scp_v0.h scp_v1.h scp_v1_mng.h session.h sig.h thread.h
1
2		AM_CFLAGS = \
	0	AM_CPPFLAGS = \
3	1	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
4	2	-DXRDP_SBIN_PATH=\"${sbindir}\" \
5	3	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
6		-DXRDP_PID_PATH=\"${localstatedir}/run\"
7
8		INCLUDES = \
	4	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
9	5	-I$(top_srcdir)/common \
10	6	-I$(top_srcdir)/sesman/libscp
11	7

36	32	xrdp-sesman
37	33
38	34	xrdp_sesman_SOURCES = \
	35	access.c \
	36	access.h \
	37	auth.h \
	38	config.c \
	39	config.h \
	40	env.c \
	41	env.h \
39	42	scp.c \
	43	scp.h \
40	44	scp_v0.c \
	45	scp_v0.h \
41	46	scp_v1.c \
	47	scp_v1.h \
42	48	scp_v1_mng.c \
	49	scp_v1_mng.h \
43	50	sesman.c \
	51	sesman.h \
44	52	session.c \
	53	session.h \
45	54	sig.c \
46		thread.c \
47		lock.c \
48		access.c \
49		config.c \
50		env.c \
	55	sig.h \
51	56	$(AUTH_C)
52	57
53	58	xrdp_sesman_LDADD = \

58	63
59	64	sesmansysconfdir=$(sysconfdir)/xrdp
60	65
61		sesmansysconf_DATA = \
62		sesman.ini \
	66	dist_sesmansysconf_DATA = \
	67	sesman.ini
	68
	69	dist_sesmansysconf_SCRIPTS = \
63	70	startwm.sh
64	71
65	72	SUBDIRS = \

67	74	tools \
68	75	sessvc \
69	76	chansrv
70
71		# must be tab below
72		install-data-hook:
73		chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh

+2

-2

sesman/access.c less more

0	0	/**
1	1	* xrdp: A Remote Desktop Protocol server.
2	2	*
3		* Copyright (C) Jay Sorg 2004-2013
	3	* Copyright (C) Jay Sorg 2004-2015
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

92	92
93	93	if (0 == g_cfg->sec.ts_admins_enable)
94	94	{
95		LOG_DBG("[MNG] Terminal Server Admin group is disabled,"
	95	LOG_DBG("[MNG] Terminal Server Admin group is disabled, "
96	96	"allowing authentication", 1);
97	97	return 1;
98	98	}

+33

-35

sesman/chansrv/Makefile.am less more

0		EXTRA_DIST = \
1		chansrv.h \
2		chansrv_fuse.h \
3		clipboard.h \
4		clipboard_common.h \
5		clipboard_file.h \
6		devredir.h \
7		drdynvc.h \
8		rail.h \
9		sound.h \
10		xcommon.h \
11		mlog.h \
12		chansrv_common.h \
13		irp.h \
14		smartcard.h \
15		smartcard_pcsc.h \
16		fifo.h
17
18	0	EXTRA_DEFINES =
19	1	EXTRA_INCLUDES =
20	2	EXTRA_LIBS =

30	12	EXTRA_LIBS += -lopus
31	13	endif
32	14
33		AM_CFLAGS = \
	15	AM_CPPFLAGS = \
34	16	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
35	17	-DXRDP_SBIN_PATH=\"${sbindir}\" \
36	18	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
37	19	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
38		$(EXTRA_DEFINES)
39
40		INCLUDES = \
	20	$(EXTRA_DEFINES) \
41	21	-I$(top_srcdir)/common \
42	22	$(EXTRA_INCLUDES)
	23
	24	AM_CFLAGS = $(X_CFLAGS)
43	25
44	26	sbin_PROGRAMS = \
45	27	xrdp-chansrv
46	28
47	29	xrdp_chansrv_SOURCES = \
48	30	chansrv.c \
	31	chansrv.h \
	32	chansrv_common.c \
	33	chansrv_common.h \
	34	chansrv_fuse.c \
	35	chansrv_fuse.h \
	36	clipboard.c \
	37	clipboard.h \
	38	clipboard_common.h \
	39	clipboard_file.c \
	40	clipboard_file.h \
	41	devredir.c \
	42	devredir.h \
	43	drdynvc.c \
	44	drdynvc.h \
	45	fifo.c \
	46	fifo.h \
	47	irp.c \
	48	irp.h \
	49	mlog.h \
	50	rail.c \
	51	rail.h \
	52	smartcard.c \
	53	smartcard.h \
	54	smartcard_pcsc.c \
	55	smartcard_pcsc.h \
49	56	sound.c \
50		clipboard.c \
51		clipboard_file.c \
52		devredir.c \
53		smartcard.c \
54		smartcard_pcsc.c \
55		rail.c \
	57	sound.h \
56	58	xcommon.c \
57		drdynvc.c \
58		chansrv_fuse.c \
59		irp.c \
60		fifo.c \
61		chansrv_common.c
	59	xcommon.h
62	60
63	61	xrdp_chansrv_LDFLAGS = \
	62	$(X_LIBS) \
64	63	$(EXTRA_FLAGS)
65	64
66	65	xrdp_chansrv_LDADD = \
67		-L/usr/X11R6/lib \
68	66	$(top_builddir)/common/libcommon.la \
69		-lX11 -lXfixes -lXrandr \
	67	$(X_PRE_LIBS) -lXfixes -lXrandr -lX11 $(X_EXTRA_LIBS) \
70	68	$(EXTRA_LIBS)

+2

-4

sesman/chansrv/chansrv.c less more

755	755	my_trans_data_in(struct trans *trans)
756	756	{
757	757	struct stream s = (struct stream )NULL;
758		int id = 0;
759	758	int size = 0;
760	759	int error = 0;
761	760

771	770
772	771	LOGM((LOG_LEVEL_DEBUG, "my_trans_data_in:"));
773	772	s = trans_get_in_s(trans);
774		in_uint32_le(s, id);
	773	in_uint8s(s, 4); /* id */
775	774	in_uint32_le(s, size);
776	775	error = trans_force_read(trans, size - 8);
777	776

1486	1485
1487	1486	/* starting logging subsystem */
1488	1487	g_memset(&logconfig, 0, sizeof(struct log_config));
1489		logconfig.program_name = "XRDP-Chansrv";
	1488	logconfig.program_name = "xrdp-chansrv";
1490	1489	g_snprintf(log_file, 255, "%s/xrdp-chansrv.log", log_path);
1491	1490	g_writeln("chansrv::main: using log file [%s]", log_file);
1492	1491

1524	1523
1525	1524	LOGM((LOG_LEVEL_ALWAYS, "main: app started pid %d(0x%8.8x)", pid, pid));
1526	1525	/* set up signal handler */
1527		g_signal_kill(term_signal_handler); /* SIGKILL */
1528	1526	g_signal_terminate(term_signal_handler); /* SIGTERM */
1529	1527	g_signal_user_interrupt(term_signal_handler); /* SIGINT */
1530	1528	g_signal_pipe(nil_signal_handler); /* SIGPIPE */

+17

-12

sesman/chansrv/chansrv_fuse.c less more

18	18	/*
19	19	* TODO
20	20	* o when creating dir/file, ensure it does not already exist
21		* o do not allow dirs to be created in ino==1 except for .clipbard and share mounts
	21	* o do not allow dirs to be created in ino==1 except for .clipboard and share mounts
22	22	* o fix the HACK where I have to use my own buf instead of g_buffer
23	23	* this is in func xfuse_check_wait_objs()
24	24	* o if fuse mount point is already mounted, I get segfault

38	38
39	39	//#define USE_SYNC_FLAG
40	40
41		static char g_fuse_mount_name[256] = "xrdp_client";
42
43	41	/* FUSE mount point */
44	42	char g_fuse_root_path[256] = "";
45	43	char g_fuse_clipboard_path[256] = ""; /* for clipboard use */

61	59	#include "chansrv_fuse.h"
62	60
63	61	/* dummy calls when XRDP_FUSE is not defined */
64		int xfuse_init() { return 0; }
65		int xfuse_deinit() { return 0; }
	62	int xfuse_init(void) { return 0; }
	63	int xfuse_deinit(void) { return 0; }
66	64	int xfuse_check_wait_objs(void) { return 0; }
67	65	int xfuse_get_wait_objs(tbus objs, int count, int *timeout) { return 0; }
68	66	int xfuse_clear_clip_dir(void) { return 0; }

73	71	void xfuse_devredir_cb_open_file(void *vp, tui32 IoStatus, tui32 DeviceId, tui32 FileId) {}
74	72	void xfuse_devredir_cb_write_file(void vp, char buf, size_t length) {}
75	73	void xfuse_devredir_cb_read_file(void vp, char buf, size_t length) {}
76		int xfuse_devredir_cb_enum_dir(void vp, struct xrdp_inode xinode) {}
	74	int xfuse_devredir_cb_enum_dir(void vp, struct xrdp_inode xinode) { return 0; }
77	75	void xfuse_devredir_cb_enum_dir_done(void *vp, tui32 IoStatus) {}
78	76	void xfuse_devredir_cb_rmdir_or_file(void *vp, tui32 IoStatus) {}
79	77	void xfuse_devredir_cb_rename_file(void *vp, tui32 IoStatus) {}

238	236	struct fuse_file_info *fi;
239	237	};
240	238
	239	static char g_fuse_mount_name[256] = "xrdp_client";
	240
241	241	FIFO g_fifo_opendir;
242	242
243	243	static struct list *g_req_list = 0;

252	252	static tintptr g_bufsize = 0;
253	253
254	254	/* forward declarations for internal access */
255		static int xfuse_init_xrdp_fs();
256		static int xfuse_deinit_xrdp_fs();
	255	static int xfuse_init_xrdp_fs(void);
	256	static int xfuse_deinit_xrdp_fs(void);
257	257	static int xfuse_init_lib(struct fuse_args *args);
258	258	static int xfuse_is_inode_valid(int ino);
259	259

263	263	const char *name, mode_t mode, int type);
264	264	#endif
265	265
266		static void xfuse_dump_fs();
	266	static void xfuse_dump_fs(void);
267	267	static void xfuse_dump_xrdp_inode(struct xrdp_inode *xino);
268	268	static tui32 xfuse_get_device_id_for_inode(tui32 ino, char *full_path);
269	269	static void fuse_reverse_pathname(char full_path, char reverse_path);

280	280	static int xfuse_delete_file_with_xinode(XRDP_INODE *xinode);
281	281	static int xfuse_delete_dir_with_xinode(XRDP_INODE *xinode);
282	282	static int xfuse_recursive_delete_dir_with_xinode(XRDP_INODE *xinode);
283		static void xfuse_update_xrdpfs_size();
	283	static void xfuse_update_xrdpfs_size(void);
284	284	static void xfuse_enum_dir(fuse_req_t req, fuse_ino_t ino, size_t size,
285	285	off_t off, struct fuse_file_info *fi);
286	286

305	305	static void xfuse_cb_getattr(fuse_req_t req, fuse_ino_t ino,
306	306	struct fuse_file_info *fi);
307	307
308		/* this is not a callback, but its's used by xfuse_cb_readdir() */
	308	/* this is not a callback, but it's used by xfuse_cb_readdir() */
309	309	static void xfuse_dirbuf_add(fuse_req_t req, struct dirbuf *b,
310	310	const char *name, fuse_ino_t ino);
311	311

692	692
693	693	log_debug("entered");
694	694
	695	if (g_xrdp_fs.inode_table == NULL)
	696	{
	697	return 0;
	698	}
	699
695	700	/* xinode for .clipboard */
696	701	xip = g_xrdp_fs.inode_table[2];
697	702

1258	1263	* Check if specified file exists
1259	1264	*
1260	1265	* @param parent parent inode of file
1261		* @param name flilename or dirname
	1266	* @param name filename or dirname
1262	1267	*
1263	1268	* @return 1 if specified file exists, 0 otherwise
1264	1269	*****************************************************************************/

+34

-22

sesman/chansrv/clipboard.c less more

175	175	#define LOG_ERROR 0
176	176	#define LOG_INFO 1
177	177	#define LOG_DEBUG 2
	178
	179	#undef LOG_LEVEL
178	180	#define LOG_LEVEL LOG_ERROR
179	181
180	182	#define log_error(_params...) \

270	272	CB_FILECLIP_NO_FILE_PATHS;
271	273
272	274	/* from client to server */
273		/* last recieved CLIPRDR_FORMAT_LIST(CLIPRDR_FORMAT_ANNOUNCE) */
	275	/* last received CLIPRDR_FORMAT_LIST(CLIPRDR_FORMAT_ANNOUNCE) */
274	276	static int g_formatIds[16];
275	277	static int g_num_formatIds = 0;
276	278

1083	1085	/* response to CB_FORMAT_LIST; used to indicate whether
1084	1086	processing of the Format List PDU was successful */
1085	1087	static int APP_CC
1086		clipboard_prcoess_format_ack(struct stream *s, int clip_msg_status,
	1088	clipboard_process_format_ack(struct stream *s, int clip_msg_status,
1087	1089	int clip_msg_len)
1088	1090	{
1089		log_debug("clipboard_prcoess_format_ack: CLIPRDR_FORMAT_ACK");
1090		log_debug("clipboard_prcoess_format_ack:");
	1091	log_debug("clipboard_process_format_ack: CLIPRDR_FORMAT_ACK");
	1092	log_debug("clipboard_process_format_ack:");
1091	1093	return 0;
1092	1094	}
1093	1095

1546	1548	{
1547	1549	log_error("aborting clipboard_data_in - clipboard has not "
1548	1550	"been initialized");
1549		/* we return 0 here to indicate no protocol problem occured */
	1551	/* we return 0 here to indicate no protocol problem occurred */
1550	1552	return 0;
1551	1553	}
1552	1554

1631	1633	/* response to CB_FORMAT_LIST; used to indicate whether */
1632	1634	/* processing of the Format List PDU was successful */
1633	1635	case CB_FORMAT_LIST_RESPONSE: /* 3 CLIPRDR_FORMAT_ACK */
1634		rv = clipboard_prcoess_format_ack(ls, clip_msg_status,
	1636	rv = clipboard_process_format_ack(ls, clip_msg_status,
1635	1637	clip_msg_len);
1636	1638	break;
1637	1639	/* sent by recipient of CB_FORMAT_LIST; used to request data for one */

1694	1696	XFixesSelectionNotifyEvent *lxevent;
1695	1697
1696	1698	lxevent = (XFixesSelectionNotifyEvent *)xevent;
1697		log_debug("clipboard_event_selection_owner_notify: %p", lxevent->owner);
	1699	log_debug("clipboard_event_selection_owner_notify: 0x%lx", lxevent->owner);
1698	1700	log_debug("clipboard_event_selection_owner_notify: "
1699		"window %d subtype %d owner %d g_wnd %d",
	1701	"window %ld subtype %d owner %ld g_wnd %ld",
1700	1702	lxevent->window, lxevent->subtype, lxevent->owner, g_wnd);
1701	1703
1702	1704	if (lxevent->owner == g_wnd)
1703	1705	{
1704	1706	log_debug("clipboard_event_selection_owner_notify: matches g_wnd");
1705	1707	log_debug("clipboard_event_selection_owner_notify: skipping, "
1706		"onwer == g_wnd");
	1708	"owner == g_wnd");
1707	1709	g_got_selection = 1;
1708	1710	return 0;
1709	1711	}

1732	1734	Atom ltype;
1733	1735
1734	1736	log_debug("clipboard_get_window_property:");
1735		log_debug(" prop %d name %s", prop, get_atom_text(prop));
	1737	log_debug(" prop %ld name %s", prop, get_atom_text(prop));
1736	1738	lxdata = 0;
1737	1739	ltype = 0;
1738	1740	XGetWindowProperty(g_display, wnd, prop, 0, 0, 0,

1870	1872
1871	1873	if (rv == 0)
1872	1874	{
1873		log_debug("clipboard_event_selection_notify: wnd %p prop %s",
	1875	log_debug("clipboard_event_selection_notify: wnd 0x%lx prop %s",
1874	1876	lxevent->requestor,
1875	1877	get_atom_text(lxevent->property));
1876	1878	rv = clipboard_get_window_property(lxevent->requestor, lxevent->property,

1886	1888	XDeleteProperty(g_display, lxevent->requestor, lxevent->property);
1887	1889	if (type == g_incr_atom)
1888	1890	{
1889		/* nothing more to do here, the data is comming in through
	1891	/* nothing more to do here, the data is coming in through
1890	1892	PropertyNotify */
1891	1893	log_debug("clipboard_event_selection_notify: type is INCR "
1892	1894	"data_size %d property name %s type %s", data_size,

1919	1921	atom = atoms[index];
1920	1922	LOGM((LOG_LEVEL_DEBUG, "clipboard_event_selection_notify: %d %s %d",
1921	1923	atom, get_atom_text(atom), XA_STRING));
1922		log_debug("clipboard_event_selection_notify: 0x%x %s",
	1924	log_debug("clipboard_event_selection_notify: 0x%lx %s",
1923	1925	atom, get_atom_text(atom));
1924	1926	if (atom == g_utf8_atom)
1925	1927	{

1940	1942	}
1941	1943	else
1942	1944	{
1943		log_error("clipboard_event_selection_notify: unknown atom 0x%x", atom);
	1945	log_error("clipboard_event_selection_notify: unknown atom 0x%lx", atom);
1944	1946	}
1945	1947	}
1946	1948	}
1947	1949	else
1948	1950	{
1949	1951	log_error("clipboard_event_selection_notify: error, "
1950		"target is 'TARGETS' and type[%d] or fmt[%d] not right, "
1951		"should be type[%d], fmt[%d]", type, fmt, XA_ATOM, 32);
	1952	"target is 'TARGETS' and type[%ld] or fmt[%d] not right, "
	1953	"should be type[%ld], fmt[%d]", type, fmt, XA_ATOM, 32);
1952	1954	}
1953	1955	}
1954	1956	else if (lxevent->target == g_utf8_atom)

2135	2137	char *xdata;
2136	2138
2137	2139	lxev = (XSelectionRequestEvent *)xevent;
2138		log_debug("clipboard_event_selection_request: %p", lxev->property);
2139		log_debug("clipboard_event_selection_request: g_wnd %d, "
2140		".requestor %d .owner %d .selection %d '%s' .target %d .property %d",
	2140	log_debug("clipboard_event_selection_request: 0x%lx", lxev->property);
	2141	log_debug("clipboard_event_selection_request: g_wnd %ld, "
	2142	".requestor %ld .owner %ld .selection %ld '%s' .target %ld .property %ld",
2141	2143	g_wnd, lxev->requestor, lxev->owner, lxev->selection,
2142	2144	get_atom_text(lxev->selection),
2143	2145	lxev->target, lxev->property);

2323	2325	char *cptr;
2324	2326
2325	2327	log_debug("clipboard_event_property_notify:");
2326		log_debug("clipboard_event_property_notify: PropertyNotify .window %d "
2327		".state %d .atom %d %s", xevent->xproperty.window,
	2328	log_debug("clipboard_event_property_notify: PropertyNotify .window %ld "
	2329	".state %d .atom %ld %s", xevent->xproperty.window,
2328	2330	xevent->xproperty.state, xevent->xproperty.atom,
2329	2331	get_atom_text(xevent->xproperty.atom));
2330	2332

2378	2380	rv = XGetWindowProperty(g_display, g_wnd, g_clip_s2c.property, 0, 0, 0,
2379	2381	AnyPropertyType, &actual_type_return, &actual_format_return,
2380	2382	&nitems_returned, &bytes_left, &data);
	2383
	2384	if (rv != Success)
	2385	{
	2386	return 1;
	2387	}
2381	2388
2382	2389	if (data != 0)
2383	2390	{

2409	2416	}
2410	2417	else
2411	2418	{
2412		log_error("clipboard_event_property_notify: error unknown type %d",
	2419	log_error("clipboard_event_property_notify: error unknown type %ld",
2413	2420	g_clip_s2c.type);
2414	2421	clipboard_send_data_response_failed();
2415	2422	}

2421	2428	rv = XGetWindowProperty(g_display, g_wnd, g_clip_s2c.property, 0, bytes_left, 0,
2422	2429	AnyPropertyType, &actual_type_return, &actual_format_return,
2423	2430	&nitems_returned, &bytes_left, &data);
	2431
	2432	if (rv != Success)
	2433	{
	2434	return 1;
	2435	}
2424	2436
2425	2437	format_in_bytes = FORMAT_TO_BYTES(actual_format_return);
2426	2438	new_data_len = nitems_returned * format_in_bytes;

+5

-3

sesman/chansrv/clipboard_file.c less more

21	21	* CLIPRDR_FILEDESCRIPTOR
22	22	* http://msdn.microsoft.com/en-us/library/ff362447%28prot.20%29.aspx */
23	23
	24	#include <sys/time.h>
24	25	#include <X11/Xlib.h>
25	26	#include <X11/Xatom.h>
26	27	#include <X11/extensions/Xfixes.h>

100	101	#define CB_EPOCH_DIFF 11644473600LL
101	102
102	103	/*****************************************************************************/
	104	#if 0
103	105	static tui64 APP_CC
104	106	timeval2wintime(struct timeval *tv)
105	107	{

111	113	result += tv->tv_usec * 10;
112	114	return result;
113	115	}
	116	#endif
114	117
115	118	/*****************************************************************************/
116	119	/* this will replace %20 or any hex with the space or correct char

527	530	int lindex;
528	531	int dwFlags;
529	532	int nPositionLow;
530		int nPositionHigh;
531	533	int cbRequested;
532	534	//int clipDataId;
533	535

537	539	in_uint32_le(s, lindex);
538	540	in_uint32_le(s, dwFlags);
539	541	in_uint32_le(s, nPositionLow);
540		in_uint32_le(s, nPositionHigh);
	542	in_uint8s(s, 4); /* nPositionHigh */
541	543	in_uint32_le(s, cbRequested);
542	544	//in_uint32_le(s, clipDataId); /* options, used when locking */
543	545	if (dwFlags & CB_FILECONTENTS_SIZE)

552	554	}
553	555
554	556	/*****************************************************************************/
555		/* server requested info about the file and this is the responce
	557	/* server requested info about the file and this is the response
556	558	it's either the file size or file data */
557	559	int APP_CC
558	560	clipboard_process_file_response(struct stream *s, int clip_msg_status,

+10

-21

sesman/chansrv/devredir.c less more

241	241	case PAKID_CORE_CLIENT_NAME:
242	242	/* client is telling us its computer name; do we even care? */
243	243
244		/* let client know loggin was successful */
	244	/* let client know login was successful */
245	245	dev_redir_send_server_user_logged_on();
246	246	usleep(1000 * 100);
247	247
248		/* let client know our capabilites */
	248	/* let client know our capabilities */
249	249	dev_redir_send_server_core_cap_req();
250	250
251	251	/* send confirm clientID */

575	575	******************************************************************************/
576	576
577	577	/**
578		* @brief process client's repsonse to our core_capability_req() msg
	578	* @brief process client's response to our core_capability_req() msg
579	579	*
580	580	* @param s stream containing client's response
581	581	*****************************************************************************/

889	889	XRDP_INODE *xinode;
890	890
891	891	tui32 Length;
892		tui32 NextEntryOffset;
893	892	tui64 CreationTime;
894	893	tui64 LastAccessTime;
895	894	tui64 LastWriteTime;
896		tui64 ChangeTime;
897	895	tui64 EndOfFile;
898	896	tui32 FileAttributes;
899	897	tui32 FileNameLength;
900	898	tui32 status;
901
902		#ifdef USE_SHORT_NAMES_IN_DIR_LISTING
903		tui32 EaSize;
904		tui8 ShortNameLength;
905		tui8 Reserved;
906		#endif
907	899
908	900	char filename[256];
909	901	int i = 0;

934	926	{
935	927	log_debug("processing FILE_DIRECTORY_INFORMATION structs");
936	928
937		xstream_rd_u32_le(s_in, NextEntryOffset);
	929	xstream_seek(s_in, 4); /* NextEntryOffset */
938	930	xstream_seek(s_in, 4); /* FileIndex */
939	931	xstream_rd_u64_le(s_in, CreationTime);
940	932	xstream_rd_u64_le(s_in, LastAccessTime);
941	933	xstream_rd_u64_le(s_in, LastWriteTime);
942		xstream_rd_u64_le(s_in, ChangeTime);
	934	xstream_seek(s_in, 8); /* ChangeTime */
943	935	xstream_rd_u64_le(s_in, EndOfFile);
944	936	xstream_seek(s_in, 8); /* AllocationSize */
945	937	xstream_rd_u32_le(s_in, FileAttributes);
946	938	xstream_rd_u32_le(s_in, FileNameLength);
947	939
948	940	#ifdef USE_SHORT_NAMES_IN_DIR_LISTING
949		xstream_rd_u32_le(s_in, EaSize);
950		xstream_rd_u8(s_in, ShortNameLength);
951		xstream_rd_u8(s_in, Reserved);
	941	xstream_seek(s_in, 4); /* EaSize */
	942	xstream_seek(s_in, 1); /* ShortNameLength */
	943	xstream_seek(s_in, 1); /* Reserved */
952	944	xstream_seek(s_in, 23); /* ShortName in Unicode */
953	945	#endif
954	946	devredir_cvt_from_unicode_len(filename, s_in->p, FileNameLength);

958	950	#else
959	951	i += 64 + FileNameLength;
960	952	#endif
961		//log_debug("NextEntryOffset: 0x%x", NextEntryOffset);
962	953	//log_debug("CreationTime: 0x%llx", CreationTime);
963	954	//log_debug("LastAccessTime: 0x%llx", LastAccessTime);
964	955	//log_debug("LastWriteTime: 0x%llx", LastWriteTime);
965		//log_debug("ChangeTime: 0x%llx", ChangeTime);
966	956	//log_debug("EndOfFile: %lld", EndOfFile);
967	957	//log_debug("FileAttributes: 0x%x", FileAttributes);
968	958	#ifdef USE_SHORT_NAMES_IN_DIR_LISTING

1039	1029
1040	1030	log_debug("looking for device_id=%d path=%s", device_id, path);
1041	1031
1042		/* when we get a respone to dev_redir_send_drive_create_request(), we */
	1032	/* when we get a response to dev_redir_send_drive_create_request(), we */
1043	1033	/* call dev_redir_send_drive_dir_request(), which needs the following */
1044	1034	/* at the end of the path argument */
1045	1035	if (dev_redir_string_ends_with(irp->pathname, '\\'))

1483	1473	char *dest;
1484	1474	char *dest_saved;
1485	1475	char *src;
1486		int rv;
1487	1476	int i;
1488	1477	int bytes_to_alloc;
1489	1478	int max_bytes;

1508	1497	max_bytes = wcstombs(NULL, (wchar_t *) dest_saved, 0);
1509	1498	if (max_bytes > 0)
1510	1499	{
1511		rv = wcstombs(path, (wchar_t *) dest_saved, max_bytes);
	1500	wcstombs(path, (wchar_t *) dest_saved, max_bytes);
1512	1501	path[max_bytes] = 0;
1513	1502	}
1514	1503

+1

-1

sesman/chansrv/devredir.h less more

328	328	(((_a) & W_FILE_ATTRIBUTE_DIRECTORY) ? S_IFDIR \| 0100 : S_IFREG) \|\
329	329	(((_a) & W_FILE_ATTRIBUTE_READONLY) ? 0444 : 0644)
330	330
331		/* winodws time starts on Jan 1, 1601 */
	331	/* Windows time starts on Jan 1, 1601 */
332	332	/* Linux time starts on Jan 1, 1970 */
333	333	#define EPOCH_DIFF 11644473600LL
334	334	#define WINDOWS_TO_LINUX_TIME(_t) ((_t) / 10000000) - EPOCH_DIFF;

+5

-5

sesman/chansrv/drdynvc.c less more

341	341
342	342	uint32_t chan_id;
343	343	int bytes_in_stream;
344		int data_len;
345	344	int Len;
346	345
347	346	drdynvc_get_chan_id(s, cmd, &chan_id);
348	347
349	348	Len = (cmd >> 2) & 0x03;
350	349
	350	/* skip data_len */
351	351	if (Len == 0)
352	352	{
353		in_uint8(s, data_len);
	353	in_uint8s(s, 1);
354	354	}
355	355	else if (Len == 1)
356	356	{
357		in_uint16_le(s, data_len);
	357	in_uint8s(s, 2);
358	358	}
359	359	else
360	360	{
361		in_uint32_le(s, data_len);
	361	in_uint8s(s, 4);
362	362	}
363	363
364	364	bytes_in_stream = stream_length_after_p(s);

413	413	* process incoming data on a dynamic virtual channel
414	414	*
415	415	* @pram s stream containing the incoming data
416		* @pram chand_id LK_TODO
	416	* @pram chan_id LK_TODO
417	417	* @pram chan_flags LK_TODO
418	418	* @pram length LK_TODO
419	419	* @pram total_length LK_TODO

+1

-0

sesman/chansrv/pcsc/.gitignore less more

0

!Makefile

+3

-3

sesman/chansrv/pcsc/wrapper/winscard.c less more

97	97
98	98	/*****************************************************************************/
99	99	static int __fastcall
100		load_funsc(void)
	100	load_funcs(void)
101	101	{
102	102	HMODULE lib;
103	103

107	107	}
108	108	g_funcs_loaded = 1;
109	109	lib = LoadLibrary("winscard-org.dll");
110		LLOGLN(0, ("load_funsc: lib %p", lib));
	110	LLOGLN(0, ("load_funcs: lib %p", lib));
111	111	LLOAD(aSCardEstablishContext, tSCardEstablishContext, "SCardEstablishContext");
112	112	LLOAD(aSCardReleaseContext, tSCardReleaseContext, "SCardReleaseContext");
113	113	LLOAD(aSCardIsValidContext, tSCardIsValidContext, "SCardIsValidContext");

179	179	{
180	180	case DLL_PROCESS_ATTACH:
181	181	LLOGLN(0, ("DllEntryPoint: DLL_PROCESS_ATTACH"));
182		load_funsc();
	182	load_funcs();
183	183	rv = TRUE;
184	184	break;
185	185	case DLL_THREAD_ATTACH:

+1

-0

sesman/chansrv/pulse/.gitignore less more

0

!Makefile

+2

-2

sesman/chansrv/pulse/module-xrdp-sink-symdef.h less more

0		#ifndef foomodulexrdpsinksymdeffoo
1		#define foomodulexrdpsinksymdeffoo
	0	#ifndef MODULE_XRDP_SINK_SYMDEF_H
	1	#define MODULE_XRDP_SINK_SYMDEF_H
2	2
3	3	#include <pulsecore/core.h>
4	4	#include <pulsecore/module.h>

+6

-2

sesman/chansrv/pulse/module-xrdp-sink.c less more

76	76	"sink_name=<name for the sink> "
77	77	"sink_properties=<properties for the sink> "
78	78	"format=<sample format> "
79		"rate=<sample rate>"
	79	"rate=<sample rate> "
80	80	"channels=<number of channels> "
81	81	"channel_map=<channel map>");
82	82

308	308	s.sun_family = AF_UNIX;
309	309	bytes = sizeof(s.sun_path) - 1;
310	310	snprintf(s.sun_path, bytes, CHANSRV_PORT_STR, u->display_num);
311		pa_log_debug("trying to conenct to %s", s.sun_path);
	311	pa_log_debug("trying to connect to %s", s.sun_path);
312	312	if (connect(fd, (struct sockaddr *)&s,
313	313	sizeof(struct sockaddr_un)) != 0) {
314	314	u->failed_connect_time = pa_rtclock_now();

439	439	pa_rtpoll_set_timer_disabled(u->rtpoll);
440	440	}
441	441
	442	#if defined(PA_CHECK_VERSION) && PA_CHECK_VERSION(6, 0, 0)
	443	if ((ret = pa_rtpoll_run(u->rtpoll)) < 0) {
	444	#else
442	445	if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) {
	446	#endif
443	447	goto fail;
444	448	}
445	449

+2

-2

sesman/chansrv/pulse/module-xrdp-source-symdef.h less more

0		#ifndef foomodulenullsourcesymdeffoo
1		#define foomodulenullsourcesymdeffoo
	0	#ifndef MODULE_XRDP_SOURCE_SYMDEF_H
	1	#define MODULE_XRDP_SOURCE_SYMDEF_H
2	2
3	3	#include <pulsecore/core.h>
4	4	#include <pulsecore/module.h>

+7

-2

sesman/chansrv/pulse/module-xrdp-source.c less more

312	312	} else {
313	313	if (u->want_src_data)
314	314	{
315		/* we dont want source data anymore */
	315	/* we don't want source data anymore */
316	316	char buf[12];
317	317
318	318	buf[0] = 0;

338	338	}
339	339
340	340	/* Hmm, nothing to do. Let's sleep */
341		if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
	341	#if defined(PA_CHECK_VERSION) && PA_CHECK_VERSION(6, 0, 0)
	342	if ((ret = pa_rtpoll_run(u->rtpoll)) < 0) {
	343	#else
	344	if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) {
	345	#endif
342	346	goto fail;
	347	}
343	348
344	349	if (ret == 0)
345	350	goto finish;

+25

-25

sesman/chansrv/rail.c less more

382	382
383	383	if (g_xrr_event_base > 0)
384	384	{
385		LOG(0, ("rail_init: found RandR entension"));
	385	LOG(0, ("rail_init: found RandR extension"));
386	386	st = XRRQueryVersion(g_display, &ver_maj, &ver_min);
387	387	if (st)
388	388	{

507	507	window_attributes.map_state == IsViewable &&
508	508	list_index_of(g_window_list, children[i]) >= 0)
509	509	{
510		LOG(10, (" dismiss pop up 0x%8.8x", children[i]));
	510	LOG(10, (" dismiss pop up 0x%8.8lx", children[i]));
511	511	rail_send_key_esc(children[i]);
512	512	rv = 1;
513	513	}

542	542
543	543	/*****************************************************************************/
544	544	void DEFAULT_CC
545		my_timoeut(void* data)
546		{
547		LOG(10, ("my_timoeut: g_got_focus %d", g_got_focus));
	545	my_timeout(void* data)
	546	{
	547	LOG(10, ("my_timeout: g_got_focus %d", g_got_focus));
548	548	if (g_focus_counter == (int)(long)data)
549	549	{
550		LOG(10, ("my_timoeut: g_focus_counter %d", g_focus_counter));
	550	LOG(10, ("my_timeout: g_focus_counter %d", g_focus_counter));
551	551	rail_win_popdown();
552	552	}
553	553	}

616	616
617	617	LOG(10, (" window attributes: override_redirect %d",
618	618	window_attributes.override_redirect));
619		add_timeout(200, my_timoeut, (void*)(long)g_focus_counter);
	619	add_timeout(200, my_timeout, (void*)(long)g_focus_counter);
620	620	}
621	621	return 0;
622	622	}

755	755	int old_state;
756	756	unsigned long data[2] = { state, None };
757	757
758		LOG(10, (" rail_win_set_state: %d", state));
	758	LOG(10, (" rail_win_set_state: %ld", state));
759	759	/* check whether WM_STATE exists */
760	760	old_state = rail_win_get_state(win);
761	761	if (old_state == -1)

1258	1258	}
1259	1259	if (data && len > 0)
1260	1260	{
1261		LOG(10, ("chansrv::rail_win_send_text: 0x%8.8x text %s length %d",
	1261	LOG(10, ("chansrv::rail_win_send_text: 0x%8.8lx text %s length %d",
1262	1262	win, data, len));
1263	1263	make_stream(s);
1264	1264	init_stream(s, len + 1024);

1288	1288	{
1289	1289	struct stream *s;
1290	1290
1291		LOG(10, ("chansrv::rail_destroy_window 0x%8.8x", window_id));
	1291	LOG(10, ("chansrv::rail_destroy_window 0x%8.8lx", window_id));
1292	1292	make_stream(s);
1293	1293	init_stream(s, 1024);
1294	1294

1308	1308	int flags;
1309	1309	struct stream* s;
1310	1310
1311		LOG(10, ("chansrv::rail_show_window 0x%8.8x 0x%x", window_id, show_state));
	1311	LOG(10, ("chansrv::rail_show_window 0x%8.8lx 0x%x", window_id, show_state));
1312	1312	make_stream(s);
1313	1313	init_stream(s, 1024);
1314	1314

1350	1350	struct rail_window_data* rwd;
1351	1351	struct stream* s;
1352	1352
1353		LOG(10, ("chansrv::rail_create_window 0x%8.8x", window_id));
	1353	LOG(10, ("chansrv::rail_create_window 0x%8.8lx", window_id));
1354	1354
1355	1355	rwd = rail_get_window_data_safe(window_id);
1356	1356	if (rwd == 0)

1506	1506	if (mask & CWStackMode)
1507	1507	{
1508	1508	LOG(10, ("chansrv::rail_configure_request_window: CWStackMode "
1509		"detail 0x%8.8x above 0x%8.8x", config->detail, config->above));
	1509	"detail 0x%8.8x above 0x%8.8lx", config->detail, config->above));
1510	1510	if (config->detail == Above)
1511	1511	{
1512	1512	LOG(10, ("chansrv::rail_configure_request_window: bring to front "

1774	1774
1775	1775	/*****************************************************************************/
1776	1776	static int
1777		rail_desktop_resize(lxevent)
	1777	rail_desktop_resize(XEvent *lxevent)
1778	1778	{
1779	1779	LOG(0, ("rail_desktop_resize:"));
1780	1780	return 0;

1807	1807	{
1808	1808	case PropertyNotify:
1809	1809	prop_name = XGetAtomName(g_display, lxevent->xproperty.atom);
1810		LOG(10, (" got PropertyNotify window_id 0x%8.8x %s state new %d",
	1810	LOG(10, (" got PropertyNotify window_id 0x%8.8lx %s state new %d",
1811	1811	lxevent->xproperty.window, prop_name,
1812	1812	lxevent->xproperty.state == PropertyNewValue));
1813	1813

1830	1830	break;
1831	1831
1832	1832	case ConfigureRequest:
1833		LOG(10, (" got ConfigureRequest window_id 0x%8.8x", lxevent->xconfigurerequest.window));
	1833	LOG(10, (" got ConfigureRequest window_id 0x%8.8lx", lxevent->xconfigurerequest.window));
1834	1834	g_memset(&xwc, 0, sizeof(xwc));
1835	1835	xwc.x = lxevent->xconfigurerequest.x;
1836	1836	xwc.y = lxevent->xconfigurerequest.y;

1848	1848	break;
1849	1849
1850	1850	case CreateNotify:
1851		LOG(10, (" got CreateNotify window 0x%8.8x parent 0x%8.8x",
	1851	LOG(10, (" got CreateNotify window 0x%8.8lx parent 0x%8.8lx",
1852	1852	lxevent->xcreatewindow.window, lxevent->xcreatewindow.parent));
1853	1853	rail_select_input(lxevent->xcreatewindow.window);
1854	1854	break;
1855	1855
1856	1856	case DestroyNotify:
1857		LOG(10, (" got DestroyNotify window 0x%8.8x event 0x%8.8x",
	1857	LOG(10, (" got DestroyNotify window 0x%8.8lx event 0x%8.8lx",
1858	1858	lxevent->xdestroywindow.window, lxevent->xdestroywindow.event));
1859	1859	if (lxevent->xdestroywindow.window != lxevent->xdestroywindow.event)
1860	1860	{

1870	1870	break;
1871	1871
1872	1872	case MapRequest:
1873		LOG(10, (" got MapRequest window 0x%8.8x", lxevent->xmaprequest.window));
	1873	LOG(10, (" got MapRequest window 0x%8.8lx", lxevent->xmaprequest.window));
1874	1874	XMapWindow(g_display, lxevent->xmaprequest.window);
1875	1875	break;
1876	1876
1877	1877	case MapNotify:
1878		LOG(10, (" got MapNotify window 0x%8.8x event 0x%8.8x",
	1878	LOG(10, (" got MapNotify window 0x%8.8lx event 0x%8.8lx",
1879	1879	lxevent->xmap.window, lxevent->xmap.event));
1880	1880	if (lxevent->xmap.window != lxevent->xmap.event)
1881	1881	{

1901	1901	break;
1902	1902
1903	1903	case UnmapNotify:
1904		LOG(10, (" got UnmapNotify 0x%8.8x", lxevent->xunmap.event));
	1904	LOG(10, (" got UnmapNotify 0x%8.8lx", lxevent->xunmap.event));
1905	1905	if (lxevent->xunmap.window != lxevent->xunmap.event)
1906	1906	{
1907	1907	break;

1909	1909	if (is_window_valid_child_of_root(lxevent->xunmap.window))
1910	1910	{
1911	1911	index = list_index_of(g_window_list, lxevent->xunmap.window);
1912		LOG(10, (" window 0x%8.8x is unmapped", lxevent->xunmap.window));
	1912	LOG(10, (" window 0x%8.8lx is unmapped", lxevent->xunmap.window));
1913	1913	if (index >= 0)
1914	1914	{
1915	1915	XGetWindowAttributes(g_display, lxevent->xunmap.window, &wnd_attributes);

1928	1928	break;
1929	1929
1930	1930	case ConfigureNotify:
1931		LOG(10, (" got ConfigureNotify 0x%8.8x event 0x%8.8x", lxevent->xconfigure.window,
	1931	LOG(10, (" got ConfigureNotify 0x%8.8lx event 0x%8.8lx", lxevent->xconfigure.window,
1932	1932	lxevent->xconfigure.event));
1933	1933	rv = 0;
1934	1934	if (lxevent->xconfigure.event != lxevent->xconfigure.window \|\|

1974	1974	break;
1975	1975
1976	1976	case ReparentNotify:
1977		LOG(10, (" got ReparentNotify window 0x%8.8x parent 0x%8.8x "
1978		"event 0x%8.8x x %d y %d overrider redirect %d",
	1977	LOG(10, (" got ReparentNotify window 0x%8.8lx parent 0x%8.8lx "
	1978	"event 0x%8.8lx x %d y %d override redirect %d",
1979	1979	lxevent->xreparent.window, lxevent->xreparent.parent,
1980	1980	lxevent->xreparent.event, lxevent->xreparent.x,
1981	1981	lxevent->xreparent.y, lxevent->xreparent.override_redirect));

+3

-3

sesman/chansrv/smartcard.c less more

1853	1853	}
1854	1854
1855	1855	log_debug("send_bytes %d recv_bytes %d send dwProtocol %d cbPciLength %d "
1856		"extra_bytes %d recv dwProtocol %d cbPciLength %d", send_bytes,
1857		recv_bytes, send_ior->dwProtocol, send_ior->cbPciLength,
	1856	"extra_bytes %d recv dwProtocol %d cbPciLength %d extra_bytes %d",
	1857	send_bytes, recv_bytes, send_ior->dwProtocol, send_ior->cbPciLength,
1858	1858	send_ior->extra_bytes, recv_ior->dwProtocol, recv_ior->cbPciLength,
1859	1859	recv_ior->extra_bytes);
1860	1860

1872	1872	* u32 4 bytes dwProtocol
1873	1873	* u32 4 bytes cbPciLength
1874	1874	* u32 4 bytes map2
1875		* u32 4 byts cbSendLength
	1875	* u32 4 bytes cbSendLength
1876	1876	* u32 4 bytes map3
1877	1877	* u32 4 bytes map4
1878	1878	* u32 4 bytes map5

+1

-1

sesman/chansrv/smartcard_pcsc.c less more

258	258	}
259	259	list_delete(context->cards);
260	260	}
261		LLOGLN(10, (" left over context 0x%8.8x", context->context));
	261	LLOGLN(10, (" left over context %p", context->context));
262	262	scard_send_cancel(0, context->context, context->context_bytes);
263	263	scard_send_release_context(0, context->context,
264	264	context->context_bytes);

+3

-1

sesman/chansrv/sound.c less more

102	102	g_pcm_44100_data /* data */
103	103	};
104	104
	105	#if defined(XRDP_OPUS)
105	106	static char g_opus_44100_data[] = { 0 };
106	107	static struct xr_wave_format_ex g_opus_44100 =
107	108	{

114	115	0, /* data size */
115	116	g_opus_44100_data /* data */
116	117	};
	118	#endif
117	119
118	120
119	121	#if defined(XRDP_OPUS)

1000	1002
1001	1003	/******************************************************************************
1002	1004
1003		Microphone releated code
	1005	Microphone related code
1004	1006
1005	1007	******************************************************************************/
1006	1008

+4

-2

sesman/chansrv/xcommon.c less more

62	62	/* The X server had an internal error. This is the last function called.
63	63	Do any cleanup that needs to be done on exit, like removing temporary files.
64	64	Don't worry about memory leaks */
	65	#if 0
65	66	static int DEFAULT_CC
66	67	xcommon_fatal_handler(Display *dis)
67	68	{
68	69	return 0;
69	70	}
	71	#endif
70	72
71	73	/*****************************************************************************/
72		/* returns time in miliseconds
73		this is like g_time2 in os_calls, but not miliseconds since machine was
	74	/* returns time in milliseconds
	75	this is like g_time2 in os_calls, but not milliseconds since machine was
74	76	up, something else
75	77	this is a time value similar to what the xserver uses */
76	78	int APP_CC

+6

-8

sesman/config.h less more

115	115	int ts_users;
116	116	/**
117	117	* @var ts_admins
118		* @brief Terminal Server Adminnistrators group
	118	* @brief Terminal Server Administrators group
119	119	*/
120	120	int ts_admins_enable;
121	121	int ts_admins;

219	219	*/
220	220	struct list* rdp_params;
221	221	/**
	222	* @var xorg_params
	223	* @brief Xorg additional parameter list
	224	*/
	225	struct list* xorg_params;
	226	/**
222	227	* @var log
223	228	* @brief Log configuration struct
224	229	*/
225
226		struct list* xorg_params;
227		/**
228		* @var log
229		* @brief Log configuration struct
230		*/
231
232	230	//struct log_config log;
233	231	/**
234	232	* @var sec

+24

-6

sesman/env.c less more

33	33
34	34	/******************************************************************************/
35	35	int DEFAULT_CC
36		env_check_password_file(char filename, char password)
	36	env_check_password_file(char filename, char passwd)
37	37	{
38	38	char encryptedPasswd[16];
39	39	char key[24];
	40	char passwd_hash[20];
	41	char passwd_hash_text[40];
40	42	int fd;
41		void* des;
	43	int passwd_bytes;
	44	void *des;
	45	void *sha1;
42	46
	47	/* create password hash from password */
	48	passwd_bytes = g_strlen(passwd);
	49	sha1 = ssl_sha1_info_create();
	50	ssl_sha1_transform(sha1, "xrdp_vnc", 8);
	51	ssl_sha1_transform(sha1, passwd, passwd_bytes);
	52	ssl_sha1_transform(sha1, passwd, passwd_bytes);
	53	ssl_sha1_complete(sha1, passwd_hash);
	54	ssl_sha1_info_delete(sha1);
	55	g_snprintf(passwd_hash_text, 39, "%2.2x%2.2x%2.2x%2.2x",
	56	(tui8)passwd_hash[0], (tui8)passwd_hash[1],
	57	(tui8)passwd_hash[2], (tui8)passwd_hash[3]);
	58	passwd_hash_text[39] = 0;
	59	passwd = passwd_hash_text;
	60
	61	/* create file from password */
43	62	g_memset(encryptedPasswd, 0, sizeof(encryptedPasswd));
44		g_strncpy(encryptedPasswd, password, 8);
	63	g_strncpy(encryptedPasswd, passwd, 8);
45	64	g_memset(key, 0, sizeof(key));
46	65	g_mirror_memcpy(key, g_fixedkey, 8);
47	66	des = ssl_des3_encrypt_info_create(key, 0);
48	67	ssl_des3_encrypt(des, 8, encryptedPasswd, encryptedPasswd);
49	68	ssl_des3_info_delete(des);
50		fd = g_file_open(filename);
	69	fd = g_file_open_ex(filename, 0, 1, 1, 1);
51	70	if (fd == -1)
52	71	{
53	72	log_message(LOG_LEVEL_WARNING,
54		"can't read vnc password file - %s",
	73	"can't write vnc password hash file - %s",
55	74	filename);
56	75	return 1;
57	76	}

110	129	g_set_current_dir(pw_dir);
111	130	g_sprintf(text, ":%d.0", display);
112	131	g_setenv("DISPLAY", text, 1);
113		g_setenv("LANG", "en_US.UTF-8", 1);
114	132	g_setenv("XRDP_SESSION", "1", 1);
115	133	if ((env_names != 0) && (env_values != 0) &&
116	134	(env_names->count == env_values->count))

+1

-1

sesman/env.h less more

32	32	*
33	33	* @brief Creates vnc password file
34	34	* @param filename VNC password file name
35		* @param password The password to be encrypte
	35	* @param password The password to be encrypted
36	36	* @return 0 on success, 1 on error
37	37	*
38	38	*/

+21

-10

sesman/libscp/Makefile.am less more

0		EXTRA_DIST = libscp_connection.h libscp_commands.h libscp.h libscp_session.h libscp_types_mng.h libscp_v1c_mng.h libscp_vX.h libscp_commands_mng.h libscp_init.h libscp_tcp.h libscp_v0.h libscp_v1s.h libscp_lock.h \
1		libscp_types.h libscp_v1c.h libscp_v1s_mng.h
2
3		AM_CFLAGS = \
	0	AM_CPPFLAGS = \
4	1	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
5	2	-DXRDP_SBIN_PATH=\"${sbindir}\" \
6	3	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
7		-DXRDP_PID_PATH=\"${localstatedir}/run\"
8
9		INCLUDES = \
	4	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
10	5	-I$(top_srcdir)/common
11	6
12		lib_LTLIBRARIES = \
	7	module_LTLIBRARIES = \
13	8	libscp.la
14	9
15	10	libscp_la_SOURCES = \
	11	libscp.h \
	12	libscp_commands.h \
	13	libscp_commands_mng.h \
16	14	libscp_connection.c \
	15	libscp_connection.h \
17	16	libscp_init.c \
	17	libscp_init.h \
18	18	libscp_lock.c \
	19	libscp_lock.h \
19	20	libscp_session.c \
	21	libscp_session.h \
20	22	libscp_tcp.c \
	23	libscp_tcp.h \
	24	libscp_types.h \
	25	libscp_types_mng.h \
21	26	libscp_v0.c \
	27	libscp_v0.h \
22	28	libscp_v1c.c \
	29	libscp_v1c.h \
	30	libscp_v1c_mng.c \
	31	libscp_v1c_mng.h \
23	32	libscp_v1s.c \
24		libscp_v1c_mng.c \
	33	libscp_v1s.h \
25	34	libscp_v1s_mng.c \
26		libscp_vX.c
	35	libscp_v1s_mng.h \
	36	libscp_vX.c \
	37	libscp_vX.h
27	38
28	39	libscp_la_LIBADD = \
29	40	$(top_builddir)/common/libcommon.la \

+1

-1

sesman/libscp/libscp_init.h less more

35	35	* @brief version neutral server accept function
36	36	* @param c connection descriptor
37	37	* @param s session descriptor pointer address.
38		* it will return a newely allocated descriptor.
	38	* it will return a newly allocated descriptor.
39	39	* It this memory needs to be g_free()d
40	40	*
41	41	*/

+15

-15

sesman/libscp/libscp_lock.c less more

19	19	*/
20	20
21	21	#include "libscp_lock.h"
	22	#include "thread_calls.h"
22	23
23		#include <semaphore.h>
24	24	#include <pthread.h>
25	25
26	26	pthread_mutex_t lock_fork; /* this lock protects the counters */
27	27	pthread_mutexattr_t lock_fork_attr; /* mutex attributes */
28		sem_t lock_fork_req; /* semaphore on which the process that are going to fork suspend on */
29		sem_t lock_fork_wait; /* semaphore on which the suspended process wait on */
	28	tbus lock_fork_req; /* semaphore on which the process that are going to fork suspend on */
	29	tbus lock_fork_wait; /* semaphore on which the suspended process wait on */
30	30	int lock_fork_forkers_count; /* threads that want to fork */
31		int lock_fork_blockers_count; /* threads thar are blocking fork */
	31	int lock_fork_blockers_count; /* threads that are blocking fork */
32	32	int lock_fork_waiting_count; /* threads suspended until the fork finishes */
33	33
34	34	void DEFAULT_CC

37	37	/* initializing fork lock */
38	38	pthread_mutexattr_init(&lock_fork_attr);
39	39	pthread_mutex_init(&lock_fork, &lock_fork_attr);
40		sem_init(&lock_fork_req, 0, 0);
41		sem_init(&lock_fork_wait, 0, 0);
	40	lock_fork_req = tc_sem_create(0);
	41	lock_fork_wait = tc_sem_create(0);
42	42
43	43	/* here we don't use locking because lock_init() should be called BEFORE */
44	44	/* any thread is created */

56	56
57	57	if (lock_fork_blockers_count == 0)
58	58	{
59		/* if noone is blocking fork(), then we're allowed to fork */
60		sem_post(&lock_fork_req);
	59	/* if no one is blocking fork(), then we're allowed to fork */
	60	tc_sem_inc(lock_fork_req);
61	61	}
62	62
63	63	lock_fork_forkers_count++;
64	64	pthread_mutex_unlock(&lock_fork);
65	65
66	66	/* we wait to be allowed to fork() */
67		sem_wait(&lock_fork_req);
	67	tc_sem_dec(lock_fork_req);
68	68	}
69	69
70	70	/******************************************************************************/

77	77	/* if there's someone else that want to fork, we let him fork() */
78	78	if (lock_fork_forkers_count > 0)
79	79	{
80		sem_post(&lock_fork_req);
	80	tc_sem_inc(lock_fork_req);
81	81	}
82	82
83	83	for (; lock_fork_waiting_count > 0; lock_fork_waiting_count--)
84	84	{
85	85	/* waking up the other processes */
86		sem_post(&lock_fork_wait);
	86	tc_sem_inc(lock_fork_wait);
87	87	}
88	88
89	89	pthread_mutex_unlock(&lock_fork);

93	93	void DEFAULT_CC
94	94	scp_lock_fork_critical_section_end(int blocking)
95	95	{
96		//LOG_DBG("lock_fork_critical_secection_end()",0);
	96	//LOG_DBG("lock_fork_critical_section_end()",0);
97	97	/* lock mutex */
98	98	pthread_mutex_lock(&lock_fork);
99	99

106	106	/* then we let him go */
107	107	if ((lock_fork_blockers_count == 0) && (lock_fork_forkers_count > 0))
108	108	{
109		sem_post(&lock_fork_req);
	109	tc_sem_inc(lock_fork_req);
110	110	}
111	111
112	112	pthread_mutex_unlock(&lock_fork);

116	116	int DEFAULT_CC
117	117	scp_lock_fork_critical_section_start(void)
118	118	{
119		//LOG_DBG("lock_fork_critical_secection_start()",0);
	119	//LOG_DBG("lock_fork_critical_section_start()",0);
120	120	do
121	121	{
122	122	pthread_mutex_lock(&lock_fork);

128	128	pthread_mutex_unlock(&lock_fork);
129	129
130	130	/* we wait until the fork finishes */
131		sem_wait(&lock_fork_wait);
	131	tc_sem_dec(lock_fork_wait);
132	132
133	133	}
134	134	else

+2

-2

sesman/libscp/libscp_lock.h less more

51	51	*
52	52	* @brief starts a section that is critical for forking
53	53	*
54		* starts a section that is critical for forking, that is noone can fork()
55		* while i'm in a critical section. But if someone wanted to fork we have
	54	* starts a section that is critical for forking, that is no one can fork()
	55	* while I'm in a critical section. But if someone wanted to fork we have
56	56	* to wait until he finishes with lock_fork_release()
57	57	*
58	58	* @return

+2

-1

sesman/libscp/libscp_session.c less more

136	136	case 15:
137	137	case 16:
138	138	case 24:
	139	case 32:
139	140	s->bpp = bpp;
	141	break;
140	142	default:
141	143	return 1;
142	144	}
143
144	145	return 0;
145	146	}
146	147

+1

-1

sesman/libscp/libscp_tcp.c less more

18	18	/**
19	19	*
20	20	* @file tcp.c
21		* @brief Tcp stream funcions
	21	* @brief Tcp stream functions
22	22	* @author Jay Sorg, Simone Fedele
23	23	*
24	24	*/

+8

-1

sesman/libscp/libscp_v0.c less more

251	251	scp_session_set_height(session, sz);
252	252	/* bpp */
253	253	in_uint16_be(c->in_s, sz);
254		scp_session_set_bpp(session, (tui8)sz);
	254	if (0 != scp_session_set_bpp(session, (tui8)sz))
	255	{
	256	scp_session_destroy(session);
	257	log_message(LOG_LEVEL_WARNING,
	258	"[v0:%d] connection aborted: unsupported bpp: %d",
	259	__LINE__, (tui8)sz);
	260	return SCP_SERVER_STATE_INTERNAL_ERR;
	261	}
255	262
256	263	if (s_check_rem(c->in_s, 2))
257	264	{

+14

-4

sesman/libscp/libscp_v1s.c less more

130	130	in_uint16_be(c->in_s, cmd);
131	131	scp_session_set_height(session, cmd);
132	132	in_uint8(c->in_s, sz);
133		scp_session_set_bpp(session, sz);
	133	if (0 != scp_session_set_bpp(session, sz))
	134	{
	135	scp_session_destroy(session);
	136	log_message(LOG_LEVEL_WARNING,
	137	"[v1s:%d] connection aborted: unsupported bpp: %d",
	138	__LINE__, sz);
	139	return SCP_SERVER_STATE_INTERNAL_ERR;
	140	}
134	141	in_uint8(c->in_s, sz);
135	142	scp_session_set_rsr(session, sz);
136	143	in_uint8a(c->in_s, buf, 17);

434	441	}
435	442
436	443	/* then we wait for client ack */
437		#warning maybe this message could say if the session should be resized on
438		#warning server side or client side
	444
	445	/*
	446	* Maybe this message could say if the session should be resized on
	447	* server side or client side.
	448	*/
439	449	init_stream(c->in_s, c->in_s->size);
440	450
441	451	if (0 != scp_tcp_force_recv(c->in_sck, c->in_s->data, 8))

636	646	/* if we got here, the requested sid wasn't one from the list we sent */
637	647	/* we should kill the connection */
638	648	log_message(LOG_LEVEL_WARNING, "[v1s:%d] connection aborted: internal error (no such session in list)", __LINE__);
639		return SCP_CLIENT_STATE_INTERNAL_ERR;
	649	return SCP_SERVER_STATE_INTERNAL_ERR;
640	650	}
641	651	else if (cmd == 44)
642	652	{

+2

-2

sesman/libscp/libscp_v1s.h less more

37	37	* @param skipVchk if set to !0 skips the version control (to be used after
38	38	* scp_vXs_accept() )
39	39	*
40		* this function places in *s the address of a newely allocated SCP_SESSION structure
	40	* this function places in *s the address of a newly allocated SCP_SESSION structure
41	41	* that should be free()d
42	42	*/
43	43	enum SCP_SERVER_STATES_E

47	47	*
48	48	* @brief denies connection to sesman
49	49	* @param c connection descriptor
50		* @param reason pointer to a string containinge the reason for denying connection
	50	* @param reason pointer to a string containing the reason for denying connection
51	51	*
52	52	*/
53	53	/* 002 */

+2

-2

sesman/libscp/libscp_v1s_mng.h less more

35	35	* @param c connection descriptor
36	36	* @param s pointer to session descriptor pointer
37	37	*
38		* this function places in *s the address of a newely allocated SCP_SESSION structure
	38	* this function places in *s the address of a newly allocated SCP_SESSION structure
39	39	* that should be free()d
40	40	*/
41	41	enum SCP_SERVER_STATES_E

55	55	*
56	56	* @brief denies connection to sesman
57	57	* @param c connection descriptor
58		* @param reason pointer to a string containinge the reason for denying connection
	58	* @param reason pointer to a string containing the reason for denying connection
59	59	*
60	60	*/
61	61	/* 003 */

+1

-1

sesman/libscp/libscp_vX.h less more

37	37	* @brief version neutral server accept function
38	38	* @param c connection descriptor
39	39	* @param s session descriptor pointer address.
40		* it will return a newely allocated descriptor.
	40	* it will return a newly allocated descriptor.
41	41	* It this memory needs to be g_free()d
42	42	*
43	43	*/

+0

-121

~~sesman/lock.c~~ less more

0		/**
1		* xrdp: A Remote Desktop Protocol server.
2		*
3		* Copyright (C) Jay Sorg 2004-2013
4		*
5		* Licensed under the Apache License, Version 2.0 (the "License");
6		* you may not use this file except in compliance with the License.
7		* You may obtain a copy of the License at
8		*
9		* http://www.apache.org/licenses/LICENSE-2.0
10		*
11		* Unless required by applicable law or agreed to in writing, software
12		* distributed under the License is distributed on an "AS IS" BASIS,
13		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14		* See the License for the specific language governing permissions and
15		* limitations under the License.
16		*
17		* session manager
18		* linux only
19		*/
20
21		#include "sesman.h"
22
23		extern struct config_sesman g_cfg; / in sesman.c */
24
25		static tbus g_sync_mutex = 0;
26		static tbus g_lock_chain = 0;
27		static tbus g_sync_sem = 0;
28		static tbus g_lock_socket = 0;
29
30		/******************************************************************************/
31		void APP_CC
32		lock_init(void)
33		{
34		g_sync_mutex = tc_mutex_create();
35		g_lock_chain = tc_mutex_create();
36		g_sync_sem = tc_sem_create(0);
37		g_lock_socket = tc_sem_create(1);
38		}
39
40		/******************************************************************************/
41		void APP_CC
42		lock_deinit(void)
43		{
44		tc_mutex_delete(g_sync_mutex);
45		tc_mutex_delete(g_lock_chain);
46		tc_sem_delete(g_sync_sem);
47		tc_sem_delete(g_lock_socket);
48		}
49
50		/******************************************************************************/
51		void APP_CC
52		lock_chain_acquire(void)
53		{
54		/* lock the chain */
55		LOG_DBG("lock_chain_acquire()");
56		tc_mutex_lock(g_lock_chain);
57		}
58
59		/******************************************************************************/
60		void APP_CC
61		lock_chain_release(void)
62		{
63		/* unlock the chain */
64		LOG_DBG("lock_chain_release()");
65		tc_mutex_unlock(g_lock_chain);
66		}
67
68		/******************************************************************************/
69		void APP_CC
70		lock_socket_acquire(void)
71		{
72		/* lock socket variable */
73		LOG_DBG("lock_socket_acquire()");
74		tc_sem_dec(g_lock_socket);
75		}
76
77		/******************************************************************************/
78		void APP_CC
79		lock_socket_release(void)
80		{
81		/* unlock socket variable */
82		LOG_DBG("lock_socket_release()");
83		tc_sem_inc(g_lock_socket);
84		}
85
86		/******************************************************************************/
87		void APP_CC
88		lock_sync_acquire(void)
89		{
90		/* lock sync variable */
91		LOG_DBG("lock_sync_acquire()");
92		tc_mutex_lock(g_sync_mutex);
93		}
94
95		/******************************************************************************/
96		void APP_CC
97		lock_sync_release(void)
98		{
99		/* unlock socket variable */
100		LOG_DBG("lock_sync_release()");
101		tc_mutex_unlock(g_sync_mutex);
102		}
103
104		/******************************************************************************/
105		void APP_CC
106		lock_sync_sem_acquire(void)
107		{
108		/* dec sem */
109		LOG_DBG("lock_sync_sem_acquire()");
110		tc_sem_dec(g_sync_sem);
111		}
112
113		/******************************************************************************/
114		void APP_CC
115		lock_sync_sem_release(void)
116		{
117		/* inc sem */
118		LOG_DBG("lock_sync_sem_release()");
119		tc_sem_inc(g_sync_sem);
120		}

+0

-104

~~sesman/lock.h~~ less more

0		/**
1		* xrdp: A Remote Desktop Protocol server.
2		*
3		* Copyright (C) Jay Sorg 2004-2013
4		*
5		* Licensed under the Apache License, Version 2.0 (the "License");
6		* you may not use this file except in compliance with the License.
7		* You may obtain a copy of the License at
8		*
9		* http://www.apache.org/licenses/LICENSE-2.0
10		*
11		* Unless required by applicable law or agreed to in writing, software
12		* distributed under the License is distributed on an "AS IS" BASIS,
13		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14		* See the License for the specific language governing permissions and
15		* limitations under the License.
16		*/
17
18		#ifndef LOCK_H
19		#define LOCK_H
20
21		#include "sesman.h"
22
23		/**
24		*
25		* @brief initializes all the locks
26		*
27		*/
28		void APP_CC
29		lock_init(void);
30
31		/**
32		*
33		* @brief cleanup all the locks
34		*
35		*/
36		void APP_CC
37		lock_deinit(void);
38
39		/**
40		*
41		* @brief acquires the lock for the session chain
42		*
43		*/
44		void APP_CC
45		lock_chain_acquire(void);
46
47		/**
48		*
49		* @brief releases the session chain lock
50		*
51		*/
52		void APP_CC
53		lock_chain_release(void);
54
55		/**
56		*
57		* @brief request the socket lock
58		*
59		*/
60		void APP_CC
61		lock_socket_acquire(void);
62
63		/**
64		*
65		* @brief releases the socket lock
66		*
67		*/
68		void APP_CC
69		lock_socket_release(void);
70
71		/**
72		*
73		* @brief request the main sync lock
74		*
75		*/
76		void APP_CC
77		lock_sync_acquire(void);
78
79		/**
80		*
81		* @brief releases the main sync lock
82		*
83		*/
84		void APP_CC
85		lock_sync_release(void);
86
87		/**
88		*
89		* @brief request the sync sem lock
90		*
91		*/
92		void APP_CC
93		lock_sync_sem_acquire(void);
94
95		/**
96		*
97		* @brief releases the sync sem lock
98		*
99		*/
100		void APP_CC
101		lock_sync_sem_release(void);
102
103		#endif

+2

-8

sesman/scp.c less more

0	0	/**
1	1	* xrdp: A Remote Desktop Protocol server.
2	2	*
3		* Copyright (C) Jay Sorg 2004-2013
	3	* Copyright (C) Jay Sorg 2004-2015
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

28	28
29	29	#include "sesman.h"
30	30
31		extern int g_thread_sck; /* in thread.c */
32	31	extern struct config_sesman g_cfg; / in sesman.c */
33	32
34	33	/******************************************************************************/

38	37	struct SCP_CONNECTION scon;
39	38	struct SCP_SESSION *sdata;
40	39
41		/* making a local copy of the socket (it's on the stack) */
42		/* probably this is just paranoia */
43		scon.in_sck = g_thread_sck;
	40	scon.in_sck = (int)(tintptr)sck;
44	41	LOG_DBG("started scp thread on socket %d", scon.in_sck);
45
46		/* unlocking g_thread_sck */
47		lock_socket_release();
48	42
49	43	make_stream(scon.in_s);
50	44	make_stream(scon.out_s);

+7

-7

sesman/scp_v0.c less more

0	0	/**
1	1	* xrdp: A Remote Desktop Protocol server.
2	2	*
3		* Copyright (C) Jay Sorg 2004-2013
	3	* Copyright (C) Jay Sorg 2004-2015
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

34	34	int display = 0;
35	35	tbus data;
36	36	struct session_item *s_item;
37		int errorcode = 0 ;
	37	int errorcode = 0;
38	38
39		data = auth_userpass(s->username, s->password,&errorcode);
	39	data = auth_userpass(s->username, s->password, &errorcode);
40	40
41	41	if (s->type == SCP_GW_AUTHENTICATION)
42	42	{

54	54	}
55	55	else
56	56	{
57		scp_v0s_replyauthentication(c, 32+3); /* all first 32 are reserved for PAM errors */
	57	scp_v0s_replyauthentication(c, 32 + 3); /* all first 32 are reserved for PAM errors */
58	58	log_message(LOG_LEVEL_INFO, "Username okey but group problem for "
59	59	"user: %s", s->username);
60	60	/* g_writeln("user password ok, but group problem"); */

127	127	display = session_start(s->width, s->height, s->bpp, s->username,
128	128	s->password, data, SESMAN_SESSION_TYPE_XRDP,
129	129	s->domain, s->program, s->directory,
130		s->client_ip);
131		}
	130	s->client_ip);
	131	}
132	132	else if (SCP_SESSION_TYPE_XORG == s->type)
133	133	{
134		/* type is SCP_SESSION_TYPE_XORG */
	134	/* type is SCP_SESSION_TYPE_XORG */
135	135	log_message(LOG_LEVEL_INFO, "starting Xorg session...");
136	136	display = session_start(s->width, s->height, s->bpp, s->username,
137	137	s->password, data, SESMAN_SESSION_TYPE_XORG,

+2

-2

sesman/scp_v1.c less more

0	0	/**
1	1	* xrdp: A Remote Desktop Protocol server.
2	2	*
3		* Copyright (C) Jay Sorg 2004-2013
	3	* Copyright (C) Jay Sorg 2004-2015
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

109	109	if (scount == 0)
110	110	{
111	111	/* no disconnected sessions - start a new one */
112		log_message(LOG_LEVEL_DEBUG, "No disconnected sessions for this user"
	112	log_message(LOG_LEVEL_DEBUG, "No disconnected sessions for this user "
113	113	"- we create a new one");
114	114
115	115	if (0 != s->client_ip)

+17

-32

sesman/sesman.c less more

0	0	/**
1	1	* xrdp: A Remote Desktop Protocol server.
2	2	*
3		* Copyright (C) Jay Sorg 2004-2013
	3	* Copyright (C) Jay Sorg 2004-2015
4	4	*
5	5	* Licensed under the Apache License, Version 2.0 (the "License");
6	6	* you may not use this file except in compliance with the License.

30	30	unsigned char g_fixedkey[8] = { 23, 82, 107, 6, 35, 78, 88, 7 };
31	31	struct config_sesman g_cfg; / defined in config.h */
32	32
33		tbus g_term_event = 0;
34		tbus g_sync_event = 0;
35
36		extern int g_thread_sck; /* in thread.c */
	33	tintptr g_term_event = 0;
37	34
38	35	/******************************************************************************/
39	36	/**

79	76	robjs_count = 0;
80	77	robjs[robjs_count++] = sck_obj;
81	78	robjs[robjs_count++] = g_term_event;
82		robjs[robjs_count++] = g_sync_event;
83	79
84	80	/* wait */
85	81	if (g_obj_wait(robjs, robjs_count, 0, 0, -1) != 0)

91	87	if (g_is_wait_obj_set(g_term_event)) /* term */
92	88	{
93	89	break;
94		}
95
96		if (g_is_wait_obj_set(g_sync_event)) /* sync */
97		{
98		g_reset_wait_obj(g_sync_event);
99		session_sync_start();
100	90	}
101	91
102	92	if (g_is_wait_obj_set(sck_obj)) /* incoming connection */

117	107	{
118	108	/* we've got a connection, so we pass it to scp code */
119	109	LOG_DBG("new connection");
120		thread_scp_start(in_sck);
121		/* todo, do we have to wait here ? */
	110	scp_process_start((void*)(tintptr)in_sck);
	111	g_sck_close(in_sck);
122	112	}
123	113	}
124	114	}

137	127	"port '%s': %d (%s)", g_cfg->listen_port,
138	128	g_get_errno(), g_get_strerror());
139	129	}
140
141		if (g_sck != -1)
142		g_tcp_close(g_sck);
	130	g_tcp_close(g_sck);
143	131	}
144	132
145	133	/******************************************************************************/

147	135	main(int argc, char **argv)
148	136	{
149	137	int fd;
150		enum logReturns error;
	138	enum logReturns log_error;
	139	int error;
151	140	int daemon = 1;
152	141	int pid;
153	142	char pid_s[32];

170	159	(0 == g_strcasecmp(argv[1], "-ns"))))
171	160	{
172	161	/* starts sesman not daemonized */
173		g_printf("starting sesman in foregroud...\n");
	162	g_printf("starting sesman in foreground...\n");
174	163	daemon = 0;
175	164	}
176	165	else if ((2 == argc) && ((0 == g_strcasecmp(argv[1], "--help")) \|\|

251	240	{
252	241	g_printf("sesman is already running.\n");
253	242	g_printf("if it's not running, try removing ");
254		g_printf(pid_file);
	243	g_printf("%s", pid_file);
255	244	g_printf("\n");
256	245	g_deinit();
257	246	g_exit(1);

278	267	g_snprintf(cfg_file, 255, "%s/sesman.ini", XRDP_CFG_PATH);
279	268
280	269	/* starting logging subsystem */
281		error = log_start(cfg_file, "XRDP-sesman");
282
283		if (error != LOG_STARTUP_OK)
284		{
285		switch (error)
	270	log_error = log_start(cfg_file, "xrdp-sesman");
	271
	272	if (log_error != LOG_STARTUP_OK)
	273	{
	274	switch (log_error)
286	275	{
287	276	case LOG_ERROR_MALLOC:
288	277	g_writeln("error on malloc. cannot start logging. quitting.");

291	280	g_writeln("error opening log file [%s]. quitting.",
292	281	getLogFile(text, 255));
293	282	break;
	283	default:
	284	g_writeln("error");
	285	break;
294	286	}
295	287
296	288	g_deinit();

327	319	{
328	320	}
329	321	}
330
331		/* initializing locks */
332		lock_init();
333	322
334	323	/* signal handling */
335	324	g_pid = g_getpid();

341	330	#if 1
342	331	g_signal_hang_up(sig_sesman_reload_cfg); /* SIGHUP */
343	332	g_signal_user_interrupt(sig_sesman_shutdown); /* SIGINT */
344		g_signal_kill(sig_sesman_shutdown); /* SIGKILL */
345	333	g_signal_terminate(sig_sesman_shutdown); /* SIGTERM */
346	334	g_signal_child_stop(sig_sesman_session_end); /* SIGCHLD */
347	335	#endif

386	374
387	375	g_snprintf(text, 255, "xrdp_sesman_%8.8x_main_term", g_pid);
388	376	g_term_event = g_create_wait_obj(text);
389		g_snprintf(text, 255, "xrdp_sesman_%8.8x_main_sync", g_pid);
390		g_sync_event = g_create_wait_obj(text);
391	377
392	378	sesman_main_loop();
393	379

398	384	}
399	385
400	386	g_delete_wait_obj(g_term_event);
401		g_delete_wait_obj(g_sync_event);
402	387
403	388	if (!daemon)
404	389	{

+0

-3

sesman/sesman.h less more

41	41	#include "session.h"
42	42	#include "access.h"
43	43	#include "scp.h"
44		#include "thread.h"
45		#include "lock.h"
46		#include "thread_calls.h"
47	44
48	45	#include "libscp.h"
49	46

+3

-0

sesman/sesman.ini less more

62	62	SyslogLevel=DEBUG
63	63
64	64	[X11rdp]
	65	param0=X11rdp
65	66	param1=-bs
66	67	param2=-ac
67	68	param3=-nolisten

69	70	param5=-uds
70	71
71	72	[Xvnc]
	73	param0=Xvnc
72	74	param1=-bs
73	75	param2=-ac
74	76	param3=-nolisten

78	80	param7=96
79	81
80	82	[Xorg]
	83	param0=Xorg
81	84	param1=-config
82	85	param2=xrdp/xorg.conf
83	86	param3=-logfile

+82

-211

sesman/session.c less more

0	0	/**
1	1	* xrdp: A Remote Desktop Protocol server.
2	2	*
3		* Copyright (C) Jay Sorg 2004-2013
	3	* Copyright (C) Jay Sorg 2004-2015
4	4	*
5	5	* BSD process grouping by:
6	6	* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland.

31	31	#include "sesman.h"
32	32	#include "libscp_types.h"
33	33
34		#include <errno.h>
35		//#include <time.h>
36
37		extern tbus g_sync_event;
38	34	extern unsigned char g_fixedkey[8];
39	35	extern struct config_sesman g_cfg; / in sesman.c */
40	36	extern int g_sck; /* in sesman.c */
41		extern int g_thread_sck; /* in thread.c */
42	37	struct session_chain *g_sessions;
43	38	int g_session_count;
44	39
45		static int g_sync_width;
46		static int g_sync_height;
47		static int g_sync_bpp;
48		static char *g_sync_username;
49		static char *g_sync_password;
50		static char *g_sync_domain;
51		static char *g_sync_program;
52		static char *g_sync_directory;
53		static char *g_sync_client_ip;
54		static tbus g_sync_data;
55		static tui8 g_sync_type;
56		static int g_sync_result;
57		static int g_sync_cmd;
	40	extern tbus g_term_event; /* in sesman.c */
58	41
59	42	/**
60	43	* Creates a string consisting of all parameters that is hosted in the param list

67	50	dumpItemsToString(struct list self, char outstr, int len)
68	51	{
69	52	int index;
70		tbus item;
71	53	int totalLen = 0;
72	54
73	55	g_memset(outstr, 0, len);

98	80	{
99	81	struct session_chain *tmp;
100	82	enum SESMAN_CFG_SESS_POLICY policy = g_cfg->sess.policy;
101
102		/THREAD-FIX require chain lock /
103		lock_chain_acquire();
104	83
105	84	tmp = g_sessions;
106	85

118	97	type = SESMAN_SESSION_TYPE_XORG;
119	98	break;
120	99	default:
121		lock_chain_release();
122	100	return 0;
123	101	}
124	102

140	118	tmp->item->client_ip);
141	119	#endif
142	120
143		if ((type == SESMAN_SESSION_TYPE_XRDP) \|\| (type == SESMAN_SESSION_TYPE_XORG))
144		{
145		/* only name and bpp need to match for X11rdp, it can resize */
146		if (g_strncmp(name, tmp->item->name, 255) == 0 &&
147		(!(policy & SESMAN_CFG_SESS_POLICY_D) \|\|
148		(tmp->item->width == width && tmp->item->height == height)) &&
149		(!(policy & SESMAN_CFG_SESS_POLICY_I) \|\|
150		(g_strncmp_d(client_ip, tmp->item->client_ip, ':', 255) == 0)) &&
151		(!(policy & SESMAN_CFG_SESS_POLICY_C) \|\|
152		(g_strncmp(client_ip, tmp->item->client_ip, 255) == 0)) &&
153		tmp->item->bpp == bpp &&
154		tmp->item->type == type)
155		{
156		/THREAD-FIX release chain lock /
157		lock_chain_release();
158		return tmp->item;
159		}
160		}
161
162	121	if (g_strncmp(name, tmp->item->name, 255) == 0 &&
163		(tmp->item->width == width && tmp->item->height == height) &&
	122	(!(policy & SESMAN_CFG_SESS_POLICY_D) \|\|
	123	(tmp->item->width == width && tmp->item->height == height)) &&
164	124	(!(policy & SESMAN_CFG_SESS_POLICY_I) \|\|
165	125	(g_strncmp_d(client_ip, tmp->item->client_ip, ':', 255) == 0)) &&
166	126	(!(policy & SESMAN_CFG_SESS_POLICY_C) \|\|

168	128	tmp->item->bpp == bpp &&
169	129	tmp->item->type == type)
170	130	{
171		/THREAD-FIX release chain lock /
172		lock_chain_release();
173	131	return tmp->item;
174	132	}
175	133
176	134	tmp = tmp->next;
177	135	}
178	136
179		/THREAD-FIX release chain lock /
180		lock_chain_release();
181	137	return 0;
182	138	}
183	139

281	237	{
282	238	char text[256];
283	239	int x_running;
284		int sck;
285	240
286	241	g_sprintf(text, "/tmp/.X11-unix/X%d", display);
287	242	x_running = g_file_exist(text);

323	278	/* building parameters */
324	279	g_snprintf(exe_path, 261, "%s/xrdp-sessvc", XRDP_SBIN_PATH);
325	280
326		list_add_item(sessvc_params, (long)g_strdup(exe_path));
327		list_add_item(sessvc_params, (long)g_strdup(xpid_str));
328		list_add_item(sessvc_params, (long)g_strdup(wmpid_str));
	281	list_add_item(sessvc_params, (tintptr)g_strdup(exe_path));
	282	list_add_item(sessvc_params, (tintptr)g_strdup(xpid_str));
	283	list_add_item(sessvc_params, (tintptr)g_strdup(wmpid_str));
329	284	list_add_item(sessvc_params, 0); /* mandatory */
330	285
331	286	env_set_user(username, 0, display,

343	298	/* no problem calling strerror for thread safety: other threads
344	299	are blocked */
345	300	log_message(LOG_LEVEL_DEBUG, "errno: %d, description: %s",
346		errno, g_get_strerror());
	301	g_get_errno(), g_get_strerror());
347	302	log_message(LOG_LEVEL_DEBUG, "execve parameter list:");
348	303
349	304	for (i = 0; i < (sessvc_params->count); i++)

392	347	/******************************************************************************/
393	348	/* called with the main thread */
394	349	static int APP_CC
395		session_get_aval_display_from_chain(void)
	350	session_get_avail_display_from_chain(void)
396	351	{
397	352	int display;
398	353
399	354	display = g_cfg->sess.x11_display_offset;
400		lock_chain_acquire();
401	355
402	356	while ((display - g_cfg->sess.x11_display_offset) <= g_cfg->sess.max_sessions)
403	357	{

405	359	{
406	360	if (!x_server_running_check_ports(display))
407	361	{
408		lock_chain_release();
409	362	return display;
410	363	}
411	364	}

413	366	display++;
414	367	}
415	368
416		lock_chain_release();
417	369	log_message(LOG_LEVEL_ERROR, "X server -- no display in range is available");
418	370	return 0;
419	371	}

459	411	int pampid = 0;
460	412	int xpid = 0;
461	413	int i = 0;
	414	char xserver; / absolute/relative path to Xorg/X11rdp/Xvnc */
462	415	char geometry[32];
463	416	char depth[32];
464		char screen[32];
	417	char screen[32]; /* display number */
465	418	char text[256];
466	419	char passwd_file[256];
467	420	char *pfile;

508	461	return 0;
509	462	}
510	463
511		display = session_get_aval_display_from_chain();
	464	display = session_get_avail_display_from_chain();
512	465
513	466	if (display == 0)
514	467	{

517	470	return 0;
518	471	}
519	472
520		pid = g_fork();
	473	pid = g_fork(); /* parent is fork from tcp accept,
	474	child forks X and wm, then becomes scp */
521	475
522	476	if (pid == -1)
523	477	{
524	478	}
525		else if (pid == 0) /* child sesman */
526		{
	479	else if (pid == 0)
	480	{
	481	g_tcp_close(g_term_event);
527	482	g_tcp_close(g_sck);
528		g_tcp_close(g_thread_sck);
529	483	g_sprintf(geometry, "%dx%d", width, height);
530	484	g_sprintf(depth, "%d", bpp);
531	485	g_sprintf(screen, ":%d", display);

550	504	* Create a new session and process group since the 4.4BSD
551	505	* setlogin() affects the entire process group
552	506	*/
553		if (setsid() < 0)
554		{
555		log_message(LOG_LEVEL_ERROR,
556		"setsid failed - pid %d", g_getpid());
557		}
558
559		if (setlogin(username) < 0)
560		{
561		log_message(LOG_LEVEL_ERROR,
562		"setlogin failed for user %s - pid %d", username, g_getpid());
	507	if (g_setsid() < 0)
	508	{
	509	log_message(LOG_LEVEL_ERROR,
	510	"setsid failed - pid %d", g_getpid());
	511	}
	512
	513	if (g_setlogin(username) < 0)
	514	{
	515	log_message(LOG_LEVEL_ERROR,
	516	"setlogin failed for user %s - pid %d", username,
	517	g_getpid());
563	518	}
564	519	}
565	520
566	521	g_waitpid(bsdsespid);
567	522	#endif
568		wmpid = g_fork();
	523	wmpid = g_fork(); /* parent becomes X,
	524	child forks wm, and waits, todo */
569	525	if (wmpid == -1)
570	526	{
571	527	}
572		else if (wmpid == 0) /* child (child sesman) xserver */
	528	else if (wmpid == 0)
573	529	{
574	530	wait_for_xserver(display);
575	531	auth_start_session(data, display);
576		pampid = g_fork();
	532	pampid = g_fork(); /* parent waits, todo
	533	child becomes wm */
577	534	if (pampid == -1)
578	535	{
579	536	}
580		else if (pampid == 0) /* child: X11/client */
	537	else if (pampid == 0)
581	538	{
582	539	env_set_user(username, 0, display,
583	540	g_cfg->session_variables1,

613	570	"wm for user %s - pid %d", username, g_getpid());
614	571	/* logging parameters */
615	572	log_message(LOG_LEVEL_DEBUG, "errno: %d, "
616		"description: %s", errno, g_get_strerror());
	573	"description: %s", g_get_errno(), g_get_strerror());
617	574	log_message(LOG_LEVEL_DEBUG, "execlp3 parameter "
618	575	"list:");
619	576	log_message(LOG_LEVEL_DEBUG, " argv[0] = %s",

631	588	"wm for user %s - pid %d", username, g_getpid());
632	589	/* logging parameters */
633	590	log_message(LOG_LEVEL_DEBUG, "errno: %d, description: "
634		"%s", errno, g_get_strerror());
	591	"%s", g_get_errno(), g_get_strerror());
635	592	log_message(LOG_LEVEL_DEBUG, "execlp3 parameter list:");
636	593	log_message(LOG_LEVEL_DEBUG, " argv[0] = %s",
637	594	text);

646	603	"for user %s - pid %d", username, g_getpid());
647	604	/* logging parameters */
648	605	log_message(LOG_LEVEL_DEBUG, "errno: %d, description: "
649		"%s", errno, g_get_strerror());
	606	"%s", g_get_errno(), g_get_strerror());
650	607	}
651	608	else
652	609	{

665	622	g_exit(0);
666	623	}
667	624	}
668		else /* parent (child sesman) */
669		{
670		xpid = g_fork();
671
	625	else
	626	{
	627	xpid = g_fork(); /* parent becomes scp,
	628	child becomes X */
672	629	if (xpid == -1)
673	630	{
674	631	}

695	652	xserver_params = list_create();
696	653	xserver_params->auto_free = 1;
697	654
	655	/* get path of Xorg from config */
	656	xserver = g_strdup((const char *)list_get_item(g_cfg->xorg_params, 0));
	657	list_remove_item(g_cfg->xorg_params, 0);
	658
698	659	/* these are the must have parameters */
699		list_add_item(xserver_params, (long) g_strdup("Xorg"));
700		list_add_item(xserver_params, (long) g_strdup(screen));
	660	list_add_item(xserver_params, (tintptr) g_strdup(xserver));
	661	list_add_item(xserver_params, (tintptr) g_strdup(screen));
701	662
702	663	/* additional parameters from sesman.ini file */
703	664	list_append_list_strdup(g_cfg->xorg_params, xserver_params, 0);

717	678	g_setenv("XRDP_START_HEIGHT", geometry, 1);
718	679
719	680	/* fire up Xorg */
720		g_execvp("Xorg", pp1);
	681	g_execvp(xserver, pp1);
721	682	}
722	683	else if (type == SESMAN_SESSION_TYPE_XVNC)
723	684	{

725	686	xserver_params = list_create();
726	687	xserver_params->auto_free = 1;
727	688
	689	/* get path of Xvnc from config */
	690	xserver = g_strdup((const char *)list_get_item(g_cfg->vnc_params, 0));
	691	list_remove_item(g_cfg->vnc_params, 0);
	692
728	693	/* these are the must have parameters */
729		list_add_item(xserver_params, (long)g_strdup("Xvnc"));
730		list_add_item(xserver_params, (long)g_strdup(screen));
731		list_add_item(xserver_params, (long)g_strdup("-geometry"));
732		list_add_item(xserver_params, (long)g_strdup(geometry));
733		list_add_item(xserver_params, (long)g_strdup("-depth"));
734		list_add_item(xserver_params, (long)g_strdup(depth));
735		list_add_item(xserver_params, (long)g_strdup("-rfbauth"));
736		list_add_item(xserver_params, (long)g_strdup(passwd_file));
	694	list_add_item(xserver_params, (tintptr)g_strdup(xserver));
	695	list_add_item(xserver_params, (tintptr)g_strdup(screen));
	696	list_add_item(xserver_params, (tintptr)g_strdup("-geometry"));
	697	list_add_item(xserver_params, (tintptr)g_strdup(geometry));
	698	list_add_item(xserver_params, (tintptr)g_strdup("-depth"));
	699	list_add_item(xserver_params, (tintptr)g_strdup(depth));
	700	list_add_item(xserver_params, (tintptr)g_strdup("-rfbauth"));
	701	list_add_item(xserver_params, (tintptr)g_strdup(passwd_file));
737	702
738	703	/* additional parameters from sesman.ini file */
739	704	//config_read_xserver_params(SESMAN_SESSION_TYPE_XVNC,

744	709	list_add_item(xserver_params, 0);
745	710	pp1 = (char **)xserver_params->items;
746	711	log_message(LOG_LEVEL_INFO, "%s", dumpItemsToString(xserver_params, execvpparams, 2048));
747		g_execvp("Xvnc", pp1);
	712	g_execvp(xserver, pp1);
748	713	}
749	714	else if (type == SESMAN_SESSION_TYPE_XRDP)
750	715	{
751	716	xserver_params = list_create();
752	717	xserver_params->auto_free = 1;
753	718
	719	/* get path of X11rdp from config */
	720	xserver = g_strdup((const char *)list_get_item(g_cfg->rdp_params, 0));
	721	list_remove_item(g_cfg->rdp_params, 0);
	722
754	723	/* these are the must have parameters */
755		list_add_item(xserver_params, (long)g_strdup("X11rdp"));
756		list_add_item(xserver_params, (long)g_strdup(screen));
757		list_add_item(xserver_params, (long)g_strdup("-geometry"));
758		list_add_item(xserver_params, (long)g_strdup(geometry));
759		list_add_item(xserver_params, (long)g_strdup("-depth"));
760		list_add_item(xserver_params, (long)g_strdup(depth));
	724	list_add_item(xserver_params, (tintptr)g_strdup(xserver));
	725	list_add_item(xserver_params, (tintptr)g_strdup(screen));
	726	list_add_item(xserver_params, (tintptr)g_strdup("-geometry"));
	727	list_add_item(xserver_params, (tintptr)g_strdup(geometry));
	728	list_add_item(xserver_params, (tintptr)g_strdup("-depth"));
	729	list_add_item(xserver_params, (tintptr)g_strdup(depth));
761	730
762	731	/* additional parameters from sesman.ini file */
763	732	//config_read_xserver_params(SESMAN_SESSION_TYPE_XRDP,

768	737	list_add_item(xserver_params, 0);
769	738	pp1 = (char **)xserver_params->items;
770	739	log_message(LOG_LEVEL_INFO, "%s", dumpItemsToString(xserver_params, execvpparams, 2048));
771		g_execvp("X11rdp", pp1);
	740	g_execvp(xserver, pp1);
772	741	}
773	742	else
774	743	{

783	752
784	753	/* logging parameters */
785	754	log_message(LOG_LEVEL_DEBUG, "errno: %d, description: "
786		"%s", errno, g_get_strerror());
	755	"%s", g_get_errno(), g_get_strerror());
787	756	log_message(LOG_LEVEL_DEBUG, "execve parameter list size: "
788	757	"%d", (xserver_params)->count);
789	758

796	765	list_delete(xserver_params);
797	766	g_exit(1);
798	767	}
799		else /* parent (child sesman)*/
	768	else
800	769	{
801	770	wait_for_xserver(display);
802	771	g_snprintf(text, 255, "%d", display);

808	777	}
809	778	}
810	779	}
811		else /* parent sesman process */
	780	else
812	781	{
813	782	temp->item->pid = pid;
814	783	temp->item->display = display;

822	791	ltime = g_time1();
823	792	localtime_r(&ltime, &stime);
824	793	temp->item->connect_time.year = (tui16)(stime.tm_year + 1900);
825		temp->item->connect_time.month = (tui8)stime.tm_mon;
	794	temp->item->connect_time.month = (tui8)(stime.tm_mon + 1);
826	795	temp->item->connect_time.day = (tui8)stime.tm_mday;
827	796	temp->item->connect_time.hour = (tui8)stime.tm_hour;
828	797	temp->item->connect_time.minute = (tui8)stime.tm_min;

832	801	temp->item->type = type;
833	802	temp->item->status = SESMAN_SESSION_STATUS_ACTIVE;
834	803
835		/THREAD-FIX require chain lock /
836		lock_chain_acquire();
837
838	804	temp->next = g_sessions;
839	805	g_sessions = temp;
840	806	g_session_count++;
841
842		/THREAD-FIX release chain lock /
843		lock_chain_release();
844	807
845	808	return display;
846	809	}

888	851	long data, tui8 type, char domain, char program,
889	852	char directory, char client_ip)
890	853	{
891		int display;
892
893		/* lock mutex */
894		lock_sync_acquire();
895		/* set shared vars */
896		g_sync_cmd = 0;
897		g_sync_width = width;
898		g_sync_height = height;
899		g_sync_bpp = bpp;
900		g_sync_username = username;
901		g_sync_password = password;
902		g_sync_domain = domain;
903		g_sync_program = program;
904		g_sync_directory = directory;
905		g_sync_client_ip = client_ip;
906		g_sync_data = data;
907		g_sync_type = type;
908		/* set event for main thread to see */
909		g_set_wait_obj(g_sync_event);
910		/* wait for main thread to get done */
911		lock_sync_sem_acquire();
912		/* read result(display) from shared var */
913		display = g_sync_result;
914		/* unlock mutex */
915		lock_sync_release();
916		return display;
	854	return session_start_fork(width, height, bpp, username,
	855	password, data, type, domain,
	856	program, directory, client_ip);
917	857	}
918	858
919	859	/******************************************************************************/

922	862	int DEFAULT_CC
923	863	session_reconnect(int display, char *username)
924	864	{
925		/* lock mutex */
926		lock_sync_acquire();
927		/* set shared vars */
928		g_sync_cmd = 1;
929		g_sync_width = display;
930		g_sync_username = username;
931		/* set event for main thread to see */
932		g_set_wait_obj(g_sync_event);
933		/* wait for main thread to get done */
934		lock_sync_sem_acquire();
935		/* unlock mutex */
936		lock_sync_release();
937		return 0;
938		}
939
940		/******************************************************************************/
941		/* called with the main thread */
942		int APP_CC
943		session_sync_start(void)
944		{
945		if (g_sync_cmd == 0)
946		{
947		g_sync_result = session_start_fork(g_sync_width, g_sync_height, g_sync_bpp,
948		g_sync_username, g_sync_password,
949		g_sync_data, g_sync_type, g_sync_domain,
950		g_sync_program, g_sync_directory,
951		g_sync_client_ip);
952		}
953		else
954		{
955		/* g_sync_width is really display */
956		g_sync_result = session_reconnect_fork(g_sync_width, g_sync_username);
957		}
958
959		lock_sync_sem_release();
960		return 0;
	865	return session_reconnect_fork(display, username);
961	866	}
962	867
963	868	/******************************************************************************/

966	871	{
967	872	struct session_chain *tmp;
968	873	struct session_chain *prev;
969
970		/THREAD-FIX require chain lock /
971		lock_chain_acquire();
972	874
973	875	tmp = g_sessions;
974	876	prev = 0;

991	893	prev->next = tmp->next;
992	894	}
993	895
994		/THREAD-FIX release chain lock /
995		lock_chain_release();
996	896	return SESMAN_SESSION_KILL_NULLITEM;
997	897	}
998	898

1015	915
1016	916	g_free(tmp);
1017	917	g_session_count--;
1018		/THREAD-FIX release chain lock /
1019		lock_chain_release();
1020	918	return SESMAN_SESSION_KILL_OK;
1021	919	}
1022	920

1025	923	tmp = tmp->next;
1026	924	}
1027	925
1028		/THREAD-FIX release chain lock /
1029		lock_chain_release();
1030	926	return SESMAN_SESSION_KILL_NOTFOUND;
1031	927	}
1032	928

1036	932	{
1037	933	struct session_chain *tmp;
1038	934
1039		/THREAD-FIX require chain lock /
1040		lock_chain_acquire();
1041
1042	935	tmp = g_sessions;
1043	936
1044	937	while (tmp != 0)

1056	949	/* go on */
1057	950	tmp = tmp->next;
1058	951	}
1059
1060		/THREAD-FIX release chain lock /
1061		lock_chain_release();
1062	952	}
1063	953
1064	954	/******************************************************************************/

1076	966	return 0;
1077	967	}
1078	968
1079		/THREAD-FIX require chain lock /
1080		lock_chain_acquire();
1081
1082	969	tmp = g_sessions;
1083	970
1084	971	while (tmp != 0)

1087	974	{
1088	975	log_message(LOG_LEVEL_ERROR, "session descriptor for "
1089	976	"pid %d is null!", pid);
1090		/THREAD-FIX release chain lock /
1091		lock_chain_release();
1092	977	g_free(dummy);
1093	978	return 0;
1094	979	}
1095	980
1096	981	if (tmp->item->pid == pid)
1097	982	{
1098		/THREAD-FIX release chain lock /
1099	983	g_memcpy(dummy, tmp->item, sizeof(struct session_item));
1100		lock_chain_release();
1101		/return tmp->item;/
1102	984	return dummy;
1103	985	}
1104	986

1106	988	tmp = tmp->next;
1107	989	}
1108	990
1109		/THREAD-FIX release chain lock /
1110		lock_chain_release();
1111	991	g_free(dummy);
1112	992	return 0;
1113	993	}

1123	1003
1124	1004	count = 0;
1125	1005
1126		/THREAD-FIX require chain lock /
1127		lock_chain_acquire();
1128
1129	1006	tmp = g_sessions;
1130	1007
1131	1008	while (tmp != 0)

1151	1028	if (count == 0)
1152	1029	{
1153	1030	(*cnt) = 0;
1154		/THREAD-FIX release chain lock /
1155		lock_chain_release();
1156	1031	return 0;
1157	1032	}
1158	1033

1162	1037	if (sess == 0)
1163	1038	{
1164	1039	(*cnt) = 0;
1165		/THREAD-FIX release chain lock /
1166		lock_chain_release();
1167	1040	return 0;
1168	1041	}
1169	1042

1172	1045
1173	1046	while (tmp != 0)
1174	1047	{
1175		#warning FIXME: we should get only disconnected sessions!
	1048	/* #warning FIXME: we should get only disconnected sessions! */
1176	1049	if ((NULL == user) \|\| (!g_strncasecmp(user, tmp->item->name, 256)))
1177	1050	{
1178	1051	if ((tmp->item->status) & flags)

1182	1055	(sess[index]).height = tmp->item->height;
1183	1056	(sess[index]).width = tmp->item->width;
1184	1057	(sess[index]).bpp = tmp->item->bpp;
1185		#warning FIXME: setting idle times and such
	1058	/* #warning FIXME: setting idle times and such */
1186	1059	/*(sess[index]).connect_time.year = tmp->item->connect_time.year;
1187	1060	(sess[index]).connect_time.month = tmp->item->connect_time.month;
1188	1061	(sess[index]).connect_time.day = tmp->item->connect_time.day;

1215	1088	tmp = tmp->next;
1216	1089	}
1217	1090
1218		/THREAD-FIX release chain lock /
1219		lock_chain_release();
1220	1091	(*cnt) = count;
1221	1092	return sess;
1222	1093	}

+0

-9

sesman/session.h less more

111	111
112	112	/**
113	113	*
114		* @brief starts a session
115		* @return error
116		*
117		*/
118		int APP_CC
119		session_sync_start(void);
120
121		/**
122		*
123	114	* @brief kills a session
124	115	* @param pid the pid of the session to be killed
125	116	* @return

+2

-4

sesman/sessvc/Makefile.am less more

0	0
1		AM_CFLAGS = \
	1	AM_CPPFLAGS = \
2	2	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
3	3	-DXRDP_SBIN_PATH=\"${sbindir}\" \
4	4	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
5		-DXRDP_PID_PATH=\"${localstatedir}/run\"
6
7		INCLUDES = \
	5	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
8	6	-I$(top_srcdir)/common
9	7
10	8	sbin_PROGRAMS = \

+1

-2

sesman/sessvc/sessvc.c less more

92	92	return 1;
93	93	}
94	94
95		g_signal_kill(term_signal_handler); /* SIGKILL */
96	95	g_signal_terminate(term_signal_handler); /* SIGTERM */
97	96	g_signal_user_interrupt(term_signal_handler); /* SIGINT */
98	97	g_signal_pipe(nil_signal_handler); /* SIGPIPE */

100	99	wm_pid = g_atoi(argv[2]);
101	100	g_writeln("xrdp-sessvc: waiting for X (pid %d) and WM (pid %d)",
102	101	x_pid, wm_pid);
103		/* run xrdp-chansrv as a seperate process */
	102	/* run xrdp-chansrv as a separate process */
104	103	chansrv_pid = g_fork();
105	104
106	105	if (chansrv_pid == -1)

+2

-8

sesman/sig.c less more

92	92	/* stop logging subsystem */
93	93	log_end();
94	94
95		/* replace old config with new readed one */
	95	/* replace old config with newly read one */
96	96	g_cfg = cfg;
97	97
98	98	g_snprintf(cfg_file, 255, "%s/sesman.ini", XRDP_CFG_PATH);
99	99
100	100	/* start again logging subsystem */
101		error = log_start(cfg_file, "XRDP-sesman");
	101	error = log_start(cfg_file, "xrdp-sesman");
102	102
103	103	if (error != LOG_STARTUP_OK)
104	104	{

157	157	sigaddset(&waitmask, SIGHUP);
158	158	sigaddset(&waitmask, SIGCHLD);
159	159	sigaddset(&waitmask, SIGTERM);
160		sigaddset(&waitmask, SIGKILL);
161	160	sigaddset(&waitmask, SIGINT);
162	161
163	162	// sigaddset(&waitmask, SIGFPE);

187	186	LOG_DBG("sesman received SIGINT", 0);
188	187	sig_sesman_shutdown(recv_signal);
189	188	break;
190		case SIGKILL:
191		/* we die */
192		LOG_DBG("sesman received SIGKILL", 0);
193		sig_sesman_shutdown(recv_signal);
194		break;
195	189	case SIGTERM:
196	190	/* we die */
197	191	LOG_DBG("sesman received SIGTERM", 0);

+26

-29

sesman/startwm.sh less more

28	28	xterm
29	29	}
30	30
31		#Execution sequence for interactive login shell
32		#Following pseudo code explains the sequence of execution of these files.
33		#execute /etc/profile
34		#IF ~/.bash_profile exists THEN
35		# execute ~/.bash_profile
36		#ELSE
37		# IF ~/.bash_login exist THEN
38		# execute ~/.bash_login
39		# ELSE
40		# IF ~/.profile exist THEN
41		# execute ~/.profile
42		# END IF
43		# END IF
44		#END IF
	31	# Execution sequence for interactive login shell - pseudocode
	32	#
	33	# IF /etc/profile is readable THEN
	34	# execute ~/.bash_profile
	35	# END IF
	36	# IF ~/.bash_profile is readable THEN
	37	# execute ~/.bash_profile
	38	# ELSE
	39	# IF ~/.bash_login is readable THEN
	40	# execute ~/.bash_login
	41	# ELSE
	42	# IF ~/.profile is readable THEN
	43	# execute ~/.profile
	44	# END IF
	45	# END IF
	46	# END IF
45	47	pre_start()
46	48	{
47		if [ -f /etc/profile ]
48		then
	49	if [ -r /etc/profile ]; then
49	50	. /etc/profile
50	51	fi
51		if [ -f ~/.bash_profile ]
52		then
	52	if [ -r ~/.bash_profile ]; then
53	53	. ~/.bash_profile
54	54	else
55		if [ -f ~/.bash_login ]
56		then
	55	if [ -r ~/.bash_login ]; then
57	56	. ~/.bash_login
58	57	else
59		if [ -f ~/.profile ]
60		then
	58	if [ -r ~/.profile ]; then
61	59	. ~/.profile
62	60	fi
63	61	fi

65	63	return 0
66	64	}
67	65
68		#When you logout of the interactive shell, following is the
69		#sequence of execution:
70		#IF ~/.bash_logout exists THEN
71		# execute ~/.bash_logout
72		#END IF
	66	# When loging out from the interactive shell, the execution sequence is:
	67	#
	68	# IF ~/.bash_logout exists THEN
	69	# execute ~/.bash_logout
	70	# END IF
73	71	post_start()
74	72	{
75		if [ -f ~/.bash_logout ]
76		then
	73	if [ -r ~/.bash_logout ]; then
77	74	. ~/.bash_logout
78	75	fi
79	76	return 0

+0

-173

~~sesman/thread.c~~ less more

0		/**
1		* xrdp: A Remote Desktop Protocol server.
2		*
3		* Copyright (C) Jay Sorg 2004-2013
4		*
5		* Licensed under the Apache License, Version 2.0 (the "License");
6		* you may not use this file except in compliance with the License.
7		* You may obtain a copy of the License at
8		*
9		* http://www.apache.org/licenses/LICENSE-2.0
10		*
11		* Unless required by applicable law or agreed to in writing, software
12		* distributed under the License is distributed on an "AS IS" BASIS,
13		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14		* See the License for the specific language governing permissions and
15		* limitations under the License.
16		*/
17
18		/**
19		*
20		* @file thread.c
21		* @brief thread stuff...
22		* @author Simone Fedele
23		*
24		*/
25
26		#include "sesman.h"
27
28		#include <errno.h>
29		#include <signal.h>
30		#include <pthread.h>
31
32		extern struct config_sesman g_cfg; / in sesman.c */
33
34		static pthread_t g_thread_sighandler;
35		//static pthread_t g_thread_updater;
36
37		/* a variable to pass the socket of s connection to a thread */
38		int g_thread_sck;
39
40		/******************************************************************************/
41		int DEFAULT_CC
42		thread_sighandler_start(void)
43		{
44		int ret;
45		sigset_t sigmask;
46		sigset_t oldmask;
47		sigset_t waitmask;
48
49		/* mask signals to be able to wait for them... */
50		sigfillset(&sigmask);
51		pthread_sigmask(SIG_BLOCK, &sigmask, &oldmask);
52
53		/* unblock some signals... */
54		sigemptyset(&waitmask);
55
56		/* it is a good idea not to block SIGILL SIGSEGV */
57		/* SIGFPE -- see sigaction(2) NOTES */
58		sigaddset(&waitmask, SIGILL);
59		sigaddset(&waitmask, SIGSEGV);
60		sigaddset(&waitmask, SIGFPE);
61		pthread_sigmask(SIG_UNBLOCK, &waitmask, NULL);
62
63		log_message(LOG_LEVEL_INFO, "starting signal handling thread...");
64
65		ret = pthread_create(&g_thread_sighandler, NULL, sig_handler_thread, "");
66		pthread_detach(g_thread_sighandler);
67
68		if (ret == 0)
69		{
70		log_message(LOG_LEVEL_INFO, "signal handler thread started successfully");
71		return 0;
72		}
73
74		/* if something happened while starting a new thread... */
75		switch (ret)
76		{
77		case EINVAL:
78		log_message(LOG_LEVEL_ERROR, "invalid attributes for signal handling thread (creation returned EINVAL)");
79		break;
80		case EAGAIN:
81		log_message(LOG_LEVEL_ERROR, "not enough resources to start signal handling thread (creation returned EAGAIN)");
82		break;
83		case EPERM:
84		log_message(LOG_LEVEL_ERROR, "invalid permissions for signal handling thread (creation returned EPERM)");
85		break;
86		default:
87		log_message(LOG_LEVEL_ERROR, "unknown error starting signal handling thread");
88		}
89
90		return 1;
91		}
92
93		#ifdef JUST_TO_AVOID_COMPILER_ERRORS
94		/******************************************************************************/
95		int DEFAULT_CC
96		thread_session_update_start(void)
97		{
98		int ret;
99		//starts the session update thread
100		//that checks for idle time, destroys sessions, ecc...
101
102		#warning this thread should always request lock_fork before read or write
103		#warning (so we can Fork() In Peace)
104		ret = pthread_create(&g_thread_updater, NULL, , "");
105		pthread_detach(g_thread_updater);
106
107		if (ret == 0)
108		{
109		log_message(&(g_cfg->log), LOG_LEVEL_INFO, "session update thread started successfully");
110		return 0;
111		}
112
113		/* if something happened while starting a new thread... */
114		switch (ret)
115		{
116		case EINVAL:
117		log_message(LOG_LEVEL_ERROR, "invalid attributes for session update thread (creation returned EINVAL)");
118		break;
119		case EAGAIN:
120		log_message(LOG_LEVEL_ERROR, "not enough resources to start session update thread (creation returned EAGAIN)");
121		break;
122		case EPERM:
123		log_message(LOG_LEVEL_ERROR, "invalid permissions for session update thread (creation returned EPERM)");
124		break;
125		default:
126		log_message(LOG_LEVEL_ERROR, "unknown error starting session update thread");
127		}
128
129		return 1;
130		}
131		#endif
132
133		/******************************************************************************/
134		int DEFAULT_CC
135		thread_scp_start(int skt)
136		{
137		int ret;
138		pthread_t th;
139
140		/* blocking the use of thread_skt */
141		lock_socket_acquire();
142		g_thread_sck = skt;
143
144		/* start a thread that processes a connection */
145		ret = pthread_create(&th, NULL, scp_process_start, "");
146		//ret = pthread_create(&th, NULL, scp_process_start, (void*) (&g_thread_sck));
147		pthread_detach(th);
148
149		if (ret == 0)
150		{
151		log_message(LOG_LEVEL_INFO, "scp thread on sck %d started successfully", skt);
152		return 0;
153		}
154
155		/* if something happened while starting a new thread... */
156		switch (ret)
157		{
158		case EINVAL:
159		log_message(LOG_LEVEL_ERROR, "invalid attributes for scp thread on sck %d (creation returned EINVAL)", skt);
160		break;
161		case EAGAIN:
162		log_message(LOG_LEVEL_ERROR, "not enough resources to start scp thread on sck %d (creation returned EAGAIN)", skt);
163		break;
164		case EPERM:
165		log_message(LOG_LEVEL_ERROR, "invalid permissions for scp thread on sck %d (creation returned EPERM)", skt);
166		break;
167		default:
168		log_message(LOG_LEVEL_ERROR, "unknown error starting scp thread on sck %d");
169		}
170
171		return 1;
172		}

+0

-56

~~sesman/thread.h~~ less more

0		/**
1		* xrdp: A Remote Desktop Protocol server.
2		*
3		* Copyright (C) Jay Sorg 2004-2013
4		*
5		* Licensed under the Apache License, Version 2.0 (the "License");
6		* you may not use this file except in compliance with the License.
7		* You may obtain a copy of the License at
8		*
9		* http://www.apache.org/licenses/LICENSE-2.0
10		*
11		* Unless required by applicable law or agreed to in writing, software
12		* distributed under the License is distributed on an "AS IS" BASIS,
13		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14		* See the License for the specific language governing permissions and
15		* limitations under the License.
16		*/
17
18		/**
19		*
20		* @file thread.h
21		* @brief thread stuff...
22		* @author Simone Fedele
23		*
24		*/
25
26		#ifndef THREAD_H
27		#define THREAD_H
28
29		/**
30		*
31		* @brief Starts the signal handling thread
32		* @retval 0 on success
33		* @retval 1 on error
34		*
35		*/
36		int DEFAULT_CC
37		thread_sighandler_start(void);
38
39		/**
40		*
41		* @brief Starts the session update thread
42		*
43		*/
44		int DEFAULT_CC
45		thread_session_update_start(void);
46
47		/**
48		*
49		* @brief Starts a thread to handle an incoming connection
50		*
51		*/
52		int DEFAULT_CC
53		thread_scp_start(int skt);
54
55		#endif

+10

-9

sesman/tools/Makefile.am less more

0		EXTRA_DIST = tcp.h
1
2		AM_CFLAGS = \
	0	AM_CPPFLAGS = \
3	1	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
4	2	-DXRDP_SBIN_PATH=\"${sbindir}\" \
5	3	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
6		-DXRDP_PID_PATH=\"${localstatedir}/run\"
7
8		INCLUDES = \
	4	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
9	5	-I$(top_srcdir)/common \
10	6	-I$(top_srcdir)/sesman/libscp \
11	7	-I$(top_srcdir)/sesman
	8
	9	AM_CFLAGS = $(X_CFLAGS)
12	10
13	11	bin_PROGRAMS = \
14	12	xrdp-sesrun \

20	18	xrdp-xcon
21	19
22	20	xrdp_sesrun_SOURCES = \
	21	config.c \
23	22	sesrun.c \
24	23	tcp.c \
25		config.c
	24	tcp.h
26	25
27	26	xrdp_sestest_SOURCES = \
28	27	sestest.c

47	46	$(top_builddir)/common/libcommon.la \
48	47	$(top_builddir)/sesman/libscp/libscp.la
49	48
	49	xrdp_xcon_LDFLAGS = \
	50	$(X_LIBS)
	51
50	52	xrdp_xcon_LDADD = \
51		-L/usr/X11R6/lib \
52		-lX11
	53	$(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)

+1

-0

sesman/tools/config.c less more

0

#include "../config.c"

+11

-4

sesman/tools/sesadmin.c less more

100	100
101	101	if (0 == g_strncmp(user, "", 1))
102	102	{
103		g_strncpy(user, "root", 256);
	103	cmndHelp();
	104	return 0;
	105	}
	106
	107	if (0 == g_strncmp(cmnd, "", 1))
	108	{
	109	cmndHelp();
	110	return 0;
104	111	}
105	112
106	113	if (0 == g_strncmp(pass, "", 1))

167	174
168	175	void cmndHelp()
169	176	{
170		fprintf(stderr, "sesadmin - a console sesman adminitration tool\n");
171		fprintf(stderr, "sysntax: sesadmin [] COMMAND [OPTIONS]\n\n");
	177	fprintf(stderr, "sesadmin - a console sesman administration tool\n");
	178	fprintf(stderr, "syntax: sesadmin [] COMMAND [OPTIONS]\n\n");
172	179	fprintf(stderr, "-u=<username>: username to connect to sesman [MANDATORY]\n");
173		fprintf(stderr, "-p=<password>: password to connect to sesman [MANDATORY]\n");
	180	fprintf(stderr, "-p=<password>: password to connect to sesman (asked if not given)\n");
174	181	fprintf(stderr, "-s=<hostname>: sesman host (default is localhost)\n");
175	182	fprintf(stderr, "-i=<port> : sesman port (default 3350)\n");
176	183	fprintf(stderr, "-c=<command> : command to execute on the server [MANDATORY]\n");

+1

-1

sesman/tools/sesrun.c less more

114	114	{
115	115	in_uint16_be(in_s, data);
116	116	in_uint16_be(in_s, display);
117		g_printf("ok %d display %d\n", data, display);
	117	g_printf("ok %d display %d\n", (int)data, display);
118	118	}
119	119	}
120	120	}

+2

-2

sesman/tools/sestest.c less more

200	200	}
201	201
202	202	g_printf("session type:\n");
203		g_printf("0: Xvnc\n", SCP_SESSION_TYPE_XVNC);
204		g_printf("1: x11rdp\n", SCP_SESSION_TYPE_XRDP);
	203	g_printf("%d: Xvnc\n", SCP_SESSION_TYPE_XVNC);
	204	g_printf("%d: x11rdp\n", SCP_SESSION_TYPE_XRDP);
205	205	integer = menuSelect(1);
206	206
207	207	if (integer == 1)

+1

-1

sesman/tools/tcp.c less more

18	18	/**
19	19	*
20	20	* @file tcp.c
21		* @brief Tcp stream funcions
	21	* @brief Tcp stream functions
22	22	* @author Jay Sorg, Simone Fedele
23	23	*
24	24	*/

+2

-0

sesman/tools/xcon.c less more

18	18	#include <stdio.h>
19	19	#include <stdlib.h>
20	20	#include <string.h>
	21	#include <unistd.h>
	22	#include <sys/types.h>
21	23	#include <X11/Xlib.h>
22	24
23	25	Display *g_display = 0;

+1

-1

tcutils/README.txt less more

0		A QT based utility program for thinclients using xrdp and NeutrinoRDP
	0	A QT based utility program for thin clients using xrdp and NeutrinoRDP
1	1
2	2	This program sends commands to NeutrinoRDP to do something
3	3	useful on the client end (such as unmounting a USB drive,

+1

-0

tests/.gitignore less more

0

!Makefile

+3

-3

tests/gtcp_proxy/gtcp-proxy.c less more

222	222	}
223	223
224	224	/**
225		* Start listening on specifed local socket; when we get a connection,
	225	* Start listening on specified local socket; when we get a connection,
226	226	* connect to specified remote server and transfer data between local
227	227	* and remote server
228	228	*****************************************************************************/

610	610
611	611	static void on_destroy(GtkWidget *widget, gpointer data)
612	612	{
613		/* this will destory all windows and return control to gtk_main() */
	613	/* this will destroy all windows and return control to gtk_main() */
614	614	gtk_main_quit();
615	615	}
616	616

672	672
673	673	static void on_quit_clicked(GtkWidget *widget, gpointer data)
674	674	{
675		/* this will destory all windows and return control to gtk_main() */
	675	/* this will destroy all windows and return control to gtk_main() */
676	676	gtk_main_quit();
677	677	}

+1

-1

tests/gtcp_proxy/gtcp.c less more

68	68	}
69	69
70	70	/**
71		* Place specifed socket in non blocking mode
	71	* Place specified socket in non blocking mode
72	72	*****************************************************************************/
73	73
74	74	void tcp_set_non_blocking(int skt)

+5

-13

tests/tcp_proxy/main.c less more

25	25	#include <errno.h>
26	26	#include <locale.h>
27	27	#include <netdb.h>
28		#include <sys/types.h>
	28	#include <sys/types.h>
29	29	#include <sys/socket.h>
30	30	#include <netinet/in.h>
31	31	#include <arpa/inet.h>

108	108	g_printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
109	109	}
110	110
111		g_writeln("");
	111	g_writeln("%s", "");
112	112	offset += thisline;
113	113	line += thisline;
114	114	}

394	394	g_signal_user_interrupt(void (*func)(int))
395	395	{
396	396	signal(SIGINT, func);
397		}
398
399		/*****************************************************************************/
400		static void APP_CC
401		g_signal_kill(void (*func)(int))
402		{
403		signal(SIGKILL, func);
404	397	}
405	398
406	399	/*****************************************************************************/

453	446	g_writeln("bind failed");
454	447	}
455	448
456		/* listen for an incomming connection */
	449	/* listen for an incoming connection */
457	450	if (error == 0)
458	451	{
459	452	error = g_tcp_listen(lis_sck);

464	457	}
465	458	}
466	459
467		/* accept an incomming connection */
	460	/* accept an incoming connection */
468	461	if (error == 0)
469	462	{
470	463	while ((!g_terminated) && (error == 0))

522	515
523	516	if (i > 99)
524	517	{
525		g_writeln("timout connecting");
	518	g_writeln("timeout connecting");
526	519	error = 1;
527	520	}
528	521

684	677
685	678	g_init("tcp_proxy");
686	679	g_signal_user_interrupt(proxy_shutdown); /* SIGINT */
687		g_signal_kill(proxy_shutdown); /* SIGKILL */
688	680	g_signal_usr1(clear_counters); /* SIGUSR1 */
689	681	g_signal_terminate(proxy_shutdown); /* SIGTERM */
690	682

+6

-8

vnc/Makefile.am less more

0		EXTRA_DIST = vnc.h
1
2		AM_CFLAGS = \
	0	AM_CPPFLAGS = \
3	1	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
4	2	-DXRDP_SBIN_PATH=\"${sbindir}\" \
5	3	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
6		-DXRDP_PID_PATH=\"${localstatedir}/run\"
7
8		INCLUDES = \
	4	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
9	5	-I$(top_srcdir)/common
10	6
11		lib_LTLIBRARIES = \
	7	module_LTLIBRARIES = \
12	8	libvnc.la
13	9
14		libvnc_la_SOURCES = vnc.c
	10	libvnc_la_SOURCES = \
	11	vnc.c \
	12	vnc.h
15	13
16	14	libvnc_la_LIBADD = \
17	15	$(top_builddir)/common/libcommon.la

+37

-12

vnc/vnc.c less more

52	52	rfbEncryptBytes(char bytes, char passwd)
53	53	{
54	54	char key[24];
	55	char passwd_hash[20];
	56	char passwd_hash_text[40];
55	57	void *des;
	58	void *sha1;
56	59	int len;
	60	int passwd_bytes;
	61
	62	/* create password hash from password */
	63	passwd_bytes = g_strlen(passwd);
	64	sha1 = ssl_sha1_info_create();
	65	ssl_sha1_transform(sha1, "xrdp_vnc", 8);
	66	ssl_sha1_transform(sha1, passwd, passwd_bytes);
	67	ssl_sha1_transform(sha1, passwd, passwd_bytes);
	68	ssl_sha1_complete(sha1, passwd_hash);
	69	ssl_sha1_info_delete(sha1);
	70	g_snprintf(passwd_hash_text, 39, "%2.2x%2.2x%2.2x%2.2x",
	71	(tui8)passwd_hash[0], (tui8)passwd_hash[1],
	72	(tui8)passwd_hash[2], (tui8)passwd_hash[3]);
	73	passwd_hash_text[39] = 0;
	74	passwd = passwd_hash_text;
57	75
58	76	/* key is simply password padded with nulls */
59	77	g_memset(key, 0, sizeof(key));

346	364	}
347	365	else if (msg == 200) /* invalidate */
348	366	{
349		/* FrambufferUpdateRequest */
	367	/* FramebufferUpdateRequest */
350	368	init_stream(s, 8192);
351	369	out_uint8(s, 3);
352	370	out_uint8(s, 0);

672	690	}
673	691	}
674	692
675		/* keep these in 32x32, vnc cursor can be alot bigger */
	693	/* keep these in 32x32, vnc cursor can be a lot bigger */
676	694	if (x > 31)
677	695	{
678	696	x = 31;

708	726
709	727	if (error == 0)
710	728	{
711		/* FrambufferUpdateRequest */
	729	/* FramebufferUpdateRequest */
712	730	init_stream(s, 8192);
713	731	out_uint8(s, 3);
714	732	out_uint8(s, 1);

974	992	v->server_msg(v, "VNC started connecting", 0);
975	993	check_sec_result = 1;
976	994
977		/* only support 8 and 16 bpp connections from rdp client */
978		if ((v->server_bpp != 8) && (v->server_bpp != 15) &&
979		(v->server_bpp != 16) && (v->server_bpp != 24))
980		{
981		v->server_msg(v, "VNC error - only supporting 8, 15, 16 and 24 bpp rdp "
982		"connections", 0);
	995	/* check if bpp is supported for rdp connection */
	996	switch (v->server_bpp)
	997	{
	998	case 8:
	999	case 15:
	1000	case 16:
	1001	case 24:
	1002	case 32:
	1003	break;
	1004	default:
	1005	v->server_msg(v, "VNC error - only supporting 8, 15, 16, 24 and 32 "
	1006	"bpp rdp connections", 0);
983	1007	return 1;
984	1008	}
985	1009

1022	1046	if (error == 0)
1023	1047	{
1024	1048	v->server_msg(v, "VNC tcp connected", 0);
1025		/* protocal version */
	1049	/* protocol version */
1026	1050	init_stream(s, 8192);
1027	1051	error = trans_force_read_s(v->trans, s, 12);
1028	1052	if (error == 0)

1080	1104
1081	1105	if (error != 0)
1082	1106	{
1083		log_message(LOG_LEVEL_DEBUG, "VNC Error after security negotiation");
	1107	log_message(LOG_LEVEL_DEBUG, "VNC error %d after security negotiation",
	1108	error);
1084	1109	}
1085	1110
1086	1111	if (error == 0 && check_sec_result)

1290	1315
1291	1316	if (error == 0)
1292	1317	{
1293		/* FrambufferUpdateRequest */
	1318	/* FramebufferUpdateRequest */
1294	1319	init_stream(s, 8192);
1295	1320	out_uint8(s, 3);
1296	1321	out_uint8(s, 0);

+2

-2

vnc/vnc.h less more

61	61	int (server_set_bgcolor)(struct vnc v, int bgcolor);
62	62	int (server_set_opcode)(struct vnc v, int opcode);
63	63	int (server_set_mixmode)(struct vnc v, int mixmode);
64		int (server_set_brush)(struct vnc v, int x_orgin, int y_orgin,
	64	int (server_set_brush)(struct vnc v, int x_origin, int y_origin,
65	65	int style, char* pattern);
66	66	int (server_set_pen)(struct vnc v, int style,
67	67	int width);
68	68	int (server_draw_line)(struct vnc v, int x1, int y1, int x2, int y2);
69		int (server_add_char)(struct vnc v, int font, int charactor,
	69	int (server_add_char)(struct vnc v, int font, int character,
70	70	int offset, int baseline,
71	71	int width, int height, char* data);
72	72	int (server_draw_text)(struct vnc v, int font,

+1

-1

vrplayer/decoderthread.cpp less more

22	22	/*
23	23	* TODO:
24	24	* o need to maintain aspect ratio while resizing
25		* o clicking in the middle of the slider bar shuld move the slider to the middle
	25	* o clicking in the middle of the slider bar should move the slider to the middle
26	26	* o need to be able to rewind the move when it is done playing
27	27	* o need to be able to load another move and play it w/o restarting player
28	28	* o pause button needs to work

+1

-1

vrplayer/mainwindow.h less more

61	61	~MainWindow();
62	62
63	63	signals:
64		void onGeometryChanged(int x, int y, int widht, int height);
	64	void onGeometryChanged(int x, int y, int width, int height);
65	65
66	66	public slots:
67	67	void onSliderValueChanged(int value);

+1

-0

xorg/.gitignore less more

0

!Makefile

+5

-5

xorg/X11R7.6/rdp/rdp.h less more

557	557	int
558	558	rdpup_set_cursor_ex(short x, short y, char cur_data, char cur_mask, int bpp);
559	559	int
560		rdpup_create_os_surface(int rdpindexd, int width, int height);
561		int
562		rdpup_create_os_surface_bpp(int rdpindexd, int width, int height, int bpp);
	560	rdpup_create_os_surface(int rdpindex, int width, int height);
	561	int
	562	rdpup_create_os_surface_bpp(int rdpindex, int width, int height, int bpp);
563	563	int
564	564	rdpup_switch_os_surface(int rdpindex);
565	565	int

581	581	int
582	582	rdpup_check_dirty_screen(rdpPixmapRec* pDirtyPriv);
583	583	int
584		rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy,
	584	rdpup_add_char(int font, int character, short x, short y, int cx, int cy,
585	585	char* bmpdata, int bmpdata_bytes);
586	586	int
587		rdpup_add_char_alpha(int font, int charactor, short x, short y, int cx, int cy,
	587	rdpup_add_char_alpha(int font, int character, short x, short y, int cx, int cy,
588	588	char* bmpdata, int bmpdata_bytes);
589	589	int
590	590	rdpup_draw_text(int font, int flags, int mixmode,

+6

-6

xorg/X11R7.6/rdp/rdpComposite.c less more

223	223
224	224	/******************************************************************************/
225	225	static int
226		compsoite_print(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
	226	composite_print(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
227	227	INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst,
228	228	INT16 yDst, CARD16 width, CARD16 height)
229	229	{

232	232	rdpPixmapRec* pSrcPriv;
233	233	rdpPixmapRec* pDstPriv;
234	234
235		LLOGLN(0, ("compsoite_print: op %d xSrc %d ySrc %d xDst %d yDst %d "
	235	LLOGLN(0, ("composite_print: op %d xSrc %d ySrc %d xDst %d yDst %d "
236	236	"width %d height %d",
237	237	op, xSrc, ySrc, xDst, yDst, width, height));
238	238

492	492	{
493	493	LLOGLN(10, ("check_drawables: can not remote [%s]", g_com_fail_strings[fail_reason]));
494	494	#if 0
495		compsoite_print(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
	495	composite_print(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
496	496	xDst, yDst, width, height);
497	497	#endif
498	498	}

500	500	{
501	501	LLOGLN(10, ("check_drawables: can remote [%s]", g_com_fail_strings[fail_reason]));
502	502	#if 0
503		compsoite_print(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
	503	composite_print(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
504	504	xDst, yDst, width, height);
505	505	#endif
506	506	}

706	706	{
707	707	if (pMask != 0)
708	708	{
709		/* TODO: here we can try to send it as a gylph */
	709	/* TODO: here we can try to send it as a glyph */
710	710	}
711	711	}
712	712	}

744	744	post_process = 1;
745	745	if (g_do_dirty_os)
746	746	{
747		LLOGLN(10, ("rdpComposite: gettig dirty"));
	747	LLOGLN(10, ("rdpComposite: getting dirty"));
748	748	pDstPriv->is_dirty = 1;
749	749	dirty_type = g_doing_font ? RDI_IMGLL : RDI_IMGLY;
750	750	pDirtyPriv = pDstPriv;

+4

-4

xorg/X11R7.6/rdp/rdpPolyFillRect.c less more

187	187	pGC->alu == GXnoop \|\|
188	188	pGC->alu == GXand \|\|
189	189	pGC->alu == GXcopy /*\|\|
190		pGC->alu == GXxor/)) / todo, why dosen't xor work? */
	190	pGC->alu == GXxor/)) / todo, why doesn't xor work? */
191	191	{
192	192	draw_item_add_fill_region(pDirtyPriv, fill_reg, pGC->fgPixel,
193	193	pGC->alu);

209	209	pGC->alu == GXnoop \|\|
210	210	pGC->alu == GXand \|\|
211	211	pGC->alu == GXcopy /*\|\|
212		pGC->alu == GXxor/)) / todo, why dosen't xor work? */
	212	pGC->alu == GXxor/)) / todo, why doesn't xor work? */
213	213	{
214	214	rdpup_set_fgcolor(pGC->fgPixel);
215	215	rdpup_set_opcode(pGC->alu);

252	252	pGC->alu == GXnoop \|\|
253	253	pGC->alu == GXand \|\|
254	254	pGC->alu == GXcopy /*\|\|
255		pGC->alu == GXxor/)) / todo, why dosen't xor work? */
	255	pGC->alu == GXxor/)) / todo, why doesn't xor work? */
256	256	{
257	257	LLOGLN(10, ("rdpPolyFillRect: 3"));
258	258	draw_item_add_fill_region(pDirtyPriv, &clip_reg,

279	279	pGC->alu == GXnoop \|\|
280	280	pGC->alu == GXand \|\|
281	281	pGC->alu == GXcopy /*\|\|
282		pGC->alu == GXxor/)) / todo, why dosen't xor work? */
	282	pGC->alu == GXxor/)) / todo, why doesn't xor work? */
283	283	{
284	284	rdpup_set_fgcolor(pGC->fgPixel);
285	285	rdpup_set_opcode(pGC->alu);

+2

-2

xorg/X11R7.6/rdp/rdpdraw.c less more

607	607	/******************************************************************************/
608	608	/* returns boolean */
609	609	static int
610		region_interect_at_all(RegionPtr reg_small, RegionPtr reg_big)
	610	region_intersect_at_all(RegionPtr reg_small, RegionPtr reg_big)
611	611	{
612	612	int rv;
613	613	RegionRec reg;

718	718	{
719	719	if ((di->type == RDI_TEXT) && (di_prev->type == RDI_IMGLY))
720	720	{
721		if (region_interect_at_all(di->reg, di_prev->reg))
	721	if (region_intersect_at_all(di->reg, di_prev->reg))
722	722	{
723	723	di_prev->type = RDI_IMGLL;
724	724	}

+2

-2

xorg/X11R7.6/rdp/rdpglyph.c less more

502	502	PictFormatPtr format;
503	503	} GlyphListRec, *GlyphListPtr;
504	504	*/
505		/* see ghyphstr.h but the follow is not in there
	505	/* see glyphstr.h but the following is not in there
506	506	typedef struct _XGlyphInfo {
507	507	unsigned short width;
508	508	unsigned short height;

556	556	post_process = 1;
557	557	if (g_do_dirty_os)
558	558	{
559		LLOGLN(10, ("rdpGlyphu: gettig dirty"));
	559	LLOGLN(10, ("rdpGlyphu: getting dirty"));
560	560	pDstPriv->is_dirty = 1;
561	561	dirty_type = RDI_IMGLL;
562	562	pDirtyPriv = pDstPriv;

+13

-13

xorg/X11R7.6/rdp/rdpinput.c less more

25	25	flags right so control down is used to determine between pause and
26	26	num lock */
27	27	/* this should be fixed in rdesktop */
28		/* g_pause_spe flag for specal control sent by ms client before scan code
	28	/* g_pause_spe flag for special control sent by ms client before scan code
29	29	69 is sent to tell that its pause, not num lock. both pause and num
30	30	lock use scan code 69 */
31	31

67	67	static OsTimerPtr g_timer = 0;
68	68	static int g_x = 0;
69	69	static int g_y = 0;
70		static int g_timer_schedualed = 0;
	70	static int g_timer_scheduled = 0;
71	71	static int g_delay_motion = 1; /* turn on or off */
72	72	static int g_use_evdev = 0;
73	73

181	181	if (ctrls->enabled_ctrls & XkbRepeatKeysMask)
182	182	{
183	183	LLOGLN(10, ("rdpChangeKeyboardControl: autoRepeat on"));
184		/* schedual to turn off the autorepeat after 100 ms so any app
	184	/* schedule to turn off the autorepeat after 100 ms so any app
185	185	* polling it will be happy it's on */
186	186	g_kbtimer = TimerSet(g_kbtimer, 0, 100,
187	187	rdpInDeferredUpdateCallback, 0);

237	237	0x0000042C Azeri Latin
238	238	0x0000042F FYRO Macedonian
239	239	0x00000437 Georgian
240		0x00000438 Faeroese
	240	0x00000438 Faroese
241	241	0x00000439 Devanagari - INSCRIPT
242	242	0x0000043A Maltese 47-key
243	243	0x0000043B Norwegian with Sami

858	858	rdpDeferredInputCallback(OsTimerPtr timer, CARD32 now, pointer arg)
859	859	{
860	860	LLOGLN(10, ("rdpDeferredInputCallback:"));
861		g_timer_schedualed = 0;
	861	g_timer_scheduled = 0;
862	862	if ((g_old_x != g_x) \|\| (g_old_y != g_y))
863	863	{
864	864	rdpEnqueueMotion(g_x, g_y);

883	883	return;
884	884	}
885	885	send_now = (buttonMask ^ g_old_button_mask) \|\| (g_delay_motion == 0);
886		LLOGLN(10, ("PtrAddEvent: send_now %d g_timer_schedualed %d",
887		send_now, g_timer_schedualed));
	886	LLOGLN(10, ("PtrAddEvent: send_now %d g_timer_scheduled %d",
	887	send_now, g_timer_scheduled));
888	888	if (send_now)
889	889	{
890		if (g_timer_schedualed)
891		{
892		g_timer_schedualed = 0;
	890	if (g_timer_scheduled)
	891	{
	892	g_timer_scheduled = 0;
893	893	TimerCancel(g_timer);
894	894	}
895	895	if ((g_old_x != x) \|\| (g_old_y != y))

922	922	{
923	923	g_x = x;
924	924	g_y = y;
925		if (!g_timer_schedualed)
926		{
927		g_timer_schedualed = 1;
	925	if (!g_timer_scheduled)
	926	{
	927	g_timer_scheduled = 1;
928	928	g_timer = TimerSet(g_timer, 0, 60, rdpDeferredInputCallback, 0);
929	929	}
930	930	}

+3

-3

xorg/X11R7.6/rdp/rdpkeyboardbase.c less more

55	55	#define XSCAN_KP_3 89
56	56	#define XSCAN_KP_0 90
57	57	#define XSCAN_KP_Decimal 91
58		/* "/ ?" on br keybaord */
	58	/* "/ ?" on br keyboard */
59	59	#define XSCAN_97 97 /* ------------------------------? */
60	60	#define XSCAN_Enter 108 /* 104 / / on keypad */
61	61	#define XSCAN_Control_R 109 /* 105 */

80	80	#define XSCAN_Menu 117 /* 135 */
81	81	#define XSCAN_LMeta 156
82	82	#define XSCAN_RMeta 156
83		#define XSCAN_211 211 /* "/ ?" on br keybaord, "\ _" on jp keyboard */
	83	#define XSCAN_211 211 /* "/ ?" on br keyboard, "\ _" on jp keyboard */
84	84
85	85	/******************************************************************************/
86	86	void

278	278	break;
279	279
280	280	case RDPSCAN_115:
281		rdpEnqueueKey(type, XSCAN_211); /* "/ ?" on br keybaord, "\ _" on jp keyboard */
	281	rdpEnqueueKey(type, XSCAN_211); /* "/ ?" on br keyboard, "\ _" on jp keyboard */
282	282	break;
283	283
284	284	case RDPSCAN_126:

+2

-2

xorg/X11R7.6/rdp/rdpkeyboardevdev.c less more

55	55	#define XSCAN_KP_3 89
56	56	#define XSCAN_KP_0 90
57	57	#define XSCAN_KP_Decimal 91
58		/* "/ ?" on br keybaord */
	58	/* "/ ?" on br keyboard */
59	59	#define XSCAN_97 97
60	60	#define XSCAN_Enter 104 /* on keypad */
61	61	#define XSCAN_Control_R 105

277	277	break;
278	278
279	279	case RDPSCAN_115:
280		rdpEnqueueKey(type, XSCAN_97); /* "/ ?" on br keybaord */
	280	rdpEnqueueKey(type, XSCAN_97); /* "/ ?" on br keyboard */
281	281	break;
282	282
283	283	case RDPSCAN_126:

+11

-4

xorg/X11R7.6/rdp/rdpmain.c less more

40	40	#endif
41	41
42	42	#if XRDP_DISABLE_LINUX_ABSTRACT
43		/* because including <X11/Xtrans/Xtransint.h> in problematic
	43	/* because including <X11/Xtrans/Xtransint.h> is problematic
44	44	* we dup a small struct
45	45	* we need to set flags to zero to turn off abstract sockets */
46	46	struct _MyXtransport

138	138	rdpPointerNewEventScreen
139	139	};
140	140
	141	int glGetBufferSubData(void);
	142
141	143	/******************************************************************************/
142	144	/* returns error, zero is good */
143	145	static int

187	189	g_redBits = 8;
188	190	g_greenBits = 8;
189	191	g_blueBits = 8;
	192	}
	193	else if (g_bpp == 33)
	194	{
	195	/* will never happen */
	196	glGetBufferSubData();
190	197	}
191	198	else
192	199	{

413	420	g_rdpScreen.CloseScreen = pScreen->CloseScreen;
414	421	/* GC procedures */
415	422	g_rdpScreen.CreateGC = pScreen->CreateGC;
416		/* Pixmap procudures */
	423	/* Pixmap procedures */
417	424	g_rdpScreen.CreatePixmap = pScreen->CreatePixmap;
418	425	g_rdpScreen.DestroyPixmap = pScreen->DestroyPixmap;
419	426

589	596	/******************************************************************************/
590	597	/* this is the first function called, it can be called many times
591	598	returns the number or parameters processed
592		if it dosen't apply to the rdp part, return 0 */
	599	if it doesn't apply to the rdp part, return 0 */
593	600	int
594	601	ddxProcessArgument(int argc, char **argv, int i)
595	602	{

653	660	OsVendorInit(void)
654	661	{
655	662	#if XRDP_DISABLE_LINUX_ABSTRACT
656		/* turn off the Linux abstract unix doamin sockets TRANS_ABSTRACT */
	663	/* turn off the Linux abstract unix domain sockets TRANS_ABSTRACT */
657	664	/* TRANS_NOLISTEN = 1 << 3 */
658	665	_XSERVTransSocketLocalFuncs.flags = 0;
659	666	#endif

+2

-2

xorg/X11R7.6/rdp/rdpmisc.c less more

253	253
254	254	//#ifdef _XSERVER64
255	255	#if 1
256		/* I thought xalloc whould work here but I guess not, why, todo */
	256	/* I thought xalloc would work here but I guess not, why, todo */
257	257	rv = (char *)malloc(size);
258	258	#else
259	259	rv = (char *)Xalloc(size);

278	278	{
279	279	//#ifdef _XSERVER64
280	280	#if 1
281		/* I thought xfree whould work here but I guess not, why, todo */
	281	/* I thought xfree would work here but I guess not, why, todo */
282	282	free(ptr);
283	283	#else
284	284	Xfree(ptr);

+163

-7

xorg/X11R7.6/rdp/rdprandr.c less more

37	37
38	38	static XID g_wid = 0;
39	39
	40	static int g_panning = 0;
	41
	42	#define LOG_LEVEL 1
	43	#define LLOG(_level, _args) \
	44	do { if (_level < LOG_LEVEL) { ErrorF _args ; } } while (0)
	45	#define LLOGLN(_level, _args) \
	46	do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
	47
40	48	/******************************************************************************/
41	49	Bool
42	50	rdpRRRegisterSize(ScreenPtr pScreen, int width, int height)

67	75	Bool
68	76	rdpRRGetInfo(ScreenPtr pScreen, Rotation *pRotations)
69	77	{
70		int width;
71		int height;
72
73	78	ErrorF("rdpRRGetInfo:\n");
74	79	*pRotations = RR_Rotate_0;
75
76		width = g_rdpScreen.width;
77		height = g_rdpScreen.height;
78		rdpRRRegisterSize(pScreen, width, height);
79	80	return TRUE;
80	81	}
81	82

213	214	rdpRRCrtcGetGamma(ScreenPtr pScreen, RRCrtcPtr crtc)
214	215	{
215	216	ErrorF("rdpRRCrtcGetGamma:\n");
	217	crtc->gammaSize = 1;
	218	if (crtc->gammaRed == NULL)
	219	{
	220	crtc->gammaRed = g_malloc(32, 1);
	221	}
	222	if (crtc->gammaBlue == NULL)
	223	{
	224	crtc->gammaBlue = g_malloc(32, 1);
	225	}
	226	if (crtc->gammaGreen == NULL)
	227	{
	228	crtc->gammaGreen = g_malloc(32, 1);
	229	}
216	230	return TRUE;
217	231	}
218	232

255	269	BoxPtr trackingArea, INT16 *border)
256	270	{
257	271	ErrorF("rdpRRGetPanning:\n");
	272
	273	if (!g_panning)
	274	{
	275	return FALSE;
	276	}
258	277
259	278	if (totalArea != 0)
260	279	{

291	310	ErrorF("rdpRRSetPanning:\n");
292	311	return TRUE;
293	312	}
	313
	314	/******************************************************************************/
	315	static RROutputPtr
	316	rdpRRAddOutput(const char *aname, int x, int y, int width, int height)
	317	{
	318	RRModePtr mode;
	319	RRCrtcPtr crtc;
	320	RROutputPtr output;
	321	xRRModeInfo modeInfo;
	322	char name[64];
	323
	324	sprintf (name, "%dx%d", width, height);
	325	memset (&modeInfo, 0, sizeof(modeInfo));
	326	modeInfo.width = width;
	327	modeInfo.height = height;
	328	modeInfo.nameLength = strlen(name);
	329	mode = RRModeGet(&modeInfo, name);
	330	if (mode == 0)
	331	{
	332	LLOGLN(0, ("rdpRRAddOutput: RRModeGet failed"));
	333	return 0;
	334	}
	335
	336	crtc = RRCrtcCreate(g_pScreen, NULL);
	337	if (crtc == 0)
	338	{
	339	LLOGLN(0, ("rdpRRAddOutput: RRCrtcCreate failed"));
	340	RRModeDestroy(mode);
	341	return 0;
	342	}
	343	output = RROutputCreate(g_pScreen, aname, strlen(aname), NULL);
	344	if (output == 0)
	345	{
	346	LLOGLN(0, ("rdpRRAddOutput: RROutputCreate failed"));
	347	RRCrtcDestroy(crtc);
	348	RRModeDestroy(mode);
	349	return 0;
	350	}
	351	if (!RROutputSetClones(output, NULL, 0))
	352	{
	353	LLOGLN(0, ("rdpRRAddOutput: RROutputSetClones failed"));
	354	}
	355	if (!RROutputSetModes(output, &mode, 1, 0))
	356	{
	357	LLOGLN(0, ("rdpRRAddOutput: RROutputSetModes failed"));
	358	}
	359	if (!RROutputSetCrtcs(output, &crtc, 1))
	360	{
	361	LLOGLN(0, ("rdpRRAddOutput: RROutputSetCrtcs failed"));
	362	}
	363	if (!RROutputSetConnection(output, RR_Connected))
	364	{
	365	LLOGLN(0, ("rdpRRAddOutput: RROutputSetConnection failed"));
	366	}
	367	RRCrtcNotify(crtc, mode, x, y, RR_Rotate_0, NULL, 1, &output);
	368
	369	return output;
	370	}
	371
	372	/******************************************************************************/
	373	static void
	374	RRSetPrimaryOutput(rrScrPrivPtr pScrPriv, RROutputPtr output)
	375	{
	376	if (pScrPriv->primaryOutput == output)
	377	{
	378	return;
	379	}
	380	/* clear the old primary */
	381	if (pScrPriv->primaryOutput)
	382	{
	383	RROutputChanged(pScrPriv->primaryOutput, 0);
	384	pScrPriv->primaryOutput = NULL;
	385	}
	386	/* set the new primary */
	387	if (output)
	388	{
	389	pScrPriv->primaryOutput = output;
	390	RROutputChanged(output, 0);
	391	}
	392	pScrPriv->layoutChanged = TRUE;
	393	}
	394
	395	/******************************************************************************/
	396	int
	397	rdpRRSetRdpOutputs(void)
	398	{
	399	rrScrPrivPtr pRRScrPriv;
	400	int index;
	401	int width;
	402	int height;
	403	char text[256];
	404	RROutputPtr output;
	405
	406	pRRScrPriv = rrGetScrPriv(g_pScreen);
	407
	408	LLOGLN(0, ("rdpRRSetRdpOutputs: numCrtcs %d", pRRScrPriv->numCrtcs));
	409	while (pRRScrPriv->numCrtcs > 0)
	410	{
	411	RRCrtcDestroy(pRRScrPriv->crtcs[0]);
	412	}
	413	LLOGLN(0, ("rdpRRSetRdpOutputs: numOutputs %d", pRRScrPriv->numOutputs));
	414	while (pRRScrPriv->numOutputs > 0)
	415	{
	416	RROutputDestroy(pRRScrPriv->outputs[0]);
	417	}
	418
	419	if (g_rdpScreen.client_info.monitorCount == 0)
	420	{
	421	rdpRRAddOutput("rdp0", 0, 0, g_rdpScreen.width, g_rdpScreen.height);
	422	}
	423	else
	424	{
	425	for (index = 0; index < g_rdpScreen.client_info.monitorCount; index++)
	426	{
	427	snprintf(text, 255, "rdp%d", index);
	428	width = g_rdpScreen.client_info.minfo[index].right - g_rdpScreen.client_info.minfo[index].left + 1;
	429	height = g_rdpScreen.client_info.minfo[index].bottom - g_rdpScreen.client_info.minfo[index].top + 1;
	430	output = rdpRRAddOutput(text,
	431	g_rdpScreen.client_info.minfo[index].left,
	432	g_rdpScreen.client_info.minfo[index].top,
	433	width, height);
	434	if ((output != 0) && (g_rdpScreen.client_info.minfo[index].is_primary))
	435	{
	436	RRSetPrimaryOutput(pRRScrPriv, output);
	437	}
	438	}
	439	}
	440
	441	for (index = 0; index < pRRScrPriv->numOutputs; index++)
	442	{
	443	RROutputSetCrtcs(pRRScrPriv->outputs[index], pRRScrPriv->crtcs,
	444	pRRScrPriv->numCrtcs);
	445	}
	446
	447	return 0;
	448	}
	449

+3

-0

xorg/X11R7.6/rdp/rdprandr.h less more

56	56	rdpRRSetPanning(ScreenPtr pScrn, RRCrtcPtr crtc, BoxPtr totalArea,
57	57	BoxPtr trackingArea, INT16* border);
58	58
	59	int
	60	rdpRRSetRdpOutputs(void);
	61
59	62	#endif

+37

-10

xorg/X11R7.6/rdp/rdpup.c less more

21	21	#include "rdp.h"
22	22	#include "xrdp_rail.h"
23	23	#include "rdpglyph.h"
	24	#include "rdprandr.h"
24	25
25	26	#include <signal.h>
26	27	#include <sys/ipc.h>

711	712	static int
712	713	process_screen_size_msg(int width, int height, int bpp)
713	714	{
714		RRScreenSizePtr pSize;
715	715	int mmwidth;
716	716	int mmheight;
717	717	int bytes;

782	782
783	783	mmwidth = PixelToMM(width);
784	784	mmheight = PixelToMM(height);
785
786		pSize = RRRegisterSize(g_pScreen, width, height, mmwidth, mmheight);
787		RRSetCurrentConfig(g_pScreen, RR_Rotate_0, 0, pSize);
788	785
789	786	if ((g_rdpScreen.width != width) \|\| (g_rdpScreen.height != height))
790	787	{

929	926	int y;
930	927	int cx;
931	928	int cy;
	929	int index;
932	930	RegionRec reg;
933	931	BoxRec box;
934	932

1118	1116	{
1119	1117	LLOGLN(0, (" client can not do new(color) cursor"));
1120	1118	}
	1119
1121	1120	if (g_rdpScreen.client_info.monitorCount > 0)
1122	1121	{
1123	1122	LLOGLN(0, (" client can do multimon"));
1124	1123	LLOGLN(0, (" client monitor data, monitorCount= %d", g_rdpScreen.client_info.monitorCount));
	1124	box.x1 = g_rdpScreen.client_info.minfo[0].left;
	1125	box.y1 = g_rdpScreen.client_info.minfo[0].top;
	1126	box.x2 = g_rdpScreen.client_info.minfo[0].right;
	1127	box.y2 = g_rdpScreen.client_info.minfo[0].bottom;
1125	1128	g_do_multimon = 1;
	1129	/* adjust monitor info so it's not negative */
	1130	for (index = 1; index < g_rdpScreen.client_info.monitorCount; index++)
	1131	{
	1132	box.x1 = min(box.x1, g_rdpScreen.client_info.minfo[index].left);
	1133	box.y1 = min(box.y1, g_rdpScreen.client_info.minfo[index].top);
	1134	box.x2 = max(box.x2, g_rdpScreen.client_info.minfo[index].right);
	1135	box.y2 = max(box.y2, g_rdpScreen.client_info.minfo[index].bottom);
	1136	}
	1137	for (index = 0; index < g_rdpScreen.client_info.monitorCount; index++)
	1138	{
	1139	g_rdpScreen.client_info.minfo[index].left -= box.x1;
	1140	g_rdpScreen.client_info.minfo[index].top -= box.y1;
	1141	g_rdpScreen.client_info.minfo[index].right -= box.x1;
	1142	g_rdpScreen.client_info.minfo[index].bottom -= box.y1;
	1143	LLOGLN(0, (" left %d top %d right %d bottom %d",
	1144	g_rdpScreen.client_info.minfo[index].left,
	1145	g_rdpScreen.client_info.minfo[index].top,
	1146	g_rdpScreen.client_info.minfo[index].right,
	1147	g_rdpScreen.client_info.minfo[index].bottom));
	1148	}
	1149	rdpRRSetRdpOutputs();
	1150	RRTellChanged(g_pScreen);
1126	1151	}
1127	1152	else
1128	1153	{
1129	1154	LLOGLN(0, (" client can not do multimon"));
1130	1155	g_do_multimon = 0;
	1156	rdpRRSetRdpOutputs();
	1157	RRTellChanged(g_pScreen);
1131	1158	}
1132	1159
1133	1160	rdpLoadLayout(&(g_rdpScreen.client_info));

1318	1345	g_disconnect_timeout_s = 60;
1319	1346	}
1320	1347
1321		rdpLog("kill disconencted [%d] timeout [%d] sec\n", g_do_kill_disconnected,
	1348	rdpLog("kill disconnected [%d] timeout [%d] sec\n", g_do_kill_disconnected,
1322	1349	g_disconnect_timeout_s);
1323	1350
1324	1351	return 1;

2121	2148	safety = 0;
2122	2149	while (RegionContainsRect(g_shm_reg, &box))
2123	2150	{
2124		/* instread of rdpup_end_update, call rdpup_send_pending */
	2151	/* instead of rdpup_end_update, call rdpup_send_pending */
2125	2152	rdpup_send_pending();
2126	2153	rdpup_begin_update();
2127	2154	safety++;

2822	2849
2823	2850	/******************************************************************************/
2824	2851	int
2825		rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy,
	2852	rdpup_add_char(int font, int character, short x, short y, int cx, int cy,
2826	2853	char* bmpdata, int bmpdata_bytes)
2827	2854	{
2828	2855	if (g_connected)

2833	2860	out_uint16_le(g_out_s, 18 + bmpdata_bytes); /* size */
2834	2861	g_count++;
2835	2862	out_uint16_le(g_out_s, font);
2836		out_uint16_le(g_out_s, charactor);
	2863	out_uint16_le(g_out_s, character);
2837	2864	out_uint16_le(g_out_s, x);
2838	2865	out_uint16_le(g_out_s, y);
2839	2866	out_uint16_le(g_out_s, cx);

2846	2873
2847	2874	/******************************************************************************/
2848	2875	int
2849		rdpup_add_char_alpha(int font, int charactor, short x, short y, int cx, int cy,
	2876	rdpup_add_char_alpha(int font, int character, short x, short y, int cx, int cy,
2850	2877	char* bmpdata, int bmpdata_bytes)
2851	2878	{
2852	2879	if (g_connected)

2857	2884	out_uint16_le(g_out_s, 18 + bmpdata_bytes); /* size */
2858	2885	g_count++;
2859	2886	out_uint16_le(g_out_s, font);
2860		out_uint16_le(g_out_s, charactor);
	2887	out_uint16_le(g_out_s, character);
2861	2888	out_uint16_le(g_out_s, x);
2862	2889	out_uint16_le(g_out_s, y);
2863	2890	out_uint16_le(g_out_s, cx);

+1

-1

xorg/X11R7.6/rdp/rdpxv.c less more

164	164	rdpXvSetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute,
165	165	INT32 value)
166	166	{
167		LLOGLN(0, ("rdpXvxSetPortAttribute:"));
	167	LLOGLN(0, ("rdpXvSetPortAttribute:"));
168	168	return Success;
169	169	}
170	170

+1

-1

xorg/X11R7.6/x11_file_list.txt less more

11	11	libpng-1.2.46.tar.gz : libpng-1.2.46 :
12	12	pixman-0.30.0.tar.bz2 : pixman-0.30.0 : --disable-gtk
13	13	freetype-2.4.6.tar.bz2 : freetype-2.4.6 :
14		fontconfig-2.8.0.tar.gz : fontconfig-2.8.0 :
	14	fontconfig-2.8.0.tar.gz : fontconfig-2.8.0 : --disable-docs
15	15	cairo-1.8.8.tar.gz : cairo-1.8.8 :
16	16	expat-2.0.1.tar.gz : expat-2.0.1 :
17	17	xextproto-7.1.2.tar.bz2 : xextproto-7.1.2 :

+1

-1

xorg/tests/randr/trandr.c less more

142	142	}
143	143
144	144	return 0;
145		}⏎
	145	}

+1

-1

xorg/tests/xdemo/bmp_parser.c less more

69	69
70	70	if ((fd = open(filename, O_RDONLY)) < 0)
71	71	{
72		printf("error opeing %s\n", filename);
	72	printf("error opening %s\n", filename);
73	73	return -1;
74	74	}
75	75

+1

-1

xorg/tests/xdemo/xdemo.c less more

204	204	}
205	205	else
206	206	{
207		printf("XListFonts() reted NULL\n");
	207	printf("XListFonts() returned NULL\n");
208	208	}
209	209
210	210	#endif

+1

-1

xorgxrdp/configure.ac less more

0	0	# Process this file with autoconf to produce a configure script
1	1
2	2	AC_PREREQ(2.59)
3		AC_INIT([xrdpmod], [0.1.0], [xrdp-devel@lists.sourceforge.net])
	3	AC_INIT([xrdpmod], [0.1.0], [xrdp-devel@googlegroups.com])
4	4	AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
5	5	AM_INIT_AUTOMAKE([1.6 foreign])
6	6	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])

+4

-2

xorgxrdp/module/Makefile.am less more

8	8	amd64/i420_to_rgb32_amd64_sse2.asm \
9	9	amd64/yuy2_to_rgb32_amd64_sse2.asm \
10	10	amd64/uyvy_to_rgb32_amd64_sse2.asm \
11		amd64/a8r8g8b8_to_a8b8g8r8_box_amd64_sse2.asm
	11	amd64/a8r8g8b8_to_a8b8g8r8_box_amd64_sse2.asm \
	12	amd64/a8r8g8b8_to_nv12_box_amd64_sse2.asm
12	13	EXTRA_FLAGS += -DSIMD_USE_ACCEL=1
13	14	endif
14	15

18	19	x86/i420_to_rgb32_x86_sse2.asm \
19	20	x86/yuy2_to_rgb32_x86_sse2.asm \
20	21	x86/uyvy_to_rgb32_x86_sse2.asm \
21		x86/a8r8g8b8_to_a8b8g8r8_box_x86_sse2.asm
	22	x86/a8r8g8b8_to_a8b8g8r8_box_x86_sse2.asm \
	23	x86/a8r8g8b8_to_nv12_box_x86_sse2.asm
22	24	EXTRA_FLAGS += -DSIMD_USE_ACCEL=1
23	25	endif
24	26

+324

-0

xorgxrdp/module/amd64/a8r8g8b8_to_nv12_box_amd64_sse2.asm less more

	0	;
	1	;Copyright 2015 Jay Sorg
	2	;
	3	;Permission to use, copy, modify, distribute, and sell this software and its
	4	;documentation for any purpose is hereby granted without fee, provided that
	5	;the above copyright notice appear in all copies and that both that
	6	;copyright notice and this permission notice appear in supporting
	7	;documentation.
	8	;
	9	;The above copyright notice and this permission notice shall be included in
	10	;all copies or substantial portions of the Software.
	11	;
	12	;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	13	;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	14	;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	15	;OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	16	;AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	17	;CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	18	;
	19	;ARGB to NV12
	20	;amd64 SSE2
	21	;
	22	; notes
	23	; address s8 should be aligned on 16 bytes, will be slower if not
	24	; width should be multile of 8 and > 0
	25	; height should be even and > 0
	26
	27	SECTION .data
	28
	29	align 16
	30
	31	cd255 times 4 dd 255
	32
	33	cw255 times 8 dw 255
	34	cw16 times 8 dw 16
	35	cw128 times 8 dw 128
	36	cw66 times 8 dw 66
	37	cw129 times 8 dw 129
	38	cw25 times 8 dw 25
	39	cw38 times 8 dw 38
	40	cw74 times 8 dw 74
	41	cw112 times 8 dw 112
	42	cw94 times 8 dw 94
	43	cw18 times 8 dw 18
	44	cw2 times 8 dw 2
	45
	46	SECTION .text
	47
	48	%macro PROC 1
	49	align 16
	50	global %1
	51	%1:
	52	%endmacro
	53
	54	%define LS8 [rsp + 0] ; s8
	55	%define LSRC_STRIDE [rsp + 8] ; src_stride
	56	%define LD8_Y [rsp + 16] ; d8_y
	57	%define LDST_Y_STRIDE [rsp + 24] ; dst_stride_y
	58	%define LD8_UV [rsp + 32] ; d8_uv
	59	%define LDST_UV_STRIDE [rsp + 40] ; dst_stride_uv
	60	%define LU1 [rsp + 48] ; first line U, 8 bytes
	61	%define LV1 [rsp + 56] ; first line V, 8 bytes
	62	%define LU2 [rsp + 64] ; second line U, 8 bytes
	63	%define LV2 [rsp + 72] ; second line V, 8 bytes
	64
	65	%define LWIDTH [rsp + 104] ; width
	66	%define LHEIGHT [rsp + 112] ; height
	67
	68	;The first six integer or pointer arguments are passed in registers
	69	; RDI, RSI, RDX, RCX, R8, and R9
	70
	71	;int
	72	;a8r8g8b8_to_nv12_box_amd64_sse2(char *s8, int src_stride,
	73	; char *d8_y, int dst_stride_y,
	74	; char *d8_uv, int dst_stride_uv,
	75	; int width, int height);
	76	PROC a8r8g8b8_to_nv12_box_amd64_sse2
	77	push rbx
	78	push rbp
	79	sub rsp, 80 ; local vars, 80 bytes
	80
	81	mov LS8, rdi ; s8
	82	mov LSRC_STRIDE, rsi ; src_stride
	83	mov LD8_Y, rdx ; d8_y
	84	mov LDST_Y_STRIDE, rcx ; dst_stride_y
	85	mov LD8_UV, r8 ; d8_uv
	86	mov LDST_UV_STRIDE, r9 ; dst_stride_uv
	87
	88	pxor xmm7, xmm7
	89
	90	mov ebx, LHEIGHT ; ebx = height
	91	shr ebx, 1 ; doing 2 lines at a time
	92
	93	row_loop1:
	94	mov rsi, LS8 ; s8
	95	mov rdi, LD8_Y ; d8_y
	96	mov rdx, LD8_UV ; d8_uv
	97
	98	mov ecx, LWIDTH ; ecx = width
	99	shr ecx, 3 ; doing 8 pixels at a time
	100
	101	loop1:
	102	; first line
	103	movdqu xmm0, [rsi] ; 4 pixels, 16 bytes
	104	movdqa xmm1, xmm0 ; blue
	105	pand xmm1, [rel cd255] ; blue
	106	movdqa xmm2, xmm0 ; green
	107	psrld xmm2, 8 ; green
	108	pand xmm2, [rel cd255] ; green
	109	movdqa xmm3, xmm0 ; red
	110	psrld xmm3, 16 ; red
	111	pand xmm3, [rel cd255] ; red
	112
	113	movdqu xmm0, [rsi + 16] ; 4 pixels, 16 bytes
	114	movdqa xmm4, xmm0 ; blue
	115	pand xmm4, [rel cd255] ; blue
	116	movdqa xmm5, xmm0 ; green
	117	psrld xmm5, 8 ; green
	118	pand xmm5, [rel cd255] ; green
	119	movdqa xmm6, xmm0 ; red
	120	psrld xmm6, 16 ; red
	121	pand xmm6, [rel cd255] ; red
	122
	123	packssdw xmm1, xmm4 ; xmm1 = 8 blues
	124	packssdw xmm2, xmm5 ; xmm2 = 8 greens
	125	packssdw xmm3, xmm6 ; xmm3 = 8 reds
	126
	127	; _Y = (( 66 * _R + 129 * _G + 25 * _B + 128) >> 8) + 16;
	128	movdqa xmm4, xmm1 ; blue
	129	movdqa xmm5, xmm2 ; green
	130	movdqa xmm6, xmm3 ; red
	131	pmullw xmm4, [rel cw25]
	132	pmullw xmm5, [rel cw129]
	133	pmullw xmm6, [rel cw66]
	134	paddw xmm4, xmm5
	135	paddw xmm4, xmm6
	136	paddw xmm4, [rel cw128]
	137	psrlw xmm4, 8
	138	paddw xmm4, [rel cw16]
	139	packuswb xmm4, xmm7
	140	movq [rdi], xmm4 ; out 8 bytes yyyyyyyy
	141
	142	; _U = ((-38 * _R - 74 * _G + 112 * _B + 128) >> 8) + 128;
	143	movdqa xmm4, xmm1 ; blue
	144	movdqa xmm5, xmm2 ; green
	145	movdqa xmm6, xmm3 ; red
	146	pmullw xmm4, [rel cw112]
	147	pmullw xmm5, [rel cw74]
	148	pmullw xmm6, [rel cw38]
	149	psubw xmm4, xmm5
	150	psubw xmm4, xmm6
	151	paddw xmm4, [rel cw128]
	152	psraw xmm4, 8
	153	paddw xmm4, [rel cw128]
	154	packuswb xmm4, xmm7
	155	movq LU1, xmm4 ; save for later
	156
	157	; _V = ((112 * _R - 94 * _G - 18 * _B + 128) >> 8) + 128;
	158	movdqa xmm6, xmm1 ; blue
	159	movdqa xmm5, xmm2 ; green
	160	movdqa xmm4, xmm3 ; red
	161	pmullw xmm4, [rel cw112]
	162	pmullw xmm5, [rel cw94]
	163	pmullw xmm6, [rel cw18]
	164	psubw xmm4, xmm5
	165	psubw xmm4, xmm6
	166	paddw xmm4, [rel cw128]
	167	psraw xmm4, 8
	168	paddw xmm4, [rel cw128]
	169	packuswb xmm4, xmm7
	170	movq LV1, xmm4 ; save for later
	171
	172	; go down to second line
	173	add rsi, LSRC_STRIDE
	174	add rdi, LDST_Y_STRIDE
	175
	176	; second line
	177	movdqu xmm0, [rsi] ; 4 pixels, 16 bytes
	178	movdqa xmm1, xmm0 ; blue
	179	pand xmm1, [rel cd255] ; blue
	180	movdqa xmm2, xmm0 ; green
	181	psrld xmm2, 8 ; green
	182	pand xmm2, [rel cd255] ; green
	183	movdqa xmm3, xmm0 ; red
	184	psrld xmm3, 16 ; red
	185	pand xmm3, [rel cd255] ; red
	186
	187	movdqu xmm0, [rsi + 16] ; 4 pixels, 16 bytes
	188	movdqa xmm4, xmm0 ; blue
	189	pand xmm4, [rel cd255] ; blue
	190	movdqa xmm5, xmm0 ; green
	191	psrld xmm5, 8 ; green
	192	pand xmm5, [rel cd255] ; green
	193	movdqa xmm6, xmm0 ; red
	194	psrld xmm6, 16 ; red
	195	pand xmm6, [rel cd255] ; red
	196
	197	packssdw xmm1, xmm4 ; xmm1 = 8 blues
	198	packssdw xmm2, xmm5 ; xmm2 = 8 greens
	199	packssdw xmm3, xmm6 ; xmm3 = 8 reds
	200
	201	; _Y = (( 66 * _R + 129 * _G + 25 * _B + 128) >> 8) + 16;
	202	movdqa xmm4, xmm1 ; blue
	203	movdqa xmm5, xmm2 ; green
	204	movdqa xmm6, xmm3 ; red
	205	pmullw xmm4, [rel cw25]
	206	pmullw xmm5, [rel cw129]
	207	pmullw xmm6, [rel cw66]
	208	paddw xmm4, xmm5
	209	paddw xmm4, xmm6
	210	paddw xmm4, [rel cw128]
	211	psrlw xmm4, 8
	212	paddw xmm4, [rel cw16]
	213	packuswb xmm4, xmm7
	214	movq [rdi], xmm4 ; out 8 bytes yyyyyyyy
	215
	216	; _U = ((-38 * _R - 74 * _G + 112 * _B + 128) >> 8) + 128;
	217	movdqa xmm4, xmm1 ; blue
	218	movdqa xmm5, xmm2 ; green
	219	movdqa xmm6, xmm3 ; red
	220	pmullw xmm4, [rel cw112]
	221	pmullw xmm5, [rel cw74]
	222	pmullw xmm6, [rel cw38]
	223	psubw xmm4, xmm5
	224	psubw xmm4, xmm6
	225	paddw xmm4, [rel cw128]
	226	psraw xmm4, 8
	227	paddw xmm4, [rel cw128]
	228	packuswb xmm4, xmm7
	229	movq LU2, xmm4 ; save for later
	230
	231	; _V = ((112 * _R - 94 * _G - 18 * _B + 128) >> 8) + 128;
	232	movdqa xmm6, xmm1 ; blue
	233	movdqa xmm5, xmm2 ; green
	234	movdqa xmm4, xmm3 ; red
	235	pmullw xmm4, [rel cw112]
	236	pmullw xmm5, [rel cw94]
	237	pmullw xmm6, [rel cw18]
	238	psubw xmm4, xmm5
	239	psubw xmm4, xmm6
	240	paddw xmm4, [rel cw128]
	241	psraw xmm4, 8
	242	paddw xmm4, [rel cw128]
	243	packuswb xmm4, xmm7
	244	movq LV2, xmm4 ; save for later
	245
	246	; uv add and divide(average)
	247	movq mm1, LU1 ; u from first line
	248	movq mm3, mm1
	249	pand mm1, [rel cw255]
	250	psrlw mm3, 8
	251	pand mm3, [rel cw255]
	252	paddw mm1, mm3 ; add
	253	movq mm2, LU2 ; u from second line
	254	movq mm3, mm2
	255	pand mm2, [rel cw255]
	256	paddw mm1, mm2 ; add
	257	psrlw mm3, 8
	258	pand mm3, [rel cw255]
	259	paddw mm1, mm3 ; add
	260	paddw mm1, [rel cw2] ; add 2
	261	psrlw mm1, 2 ; div 4
	262
	263	movq mm2, LV1 ; v from first line
	264	movq mm4, mm2
	265	pand mm2, [rel cw255]
	266	psrlw mm4, 8
	267	pand mm4, [rel cw255]
	268	paddw mm2, mm4 ; add
	269	movq mm3, LV2 ; v from second line
	270	movq mm4, mm3
	271	pand mm3, [rel cw255]
	272	paddw mm2, mm3 ; add
	273	psrlw mm4, 8
	274	pand mm4, [rel cw255]
	275	paddw mm2, mm4 ; add
	276	paddw mm2, [rel cw2] ; add 2
	277	psrlw mm2, 2 ; div 4
	278
	279	packuswb mm1, mm1
	280	packuswb mm2, mm2
	281
	282	punpcklbw mm1, mm2 ; uv
	283	movq [rdx], mm1 ; out 8 bytes uvuvuvuv
	284
	285	; go up to first line
	286	sub rsi, LSRC_STRIDE
	287	sub rdi, LDST_Y_STRIDE
	288
	289	; move right
	290	lea rsi, [rsi + 32]
	291	lea rdi, [rdi + 8]
	292	lea rdx, [rdx + 8]
	293
	294	dec ecx
	295	jnz loop1
	296
	297	; update s8
	298	mov rax, LS8 ; s8
	299	add rax, LSRC_STRIDE ; s8 += src_stride
	300	add rax, LSRC_STRIDE ; s8 += src_stride
	301	mov LS8, rax
	302
	303	; update d8_y
	304	mov rax, LD8_Y ; d8_y
	305	add rax, LDST_Y_STRIDE ; d8_y += dst_stride_y
	306	add rax, LDST_Y_STRIDE ; d8_y += dst_stride_y
	307	mov LD8_Y, rax
	308
	309	; update d8_uv
	310	mov rax, LD8_UV ; d8_uv
	311	add rax, LDST_UV_STRIDE ; d8_uv += dst_stride_uv
	312	mov LD8_UV, rax
	313
	314	dec ebx
	315	jnz row_loop1
	316
	317	mov rax, 0 ; return value
	318	add rsp, 80 ; local vars, 80 bytes
	319	pop rbp
	320	pop rbx
	321	ret
	322	align 16
	323

+6

-1

xorgxrdp/module/amd64/funcs_amd64.h less more

0	0	/*
1		Copyright 2014 Jay Sorg
	1	Copyright 2014-2015 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

37	37	a8r8g8b8_to_a8b8g8r8_box_amd64_sse2(char *s8, int src_stride,
38	38	char *d8, int dst_stride,
39	39	int width, int height);
	40	int
	41	a8r8g8b8_to_nv12_box_amd64_sse2(char *s8, int src_stride,
	42	char *d8_y, int dst_stride_y,
	43	char *d8_uv, int dst_stride_uv,
	44	int width, int height);
40	45
41	46	#endif
42	47

+9

-1

xorgxrdp/module/rdp.h less more

0	0	/*
1		Copyright 2005-2014 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

141	141	int old_button_mask;
142	142	int button_mask;
143	143	DeviceIntPtr device;
	144	int old_cursor_x;
	145	int old_cursor_y;
144	146	};
145	147	typedef struct _rdpPointer rdpPointer;
146	148

213	215	typedef int (copy_box_proc)(char s8, int src_stride,
214	216	char *d8, int dst_stride,
215	217	int width, int height);
	218	/* copy_box_proc but 2 dest */
	219	typedef int (copy_box_dst2_proc)(char s8, int src_stride,
	220	char *d8_y, int dst_stride_y,
	221	char *d8_uv, int dst_stride_uv,
	222	int width, int height);
216	223
217	224	/* move this to common header */
218	225	struct _rdpRec

296	303	OsTimerPtr xv_timer;
297	304
298	305	copy_box_proc a8r8g8b8_to_a8b8g8r8_box;
	306	copy_box_dst2_proc a8r8g8b8_to_nv12_box;
299	307
300	308	/* multimon */
301	309	int extra_outputs;

+7

-5

xorgxrdp/module/rdpCapture.c less more

0	0	/*
1	1	Copyright 2014 Laxmikant Rashinkar
2		Copyright 2014-2015 Jay Sorg
	2	Copyright 2014-2016 Jay Sorg
3	3
4	4	Permission to use, copy, modify, distribute, and sell this software and its
5	5	documentation for any purpose is hereby granted without fee, provided that

534	534	U_sum += RDPCLAMP(U, 0, 255);
535	535	V_sum += RDPCLAMP(V, 0, 255);
536	536
537		d8uv[0] = U_sum / 4;
	537	d8uv[0] = (U_sum + 2) / 4;
538	538	d8uv++;
539		d8uv[0] = V_sum / 4;
	539	d8uv[0] = (V_sum + 2) / 4;
540	540	d8uv++;
541	541	}
542	542	}

572	572	d8_uv += (box->x1 - dstx) * 1;
573	573	width = box->x2 - box->x1;
574	574	height = box->y2 - box->y1;
575		a8r8g8b8_to_nv12_box(s8, src_stride, d8_y, dst_stride_y,
576		d8_uv, dst_stride_uv, width, height);
	575	clientCon->dev->a8r8g8b8_to_nv12_box(s8, src_stride,
	576	d8_y, dst_stride_y,
	577	d8_uv, dst_stride_uv,
	578	width, height);
577	579	}
578	580	return 0;
579	581	}

+6

-1

xorgxrdp/module/rdpCapture.h less more

0	0	/*
1	1	Copyright 2014 Laxmikant Rashinkar
2		Copyright 2014-2015 Jay Sorg
	2	Copyright 2014-2016 Jay Sorg
3	3
4	4	Permission to use, copy, modify, distribute, and sell this software and its
5	5	documentation for any purpose is hereby granted without fee, provided that

41	41	a8r8g8b8_to_a8b8g8r8_box(char *s8, int src_stride,
42	42	char *d8, int dst_stride,
43	43	int width, int height);
	44	extern _X_EXPORT int
	45	a8r8g8b8_to_nv12_box(char *s8, int src_stride,
	46	char *d8_y, int dst_stride_y,
	47	char *d8_uv, int dst_stride_uv,
	48	int width, int height);
44	49
45	50	#endif

+6

-3

xorgxrdp/module/rdpClientCon.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

133	133	AddEnabledDevice(clientCon->sck);
134	134	}
135	135
136		#if 0
	136	#if 1
137	137	if (dev->clientConTail != NULL)
138	138	{
	139	LLOGLN(0, ("rdpClientConGotConnection: disconnecting only clientCon"));
139	140	rdpClientConDisconnect(dev, dev->clientConTail);
140	141	dev->clientConHead = NULL;
141	142	dev->clientConTail = NULL;

864	865	RRTellChanged(dev->pScreen);
865	866	}
866	867
867		//rdpLoadLayout(g_rdpScreen.client_info.keylayout);
	868	/* rdpLoadLayout */
	869	rdpInputKeyboardEvent(dev, 18, (long)(&(clientCon->client_info)),
	870	0, 0, 0);
868	871
869	872	return 0;
870	873	}

+1

-1

xorgxrdp/module/rdpClientCon.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpComposite.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpComposite.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpCopyArea.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpCopyArea.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpCopyPlane.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpCopyPlane.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpCursor.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpCursor.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpDraw.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpDraw.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpFillPolygon.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpFillPolygon.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpFillSpans.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpFillSpans.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpGC.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpGC.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpGlyphs.c less more

0	0	/*
1		Copyright 2012-2015 Jay Sorg
	1	Copyright 2012-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpGlyphs.h less more

0	0	/*
1		Copyright 2012-2015 Jay Sorg
	1	Copyright 2012-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpImageGlyphBlt.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpImageGlyphBlt.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpImageText16.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpImageText16.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpImageText8.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpImageText8.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpInput.c less more

0	0	/*
1		Copyright 2013-2015 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpInput.h less more

0	0	/*
1		Copyright 2013-2015 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpMain.c less more

0	0	/*
1		Copyright 2013-2015 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpMain.h less more

0	0	/*
1		Copyright 2013-2015 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpMisc.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpMisc.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPixmap.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPixmap.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyArc.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyArc.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyFillArc.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyFillArc.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyFillRect.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyFillRect.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyGlyphBlt.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyGlyphBlt.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyPoint.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyPoint.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyRectangle.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyRectangle.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolySegment.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolySegment.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyText16.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyText16.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyText8.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolyText8.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolylines.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPolylines.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPri.c less more

0	0	/*
1		Copyright 2013-2015 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPri.h less more

0	0	/*
1		Copyright 2013-2015 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPushPixels.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPushPixels.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPutImage.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpPutImage.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+2

-2

xorgxrdp/module/rdpRandR.c less more

0	0	/*
1		Copyright 2011-2014 Jay Sorg
	1	Copyright 2011-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

268	268
269	269	if (!g_panning)
270	270	{
271		return FALSE;
	271	return FALSE;
272	272	}
273	273
274	274	dev = rdpGetDevFromScreen(pScreen);

+1

-1

xorgxrdp/module/rdpRandR.h less more

0	0	/*
1		Copyright 2011-2015 Jay Sorg
	1	Copyright 2011-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpReg.c less more

0	0	/*
1		Copyright 2013-2015 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpReg.h less more

0	0	/*
1		Copyright 2013-2015 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpSetSpans.c less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpSetSpans.h less more

0	0	/*
1		Copyright 2005-2015 Jay Sorg
	1	Copyright 2005-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+4

-1

xorgxrdp/module/rdpSimd.c less more

0	0	/*
1		Copyright 2014-2015 Jay Sorg
	1	Copyright 2014-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

71	71	dev->yuy2_to_rgb32 = YUY2_to_RGB32;
72	72	dev->uyvy_to_rgb32 = UYVY_to_RGB32;
73	73	dev->a8r8g8b8_to_a8b8g8r8_box = a8r8g8b8_to_a8b8g8r8_box;
	74	dev->a8r8g8b8_to_nv12_box = a8r8g8b8_to_nv12_box;
74	75	#if SIMD_USE_ACCEL
75	76	if (g_simd_use_accel)
76	77	{

86	87	dev->yuy2_to_rgb32 = yuy2_to_rgb32_amd64_sse2;
87	88	dev->uyvy_to_rgb32 = uyvy_to_rgb32_amd64_sse2;
88	89	dev->a8r8g8b8_to_a8b8g8r8_box = a8r8g8b8_to_a8b8g8r8_box_amd64_sse2;
	90	dev->a8r8g8b8_to_nv12_box = a8r8g8b8_to_nv12_box_amd64_sse2;
89	91	LLOGLN(0, ("rdpSimdInit: sse2 amd64 yuv functions assigned"));
90	92	}
91	93	#elif defined(__x86__) \|\| defined(_M_IX86) \|\| defined(__i386__)

100	102	dev->yuy2_to_rgb32 = yuy2_to_rgb32_x86_sse2;
101	103	dev->uyvy_to_rgb32 = uyvy_to_rgb32_x86_sse2;
102	104	dev->a8r8g8b8_to_a8b8g8r8_box = a8r8g8b8_to_a8b8g8r8_box_x86_sse2;
	105	dev->a8r8g8b8_to_nv12_box = a8r8g8b8_to_nv12_box_x86_sse2;
103	106	LLOGLN(0, ("rdpSimdInit: sse2 x86 yuv functions assigned"));
104	107	}
105	108	#endif

+1

-1

xorgxrdp/module/rdpSimd.h less more

0	0	/*
1		Copyright 2014-2015 Jay Sorg
	1	Copyright 2014-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpTrapezoids.c less more

0	0	/*
1		Copyright 2014-2015 Jay Sorg
	1	Copyright 2014-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpTrapezoids.h less more

0	0	/*
1		Copyright 2014-2014 Jay Sorg
	1	Copyright 2014-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpXv.c less more

0	0	/*
1		Copyright 2014-2015 Jay Sorg
	1	Copyright 2014-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+1

-1

xorgxrdp/module/rdpXv.h less more

0	0	/*
1		Copyright 2014-2015 Jay Sorg
	1	Copyright 2014-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

+318

-0

xorgxrdp/module/x86/a8r8g8b8_to_nv12_box_x86_sse2.asm less more

	0	;
	1	;Copyright 2015 Jay Sorg
	2	;
	3	;Permission to use, copy, modify, distribute, and sell this software and its
	4	;documentation for any purpose is hereby granted without fee, provided that
	5	;the above copyright notice appear in all copies and that both that
	6	;copyright notice and this permission notice appear in supporting
	7	;documentation.
	8	;
	9	;The above copyright notice and this permission notice shall be included in
	10	;all copies or substantial portions of the Software.
	11	;
	12	;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	13	;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	14	;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	15	;OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	16	;AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	17	;CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	18	;
	19	;ARGB to NV12
	20	;x86 SSE2
	21	;
	22	; notes
	23	; address s8 should be aligned on 16 bytes, will be slower if not
	24	; width should be multile of 8 and > 0
	25	; height should be even and > 0
	26
	27	SECTION .data
	28
	29	align 16
	30
	31	cd255 times 4 dd 255
	32
	33	cw255 times 8 dw 255
	34	cw16 times 8 dw 16
	35	cw128 times 8 dw 128
	36	cw66 times 8 dw 66
	37	cw129 times 8 dw 129
	38	cw25 times 8 dw 25
	39	cw38 times 8 dw 38
	40	cw74 times 8 dw 74
	41	cw112 times 8 dw 112
	42	cw94 times 8 dw 94
	43	cw18 times 8 dw 18
	44	cw2 times 8 dw 2
	45
	46	SECTION .text
	47
	48	%macro PROC 1
	49	align 16
	50	global %1
	51	%1:
	52	%endmacro
	53
	54	%define LU1 [esp + 0] ; first line U, 8 bytes
	55	%define LV1 [esp + 8] ; first line V, 8 bytes
	56	%define LU2 [esp + 16] ; second line U, 8 bytes
	57	%define LV2 [esp + 24] ; second line V, 8 bytes
	58
	59	%define LS8 [esp + 52] ; s8
	60	%define LSRC_STRIDE [esp + 56] ; src_stride
	61	%define LD8_Y [esp + 60] ; d8_y
	62	%define LDST_Y_STRIDE [esp + 64] ; dst_stride_y
	63	%define LD8_UV [esp + 68] ; d8_uv
	64	%define LDST_UV_STRIDE [esp + 72] ; dst_stride_uv
	65	%define LWIDTH [esp + 76] ; width
	66	%define LHEIGHT [esp + 80] ; height
	67
	68	;int
	69	;a8r8g8b8_to_nv12_box_x86_sse2(char *s8, int src_stride,
	70	; char *d8_y, int dst_stride_y,
	71	; char *d8_uv, int dst_stride_uv,
	72	; int width, int height);
	73	PROC a8r8g8b8_to_nv12_box_x86_sse2
	74	push ebx
	75	push esi
	76	push edi
	77	push ebp
	78	sub esp, 32 ; local vars, 32 bytes
	79
	80	pxor xmm7, xmm7
	81
	82	mov ebx, LHEIGHT ; ebx = height
	83	shr ebx, 1 ; doing 2 lines at a time
	84
	85	row_loop1:
	86	mov esi, LS8 ; s8
	87	mov edi, LD8_Y ; d8_y
	88	mov edx, LD8_UV ; d8_uv
	89
	90	mov ecx, LWIDTH ; ecx = width
	91	shr ecx, 3 ; doing 8 pixels at a time
	92
	93	loop1:
	94	; first line
	95	movdqu xmm0, [esi] ; 4 pixels, 16 bytes
	96	movdqa xmm1, xmm0 ; blue
	97	pand xmm1, [cd255] ; blue
	98	movdqa xmm2, xmm0 ; green
	99	psrld xmm2, 8 ; green
	100	pand xmm2, [cd255] ; green
	101	movdqa xmm3, xmm0 ; red
	102	psrld xmm3, 16 ; red
	103	pand xmm3, [cd255] ; red
	104
	105	movdqu xmm0, [esi + 16] ; 4 pixels, 16 bytes
	106	movdqa xmm4, xmm0 ; blue
	107	pand xmm4, [cd255] ; blue
	108	movdqa xmm5, xmm0 ; green
	109	psrld xmm5, 8 ; green
	110	pand xmm5, [cd255] ; green
	111	movdqa xmm6, xmm0 ; red
	112	psrld xmm6, 16 ; red
	113	pand xmm6, [cd255] ; red
	114
	115	packssdw xmm1, xmm4 ; xmm1 = 8 blues
	116	packssdw xmm2, xmm5 ; xmm2 = 8 greens
	117	packssdw xmm3, xmm6 ; xmm3 = 8 reds
	118
	119	; _Y = (( 66 * _R + 129 * _G + 25 * _B + 128) >> 8) + 16;
	120	movdqa xmm4, xmm1 ; blue
	121	movdqa xmm5, xmm2 ; green
	122	movdqa xmm6, xmm3 ; red
	123	pmullw xmm4, [cw25]
	124	pmullw xmm5, [cw129]
	125	pmullw xmm6, [cw66]
	126	paddw xmm4, xmm5
	127	paddw xmm4, xmm6
	128	paddw xmm4, [cw128]
	129	psrlw xmm4, 8
	130	paddw xmm4, [cw16]
	131	packuswb xmm4, xmm7
	132	movq [edi], xmm4 ; out 8 bytes yyyyyyyy
	133
	134	; _U = ((-38 * _R - 74 * _G + 112 * _B + 128) >> 8) + 128;
	135	movdqa xmm4, xmm1 ; blue
	136	movdqa xmm5, xmm2 ; green
	137	movdqa xmm6, xmm3 ; red
	138	pmullw xmm4, [cw112]
	139	pmullw xmm5, [cw74]
	140	pmullw xmm6, [cw38]
	141	psubw xmm4, xmm5
	142	psubw xmm4, xmm6
	143	paddw xmm4, [cw128]
	144	psraw xmm4, 8
	145	paddw xmm4, [cw128]
	146	packuswb xmm4, xmm7
	147	movq LU1, xmm4 ; save for later
	148
	149	; _V = ((112 * _R - 94 * _G - 18 * _B + 128) >> 8) + 128;
	150	movdqa xmm6, xmm1 ; blue
	151	movdqa xmm5, xmm2 ; green
	152	movdqa xmm4, xmm3 ; red
	153	pmullw xmm4, [cw112]
	154	pmullw xmm5, [cw94]
	155	pmullw xmm6, [cw18]
	156	psubw xmm4, xmm5
	157	psubw xmm4, xmm6
	158	paddw xmm4, [cw128]
	159	psraw xmm4, 8
	160	paddw xmm4, [cw128]
	161	packuswb xmm4, xmm7
	162	movq LV1, xmm4 ; save for later
	163
	164	; go down to second line
	165	add esi, LSRC_STRIDE
	166	add edi, LDST_Y_STRIDE
	167
	168	; second line
	169	movdqu xmm0, [esi] ; 4 pixels, 16 bytes
	170	movdqa xmm1, xmm0 ; blue
	171	pand xmm1, [cd255] ; blue
	172	movdqa xmm2, xmm0 ; green
	173	psrld xmm2, 8 ; green
	174	pand xmm2, [cd255] ; green
	175	movdqa xmm3, xmm0 ; red
	176	psrld xmm3, 16 ; red
	177	pand xmm3, [cd255] ; red
	178
	179	movdqu xmm0, [esi + 16] ; 4 pixels, 16 bytes
	180	movdqa xmm4, xmm0 ; blue
	181	pand xmm4, [cd255] ; blue
	182	movdqa xmm5, xmm0 ; green
	183	psrld xmm5, 8 ; green
	184	pand xmm5, [cd255] ; green
	185	movdqa xmm6, xmm0 ; red
	186	psrld xmm6, 16 ; red
	187	pand xmm6, [cd255] ; red
	188
	189	packssdw xmm1, xmm4 ; xmm1 = 8 blues
	190	packssdw xmm2, xmm5 ; xmm2 = 8 greens
	191	packssdw xmm3, xmm6 ; xmm3 = 8 reds
	192
	193	; _Y = (( 66 * _R + 129 * _G + 25 * _B + 128) >> 8) + 16;
	194	movdqa xmm4, xmm1 ; blue
	195	movdqa xmm5, xmm2 ; green
	196	movdqa xmm6, xmm3 ; red
	197	pmullw xmm4, [cw25]
	198	pmullw xmm5, [cw129]
	199	pmullw xmm6, [cw66]
	200	paddw xmm4, xmm5
	201	paddw xmm4, xmm6
	202	paddw xmm4, [cw128]
	203	psrlw xmm4, 8
	204	paddw xmm4, [cw16]
	205	packuswb xmm4, xmm7
	206	movq [edi], xmm4 ; out 8 bytes yyyyyyyy
	207
	208	; _U = ((-38 * _R - 74 * _G + 112 * _B + 128) >> 8) + 128;
	209	movdqa xmm4, xmm1 ; blue
	210	movdqa xmm5, xmm2 ; green
	211	movdqa xmm6, xmm3 ; red
	212	pmullw xmm4, [cw112]
	213	pmullw xmm5, [cw74]
	214	pmullw xmm6, [cw38]
	215	psubw xmm4, xmm5
	216	psubw xmm4, xmm6
	217	paddw xmm4, [cw128]
	218	psraw xmm4, 8
	219	paddw xmm4, [cw128]
	220	packuswb xmm4, xmm7
	221	movq LU2, xmm4 ; save for later
	222
	223	; _V = ((112 * _R - 94 * _G - 18 * _B + 128) >> 8) + 128;
	224	movdqa xmm6, xmm1 ; blue
	225	movdqa xmm5, xmm2 ; green
	226	movdqa xmm4, xmm3 ; red
	227	pmullw xmm4, [cw112]
	228	pmullw xmm5, [cw94]
	229	pmullw xmm6, [cw18]
	230	psubw xmm4, xmm5
	231	psubw xmm4, xmm6
	232	paddw xmm4, [cw128]
	233	psraw xmm4, 8
	234	paddw xmm4, [cw128]
	235	packuswb xmm4, xmm7
	236	movq LV2, xmm4 ; save for later
	237
	238	; uv add and divide(average)
	239	movq mm1, LU1 ; u from first line
	240	movq mm3, mm1
	241	pand mm1, [cw255]
	242	psrlw mm3, 8
	243	pand mm3, [cw255]
	244	paddw mm1, mm3 ; add
	245	movq mm2, LU2 ; u from second line
	246	movq mm3, mm2
	247	pand mm2, [cw255]
	248	paddw mm1, mm2 ; add
	249	psrlw mm3, 8
	250	pand mm3, [cw255]
	251	paddw mm1, mm3 ; add
	252	paddw mm1, [cw2] ; add 2
	253	psrlw mm1, 2 ; div 4
	254
	255	movq mm2, LV1 ; v from first line
	256	movq mm4, mm2
	257	pand mm2, [cw255]
	258	psrlw mm4, 8
	259	pand mm4, [cw255]
	260	paddw mm2, mm4 ; add
	261	movq mm3, LV2 ; v from second line
	262	movq mm4, mm3
	263	pand mm3, [cw255]
	264	paddw mm2, mm3 ; add
	265	psrlw mm4, 8
	266	pand mm4, [cw255]
	267	paddw mm2, mm4 ; add
	268	paddw mm2, [cw2] ; add 2
	269	psrlw mm2, 2 ; div 4
	270
	271	packuswb mm1, mm1
	272	packuswb mm2, mm2
	273
	274	punpcklbw mm1, mm2 ; uv
	275	movq [edx], mm1 ; out 8 bytes uvuvuvuv
	276
	277	; go up to first line
	278	sub esi, LSRC_STRIDE
	279	sub edi, LDST_Y_STRIDE
	280
	281	; move right
	282	lea esi, [esi + 32]
	283	lea edi, [edi + 8]
	284	lea edx, [edx + 8]
	285
	286	dec ecx
	287	jnz loop1
	288
	289	; update s8
	290	mov eax, LS8 ; s8
	291	add eax, LSRC_STRIDE ; s8 += src_stride
	292	add eax, LSRC_STRIDE ; s8 += src_stride
	293	mov LS8, eax
	294
	295	; update d8_y
	296	mov eax, LD8_Y ; d8_y
	297	add eax, LDST_Y_STRIDE ; d8_y += dst_stride_y
	298	add eax, LDST_Y_STRIDE ; d8_y += dst_stride_y
	299	mov LD8_Y, eax
	300
	301	; update d8_uv
	302	mov eax, LD8_UV ; d8_uv
	303	add eax, LDST_UV_STRIDE ; d8_uv += dst_stride_uv
	304	mov LD8_UV, eax
	305
	306	dec ebx
	307	jnz row_loop1
	308
	309	mov eax, 0 ; return value
	310	add esp, 32 ; local vars, 32 bytes
	311	pop ebp
	312	pop edi
	313	pop esi
	314	pop ebx
	315	ret
	316	align 16
	317

+7

-2

xorgxrdp/module/x86/funcs_x86.h less more

0	0	/*
1		Copyright 2014 Jay Sorg
	1	Copyright 2014-2015 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

16	16	AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
17	17	CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
18	18
19		x86 asm files
	19	x86 asm functions
20	20
21	21	*/
22	22

37	37	a8r8g8b8_to_a8b8g8r8_box_x86_sse2(char *s8, int src_stride,
38	38	char *d8, int dst_stride,
39	39	int width, int height);
	40	int
	41	a8r8g8b8_to_nv12_box_x86_sse2(char *s8, int src_stride,
	42	char *d8_y, int dst_stride_y,
	43	char *d8_uv, int dst_stride_uv,
	44	int width, int height);
40	45
41	46	#endif
42	47

+7

-0

xorgxrdp/readme.txt less more

	0	------------------------------------------------------
	1	11/04/2015
	2	------------------------------------------------------
	3
	4	After normal make and make install, you can test Xorg startup with
	5	Xorg -config xrdp/xorg.conf -logfile /tmp/Xjay.log -noreset -ac :10
	6
0	7	------------------------------------------------------
1	8	11/05/2014
2	9	------------------------------------------------------

+21

-0

xorgxrdp/tests/yuv2rgb/Makefile less more

	0
	1	#OBJS = yuv2rgb_speed.o a8r8g8b8_to_nv12_box_x86_sse2.o
	2	OBJS = yuv2rgb_speed.o a8r8g8b8_to_nv12_box_amd64_sse2.o
	3
	4	CFLAGS = -Wall -O2
	5
	6	LDFLAGS =
	7
	8	all: yuv2rgb_speed
	9
	10	yuv2rgb_speed: $(OBJS)
	11	$(CC) -o yuv2rgb_speed $(OBJS) $(LDFLAGS)
	12
	13	clean:
	14	rm -f $(OBJS) yuv2rgb_speed
	15
	16	a8r8g8b8_to_nv12_box_x86_sse2.o: ../../module/x86/a8r8g8b8_to_nv12_box_x86_sse2.asm
	17	yasm -f elf32 ../../module/x86/a8r8g8b8_to_nv12_box_x86_sse2.asm
	18
	19	a8r8g8b8_to_nv12_box_amd64_sse2.o: ../../module/amd64/a8r8g8b8_to_nv12_box_amd64_sse2.asm
	20	yasm -f elf64 ../../module/amd64/a8r8g8b8_to_nv12_box_amd64_sse2.asm

+331

-0

xorgxrdp/tests/yuv2rgb/yuv2rgb_speed.c less more

	0	/*
	1	Copyright 2014-2015 Jay Sorg
	2
	3	Permission to use, copy, modify, distribute, and sell this software and its
	4	documentation for any purpose is hereby granted without fee, provided that
	5	the above copyright notice appear in all copies and that both that
	6	copyright notice and this permission notice appear in supporting
	7	documentation.
	8
	9	The above copyright notice and this permission notice shall be included in
	10	all copies or substantial portions of the Software.
	11
	12	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	13	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	14	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	15	OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	16	AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	17	CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	18
	19	yuv to rgb speed testing
	20
	21	*/
	22
	23	#include <stdio.h>
	24	#include <stdlib.h>
	25	#include <string.h>
	26	#include <fcntl.h>
	27	#include <unistd.h>
	28	#include <sys/types.h>
	29	#include <sys/stat.h>
	30	#include <sys/time.h>
	31
	32	/******************************************************************************/
	33	//Y = ( ( 66 * R + 129 * G + 25 * B + 128) >> 8) + 16
	34	//U = ( ( -38 * R - 74 * G + 112 * B + 128) >> 8) + 128
	35	//V = ( ( 112 * R - 94 * G - 18 * B + 128) >> 8) + 128
	36
	37	//C = Y - 16
	38	//D = U - 128
	39	//E = V - 128
	40	//R = clip(( 298 * C + 409 * E + 128) >> 8)
	41	//G = clip(( 298 * C - 100 * D - 208 * E + 128) >> 8)
	42	//B = clip(( 298 * C + 516 * D + 128) >> 8)
	43
	44	/******************************************************************************/
	45	#define RDPCLAMP(_val, _lo, _hi) \
	46	(_val) < (_lo) ? (_lo) : (_val) > (_hi) ? (_hi) : (_val)
	47
	48	// floating point
	49	#define YUV2RGB1(_Y, _U, _V, _R, _G, _B) \
	50	_Y = (0.257 * _R) + (0.504 * _G) + (0.098 * _B) + 16; \
	51	_U = -(0.148 * _R) - (0.291 * _G) + (0.439 * _B) + 128; \
	52	_V = (0.439 * _R) - (0.368 * _G) - (0.071 * _B) + 128;
	53
	54	#define YUV2RGB3(_Y, _U, _V, _R, _G, _B) \
	55	_Y = (( 1053 * _R + 2064 * _G + 401 * _B) >> 12) + 16; \
	56	_U = (( -606 * _R - 1192 * _G + 1798 * _B) >> 12) + 128; \
	57	_V = (( 1798 * _R - 1507 * _G - 291 * _B) >> 12) + 128;
	58
	59	#define YUV2RGB2(_Y, _U, _V, _R, _G, _B) \
	60	_Y = (( 16843 * _R + 33030 * _G + 6423 * _B) >> 16) + 16; \
	61	_U = (( -9699 * _R - 19071 * _G + 28770 * _B) >> 16) + 128; \
	62	_V = (( 28770 * _R - 24117 * _G - 4653 * _B) >> 16) + 128;
	63
	64	// original
	65	#define YUV2RGB(_Y, _U, _V, _R, _G, _B) \
	66	_Y = (( 66 * _R + 129 * _G + 25 * _B + 128) >> 8) + 16; \
	67	_U = ((-38 * _R - 74 * _G + 112 * _B + 128) >> 8) + 128; \
	68	_V = ((112 * _R - 94 * _G - 18 * _B + 128) >> 8) + 128;
	69
	70	#define YUV2RGB4(_Y, _U, _V, _R, _G, _B) \
	71	_Y = ( ((1053 * ((_R) << 4)) >> 16) + ((2064 * ((_G) << 4)) >> 16) + (( 401 * ((_B) << 4)) >> 16)) + 16; \
	72	_U = ( ((1798 * ((_B) << 4)) >> 16) - (( 606 * ((_R) << 4)) >> 16) - ((1192 * ((_G) << 4)) >> 16)) + 128; \
	73	_V = ( ((1798 * ((_R) << 4)) >> 16) - ((1507 * ((_G) << 4)) >> 16) - (( 291 * ((_B) << 4)) >> 16)) + 128;
	74
	75	/******************************************************************************/
	76	static int
	77	a8r8g8b8_to_nv12_box(char *s8, int src_stride,
	78	char *d8_y, int dst_stride_y,
	79	char *d8_uv, int dst_stride_uv,
	80	int width, int height)
	81	{
	82	int index;
	83	int jndex;
	84	int R;
	85	int G;
	86	int B;
	87	int Y;
	88	int U;
	89	int V;
	90	int U_sum;
	91	int V_sum;
	92	int pixel;
	93	int lwidth;
	94	int lheight;
	95	int *s32a;
	96	int *s32b;
	97	char *d8ya;
	98	char *d8yb;
	99	char *d8uv;
	100
	101	/* must be even */
	102	lwidth = width & ~1;
	103	lheight = height & ~1;
	104	for (jndex = 0; jndex < lheight; jndex += 2)
	105	{
	106	s32a = (int ) (s8 + src_stride jndex);
	107	s32b = (int ) (s8 + src_stride (jndex + 1));
	108	d8ya = d8_y + dst_stride_y * jndex;
	109	d8yb = d8_y + dst_stride_y * (jndex + 1);
	110	d8uv = d8_uv + dst_stride_uv * (jndex / 2);
	111	for (index = 0; index < lwidth; index += 2)
	112	{
	113	U_sum = 0;
	114	V_sum = 0;
	115
	116	pixel = s32a[0];
	117	s32a++;
	118	R = (pixel >> 16) & 0xff;
	119	G = (pixel >> 8) & 0xff;
	120	B = (pixel >> 0) & 0xff;
	121	YUV2RGB(Y, U, V, R, G, B);
	122	d8ya[0] = RDPCLAMP(Y, 0, 255);
	123	d8ya++;
	124	U_sum += RDPCLAMP(U, 0, 255);
	125	V_sum += RDPCLAMP(V, 0, 255);
	126
	127	pixel = s32a[0];
	128	s32a++;
	129	R = (pixel >> 16) & 0xff;
	130	G = (pixel >> 8) & 0xff;
	131	B = (pixel >> 0) & 0xff;
	132	YUV2RGB(Y, U, V, R, G, B);
	133	d8ya[0] = RDPCLAMP(Y, 0, 255);
	134	d8ya++;
	135	U_sum += RDPCLAMP(U, 0, 255);
	136	V_sum += RDPCLAMP(V, 0, 255);
	137
	138	pixel = s32b[0];
	139	s32b++;
	140	R = (pixel >> 16) & 0xff;
	141	G = (pixel >> 8) & 0xff;
	142	B = (pixel >> 0) & 0xff;
	143	YUV2RGB(Y, U, V, R, G, B);
	144	d8yb[0] = RDPCLAMP(Y, 0, 255);
	145	d8yb++;
	146	U_sum += RDPCLAMP(U, 0, 255);
	147	V_sum += RDPCLAMP(V, 0, 255);
	148
	149	pixel = s32b[0];
	150	s32b++;
	151	R = (pixel >> 16) & 0xff;
	152	G = (pixel >> 8) & 0xff;
	153	B = (pixel >> 0) & 0xff;
	154	YUV2RGB(Y, U, V, R, G, B);
	155	d8yb[0] = RDPCLAMP(Y, 0, 255);
	156	d8yb++;
	157	U_sum += RDPCLAMP(U, 0, 255);
	158	V_sum += RDPCLAMP(V, 0, 255);
	159
	160	d8uv[0] = (U_sum + 2) / 4;
	161	d8uv++;
	162	d8uv[0] = (V_sum + 2) / 4;
	163	d8uv++;
	164	}
	165	}
	166
	167	return 0;
	168	}
	169
	170	int output_params(void)
	171	{
	172	return 0;
	173	}
	174
	175	void hexdump(const void* p, int len)
	176	{
	177	const unsigned char* line;
	178	int i;
	179	int thisline;
	180	int offset;
	181
	182	line = (const unsigned char *)p;
	183	offset = 0;
	184
	185	while (offset < len)
	186	{
	187	printf("%04x ", offset);
	188	thisline = len - offset;
	189
	190	if (thisline > 16)
	191	{
	192	thisline = 16;
	193	}
	194
	195	for (i = 0; i < thisline; i++)
	196	{
	197	printf("%02x ", line[i]);
	198	}
	199
	200	for (; i < 16; i++)
	201	{
	202	printf(" ");
	203	}
	204
	205	for (i = 0; i < thisline; i++)
	206	{
	207	printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
	208	}
	209
	210	printf("\n");
	211	offset += thisline;
	212	line += thisline;
	213	}
	214	}
	215
	216	int lmemcmp(const void* data1, const void* data2, int bytes, int* offset)
	217	{
	218	int index;
	219	int diff;
	220	const unsigned char* ldata1;
	221	const unsigned char* ldata2;
	222
	223	ldata1 = (const unsigned char*)data1;
	224	ldata2 = (const unsigned char*)data2;
	225
	226	for (index = 0; index < bytes; index++)
	227	{
	228	diff = ldata1[index] - ldata2[index];
	229	if (abs(diff) > 0)
	230	{
	231	*offset = index;
	232	return 1;
	233	}
	234	}
	235	return 0;
	236	}
	237
	238	int get_mstime(void)
	239	{
	240	struct timeval tp;
	241
	242	gettimeofday(&tp, 0);
	243	return (tp.tv_sec * 1000) + (tp.tv_usec / 1000);
	244	}
	245
	246	int
	247	a8r8g8b8_to_nv12_box_x86_sse2(char *s8, int src_stride,
	248	char *d8_y, int dst_stride_y,
	249	char *d8_uv, int dst_stride_uv,
	250	int width, int height);
	251	int
	252	a8r8g8b8_to_nv12_box_amd64_sse2(char *s8, int src_stride,
	253	char *d8_y, int dst_stride_y,
	254	char *d8_uv, int dst_stride_uv,
	255	int width, int height);
	256
	257	#define AL(_ptr) ((char*)((((size_t)_ptr) + 15) & ~15))
	258
	259	int main(int argc, char** argv)
	260	{
	261	int index;
	262	int offset;
	263	int fd;
	264	int data_bytes;
	265	int stime;
	266	int etime;
	267	char* rgb_data;
	268	char* yuv_data1;
	269	char* yuv_data2;
	270	char* al_rgb_data;
	271	char* al_yuv_data1;
	272	char* al_yuv_data2;
	273
	274	if (argc == 1)
	275	{
	276	return output_params();
	277	}
	278	fd = open("/dev/urandom", O_RDONLY);
	279	data_bytes = 1920 * 1080 * 4;
	280	rgb_data = (char*)malloc(data_bytes + 16);
	281	al_rgb_data = AL(rgb_data);
	282	if (read(fd, al_rgb_data, data_bytes) != data_bytes)
	283	{
	284	printf("error\n");
	285	}
	286	close(fd);
	287	data_bytes = 1920 * 1080 * 2;
	288	yuv_data1 = (char*)malloc(data_bytes + 16);
	289	yuv_data2 = (char*)malloc(data_bytes + 16);
	290	al_yuv_data1 = AL(yuv_data1);
	291	al_yuv_data2 = AL(yuv_data2);
	292	stime = get_mstime();
	293	for (index = 0; index < 100; index++)
	294	{
	295	a8r8g8b8_to_nv12_box(al_rgb_data, 1920 * 4,
	296	al_yuv_data1, 1920,
	297	al_yuv_data1 + 1920 * 1080,
	298	1920, 1920, 1080);
	299	}
	300	etime = get_mstime();
	301	printf("a8r8g8b8_to_nv12_box took %d\n", etime - stime);
	302	stime = get_mstime();
	303	for (index = 0; index < 100; index++)
	304	{
	305	//a8r8g8b8_to_nv12_box_x86_sse2
	306	//a8r8g8b8_to_nv12_box_amd64_sse2
	307	a8r8g8b8_to_nv12_box_amd64_sse2(al_rgb_data, 1920 * 4,
	308	al_yuv_data2, 1920,
	309	al_yuv_data2 + 1920 * 1080, 1920,
	310	1920, 1080);
	311	}
	312	etime = get_mstime();
	313	printf("a8r8g8b8_to_nv12_box_x86_sse2 took %d\n", etime - stime);
	314	if (lmemcmp(al_yuv_data1, al_yuv_data2, 1920 * 1080 * 3 / 2, &offset) != 0)
	315	{
	316	printf("no match at offset %d\n", offset);
	317	printf("first\n");
	318	hexdump(al_yuv_data1 + offset, 16);
	319	printf("second\n");
	320	hexdump(al_yuv_data2 + offset, 16);
	321	}
	322	else
	323	{
	324	printf("match\n");
	325	}
	326	free(rgb_data);
	327	free(yuv_data1);
	328	free(yuv_data2);
	329	return 0;
	330	}

+5

-1

xorgxrdp/xrdpdev/xrdpdev.c less more

0	0	/*
1		Copyright 2013-2014 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

137	137	rgb zeros1;
138	138	Gamma zeros2;
139	139	int got_res_match;
	140	#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 16, 0, 0, 0)
140	141	char **modename;
	142	#else
	143	const char **modename;
	144	#endif
141	145	DisplayModePtr mode;
142	146	rdpPtr dev;
143	147

+120

-2

xorgxrdp/xrdpkeyb/rdpKeyboard.c less more

0	0	/*
1		Copyright 2013-2014 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

196	196	NoSymbol, NoSymbol
197	197	};
198	198
	199	static int
	200	rdpLoadLayout(rdpKeyboard keyboard, struct xrdp_client_info client_info);
	201
199	202	/******************************************************************************/
200	203	static void
201	204	rdpEnqueueKey(DeviceIntPtr device, int type, int scancode)

433	436	rdpEnqueueKey(keyboard->device, type, 117);
434	437	break;
435	438
	439	case 89: /* left meta */
	440	rdpEnqueueKey(keyboard->device, type, 156);
	441	break;
	442
	443	case 90: /* right meta */
	444	rdpEnqueueKey(keyboard->device, type, 156);
	445	break;
	446
	447	case 115: /* "/ ?" on br keybaord */
	448	sendDownUpKeyEvent(keyboard->device, type, 211);
	449	break;
	450
	451	case 126: /* . on br keypad */
	452	sendDownUpKeyEvent(keyboard->device, type, 134);
	453	break;
	454
436	455	default:
437	456	x_scancode = rdp_scancode + MIN_KEY_CODE;
438	457

496	515	case 17: /* from RDP_INPUT_SYNCHRONIZE */
497	516	KbdSync(keyboard, param1);
498	517	break;
	518	case 18:
	519	rdpLoadLayout(keyboard, (struct xrdp_client_info *) param1);
	520	break;
	521
499	522	}
500	523	return 0;
501	524	}

675	698	return Success;
676	699	}
677	700
678		#if XORG_VERSION_CURRENT < (((1) * 10000000) + ((9) * 100000) + ((0) * 1000) + 1)
	701	#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 0, 1, 0)
679	702
680	703	/* debian 6
681	704	ubuntu 10.04 */

754	777	rdpkeybUnplug(pointer p)
755	778	{
756	779	LLOGLN(0, ("rdpkeybUnplug:"));
	780	}
	781
	782	/******************************************************************************/
	783	static int
	784	reload_xkb(DeviceIntPtr keyboard, XkbRMLVOSet *set)
	785	{
	786	XkbSrvInfoPtr xkbi;
	787	XkbDescPtr xkb;
	788	KeySymsPtr keySyms;
	789	KeyCode first_key;
	790	CARD8 num_keys;
	791	DeviceIntPtr pDev;
	792
	793	/* free some stuff so we can call InitKeyboardDeviceStruct again */
	794	xkbi = keyboard->key->xkbInfo;
	795	xkb = xkbi->desc;
	796	XkbFreeKeyboard(xkb, 0, TRUE);
	797	free(xkbi);
	798	keyboard->key->xkbInfo = NULL;
	799	free(keyboard->kbdfeed);
	800	keyboard->kbdfeed = NULL;
	801	free(keyboard->key);
	802	keyboard->key = NULL;
	803
	804	/* init keyboard and reload the map */
	805	if (!InitKeyboardDeviceStruct(keyboard, set, rdpkeybBell,
	806	rdpkeybChangeKeyboardControl))
	807	{
	808	LLOGLN(0, ("rdpLoadLayout: InitKeyboardDeviceStruct failed"));
	809	return 1;
	810	}
	811
	812	/* notify the X11 clients eg. X_ChangeKeyboardMapping */
	813	keySyms = XkbGetCoreMap(keyboard);
	814	if (keySyms)
	815	{
	816	first_key = keySyms->minKeyCode;
	817	num_keys = (keySyms->maxKeyCode - keySyms->minKeyCode) + 1;
	818	XkbApplyMappingChange(keyboard, keySyms, first_key, num_keys,
	819	NULL, serverClient);
	820	for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
	821	{
	822	if ((pDev->coreEvents \|\| pDev == keyboard) && pDev->key)
	823	{
	824	XkbApplyMappingChange(pDev, keySyms, first_key, num_keys,
	825	NULL, serverClient);
	826	}
	827	}
	828	}
	829	else
	830	{
	831	return 1;
	832	}
	833	return 0;
	834	}
	835
	836	/******************************************************************************/
	837	static int
	838	rdpLoadLayout(rdpKeyboard keyboard, struct xrdp_client_info client_info)
	839	{
	840	XkbRMLVOSet set;
	841
	842	int keylayout = client_info->keylayout;
	843
	844	LLOGLN(0, ("rdpLoadLayout: keylayout 0x%8.8x variant %s display %s",
	845	keylayout, client_info->variant, display));
	846	memset(&set, 0, sizeof(set));
	847	set.rules = "base";
	848
	849	set.model = "pc104";
	850	set.layout = "us";
	851	set.variant = "";
	852	set.options = "";
	853
	854	if (strlen(client_info->model) > 0)
	855	{
	856	set.model = client_info->model;
	857	}
	858	if (strlen(client_info->variant) > 0)
	859	{
	860	set.variant = client_info->variant;
	861	}
	862	if (strlen(client_info->layout) > 0)
	863	{
	864	set.layout = client_info->layout;
	865	}
	866	if (strlen(client_info->options) > 0)
	867	{
	868	set.options = client_info->options;
	869	}
	870
	871	reload_xkb(keyboard->device, &set);
	872	reload_xkb(inputInfo.keyboard, &set);
	873
	874	return 0;
757	875	}
758	876
759	877	/******************************************************************************/

+10

-4

xorgxrdp/xrdpmouse/rdpMouse.c less more

0	0	/*
1		Copyright 2013-2014 Jay Sorg
	1	Copyright 2013-2016 Jay Sorg
2	2
3	3	Permission to use, copy, modify, distribute, and sell this software and its
4	4	documentation for any purpose is hereby granted without fee, provided that

110	110	int type;
111	111	int buttons;
112	112
113		rdpEnqueueMotion(pointer->device, pointer->cursor_x, pointer->cursor_y);
114
115	113	LLOGLN(10, ("PtrAddEvent: x %d y %d", pointer->cursor_x, pointer->cursor_y));
	114
	115	if ((pointer->old_cursor_x != pointer->cursor_x) \|\|
	116	(pointer->old_cursor_y != pointer->cursor_y))
	117	{
	118	rdpEnqueueMotion(pointer->device, pointer->cursor_x, pointer->cursor_y);
	119	pointer->old_cursor_x = pointer->cursor_x;
	120	pointer->old_cursor_y = pointer->cursor_y;
	121	}
116	122
117	123	for (i = 0; i < 5; i++)
118	124	{

260	266	return Success;
261	267	}
262	268
263		#if XORG_VERSION_CURRENT < (((1) * 10000000) + ((9) * 100000) + ((0) * 1000) + 1)
	269	#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 0, 1, 0)
264	270
265	271	/* debian 6
266	272	ubuntu 10.04 */

+11

-18

xrdp/Makefile.am less more

0		EXTRA_DIST = xrdp.ini ad24b.bmp ad256.bmp xrdp24b.bmp xrdp256.bmp xrdp_logo.bmp sans-10.fv1 cursor0.cur cursor1.cur xrdp.h xrdp_types.h \
1		xrdp_encoder.h xrdp_keyboard.ini
2
3	0	EXTRA_INCLUDES =
4	1	EXTRA_LIBS =
5	2	EXTRA_FLAGS =

10	7	EXTRA_DEFINES = -DXRDP_NODEBUG
11	8	endif
12	9
13		if GOT_PREFIX
14		EXTRA_INCLUDES += -I$(prefix)/include
15		EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib
16		endif
17
18	10	if XRDP_RFXCODEC
19	11	EXTRA_DEFINES += -DXRDP_RFXCODEC
20	12	EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include
21	13	EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/librfxencode.a
22	14	endif
23	15
24		AM_CFLAGS = \
	16	AM_CPPFLAGS = \
25	17	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
26	18	-DXRDP_SBIN_PATH=\"${sbindir}\" \
27	19	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
28	20	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
29		-DXRDP_LIB_PATH=\"${libdir}\" \
30		$(EXTRA_DEFINES)
31
32		INCLUDES = \
	21	-DXRDP_MODULE_PATH=\"${moduledir}\" \
	22	$(EXTRA_DEFINES) \
33	23	-I$(top_builddir) \
34	24	-I$(top_srcdir)/common \
35	25	-I$(top_srcdir)/libxrdp \

41	31	xrdp_SOURCES = \
42	32	funcs.c \
43	33	lang.c \
	34	xrdp.c \
	35	xrdp.h \
44	36	xrdp_bitmap.c \
45		xrdp.c \
46	37	xrdp_cache.c \
	38	xrdp_encoder.c \
	39	xrdp_encoder.h \
47	40	xrdp_font.c \
48	41	xrdp_listen.c \
49	42	xrdp_login_wnd.c \

51	44	xrdp_painter.c \
52	45	xrdp_process.c \
53	46	xrdp_region.c \
54		xrdp_wm.c \
55		xrdp_encoder.c
	47	xrdp_types.h \
	48	xrdp_wm.c
56	49
57	50	xrdp_LDADD = \
58	51	$(top_builddir)/common/libcommon.la \

64	57
65	58	xrdpsysconfdir=$(sysconfdir)/xrdp
66	59
67		xrdpsysconf_DATA = \
	60	dist_xrdpsysconf_DATA = \
68	61	xrdp.ini \
69	62	xrdp_keyboard.ini
70	63
71	64	xrdppkgdatadir=$(datadir)/xrdp
72	65
73		xrdppkgdata_DATA = \
	66	dist_xrdppkgdata_DATA = \
74	67	ad24b.bmp \
75	68	ad256.bmp \
76	69	xrdp24b.bmp \

xrdp/ad256.bmp less more

Binary diff not shown

+1

-1

xrdp/lang.c less more

262	262	if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)
263	263	{
264	264	log_message(LOG_LEVEL_WARNING,
265		"local keymap file for 0x%4.4x found and dosen't match "
	265	"local keymap file for 0x%4.4x found and doesn't match "
266	266	"built in keymap, using local keymap file", keylayout);
267	267	}
268	268

+1

-1

xrdp/rdp-scan-codes.txt less more

2	2
3	3	en-us
4	4
5		4000s in the down flags columm is from repeating keys(holding a key down)
	5	4000s in the down flags column is from repeating keys(holding a key down)
6	6	When holding a key down, the down flags repeat but the up flags only
7	7	come once at the end.
8	8	Rdesktop does not do this as of yet. It always sends down and up

xrdp/sans-10.fv1 less more

Binary diff not shown

+115

-87

xrdp/xrdp.c less more

33	33	static long g_sync1_mutex = 0;
34	34	static tbus g_term_event = 0;
35	35	static tbus g_sync_event = 0;
36		/* syncronize stuff */
	36	/* synchronize stuff */
37	37	static int g_sync_command = 0;
38	38	static long g_sync_result = 0;
39	39	static long g_sync_param1 = 0;

106	106
107	107	threadid = tc_get_threadid();
108	108	g_writeln("shutting down");
109		g_writeln("signal %d threadid %p", sig, threadid);
	109	g_writeln("signal %d threadid %lld", sig, (long long)threadid);
110	110
111	111	if (!g_is_wait_obj_set(g_term_event))
112	112	{

292	292	}
293	293
294	294	/*****************************************************************************/
	295	/* Basic sanity checks before any forking */
	296	int
	297	xrdp_sanity_check(void)
	298	{
	299	int intval = 1;
	300	int host_be;
	301	char key_file[256];
	302
	303	/* check compiled endian with actual endian */
	304	host_be = !((int)((unsigned char )(&intval)));
	305
	306	#if defined(B_ENDIAN)
	307	if (!host_be)
	308	{
	309	g_writeln("Not a big endian machine, edit arch.h");
	310	return 1;
	311	}
	312	#endif
	313	#if defined(L_ENDIAN)
	314	if (host_be)
	315	{
	316	g_writeln("Not a little endian machine, edit arch.h");
	317	return 1;
	318	}
	319	#endif
	320
	321	/* check long, int and void* sizes */
	322	if (sizeof(int) != 4)
	323	{
	324	g_writeln("unusable int size, must be 4");
	325	return 1;
	326	}
	327
	328	if (sizeof(long) != sizeof(void *))
	329	{
	330	g_writeln("long size must match void* size");
	331	return 1;
	332	}
	333
	334	if (sizeof(long) != 4 && sizeof(long) != 8)
	335	{
	336	g_writeln("unusable long size, must be 4 or 8");
	337	return 1;
	338	}
	339
	340	if (sizeof(tui64) != 8)
	341	{
	342	g_writeln("unusable tui64 size, must be 8");
	343	return 1;
	344	}
	345
	346	g_snprintf(key_file, 255, "%s/rsakeys.ini", XRDP_CFG_PATH);
	347	if (!g_file_exist(key_file))
	348	{
	349	g_writeln("File %s is missing, create it using xrdp-keygen", key_file);
	350	return 1;
	351	}
	352
	353	return 0;
	354	}
	355
	356	/*****************************************************************************/
295	357	int DEFAULT_CC
296	358	main(int argc, char **argv)
297	359	{
298	360	int test;
299		int host_be;
300	361	char cfg_file[256];
301	362	enum logReturns error;
302	363	struct xrdp_startup_params *startup_params;

314	375	DEBUG(("Argument %i - %s", test, argv[test]));
315	376	}
316	377
317		/* check compiled endian with actual endian */
318		test = 1;
319		host_be = !((int)((unsigned char )(&test)));
320		#if defined(B_ENDIAN)
321		if (!host_be)
322		#endif
323		#if defined(L_ENDIAN)
324		if (host_be)
325		#endif
326		{
327		g_writeln("endian wrong, edit arch.h");
328		return 0;
329		}
330
331		/* check long, int and void* sizes */
332		if (sizeof(int) != 4)
333		{
334		g_writeln("unusable int size, must be 4");
335		return 0;
336		}
337
338		if (sizeof(long) != sizeof(void *))
339		{
340		g_writeln("long size must match void* size");
341		return 0;
342		}
343
344		if (sizeof(long) != 4 && sizeof(long) != 8)
345		{
346		g_writeln("unusable long size, must be 4 or 8");
347		return 0;
348		}
349
350		if (sizeof(tui64) != 8)
351		{
352		g_writeln("unusable tui64 size, must be 8");
353		return 0;
354		}
355
356	378	g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH);
357	379
358	380	startup_params = (struct xrdp_startup_params *)

362	384	{
363	385	g_writeln("Unknown Parameter");
364	386	g_writeln("xrdp -h for help");
365		g_writeln("");
	387	g_writeln("%s", "");
366	388	g_deinit();
367	389	g_exit(0);
368	390	}

372	394
373	395	if (startup_params->help)
374	396	{
375		g_writeln("");
	397	g_writeln("%s", "");
376	398	g_writeln("xrdp: A Remote Desktop Protocol server.");
377	399	g_writeln("Copyright (C) Jay Sorg 2004-2014");
378	400	g_writeln("See http://www.xrdp.org for more information.");
379		g_writeln("");
	401	g_writeln("%s", "");
380	402	g_writeln("Usage: xrdp [options]");
381	403	g_writeln(" --help: show help");
382	404	g_writeln(" --nodaemon: don't fork into background");
383	405	g_writeln(" --kill: shut down xrdp");
384	406	g_writeln(" --port: tcp listen port");
385	407	g_writeln(" --fork: fork on new connection");
386		g_writeln("");
	408	g_writeln("%s", "");
387	409	g_deinit();
388	410	g_exit(0);
389	411	}
390	412
391	413	if (startup_params->version)
392	414	{
393		g_writeln("");
	415	g_writeln("%s", "");
394	416	g_writeln("xrdp: A Remote Desktop Protocol server.");
395	417	g_writeln("Copyright (C) Jay Sorg 2004-2014");
396	418	g_writeln("See http://www.xrdp.org for more information.");
397	419	g_writeln("Version %s", PACKAGE_VERSION);
398		g_writeln("");
	420	g_writeln("%s", "");
399	421	g_deinit();
400	422	g_exit(0);
401	423	}
402	424
	425	if (xrdp_sanity_check() != 0)
	426	{
	427	g_writeln("Fatal error occurred, exiting");
	428	g_deinit();
	429	g_exit(1);
	430	}
	431
	432	if (startup_params->kill)
	433	{
	434	g_writeln("stopping xrdp");
	435	/* read the xrdp.pid file */
	436	fd = -1;
	437
	438	if (g_file_exist(pid_file)) /* xrdp.pid */
	439	{
	440	fd = g_file_open(pid_file); /* xrdp.pid */
	441	}
	442
	443	if (fd == -1)
	444	{
	445	g_writeln("problem opening to xrdp.pid [%s]", pid_file);
	446	g_writeln("maybe its not running");
	447	}
	448	else
	449	{
	450	g_memset(text, 0, 32);
	451	g_file_read(fd, text, 31);
	452	pid = g_atoi(text);
	453	g_writeln("stopping process id %d", pid);
	454
	455	if (pid > 0)
	456	{
	457	g_sigterm(pid);
	458	}
	459
	460	g_file_close(fd);
	461	}
	462
	463	g_deinit();
	464	g_exit(0);
	465	}
	466
403	467	/* starting logging subsystem */
404		error = log_start(cfg_file, "XRDP");
	468	error = log_start(cfg_file, "xrdp");
405	469
406	470	if (error != LOG_STARTUP_OK)
407	471	{

427	491
428	492	if (g_file_exist(pid_file)) /* xrdp.pid */
429	493	{
430		g_writeln("It looks like xrdp is allready running,");
431		g_writeln("if not delete the xrdp.pid file and try again");
432		g_deinit();
433		g_exit(0);
434		}
435
436		if (startup_params->kill)
437		{
438		g_writeln("stopping xrdp");
439		/* read the xrdp.pid file */
440		fd = -1;
441
442		if (g_file_exist(pid_file)) /* xrdp.pid */
443		{
444		fd = g_file_open(pid_file); /* xrdp.pid */
445		}
446
447		if (fd == -1)
448		{
449		g_writeln("problem opening to xrdp.pid [%s]", pid_file);
450		g_writeln("maybe its not running");
451		}
452		else
453		{
454		g_memset(text, 0, 32);
455		g_file_read(fd, text, 31);
456		pid = g_atoi(text);
457		g_writeln("stopping process id %d", pid);
458
459		if (pid > 0)
460		{
461		g_sigterm(pid);
462		}
463
464		g_file_close(fd);
465		}
466
	494	g_writeln("It looks like xrdp is already running.");
	495	g_writeln("If not, delete %s and try again.", pid_file);
467	496	g_deinit();
468	497	g_exit(0);
469	498	}

562	591	g_threadid = tc_get_threadid();
563	592	g_listen = xrdp_listen_create();
564	593	g_signal_user_interrupt(xrdp_shutdown); /* SIGINT */
565		g_signal_kill(xrdp_shutdown); /* SIGKILL */
566	594	g_signal_pipe(pipe_sig); /* SIGPIPE */
567	595	g_signal_terminate(xrdp_shutdown); /* SIGTERM */
568	596	g_signal_child_stop(xrdp_child); /* SIGCHLD */

+6

-4

xrdp/xrdp.h less more

135	135	int
136	136	callback(long id, int msg, long param1, long param2, long param3, long param4);
137	137	int APP_CC
138		xrdp_wm_delete_all_childs(struct xrdp_wm* self);
	138	xrdp_wm_delete_all_children(struct xrdp_wm* self);
139	139	int APP_CC
140	140	xrdp_wm_show_log(struct xrdp_wm *self);
141	141	int APP_CC

380	380	xrdp_mm_check_chan(struct xrdp_mm *self);
381	381	int APP_CC
382	382	xrdp_mm_check_wait_objs(struct xrdp_mm* self);
	383	int APP_CC
	384	xrdp_mm_frame_ack(struct xrdp_mm *self, int frame_id);
383	385	int DEFAULT_CC
384	386	server_begin_update(struct xrdp_mod* mod);
385	387	int DEFAULT_CC

436	438	int DEFAULT_CC
437	439	server_set_mixmode(struct xrdp_mod* mod, int mixmode);
438	440	int DEFAULT_CC
439		server_set_brush(struct xrdp_mod* mod, int x_orgin, int y_orgin,
	441	server_set_brush(struct xrdp_mod* mod, int x_origin, int y_origin,
440	442	int style, char* pattern);
441	443	int DEFAULT_CC
442	444	server_set_pen(struct xrdp_mod* mod, int style, int width);
443	445	int DEFAULT_CC
444	446	server_draw_line(struct xrdp_mod* mod, int x1, int y1, int x2, int y2);
445	447	int DEFAULT_CC
446		server_add_char(struct xrdp_mod* mod, int font, int charactor,
	448	server_add_char(struct xrdp_mod* mod, int font, int character,
447	449	int offset, int baseline,
448	450	int width, int height, char* data);
449	451	int DEFAULT_CC

508	510	struct rail_monitored_desktop_order* mdo,
509	511	int flags);
510	512	int DEFAULT_CC
511		server_add_char_alpha(struct xrdp_mod* mod, int font, int charactor,
	513	server_add_char_alpha(struct xrdp_mod* mod, int font, int character,
512	514	int offset, int baseline,
513	515	int width, int height, char* data);

xrdp/xrdp256.bmp less more

Binary diff not shown

+3

-3

xrdp/xrdp_bitmap.c less more

164	164	if (((bpp >= 24) && (data_as_int & 3)) \|\|
165	165	(((bpp == 15) \|\| (bpp == 16)) && (data_as_int & 1)))
166	166	{
167		/* got to copy data here, it's not alligned
	167	/* got to copy data here, it's not aligned
168	168	other calls in this file assume alignment */
169	169	Bpp = 4;
170	170	switch (bpp)

1253	1253	painter->brush.pattern[5] = 0x55;
1254	1254	painter->brush.pattern[6] = 0xaa;
1255	1255	painter->brush.pattern[7] = 0x55;
1256		painter->brush.x_orgin = x;
1257		painter->brush.x_orgin = x;
	1256	painter->brush.x_origin = x;
	1257	painter->brush.x_origin = x;
1258	1258	painter->brush.style = 3;
1259	1259	painter->fg_color = self->wm->black;
1260	1260	painter->bg_color = self->parent->bg_color;

+3

-3

xrdp/xrdp_cache.c less more

78	78	{
79	79	for (jndex = 0; jndex < 64 * 1024; jndex++)
80	80	{
81		/* it's ok to deinit a zero'ed out struct list16 */
	81	/* it's ok to deinit a zeroed out struct list16 */
82	82	list16_deinit(&(self->crc16[index][jndex]));
83	83	list16_init(&(self->crc16[index][jndex]));
84	84	}

683	683	}
684	684
685	685	/*****************************************************************************/
686		/* this does not take owership of pointer_item, it makes a copy */
	686	/* this does not take ownership of pointer_item, it makes a copy */
687	687	int APP_CC
688	688	xrdp_cache_add_pointer_static(struct xrdp_cache *self,
689	689	struct xrdp_pointer_item *pointer_item,

715	715	}
716	716
717	717	/*****************************************************************************/
718		/* this does not take owership of brush_item_data, it makes a copy */
	718	/* this does not take ownership of brush_item_data, it makes a copy */
719	719	int APP_CC
720	720	xrdp_cache_add_brush(struct xrdp_cache *self,
721	721	char *brush_item_data)

+1

-1

xrdp/xrdp_encoder.c less more

110	110	return 0;
111	111	}
112	112
113		LLOGLN(0, ("init_xrdp_encoder: initing encoder codec_id %d", self->codec_id));
	113	LLOGLN(0, ("init_xrdp_encoder: initializing encoder codec_id %d", self->codec_id));
114	114
115	115	/* setup required FIFOs */
116	116	self->fifo_to_proc = fifo_create();

+2

-2

xrdp/xrdp_keyboard.ini less more

39	39
40	40	# default
41	41	[default]
42		# keyboard_type and keyboard_subtype is not readed for default section. It
43		# is only as a place holder to keep consistency. Default model/variant are
	42	# keyboard_type and keyboard_subtype is not read for default section. It
	43	# is only a placeholder to keep consistency. Default model/variant are
44	44	# platform dependent, and could be overridden if needed.
45	45	keyboard_type=0
46	46	keyboard_subtype=0

+43

-17

xrdp/xrdp_login_wnd.c less more

95	95
96	96	/*****************************************************************************/
97	97	int APP_CC
98		xrdp_wm_delete_all_childs(struct xrdp_wm *self)
	98	xrdp_wm_delete_all_children(struct xrdp_wm *self)
99	99	{
100	100	int index;
101	101	struct xrdp_bitmap *b;

227	227	wm->mm->login_names->auto_free = 1;
228	228	wm->mm->login_values = list_create();
229	229	wm->mm->login_values->auto_free = 1;
230		/* gota copy these cause dialog gets freed */
	230	/* will copy these cause dialog gets freed */
231	231	list_append_list_strdup(mod_data->names, wm->mm->login_names, 0);
232	232	list_append_list_strdup(mod_data->values, wm->mm->login_values, 0);
233	233	xrdp_wm_set_login_mode(wm, 2);

256	256	*
257	257	* Users can create shortcuts where this information is configured. These
258	258	* shortcuts simplifies login.
259		* @param orginalDomainInfo indata to this function
	259	* @param originalDomainInfo indata to this function
260	260	* @param comboMax the max number of combo choices
261	261	* @param decode if true then we perform decoding of combo choice
262	262	* @param resultBuffer must be pre allocated before calling this function.

265	265	* 0 if the user does not prefer any choice.
266	266	*/
267	267	static int APP_CC
268		xrdp_wm_parse_domain_information(char *orginalDomainInfo, int comboMax,
	268	xrdp_wm_parse_domain_information(char *originalDomainInfo, int comboMax,
269	269	int decode, char *resultBuffer)
270	270	{
271	271	int ret;

279	279	ret = 0; /* default return value */
280	280	/* resultBuffer assumed to be 256 chars */
281	281	g_memset(resultBuffer, 0, 256);
282		if (orginalDomainInfo[0] == '_')
	282	if (originalDomainInfo[0] == '_')
283	283	{
284	284	/* we try to locate a number indicating what combobox index the user
285	285	* prefer the information is loaded from domain field, from the client

288	288	* Underscore is a valid name in the domain.
289	289	* Invalid chars are ignored in microsoft client therefore we use '_'
290	290	* again. this sec '__' contains the split for index.*/
291		pos = g_pos(&orginalDomainInfo[1], "__");
	291	pos = g_pos(&originalDomainInfo[1], "__");
292	292	if (pos > 0)
293	293	{
294	294	/* an index is found we try to use it

297	297	{
298	298	g_memset(index, 0, 2);
299	299	/* we just accept values 0-9 (one figure) */
300		g_strncpy(index, &orginalDomainInfo[pos + 3], 1);
	300	g_strncpy(index, &originalDomainInfo[pos + 3], 1);
301	301	comboxindex = g_htoi(index);
302	302	g_snprintf(debugstr, 255, "Value of index (as char): %s "
303	303	"(converted) : %d (max) : %d", index, comboxindex,

313	313	}
314	314	}
315	315	/* pos limit the String to only contain the IP */
316		g_strncpy(resultBuffer, &orginalDomainInfo[1], pos);
	316	g_strncpy(resultBuffer, &originalDomainInfo[1], pos);
317	317	}
318	318	else
319	319	{
320	320	/* log_message(LOG_LEVEL_DEBUG, "domain does not contain _"); */
321		g_strncpy(resultBuffer, &orginalDomainInfo[1], 255);
	321	g_strncpy(resultBuffer, &originalDomainInfo[1], 255);
322	322	}
323	323	}
324	324	return ret;

343	343
344	344	username_set = 0;
345	345
346		/* free labels and edits, cause we gota create them */
	346	/* free labels and edits, cause we will create them */
347	347	/* creation or combo changed */
348	348	for (index = 100; index < 200; index++)
349	349	{

617	617	int log_width;
618	618	int log_height;
619	619	int regular;
	620	int primary_x_offset;
	621	int primary_y_offset;
	622	int index;
	623	int x;
	624	int y;
	625	int cx;
	626	int cy;
620	627
621	628	globals = &self->xrdp_config->cfg_globals;
	629
	630	primary_x_offset = self->screen->width / 2;
	631	primary_y_offset = self->screen->height / 2;
622	632
623	633	log_width = globals->ls_width;
624	634	log_height = globals->ls_height;

636	646	}
637	647
638	648	regular = 0;
	649	}
	650
	651	/* multimon scenario, draw login window on primary monitor */
	652	if (self->client_info->monitorCount > 1)
	653	{
	654	for (index = 0; index < self->client_info->monitorCount; index++)
	655	{
	656	if (self->client_info->minfo_wm[index].is_primary)
	657	{
	658	x = self->client_info->minfo_wm[index].left;
	659	y = self->client_info->minfo_wm[index].top;
	660	cx = self->client_info->minfo_wm[index].right;
	661	cy = self->client_info->minfo_wm[index].bottom;
	662
	663	primary_x_offset = x + ((cx - x) / 2);
	664	primary_y_offset = y + ((cy - y) / 2);
	665	break;
	666	}
	667	}
639	668	}
640	669
641	670	/* draw login window */

646	675	self->login_window->owner = self->screen;
647	676	self->login_window->bg_color = globals->ls_bg_color;
648	677
649		self->login_window->left = self->screen->width / 2 -
650		self->login_window->width / 2;
651
652		self->login_window->top = self->screen->height / 2 -
653		self->login_window->height / 2;
	678	self->login_window->left = primary_x_offset - self->login_window->width / 2;
	679	self->login_window->top = primary_y_offset - self->login_window->height / 2;
	680
654	681
655	682	self->login_window->notify = xrdp_wm_login_notify;
656	683

790	817
791	818	globals = &config->cfg_globals;
792	819
793		/* set default values incase we can't get them from xrdp.ini file */
	820	/* set default values in case we can't get them from xrdp.ini file */
794	821	globals->ini_version = 1;
795	822	globals->ls_top_window_bg_color = HCOLOR(bpp, xrdp_wm_htoi("009cb5"));
796	823	globals->ls_bg_color = HCOLOR(bpp, xrdp_wm_htoi("dedede"));
797	824	globals->ls_width = 350;
798	825	globals->ls_height = 350;
799		globals->ls_bg_color = 0xdedede;
800	826	globals->ls_logo_x_pos = 63;
801	827	globals->ls_logo_y_pos = 50;
802	828	globals->ls_label_x_pos = 30;

+31

-19

xrdp/xrdp_mm.c less more

356	356
357	357	if (self->mod_handle == 0)
358	358	{
359		g_snprintf(text, 255, "%s/%s", XRDP_LIB_PATH, lib);
	359	g_snprintf(text, 255, "%s/%s", XRDP_MODULE_PATH, lib);
360	360	/* Let the main thread load the lib,*/
361	361	self->mod_handle = g_xrdp_sync(xrdp_mm_sync_load, (tintptr)text, 0);
362	362

577	577	else
578	578	{
579	579	xrdp_wm_show_log(self->wm);
	580	if (self->wm->hide_log_window)
	581	{
	582	rv = 1;
	583	}
580	584	}
581	585	}
582	586

812	816	return rv;
813	817	}
814	818
	819	#if 0
815	820	/*****************************************************************************/
816	821	/* returns error
817	822	process rail configure window order */

878	883	g_free(rwso.visibility_rects);
879	884	return rv;
880	885	}
	886	#endif
881	887
882	888	/*****************************************************************************/
883	889	/* returns error

1051	1057	{
1052	1058	struct xrdp_mm *self;
1053	1059	struct stream *s;
1054		int id;
1055	1060	int size;
1056	1061	int error;
1057	1062

1068	1073	return 1;
1069	1074	}
1070	1075
1071		in_uint32_le(s, id);
	1076	in_uint8s(s, 4); /* id */
1072	1077	in_uint32_le(s, size);
1073	1078	error = trans_force_read(trans, size - 8);
1074	1079

1146	1151
1147	1152	if (!(self->chan_trans_up))
1148	1153	{
1149		log_message(LOG_LEVEL_ERROR,"xrdp_mm_connect_chansrv: error in"
	1154	log_message(LOG_LEVEL_ERROR,"xrdp_mm_connect_chansrv: error in "
1150	1155	"trans_connect chan");
1151	1156	}
1152	1157

1159	1164	}
1160	1165	else
1161	1166	{
1162		log_message(LOG_LEVEL_DEBUG,"xrdp_mm_connect_chansrv: chansrv"
	1167	log_message(LOG_LEVEL_DEBUG,"xrdp_mm_connect_chansrv: chansrv "
1163	1168	"connect successful");
1164	1169	}
1165	1170	}

1230	1235	log_message(LOG_LEVEL_INFO,"xrdp_mm_process_login_response: "
1231	1236	"login failed");
1232	1237	xrdp_wm_show_log(self->wm);
	1238	if (self->wm->hide_log_window)
	1239	{
	1240	rv = 1;
	1241	}
1233	1242	}
1234	1243
1235	1244	cleanup_sesman_connection(self);

1449	1458	if (reply > 0)
1450	1459	{
1451	1460	/* We wait in 5 sec for a reply from sesman*/
1452		if (g_tcp_can_recv(socket, 5000))
	1461	if (g_sck_can_recv(socket, 5000))
1453	1462	{
1454	1463	reply = g_tcp_recv(socket, in_s->end, 500, 0);
1455	1464

1974	1983	if (xrdp_mm_setup_mod2(self) == 0)
1975	1984	{
1976	1985	xrdp_wm_set_login_mode(self->wm, 10);
1977		rv = 0; /sucess/
	1986	rv = 0; /success/
1978	1987	}
1979	1988	else
1980	1989	{

2005	2014	xrdp_mm_connect_chansrv(self, "", chansrvport);
2006	2015	}
2007	2016
2008		log_message(LOG_LEVEL_DEBUG,"returnvalue from xrdp_mm_connect %d", rv);
	2017	log_message(LOG_LEVEL_DEBUG,"return value from xrdp_mm_connect %d", rv);
2009	2018
2010	2019	return rv;
2011	2020	}

2154	2163	if (trans_check_wait_objs(self->sesman_trans) != 0)
2155	2164	{
2156	2165	self->delete_sesman_trans = 1;
	2166	if (self->wm->hide_log_window)
	2167	{
	2168	/* if hide_log_window, this is fatal */
	2169	rv = 1;
	2170	}
2157	2171	}
2158	2172	}
2159	2173

2644	2658
2645	2659	if (code == 1)
2646	2660	{
2647		g_writeln(msg);
	2661	g_writeln("%s",msg);
2648	2662	return 0;
2649	2663	}
2650	2664

2762	2776
2763	2777	/*****************************************************************************/
2764	2778	int DEFAULT_CC
2765		server_set_brush(struct xrdp_mod *mod, int x_orgin, int y_orgin,
	2779	server_set_brush(struct xrdp_mod *mod, int x_origin, int y_origin,
2766	2780	int style, char *pattern)
2767	2781	{
2768	2782	struct xrdp_painter *p;

2774	2788	return 0;
2775	2789	}
2776	2790
2777		p->brush.x_orgin = x_orgin;
2778		p->brush.y_orgin = y_orgin;
	2791	p->brush.x_origin = x_origin;
	2792	p->brush.y_origin = y_origin;
2779	2793	p->brush.style = style;
2780	2794	g_memcpy(p->brush.pattern, pattern, 8);
2781	2795	return 0;

2819	2833
2820	2834	/*****************************************************************************/
2821	2835	int DEFAULT_CC
2822		server_add_char(struct xrdp_mod *mod, int font, int charactor,
	2836	server_add_char(struct xrdp_mod *mod, int font, int character,
2823	2837	int offset, int baseline,
2824	2838	int width, int height, char *data)
2825	2839	{

2833	2847	fi.data = data;
2834	2848	fi.bpp = 1;
2835	2849	return libxrdp_orders_send_font(((struct xrdp_wm *)mod->wm)->session,
2836		&fi, font, charactor);
	2850	&fi, font, character);
2837	2851	}
2838	2852
2839	2853	/*****************************************************************************/

2915	2929	int fd;
2916	2930	int ret = 0;
2917	2931	char cfg_file[256];
2918		int pos;
2919	2932
2920	2933	g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH);
2921	2934	fd = g_file_open(cfg_file);

2924	2937	{
2925	2938	names->auto_free = 1;
2926	2939	values->auto_free = 1;
2927		pos = 0;
2928	2940
2929	2941	/* all values in this section can be valid channel names */
2930	2942	if (file_read_section(fd, "channels", names, values) == 0)

3456	3468
3457	3469	/*****************************************************************************/
3458	3470	int DEFAULT_CC
3459		server_add_char_alpha(struct xrdp_mod* mod, int font, int charactor,
	3471	server_add_char_alpha(struct xrdp_mod* mod, int font, int character,
3460	3472	int offset, int baseline,
3461	3473	int width, int height, char* data)
3462	3474	{

3470	3482	fi.data = data;
3471	3483	fi.bpp = 8;
3472	3484	return libxrdp_orders_send_font(((struct xrdp_wm*)mod->wm)->session,
3473		&fi, font, charactor);
3474		}
	3485	&fi, font, character);
	3486	}

+1

-3

xrdp/xrdp_painter.c less more

28	28	self = (struct xrdp_painter *)g_malloc(sizeof(struct xrdp_painter), 1);
29	29	self->wm = wm;
30	30	self->session = session;
31		self->rop = 0xcc; /* copy gota use 0xcc*/
	31	self->rop = 0xcc; /* copy will use 0xcc*/
32	32	self->clip_children = 1;
33	33	return self;
34	34	}

914	914	int k;
915	915	int dx;
916	916	int dy;
917		int palette_id;
918	917	int cache_srcidx;
919	918	int cache_mskidx;
920	919

938	937	dstx += dx;
939	938	dsty += dy;
940	939
941		palette_id = 0;
942	940	cache_srcidx = src->item_index;
943	941	cache_mskidx = -1;
944	942	if (mskflags & 1)

+2

-2

xrdp/xrdp_process.c less more

201	201	/* this function is just above */
202	202	self->session->is_term = xrdp_is_term;
203	203
204		if (libxrdp_process_incomming(self->session) == 0)
	204	if (libxrdp_process_incoming(self->session) == 0)
205	205	{
206	206	init_stream(self->server_trans->in_s, 32 * 1024);
207	207

252	252	}
253	253	else
254	254	{
255		g_writeln("xrdp_process_main_loop: libxrdp_process_incomming failed");
	255	g_writeln("xrdp_process_main_loop: libxrdp_process_incoming failed");
256	256	/* this will try to send a disconnect,
257	257	maybe should check that connection got far enough */
258	258	libxrdp_disconnect(self->session);

+4

-4

xrdp/xrdp_types.h less more

69	69	int (server_set_bgcolor)(struct xrdp_mod v, int bgcolor);
70	70	int (server_set_opcode)(struct xrdp_mod v, int opcode);
71	71	int (server_set_mixmode)(struct xrdp_mod v, int mixmode);
72		int (server_set_brush)(struct xrdp_mod v, int x_orgin, int y_orgin,
	72	int (server_set_brush)(struct xrdp_mod v, int x_origin, int y_origin,
73	73	int style, char* pattern);
74	74	int (server_set_pen)(struct xrdp_mod v, int style,
75	75	int width);
76	76	int (server_draw_line)(struct xrdp_mod v, int x1, int y1, int x2, int y2);
77		int (server_add_char)(struct xrdp_mod v, int font, int charactor,
	77	int (server_add_char)(struct xrdp_mod v, int font, int character,
78	78	int offset, int baseline,
79	79	int width, int height, char* data);
80	80	int (server_draw_text)(struct xrdp_mod v, int font,

124	124	int flags);
125	125	int (server_set_pointer_ex)(struct xrdp_mod v, int x, int y, char* data,
126	126	char* mask, int bpp);
127		int (server_add_char_alpha)(struct xrdp_mod mod, int font, int charactor,
	127	int (server_add_char_alpha)(struct xrdp_mod mod, int font, int character,
128	128	int offset, int baseline,
129	129	int width, int height, char* data);
130	130

222	222	/* moved to xrdp_constants.h
223	223	#define XRDP_BITMAP_CACHE_ENTRIES 2048 */
224	224
225		/* differnce caches */
	225	/* difference caches */
226	226	struct xrdp_cache
227	227	{
228	228	struct xrdp_wm* wm; /* owner */

+37

-15

xrdp/xrdp_wm.c less more

559	559	xrdp_wm_load_static_pointers(self);
560	560	self->screen->bg_color = self->xrdp_config->cfg_globals.ls_top_window_bg_color;
561	561
562		if (self->session->client_info->rdp_autologin)
	562	if (self->session->client_info->rdp_autologin \|\| self->hide_log_window)
563	563	{
564	564	/*
565	565	* NOTE: this should eventually be accessed from self->xrdp_config

575	575	values->auto_free = 1;
576	576
577	577	/* look for module name to be loaded */
578		if (autorun_name[0] != 0) {
	578	if (autorun_name[0] != 0)
	579	{
579	580	/* if autorun is configured in xrdp.ini, we enforce that module to be loaded */
580	581	g_strncpy(section_name, autorun_name, 255);
581	582	}

592	593	{
593	594	/* if no domain is passed, and no autorun in xrdp.ini,
594	595	use the first item in the xrdp.ini
595		file thats not named
	596	file that's not named
596	597	'globals' or 'Logging' or 'channels' */
597		/* TODO: change this and have a 'autologin'
	598	/* TODO: change this and have an 'autologin'
598	599	line in globals section */
599	600	file_read_sections(fd, names);
600	601	for (index = 0; index < names->count; index++)

808	809	self->painter->brush.pattern[5] = 0x55;
809	810	self->painter->brush.pattern[6] = 0xaa;
810	811	self->painter->brush.pattern[7] = 0x55;
811		self->painter->brush.x_orgin = 0;
812		self->painter->brush.x_orgin = 0;
	812	self->painter->brush.x_origin = 0;
	813	self->painter->brush.x_origin = 0;
813	814	self->painter->brush.style = 3;
814	815	self->painter->bg_color = self->black;
815	816	self->painter->fg_color = self->white;

868	869	}
869	870
870	871	/*****************************************************************************/
871		/* return true is rect is totaly exposed going in reverse z order */
	872	/* return true if rect is totally exposed going in reverse z order */
872	873	/* from wnd up */
873	874	static int APP_CC
874	875	xrdp_wm_is_rect_vis(struct xrdp_wm self, struct xrdp_bitmap wnd,

1686	1687	}
1687	1688
1688	1689	/******************************************************************************/
1689		/* this is the callbacks comming from libxrdp.so */
	1690	/* this is the callbacks coming from libxrdp.so */
1690	1691	int DEFAULT_CC
1691	1692	callback(long id, int msg, long param1, long param2, long param3, long param4)
1692	1693	{

1758	1759
1759	1760	if (self->login_mode == 0)
1760	1761	{
1761		/* this is the inital state of the login window */
	1762	/* this is the initial state of the login window */
1762	1763	xrdp_wm_set_login_mode(self, 1); /* put the wm in login mode */
1763	1764	list_clear(self->log);
1764		xrdp_wm_delete_all_childs(self);
	1765	xrdp_wm_delete_all_children(self);
1765	1766	self->dragging = 0;
1766	1767	xrdp_wm_init(self);
1767	1768	}

1770	1771	if (xrdp_mm_connect(self->mm) == 0)
1771	1772	{
1772	1773	xrdp_wm_set_login_mode(self, 3); /* put the wm in connected mode */
1773		xrdp_wm_delete_all_childs(self);
	1774	xrdp_wm_delete_all_children(self);
1774	1775	self->dragging = 0;
1775	1776	}
1776	1777	else

1780	1781	}
1781	1782	else if (self->login_mode == 10)
1782	1783	{
1783		xrdp_wm_delete_all_childs(self);
	1784	xrdp_wm_delete_all_children(self);
1784	1785	self->dragging = 0;
1785	1786	xrdp_wm_set_login_mode(self, 11);
1786	1787	}

1865	1866	do
1866	1867	{
1867	1868	new_part_message = g_strndup(current_pointer, LOG_WINDOW_CHAR_PER_LINE) ;
1868		g_writeln(new_part_message);
	1869	g_writeln("%s",new_part_message);
1869	1870	list_add_item(log, (long)new_part_message);
1870	1871	processedlen = processedlen + g_strlen(new_part_message);
1871	1872	current_pointer = current_pointer + g_strlen(new_part_message) ;

1882	1883	int h;
1883	1884	int xoffset;
1884	1885	int yoffset;
	1886	int index;
	1887	int primary_x_offset;
	1888	int primary_y_offset;
	1889
1885	1890
1886	1891	if (self->hide_log_window)
1887	1892	{

1908	1913	{
1909	1914	h = self->screen->height - 4;
1910	1915	yoffset = 2;
	1916	}
	1917
	1918	primary_x_offset = 0;
	1919	primary_y_offset = 0;
	1920
	1921	/* multimon scenario, draw log window on primary monitor */
	1922	if (self->client_info->monitorCount > 1)
	1923	{
	1924	for (index = 0; index < self->client_info->monitorCount; index++)
	1925	{
	1926	if (self->client_info->minfo_wm[index].is_primary)
	1927	{
	1928	primary_x_offset = self->client_info->minfo_wm[index].left;
	1929	primary_y_offset = self->client_info->minfo_wm[index].top;
	1930	break;
	1931	}
	1932	}
1911	1933	}
1912	1934
1913	1935	/* log window */

1917	1939	self->log_wnd->parent = self->screen;
1918	1940	self->log_wnd->owner = self->screen;
1919	1941	self->log_wnd->bg_color = self->grey;
1920		self->log_wnd->left = xoffset;
1921		self->log_wnd->top = yoffset;
	1942	self->log_wnd->left = primary_x_offset + xoffset;
	1943	self->log_wnd->top = primary_y_offset + yoffset;
1922	1944	set_string(&(self->log_wnd->caption1), "Connection Log");
1923	1945	/* ok button */
1924	1946	but = xrdp_bitmap_create(DEFAULT_BUTTON_W, DEFAULT_BUTTON_H, self->screen->bpp, WND_TYPE_BUTTON, self);

+18

-19

xrdp/xrdpwin.c less more

33	33	static long g_sync1_mutex = 0;
34	34	static tbus g_term_event = 0;
35	35	static tbus g_sync_event = 0;
36		/* syncronize stuff */
	36	/* synchronize stuff */
37	37	static int g_sync_command = 0;
38	38	static long g_sync_result = 0;
39	39	static long g_sync_param1 = 0;

343	343	g_strncasecmp(argv[1], "--help", 255) == 0 \|\|
344	344	g_strncasecmp(argv[1], "-h", 255) == 0)
345	345	{
346		g_writeln("");
	346	g_writeln("%s", "");
347	347	g_writeln("xrdp: A Remote Desktop Protocol server.");
348	348	g_writeln("Copyright (C) Jay Sorg 2004-2011");
349	349	g_writeln("See http://xrdp.sourceforge.net for more information.");
350		g_writeln("");
	350	g_writeln("%s", "");
351	351	g_writeln("Usage: xrdp [options]");
352	352	g_writeln(" -h: show help");
353	353	g_writeln(" -install: install service");
354	354	g_writeln(" -remove: remove service");
355		g_writeln("");
	355	g_writeln("%s", "");
356	356	g_exit(0);
357	357	}
358	358	else if (g_strncasecmp(argv[1], "-install", 255) == 0 \|\|

368	368	g_exit(0);
369	369	}
370	370
371		/* check if service is allready installed */
	371	/* check if service is already installed */
372	372	sc_ser = OpenService(sc_man, "xrdp", SERVICE_ALL_ACCESS);
373	373
374	374	if (sc_ser == 0)

382	382	}
383	383	else
384	384	{
385		g_writeln("error service is allready installed");
	385	g_writeln("error service is already installed");
386	386	CloseServiceHandle(sc_ser);
387	387	CloseServiceHandle(sc_man);
388	388	g_exit(0);

404	404	g_exit(0);
405	405	}
406	406
407		/* check if service is allready installed */
	407	/* check if service is already installed */
408	408	sc_ser = OpenService(sc_man, "xrdp", SERVICE_ALL_ACCESS);
409	409
410	410	if (sc_ser == 0)

422	422	{
423	423	g_writeln("Unknown Parameter");
424	424	g_writeln("xrdp -h for help");
425		g_writeln("");
	425	g_writeln("%s", "");
426	426	g_exit(0);
427	427	}
428	428	}

430	430	{
431	431	g_writeln("Unknown Parameter");
432	432	g_writeln("xrdp -h for help");
433		g_writeln("");
	433	g_writeln("%s", "");
434	434	g_exit(0);
435	435	}
436	436

498	498	g_strncasecmp(argv[1], "--help", 255) == 0 \|\|
499	499	g_strncasecmp(argv[1], "-h", 255) == 0)
500	500	{
501		g_writeln("");
	501	g_writeln("%s", "");
502	502	g_writeln("xrdp: A Remote Desktop Protocol server.");
503	503	g_writeln("Copyright (C) Jay Sorg 2004-2011");
504	504	g_writeln("See http://xrdp.sourceforge.net for more information.");
505		g_writeln("");
	505	g_writeln("%s", "");
506	506	g_writeln("Usage: xrdp [options]");
507	507	g_writeln(" -h: show help");
508	508	g_writeln(" -nodaemon: don't fork into background");
509	509	g_writeln(" -kill: shut down xrdp");
510		g_writeln("");
	510	g_writeln("%s", "");
511	511	g_exit(0);
512	512	}
513	513	else if ((g_strncasecmp(argv[1], "-v", 255) == 0) \|\|
514	514	(g_strncasecmp(argv[1], "--version", 255) == 0))
515	515	{
516		g_writeln("");
	516	g_writeln("%s", "");
517	517	g_writeln("xrdp: A Remote Desktop Protocol server.");
518	518	g_writeln("Copyright (C) Jay Sorg 2004-2011");
519	519	g_writeln("See http://xrdp.sourceforge.net for more information.");
520	520	g_writeln("Version %s", PACKAGE_VERSION);
521		g_writeln("");
	521	g_writeln("%s", "");
522	522	g_exit(0);
523	523	}
524	524	else
525	525	{
526	526	g_writeln("Unknown Parameter");
527	527	g_writeln("xrdp -h for help");
528		g_writeln("");
	528	g_writeln("%s", "");
529	529	g_exit(0);
530	530	}
531	531	}

533	533	{
534	534	g_writeln("Unknown Parameter");
535	535	g_writeln("xrdp -h for help");
536		g_writeln("");
	536	g_writeln("%s", "");
537	537	g_exit(0);
538	538	}
539	539
540	540	if (g_file_exist(pid_file)) /* xrdp.pid */
541	541	{
542		g_writeln("It looks like xrdp is allready running,");
543		g_writeln("if not delete the xrdp.pid file and try again");
	542	g_writeln("It looks like xrdp is already running.");
	543	g_writeln("If not, delete %s and try again.", pid_file);
544	544	g_exit(0);
545	545	}
546	546

617	617	g_threadid = tc_get_threadid();
618	618	g_listen = xrdp_listen_create();
619	619	g_signal_user_interrupt(xrdp_shutdown); /* SIGINT */
620		g_signal_kill(xrdp_shutdown); /* SIGKILL */
621	620	g_signal_pipe(pipe_sig); /* SIGPIPE */
622	621	g_signal_terminate(xrdp_shutdown); /* SIGTERM */
623	622	g_sync_mutex = tc_mutex_create();

+5

-8

xrdpapi/Makefile.am less more

0		EXTRA_DIST = xrdpapi.h
1
2	0	EXTRA_DEFINES =
3	1	EXTRA_INCLUDES =
4	2	EXTRA_LIBS =
5	3	EXTRA_FLAGS =
6	4
7		AM_CFLAGS = \
8		$(EXTRA_DEFINES)
9
10		INCLUDES = \
	5	AM_CPPFLAGS = \
	6	$(EXTRA_DEFINES) \
11	7	$(EXTRA_INCLUDES)
12	8
13		lib_LTLIBRARIES = \
	9	module_LTLIBRARIES = \
14	10	libxrdpapi.la
15	11
16	12	libxrdpapi_la_SOURCES = \
17		xrdpapi.c
	13	xrdpapi.c \
	14	xrdpapi.h
18	15
19	16	libxrdpapi_la_LDFLAGS = \
20	17	$(EXTRA_FLAGS)

+16

-21

xrdpapi/xrdpapi.c less more

117	117
118	118	if (wts->display_num <= 0)
119	119	{
120		LLOGLN(0, ("WTSVirtualChannelOpenEx: fatal errror; display is 0"));
	120	LLOGLN(0, ("WTSVirtualChannelOpenEx: fatal error; display is 0"));
121	121	free(wts);
122	122	return NULL;
123	123	}

125	125	/* we use unix domain socket to communicate with chansrv */
126	126	if ((wts->fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
127	127	{
128		g_free(wts);
	128	free(wts);
129	129	return NULL;
130	130	}
131	131

161	161	return wts;
162	162	}
163	163
	164	/*
	165	* Prevent receiving SIGPIPE on disconnect using either MSG_NOSIGNAL (Linux)
	166	* or SO_NOSIGPIPE (Mac OS X)
	167	*/
	168	#if !defined(MSG_NOSIGNAL)
	169	#define MSG_NOSIGNAL 0
	170	#endif
	171
164	172	/*****************************************************************************/
165	173	static int
166	174	mysend(int sck, const void* adata, int bytes)

168	176	int sent;
169	177	int error;
170	178	const char* data;
	179
	180	#if defined(SO_NOSIGPIPE)
	181	const int on = 1;
	182	setsockopt(sck, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
	183	#endif
171	184
172	185	data = (const char*)adata;
173	186	sent = 0;

233	246	return -1;
234	247	}
235	248
236		LLOGLN(10, ("WTSVirtualChannelWrite: mysend() reted %d", rv));
	249	LLOGLN(10, ("WTSVirtualChannelWrite: mysend() returned %d", rv));
237	250
238	251	if (rv >= 0)
239	252	{

466	479	{
467	480	int index;
468	481	int mode;
469		int host_index;
470	482	int disp_index;
471		int scre_index;
472		char host[256];
473	483	char disp[256];
474		char scre[256];
475	484
476	485	index = 0;
477		host_index = 0;
478	486	disp_index = 0;
479		scre_index = 0;
480	487	mode = 0;
481	488
482	489	while (display_text[index] != 0)

488	495	else if (display_text[index] == '.')
489	496	{
490	497	mode = 2;
491		}
492		else if (mode == 0)
493		{
494		host[host_index] = display_text[index];
495		host_index++;
496	498	}
497	499	else if (mode == 1)
498	500	{
499	501	disp[disp_index] = display_text[index];
500	502	disp_index++;
501	503	}
502		else if (mode == 2)
503		{
504		scre[scre_index] = display_text[index];
505		scre_index++;
506		}
507	504
508	505	index++;
509	506	}
510	507
511		host[host_index] = 0;
512	508	disp[disp_index] = 0;
513		scre[scre_index] = 0;
514	509	return atoi(disp);
515	510	}

+5

-8

xrdpvr/Makefile.am less more

0		EXTRA_DIST = xrdpvr.h
1
2	0	EXTRA_DEFINES =
3	1	EXTRA_INCLUDES =
4	2	EXTRA_LIBS =
5	3	EXTRA_FLAGS =
6	4
7		AM_CFLAGS = \
8		$(EXTRA_DEFINES)
9
10		INCLUDES = \
	5	AM_CPPFLAGS = \
	6	$(EXTRA_DEFINES) \
11	7	$(EXTRA_INCLUDES)
12	8
13		lib_LTLIBRARIES = \
	9	module_LTLIBRARIES = \
14	10	libxrdpvr.la
15	11
16	12	libxrdpvr_la_SOURCES = \
17		xrdpvr.c
	13	xrdpvr.c \
	14	xrdpvr.h
18	15
19	16	libxrdpvr_la_LDFLAGS = \
20	17	$(EXTRA_FLAGS)

+1

-1

xrdpvr/xrdpvr.c less more

193	193	//if (avformat_find_stream_info(g_psi.p_format_ctx, NULL) < 0)
194	194	if (av_find_stream_info(g_psi.p_format_ctx) < 0)
195	195	{
196		printf("ERRRO reading stream info\n");
	196	printf("ERROR reading stream info\n");
197	197	return -1;
198	198	}
199	199

+6

-8

xup/Makefile.am less more

0		EXTRA_DIST = xup.h
1
2		AM_CFLAGS = \
	0	AM_CPPFLAGS = \
3	1	-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
4	2	-DXRDP_SBIN_PATH=\"${sbindir}\" \
5	3	-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
6		-DXRDP_PID_PATH=\"${localstatedir}/run\"
7
8		INCLUDES = \
	4	-DXRDP_PID_PATH=\"${localstatedir}/run\" \
9	5	-I$(top_srcdir)/common
10	6
11		lib_LTLIBRARIES = \
	7	module_LTLIBRARIES = \
12	8	libxup.la
13	9
14		libxup_la_SOURCES = xup.c
	10	libxup_la_SOURCES = \
	11	xup.c \
	12	xup.h
15	13
16	14	libxup_la_LIBADD = \
17	15	$(top_builddir)/common/libcommon.la

+13

-11

xup/xup.c less more

85	85	struct stream *s;
86	86	int len;
87	87
	88	LLOGLN(10, ("lib_data_in:"));
88	89	if (trans == 0)
89	90	{
90	91	return 1;

209	210	error = -1;
210	211	if (trans_connect(mod->trans, mod->ip, con_port, 3000) == 0)
211	212	{
	213	LLOGLN(0, ("lib_mod_connect: connected to Xserver "
	214	"(Xorg or X11rdp) sck %ld", mod->trans->sck));
212	215	error = 0;
213	216	}
214	217

793	796	{
794	797	int rv;
795	798	int font;
796		int charactor;
	799	int character;
797	800	int x;
798	801	int y;
799	802	int cx;

802	805	char *bmpdata;
803	806
804	807	in_uint16_le(s, font);
805		in_uint16_le(s, charactor);
	808	in_uint16_le(s, character);
806	809	in_sint16_le(s, x);
807	810	in_sint16_le(s, y);
808	811	in_uint16_le(s, cx);
809	812	in_uint16_le(s, cy);
810	813	in_uint16_le(s, len_bmpdata);
811	814	in_uint8p(s, bmpdata, len_bmpdata);
812		rv = mod->server_add_char(mod, font, charactor, x, y, cx, cy, bmpdata);
	815	rv = mod->server_add_char(mod, font, character, x, y, cx, cy, bmpdata);
813	816	return rv;
814	817	}
815	818

821	824	{
822	825	int rv;
823	826	int font;
824		int charactor;
	827	int character;
825	828	int x;
826	829	int y;
827	830	int cx;

830	833	char *bmpdata;
831	834
832	835	in_uint16_le(s, font);
833		in_uint16_le(s, charactor);
	836	in_uint16_le(s, character);
834	837	in_sint16_le(s, x);
835	838	in_sint16_le(s, y);
836	839	in_uint16_le(s, cx);
837	840	in_uint16_le(s, cy);
838	841	in_uint16_le(s, len_bmpdata);
839	842	in_uint8p(s, bmpdata, len_bmpdata);
840		rv = mod->server_add_char_alpha(mod, font, charactor, x, y, cx, cy,
	843	rv = mod->server_add_char_alpha(mod, font, character, x, y, cx, cy,
841	844	bmpdata);
842	845	return rv;
843	846	}

1147	1150	int shmem_offset;
1148	1151	int width;
1149	1152	int height;
1150		int x;
1151		int y;
1152		int cx;
1153		int cy;
1154	1153	int index;
1155	1154	int rv;
1156	1155	tsi16 *ldrects;

1236	1235	g_free(lcrects);
1237	1236	g_free(ldrects);
1238	1237
1239		return 0;
	1238	return rv;
1240	1239	}
1241	1240
1242	1241	/******************************************************************************/

1246	1245	{
1247	1246	int rv;
1248	1247
	1248	LLOGLN(10, ("lib_mod_process_orders: type %d", type));
1249	1249	rv = 0;
1250	1250	switch (type)
1251	1251	{

1383	1383	int type;
1384	1384	char *phold;
1385	1385
	1386	LLOGLN(10, ("lib_mod_process_message:"));
1386	1387	rv = 0;
1387	1388	if (rv == 0)
1388	1389	{
1389	1390	in_uint16_le(s, type);
1390	1391	in_uint16_le(s, num_orders);
1391	1392	in_uint32_le(s, len);
	1393	LLOGLN(10, ("lib_mod_process_message: type %d", type));
1392	1394
1393	1395	if (type == 1) /* original order list */
1394	1396	{

+3

-3

xup/xup.h less more

65	65	int (server_set_bgcolor)(struct mod v, int bgcolor);
66	66	int (server_set_opcode)(struct mod v, int opcode);
67	67	int (server_set_mixmode)(struct mod v, int mixmode);
68		int (server_set_brush)(struct mod v, int x_orgin, int y_orgin,
	68	int (server_set_brush)(struct mod v, int x_origin, int y_origin,
69	69	int style, char* pattern);
70	70	int (server_set_pen)(struct mod v, int style,
71	71	int width);
72	72	int (server_draw_line)(struct mod v, int x1, int y1, int x2, int y2);
73		int (server_add_char)(struct mod v, int font, int charactor,
	73	int (server_add_char)(struct mod v, int font, int character,
74	74	int offset, int baseline,
75	75	int width, int height, char* data);
76	76	int (server_draw_text)(struct mod v, int font,

120	120	int flags);
121	121	int (server_set_cursor_ex)(struct mod v, int x, int y, char* data,
122	122	char* mask, int bpp);
123		int (server_add_char_alpha)(struct mod v, int font, int charactor,
	123	int (server_add_char_alpha)(struct mod v, int font, int character,
124	124	int offset, int baseline,
125	125	int width, int height, char* data);
126	126	int (server_create_os_surface_bpp)(struct mod v, int rdpindex,