mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,630 Commits 6 Branches 74 Tags 84 MiB
ae025ae332
Commit Graph

4630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Armin Novak
ae025ae332 Fixed memory leak. 
(cherry picked from commit 9863ccfe66)
 2015-01-16 14:07:38 +01:00
Armin Novak
2228cd6e73 Fixed multiple parsing errors for compatibility command line. 
(cherry picked from commit dfb6176df6)

Conflicts:
	client/common/compatibility.c
 2015-01-16 14:07:31 +01:00
Armin Novak
1fdf05da3f Fixed windows command line 
freerdp_detect_windows_style_command_line_syntax returns negative values
in error but also in help and version case... oh boy

(cherry picked from commit f86ed3ffef)
 2015-01-16 13:56:35 +01:00
Armin Novak
41313e6d70 Fixed missing NULL pointer check. 
(cherry picked from commit 241848038c)

Conflicts:
	client/common/compatibility.c
 2015-01-16 13:56:23 +01:00
Armin Novak
dab7113f0f Fixed clang warnings. 
Fixed check for compatibility command line.

(cherry picked from commit 20f7e4d301)

Conflicts:
	client/common/cmdline.c
 2015-01-16 13:54:16 +01:00
Armin Novak
cd21ac3498 Fixed command line pre filter, now returning 2 to skip argument. 
(cherry picked from commit 1d4403cbbe)

Conflicts:
	client/common/compatibility.c
 2015-01-16 13:53:00 +01:00
Bernhard Miklautz
7974c5072c winpr build: cmake 3.1 compatibility 
* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single
* / instead of // as previously - necessary adoptions for regex and
  matches done. Should work with all cmake versions.
 2015-01-16 13:43:04 +01:00
Bernhard Miklautz
0027350ff0 build: improve X11 detection on OS X 
/usr/X11R6 doesn't exist on OS X per default (anymore). Therefore add
PATHS to all X11 detection modules pointing to the Xquarz installation
directory in /opt/X11.
For FindX11 it was also necessary to ensure that the frameworks are
searched as last (after PATHS) otherwise it could happen that X11 headers
of a framework (e.g. Tk.framework) were used.

(cherry picked from commit b35dc849ee)
 2015-01-16 13:27:31 +01:00
Bernhard Miklautz
598d30f8b8 Mac: set policy to silent cmake >= 3.0 warnings 
Set the following policies to "OLD" if cmake version is greater than
2.8.12:

CMP0026 - Disallow use of the LOCATION target property
CMP0045 - Error on non-existent target in get_target_property

(cherry picked from commit 10ee2f72d9)
 2015-01-16 13:27:22 +01:00
Bernhard Miklautz
b065492890 build: cmake 3.1 compatibility 
* fix problem with REMOVE_DUPLICATES on undefined lists
* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
  previously - necessary adoptions for regex and matches done. Should
	work with all cmake versions.

Tested with 3.1.0-rc3

(cherry picked from commit 1b663ceffe)

Conflicts:
	client/CMakeLists.txt
	server/CMakeLists.txt
 2015-01-16 13:27:08 +01:00
Bernhard Miklautz
6c6fb62029 mfreerdp: fix build with latest cmake 
Newer versions of cmake seem to use CMAKE_C_FLAGS for objective-c.
Now both flags are set for compatibility.

(cherry picked from commit 9ab95adf0d)
 2015-01-16 13:24:52 +01:00
Marc-André Moreau
440916eae2 Merge pull request #2061 from bmiklautz/remove_winpr_configh 
Get rid of winpr/config.h
 2014-08-25 09:52:43 -04:00
Bernhard Miklautz
6d2d377ed1 Get rid of winpr/config.h 
winpr/config.h just contains WITH_NATIVE_SSPI which is already
defined in top level config.h.
 2014-08-24 14:31:13 +02:00
Marc-André Moreau
6fc97c7179 Merge pull request #2040 from dpoe/stable-1.1 
handle user@corp.net username correctly
 2014-08-18 13:07:30 -04:00
Daryl Poe
248c918508 handle user@corp.net username correctly 2014-08-15 15:45:06 -06:00
Bernhard Miklautz
b07a5c11e4 Merge pull request #2031 from bmiklautz/fix/stable-1.1/ffmpeg2 
build: fix tsmf ffmpeg build
 2014-08-09 21:06:40 +02:00
Bernhard Miklautz
dc7f6abbed build: fix tsmf ffmpeg build 
Backported fixes to build against libavcodec >= 9.0
 2014-08-08 16:05:45 +02:00
Bernhard Miklautz
7b5cd86a3e Merge pull request #2030 from bmiklautz/fix/stable-1.1/ffmpeg 
build: fix tsmf ffmpeg
 2014-08-08 15:22:12 +02:00
Ian Whyman
75b6e12c11 Backwards compat defines 
Conflicts:
	channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
 2014-08-08 15:13:25 +02:00
Ian Whyman
3b9b030b0e CODEC_ID_* -> AV_CODEC_ID_* 2014-08-08 15:08:15 +02:00
Bernhard Miklautz
28f65ff297 Merge pull request #1887 from dpoe/stable-1.1 
correct Pause key sequence
 2014-07-25 11:23:09 +02:00
Hardening
3122946757 Merge pull request #1891 from hardening/CVE-2014-0250_1dot1 
Fix for CVE 2014-0250
 2014-06-19 10:24:10 +02:00
Hardening
5ad707ddf3 Fix CVE-2014-0250 
This patch fixes CVE-2014-0250 by checking width, height and bpp when
receiving a new pointer.
 2014-06-06 23:24:16 +02:00
Daryl Poe
46a00b5c9e correct Pause key sequence 2014-06-04 15:41:17 -06:00
Marc-André Moreau
01865f0e28 Merge pull request #1770 from dpoe/stable-1.1 
/kbd: option should be unsigned
 2014-04-08 23:56:49 -04:00
Daryl Poe
fc6b72017f /kbd: option should be unsigned 2014-04-04 14:09:48 -06:00
Marc-André Moreau
2604ff20bd Merge pull request #1673 from dpoe/stable-1.1 
Fixes for redirected-drive cut, mode, read/write
 2014-02-27 13:55:30 -05:00
Daryl Poe
865b816b80 fixes for drive cut, mode, read/write 2014-01-27 17:21:34 -07:00
Marc-André Moreau
997d40639c Merge pull request #1658 from dbungert/compression 
Address bitmap related crashes.
 2014-01-14 11:16:01 -08:00
Dan Bungert
580e6b68c9 Switch back to 64K (RDP5) compression. 2014-01-10 08:05:23 -07:00
Marc-André Moreau
69af35a1b5 Merge pull request #1630 from bmiklautz/stable-1.1-bp 
master stable sync
 2013-12-08 15:52:51 -08:00
Bernhard Miklautz
7c4ebe2bc4 ios build: updated README.ios 
(cherry picked from commit fa1bc1f2fe)
 2013-12-08 17:35:57 +01:00
Bernhard Miklautz
37ac70aa1c ios ssl build: support for user specified sdks 
To build against a specific (not auto detected) SDK version set
USER_OS_SDK and/or USER_SIM_SDK at the top of the script.
(cherry picked from commit 38883e5ecd)
 2013-12-08 17:35:51 +01:00
Bernhard Miklautz
3754d07163 ios ssl build: do sdk detection before download 
(cherry picked from commit 27d8844fab)
 2013-12-08 17:35:43 +01:00
Bernhard Miklautz
2ef6c552c4 Cleaned up and improved iOS openssl build script 
* Added support for optional build directory (first argument)
* Automatically detect iOS/iPhoneSimulator SDKs (oldest SDK found is used)
(cherry picked from commit e30d6109bc)
 2013-12-08 17:35:36 +01:00
Bernhard Miklautz
323b081192 ios build: added option to set signing certificate 
Code signing certificate can be set with with cmake option CODE_SIGN_IDENTITY.
Like -DCODE_SIGN_IDENTITY="signing identity"
(cherry picked from commit f30d3ac3a1)
 2013-12-08 17:35:27 +01:00
Bernhard Miklautz
413c4dea65 ios simulator build: set CMAKE_OSX_SYSROOT 
When building for iphone simulator it is required to set the CMAKE_OSX_SYSROOT
to "iphonesimulator" otherwise command line builds (with cmake --build) will fail.
(cherry picked from commit 6d2142182d)
 2013-12-08 17:35:22 +01:00
Bernhard Miklautz
88963aae5c ios build: fixed toolchain for cmake 2.8.10 
(cherry picked from commit 7b706ba840)
 2013-12-08 17:35:15 +01:00
Bernhard Miklautz
30de5b226d windows build: use different .def file for xp 
Use different def file for windows < 5.1.
(cherry picked from commit 57d295441f)
 2013-12-08 17:27:58 +01:00
Bernhard Miklautz
5360f59940 windows build: ignore generated files (nmake) 
(cherry picked from commit 23f33ca20e)
 2013-12-08 17:27:50 +01:00
Bernhard Miklautz
abf84cf6e0 Cmake preload scripts for CI added 
(cherry picked from commit f2b7876302)
 2013-12-08 17:22:21 +01:00
Bernhard Miklautz
613b20d482 android: use version.h 2013-12-08 17:17:12 +01:00
Bernhard Miklautz
37602e6000 use version.h in ios client 
(cherry picked from commit 0147b06d06)
 2013-12-08 16:48:48 +01:00
Bernhard Miklautz
0380e652d0 install version.h 
(cherry picked from commit c9f49162bd)
 2013-12-08 16:47:53 +01:00
Bernhard Miklautz
23512af600 moved version information to freerdp/version.h 
fixed #1465
(cherry picked from commit a0161a12ac)
 2013-12-08 16:47:47 +01:00
Marc-André Moreau
d2a9df1ce0 Merge pull request #1494 from dpoe/stable-1.1 
send RDP_NEG_REQ also in the case of a null server certificate
 2013-09-19 13:03:46 -07:00
Daryl Poe
afec6957c4 send RDP_NEG_REQ also in the case of a null server certificate 2013-09-18 17:16:48 -06:00
Marc-André Moreau
d8d7a9c1c6 Merge pull request #1435 from dpoe/stable-1.1 
Apply glyph fragment offset after fragment
 2013-09-16 13:38:46 -07:00
Marc-André Moreau
fe40452d65 Merge pull request #1443 from bmiklautz/stable-1.1-sync 
Backported commits from master
 2013-09-03 15:40:57 -07:00
Marc-André Moreau
214fe2198a xfreerdp: fix monolithic build 
(cherry picked from commit 3194967957)
 2013-08-26 20:20:33 +02:00