Changeset 1453

Timestamp:

Sep 13, 2009, 1:24:37 AM (16 years ago)

Author:

Gregg Young

Message:

Avoid (?spurrious error) when dragging multiple files from a pmmail mail message. (ticket 391)

File:

• trunk/dll/draglist.c (modified) (4 diffs)

trunk/dll/draglist.c

@@ -23 +23 @@
   29 Feb 08 GKY Use xmallocz where appropriate
   08 Mar 09 GKY Additional strings move to PCSZs
+  12 Sep 09 GKY Fix (probably spurrious) error message generated on drag of
+                items from a pmmail mail message (PMERR_INVALID_PARAMETER)
 
 ***********************************************************************/
@@ -70 +72 @@
 VOID FreeDragInfoData (HWND hwnd, PDRAGINFO pDInfo)
 {
-  PDRAGITEM pDItem;
-  ULONG cDitem;
-  ULONG curitem;
-  APIRET ok;
-
-# ifdef USE_FAST_FREE
+
+# ifdef  USE_FAST_FREE
   if (!DrgDeleteDraginfoStrHandles(pDInfo)) {
     Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
@@ -81 +79 @@
   }
 # else // The slow way
+  PDRAGITEM pDItem;
+  ULONG cDitem;
+  ULONG curitem;
+  APIRET ok;
+
   cDitem = DrgQueryDragitemCount(pDInfo);
   for (curitem = 0; curitem < cDitem; curitem++) {
@@ -91 +94 @@
       ok = DrgDeleteStrHandle(pDItem->hstrType);
       if (!ok) {
-        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                      "DrgDeleteStrHandle(0x%x) hstrType",pDItem->hstrType);
+        HAB hab = WinQueryAnchorBlock(hwnd);
+        PERRINFO pErrInfoBlk = WinGetErrorInfo(hab);
+        if (ERRORIDERROR(pErrInfoBlk->idError) != PMERR_INVALID_PARAMETER)
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    "DrgDeleteStrHandle(0x%x) hstrType",pDItem->hstrType);
       }
       ok = DrgDeleteStrHandle(pDItem->hstrRMF);
       if (!ok) {
-        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                      "DrgDeleteStrHandle(0x%x) hstrRMF",pDItem->hstrRMF);
+        HAB hab = WinQueryAnchorBlock(hwnd);
+        PERRINFO pErrInfoBlk = WinGetErrorInfo(hab);
+        if (ERRORIDERROR(pErrInfoBlk->idError) != PMERR_INVALID_PARAMETER)
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    "DrgDeleteStrHandle(0x%x) hstrRMF",pDItem->hstrRMF);
       }
       ok = DrgDeleteStrHandle(pDItem->hstrContainerName);
       if (!ok) {
-        Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                      "DrgDeleteStrHandle(0x%x) hstrContainerName",pDItem->hstrContainerName);
+        HAB hab = WinQueryAnchorBlock(hwnd);
+        PERRINFO pErrInfoBlk = WinGetErrorInfo(hab);
+        if (ERRORIDERROR(pErrInfoBlk->idError) != PMERR_INVALID_PARAMETER)
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    "DrgDeleteStrHandle(0x%x) hstrContainerName",pDItem->hstrContainerName);
       }
       ok = DrgDeleteStrHandle(pDItem->hstrSourceName);