[ 683924 ] Same binaries for directory compare

diff --git a/Src/Diff.cpp b/Src/Diff.cpp
index 827a6ad..cba08ca 100644 (file)
--- a/Src/Diff.cpp
+++ b/Src/Diff.cpp
@@ -497,9 +497,11 @@ compare_files (LPCTSTR dir0, LPCTSTR name0,
            }
            else 
            {
-                       val = 0;
-                       //pCtx->AddDiff(name0, dir0, dir1, inf[0].stat.st_mtime, inf[1].stat.st_mtime, FILE_SAME);
-                       //      if (gWriteLog) gLog.Write(_T("\tidentical.\r\n"));
+                       // To not add as same file
+                       // This should be done more cleanly in future
+                       val = 1;
+                       pCtx->AddDiff(name0, dir0, dir1, inf[0].stat.st_mtime, inf[1].stat.st_mtime, FILE_BINSAME);
+                       gLog.Write(_T("\tsame binary.\r\n"));
            }
        }
        else

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index e9dc4b8..fc30148 100644 (file)
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -25,14 +25,15 @@ typedef struct tagDIFFITEM {
        BYTE code;
 }DIFFITEM;
 
-#define FILE_LUNIQUE           0
-#define FILE_RUNIQUE           1
-#define FILE_DIFF              2
-#define FILE_SAME              3
-#define FILE_ERROR             4
-#define FILE_BINDIFF   5
-#define FILE_LDIRUNIQUE                6
-#define FILE_RDIRUNIQUE                7
+#define FILE_LUNIQUE     0
+#define FILE_RUNIQUE     1
+#define FILE_DIFF        2
+#define FILE_SAME        3
+#define FILE_ERROR       4
+#define FILE_BINSAME     5
+#define FILE_BINDIFF     6
+#define FILE_LDIRUNIQUE  7
+#define FILE_RDIRUNIQUE  8
 
 class IDiffStatus
 {

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index 0531bbb..1fb70f4 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -81,6 +81,7 @@ void CDirView::DoCopyFileToLeft()
                        act.src = srFile;
                        act.dest = slFile;
                        act.idx = sel;
+                       act.code = di.code;
                        act.dirflag = IsItemCodeDir(di.code);
                        actionList.actions.AddTail(act);
                }
@@ -106,6 +107,7 @@ void CDirView::DoCopyFileToRight()
                        act.dest = srFile;
                        act.dirflag = IsItemCodeDir(di.code);
                        act.idx = sel;
+                       act.code = di.code;
                        actionList.actions.AddTail(act);
                }
                ++actionList.selcount;
@@ -130,6 +132,7 @@ void CDirView::DoDelLeft()
                        act.src = slFile;
                        act.dirflag = IsItemCodeDir(di.code);
                        act.idx = sel;
+                       act.code = di.code;
                        actionList.actions.AddTail(act);
                }
                ++actionList.selcount;
@@ -154,6 +157,7 @@ void CDirView::DoDelRight()
                        act.src = srFile;
                        act.dirflag = IsItemCodeDir(di.code);
                        act.idx = sel;
+                       act.code = di.code;
                        actionList.actions.AddTail(act);
                }
                ++actionList.selcount;
@@ -179,6 +183,7 @@ void CDirView::DoDelBoth()
                        act.dest = slFile;
                        act.dirflag = IsItemCodeDir(di.code);
                        act.idx = sel;
+                       act.code = di.code;
                        actionList.actions.AddTail(act);
                }
                ++actionList.selcount;
@@ -291,7 +296,10 @@ void CDirView::PerformAndRemoveTopAction(ActionList & actionList)
                        // copy single file, and update status immediately
                        if (mf->SyncFiles(act.src, act.dest, &s))
                        {
-                               mf->UpdateCurrentFileStatus(FILE_SAME, act.idx);
+                               if (act.code == FILE_BINDIFF)
+                                       mf->UpdateCurrentFileStatus(FILE_BINSAME, act.idx);
+                               else
+                                       mf->UpdateCurrentFileStatus(FILE_SAME, act.idx);
                        }
                        else
                        {
@@ -420,6 +428,7 @@ BOOL CDirView::IsItemDeletableOnLeft(int code)
        {
        case FILE_LUNIQUE:
        case FILE_DIFF:
+       case FILE_BINSAME:
        case FILE_BINDIFF:
        case FILE_SAME:
        case FILE_LDIRUNIQUE:
@@ -434,6 +443,7 @@ BOOL CDirView::IsItemDeletableOnRight(int code)
        {
        case FILE_RUNIQUE:
        case FILE_DIFF:
+       case FILE_BINSAME:
        case FILE_BINDIFF:
        case FILE_SAME:
        case FILE_RDIRUNIQUE:
@@ -447,6 +457,7 @@ BOOL CDirView::IsItemDeletableOnBoth(int code)
        switch(code)
        {
        case FILE_DIFF:
+       case FILE_BINSAME:
        case FILE_BINDIFF:
        case FILE_SAME:
                return TRUE;
@@ -461,6 +472,7 @@ BOOL CDirView::IsItemOpenableOnLeft(int code)
        {
        case FILE_LUNIQUE:
        case FILE_DIFF:
+       case FILE_BINSAME:
        case FILE_BINDIFF:
        case FILE_SAME:
                return TRUE;
@@ -474,6 +486,7 @@ BOOL CDirView::IsItemOpenableOnRight(int code)
        {
        case FILE_RUNIQUE:
        case FILE_DIFF:
+       case FILE_BINSAME:
        case FILE_BINDIFF:
        case FILE_SAME:
                return TRUE;

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index bc13d6f..0fcfa31 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -232,6 +232,7 @@ void CDirDoc::Redisplay()
                                p = _tcsninc(di.lpath, llen);
                        }
                        break;
+               case FILE_BINSAME:
                case FILE_BINDIFF:
                        if (mf->m_bShowDiff
                                && (!mf->m_bHideBak || !FileExtMatches(di.filename,BACKUP_FILE_EXT)))
@@ -352,6 +353,10 @@ void CDirDoc::UpdateItemStatus(UINT nIdx)
                VERIFY(s.LoadString(IDS_BIN_FILES_DIFF));
                SetItemStatus(nIdx, s, FILE_BINDIFF, &di.ltime, &di.rtime);
                break;
+       case FILE_BINSAME:
+               VERIFY(s.LoadString(IDS_BIN_FILES_SAME));
+               SetItemStatus(nIdx, s, FILE_BINSAME, &di.ltime, &di.rtime);
+               break;
        case FILE_LUNIQUE:
        case FILE_LDIRUNIQUE:
                AfxFormatString1(s, IDS_ONLY_IN_FMT, di.lpath);

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index ca528d0..bf8c8df 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -179,7 +179,10 @@ void CDirView::OnInitialUpdate()
        VERIFY (bm.LoadBitmap (IDB_UNKNOWN));
        VERIFY (-1 != m_imageList.Add (&bm, RGB (255, 255, 255)));
        bm.Detach();
-       VERIFY (bm.LoadBitmap (IDB_BINARY));
+       VERIFY (bm.LoadBitmap (IDB_BINARYSAME));
+       VERIFY (-1 != m_imageList.Add (&bm, RGB (255, 255, 255)));
+       bm.Detach();
+       VERIFY (bm.LoadBitmap (IDB_BINARYDIFF));
        VERIFY (-1 != m_imageList.Add (&bm, RGB (255, 255, 255)));
        bm.Detach();
        VERIFY (bm.LoadBitmap (IDB_LFOLDER));
@@ -516,6 +519,7 @@ void CDirView::OpenSelection()
                        }
                        break;
                case FILE_BINDIFF:
+               case FILE_BINSAME:
                        {
                                CString s;
                                VERIFY(s.LoadString(IDS_FILEBINARY));

diff --git a/Src/DirView.h b/Src/DirView.h
index cddbbaf..d7000df 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -79,7 +79,7 @@ public:
 // Implementation types
 private:
        typedef enum { ACT_COPY=1, ACT_DEL_LEFT, ACT_DEL_RIGHT, ACT_DEL_BOTH } ACT_TYPE;
-       struct action { CString src; CString dest; BOOL dirflag; int idx; };
+       struct action { CString src; CString dest; BOOL dirflag; int idx; BYTE code;};
        typedef CList<int, int> DeletedItemList; // indices into display list control
        struct ActionList
        {

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 36252c7..c7cec43 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -993,6 +993,7 @@ END
 STRINGTABLE DISCARDABLE 
 BEGIN
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
+    IDS_BIN_FILES_SAME      "Binary files are identical"
 END
 
 #endif    // English (U.S.) resources

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 1f4050a..edce683 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -87,17 +87,20 @@
 #define IDS_ERROR_BACKUP                188
 #define IDS_CONFIRM_COPY_SINGLE         189
 #define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
-#define IDB_BINARY                      217
+#define IDB_BINARYSAME                  217
+
 #define IDB_LFILE                       218
 #define IDB_RFILE                       219
 #define IDB_SPLASH                      220
 #define IDB_WINMERGE                    221
 #define IDB_OLDSPLASH                   222
 #define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
 
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
@@ -322,7 +325,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_RESOURCE_VALUE        225
 #define _APS_NEXT_COMMAND_VALUE         32817
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           108

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 1f4050a..edce683 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -87,17 +87,20 @@
 #define IDS_ERROR_BACKUP                188
 #define IDS_CONFIRM_COPY_SINGLE         189
 #define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
-#define IDB_BINARY                      217
+#define IDB_BINARYSAME                  217
+
 #define IDB_LFILE                       218
 #define IDB_RFILE                       219
 #define IDB_SPLASH                      220
 #define IDB_WINMERGE                    221
 #define IDB_OLDSPLASH                   222
 #define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
 
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
@@ -322,7 +325,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_RESOURCE_VALUE        225
 #define _APS_NEXT_COMMAND_VALUE         32817
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           108

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 1f4050a..edce683 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -87,17 +87,20 @@
 #define IDS_ERROR_BACKUP                188
 #define IDS_CONFIRM_COPY_SINGLE         189
 #define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
-#define IDB_BINARY                      217
+#define IDB_BINARYSAME                  217
+
 #define IDB_LFILE                       218
 #define IDB_RFILE                       219
 #define IDB_SPLASH                      220
 #define IDB_WINMERGE                    221
 #define IDB_OLDSPLASH                   222
 #define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
 
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
@@ -322,7 +325,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_RESOURCE_VALUE        225
 #define _APS_NEXT_COMMAND_VALUE         32817
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           108

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 1f4050a..edce683 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -87,17 +87,20 @@
 #define IDS_ERROR_BACKUP                188
 #define IDS_CONFIRM_COPY_SINGLE         189
 #define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
-#define IDB_BINARY                      217
+#define IDB_BINARYSAME                  217
+
 #define IDB_LFILE                       218
 #define IDB_RFILE                       219
 #define IDB_SPLASH                      220
 #define IDB_WINMERGE                    221
 #define IDB_OLDSPLASH                   222
 #define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
 
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
@@ -322,7 +325,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_RESOURCE_VALUE        225
 #define _APS_NEXT_COMMAND_VALUE         32817
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           108

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 1f4050a..edce683 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -87,17 +87,20 @@
 #define IDS_ERROR_BACKUP                188
 #define IDS_CONFIRM_COPY_SINGLE         189
 #define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
-#define IDB_BINARY                      217
+#define IDB_BINARYSAME                  217
+
 #define IDB_LFILE                       218
 #define IDB_RFILE                       219
 #define IDB_SPLASH                      220
 #define IDB_WINMERGE                    221
 #define IDB_OLDSPLASH                   222
 #define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
 
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
@@ -322,7 +325,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_RESOURCE_VALUE        225
 #define _APS_NEXT_COMMAND_VALUE         32817
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           108

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 1f4050a..edce683 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -87,17 +87,20 @@
 #define IDS_ERROR_BACKUP                188
 #define IDS_CONFIRM_COPY_SINGLE         189
 #define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
-#define IDB_BINARY                      217
+#define IDB_BINARYSAME                  217
+
 #define IDB_LFILE                       218
 #define IDB_RFILE                       219
 #define IDB_SPLASH                      220
 #define IDB_WINMERGE                    221
 #define IDB_OLDSPLASH                   222
 #define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
 
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
@@ -322,7 +325,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_RESOURCE_VALUE        225
 #define _APS_NEXT_COMMAND_VALUE         32817
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           108

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 1f4050a..edce683 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -87,17 +87,20 @@
 #define IDS_ERROR_BACKUP                188
 #define IDS_CONFIRM_COPY_SINGLE         189
 #define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
-#define IDB_BINARY                      217
+#define IDB_BINARYSAME                  217
+
 #define IDB_LFILE                       218
 #define IDB_RFILE                       219
 #define IDB_SPLASH                      220
 #define IDB_WINMERGE                    221
 #define IDB_OLDSPLASH                   222
 #define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
 
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
@@ -322,7 +325,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_RESOURCE_VALUE        225
 #define _APS_NEXT_COMMAND_VALUE         32817
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           108

diff --git a/Src/Merge.rc b/Src/Merge.rc
index f9a080a..fbc04c6 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -570,9 +570,10 @@ IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"
 IDB_UNKNOWN             BITMAP  DISCARDABLE     "res\\unknown.bmp"
-IDB_BINARY              BITMAP  DISCARDABLE     "res\\binary.bmp"
+IDB_BINARYSAME          BITMAP  DISCARDABLE     "res\\binary.bmp"
 IDB_LFILE               BITMAP  DISCARDABLE     "res\\lfile.bmp"
 IDB_RFILE               BITMAP  DISCARDABLE     "res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP  DISCARDABLE     "res\\binarydiff.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1017,6 +1018,7 @@ END
 STRINGTABLE DISCARDABLE 
 BEGIN
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
+    IDS_BIN_FILES_SAME      "Binary files are identical"
 END
 
 #endif    // English (U.S.) resources

diff --git a/Src/readme.txt b/Src/readme.txt
index 8741aa3..0975d00 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,5 +1,6 @@
 2003-02-11  Perry
  Fixing recent SplitFilename & directory concat problems.
+ [ 683924 ] Same binaries for directory compare.
 
 2003-02-10  Perry
  Kimmo's fix for crash due to NULL doc pointer in MergeDoc::SaveHelper.

diff --git a/Src/res/binarydiff.bmp b/Src/res/binarydiff.bmp
new file mode 100755 (executable)
index 0000000..ce1ac70
Binary files /dev/null and b/Src/res/binarydiff.bmp differ

diff --git a/Src/resource.h b/Src/resource.h
index 1f4050a..edce683 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -87,17 +87,20 @@
 #define IDS_ERROR_BACKUP                188
 #define IDS_CONFIRM_COPY_SINGLE         189
 #define IDS_CONFIRM_DELETE_SINGLE       190
+#define IDS_BIN_FILES_SAME              191
 #define IDB_EQUAL                       213
 #define IDB_NOTEQUAL                    214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
-#define IDB_BINARY                      217
+#define IDB_BINARYSAME                  217
+
 #define IDB_LFILE                       218
 #define IDB_RFILE                       219
 #define IDB_SPLASH                      220
 #define IDB_WINMERGE                    221
 #define IDB_OLDSPLASH                   222
 #define IDB_LFOLDER                     223
+#define IDB_BINARYDIFF                  224
 
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
@@ -322,7 +325,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_RESOURCE_VALUE        225
 #define _APS_NEXT_COMMAND_VALUE         32817
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           108