Changes in shared code that don't affect open-vm-tools functionality.

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

diff --git a/open-vm-tools/lib/include/appUtil.h b/open-vm-tools/lib/include/appUtil.h
index edaa09b2adf52df46d5e76d0820c3b32d7e4edf7..140e3e7fddbc4e305614de2da8591a63e8dc919b 100644 (file)
--- a/open-vm-tools/lib/include/appUtil.h
+++ b/open-vm-tools/lib/include/appUtil.h
@@ -46,16 +46,15 @@ extern "C" {
 #define APPUTIL_ICON_SMALL 16
 #define APPUTIL_ICON_BIG 32
 
-
-typedef struct _AppUtilIconEntry {
-   uint32 width;
-   uint32 height;
-   uint32 widthBytes;
-   uint32 dataLength;
-   unsigned char *dataBGRA;
+typedef struct AppUtilIconEntry {
+   uint32 width;            // width of icon in pixels
+   uint32 height;           // height of icon in pixels
+   uint32 widthBytes;       // width of one row in bytes, including padding
+   uint32 dataLength;       // length of bgra data, in bytes
+   unsigned char *dataBGRA; // pointer to bgra data
 } AppUtilIconEntry;
 
-typedef struct _AppUtilIconInfo {
+typedef struct AppUtilIconInfo {
    uint32 numEntries;
    AppUtilIconEntry *iconList;
 } AppUtilIconInfo;
@@ -85,20 +84,30 @@ HICON AppUtil_GetWindowIcon(HWND hwnd,
                             uint32 iconSize);
 
 void AppUtil_BuildGlobalApplicationList(void);
+
 char *AppUtil_ActionURIForCommandLine(const WCHAR *commandLineUtf16);
+
 Bool AppUtil_GetLinkIconData(const TCHAR *path,
                              AppUtilIconInfo *iconInfo,
                              AppUtilBitmapOrigin dibOrientation);
-Bool AppUtil_GetAppIconData(HWND hwnd,
-                            const TCHAR *path,
+
+Bool AppUtil_GetAppIconData(const TCHAR *path,
                             AppUtilIconInfo *iconInfo,
                             AppUtilBitmapOrigin dibOrientation);
 
-Bool
-AppUtil_GetIconIndexAndLocationForShortcut(const TCHAR *shortcut,
-                                           int maxLen,
-                                           TCHAR *iconFile,
-                                           int *iconIndex);
+Bool AppUtil_LoadIcon(HMODULE module,
+                      LPCWSTR resID,
+                      AppUtilBitmapOrigin origin,
+                      AppUtilIconInfo *icon);
+
+Bool AppUtil_CopyIcon(const AppUtilIconInfo *srcIcon, AppUtilIconInfo *dstIcon);
+
+void AppUtil_DestroyIcon(AppUtilIconInfo *icon);
+
+Bool AppUtil_GetIconIndexAndLocationForShortcut(const TCHAR *shortcut,
+                                                int maxLen,
+                                                TCHAR *iconFile,
+                                                int *iconIndex);
 
 LPSTR  AppUtil_ToLowerUtf8(LPCSTR s);
 LPWSTR AppUtil_ToLowerUtf16(LPCWSTR s);

diff --git a/open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h b/open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h
index 8cdd435c5794b06519788cb31e0b269a80c82fd2..68b3e14723426335b621880a54d420404420715b 100644 (file)
--- a/open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h
+++ b/open-vm-tools/services/plugins/unity/unitylib/unityPlatform.h
@@ -60,9 +60,6 @@ Bool UnityPlatformGetWindowPath(UnityPlatform *up,
                                 UnityWindowId window,
                                 DynBuf *windowPathUtf8,
                                 DynBuf *execPathUtf8);
-Bool UnityPlatformGetNativeWindowPath(UnityPlatform *up,
-                                      UnityWindowId window,
-                                      DynBuf *buf);
 Bool UnityPlatformGetBinaryInfo(UnityPlatform *up,
                                 const char *pathUtf8,
                                 DynBuf *buf);