rdesktop

Revision: 1588
          http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1588&view=rev
Author:   astrand
Date:     2010-03-31 12:48:59 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
New indent style

Modified Paths:
--------------
    seamlessrdp/trunk/ServerExe/hookdll.c
    seamlessrdp/trunk/ServerExe/main.c
    seamlessrdp/trunk/ServerExe/seamlessrdphook.c
    seamlessrdp/trunk/ServerExe/vchannel.c
    seamlessrdp/trunk/indent-all

Modified: seamlessrdp/trunk/ServerExe/hookdll.c
===================================================================

--- seamlessrdp/trunk/ServerExe/hookdll.c	2010-03-31 12:43:15 UTC (rev 1587)
+++ seamlessrdp/trunk/ServerExe/hookdll.c	2010-03-31 12:48:59 UTC (rev 1588)
@@ -113,13 +113,10 @@
 	   http://msdn2.microsoft.com/en-us/library/bb776822.aspx */
 	owner = GetWindow(hwnd, GW_OWNER);
 	exstyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-	if (!owner && !(exstyle & WS_EX_TOOLWINDOW))
-	{
+	if (!owner && !(exstyle & WS_EX_TOOLWINDOW)) {
 		/* display taskbar icon */
 		result = NULL;
-	}
-	else
-	{
+	} else {
 		/* no taskbar icon */
 		if (owner)
 			result = owner;
@@ -145,21 +142,21 @@
 
 	vchannel_block();
 
-	if (!GetWindowRect(hwnd, &rect))
-	{
+	if (!GetWindowRect(hwnd, &rect)) {
 		debug("GetWindowRect failed!");
 		goto end;
 	}
 
-	if ((hwnd == blocked_hwnd) && (rect.left == blocked.left) && (rect.top == blocked.top)
-	    && (rect.right == blocked.right) && (rect.bottom == blocked.bottom))
+	if ((hwnd == blocked_hwnd) && (rect.left == blocked.left)
+		&& (rect.top == blocked.top)
+		&& (rect.right == blocked.right) && (rect.bottom == blocked.bottom))
 		goto end;
 
 	vchannel_write("POSITION", "0x%08lx,%d,%d,%d,%d,0x%08x",
-		       hwnd,
-		       rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0);
+		hwnd,
+		rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0);
 
-      end:
+  end:
 	vchannel_unblock();
 }
 
@@ -179,8 +176,7 @@
 	vchannel_block();
 
 	behind = GetNextWindow(hwnd, GW_HWNDPREV);
-	while (behind)
-	{
+	while (behind) {
 		LONG style;
 
 		style = GetWindowLong(behind, GWL_STYLE);
@@ -193,14 +189,14 @@
 
 	if ((hwnd == block_hwnd) && (behind == block_behind))
 		vchannel_write("ACK", "%u", serial);
-	else
-	{
+	else {
 		int flags = 0;
 		LONG exstyle = GetWindowLong(hwnd, GWL_EXSTYLE);
 		// handle always on top
 		if (exstyle & WS_EX_TOPMOST)
 			flags |= SEAMLESS_CREATE_TOPMOST;
-		vchannel_write("ZCHANGE", "0x%08lx,0x%08lx,0x%08x", hwnd, behind, flags);
+		vchannel_write("ZCHANGE", "0x%08lx,0x%08lx,0x%08x", hwnd, behind,
+			flags);
 	}
 
 	vchannel_unblock();
@@ -212,7 +208,7 @@
 	HICON icon;
 
 	if (!SendMessageTimeout(hwnd, WM_GETICON, large ? ICON_BIG : ICON_SMALL,
-				0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon))
+			0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon))
 		return NULL;
 
 	if (icon)
@@ -222,10 +218,9 @@
 	 * Modern versions of Windows uses the voodoo value of 2 instead of 0
 	 * for the small icons.
 	 */
-	if (!large)
-	{
+	if (!large) {
 		if (!SendMessageTimeout(hwnd, WM_GETICON, 2,
-					0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon))
+				0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon))
 			return NULL;
 	}
 
@@ -296,16 +291,17 @@
 	if (!hdc)
 		goto free_cbuf;
 
-	if (!GetDIBits(hdc, info.hbmMask, 0, mask_bmp.bmHeight, mask_buf, &bmi, DIB_RGB_COLORS))
+	if (!GetDIBits(hdc, info.hbmMask, 0, mask_bmp.bmHeight, mask_buf, &bmi,
+			DIB_RGB_COLORS))
 		goto del_dc;
-	if (!GetDIBits(hdc, info.hbmColor, 0, color_bmp.bmHeight, color_buf, &bmi, DIB_RGB_COLORS))
+	if (!GetDIBits(hdc, info.hbmColor, 0, color_bmp.bmHeight, color_buf, &bmi,
+			DIB_RGB_COLORS))
 		goto del_dc;
 
 	o = buffer;
 	m = mask_buf;
 	c = color_buf;
-	for (i = 0; i < size / 4; i++)
-	{
+	for (i = 0; i < size / 4; i++) {
 		o[0] = c[2];
 		o[1] = c[1];
 		o[2] = c[0];
@@ -321,19 +317,19 @@
 
 	ret = size;
 
-      del_dc:
+  del_dc:
 	DeleteDC(hdc);
 
-      free_cbuf:
+  free_cbuf:
 	free(color_buf);
-      free_mbuf:
+  free_mbuf:
 	free(mask_buf);
 
-      free_bmps:
+  free_bmps:
 	DeleteObject(info.hbmMask);
 	DeleteObject(info.hbmColor);
 
-      fail:
+  fail:
 	return ret;
 }
 
@@ -350,17 +346,14 @@
 	if (size <= 0)
 		return;
 
-	if ((!large && size != 16 * 16 * 4) || (large && size != 32 * 32 * 4))
-	{
+	if ((!large && size != 16 * 16 * 4) || (large && size != 32 * 32 * 4)) {
 		debug("Unexpected icon size.");
 		return;
 	}
 
 	chunks = (size + ICON_CHUNK - 1) / ICON_CHUNK;
-	for (i = 0; i < chunks; i++)
-	{
-		for (j = 0; j < ICON_CHUNK; j++)
-		{
+	for (i = 0; i < chunks; i++) {
+		for (j = 0; j < ICON_CHUNK; j++) {
 			if (i * ICON_CHUNK + j >= size)
 				break;
 			sprintf(asciibuf + j * 2, "%02x",
@@ -368,7 +361,7 @@
 		}
 
 		vchannel_write("SETICON", "0x%08lx,%d,RGBA,%d,%d,%s", hwnd, i,
-			       large ? 32 : 16, large ? 32 : 16, asciibuf);
+			large ? 32 : 16, large ? 32 : 16, asciibuf);
 	}
 }
 
@@ -393,136 +386,128 @@
 	wparam = ((CWPSTRUCT *) details)->wParam;
 	lparam = ((CWPSTRUCT *) details)->lParam;
 
-	if (!is_toplevel(hwnd))
-	{
+	if (!is_toplevel(hwnd)) {
 		goto end;
 	}
 
 	style = GetWindowLong(hwnd, GWL_STYLE);
 
-	switch (msg)
-	{
-		case WM_WINDOWPOSCHANGED:
-			{
-				WINDOWPOS *wp = (WINDOWPOS *) lparam;
+	switch (msg) {
+	case WM_WINDOWPOSCHANGED:
+		{
+			WINDOWPOS *wp = (WINDOWPOS *) lparam;
 
-				if (wp->flags & SWP_SHOWWINDOW)
-				{
-					unsigned short title[150];
-					int state;
-					DWORD pid;
-					int flags;
-					HICON icon;
-					LONG exstyle;
+			if (wp->flags & SWP_SHOWWINDOW) {
+				unsigned short title[150];
+				int state;
+				DWORD pid;
+				int flags;
+				HICON icon;
+				LONG exstyle;
 
-					exstyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-					GetWindowThreadProcessId(hwnd, &pid);
+				exstyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+				GetWindowThreadProcessId(hwnd, &pid);
 
-					flags = 0;
-					if (style & DS_MODALFRAME)
-						flags |= SEAMLESS_CREATE_MODAL;
-					// handle always on top
-					if (exstyle & WS_EX_TOPMOST)
-						flags |= SEAMLESS_CREATE_TOPMOST;
+				flags = 0;
+				if (style & DS_MODALFRAME)
+					flags |= SEAMLESS_CREATE_MODAL;
+				// handle always on top
+				if (exstyle & WS_EX_TOPMOST)
+					flags |= SEAMLESS_CREATE_TOPMOST;
 
-					vchannel_write("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x",
-						       hwnd_to_long(hwnd), (long) pid,
-						       hwnd_to_long(get_parent(hwnd)), flags);
+				vchannel_write("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x",
+					hwnd_to_long(hwnd), (long) pid,
+					hwnd_to_long(get_parent(hwnd)), flags);
 
-					GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title));
+				GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title));
 
-					vchannel_write("TITLE", "0x%08lx,%s,0x%08x", hwnd,
-						       vchannel_strfilter_unicode(title), 0);
+				vchannel_write("TITLE", "0x%08lx,%s,0x%08x", hwnd,
+					vchannel_strfilter_unicode(title), 0);
 
-					icon = get_icon(hwnd, 1);
-					if (icon)
-					{
-						update_icon(hwnd, icon, 1);
-						DeleteObject(icon);
-					}
+				icon = get_icon(hwnd, 1);
+				if (icon) {
+					update_icon(hwnd, icon, 1);
+					DeleteObject(icon);
+				}
 
-					icon = get_icon(hwnd, 0);
-					if (icon)
-					{
-						update_icon(hwnd, icon, 0);
-						DeleteObject(icon);
-					}
-
-					if (style & WS_MAXIMIZE)
-						state = 2;
-					else if (style & WS_MINIMIZE)
-						state = 1;
-					else
-						state = 0;
-
-					update_position(hwnd);
-
-					vchannel_write("STATE", "0x%08lx,0x%08x,0x%08x", hwnd,
-						       state, 0);
+				icon = get_icon(hwnd, 0);
+				if (icon) {
+					update_icon(hwnd, icon, 0);
+					DeleteObject(icon);
 				}
 
-				if (wp->flags & SWP_HIDEWINDOW)
-					vchannel_write("DESTROY", "0x%08lx,0x%08x", hwnd, 0);
+				if (style & WS_MAXIMIZE)
+					state = 2;
+				else if (style & WS_MINIMIZE)
+					state = 1;
+				else
+					state = 0;
 
-				if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
-					break;
+				update_position(hwnd);
 
-				if (!(wp->flags & SWP_NOMOVE && wp->flags & SWP_NOSIZE))
-					update_position(hwnd);
-
-				break;
+				vchannel_write("STATE", "0x%08lx,0x%08x,0x%08x", hwnd,
+					state, 0);
 			}
 
-		case WM_SETICON:
-			if (!(style & WS_VISIBLE))
+			if (wp->flags & SWP_HIDEWINDOW)
+				vchannel_write("DESTROY", "0x%08lx,0x%08x", hwnd, 0);
+
+			if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
 				break;
 
-			switch (wparam)
-			{
-				case ICON_BIG:
-					if (lparam)
-						update_icon(hwnd, (HICON) lparam, 1);
-					else
-						vchannel_write("DELICON", "0x%08lx,RGBA,32,32",
-							       hwnd);
-					break;
-				case ICON_SMALL:
-				case 2:
-					if (lparam)
-						update_icon(hwnd, (HICON) lparam, 0);
-					else
-						vchannel_write("DELICON", "0x%08lx,RGBA,16,16",
-							       hwnd);
-					break;
-				default:
-					debug("Weird icon size %d", (int) wparam);
-			}
+			if (!(wp->flags & SWP_NOMOVE && wp->flags & SWP_NOSIZE))
+				update_position(hwnd);
 
 			break;
+		}
 
-		case WM_SIZE:
-			if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
-				break;
-			update_position(hwnd);
+	case WM_SETICON:
+		if (!(style & WS_VISIBLE))
 			break;
 
-		case WM_MOVE:
-			if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
-				break;
-			update_position(hwnd);
+		switch (wparam) {
+		case ICON_BIG:
+			if (lparam)
+				update_icon(hwnd, (HICON) lparam, 1);
+			else
+				vchannel_write("DELICON", "0x%08lx,RGBA,32,32", hwnd);
 			break;
+		case ICON_SMALL:
+		case 2:
+			if (lparam)
+				update_icon(hwnd, (HICON) lparam, 0);
+			else
+				vchannel_write("DELICON", "0x%08lx,RGBA,16,16", hwnd);
+			break;
+		default:
+			debug("Weird icon size %d", (int) wparam);
+		}
 
-		case WM_DESTROY:
-			if (!(style & WS_VISIBLE))
-				break;
-			vchannel_write("DESTROY", "0x%08lx,0x%08x", hwnd, 0);
+		break;
+
+	case WM_SIZE:
+		if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
 			break;
+		update_position(hwnd);
+		break;
 
-		default:
+	case WM_MOVE:
+		if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
 			break;
+		update_position(hwnd);
+		break;
+
+	case WM_DESTROY:
+		if (!(style & WS_VISIBLE))
+			break;
+		vchannel_write("DESTROY", "0x%08lx,0x%08x", hwnd, 0);
+		break;
+
+	default:
+		break;
 	}
 
-      end:
+  end:
 	return CallNextHookEx(g_wndproc_hook, code, cur_thread, details);
 }
 
@@ -547,67 +532,63 @@
 	wparam = ((CWPRETSTRUCT *) details)->wParam;
 	lparam = ((CWPRETSTRUCT *) details)->lParam;
 
-	if (!is_toplevel(hwnd))
-	{
+	if (!is_toplevel(hwnd)) {
 		goto end;
 	}
 
 	style = GetWindowLong(hwnd, GWL_STYLE);
 
-	switch (msg)
-	{
-		case WM_WINDOWPOSCHANGED:
-			{
-				WINDOWPOS *wp = (WINDOWPOS *) lparam;
+	switch (msg) {
+	case WM_WINDOWPOSCHANGED:
+		{
+			WINDOWPOS *wp = (WINDOWPOS *) lparam;
 
-				if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
-					break;
+			if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
+				break;
 
-				if (!(wp->flags & SWP_NOZORDER))
-					update_zorder(hwnd);
+			if (!(wp->flags & SWP_NOZORDER))
+				update_zorder(hwnd);
 
-				break;
-			}
+			break;
+		}
 
 
-		case WM_SETTEXT:
-			{
-				unsigned short title[150];
-				if (!(style & WS_VISIBLE))
-					break;
-				/* We cannot use the string in lparam because
-				   we need unicode. */
-				GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title));
-				vchannel_write("TITLE", "0x%08lx,%s,0x%08x", hwnd,
-					       vchannel_strfilter_unicode(title), 0);
+	case WM_SETTEXT:
+		{
+			unsigned short title[150];
+			if (!(style & WS_VISIBLE))
 				break;
-			}
+			/* We cannot use the string in lparam because
+			   we need unicode. */
+			GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title));
+			vchannel_write("TITLE", "0x%08lx,%s,0x%08x", hwnd,
+				vchannel_strfilter_unicode(title), 0);
+			break;
+		}
 
-		case WM_SETICON:
-			{
-				HICON icon;
-				if (!(style & WS_VISIBLE))
-					break;
+	case WM_SETICON:
+		{
+			HICON icon;
+			if (!(style & WS_VISIBLE))
+				break;
 
-				/*
-				 * Somehow, we never get WM_SETICON for the small icon.
-				 * So trigger a read of it every time the large one is
-				 * changed.
-				 */
-				icon = get_icon(hwnd, 0);
-				if (icon)
-				{
-					update_icon(hwnd, icon, 0);
-					DeleteObject(icon);
-				}
+			/*
+			 * Somehow, we never get WM_SETICON for the small icon.
+			 * So trigger a read of it every time the large one is
+			 * changed.
+			 */
+			icon = get_icon(hwnd, 0);
+			if (icon) {
+				update_icon(hwnd, icon, 0);
+				DeleteObject(icon);
 			}
+		}
 
-		default:
-			break;
+	default:
+		break;
 	}
 
-	if (msg == g_wm_seamless_focus)
-	{
+	if (msg == g_wm_seamless_focus) {
 		/* For some reason, SetForegroundWindow() on menus
 		   closes them. Ignore focus requests for menu windows. */
 		if ((GetForegroundWindow() != hwnd) && !is_menu(hwnd))
@@ -616,7 +597,7 @@
 		vchannel_write("ACK", "%u", g_shdata->blocked_focus_serial);
 	}
 
-      end:
+  end:
 	return CallNextHookEx(g_wndprocret_hook, code, cur_thread, details);
 }
 
@@ -629,57 +610,55 @@
 	if (code < 0)
 		goto end;
 
-	switch (code)
-	{
-		case HCBT_MINMAX:
-			{
-				int show, state, blocked;
-				HWND hwnd, blocked_hwnd;
-				unsigned int serial;
-				LONG style;
+	switch (code) {
+	case HCBT_MINMAX:
+		{
+			int show, state, blocked;
+			HWND hwnd, blocked_hwnd;
+			unsigned int serial;
+			LONG style;
 
-				WaitForSingleObject(g_mutex, INFINITE);
-				blocked_hwnd = long_to_hwnd(g_shdata->blocked_state_hwnd);
-				serial = g_shdata->blocked_state_serial;
-				blocked = g_shdata->blocked_state;
-				ReleaseMutex(g_mutex);
+			WaitForSingleObject(g_mutex, INFINITE);
+			blocked_hwnd = long_to_hwnd(g_shdata->blocked_state_hwnd);
+			serial = g_shdata->blocked_state_serial;
+			blocked = g_shdata->blocked_state;
+			ReleaseMutex(g_mutex);
 
-				hwnd = (HWND) wparam;
+			hwnd = (HWND) wparam;
 
-				style = GetWindowLong(hwnd, GWL_STYLE);
+			style = GetWindowLong(hwnd, GWL_STYLE);
 
-				if (!(style & WS_VISIBLE))
-					break;
+			if (!(style & WS_VISIBLE))
+				break;
 
-				show = LOWORD(lparam);
+			show = LOWORD(lparam);
 
-				if ((show == SW_NORMAL) || (show == SW_SHOWNORMAL)
-				    || (show == SW_RESTORE))
-					state = 0;
-				else if ((show == SW_MINIMIZE) || (show == SW_SHOWMINIMIZED))
-					state = 1;
-				else if ((show == SW_MAXIMIZE) || (show == SW_SHOWMAXIMIZED))
-					state = 2;
-				else
-				{
-					debug("Unexpected show: %d", show);
-					break;
-				}
-
-				if ((blocked_hwnd == hwnd) && (blocked == state))
-					vchannel_write("ACK", "%u", serial);
-				else
-					vchannel_write("STATE", "0x%08lx,0x%08x,0x%08x",
-						       hwnd, state, 0);
-
+			if ((show == SW_NORMAL) || (show == SW_SHOWNORMAL)
+				|| (show == SW_RESTORE))
+				state = 0;
+			else if ((show == SW_MINIMIZE) || (show == SW_SHOWMINIMIZED))
+				state = 1;
+			else if ((show == SW_MAXIMIZE) || (show == SW_SHOWMAXIMIZED))
+				state = 2;
+			else {
+				debug("Unexpected show: %d", show);
 				break;
 			}
 
-		default:
+			if ((blocked_hwnd == hwnd) && (blocked == state))
+				vchannel_write("ACK", "%u", serial);
+			else
+				vchannel_write("STATE", "0x%08lx,0x%08x,0x%08x",
+					hwnd, state, 0);
+
 			break;
+		}
+
+	default:
+		break;
 	}
 
-      end:
+  end:
 	return CallNextHookEx(g_cbt_hook, code, wparam, lparam);
 }
 
@@ -690,11 +669,13 @@
 		g_cbt_hook = SetWindowsHookEx(WH_CBT, cbt_hook_proc, g_instance, 0);
 
 	if (!g_wndproc_hook)
-		g_wndproc_hook = SetWindowsHookEx(WH_CALLWNDPROC, wndproc_hook_proc, g_instance, 0);
+		g_wndproc_hook =
+			SetWindowsHookEx(WH_CALLWNDPROC, wndproc_hook_proc, g_instance, 0);
 
 	if (!g_wndprocret_hook)
 		g_wndprocret_hook =
-			SetWindowsHookEx(WH_CALLWNDPROCRET, wndprocret_hook_proc, g_instance, 0);
+			SetWindowsHookEx(WH_CALLWNDPROCRET, wndprocret_hook_proc,
+			g_instance, 0);
 }
 
 EXTERN void
@@ -711,7 +692,8 @@
 }
 
 EXTERN void
-SafeMoveWindow(unsigned int serial, HWND hwnd, int x, int y, int width, int height)
+SafeMoveWindow(unsigned int serial, HWND hwnd, int x, int y, int width,
+	int height)
 {
 	RECT rect;
 
@@ -727,14 +709,15 @@
 	g_shdata->block_move.bottom = y + height;
 	ReleaseMutex(g_mutex);
 
-	SetWindowPos(hwnd, NULL, x, y, width, height, SWP_NOACTIVATE | SWP_NOZORDER);
+	SetWindowPos(hwnd, NULL, x, y, width, height,
+		SWP_NOACTIVATE | SWP_NOZORDER);
 
 	vchannel_write("ACK", "%u", serial);
 
 	if (!GetWindowRect(hwnd, &rect))
 		debug("GetWindowRect failed!");
 	else if ((rect.left != x) || (rect.top != y) || (rect.right != x + width)
-		 || (rect.bottom != y + height))
+		|| (rect.bottom != y + height))
 		update_position(hwnd);
 
 	WaitForSingleObject(g_mutex, INFINITE);
@@ -758,7 +741,8 @@
 	if (behind == NULL)
 		behind = HWND_TOP;
 
-	SetWindowPos(hwnd, behind, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
+	SetWindowPos(hwnd, behind, 0, 0, 0, 0,
+		SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
 
 	WaitForSingleObject(g_mutex, INFINITE);
 	g_shdata->blocked_zchange[0] = 0;
@@ -804,8 +788,7 @@
 	else
 		curstate = 0;
 
-	if (state == curstate)
-	{
+	if (state == curstate) {
 		vchannel_write("ACK", "%u", serial);
 		vchannel_unblock();
 		return;
@@ -847,70 +830,61 @@
 DllMain(HINSTANCE hinstDLL, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
 	HANDLE filemapping = NULL;
-	switch (ul_reason_for_call)
-	{
-		case DLL_PROCESS_ATTACH:
-			// remember our instance handle
-			g_instance = hinstDLL;
+	switch (ul_reason_for_call) {
+	case DLL_PROCESS_ATTACH:
+		// remember our instance handle
+		g_instance = hinstDLL;
 
-			g_mutex = CreateMutex(NULL, FALSE, "Local\\SeamlessDLL");
+		g_mutex = CreateMutex(NULL, FALSE, "Local\\SeamlessDLL");
 
-			filemapping = CreateFileMapping(INVALID_HANDLE_VALUE,
-							NULL,
-							PAGE_READWRITE,
-							0,
-							sizeof(shared_variables),
-							"Local\\SeamlessRDPData");
+		filemapping = CreateFileMapping(INVALID_HANDLE_VALUE,
+			NULL,
+			PAGE_READWRITE,
+			0, sizeof(shared_variables), "Local\\SeamlessRDPData");
 
-			if (filemapping)
-			{
-				/* From MSDN: The initial contents of
-				   the pages in a file mapping object
-				   backed by the paging file are 0
-				   (zero)." */
-				g_shdata = MapViewOfFile(filemapping, FILE_MAP_ALL_ACCESS, 0, 0, 0);
-			}
+		if (filemapping) {
+			/* From MSDN: The initial contents of
+			   the pages in a file mapping object
+			   backed by the paging file are 0
+			   (zero)." */
+			g_shdata = MapViewOfFile(filemapping, FILE_MAP_ALL_ACCESS, 0, 0, 0);
+		}
 
-			if (g_mutex && filemapping && g_shdata && vchannel_open() == 0)
-			{
-				WaitForSingleObject(g_mutex, INFINITE);
-				++g_shdata->instance_count;
-				ReleaseMutex(g_mutex);
-				g_wm_seamless_focus = RegisterWindowMessage(FOCUS_MSG_NAME);
-			}
-			break;
+		if (g_mutex && filemapping && g_shdata && vchannel_open() == 0) {
+			WaitForSingleObject(g_mutex, INFINITE);
+			++g_shdata->instance_count;
+			ReleaseMutex(g_mutex);
+			g_wm_seamless_focus = RegisterWindowMessage(FOCUS_MSG_NAME);
+		}
+		break;
 
-		case DLL_THREAD_ATTACH:
-			break;
+	case DLL_THREAD_ATTACH:
+		break;
 
-		case DLL_THREAD_DETACH:
-			break;
+	case DLL_THREAD_DETACH:
+		break;
 
-		case DLL_PROCESS_DETACH:
-			if (vchannel_is_open())
-			{
-				vchannel_write("DESTROYGRP", "0x%08lx, 0x%08lx",
-					       GetCurrentProcessId(), 0);
-				vchannel_close();
-			}
+	case DLL_PROCESS_DETACH:
+		if (vchannel_is_open()) {
+			vchannel_write("DESTROYGRP", "0x%08lx, 0x%08lx",
+				GetCurrentProcessId(), 0);
+			vchannel_close();
+		}
 
-			if (g_mutex)
-			{
-				WaitForSingleObject(g_mutex, INFINITE);
-				if (g_shdata)
-				{
-					--g_shdata->instance_count;
-					UnmapViewOfFile(g_shdata);
-				}
-				ReleaseMutex(g_mutex);
-				CloseHandle(g_mutex);
+		if (g_mutex) {
+			WaitForSingleObject(g_mutex, INFINITE);
+			if (g_shdata) {
+				--g_shdata->instance_count;
+				UnmapViewOfFile(g_shdata);
 			}
+			ReleaseMutex(g_mutex);
+			CloseHandle(g_mutex);
+		}
 
-			if (filemapping)
-			{
-				CloseHandle(filemapping);
-			}
-			break;
+		if (filemapping) {
+			CloseHandle(filemapping);
+		}
+		break;
 	}
 
 	return TRUE;

Modified: seamlessrdp/trunk/ServerExe/main.c
===================================================================
--- seamlessrdp/trunk/ServerExe/main.c	2010-03-31 12:43:15 UTC (rev 1587)
+++ seamlessrdp/trunk/ServerExe/main.c	2010-03-31 12:48:59 UTC (rev 1588)
@@ -47,8 +47,8 @@
 typedef void (*remove_hooks_proc_t) ();
 typedef int (*get_instance_count_proc_t) ();
 
-typedef void (*move_window_proc_t) (unsigned int serial, HWND hwnd, int x, int y, int width,
-				    int height);
+typedef void (*move_window_proc_t) (unsigned int serial, HWND hwnd, int x,
+	int y, int width, int height);
 typedef void (*zchange_proc_t) (unsigned int serial, HWND hwnd, HWND behind);
 typedef void (*focus_proc_t) (unsigned int serial, HWND hwnd);
 typedef void (*set_state_proc_t) (unsigned int serial, HWND hwnd, int state);
@@ -74,13 +74,10 @@
 		return NULL;
 
 	comma = strchr(head, ',');
-	if (comma)
-	{
+	if (comma) {
 		*comma = '\0';
 		*s = comma + 1;
-	}
-	else
-	{
+	} else {
 		*s = NULL;
 	}
 
@@ -108,7 +105,7 @@
 	   remove this when cmd.exe support has been added, though. */
 	char classname[32];
 	if (GetClassName(hwnd, classname, sizeof(classname))
-	    && !strcmp(classname, "ConsoleWindowClass"))
+		&& !strcmp(classname, "ConsoleWindowClass"))
 		return TRUE;
 
 	if (styles & WS_POPUP)
@@ -123,21 +120,21 @@
 		flags |= SEAMLESS_CREATE_MODAL;
 
 	vchannel_write("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x",
-		       hwnd_to_long(hwnd), (long) pid, hwnd_to_long(parent), flags);
+		hwnd_to_long(hwnd), (long) pid, hwnd_to_long(parent), flags);
 
-	if (!GetWindowRect(hwnd, &rect))
-	{
+	if (!GetWindowRect(hwnd, &rect)) {
 		debug("GetWindowRect failed!");
 		return TRUE;
 	}
 
 	vchannel_write("POSITION", "0x%08lx,%d,%d,%d,%d,0x%08x",
-		       hwnd,
-		       rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0);
+		hwnd,
+		rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0);
 
 	GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title));
 
-	vchannel_write("TITLE", "0x%x,%s,0x%x", hwnd, vchannel_strfilter_unicode(title), 0);
+	vchannel_write("TITLE", "0x%x,%s,0x%x", hwnd,
+		vchannel_strfilter_unicode(title), 0);
 
 	if (styles & WS_MAXIMIZE)
 		state = 2;
@@ -205,8 +202,7 @@
 
 	char *p, *tok1, *tok2, *tok3, *tok4, *tok5, *tok6, *tok7, *tok8;
 
-	while ((size = vchannel_read(line, sizeof(line))) >= 0)
-	{
+	while ((size = vchannel_read(line, sizeof(line))) >= 0) {
 		p = line;
 
 		tok1 = get_token(&p);
@@ -221,18 +217,18 @@
 		if (strcmp(tok1, "SYNC") == 0)
 			do_sync();
 		else if (strcmp(tok1, "STATE") == 0)
-			do_state(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL, 0)),
-				 strtol(tok4, NULL, 0));
+			do_state(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL,
+						0)), strtol(tok4, NULL, 0));
 		else if (strcmp(tok1, "POSITION") == 0)
-			do_position(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL, 0)),
-				    strtol(tok4, NULL, 0), strtol(tok5, NULL, 0), strtol(tok6, NULL,
-											 0),
-				    strtol(tok7, NULL, 0));
+			do_position(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL,
+						0)), strtol(tok4, NULL, 0), strtol(tok5, NULL, 0),
+				strtol(tok6, NULL, 0), strtol(tok7, NULL, 0));
 		else if (strcmp(tok1, "ZCHANGE") == 0)
-			do_zchange(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL, 0)),
-				   long_to_hwnd(strtoul(tok4, NULL, 0)));
+			do_zchange(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL,
+						0)), long_to_hwnd(strtoul(tok4, NULL, 0)));
 		else if (strcmp(tok1, "FOCUS") == 0)
-			do_focus(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL, 0)));
+			do_focus(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL,
+						0)));
 		else if (strcmp(tok1, "DESTROY") == 0)
 			do_destroy(long_to_hwnd(strtoul(tok3, NULL, 0)));
 	}
@@ -249,8 +245,7 @@
 
 	g_startup_num_procs = 0;
 
-	for (i = 0; i < count; i++)
-	{
+	for (i = 0; i < count; i++) {
 		if (pinfo[i].SessionId != g_session_id)
 			continue;
 
@@ -260,8 +255,7 @@
 	g_startup_procs = malloc(sizeof(DWORD) * g_startup_num_procs);
 
 	j = 0;
-	for (i = 0; i < count; i++)
-	{
+	for (i = 0; i < count; i++) {
 		if (pinfo[i].SessionId != g_session_id)
 			continue;
 
@@ -292,25 +286,21 @@
 	if (!WTSEnumerateProcesses(WTS_CURRENT_SERVER_HANDLE, 0, 1, &pinfo, &count))
 		return TRUE;
 
-	for (i = 0; i < count; i++)
-	{
+	for (i = 0; i < count; i++) {
 		if (pinfo[i].SessionId != g_session_id)
 			continue;
 
 		// ieuser.exe hangs around even after IE has exited
-		if (0 == _stricmp(pinfo[i].pProcessName, "ieuser.exe"))
-		{
+		if (0 == _stricmp(pinfo[i].pProcessName, "ieuser.exe")) {
 			continue;
 		}
 
-		for (j = 0; j < g_startup_num_procs; j++)
-		{
+		for (j = 0; j < g_startup_num_procs; j++) {
 			if (pinfo[i].ProcessId == g_startup_procs[j])
 				break;
 		}
 
-		if (j == g_startup_num_procs)
-		{
+		if (j == g_startup_num_procs) {
 			WTSFreeMemory(pinfo);
 			return FALSE;
 		}
@@ -329,8 +319,7 @@
 	DWORD size;
 
 	res = WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE,
-					 WTS_CURRENT_SESSION, WTSConnectState, (LPTSTR *) & state,
-					 &size);
+		WTS_CURRENT_SESSION, WTSConnectState, (LPTSTR *) & state, &size);
 	if (!res)
 		return TRUE;
 
@@ -368,16 +357,13 @@
 	startup_info.cb = sizeof(STARTUPINFO);
 
 	result = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0,
-			       NULL, NULL, &startup_info, &proc_info);
+		NULL, NULL, &startup_info, &proc_info);
 	// Release handles
 	CloseHandle(proc_info.hThread);
 
-	if (result)
-	{
+	if (result) {
 		return proc_info.hProcess;
-	}
-	else
-	{
+	} else {
 		return NULL;
 	}
 }
@@ -391,15 +377,13 @@
 
 	/* If we are running on a x64 system, hook 32 bit apps as well
 	   by launching a 32 bit helper process. */
-	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
-	{
+	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
 		char cmd[] = "seamlessrdphook32.exe";
 		app = launch_app(cmd);
-		if (!app)
-		{
+		if (!app) {
 			char msg[256];
 			_snprintf(msg, sizeof(msg),
-				  "Unable to launch the requested application:\n%s", cmd);
+				"Unable to launch the requested application:\n%s", cmd);
 			message(msg);
 		}
 
@@ -407,14 +391,13 @@
 		   the process enum */
 		DWORD ret;
 		ret = WaitForInputIdle(app, HELPER_TIMEOUT);
-		switch (ret)
-		{
-			case 0:
-				break;
-			case WAIT_TIMEOUT:
-			case WAIT_FAILED:
-				message("Hooking helper failed to start within time limit");
-				break;
+		switch (ret) {
+		case 0:
+			break;
+		case WAIT_TIMEOUT:
+		case WAIT_FAILED:
+			message("Hooking helper failed to start within time limit");
+			break;
 		}
 	}
 	return app;
@@ -428,26 +411,23 @@
 	HWND procwnd;
 	DWORD ret;
 	procwnd = FindWindowEx(HWND_MESSAGE, NULL, "Message", wndname);
-	if (procwnd)
-	{
+	if (procwnd) {
 		PostMessage(procwnd, WM_CLOSE, 0, 0);
 	}
 	ret = WaitForSingleObject(proc, timeout);
-	switch (ret)
-	{
-		case WAIT_ABANDONED:
-		case WAIT_OBJECT_0:
-			break;
-		case WAIT_TIMEOUT:
-			// Still running, kill hard
-			if (!TerminateProcess(proc, 1))
-			{
-				message("Unable to terminate process");
-			}
-			break;
-		case WAIT_FAILED:
-			message("Unable to wait for process");
-			break;
+	switch (ret) {
+	case WAIT_ABANDONED:
+	case WAIT_OBJECT_0:
+		break;
+	case WAIT_TIMEOUT:
+		// Still running, kill hard
+		if (!TerminateProcess(proc, 1)) {
+			message("Unable to terminate process");
+		}
+		break;
+	case WAIT_FAILED:
+		message("Unable to wait for process");
+		break;
 	}
 }
 
@@ -465,67 +445,66 @@
 
 	int check_counter;
 
-	if (strlen(cmdline) == 0)
-	{
+	if (strlen(cmdline) == 0) {
 		message("No command line specified.");
 		return -1;
 	}
 
-	if (vchannel_open())
-	{
+	if (vchannel_open()) {
 		message("Unable to set up the virtual channel.");
 		return -1;
 	}
 
 	SYSTEM_INFO si;
 	GetSystemInfo(&si);
-	switch (si.wProcessorArchitecture)
-	{
-		case PROCESSOR_ARCHITECTURE_INTEL:
-			hookdll = LoadLibrary("seamlessrdp32.dll");
-			break;
-		case PROCESSOR_ARCHITECTURE_AMD64:
-			hookdll = LoadLibrary("seamlessrdp64.dll");
-			break;
-		default:
-			message("Unsupported processor architecture.");
-			break;
+	switch (si.wProcessorArchitecture) {
+	case PROCESSOR_ARCHITECTURE_INTEL:
+		hookdll = LoadLibrary("seamlessrdp32.dll");
+		break;
+	case PROCESSOR_ARCHITECTURE_AMD64:
+		hookdll = LoadLibrary("seamlessrdp64.dll");
+		break;
+	default:
+		message("Unsupported processor architecture.");
+		break;
 
 	}
 
-	if (!hookdll)
-	{
+	if (!hookdll) {
 		message("Could not load hook DLL. Unable to continue.");
 		goto close_vchannel;
 	}
 
 	set_hooks_fn = (set_hooks_proc_t) GetProcAddress(hookdll, "SetHooks");
-	remove_hooks_fn = (remove_hooks_proc_t) GetProcAddress(hookdll, "RemoveHooks");
-	instance_count_fn = (get_instance_count_proc_t) GetProcAddress(hookdll, "GetInstanceCount");
-	g_move_window_fn = (move_window_proc_t) GetProcAddress(hookdll, "SafeMoveWindow");
+	remove_hooks_fn =
+		(remove_hooks_proc_t) GetProcAddress(hookdll, "RemoveHooks");
+	instance_count_fn =
+		(get_instance_count_proc_t) GetProcAddress(hookdll, "GetInstanceCount");
+	g_move_window_fn =
+		(move_window_proc_t) GetProcAddress(hookdll, "SafeMoveWindow");
 	g_zchange_fn = (zchange_proc_t) GetProcAddress(hookdll, "SafeZChange");
 	g_focus_fn = (focus_proc_t) GetProcAddress(hookdll, "SafeFocus");
 	g_set_state_fn = (set_state_proc_t) GetProcAddress(hookdll, "SafeSetState");
 
-	if (!set_hooks_fn || !remove_hooks_fn || !instance_count_fn || !g_move_window_fn
-	    || !g_zchange_fn || !g_focus_fn || !g_set_state_fn)
-	{
-		message("Hook DLL doesn't contain the correct functions. Unable to continue.");
+	if (!set_hooks_fn || !remove_hooks_fn || !instance_count_fn
+		|| !g_move_window_fn || !g_zchange_fn || !g_focus_fn
+		|| !g_set_state_fn) {
+		message
+			("Hook DLL doesn't contain the correct functions. Unable to continue.");
 		goto close_hookdll;
 	}
 
 	/* Check if the DLL is already loaded */
-	switch (instance_count_fn())
-	{
-		case 0:
-			message("Hook DLL failed to initialize.");
-			goto close_hookdll;
-			break;
-		case 1:
-			break;
-		default:
-			message("Another running instance of Seamless RDP detected.");
-			goto close_hookdll;
+	switch (instance_count_fn()) {
+	case 0:
+		message("Hook DLL failed to initialize.");
+		goto close_hookdll;
+		break;
+	case 1:
+		break;
+	default:
+		message("Another running instance of Seamless RDP detected.");
+		goto close_hookdll;
 	}
 
 	helper = launch_helper();
@@ -537,7 +516,8 @@
 	g_connected = is_connected();
 	g_desktop_hidden = is_desktop_hidden();
 
-	vchannel_write("HELLO", "0x%08x", g_desktop_hidden ? SEAMLESS_HELLO_HIDDEN : 0);
+	vchannel_write("HELLO", "0x%08x",
+		g_desktop_hidden ? SEAMLESS_HELLO_HIDDEN : 0);
 
 	set_hooks_fn();
 
@@ -551,25 +531,22 @@
 	/* We don't want windows denying requests to activate windows. */
 	SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, 0);
 
-	if (!launch_app(cmdline))
-	{
+	if (!launch_app(cmdline)) {
 		// CreateProcess failed.
 		char msg[256];
 		_snprintf(msg, sizeof(msg),
-			  "Unable to launch the requested application:\n%s", cmdline);
+			"Unable to launch the requested application:\n%s", cmdline);
 		message(msg);
 		goto unhook;
 	}
 
 	check_counter = 5;
-	while (check_counter-- || !should_terminate())
-	{
+	while (check_counter-- || !should_terminate()) {
 		BOOL connected;
 		MSG msg;
 
 		connected = is_connected();
-		if (connected && !g_connected)
-		{
+		if (connected && !g_connected) {
 			int flags;
 			/* These get reset on each reconnect */
 			SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, TRUE, NULL, 0);
@@ -584,8 +561,7 @@
 
 		g_connected = connected;
 
-		if (check_counter < 0)
-		{
+		if (check_counter < 0) {
 			BOOL hidden;
 
 			hidden = is_desktop_hidden();
@@ -599,8 +575,7 @@
 			check_counter = 5;
 		}
 
-		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-		{
+		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
 			TranslateMessage(&msg);
 			DispatchMessage(&msg);
 		}
@@ -610,20 +585,19 @@
 
 	success = 1;
 
-      unhook:
+  unhook:
 	remove_hooks_fn();
 
 	free_startup_procs();
-	if (helper)
-	{
+	if (helper) {
 		// Terminate seamlessrdphook32.exe
 		kill_15_9(helper, "SeamlessRDPHook", HELPER_TIMEOUT);
 	}
 
-      close_hookdll:
+  close_hookdll:
 	FreeLibrary(hookdll);
 
-      close_vchannel:
+  close_vchannel:
 	vchannel_close();
 
 	// Logoff the user. This is necessary because the session may

Modified: seamlessrdp/trunk/ServerExe/seamlessrdphook.c
===================================================================
--- seamlessrdp/trunk/ServerExe/seamlessrdphook.c	2010-03-31 12:43:15 UTC (rev 1587)
+++ seamlessrdp/trunk/ServerExe/seamlessrdphook.c	2010-03-31 12:48:59 UTC (rev 1588)
@@ -42,32 +42,31 @@
 
 	SYSTEM_INFO si;
 	GetSystemInfo(&si);
-	switch (si.wProcessorArchitecture)
-	{
-		case PROCESSOR_ARCHITECTURE_INTEL:
-			hookdll = LoadLibrary("seamlessrdp32.dll");
-			break;
-		case PROCESSOR_ARCHITECTURE_AMD64:
-			hookdll = LoadLibrary("seamlessrdp64.dll");
-			break;
-		default:
-			message("Unsupported processor architecture.");
-			break;
+	switch (si.wProcessorArchitecture) {
+	case PROCESSOR_ARCHITECTURE_INTEL:
+		hookdll = LoadLibrary("seamlessrdp32.dll");
+		break;
+	case PROCESSOR_ARCHITECTURE_AMD64:
+		hookdll = LoadLibrary("seamlessrdp64.dll");
+		break;
+	default:
+		message("Unsupported processor architecture.");
+		break;
 
 	}
 
-	if (!hookdll)
-	{
+	if (!hookdll) {
 		message("Could not load hook DLL. Unable to continue.");
 		return 1;
 	}
 
 	set_hooks_fn = (set_hooks_proc_t) GetProcAddress(hookdll, "SetHooks");
-	instance_count_fn = (get_instance_count_proc_t) GetProcAddress(hookdll, "GetInstanceCount");
+	instance_count_fn =
+		(get_instance_count_proc_t) GetProcAddress(hookdll, "GetInstanceCount");
 
-	if (!set_hooks_fn || !instance_count_fn)
-	{
-		message("Hook DLL doesn't contain the correct functions. Unable to continue.");
+	if (!set_hooks_fn || !instance_count_fn) {
+		message
+			("Hook DLL doesn't contain the correct functions. Unable to continue.");
 		goto close_hookdll;
 	}
 
@@ -79,27 +78,23 @@
 	   dialog, such messages are lost. Instead, we need to create
 	   a "Message-Only Window". */
 	CreateWindow("Message", "SeamlessRDPHook", 0, 0, 0, 0, 0,
-		     HWND_MESSAGE, NULL, instance, NULL);
+		HWND_MESSAGE, NULL, instance, NULL);
 
 	MSG msg;
-	while (1)
-	{
+	while (1) {
 		BOOL ret;
 		ret = GetMessage(&msg, NULL, 0, 0);
-		if (ret == -1)
-		{
+		if (ret == -1) {
 			message("GetMessage failed");
 			break;
-		}
-		else if (ret == 0)
-		{
+		} else if (ret == 0) {
 			break;
 		}
 		TranslateMessage(&msg);
 		DispatchMessage(&msg);
 	}
 
-      close_hookdll:
+  close_hookdll:
 	FreeLibrary(hookdll);
 
 	return 0;

Modified: seamlessrdp/trunk/ServerExe/vchannel.c
===================================================================
--- seamlessrdp/trunk/ServerExe/vchannel.c	2010-03-31 12:43:15 UTC (rev 1587)
+++ seamlessrdp/trunk/ServerExe/vchannel.c	2010-03-31 12:48:59 UTC (rev 1588)
@@ -90,25 +90,19 @@
 	size = sizeof(convert_buffer) - 1;
 
 	/* We do not handle characters outside BMP (i.e. we can't do UTF-16) */
-	while (*string != 0x0000)
-	{
-		if (*string < 0x80)
-		{
+	while (*string != 0x0000) {
+		if (*string < 0x80) {
 			if (size < 1)
 				break;
 			*buf++ = (unsigned char) *string;
 			size--;
-		}
-		else if (*string < 0x800)
-		{
+		} else if (*string < 0x800) {
 			if (size < 2)
 				break;
 			*buf++ = 0xC0 | (*string >> 6);
 			*buf++ = 0x80 | (*string & 0x3F);
 			size -= 2;
-		}
-		else if ((*string < 0xD800) || (*string > 0xDFFF))
-		{
+		} else if ((*string < 0xD800) || (*string > 0xDFFF)) {
 			if (size < 3)
 				break;
 			*buf++ = 0xE0 | (*string >> 12);
@@ -133,17 +127,17 @@
 		return 0;
 
 	g_vchannel = WTSVirtualChannelOpen(WTS_CURRENT_SERVER_HANDLE,
-					   WTS_CURRENT_SESSION, CHANNELNAME);
+		WTS_CURRENT_SESSION, CHANNELNAME);
 
 	if (g_vchannel == NULL)
 		return -1;
 
 	g_mutex = CreateMutex(NULL, FALSE, "Local\\SeamlessChannel");
 
-	g_vchannel_serial = CreateSemaphore(NULL, 0, INT_MAX, "Local\\SeamlessRDPSerial");
+	g_vchannel_serial =
+		CreateSemaphore(NULL, 0, INT_MAX, "Local\\SeamlessRDPSerial");
 
-	if (!g_mutex || !g_vchannel_serial)
-	{
+	if (!g_mutex || !g_vchannel_serial) {
 		WTSVirtualChannelClose(g_vchannel);
 		g_vchannel = NULL;
 		return -1;
@@ -192,38 +186,31 @@
 	ULONG bytes_read;
 
 	result = WTSVirtualChannelRead(g_vchannel, 0, buffer + size,
-				       sizeof(buffer) - size, &bytes_read);
+		sizeof(buffer) - size, &bytes_read);
 
-	if (!result)
-	{
+	if (!result) {
 		errno = EIO;
 		return -1;
 	}
 
-	if (overflow_mode)
-	{
+	if (overflow_mode) {
 		newline = strchr(buffer, '\n');
-		if (newline && (newline - buffer) < bytes_read)
-		{
+		if (newline && (newline - buffer) < bytes_read) {
 			size = bytes_read - (newline - buffer) - 1;
 			memmove(buffer, newline + 1, size);
 			overflow_mode = FALSE;
 		}
-	}
-	else
+	} else
 		size += bytes_read;
 
-	if (overflow_mode)
-	{
+	if (overflow_mode) {
 		errno = -EAGAIN;
 		return -1;
 	}
 
 	newline = strchr(buffer, '\n');
-	if (!newline || (newline - buffer) >= size)
-	{
-		if (size == sizeof(buffer))
-		{
+	if (!newline || (newline - buffer) >= size) {
+		if (size == sizeof(buffer)) {
 			overflow_mode = TRUE;
 			size = 0;
 		}
@@ -231,8 +218,7 @@
 		return -1;
 	}
 
-	if ((newline - buffer) >= length)
-	{
+	if ((newline - buffer) >= length) {
 		errno = ENOMEM;
 		return -1;
 	}
@@ -263,14 +249,11 @@
 	WaitForSingleObject(g_mutex, INFINITE);
 
 	/* Increase serial */
-	if (!ReleaseSemaphore(g_vchannel_serial, 1, &prev_serial))
-	{
-		if (GetLastError() == ERROR_TOO_MANY_POSTS)
-		{
+	if (!ReleaseSemaphore(g_vchannel_serial, 1, &prev_serial)) {
+		if (GetLastError() == ERROR_TOO_MANY_POSTS) {
 			/* Reset serial to zero */
 			while (WaitForSingleObject(g_vchannel_serial, 0) == WAIT_OBJECT_0);
-			if (!ReleaseSemaphore(g_vchannel_serial, 1, &prev_serial))
-			{
+			if (!ReleaseSemaphore(g_vchannel_serial, 1, &prev_serial)) {
 				return -1;
 			}
 		}
@@ -278,14 +261,11 @@
 
 	ret = _snprintf(buf, sizeof(buf), "%s,%u,", command, prev_serial);
 
-	if (ret < 0)
-	{
+	if (ret < 0) {
 		// If the command and serial didn't fit, let's skip
 		// this message
 		return -1;
-	}
-	else
-	{
+	} else {
 		size = ret;
 	}
 	assert(size <= sizeof(buf));
@@ -295,20 +275,20 @@
 	ret = _vsnprintf(buf + size, sizeof(buf) - size, format, argp);
 	va_end(argp);
 
-	if (ret < 0)
-	{
+	if (ret < 0) {
 		// Truncated, but let's write what we have              
 		size = sizeof(buf) - 1;
-	}
-	else
-	{
+	} else {
 		size = ret;
 	}
 	buf[sizeof(buf) - 1] = '\0';
 	assert(size < sizeof(buf));
 
-	result = WTSVirtualChannelWrite(g_vchannel, buf, (ULONG) strlen(buf), &bytes_written);
-	result = WTSVirtualChannelWrite(g_vchannel, "\n", (ULONG) 1, &bytes_written);
+	result =
+		WTSVirtualChannelWrite(g_vchannel, buf, (ULONG) strlen(buf),
+		&bytes_written);
+	result =
+		WTSVirtualChannelWrite(g_vchannel, "\n", (ULONG) 1, &bytes_written);
 
 	ReleaseMutex(g_mutex);
 
@@ -335,8 +315,7 @@
 {
 	char *c;
 
-	for (c = string; *c != '\0'; c++)
-	{
+	for (c = string; *c != '\0'; c++) {
 		if (((unsigned char) *c < 0x20) || (strchr(INVALID_CHARS, *c) != NULL))
 			*c = REPLACEMENT_CHAR;
 	}

Modified: seamlessrdp/trunk/indent-all
===================================================================
--- seamlessrdp/trunk/indent-all	2010-03-31 12:43:15 UTC (rev 1587)
+++ seamlessrdp/trunk/indent-all	2010-03-31 12:48:59 UTC (rev 1588)
@@ -1,2 +1,2 @@
 #!/bin/sh
-indent -bli0 -i8 -cli8 -npcs -l100 ServerExe/*.h ServerExe/*.c
+indent -bli0 -i4 -ts4 -cli0 -npcs -nlp -br -ce -l80 ServerExe/*.h ServerExe/*.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2009	Jan	Feb	Mar	Apr	May (1)	Jun	Jul	Aug (4)	Sep (3)	Oct (9)	Nov	Dec (1)
2010	Jan (41)	Feb (1)	Mar (24)	Apr (5)	May	Jun (6)	Jul	Aug (1)	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr (20)	May (1)	Jun	Jul	Aug (2)	Sep (5)	Oct (1)	Nov (2)	Dec (5)
2012	Jan (5)	Feb	Mar	Apr	May	Jun (5)	Jul (4)	Aug	Sep (2)	Oct (3)	Nov (14)	Dec (2)
2013	Jan (6)	Feb (3)	Mar (10)	Apr (4)	May	Jun (12)	Jul (2)	Aug (10)	Sep (14)	Oct	Nov (21)	Dec (9)
2014	Jan	Feb (11)	Mar (3)	Apr (3)	May (14)	Jun (8)	Jul (5)	Aug (4)	Sep (10)	Oct (2)	Nov (4)	Dec
2015	Jan	Feb (4)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Thanks for helping keep SourceForge clean.

rdesktop

rdesktop has moved to GitHub

Brought to you by: astrand, hean01, matthewc

rdesktop-commits — Subversion commit messages

S	M	T	W	T	F	S
	1	2 (6)	3 (4)	4 (3)	5	6
7	8 (1)	9	10 (1)	11 (1)	12	13
14	15	16	17	18	19	20
21	22	23	24	25	26	27
28	29	30 (1)	31 (7)