From e0e61e078d8ed280c128e6a405194284aa0d3713 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Tue, 16 Oct 2012 11:20:04 -0700 Subject: [PATCH] win32: no logic, just white space changes --- client/Windows/wf_cliprdr.c | 1 - client/Windows/wf_event.c | 4 ++-- client/Windows/wf_gdi.c | 6 +++--- client/Windows/wf_graphics.c | 10 +++++----- client/Windows/wf_rail.h | 2 +- client/Windows/wf_window.h | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/client/Windows/wf_cliprdr.c b/client/Windows/wf_cliprdr.c index 470429c0d..6ad53b8e9 100644 --- a/client/Windows/wf_cliprdr.c +++ b/client/Windows/wf_cliprdr.c @@ -107,4 +107,3 @@ void wf_cliprdr_check_owner(wfInfo* wfi) { } - diff --git a/client/Windows/wf_event.c b/client/Windows/wf_event.c index fbf0611f2..1840314c7 100644 --- a/client/Windows/wf_event.c +++ b/client/Windows/wf_event.c @@ -162,7 +162,7 @@ LRESULT CALLBACK wf_event_proc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam { case WM_PAINT: hdc = BeginPaint(hWnd, &ps); - + x = ps.rcPaint.left; y = ps.rcPaint.top; w = ps.rcPaint.right - ps.rcPaint.left + 1; @@ -194,7 +194,7 @@ LRESULT CALLBACK wf_event_proc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam case WM_MOUSEMOVE: input->MouseEvent(input, PTR_FLAGS_MOVE, X_POS(lParam), Y_POS(lParam)); break; - + case WM_MOUSEWHEEL: xf_event_process_WM_MOUSEWHEEL(wfi, hWnd, Msg, wParam, lParam, FALSE); break; diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c index c555ac1d7..334913f04 100644 --- a/client/Windows/wf_gdi.c +++ b/client/Windows/wf_gdi.c @@ -142,7 +142,7 @@ HBRUSH wf_create_brush(wfInfo * wfi, rdpBrush* brush, UINT32 color, int bpp) { for (i = 0; i != 8; i++) ipattern[7 - i] = brush->data[i]; - + cdata = wf_glyph_convert(wfi, 8, 8, ipattern); pattern = CreateBitmap(8, 8, 1, 1, cdata); lbr.lbHatch = (ULONG_PTR) pattern; @@ -342,7 +342,7 @@ void wf_gdi_line_to(rdpContext* context, LINE_TO_ORDER* line_to) wf_set_rop2(wfi->drawing->hdc, line_to->bRop2); org_pen = (HPEN) SelectObject(wfi->drawing->hdc, pen); - + MoveToEx(wfi->drawing->hdc, line_to->nXStart, line_to->nYStart, NULL); LineTo(wfi->drawing->hdc, line_to->nXEnd, line_to->nYEnd); @@ -469,7 +469,7 @@ void wf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* surface_bits wfi->image->_bitmap.data = (BYTE*) realloc(wfi->image->_bitmap.data, wfi->image->_bitmap.width * wfi->image->_bitmap.height * 4); freerdp_image_flip(nsc_context->bmpdata, wfi->image->_bitmap.data, wfi->image->_bitmap.width, wfi->image->_bitmap.height, 32); BitBlt(wfi->primary->hdc, surface_bits_command->destLeft, surface_bits_command->destTop, surface_bits_command->width, surface_bits_command->height, wfi->image->hdc, 0, 0, GDI_SRCCOPY); - } + } else if (surface_bits_command->codecID == CODEC_ID_NONE) { wfi->image->_bitmap.width = surface_bits_command->width; diff --git a/client/Windows/wf_graphics.c b/client/Windows/wf_graphics.c index d945f56c6..0e70fb8c2 100644 --- a/client/Windows/wf_graphics.c +++ b/client/Windows/wf_graphics.c @@ -80,7 +80,7 @@ wfBitmap* wf_image_new(wfInfo* wfi, int width, int height, int bpp, BYTE* data) image->org_bitmap = (HBITMAP) SelectObject(image->hdc, image->bitmap); ReleaseDC(NULL, hdc); - + return image; } @@ -120,7 +120,7 @@ void wf_Bitmap_New(rdpContext* context, rdpBitmap* bitmap) void wf_Bitmap_Free(rdpContext* context, rdpBitmap* bitmap) { wfBitmap* wf_bitmap = (wfBitmap*) bitmap; - + if (wf_bitmap != 0) { SelectObject(wf_bitmap->hdc, wf_bitmap->org_bitmap); @@ -198,8 +198,8 @@ void wf_Pointer_New(rdpContext* context, rdpPointer* pointer) int width, height, bpp; width = pointer->width; - height = pointer->height; - bpp = pointer->xorBpp; + height = pointer->height; + bpp = pointer->xorBpp; if ((bpp != 1 && bpp != 8 && bpp != 15 && bpp != 16 && bpp != 24 && bpp != 32) || width > 32 || height > 32) @@ -211,7 +211,7 @@ void wf_Pointer_New(rdpContext* context, rdpPointer* pointer) memset(xm, 0, 32 * 4); for (i = 0; i < 32; i++) { - ii = (bpp == 1) ? i : (height - 1) - i; + ii = (bpp == 1) ? i : (height - 1) - i; for (j = 0; j < 32; j++) { if (freerdp_get_pixel(pointer->andMaskData, j, i, width, height, 1)) diff --git a/client/Windows/wf_rail.h b/client/Windows/wf_rail.h index fbbdb0c08..27ecf9b80 100644 --- a/client/Windows/wf_rail.h +++ b/client/Windows/wf_rail.h @@ -29,4 +29,4 @@ void wf_process_rail_event(wfInfo* wfi, rdpChannels* chanman, RDP_EVENT* event); void wf_rail_adjust_position(wfInfo* wfi, rdpWindow *window); void wf_rail_end_local_move(wfInfo* wfi, rdpWindow *window); -#endif \ No newline at end of file +#endif diff --git a/client/Windows/wf_window.h b/client/Windows/wf_window.h index 302b990d6..de093424c 100644 --- a/client/Windows/wf_window.h +++ b/client/Windows/wf_window.h @@ -24,4 +24,4 @@ #include "wfreerdp.h" -#endif \ No newline at end of file +#endif