Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed windows shadow server update copy. #4469

Merged
merged 2 commits into from Mar 21, 2018
Merged

Fixed windows shadow server update copy. #4469

merged 2 commits into from Mar 21, 2018

Conversation

akallabeth
Copy link
Member

  • Fixes update copy for windows shadow server
  • Fixes callback argument/return mismatches
  • Removes unnecessary casts

@akallabeth akallabeth added this to the 2.0-rc2 milestone Mar 6, 2018
@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/2711/

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/2712/

mfleisz
mfleisz requested changes Mar 6, 2018
View reviewed changes
Copy link
Member

@mfleisz mfleisz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Except type LGTM

server/shadow/Win/win_shadow.c Outdated
}

#elif defined(WITH_DXGI_1_2)

void* win_shadow_subsystem_thread(winShadowSubsystem* subsystem)
static DWORD win_shadow_subsystem_thread(LPVOID arg) win_shadow_subsystem_thread(LPVOID arg)
Copy link
Member

@mfleisz mfleisz Mar 6, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo?

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/2714/

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/2723/

@akallabeth
Copy link
Member Author

@hardening @mfleisz @bmiklautz anyone want to merge this one?

@mfleisz
Copy link
Member

mfleisz commented Mar 21, 2018

Already approved but want someone else to have a look as well 👍

@hardening hardening merged commit 15fb917 into FreeRDP:master Mar 21, 2018
@akallabeth akallabeth deleted the win_server_fix branch March 21, 2018 13:20
Mironenko added a commit to AktivCo/aFreeRDP-SC that referenced this pull request Mar 28, 2018
@Mironenko
Release 0.1.0
702b647 
9b3ec2546 Make use long APK version string
aca71e150 Merge remote-tracking branch 'origin/master' into rutoken-master
2bd0255e1 Check rtservice installation
a42f6d6 Merge pull request FreeRDP#4513 from chipitsine/travis-new
5b52ad9 Merge pull request FreeRDP#4512 from chipitsine/master
1d73d2d initial travis-ci support
14c15c6 resolve several possible null pointer dereference
68c4bab Merge pull request FreeRDP#4510 from mfleisz/cssp_version_fix
eb1f693 cssp: Separate client/server version handling (FreeRDP#4502)
1adbc38 Merge pull request FreeRDP#4508 from h3xx/fix-ccache-support
3af9c4d Fix ccache support
15fb917 Merge pull request FreeRDP#4469 from akallabeth/win_server_fix
f11ff9a Merge pull request FreeRDP#4504 from mfleisz/cssp_warnings
e9ba4b5 cssp: Fix warnings (FreeRDP#4503)
31a687a Merge pull request FreeRDP#4505 from bmiklautz/nightlies_bionic
8b73612 pkg freerdp-nightly: fix build on bionic
c08677467 Replace tower icons with token icons
1f855684e Fix locales, improve 'about' html
de83f4d Merge pull request FreeRDP#4499 from mfleisz/cssp_v6
8df9636 cssp: Add support for protocol version 6
103686e Merge pull request FreeRDP#4497 from akallabeth/kwin_multimon
291be7801 Add instructions how user can build the product
785329aea Add readme for aFreeRDP SC
338e74a Fix FreeRDP#2707: Set fullscreen first
a71914a45 Remove minimum height for Rutoken image
9b893762a Red application icon
198cdf2f5 Rename package
cbdafd301 Add 'changed' notification to apache licensed files
84212d81d Add MPL annotation to new java files
d623b6615 Edit 'about' page
980bc9c Merge pull request FreeRDP#4495 from akallabeth/header_fix
87ebdf0 Fixed FreeRDP#4493: duplicate typedef.
1e4a8172c Add script to perform github publishing task
6a24cdbcc Change PCSC_DWORD/ULONG to 32 bit on Android armv7/arm64
7fac28ccf Move buildscript to scripts directory
f8baeb7 Merge pull request FreeRDP#4487 from bmiklautz/KB4088776
e7ae3f6 fix nla: don't use server version
fd0a0a6b1 Improve pcsc exceptions
e39d3a1ed Fix rtservice installation check
26b85a976 Implement rutoken service installation check
a9990bf0b Change message text
8cd156a Merge pull request FreeRDP#4473 from akallabeth/mac_timer
1337aa5a4 Add advanced bookmark setting for smartcard redirection
9bd13c2 Added WaitableTimer implementation for mac OS.
d99af6871 Fix build
1c72127 Do not clear invalid region if no client connected.
2ad5b35 Fixed windows shadow server update copy.
14997f9 Merge pull request FreeRDP#4471 from akallabeth/thread_function_fix
44eebbb Fixed compiler warnings.
66cc038 Fixed threadpool work function return and arguments.
2517755 Fixed thread function return and parameters.
dd538cc Merge pull request FreeRDP#4470 from mfleisz/misc_fixes
ce61ec1 Merge pull request FreeRDP#4464 from perkerk/misc-windows-client
ad3f8eb93 Add Rutoken list popup
1f81b614c Create buildscript and add binary deps
e3adeb1 Remove NULL check before _aligned_free call
2e0253a Clean up mf_uninit
91ee4c2 Merge pull request FreeRDP#4454 from akallabeth/nightly
2396e37 rdpei: Fix possible NULL ptr access
9b4de79 drive: Fix possible NULL ptr access
900aa94 debug: Fix broken format specifiers
ffa5fb0 drdynvc: Fix possible NULL pointer accesses
0599a3c codec: Another realloc fix
8114063 core: Fix possible out-of-bounds read
5c7dbe7b4 Fix jna dependency
07f05c5 nla: Add NULL pointer check
ba5ad2e codec: Prevent invalid mem access on realloc failure
21eeea2 codec: Fix broken reallocs
01388c1 Merge pull request FreeRDP#4468 from akallabeth/transport_fix_handle
a419677 Fix invalid handle offset.
930ccb6 Fix memory leak of Decompress buffer in client wf_Bitmap_Free
d8151c0 Remove unnecessary WM_SETCURSOR handling from wf_event_proc
0c24ade Misc fixes for Windows clients
4c09986 Support EmbeddedWindow in wf_resize_window
3c52e3d Fix H.264 codec init access violation on Windows N/KN systems
4d401b4 Merge pull request FreeRDP#4459 from akallabeth/surface_cmd_fix
1f7d33a Fixed read/write of surface bits command.
b0962e11a Add parsing atr
32337a5e6 Add pcsc jna wrapper
8e5d5fa Merge pull request FreeRDP#4450 from akallabeth/assist_fix
62f06ed Use a custom command to generate helper tool
ffcee73 Merge pull request FreeRDP#4451 from akallabeth/gsm_leak_fix
3cfa837 Merge pull request FreeRDP#4441 from akallabeth/paa
6623927 Free gsmBuffer on channel close.
3b67190 Clean up GSM context on channel close.
68641f1 Fixed .rdp and .msrcIncident checks.
212a448 Added assistance file name NULL check.
c276005 Merge pull request FreeRDP#4448 from akallabeth/nightly_manpage_fix
b9e90bc Reenable -DWITH_SANITIZE_ADDRESS=ON for i386 builds.
b242876 manpage helper tool generation fixes
5077e88 Merge pull request FreeRDP#4447 from akallabeth/apple_rpath_namespace
c68e34b Fixed apple rpath settings.
10aabdd Removed apple flat-namespace hack.
420f34f Merge pull request FreeRDP#4446 from akallabeth/sam_crash_fix
e36d87b Fix FreeRDP#4445: Do not call fclose on NULL file.
3c4385e Merge pull request FreeRDP#4440 from akallabeth/silence_unused_profiler
1a902c2 Fix PROFILER_* macros
5d1ff02 Merge pull request FreeRDP#4414 from akallabeth/pthread_cleanup_fix
2af67ba Modified RDG connection setup using PAA Cookie. Skip NTLM auth on the IN/OUT channels. Add PAACookie to TUNNEL_CREATE.
b592684 Added to rdp file parsing: gatewayaccesstoken:s:<token> Added to commandline parsing: /gat:<token> Added GatewayAccessToken to sings
19a00f2 Merge pull request FreeRDP#4325 from akallabeth/fixes_com
6283ce8 Merge pull request FreeRDP#4415 from akallabeth/drdynvc_dyn_log
13be713 Merge pull request FreeRDP#4434 from akallabeth/winpr_digest_param
dae62c0 Merge pull request FreeRDP#4438 from akallabeth/gw_doublefree_fix
92c62b1 Fixed FreeRDP#4436: double free of http response. Fixed FreeRDP#4436: reset of token split.
159210e Merge pull request FreeRDP#4435 from akallabeth/refguid_static
89859d4 Fixed missing error return.
77a9e2e Do not export internal variables.
0a35c06 Merge pull request FreeRDP#4432 from akallabeth/pubsub_fix
5903d5b Fixed winpr digest type.
fca5df8 Fixed broken extern C
990b8c2 Fixed PubSub function pointer casts.
ed4f54a Merge pull request FreeRDP#4428 from hardening/video_fixes
6e5d86f http: fix compilation with valgrind memcheck helpers
441975a video, geometry: fix prototypes for timer callbacks
484abe0 video: fix invalid geometry and invalid argument passing to time pubsub
e88d1e9 Merge pull request FreeRDP#4430 from bmiklautz/rpmversion
7358c42 pkg rpm: fix perapre script for freerdp-nightly
8379fd8 pkg rpm: add version information to freerdp-nightly
50f3d1a pkg rpm: add prepare script for freerdp-nightly
8566021 Merge pull request FreeRDP#4425 from akallabeth/windows_nego_fix
bc4b57c Merge pull request FreeRDP#4426 from akallabeth/pointer_null_fix
b8599b0 Merge pull request FreeRDP#4364 from akallabeth/gateway_refactor
a6a57e3 Prefer dynamic logger in dynamic channel.
8a2b5ea Merge pull request FreeRDP#4376 from hardening/ms-rdpevor
7274ffe Check if xfreerdp window != NULL
53d2150 Fixed windows unicode authentication.
af8286b Added missing FREERDP_API function export.
79d9ae8 Fixed gemoetry mapping.
d9277b7 Fixed copy offset issue.
3eb0040 Fixed code duplication.
c7d701b Added software decoding fallback for RDPVOR
11f11a8 Fixed scaled drawing of video content.
73bef4c video, geometry: fixed geometry handling
b8e3b23 video: mutualize things in the common channel code
0743559 video: do cleanups in post_connect
73eb4ba drdynvc: fixed stream leak on error
731ef4f geometry: drop server-side option for geometry
ca4f75c video: fixed uninit of channel
4b240da video+geometry: fixed leaks, a segfault and concurrent accesses
6e022ae video: fix prototype and cleanup at exit
a07efb7 video: an implementation of MS-RDPEVOR for X11
b84839b video: a skeleton for MS-RDPEVOR client
adac409 geometry: change the channel API to mutualize things
c446052 Merge pull request FreeRDP#4423 from akallabeth/double_free
2cf10cc bitmap free now always deallocating all resources.
90f60c7 Merge pull request FreeRDP#4421 from akallabeth/x11_asan_fix_v2
62607e3 Fixed accidental free of XImage data.
2d58e96 Exit main thread with winpr_exit to trigger resource cleanup.
3293b42 Merge pull request FreeRDP#4420 from akallabeth/x11_memleak_fix
7c0a336 Fixed FreeRDP#4412: XImage must be freed with XDestroyImage
2bc9869 Merge pull request FreeRDP#4413 from akallabeth/memlead_queue_fixes
7e26c54 Set up and tear down WLog
1b9da01 Fixed cleanup of xfc->drawable.
50c7777 Prevent malloc of size 0
8c7fe93 Added client channel queue object free function.
1ec1c9b Add dynamic channel queue object free function.
855dc9a Clear message queue on free.
25076cf Fixed a memory leak.
eb2da08 Merge pull request FreeRDP#4411 from akallabeth/resolve_ipv6_fix
78de329 Fixed IPv4/IPv6 to string
5b2d803 Merge pull request FreeRDP#4380 from akallabeth/output_suppress_minimize
ed9d86b Fixed GFX output expose.
c0ec81c Do not update client if output suppressed.
253beda Fixed formatting.
17b17d6 Fixed SuppressOutput update.
a4a151a Merge pull request FreeRDP#4408 from vinzent/rpm_spec_rhel7
f1a4717 Merge pull request FreeRDP#4347 from akallabeth/h264_log
4a21c3b Merge pull request FreeRDP#4409 from akallabeth/init_once_return
fde818c Fixed FFMPEG log messages.
fac61bf Use dynamic logger in MediaFoundation backend
aff9a22 Fixed obsolete TAG definitions and use.
77d0c77 Fix OpenH264 trace logging, set up context first
7adc384 Using dynamic logger for GFX-H264 backend.
c586a30 Fixed init once return.
24720b6 Update rpm spec to support RHEL 7
1a377ba Merge pull request FreeRDP#4392 from akallabeth/yuv_asm
db8519f Merge pull request FreeRDP#4397 from SriRamanujam/vaapi
c7f1656 Merge pull request FreeRDP#4400 from hardening/defines_clean
1d99696 Fixed AVC444 YUV conversion matrix
53cdd95 Refactored RGB to AVC444v2
eb8e9cb Added SSSE3 UV average to AVC444v1
46159c4 Added UV average to AVC444v1
7ceb85c Merge pull request FreeRDP#4340 from akallabeth/init_once
71bd654 Merge pull request FreeRDP#4395 from akallabeth/afreerdp_clipboard_fix
5e7b945 Merge pull request FreeRDP#4387 from akallabeth/hotplug_fix
175361b Merge pull request FreeRDP#4394 from akallabeth/shadow_avc444
6299a3e Merge pull request FreeRDP#4406 from rozhuk-im/master
6ce9fb5 Fix: #define ConvertColor FreeRDPFreeRDPConvertColor -> FreeRDPConvertColor
6c64aa4 fixed include path
917bc4b set some define consistency
26eee4a TO BE SQUASHED: use hw_frames_ctx to set up vaapi on older versions of libavcodec
edf9c52 TO BE SQUASHED: initial changes from code review
bb061ce Increased target bitrate for shadow server.
bc33fa8 Tuned FFMPEG encoder settings.
92811ea Added return checks.
5f439f0 Fixed AVC444v2 detection.
9f57e07 Align YUV buffer strides and height.
3b70d11 Added AVC444 chroma support to shadow server.
bedc1ac Use libavcodec's VA-API decoding.
a90be56 Merge pull request FreeRDP#4396 from bmiklautz/fix_nightlies
1e842d2 fix deb/freerdp-nightly: disable ASAN on i386
db2d1ff cmdline refactor: move cmd struct to extra file
7183c50 Check length of string returned by ClipboardGetData
d5ef962 Merge pull request FreeRDP#4393 from nfedera/fix-remove-expensive-channel-send-debug
46f03d5 disabled expensive debug call in channel send
bfd370a Merge pull request FreeRDP#4391 from akallabeth/yuv_asm
c82610c Deactiveate optimized primitives if no implementation compiled.
8f7bc79 Added SSE optimized RGB to AVC444 frame split and test.
ce10e22 Added optimized C function for specific color format.
f27ee2e Split optimized YUV implementations to separate files.
64cfd75 Fixed FreeRDP#4384: Drive hotplug detection
0fc19e5 Functions static where appropriate.
20b4b28 Fixed strtoull not supported on windows.
a49a229 Refactored http parser
c3f008c Functions static where appropriate.
9804d5a SamOpen return NULL if file was not opened.
899666e Fixed FreeRDP#2006: Use InitOnceExecuteOnce
d03f985 Fixed FreeRDP#2006: Use InitOnceExecuteOnce
4483751 Fixed help for /parallel
d823586 Fixed parallel channel argument checks
04708b3 Fixed serious issues with SAM file parser
6f1b8f0 Fixed check for reserved com devices.

Release SHA-1: 9b3ec2546ab03e734b1c544233efa3d3d96e6934
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfleisz mfleisz mfleisz approved these changes

@hardening hardening hardening approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.0-rc2
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@akallabeth @freerdp-bot @mfleisz @hardening