4. remove updater wince support- Bug 386760 - directory removal with software update. r=dolske
authorRobert Strong <robert.bugzilla@gmail.com>
Mon, 11 Apr 2011 21:23:44 -0700
changeset 67958 47ceb2f1aac92dd2894fea5894ac616a07b513ae
parent 67957 8d0f07c4f8b7142df7def815bf21ac06c663ba6b
child 67959 f4f18866ee3a1273df9d9ea72892bad1df93041c
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske
bugs4, 386760
milestone2.2a1pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
4. remove updater wince support- Bug 386760 - directory removal with software update. r=dolske
toolkit/mozapps/update/updater/Makefile.in
toolkit/mozapps/update/updater/archivereader.cpp
toolkit/mozapps/update/updater/bspatch.cpp
toolkit/mozapps/update/updater/progressui_win.cpp
toolkit/mozapps/update/updater/updater_wince.cpp
toolkit/mozapps/update/updater/updater_wince.h
toolkit/mozapps/update/updater/updater_wince.rc
toolkit/mozapps/update/updater/updater_winmo.rc
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@@ -71,37 +71,16 @@ DEFINES += -DUNICODE -D_UNICODE
 ifndef GNU_CC
 RCFLAGS += -I$(srcdir)
 else
 RCFLAGS += --include-dir $(srcdir)
 endif
 
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-export NO_SHUNT = 1
-USE_STATIC_LIBS = 1
-HAVE_PROGRESSUI = 1
-CPPSRCS += \
-  updater_wince.cpp \
-  progressui_win.cpp \
-  $(NULL)
-OS_LIBS += $(call EXPAND_LIBNAME,commctrl ws2)
-ifdef WINCE_WINDOWS_MOBILE
-OS_LIBS += $(call EXPAND_LIBNAME,aygshell)
-RCINCLUDE = updater_winmo.rc
-else
-RCINCLUDE = updater_wince.rc
-endif
-DEFINES += -DUNICODE -D_UNICODE -DWINCE_SKIP_SHUNT_INCLUDE
-RCFLAGS += -I$(srcdir)
-LOCAL_INCLUDES += -I$(topsrcdir)/build/wince/shunt/include \
-                  -I$(topsrcdir)/build/wince/shunt
-endif
-
 ifneq ($(MOZ_ENABLE_GTK2),)
 HAVE_PROGRESSUI = 1
 CPPSRCS += \
   progressui_gtk.cpp \
   $(NULL)
 OS_CXXFLAGS += $(TK_CFLAGS)
 OS_LIBS += $(TK_LIBS)
 endif
@@ -124,22 +103,18 @@ MOZ_WINCONSOLE = 0
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DNS_NO_XPCOM
 
 ifdef _MSC_VER
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs:: updater.png
 	$(NSINSTALL) -D $(DIST)/bin/icons
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -148,14 +123,14 @@ libs::
 	rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/updater.app 
 	sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
 	  iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/updater.app/Contents/Resources/English.lproj/InfoPlist.strings
 	$(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/MacOS
 	$(NSINSTALL) $(DIST)/bin/updater $(DIST)/bin/updater.app/Contents/MacOS
 	rm -f $(DIST)/bin/updater
 endif
 
-ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))
+ifeq (,$(filter-out WINNT,$(OS_ARCH)))
 # Pick up nsWindowsRestart.cpp
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
 
 CXXFLAGS += $(BZ2_CFLAGS)
--- a/toolkit/mozapps/update/updater/archivereader.cpp
+++ b/toolkit/mozapps/update/updater/archivereader.cpp
@@ -44,20 +44,16 @@
 #include "errors.h"
 
 #if defined(XP_UNIX)
 # include <sys/types.h>
 #elif defined(XP_WIN)
 # include <io.h>
 #endif
 
-#ifdef WINCE
-#include "updater_wince.h"
-#endif
-
 static int inbuf_size  = 262144;
 static int outbuf_size = 262144;
 static char *inbuf  = NULL;
 static char *outbuf = NULL;
 
 int
 ArchiveReader::Open(const NS_tchar *path)
 {
--- a/toolkit/mozapps/update/updater/bspatch.cpp
+++ b/toolkit/mozapps/update/updater/bspatch.cpp
@@ -50,20 +50,16 @@
 #else
 # include <arpa/inet.h>
 #endif
 
 #ifndef SSIZE_MAX
 # define SSIZE_MAX LONG_MAX
 #endif
 
-#ifdef WINCE
-#include "updater_wince.h"
-#endif
-
 int
 MBS_ReadHeader(FILE* file, MBSPatchHeader *header)
 {
   size_t s = fread(header, 1, sizeof(MBSPatchHeader), file);
   if (s != sizeof(MBSPatchHeader))
     return READ_ERROR;
 
   header->slen      = ntohl(header->slen);
--- a/toolkit/mozapps/update/updater/progressui_win.cpp
+++ b/toolkit/mozapps/update/updater/progressui_win.cpp
@@ -39,29 +39,21 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdio.h>
 #include <windows.h>
 #include <commctrl.h>
 #include <process.h>
 #include <io.h>
 
-#ifdef WINCE_WINDOWS_MOBILE
-#include <aygshell.h>
-#endif
-
 #include "resource.h"
 #include "progressui.h"
 #include "readstrings.h"
 #include "errors.h"
 
-#ifdef WINCE
-#include "updater_wince.h"
-#endif
-
 #define TIMER_ID 1
 #define TIMER_INTERVAL 100
 
 #define RESIZE_WINDOW(hwnd, extrax, extray) \
   { \
     RECT windowSize; \
     GetWindowRect(hwnd, &windowSize); \
     SetWindowPos(hwnd, 0, 0, 0, windowSize.right - windowSize.left + extrax, \
@@ -177,98 +169,16 @@ InitDialog(HWND hDlg)
   // Get the control's font for calculating the new size for the control
   HDC hDCInfo = GetDC(hWndInfo);
   HFONT hInfoFont, hOldFont;
   hInfoFont = (HFONT)SendMessage(hWndInfo, WM_GETFONT, 0, 0);
 
   if (hInfoFont)
     hOldFont = (HFONT)SelectObject(hDCInfo, hInfoFont);
 
-  // There are three scenarios that need to be handled differently
-  // 1. Windows Mobile where dialog should be full screen.
-  // 2. Windows CE where the dialog might wrap.
-  // 3. Windows where the dialog should never wrap. The Windows CE and Windows
-  //    scenarios could be combined but then we would have to calculate the
-  //    extra border space added by the Aero theme which just adds complexity.
-#ifdef WINCE
-#ifdef WINCE_WINDOWS_MOBILE
-  RECT rcDlgInner1, rcDlgInner2, rcInfoOuter1, rcInfoOuter2;
-  // The dialog's client rectangle and the window rectangle for the text before
-  // making the dialog full screen are needed to calculate the change in border
-  // sizes.
-  GetClientRect(hDlg, &rcDlgInner1);
-  GetWindowRect(hWndInfo, &rcInfoOuter1);
-
-  // Make the dialog fullscreen
-  SHINITDLGINFO shidi;
-  shidi.dwMask = SHIDIM_FLAGS;
-  shidi.dwFlags = SHIDIF_SIZEDLGFULLSCREEN;
-  shidi.hDlg = hDlg;
-  SHInitDialog(&shidi);
-  if (!SHInitDialog(&shidi))
-    return;
-
-  // Hide the OK button
-  SHDoneButton(hDlg, SHDB_HIDE);
-
-  GetClientRect(hDlg, &rcDlgInner2);
-  GetWindowRect(hWndInfo, &rcInfoOuter2);
-  textSize.left = 0;
-  // Calculate the maximum possible width for the text by adding to the
-  // existing text rectangle's window width the change in the dialog rectangle's
-  // client width and the change in the text rectangle's window left position
-  // after the dialog has been made full screen.
-  textSize.right = (rcInfoOuter2.right - rcInfoOuter2.left) + \
-                   (rcDlgInner2.right - rcDlgInner1.right) + \
-                   (rcInfoOuter1.left - rcInfoOuter2.left);
-#else
-  RECT rcWorkArea, rcInfoOuter1;
-  GetWindowRect(hWndInfo, &rcInfoOuter1);
-  SystemParametersInfo(SPI_GETWORKAREA, NULL, &rcWorkArea, NULL);
-  textSize.left = 0;
-  // Calculate the maximum possible width for the text by subtracting from the
-  // existing working area's width the text rectangle's margin.
-  textSize.right = (rcWorkArea.right - rcWorkArea.left) - \
-                   (rcInfoOuter1.left + rcInfoOuter1.right);
-#endif
-  // Measure the space needed for the text allowing multiple lines if necessary.
-  // DT_CALCRECT means nothing is drawn.
-  if (DrawText(hDCInfo, szwInfo, -1, &textSize,
-               DT_CALCRECT | DT_NOCLIP | DT_WORDBREAK)) {
-    GetClientRect(hWndInfo, &infoSize);
-    SIZE extra;
-    // Calculate the additional space needed for the text by subtracting from
-    // the rectangle returned by DrawText the existing client rectangle's width
-    // and height.
-    extra.cx = (textSize.right - textSize.left) - \
-               (infoSize.right - infoSize.left);
-    extra.cy = (textSize.bottom - textSize.top) - \
-               (infoSize.bottom - infoSize.top);
-    // XXX rstrong - add 2 pixels to the width to prevent the text from wrapping
-    // due to Windows CE and Windows Mobile adding an extra pixel to the
-    // beginning and the end of the text. Though I have found no good reason for
-    // this it has been consistent with multiple font sizes.
-    extra.cx += 2;
-
-    RESIZE_WINDOW(hWndInfo, extra.cx, extra.cy);
-    RESIZE_WINDOW(hWndPro, extra.cx, 0);
-
-#ifdef WINCE_WINDOWS_MOBILE
-    // Move the controls 1 pixel to the left on Windows Mobile to compensate for
-    // the 2 extra pixels added to the controls above. This isn't needed on
-    // Windows CE for reasons of the unknown variety.
-    MOVE_WINDOW(hWndInfo, -1, 0);
-    MOVE_WINDOW(hWndPro, -1, extra.cy);
-#else
-    RESIZE_WINDOW(hDlg, extra.cx, extra.cy);
-    MOVE_WINDOW(hWndPro, 0, extra.cy);
-#endif
-  }
-
-#else
   // Measure the space needed for the text on a single line. DT_CALCRECT means
   // nothing is drawn.
   if (DrawText(hDCInfo, szwInfo, -1, &textSize,
                DT_CALCRECT | DT_NOCLIP | DT_SINGLELINE)) {
     GetClientRect(hWndInfo, &infoSize);
     SIZE extra;
     // Calculate the additional space needed for the text by subtracting from
     // the rectangle returned by DrawText the existing client rectangle's width
@@ -283,28 +193,22 @@ InitDialog(HWND hDlg)
       extra.cy = 0;
     if ((extra.cx > 0) || (extra.cy > 0)) {
       RESIZE_WINDOW(hDlg, extra.cx, extra.cy);
       RESIZE_WINDOW(hWndInfo, extra.cx, extra.cy);
       RESIZE_WINDOW(hWndPro, extra.cx, 0);
       MOVE_WINDOW(hWndPro, 0, extra.cy);
     }
   }
-#endif
 
   if (hOldFont)
     SelectObject(hDCInfo, hOldFont);
 
   ReleaseDC(hWndInfo, hDCInfo);
 
-  // On Windows Mobile the dialog is full screen so don't center it.
-#ifndef WINCE_WINDOWS_MOBILE
-  CenterDialog(hDlg);  // make dialog appear in the center of the screen
-#endif
-
   SetTimer(hDlg, TIMER_ID, TIMER_INTERVAL, NULL);
 }
 
 // Message handler for update dialog.
 static LRESULT CALLBACK
 DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   switch (message)
deleted file mode 100644
--- a/toolkit/mozapps/update/updater/updater_wince.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Application Update..
- *
- * The Initial Developer of the Original Code is
- * Brad Lassey <blassey@mozilla.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <windows.h>
-#include "updater_wince.h"
-#include "environment.cpp"
-
-# define F_OK 00
-# define W_OK 02
-# define R_OK 04
-
-int errno = 0;
-
-int chmod(const char* path, unsigned int mode) 
-{
-  WCHAR wpath[MAX_PATH];
-  MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, MAX_PATH);
-  return _wchmod(wpath, mode);
-}
-
-int _wchmod(const WCHAR* path, unsigned int mode) 
-{
-  return SetFileAttributesW(path, FILE_ATTRIBUTE_NORMAL) ? 0 : 1;
-}
-
-int fstat(FILE* handle, struct stat* buff)
-{
-  int position = ftell(handle);
-  if (position < 0)
-    return -1;
-
-  if (fseek(handle, 0, SEEK_END) < 0)
-    return -1;
-
-  buff->st_size = ftell(handle);
-
-  if (fseek(handle, position, SEEK_SET) < 0)
-    return -1;
-
-  if (buff->st_size < 0)
-    return -1;
-
-  buff->st_mode = _S_IFREG | _S_IREAD | _S_IWRITE | _S_IEXEC;
-  /* can't get time from a file handle on wince */
-  buff->st_ctime = 0;
-  buff->st_atime = 0;
-  buff->st_mtime = 0;
-  return 0;
-}
-
-int stat(const char* path, struct stat* buf) 
-{
-  FILE* f = fopen(path, "r");
-  int rv = fstat(f, buf);
-  fclose(f);
-  return rv;
-}
-
-int _wstat(const WCHAR* path, struct stat* buf) 
-{
-  FILE* f = _wfopen(path, L"r");
-  int rv = fstat(f, buf);
-  fclose(f);
-  return rv;
-}
-
-int _wmkdir(const WCHAR* path) 
-{
-  DWORD dwAttr = GetFileAttributesW(path);
-  if (dwAttr != INVALID_FILE_ATTRIBUTES)
-    return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ? 0 : -1;
-  return CreateDirectoryW(path, NULL) ? 0 : -1;
-}
-
-FILE* fileno(FILE* f) 
-{
-  return f;
-}
-
-int _access(const char* path, int amode) 
-{
-  WCHAR wpath[MAX_PATH];
-  MultiByteToWideChar(CP_ACP,
-		      0,
-		      path,
-		      -1,
-		      wpath,
-		      MAX_PATH );
-  return _waccess(wpath, amode);
-}
-
-int _waccess(const WCHAR* path, int amode)
-{
-  if (amode == F_OK || amode == R_OK)
-    return (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) ? -1 : 0;
-  return -1;
-}
-
-int _wremove(const WCHAR* wpath) 
-{
-  if (DeleteFileW(wpath)) 
-  {
-    return 0;
-  } 
-  else if (GetLastError() == ERROR_ACCESS_DENIED) {
-    return RemoveDirectoryW(wpath) ? 0:-1;
-  } 
-  else {
-    return -1;
-  }
-}
deleted file mode 100644
--- a/toolkit/mozapps/update/updater/updater_wince.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Application Update..
- *
- * The Initial Developer of the Original Code is
- * Brad Lassey <blassey@mozilla.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef UPDATER_WINCE_H
-#define UPDATER_WINCE_H
-
-#include "environment.h"
-
-#define _S_IFDIR    0040000 /* stat, is a directory */
-#define _S_IFREG    0100000 /* stat, is a normal file */
-#define _S_IREAD    0000400 /* stat, can read */
-#define _S_IWRITE   0000200 /* stat, can write */
-#define _S_IEXEC    0000100
-
-#define _putenv putenv
-
-struct stat {
-  unsigned short st_mode;
-  size_t st_size;
-  time_t st_ctime;
-  time_t st_atime;
-  time_t st_mtime;
-};
-extern int errno;
-int _wchmod(const WCHAR* path, unsigned int mode);
-int fstat(FILE* handle, struct stat* buff);
-int stat(const char* path, struct stat* buf);
-int _wstat(const WCHAR* path, struct stat* buf);
-int _wmkdir(const WCHAR* path);
-int access(const char* path, int amode);
-int _waccess(const WCHAR* path, int amode);
-int _wremove(const WCHAR* wpath);
-
-#endif
deleted file mode 100644
--- a/toolkit/mozapps/update/updater/updater_wince.rc
+++ /dev/null
@@ -1,103 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winuser.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-IDI_DIALOG ICON "updater.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG DIALOG 0, 0, 153, 41
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL         "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,7,24,139,10
-    LTEXT           "",IDC_INFO,7,8,139,13,SS_NOPREFIX
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 146
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 39
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winuser.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
deleted file mode 100644
--- a/toolkit/mozapps/update/updater/updater_winmo.rc
+++ /dev/null
@@ -1,106 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winuser.h"
-#include "aygshell.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-IDI_DIALOG ICON "updater.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG DIALOG 0, 0, 153, 41
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_NONAVDONEBUTTON
-EXSTYLE 0x80000000L
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL         "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,7,20,139,10
-    LTEXT           "",IDC_INFO,7,4,139,13,SS_NOPREFIX
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 146
-        TOPMARGIN, 3
-        BOTTOMMARGIN, 39
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winuser.h""\r\n"
-    "#include ""aygshell.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-