]> source.dussan.org Git - tigervnc.git/commitdiff
Fix WinVNC so that it embeds and serves up the Java viewer whenever BUILD_JAVA=1
authorDRC <dcommander@users.sourceforge.net>
Wed, 5 Oct 2011 09:29:21 +0000 (09:29 +0000)
committerDRC <dcommander@users.sourceforge.net>
Wed, 5 Oct 2011 09:29:21 +0000 (09:29 +0000)
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4704 3789f03b-4d11-0410-bbf8-ca57d06f2519

java/src/CMakeLists.txt
win/winvnc/CMakeLists.txt
win/winvnc/JavaViewer.cxx
win/winvnc/index.vnc
win/winvnc/winvnc.rc [deleted file]
win/winvnc/winvnc.rc.in [new file with mode: 0644]

index 7048dd91e609bdf1999bba0bb36ab423a13571fe..a6b4ec8a2cc7b314481b3d1a92fc59a0d3aef848 100644 (file)
@@ -73,6 +73,7 @@ add_custom_command(OUTPUT ${JAVA_BINDIR}/tigervnc.ico
   DEPENDS ${JAVA_SRCDIR}/tigervnc.ico)
 
 string(REGEX REPLACE "jar" "" Java_PATH ${Java_JAR_EXECUTABLE})
+string(REGEX REPLACE ".exe" "" Java_PATH ${Java_PATH})
 
 add_custom_command(OUTPUT VncViewer.jar
   DEPENDS ${JAVA_CLASSES_FULL}
@@ -98,8 +99,10 @@ add_custom_command(OUTPUT VncViewer.jar
 
 add_custom_target(java ALL DEPENDS VncViewer.jar)
 
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar
-  ${JAVA_SRCDIR}/README
-  ${JAVA_SRCDIR}/index.vnc
-  DESTINATION vnc/classes)
+if(NOT WIN32)
+  install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar
+    ${JAVA_SRCDIR}/README
+    ${JAVA_SRCDIR}/index.vnc
+    DESTINATION vnc/classes)
+endif()
index 811492c2e7612fa1e49a3c7d94c201d3616995ac..6b873c71700530c623c1e9ab1b175226f44dfd4d 100644 (file)
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_BINARY_DIR}/win)
+include_directories(${CMAKE_BINARY_DIR}/win ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Disable auto-generated manifests, since we have our own
 if(MSVC)
@@ -10,6 +10,11 @@ add_library(wm_hooks SHARED
        ../wm_hooks/wm_hooks.def
        ../wm_hooks/wm_hooks.rc)
 
+string(REGEX REPLACE "/" "\\\\\\\\" CMAKE_WIN_BINARY_DIR ${CMAKE_BINARY_DIR})
+string(REGEX REPLACE "/" "\\\\\\\\" CMAKE_WIN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+
+configure_file(winvnc.rc.in winvnc.rc)
+
 add_executable(winvnc4 WIN32
   buildTime.cxx
   ControlPanel.cxx
@@ -20,10 +25,15 @@ add_executable(winvnc4 WIN32
   VNCServerService.cxx
   VNCServerWin32.cxx
   winvnc.cxx
-  winvnc.rc)
+  ${CMAKE_CURRENT_BINARY_DIR}/winvnc.rc)
 
 target_link_libraries(winvnc4 rfb rfb_win32 Xregion network rdr ws2_32.lib)
 
+if(BUILD_JAVA)
+  set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/winvnc.rc
+    PROPERTIES OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/java/src/VncViewer.jar)
+endif()
+
 install(TARGETS winvnc4
   RUNTIME DESTINATION .
 )
index ca9c285f7a777f5d6faa6508e09c8b112645c615..39ff915a5d67bacf319dcefcbed3c22123977af1 100644 (file)
@@ -94,5 +94,10 @@ char* JavaViewerServer::substitute(const char* varName)
   if (strcmp(varName, "$DESKTOP") == 0) {
     return rfb::strDup(server->getName());
   }
+  if (strcmp(varName, "$USER") == 0) {
+    char tempStr[256];  DWORD tempStrLen = 256;
+    GetUserName(tempStr, &tempStrLen);
+    return rfb::strDup(tempStr);
+  }
   return 0;
 }
index aecb61316d154887e0b5f005aeb0a63c4c6571d7..428d4bc89f73a2a19fa1ab99c3e3354caa59f714 100644 (file)
@@ -1,13 +1,20 @@
+<!-- 
+     index.vnc - default HTML page for TigerVNC Java viewer applet, to be
+     used with WinVNC. On any file ending in .vnc, the HTTP server embedded in
+     WinVNC will substitute the following variables when preceded by a dollar:
+     USER, DESKTOP, APPLETWIDTH, APPLETHEIGHT, WIDTH, HEIGHT, PORT,
+     Use two dollar signs ($$) to get a dollar sign in the generated
+     HTML page.
+-->
+
 <HTML>
-<HEAD>
 <TITLE>
-VNC viewer for Java
+$USER's $DESKTOP desktop
 </TITLE>
-</HEAD>
-<BODY>
-<APPLET CODE=vncviewer/VNCViewer.class ARCHIVE=vncviewer.jar
-        WIDTH=400 HEIGHT=250>
-<PARAM name="port" value="$PORT">
+<APPLET CODE=com.tigervnc.vncviewer.VncViewer ARCHIVE=VncViewer.jar
+        WIDTH=$APPLETWIDTH HEIGHT=$APPLETHEIGHT>
+<param name=PORT value=$PORT>
 </APPLET>
-</BODY>
+<BR>
+<A href="http://www.tigervnc.org/">TigerVNC site</A>
 </HTML>
diff --git a/win/winvnc/winvnc.rc b/win/winvnc/winvnc.rc
deleted file mode 100644 (file)
index 9c50350..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-#include "resdefs.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "windows.h"
-
-#ifndef IDC_STATIC
-#define IDC_STATIC -1
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""windows.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __RCVERSION
- PRODUCTVERSION __RCVERSION
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "TigerVNC Project\0"
-            #ifdef WIN64
-            VALUE "FileDescription", "TigerVNC Server for Win64\0"
-            VALUE "ProductName", "TigerVNC Server for Win64\0"
-            #else
-            VALUE "FileDescription", "TigerVNC Server for Win32\0"
-            VALUE "ProductName", "TigerVNC Server for Win32\0"
-            #endif
-            VALUE "FileVersion", __RCVERSIONSTR
-            VALUE "InternalName", "winvnc\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0"
-            VALUE "LegalTrademarks", "TigerVNC\0"
-            VALUE "OriginalFilename", "winvnc4.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductVersion", __VERSIONSTR
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x809, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON                ICON    DISCARDABLE     "winvnc.ico"
-IDI_CONNECTED           ICON    DISCARDABLE     "connected.ico"
-IDI_ICON_DISABLE        ICON    DISCARDABLE     "icon_dis.ico"
-IDI_CONNECTED_DISABLE   ICON    DISCARDABLE     "connecte.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_TRAY MENU DISCARDABLE 
-BEGIN
-    POPUP "Tray Menu"
-    BEGIN
-        MENUITEM "Control &Panel",              ID_CONTR0L_PANEL
-        MENUITEM SEPARATOR
-        MENUITEM "&Options...",                 ID_OPTIONS
-        MENUITEM "Add &New Client...",          ID_CONNECT
-        MENUITEM "&Disconnect Clients",         ID_DISCONNECT
-        MENUITEM "D&isable New Clients",        ID_DISABLE_NEW_CLIENTS
-        MENUITEM SEPARATOR
-        MENUITEM "&Close VNC Server",           ID_CLOSE
-        MENUITEM "&About...",                   ID_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUT DIALOG DISCARDABLE  0, 0, 300, 92
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "About TigerVNC Server for Windows"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,245,70,47,15
-    CONTROL         109,IDC_STATIC,"Static",SS_BITMAP,5,10,33,31
-    LTEXT           ">appname<",IDC_DESCRIPTION,45,10,125,15
-    LTEXT           ">version<",IDC_VERSION,170,10,72,15
-    LTEXT           ">buildtime<",IDC_BUILDTIME,45,25,202,15
-    LTEXT           ">copyright<",IDC_COPYRIGHT,45,40,256,15
-    LTEXT           "See http://www.tigervnc.org for more information on VNC.",
-                    IDC_STATIC,45,55,202,15
-END
-
-IDD_QUERY_CONNECT DIALOG DISCARDABLE  0, 0, 164, 93
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "VNC Server : Accept Connection?"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "&Reject",IDCANCEL,105,72,52,14
-    PUSHBUTTON      "&Accept",IDOK,7,72,53,14
-    RTEXT           "User:",IDC_STATIC,7,10,28,15,SS_CENTERIMAGE
-    RTEXT           "Host:",IDC_STATIC,7,30,28,15,SS_CENTERIMAGE
-    CTEXT           "Seconds until automatic reject:",IDC_STATIC,7,50,113,15,
-                    SS_CENTERIMAGE
-    LTEXT           "-",IDC_QUERY_COUNTDOWN,125,50,32,15,SS_CENTERIMAGE
-    LTEXT           "-",IDC_QUERY_USER,40,10,117,15,SS_CENTERIMAGE
-    LTEXT           "-",IDC_QUERY_HOST,40,30,117,15,SS_CENTERIMAGE
-END
-
-IDD_ADD_NEW_CLIENT DIALOG DISCARDABLE  0, 0, 177, 52
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "VNC Server : Add New Client"
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_HOST,80,10,90,15,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,80,31,40,14
-    PUSHBUTTON      "Cancel",IDCANCEL,125,31,45,14
-    CONTROL         109,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,7,
-                    10,33,31
-    RTEXT           "Viewer:",IDC_STATIC,45,10,30,15,SS_CENTERIMAGE
-END
-
-IDD_CONTROL_PANEL DIALOG DISCARDABLE  0, 0, 267, 238
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | DS_CONTEXTHELP | 
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Control Panel"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "List1",IDC_LIST_CONNECTIONS,"SysListView32",LVS_REPORT | 
-                    LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | 
-                    WS_BORDER | WS_TABSTOP,7,25,253,76
-    LTEXT           "Authorised clients list",IDC_STATIC_KLIENTS_LIST,87,7,
-                    74,11,SS_CENTERIMAGE
-    GROUPBOX        "Control of selected clients",
-                    IDC_STATIC_SELECTED_KLIENTS,7,108,124,103
-    PUSHBUTTON      "View-only",IDC_VIEW_ONLY,13,121,111,14
-    PUSHBUTTON      "Full control ",IDC_FULL_CONTROL,13,145,112,14
-    PUSHBUTTON      "Stop updating",IDC_STOP_UPDATE,13,167,111,14
-    PUSHBUTTON      "Kill Clients",IDC_KILL_SEL_CLIENT,13,190,111,14
-    PUSHBUTTON      "Properties",IDC_PROPERTIES,144,121,111,14
-    PUSHBUTTON      "Add New Client",IDC_ADD_CLIENT,144,145,111,14
-    PUSHBUTTON      "Kill All Clients",IDC_KILL_ALL,144,167,111,14
-    CONTROL         "Disable New Clients",IDC_DISABLE_CLIENTS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,144,191,111,13
-    PUSHBUTTON      "Close",IDCANCEL,144,217,111,14
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// HTTPFILE
-//
-
-//VNCVIEWER.JAR          HTTPFILE DISCARDABLE    "..\\..\\java\\src\\com\\tigervnc\\vncviewer\\VncViewer.jar"
-//INDEX.VNC              HTTPFILE DISCARDABLE    "index.vnc"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 24
-//
-
-#ifdef WIN64
-IDR_MANIFEST            24      DISCARDABLE     "winvnc4.exe.manifest64"
-#else
-IDR_MANIFEST            24      DISCARDABLE     "winvnc4.exe.manifest"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 5
-        VERTGUIDE, 45
-        VERTGUIDE, 170
-        VERTGUIDE, 195
-        VERTGUIDE, 242
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 85
-        HORZGUIDE, 10
-        HORZGUIDE, 25
-        HORZGUIDE, 40
-        HORZGUIDE, 55
-        HORZGUIDE, 70
-    END
-
-    IDD_QUERY_CONNECT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 157
-        VERTGUIDE, 35
-        VERTGUIDE, 40
-        VERTGUIDE, 60
-        VERTGUIDE, 120
-        VERTGUIDE, 125
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 86
-        HORZGUIDE, 10
-        HORZGUIDE, 25
-        HORZGUIDE, 30
-        HORZGUIDE, 45
-        HORZGUIDE, 50
-        HORZGUIDE, 65
-    END
-
-    IDD_ADD_NEW_CLIENT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 170
-        VERTGUIDE, 45
-        VERTGUIDE, 75
-        VERTGUIDE, 80
-        VERTGUIDE, 120
-        VERTGUIDE, 125
-        VERTGUIDE, 170
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 45
-        HORZGUIDE, 10
-        HORZGUIDE, 25
-        HORZGUIDE, 30
-        HORZGUIDE, 45
-    END
-
-    IDD_CONTROL_PANEL, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 260
-        VERTGUIDE, 13
-        VERTGUIDE, 124
-        VERTGUIDE, 144
-        VERTGUIDE, 255
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 231
-        HORZGUIDE, 121
-        HORZGUIDE, 135
-        HORZGUIDE, 145
-        HORZGUIDE, 159
-        HORZGUIDE, 181
-        HORZGUIDE, 191
-        HORZGUIDE, 204
-        HORZGUIDE, 217
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BITMAP              BITMAP  DISCARDABLE     "winvnc.bmp"
-#endif    // English (U.K.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/win/winvnc/winvnc.rc.in b/win/winvnc/winvnc.rc.in
new file mode 100644 (file)
index 0000000..9352006
--- /dev/null
@@ -0,0 +1,341 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+#include "resdefs.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "windows.h"
+
+#ifndef IDC_STATIC
+#define IDC_STATIC -1
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.K.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""windows.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __RCVERSION
+ PRODUCTVERSION __RCVERSION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080904b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "TigerVNC Project\0"
+            #ifdef WIN64
+            VALUE "FileDescription", "TigerVNC Server for Win64\0"
+            VALUE "ProductName", "TigerVNC Server for Win64\0"
+            #else
+            VALUE "FileDescription", "TigerVNC Server for Win32\0"
+            VALUE "ProductName", "TigerVNC Server for Win32\0"
+            #endif
+            VALUE "FileVersion", __RCVERSIONSTR
+            VALUE "InternalName", "winvnc\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0"
+            VALUE "LegalTrademarks", "TigerVNC\0"
+            VALUE "OriginalFilename", "winvnc4.exe\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductVersion", __VERSIONSTR
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x809, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON                ICON    DISCARDABLE     "winvnc.ico"
+IDI_CONNECTED           ICON    DISCARDABLE     "connected.ico"
+IDI_ICON_DISABLE        ICON    DISCARDABLE     "icon_dis.ico"
+IDI_CONNECTED_DISABLE   ICON    DISCARDABLE     "connecte.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_TRAY MENU DISCARDABLE 
+BEGIN
+    POPUP "Tray Menu"
+    BEGIN
+        MENUITEM "Control &Panel",              ID_CONTR0L_PANEL
+        MENUITEM SEPARATOR
+        MENUITEM "&Options...",                 ID_OPTIONS
+        MENUITEM "Add &New Client...",          ID_CONNECT
+        MENUITEM "&Disconnect Clients",         ID_DISCONNECT
+        MENUITEM "D&isable New Clients",        ID_DISABLE_NEW_CLIENTS
+        MENUITEM SEPARATOR
+        MENUITEM "&Close VNC Server",           ID_CLOSE
+        MENUITEM "&About...",                   ID_ABOUT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUT DIALOG DISCARDABLE  0, 0, 300, 92
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "About TigerVNC Server for Windows"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,245,70,47,15
+    CONTROL         109,IDC_STATIC,"Static",SS_BITMAP,5,10,33,31
+    LTEXT           ">appname<",IDC_DESCRIPTION,45,10,125,15
+    LTEXT           ">version<",IDC_VERSION,170,10,72,15
+    LTEXT           ">buildtime<",IDC_BUILDTIME,45,25,202,15
+    LTEXT           ">copyright<",IDC_COPYRIGHT,45,40,256,15
+    LTEXT           "See http://www.tigervnc.org for more information on VNC.",
+                    IDC_STATIC,45,55,202,15
+END
+
+IDD_QUERY_CONNECT DIALOG DISCARDABLE  0, 0, 164, 93
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "VNC Server : Accept Connection?"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "&Reject",IDCANCEL,105,72,52,14
+    PUSHBUTTON      "&Accept",IDOK,7,72,53,14
+    RTEXT           "User:",IDC_STATIC,7,10,28,15,SS_CENTERIMAGE
+    RTEXT           "Host:",IDC_STATIC,7,30,28,15,SS_CENTERIMAGE
+    CTEXT           "Seconds until automatic reject:",IDC_STATIC,7,50,113,15,
+                    SS_CENTERIMAGE
+    LTEXT           "-",IDC_QUERY_COUNTDOWN,125,50,32,15,SS_CENTERIMAGE
+    LTEXT           "-",IDC_QUERY_USER,40,10,117,15,SS_CENTERIMAGE
+    LTEXT           "-",IDC_QUERY_HOST,40,30,117,15,SS_CENTERIMAGE
+END
+
+IDD_ADD_NEW_CLIENT DIALOG DISCARDABLE  0, 0, 177, 52
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | 
+    WS_CAPTION | WS_SYSMENU
+CAPTION "VNC Server : Add New Client"
+FONT 8, "MS Sans Serif"
+BEGIN
+    EDITTEXT        IDC_HOST,80,10,90,15,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,80,31,40,14
+    PUSHBUTTON      "Cancel",IDCANCEL,125,31,45,14
+    CONTROL         109,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,7,
+                    10,33,31
+    RTEXT           "Viewer:",IDC_STATIC,45,10,30,15,SS_CENTERIMAGE
+END
+
+IDD_CONTROL_PANEL DIALOG DISCARDABLE  0, 0, 267, 238
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | DS_CONTEXTHELP | 
+    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Control Panel"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "List1",IDC_LIST_CONNECTIONS,"SysListView32",LVS_REPORT | 
+                    LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | 
+                    WS_BORDER | WS_TABSTOP,7,25,253,76
+    LTEXT           "Authorised clients list",IDC_STATIC_KLIENTS_LIST,87,7,
+                    74,11,SS_CENTERIMAGE
+    GROUPBOX        "Control of selected clients",
+                    IDC_STATIC_SELECTED_KLIENTS,7,108,124,103
+    PUSHBUTTON      "View-only",IDC_VIEW_ONLY,13,121,111,14
+    PUSHBUTTON      "Full control ",IDC_FULL_CONTROL,13,145,112,14
+    PUSHBUTTON      "Stop updating",IDC_STOP_UPDATE,13,167,111,14
+    PUSHBUTTON      "Kill Clients",IDC_KILL_SEL_CLIENT,13,190,111,14
+    PUSHBUTTON      "Properties",IDC_PROPERTIES,144,121,111,14
+    PUSHBUTTON      "Add New Client",IDC_ADD_CLIENT,144,145,111,14
+    PUSHBUTTON      "Kill All Clients",IDC_KILL_ALL,144,167,111,14
+    CONTROL         "Disable New Clients",IDC_DISABLE_CLIENTS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,144,191,111,13
+    PUSHBUTTON      "Close",IDCANCEL,144,217,111,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// HTTPFILE
+//
+
+/VNCVIEWER.JAR          HTTPFILE DISCARDABLE    "@CMAKE_WIN_BINARY_DIR@\\java\\src\\VncViewer.jar"
+/INDEX.VNC              HTTPFILE DISCARDABLE    "@CMAKE_WIN_SOURCE_DIR@\\win\\winvnc\\index.vnc"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// 24
+//
+
+#ifdef WIN64
+IDR_MANIFEST            24      DISCARDABLE     "winvnc4.exe.manifest64"
+#else
+IDR_MANIFEST            24      DISCARDABLE     "winvnc4.exe.manifest"
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_ABOUT, DIALOG
+    BEGIN
+        LEFTMARGIN, 5
+        VERTGUIDE, 45
+        VERTGUIDE, 170
+        VERTGUIDE, 195
+        VERTGUIDE, 242
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 85
+        HORZGUIDE, 10
+        HORZGUIDE, 25
+        HORZGUIDE, 40
+        HORZGUIDE, 55
+        HORZGUIDE, 70
+    END
+
+    IDD_QUERY_CONNECT, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 157
+        VERTGUIDE, 35
+        VERTGUIDE, 40
+        VERTGUIDE, 60
+        VERTGUIDE, 120
+        VERTGUIDE, 125
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 86
+        HORZGUIDE, 10
+        HORZGUIDE, 25
+        HORZGUIDE, 30
+        HORZGUIDE, 45
+        HORZGUIDE, 50
+        HORZGUIDE, 65
+    END
+
+    IDD_ADD_NEW_CLIENT, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 170
+        VERTGUIDE, 45
+        VERTGUIDE, 75
+        VERTGUIDE, 80
+        VERTGUIDE, 120
+        VERTGUIDE, 125
+        VERTGUIDE, 170
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 45
+        HORZGUIDE, 10
+        HORZGUIDE, 25
+        HORZGUIDE, 30
+        HORZGUIDE, 45
+    END
+
+    IDD_CONTROL_PANEL, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 260
+        VERTGUIDE, 13
+        VERTGUIDE, 124
+        VERTGUIDE, 144
+        VERTGUIDE, 255
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 231
+        HORZGUIDE, 121
+        HORZGUIDE, 135
+        HORZGUIDE, 145
+        HORZGUIDE, 159
+        HORZGUIDE, 181
+        HORZGUIDE, 191
+        HORZGUIDE, 204
+        HORZGUIDE, 217
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP              BITMAP  DISCARDABLE     "winvnc.bmp"
+#endif    // English (U.K.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+