From: VMware, Inc <> Date: Sat, 28 May 2011 19:45:43 +0000 (-0700) Subject: resolution set: remove references to old "guest dict" code. X-Git-Tag: 2011.05.27-420096~51 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ac7046cf8c7027dbff99fcbdaf39b109d431e89;p=thirdparty%2Fopen-vm-tools.git resolution set: remove references to old "guest dict" code. In the process, re-organize the headers a little bit to avoid duplication of code and definitions. Signed-off-by: Marcelo Vanzin --- diff --git a/open-vm-tools/services/plugins/resolutionSet/resolution.h b/open-vm-tools/services/plugins/resolutionSet/resolution.h deleted file mode 100644 index f72534ac9..000000000 --- a/open-vm-tools/services/plugins/resolutionSet/resolution.h +++ /dev/null @@ -1,105 +0,0 @@ -/********************************************************* - * Copyright (C) 2008 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation version 2.1 and no later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - *********************************************************/ - -/* - * resolution.h -- - * - * Library for the guest resolution and topology fit/resize capabilities. - * This library handles its own RPC callbacks, and it's intended to more - * or less operate independently of the client application. - * - * Client applications are expected to do (roughly) the following: - * // Init library. - * Resolution_Init(); - * - * // Register RpcIn callbacks. - * Resolution_InitBackdoor(); - * - * // Call this in response to getting a/ capreg message from the host. - * Resolution_RegisterCaps(); - * - * // Call this when you're finished with the library and wish to reclaim - * // resources. - * Resolution_Cleanup(); - * - * In response to a TCLO reset or to otherwise (temporarily) disable the - * library, one can also call Resolution_UnregisterCaps(). (This routine - * is also called implicitly by Resolution_Cleanup().) - */ - -#ifndef _LIB_RESOLUTION_H_ -#define _LIB_RESOLUTION_H_ - -#define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_DISTRIBUTE -#include "includeCheck.h" - -#include "vmware.h" - - -/* - * Data types - */ - -/* - * Argument to be passed to Resolution_Init(). Users of the X11 backend - * should provide a Display *. Not sure what users of Mac OS X will need - * to provide, if anything. - */ -#if defined(RESOLUTION_X11) -# include -# undef Bool -typedef Display * InitHandle; - -#elif defined(__APPLE__) || defined(RESOLUTION_WIN32) -typedef void * InitHandle; -#else -# error Unknown display backend -#endif - -/* - * Arguments to VMwareResolutionSet.exe - */ -#define RESOLUTION_SET_APP_NAME "VMwareResolutionSet.exe" -typedef enum { - RESOLUTION_SET_NORESET = 0, - RESOLUTION_SET_RESET = 1, - RESOLUTION_SET_ARBITRARY = 2, -} ResolutionSetDisplayReset; - - -/* - * Global functions - */ - -#if !defined(VMTOOLS_USE_GLIB) - -#include "rpcin.h" - -Bool Resolution_Init(const char *tcloChannel, InitHandle handle); -void Resolution_Cleanup(void); - -void Resolution_InitBackdoor(RpcIn *rpcIn); -void Resolution_CleanupBackdoor(void); - -Bool Resolution_RegisterCaps(void); -Bool Resolution_UnregisterCaps(void); - -#endif - -#endif // ifndef _LIB_RESOLUTION_H_ diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h b/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h index d7b2998c4..a69abaf90 100644 --- a/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h +++ b/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h @@ -28,13 +28,20 @@ #define INCLUDE_ALLOW_USERLEVEL #define INCLUDE_ALLOW_DISTRIBUTE #include "includeCheck.h" +#include "vmware.h" -#include "resolution.h" - -/* - * Data types - */ +#if defined(_WIN32) +# include "resolutionWinCommon.h" +#endif +#if defined(RESOLUTION_X11) +# include +typedef Display * InitHandle; +#elif defined(__APPLE__) || defined(RESOLUTION_WIN32) +typedef void * InitHandle; +#else +# error Unknown display backend +#endif /* * Describes internal state of the resolution library. I.e., tracks whether @@ -46,10 +53,12 @@ typedef struct { Bool canSetTopology; // TRUE if back-end supports DisplayTopology_Set. } ResolutionInfoType; - +#if !defined(_WIN32) /* * Describes the size and offset of a display. An array of these - * structures describes the entire topology of the guest desktop + * structures describes the entire topology of the guest desktop. + * + * XXX: For Win32, this is already defined in resolutionWinCommon.h. */ typedef struct { int x; @@ -57,7 +66,7 @@ typedef struct { int width; int height; } DisplayTopologyInfo; - +#endif /* * Global variables diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c b/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c index 315fad88b..86041a21b 100644 --- a/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c +++ b/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c @@ -62,24 +62,17 @@ #ifndef NO_MULTIMON +#include "resolutionInt.h" + #include #include #include - -#include "resolutionInt.h" -#include "resolutionRandR12.h" -#include #include #include #include +#include -#include -#undef Bool - -#include "vmware.h" -#include "resolution.h" -#include "debug.h" - +#include "resolutionRandR12.h" #include "str.h" #include "strutil.h" #include "util.h" diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionX11.c b/open-vm-tools/services/plugins/resolutionSet/resolutionX11.c index 67c2c14fb..50a1a2763 100644 --- a/open-vm-tools/services/plugins/resolutionSet/resolutionX11.c +++ b/open-vm-tools/services/plugins/resolutionSet/resolutionX11.c @@ -29,20 +29,14 @@ #include "resolutionInt.h" #include "resolutionRandR12.h" -#include #include #ifndef NO_MULTIMON #include #endif #include #include -#include -#undef Bool #include "vmware.h" - -#include "resolution.h" - #include "debug.h" #include "fileIO.h" #include "libvmwarectrl.h"