From: VMware, Inc <>
Date: Thu, 15 Oct 2009 21:02:41 +0000 (-0700)
Subject: Clean up usage of vm_app.h in bora-vmsoft.
X-Git-Tag: 2009.10.15-201664~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=077367fec1f444d70dd5d41ac38dcdee1561cf84;p=thirdparty%2Fopen-vm-tools.git

Clean up usage of vm_app.h in bora-vmsoft.

That header has been "deprecated" and replaced by more app-specific ones in
the new guestABI component. This change focuses mostly on files that are part
of open-vm-tools (so we can at least remove the deprecated header there).

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/guestApp/guestApp.c b/open-vm-tools/lib/guestApp/guestApp.c
index eb647bbca..62df560cd 100644
--- a/open-vm-tools/lib/guestApp/guestApp.c
+++ b/open-vm-tools/lib/guestApp/guestApp.c
@@ -32,7 +32,6 @@ extern "C" {
 #include <string.h>
 
 #include "vmware.h"
-#include "vm_app.h"
 #include "vm_version.h"
 #include "vm_tools_version.h"
 #include "guestApp.h"
@@ -50,6 +49,7 @@ extern "C" {
 #include "codeset.h"
 #include "productState.h"
 #include "posix.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 #include "hgfs.h"
 #include "cpName.h"
diff --git a/open-vm-tools/lib/hgfsServerManagerGuest/hgfsServerManagerGuest.c b/open-vm-tools/lib/hgfsServerManagerGuest/hgfsServerManagerGuest.c
index 887990090..333354360 100644
--- a/open-vm-tools/lib/hgfsServerManagerGuest/hgfsServerManagerGuest.c
+++ b/open-vm-tools/lib/hgfsServerManagerGuest/hgfsServerManagerGuest.c
@@ -31,9 +31,9 @@
 #include "hgfsServer.h"
 #include "hgfsChannel.h"
 #include "hgfsServerManager.h"
-#include "vm_app.h"
 #include "vm_assert.h"
 #include "hgfs.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 
 static Bool HgfsServerManagerRpcInDispatch(char const **result,
diff --git a/open-vm-tools/lib/include/vm_app.h b/open-vm-tools/lib/include/vm_app.h
deleted file mode 100644
index 64521f048..000000000
--- a/open-vm-tools/lib/include/vm_app.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*********************************************************
- * Copyright (C) 1998 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.
- *
- *********************************************************/
-
-/*
- * Common data structures used by the helper app that runs on the VM
- * and the user process.
- *
- * XXX: avoid including this file. Try to include the vmware/guestrpc
- * equivalent for your feature directly.
- */
-
-#ifndef _VM_APP_H_
-#define _VM_APP_H_
-
-#define INCLUDE_ALLOW_USERLEVEL
-#define INCLUDE_ALLOW_MODULE
-#include "includeCheck.h"
-
-#include "vmware/guestrpc/powerops.h"
-#include "vmware/guestrpc/tclodefs.h"
-#include "vmware/guestrpc/timesync.h"
-
-#endif
diff --git a/open-vm-tools/lib/resolution/resolution.c b/open-vm-tools/lib/resolution/resolution.c
index 3ddc070a6..13ff58b47 100644
--- a/open-vm-tools/lib/resolution/resolution.c
+++ b/open-vm-tools/lib/resolution/resolution.c
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "vmware.h"
-#include "vm_app.h"
 #include "debug.h"
 #include "rpcout.h"
 #include "str.h"
diff --git a/open-vm-tools/lib/resolution/resolutionInt.h b/open-vm-tools/lib/resolution/resolutionInt.h
index 456ab2738..0bb853159 100644
--- a/open-vm-tools/lib/resolution/resolutionInt.h
+++ b/open-vm-tools/lib/resolution/resolutionInt.h
@@ -30,7 +30,7 @@
 #include "includeCheck.h"
 
 #include "resolution.h"
-#include "vm_app.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 
 /*
diff --git a/open-vm-tools/lib/vixTools/vixTools.c b/open-vm-tools/lib/vixTools/vixTools.c
index f281c15b2..a961653d1 100644
--- a/open-vm-tools/lib/vixTools/vixTools.c
+++ b/open-vm-tools/lib/vixTools/vixTools.c
@@ -47,7 +47,6 @@
 #include "vmware.h"
 #include "procMgr.h"
 #include "vm_version.h"
-#include "vm_app.h"
 #include "message.h"
 
 #if defined(VMTOOLS_USE_GLIB)
diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
index 6eab06199..9380aa432 100644
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
@@ -53,11 +53,11 @@
 #include "strutil.h"
 #include "system.h"
 #include "util.h"
-#include "vm_app.h"
 #include "vmtools.h"
 #include "vmtoolsApp.h"
 #include "xdrutil.h"
 #include "vmsupport.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
index 507150005..17c3a3c31 100644
--- a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
+++ b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
@@ -31,9 +31,9 @@
 #include "hgfsServerPolicy.h"
 #include "hgfsServer.h"
 #include "hgfsChannel.h"
-#include "vm_app.h"
 #include "vm_assert.h"
 #include "vmtools.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/services/plugins/powerOps/powerOps.c b/open-vm-tools/services/plugins/powerOps/powerOps.c
index d9a1607c1..b0854ce75 100644
--- a/open-vm-tools/services/plugins/powerOps/powerOps.c
+++ b/open-vm-tools/services/plugins/powerOps/powerOps.c
@@ -31,8 +31,8 @@
 #include "conf.h"
 #include "procMgr.h"
 #include "system.h"
-#include "vm_app.h"
 #include "vmtools.h"
+#include "vmware/guestrpc/powerops.h"
 
 #if defined(G_PLATFORM_WIN32)
 #  define INVALID_PID NULL
diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h b/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h
index 793445211..b6f999856 100644
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h
@@ -30,7 +30,6 @@
 #include "includeCheck.h"
 
 #include "resolution.h"
-#include "vm_app.h"
 
 /*
  * Data types
diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
index 6d4d18d3f..03a1e73c8 100644
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "vmware.h"
-#include "vm_app.h"
 #include "debug.h"
 #include "rpcout.h"
 #include "str.h"
@@ -38,6 +37,7 @@
 #include "vmtools.h"
 #include "vmtoolsApp.h"
 #include "xdrutil.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 /*
  * Internal global variables
diff --git a/open-vm-tools/services/plugins/timeSync/timeSync.c b/open-vm-tools/services/plugins/timeSync/timeSync.c
index bada3a34b..4906ce2be 100644
--- a/open-vm-tools/services/plugins/timeSync/timeSync.c
+++ b/open-vm-tools/services/plugins/timeSync/timeSync.c
@@ -36,9 +36,9 @@
 #include "msg.h"
 #include "strutil.h"
 #include "system.h"
-#include "vm_app.h"
 #include "vmtools.h"
 #include "vmtoolsApp.h"
+#include "vmware/guestrpc/timesync.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
@@ -603,7 +603,7 @@ ToolsOnLoad(ToolsAppCtx *ctx)
 
    TimeSyncData *data = g_malloc(sizeof (TimeSyncData));
    RpcChannelCallback rpcs[] = {
-      { "Time_Synchronize", TimeSyncTcloHandler, data, NULL, NULL, 0 }
+      { TIMESYNC_SYNCHRONIZE, TimeSyncTcloHandler, data, NULL, NULL, 0 }
    };
    ToolsPluginSignalCb sigs[] = {
       { TOOLS_CORE_SIG_SET_OPTION, TimeSyncSetOption, &regData },
diff --git a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
index 26eacf87b..dab5a5714 100644
--- a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
+++ b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
@@ -53,7 +53,6 @@
 #include "vmware.h"
 #include "procMgr.h"
 #include "vm_version.h"
-#include "vm_app.h"
 #include "message.h"
 
 #if defined(VMTOOLS_USE_GLIB)
diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index 892187bf0..8fd5627a6 100644
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -37,9 +37,9 @@
 #include "serviceObj.h"
 #include "system.h"
 #include "util.h"
-#include "vm_app.h"
 #include "vmcheck.h"
 #include "vmtools.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 
 /**
diff --git a/open-vm-tools/tests/testDebug/testDebug.c b/open-vm-tools/tests/testDebug/testDebug.c
index 81db1e983..676f714f6 100644
--- a/open-vm-tools/tests/testDebug/testDebug.c
+++ b/open-vm-tools/tests/testDebug/testDebug.c
@@ -27,10 +27,10 @@
 #define G_LOG_DOMAIN "testDebug"
 #include <glib-object.h>
 #include "util.h"
-#include "vm_app.h"
 #include "vmrpcdbg.h"
 #include "vmtools.h"
 #include "guestrpc/ghiGetBinaryHandlers.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 static gboolean
 TestDebugValidateReset(RpcInData *data, Bool ret);
diff --git a/open-vm-tools/tests/testPlugin/testPlugin.c b/open-vm-tools/tests/testPlugin/testPlugin.c
index 5ccb6cd50..ebfe2d889 100644
--- a/open-vm-tools/tests/testPlugin/testPlugin.c
+++ b/open-vm-tools/tests/testPlugin/testPlugin.c
@@ -31,7 +31,6 @@
 #include "testData.h"
 #include "util.h"
 #include "vmtoolsApp.h"
-#include "vm_app.h"
 #include "vmtools.h"
 #include "guestrpc/ghiGetBinaryHandlers.h"
 
diff --git a/open-vm-tools/toolbox/toolbox-gtk.c b/open-vm-tools/toolbox/toolbox-gtk.c
index aef1973e5..cc31dba16 100644
--- a/open-vm-tools/toolbox/toolbox-gtk.c
+++ b/open-vm-tools/toolbox/toolbox-gtk.c
@@ -29,7 +29,6 @@
 
 #include "toolboxGtkInt.h"
 #include "vm_assert.h"
-#include "vm_app.h"
 #include "eventManager.h"
 #include "guestApp.h"
 #if !defined(OPEN_VM_TOOLS)
@@ -48,6 +47,8 @@
 #include "toolboxgtk_version.h"
 #include "util.h"
 #include "system.h"
+#include "vmware/guestrpc/tclodefs.h"
+#include "vmware/guestrpc/timesync.h"
 
 #include "embed_version.h"
 VM_EMBED_VERSION(TOOLBOXGTK_VERSION_STRING);
diff --git a/open-vm-tools/toolbox/toolboxInt.h b/open-vm-tools/toolbox/toolboxInt.h
index 56b0685d4..00cb07800 100644
--- a/open-vm-tools/toolbox/toolboxInt.h
+++ b/open-vm-tools/toolbox/toolboxInt.h
@@ -37,7 +37,6 @@
 #include "wiper.h"
 #include "backdoor_def.h"
 #include "backdoor.h"
-#include "vm_app.h"
 
 
 #define MAX_DEVICES 50  /* maximum number of devices we'll show */
diff --git a/open-vm-tools/toolbox/toolboxOptions.c b/open-vm-tools/toolbox/toolboxOptions.c
index 329c41551..1a5a270b9 100644
--- a/open-vm-tools/toolbox/toolboxOptions.c
+++ b/open-vm-tools/toolbox/toolboxOptions.c
@@ -24,10 +24,11 @@
 
 #include "toolboxGtkInt.h"
 #include "vm_version.h"
-#include "vm_app.h"
 #include "guestApp.h"
 #include "vmcheck.h"
 #include "wiper.h"
+#include "vmware/guestrpc/tclodefs.h"
+#include "vmware/guestrpc/timesync.h"
 
 /*
  *-----------------------------------------------------------------------------
diff --git a/open-vm-tools/toolbox/toolboxcmd-time.c b/open-vm-tools/toolbox/toolboxcmd-time.c
index eb492942e..d7da95985 100644
--- a/open-vm-tools/toolbox/toolboxcmd-time.c
+++ b/open-vm-tools/toolbox/toolboxcmd-time.c
@@ -23,6 +23,8 @@
  */
 
 #include "toolboxCmdInt.h"
+#include "vmware/guestrpc/tclodefs.h"
+#include "vmware/guestrpc/timesync.h"
 
 
 /*
diff --git a/open-vm-tools/vmware-user/copyPaste.c b/open-vm-tools/vmware-user/copyPaste.c
index 201b6e4b3..9065ac8a5 100644
--- a/open-vm-tools/vmware-user/copyPaste.c
+++ b/open-vm-tools/vmware-user/copyPaste.c
@@ -67,7 +67,6 @@
 #include "debug.h"
 #include "str.h"
 #include "strutil.h"
-#include "vm_app.h"
 #include "eventManager.h"
 #include "guestApp.h"
 #include "dnd.h"
@@ -81,7 +80,7 @@
 #include "escape.h"
 #include "hostinfo.h"
 #include "wiper.h"
-
+#include "vmware/guestrpc/tclodefs.h"
 
 /*
  * Gtk 1.2 doesn't know about the CLIPBOARD selection, but that doesn't matter, we
diff --git a/open-vm-tools/vmware-user/copyPasteUI.cpp b/open-vm-tools/vmware-user/copyPasteUI.cpp
index e6f3bbd50..6a4e3c038 100644
--- a/open-vm-tools/vmware-user/copyPasteUI.cpp
+++ b/open-vm-tools/vmware-user/copyPasteUI.cpp
@@ -34,7 +34,6 @@
 extern "C" {
    #include "vmwareuserInt.h"
    #include "vmblock.h"
-   #include "vm_app.h"
    #include "file.h"
    #include "dnd.h"
    #include "dndMsg.h"
@@ -44,6 +43,7 @@ extern "C" {
    #include "cpNameUtil.h"
    #include "rpcout.h"
    #include "eventManager.h"
+   #include "vmware/guestrpc/tclodefs.h"
 }
 
 /*
diff --git a/open-vm-tools/vmware-user/dnd.c b/open-vm-tools/vmware-user/dnd.c
index 9a5f3aa95..bc9148963 100644
--- a/open-vm-tools/vmware-user/dnd.c
+++ b/open-vm-tools/vmware-user/dnd.c
@@ -122,7 +122,6 @@
 #include <X11/Xatom.h>                  /* for XA_WINDOW */
 
 #include "vmwareuserInt.h"
-#include "vm_app.h"
 #include "vm_assert.h"
 #include "vm_basic_defs.h"
 #include "eventManager.h"
@@ -139,7 +138,7 @@
 #include "hgfsServerPolicy.h"
 #include "vmblock.h"
 #include "escape.h"
-
+#include "vmware/guestrpc/tclodefs.h"
 
 #define DND_MAX_PATH                    6144
 #define DRAG_TARGET_NAME_URI_LIST       "text/uri-list"
diff --git a/open-vm-tools/vmware-user/dndUI.cpp b/open-vm-tools/vmware-user/dndUI.cpp
index f94224b2c..6079d43a5 100644
--- a/open-vm-tools/vmware-user/dndUI.cpp
+++ b/open-vm-tools/vmware-user/dndUI.cpp
@@ -28,7 +28,6 @@
 extern "C" {
 #include "vmwareuserInt.h"
 #include "vmblock.h"
-#include "vm_app.h"
 #include "file.h"
 #include "dnd.h"
 #include "dndMsg.h"
@@ -42,6 +41,7 @@ extern "C" {
 #include "unity.h"
 #include <gtk/gtk.h>
 #include <X11/extensions/XTest.h>       /* for XTest*() */
+#include "vmware/guestrpc/tclodefs.h"
 }
 
 #include "dndGuest.h"
diff --git a/open-vm-tools/vmware-user/pointer.c b/open-vm-tools/vmware-user/pointer.c
index 7f394f7c3..96da76404 100644
--- a/open-vm-tools/vmware-user/pointer.c
+++ b/open-vm-tools/vmware-user/pointer.c
@@ -30,9 +30,9 @@
 #include "debug.h"
 #include "str.h"
 #include "strutil.h"
-#include "vm_app.h"
 #include "guestApp.h"
 #include "eventManager.h"
+#include "vmware/guestrpc/tclodefs.h"
 
 static GuestAppAbsoluteMouseState absoluteMouseState = GUESTAPP_ABSMOUSE_UNKNOWN;
 static Bool mouseIsGrabbed;
diff --git a/open-vm-tools/vmware-user/vmware-user.cpp b/open-vm-tools/vmware-user/vmware-user.cpp
index 33efe4b52..d4515be15 100644
--- a/open-vm-tools/vmware-user/vmware-user.cpp
+++ b/open-vm-tools/vmware-user/vmware-user.cpp
@@ -42,7 +42,6 @@ extern "C" {
 
 #include "vmwareuserInt.h"
 #include "vm_assert.h"
-#include "vm_app.h"
 #include "eventManager.h"
 #include "hgfsServerManager.h"
 #include "vmcheck.h"
@@ -63,8 +62,8 @@ extern "C" {
 #include "vm_atomic.h"
 #include "hostinfo.h"
 #include "vmwareuser_version.h"
-
 #include "embed_version.h"
+#include "vmware/guestrpc/tclodefs.h"
 } // extern "C"
 VM_EMBED_VERSION(VMWAREUSER_VERSION_STRING);