summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Generally adjusting headers for compiling on windows without the mixing of ↵Daniel Cohen Gindi2014-09-204-1/+19
| | | | Winsock 1 and 2.
* Just use a macro to bridge to the Win32 version of `mkdir`Daniel Cohen Gindi2014-09-201-5/+6
| | | | The additional compat_mkdir function was not necessary at all.
* Use correct `winsock2.h` version header instead of winsock.h.Daniel Cohen Gindi2014-09-201-2/+4
| | | | | | `windows.h` is referring to `winsock.h` (unless the `WIN32_LEAN_AND_MEAN` is defined). The structs used in this header are defined in `winsock2.h` or in `winsock.h`, but we are using Winsock2 of course! So we have to include winsock2.h and refrain from including windows.h here
* Fixed a violation of the C89 standard ("declarations must come before ↵Daniel Cohen Gindi2014-09-203-10/+16
| | | | instructions")
* A windows version for directory enumerationsDaniel Cohen Gindi2014-09-201-0/+147
| | | | Basically taken from https://github.com/danielgindi/FileDir with some adjustments
* MSVC also has the __FUNCTION__ predefinedDaniel Cohen Gindi2014-09-201-1/+1
|
* `CreateDirectory` might clash with the `CreateDirectoryA`/`CreateDirectoryW` ↵Daniel Cohen Gindi2014-09-202-1/+13
| | | | macros on MSVC
* Fail when NULL is passed to CreateFileListInfo()Daniel Cohen Gindi2014-09-201-2/+6
| | | | Passing NULL to sprintf() would most likely crash the program.
* `strings.h` and `resolv.h` are not available on MSVC, and some POSIX ↵Daniel Cohen Gindi2014-09-206-2/+29
| | | | | | functions are renamed or deprecated For all of those missing/deprecated POSIX functions, we just add a macro mapping to the _underscored version of MSVC.
* The HAVE_X11 define is not there anymore, but we don't need it either.Christian Beier2014-09-091-5/+1
|
* Move vncterm to https://github.com/LibVNC/vncterm.Christian Beier2014-09-0912-1296/+2
|
* Move VisualNaCro to https://github.com/LibVNC/VisualNaCro.Christian Beier2014-09-0912-1942/+0
|
* Move prepare_x11vnc_dist.sh over to x11vnc repo.Christian Beier2014-09-091-140/+0
|
* Remove x11vnc from autotools build system.Christian Beier2014-09-032-433/+2
|
* Remove tightvnc-1.3dev5-vncviewer-alpha-cursor.patch.Christian Beier2014-09-031-143/+0
|
* Remove x11vnc subdir.Christian Beier2014-09-03176-210670/+0
| | | | The new x11vnc repo is at https://github.com/LibVNC/x11vnc.
* Fix tv_usec calculationJohannes Schindelin2014-09-021-1/+1
| | | | | | This bug was introduced in the MSVC patches. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
* Merge branch 'msvc'Johannes Schindelin2014-09-0210-32/+389
|\ | | | | | | | | | | | | | | | | This topic branch provides compatibility for Windows, without the MINGW32 dependency. It is based on https://github.com/LibVNC/libvncserver/pull/22. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * Use Windows' critical sections to emulate pthread's mutexesDaniel Cohen Gindi2014-09-021-13/+36
| | | | | | | | | | | | | | | | | | | | | | With Microsoft Visual C++, we cannot use pthreads (MinGW sports an emulation library which is the reason we did not need Windows-specific hacks earlier). Happily, it is very easy to provide Windows-specific emulations for the pthread calls we use. [JES: fixed commit message] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * Perform pointer arithmetic on char * instead of void *Daniel Cohen Gindi2014-09-021-1/+1
| | | | | | | | | | | | | | | | Microsoft Visual C++ does not allow pointer arithmetic on void pointers. [JES: fixed commit message] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * MSVC: Use the Unix emulation headersDaniel Cohen Gindi2014-09-022-1/+11
| | | | | | | | | | | | [JES: provided commit message, split out unrelated changes] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * Use WIN32 for Windows-specific #ifdef guardsDaniel Cohen Gindi2014-09-023-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | To support Microsoft Visual C++, we must not guard Windows-specific code in MinGW-specific #ifdef guards. Happily, even 64-bit MSVC defines the WIN32 constant, therefore we can use that instead. [JES: fixed commit message, reordered commit, split out unrelated changes] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * Add MSVC compatible unix headersDaniel Cohen Gindi2014-09-023-0/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | The stdint.h file was copied from: https://runexe.googlecode.com/svn-history/r9/trunk/src/runlib/msstdint.h (we can incorporate it because it is licensed under the 3-clause BSD license.) [JES: fixed commit message, fixed stripped copyright header] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * MSVC: Use _snprintf instead of snprintfDaniel Cohen Gindi2014-09-023-0/+12
| | | | | | | | | | | | | | | | | | In Microsoft's Visual C runtime, the snprintf() function is actually called _snprintf. Let's just #define the former to call the latter. [JES: fixed commit message] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * Use correct winsock headerDaniel Cohen Gindi2014-09-021-1/+1
| | | | | | | | | | | | | | | | | | We link to ws2_32.lib which corresponds to the winsock2.h header, not the winsock.h header. [JES: fixed commit message] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * Include Winsock2 header before windows.h includeDaniel Cohen Gindi2014-09-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | That's because there are duplicate #defines, and when Winsock2 is defined before windows.h then windows.h detects that and prevent redefinition. See http://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/4a90b143-1fb8-43e9-a54c-956127e0c579/windowsh-and-winsock2h?forum=windowssdk [JES: fixed commit message] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * Remove unused variablesDaniel Cohen Gindi2014-09-021-7/+0
|/ | | | | | | | | This change is technically not required to support MSVC, but it was detected by Microsoft's compiler. [JES: fixed commit message] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
* Merge pull request #21 from newsoft/masterdscho2014-08-261-0/+19
|\ | | | | Fixing two more security issues (remote server crash)
| * Do not accept a scaling factor of zero on PalmVNCSetScaleFactor and SetScale ↵Nicolas Ruff2014-08-181-0/+14
| | | | | | | | client->server messages. This would cause a division by zero and crash the server.
| * Check malloc() return value on client->server ClientCutText message. Client ↵Nicolas Ruff2014-08-181-0/+5
|/ | | | can send up to 2**32-1 bytes of text, and such a large allocation is likely to fail in case of high memory pressure. This would in a server crash (write at address 0).
* Merge pull request #16 from sandsmark/masterdscho2014-08-162-6/+10
|\ | | | | Merge patches from KDE/krfb
| * allow rfbInitSockets with non-ready states.Amandeep Singh2014-08-031-2/+3
| | | | | | | | | | This allows for reinitializations of e. g. sockets in a SHUTDOWN state. The only state that doesn't make sense to reinitialize are READY states.
| * Fix crash in krfbAmandeep Singh2014-08-031-4/+7
| | | | | | | | | | Krfb crashes on quit, if any client is connected due to a rfbClientConnectionGone call missing
| * x11vnc: fix double X_UNLOCK on xrandr eventsWill Thompson2014-08-031-0/+1
| | | | | | | | | | | | | | | | check_xrandr_event() assumes X_LOCK is taken before it is called, and currently calls X_UNLOCK on behalf of the caller. But in practice, all callers assume that the lock is still held after check_xrandr_event() returns. In particular, this leads to a double-unlock and crash in check_xevents() on any xrandr event.
* | Merge pull request #17 from dktrkranz/masterLuca Falavigna2014-08-163-4/+14
|\ \ | | | | | | | | | Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * | Fix whitespaceJohannes Schindelin2014-08-161-8/+8
| | | | | | | | | | | | Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| * | Enable support for ppc64el architectureLuca Falavigna2014-08-161-2/+8
| | |
| * | Use Libs.private to avoid unnecessary linkageLuca Falavigna2014-08-162-2/+6
|/ /
* | Fix indentationJohannes Schindelin2014-08-162-3/+3
| | | | | | | | Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
* | Merge pull request #20 from newsoft/masterdscho2014-08-162-5/+28
|\ \ | | | | | | Fix integer overflow in MallocFrameBuffer()
| * | Check for MallocFrameBuffer() return valuenewsoft2014-08-152-4/+9
| | | | | | | | | | | | | | | | | | If MallocFrameBuffer() returns FALSE, frame buffer pointer is left to NULL. Subsequent writes into that buffer could lead to memory corruption, or even arbitrary code execution.
| * | Fix integer overflow in MallocFrameBuffer()newsoft2014-08-151-1/+19
|/ / | | | | | | | | Promote integers to uint64_t to avoid integer overflow issue during frame buffer allocation for very large screen sizes
* | Merge pull request #13 from wjt/fix-double-X_UNLOCK-on-xrandr-eventdscho2014-07-181-0/+1
|\ \ | |/ |/| x11vnc: fix double X_UNLOCK on xrandr events
| * x11vnc: fix double X_UNLOCK on xrandr eventsWill Thompson2014-07-101-0/+1
| | | | | | | | | | | | | | | | check_xrandr_event() assumes X_LOCK is taken before it is called, and currently calls X_UNLOCK on behalf of the caller. But in practice, all callers assume that the lock is still held after check_xrandr_event() returns. In particular, this leads to a double-unlock and crash in check_xevents() on any xrandr event.
* | Update LZO to version 2.07Johannes Schindelin2014-06-274-1687/+4690
| | | | | | | | | | | | | | | | | | | | It was reported that LZO has security issues in LMS-2014-06-16-1: Oberhumer LZO (CVE-2014-4607): http://seclists.org/oss-sec/2014/q2/665 This was also reported by Alex Xu as https://github.com/LibVNC/libvncserver/issues/9. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
* | Merge pull request #7 from waldheinz/init-sfae-paddingdscho2014-06-231-0/+2
|\ \ | | | | | | Initialize padding in SetFormatAndEncodings' rfbSetPixelFormatMsg.
| * | Initialize padding in SetFormatAndEncodings' rfbSetPixelFormatMsg.Matthias Treydte2014-06-231-0/+2
| |/
* | Merge pull request #6 from waldheinz/cmake-cleanupdscho2014-06-231-11/+12
|\ \ | |/ |/| Use CMAKE_CURRENT_*_DIR instead of CMAKE_*_DIR.
| * Use CMAKE_CURRENT_*_DIR instead of CMAKE_*_DIR.Matthias Treydte2014-06-231-11/+12
|/ | | | | | | | | | | | | | | This makes the library friendly to use as a git submodule within another project, and should change nothing when compiled alone. For example when having a directory structure like "my_project/external/libvnc", where in libvnc resides a checkout of libvncserver, one can just reference that directory from the CMakeLists.txt in my_project with > add_directory ( external/libvnc ) and add vncclient / vncserver in my_project's taret_link_libraries, one can just hack away without having to manually make / install LibVNCServer whenever something is changed there.
* Merge pull request #4 from dextero/masterdscho2014-05-141-0/+7
|\ | | | | x11vnc: adjust blackout region coordinates to the clipping region