mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-rfx: fix windows build

Browse Source
This commit is contained in:
Marc-André Moreau 2011-08-16 15:35:29 -04:00
parent 6587edb7a0
commit 8292fc08f4
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/freerdp/utils/profiler.h
View File

@ -55,15 +55,15 @@ void profiler_print_footer();
#define PROFILER_PRINT(prof) profiler_print(prof)
#define PROFILER_PRINT_FOOTER profiler_print_footer()
#else
#define IF_PROFILER(then)
#define PROFILER_DEFINE(prof)
#define PROFILER_CREATE(prof,name)
#define PROFILER_FREE(prof)
#define PROFILER_ENTER(prof)
#define PROFILER_EXIT(prof)
#define PROFILER_PRINT_HEADER
#define PROFILER_PRINT(prof)
#define PROFILER_PRINT_FOOTER
#define IF_PROFILER(then) do { } while (0)
#define PROFILER_DEFINE(prof) void* prof
#define PROFILER_CREATE(prof,name) do { } while (0)
#define PROFILER_FREE(prof) do { } while (0)
#define PROFILER_ENTER(prof) do { } while (0)
#define PROFILER_EXIT(prof) do { } while (0)
#define PROFILER_PRINT_HEADER do { } while (0)
#define PROFILER_PRINT(prof) do { } while (0)
#define PROFILER_PRINT_FOOTER do { } while (0)
#endif
#endif /* __UTILS_PROFILER_H */

3
libfreerdp-cache/CMakeLists.txt
View File

@ -28,5 +28,6 @@ add_library(freerdp-cache SHARED ${FREERDP_CACHE_SRCS})
set_target_properties(freerdp-cache PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION})
install(TARGETS freerdp-cache DESTINATION lib)
target_link_libraries(freerdp-cache freerdp-utils)
install(TARGETS freerdp-cache DESTINATION lib)

5
libfreerdp-core/capabilities.c
View File

@ -198,6 +198,7 @@ void rdp_write_bitmap_capability_set(STREAM* s, rdpSettings* settings)
{
uint8* header;
uint8 drawingFlags;
uint16 desktopResizeFlag;
uint16 preferredBitsPerPixel;
header = rdp_capability_set_start(s);
@ -209,6 +210,8 @@ void rdp_write_bitmap_capability_set(STREAM* s, rdpSettings* settings)
else
preferredBitsPerPixel = 8;
desktopResizeFlag = settings->desktop_resize;
stream_write_uint16(s, preferredBitsPerPixel); /* preferredBitsPerPixel (2 bytes) */
stream_write_uint16(s, 1); /* receive1BitPerPixel (2 bytes) */
stream_write_uint16(s, 1); /* receive4BitsPerPixel (2 bytes) */
@ -216,7 +219,7 @@ void rdp_write_bitmap_capability_set(STREAM* s, rdpSettings* settings)
stream_write_uint16(s, settings->width); /* desktopWidth (2 bytes) */
stream_write_uint16(s, settings->height); /* desktopHeight (2 bytes) */
stream_write_uint16(s, 0); /* pad2Octets (2 bytes) */
stream_write_uint16(s, settings->desktop_resize); /* desktopResizeFlag (2 bytes) */
stream_write_uint16(s, desktopResizeFlag); /* desktopResizeFlag (2 bytes) */
stream_write_uint16(s, 1); /* bitmapCompressionFlag (2 bytes) */
stream_write_uint8(s, 0); /* highColorFlags (1 byte) */
stream_write_uint8(s, drawingFlags); /* drawingFlags (1 byte) */

6
libfreerdp-core/tcp.c
View File

@ -24,13 +24,13 @@
#include <time.h>
#include <errno.h>
#include <fcntl.h>
#ifndef _WIN32
#include <netdb.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <unistd.h>
#ifndef _WIN32
#include <netdb.h>
#endif
#include <freerdp/utils/print.h>

2
libfreerdp-core/transport.c
View File

@ -27,10 +27,10 @@
#include <time.h>
#include <errno.h>
#include <netdb.h>
#include <fcntl.h>
#ifndef _WIN32
#include <netdb.h>
#include <sys/socket.h>
#endif

6
libfreerdp-gdi/gdi.c
View File

@ -505,10 +505,10 @@ void gdi_patblt(rdpUpdate* update, PATBLT_ORDER* patblt)
if (brush->style & CACHED_BRUSH)
{
brush->data = brush_get(gdi->cache->brush, brush->index, &brush->bpp);
brush->style = BS_PATTERN;
brush->style = GDI_BS_PATTERN;
}
if (brush->style == BS_SOLID)
if (brush->style == GDI_BS_SOLID)
{
uint32 color;
originalBrush = gdi->drawing->hdc->brush;
@ -522,7 +522,7 @@ void gdi_patblt(rdpUpdate* update, PATBLT_ORDER* patblt)
gdi_DeleteObject((HGDIOBJECT) gdi->drawing->hdc->brush);
gdi->drawing->hdc->brush = originalBrush;
}
else if (brush->style == BS_PATTERN)
else if (brush->style == GDI_BS_PATTERN)
{
HGDI_BITMAP hBmp;