Changeset 1770 for trunk/dll/arccnrs.c

Timestamp:

Mar 30, 2014, 11:14:46 PM (11 years ago)

Author:

Gregg Young

Message:

Change to lzip code to allow a list file entry to work. Ticket 537

File:

• trunk/dll/arccnrs.c (modified) (16 diffs)

trunk/dll/arccnrs.c

@@ -224 +224 @@
  *  This function should only be used for runemf2 calls that include the WAIT flag
  */
-VOID WaitChildThread(VOID * arg) /*FOLD00*/
+VOID WaitChildThread(VOID * arg)
 {
   WAITCHILD *WaitChild;
@@ -265 +265 @@
 }
 
-static MRESULT EXPENTRY ArcErrProc(HWND hwnd, ULONG msg, MPARAM mp1, /*FOLD00*/
+static MRESULT EXPENTRY ArcErrProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                    MPARAM mp2)
 {
@@ -358 +358 @@
 }
 
-static SHORT APIENTRY ArcSort(PMINIRECORDCORE pmrc1, PMINIRECORDCORE pmrc2, /*FOLD00*/
+static SHORT APIENTRY ArcSort(PMINIRECORDCORE pmrc1, PMINIRECORDCORE pmrc2,
                               PVOID pStorage)
 {
@@ -436 +436 @@
 }
 
-static INT APIENTRY ArcFilter(PMINIRECORDCORE rmini, PVOID arg) /*FOLD00*/
+static INT APIENTRY ArcFilter(PMINIRECORDCORE rmini, PVOID arg)
 {
   DIRCNRDATA *dcd = (DIRCNRDATA *) arg;
@@ -471 +471 @@
 }
 
-static MRESULT EXPENTRY ArcFrameWndProc(HWND hwnd, ULONG msg, MPARAM mp1, /*FOLD00*/
+static MRESULT EXPENTRY ArcFrameWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                         MPARAM mp2)
 {
@@ -477 +477 @@
 }
 
-static BOOL IsArcThere(HWND hwnd, CHAR * arcname) /*FOLD00*/
+static BOOL IsArcThere(HWND hwnd, CHAR * arcname)
 {
   if (arcname) {
@@ -496 +496 @@
  */
 
-static VOID FreeArcItemData(PARCITEM pai) /*FOLD00*/
+static VOID FreeArcItemData(PARCITEM pai)
 {
   // DbgMsg(pszSrcFile, __LINE__, "FreeArcItemData %p", pai);
@@ -514 +514 @@
  */
 
-static VOID RemoveArcItems(HWND hwnd, PARCITEM paiFirst, USHORT usCnt, USHORT usFlags) /*FOLD00*/
+static VOID RemoveArcItems(HWND hwnd, PARCITEM paiFirst, USHORT usCnt, USHORT usFlags)
 {
   INT remaining = usCnt;
@@ -560 +560 @@
  */
 
-static VOID EmptyArcCnr(HWND hwnd) /*FOLD00*/
+static VOID EmptyArcCnr(HWND hwnd)
 {
 #if 0 // fixme to be gone or to be configurable
@@ -1006 +1006 @@
   return numarcfiles;
 } // FillArcCnr
-MRESULT EXPENTRY ArcTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) /*FOLD00*/
+MRESULT EXPENTRY ArcTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   static BOOL emphasized = FALSE;
@@ -1329 +1329 @@
 }
 
-MRESULT EXPENTRY ArcClientWndProc(HWND hwnd, ULONG msg, MPARAM mp1, /*FOLD00*/
+MRESULT EXPENTRY ArcClientWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                   MPARAM mp2)
 {
@@ -1434 +1434 @@
 }
 
-MRESULT EXPENTRY ArcObjWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) /*FOLD00*/
+MRESULT EXPENTRY ArcObjWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   DIRCNRDATA *dcd;
@@ -2288 +2288 @@
 }
 
-static MRESULT EXPENTRY ArcCnrWndProc(HWND hwnd, ULONG msg, MPARAM mp1, /*FOLD00*/
+static MRESULT EXPENTRY ArcCnrWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                       MPARAM mp2)
 {
@@ -3561 +3561 @@
 }
 
-MRESULT EXPENTRY ArcCnrMenuProc(HWND hwnd, ULONG msg, MPARAM mp1, /*FOLD00*/
+MRESULT EXPENTRY ArcCnrMenuProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                      MPARAM mp2)
 {
@@ -3648 +3648 @@
 }
 
-HWND StartArcCnr(HWND hwndParent, HWND hwndCaller, CHAR * arcname, INT flags, /*FOLD00*/
+HWND StartArcCnr(HWND hwndParent, HWND hwndCaller, CHAR * arcname, INT flags,
                  ARC_TYPE * sinfo)
 {
@@ -3669 +3669 @@
 
   if (strrchr(arcname, '.')) {
-    if (!stricmp(strrchr(arcname, '.') + 1, "LZ")) {
+    if (!stricmp(strrchr(arcname, '.') + 1, "LZ") && info->list == NULL) {
       saymsg(MB_ENTER | MB_ICONASTERISK, HWND_DESKTOP, GetPString(IDS_LZIPLIMITATION),
              GetPString(IDS_LZIPNOLIST));