Changeset 21554 for trunk/src

Timestamp:

Jan 11, 2011, 11:47:27 PM (15 years ago)

Author:

dmik

Message:

Fixed broken indentation.

File:

• trunk/src/ole32/ole2.c (modified) (18 diffs)

trunk/src/ole32/ole2.c

@@ -562 +562 @@
 
   hwndTrackWindow = CreateWindowA(OLEDD_DRAGTRACKERCLASS,
-                                    "TrackerWindow",
-                                    WS_POPUP,
-                                    CW_USEDEFAULT, CW_USEDEFAULT,
-                                    CW_USEDEFAULT, CW_USEDEFAULT,
-                                    0,
-                                    0,
-                                    0,
-                                    (LPVOID)&trackerInfo);
+                                  "TrackerWindow",
+                                  WS_POPUP,
+                                  CW_USEDEFAULT, CW_USEDEFAULT,
+                                  CW_USEDEFAULT, CW_USEDEFAULT,
+                                  0,
+                                  0,
+                                  0,
+                                  (LPVOID)&trackerInfo);
 
   if (hwndTrackWindow!=0)
@@ -588 +588 @@
     {
       if ( (msg.message >= WM_KEYFIRST) &&
-           (msg.message <= WM_KEYLAST) )
+           (msg.message <= WM_KEYLAST) )
       {
 #ifdef __WIN32OS2__
         dprintf(("dragloop: key msg %x\n", msg.message));
 #endif
-        /*
-         * When keyboard messages are sent to windows on this thread, we
-         * want to ignore notify the drop source that the state changed.
-         * in the case of the Escape key, we also notify the drop source
-         * we give it a special meaning.
-         */
-        if ( (msg.message==WM_KEYDOWN) &&
-             (msg.wParam==VK_ESCAPE) )
-        {
-          trackerInfo.escPressed = TRUE;
-        }
-
-        /*
-         * Notify the drop source.
-         */
-        OLEDD_TrackStateChange(&trackerInfo,
-                               msg.pt,
-                               OLEDD_GetButtonState());
+        /*
+         * When keyboard messages are sent to windows on this thread, we
+         * want to ignore notify the drop source that the state changed.
+         * in the case of the Escape key, we also notify the drop source
+         * we give it a special meaning.
+         */
+        if ( (msg.message==WM_KEYDOWN) &&
+             (msg.wParam==VK_ESCAPE) )
+        {
+          trackerInfo.escPressed = TRUE;
+        }
+
+        /*
+         * Notify the drop source.
+         */
+        OLEDD_TrackStateChange(&trackerInfo,
+                               msg.pt,
+                               OLEDD_GetButtonState());
       }
       else
@@ -617 +617 @@
         dprintf(("dragloop: dispmsg %x\n", msg.message));
 #endif
-        /*
-         * Dispatch the messages only when it's not a keyboard message.
-         */
-        DispatchMessageA(&msg);
+        /*
+         * Dispatch the messages only when it's not a keyboard message.
+         */
+        DispatchMessageA(&msg);
       }
     }
@@ -1524 +1524 @@
             }
         }
-    }   
+    }
 
     WARN_(accel)("couldn't translate accelerator key\n");
@@ -1559 +1559 @@
           DeleteFileW(pmedium->u.lpszFileName);
         }
-        
+
         CoTaskMemFree(pmedium->u.lpszFileName);
       }
@@ -1896 +1896 @@
        * Track the movement of the mouse.
        */
-      #ifdef __WIN32OS2__
+#ifdef __WIN32OS2__
       wParam = OLEDD_GetButtonState();
-      #endif
+#endif
       OLEDD_TrackMouseMove(trackerInfo, mousePos, wParam);
 
@@ -2001 +2001 @@
 #endif
     IDropTarget_DragOver(trackerInfo->curDragTarget,
-                         keyState,
-                         mousePosParam,
-                         trackerInfo->pdwEffect);
+                         keyState,
+                         mousePosParam,
+                         trackerInfo->pdwEffect);
 #ifdef __WIN32OS2__
-    TRACE("OLEDD_TrackMouseMove: IDropTarget_DragEnter -> %x, *pdwEffect=%x\n", hr, *trackerInfo->pdwEffect);
+      TRACE("OLEDD_TrackMouseMove: IDropTarget_DragOver -> %x, *pdwEffect=%x\n", hr, *trackerInfo->pdwEffect);
 #endif
   }
@@ -2039 +2039 @@
 
       do {
-        newDropTargetNode = OLEDD_FindDropTarget(nexttar);
-      } while (!newDropTargetNode && (nexttar = GetParent(nexttar)) != 0);
-      if(nexttar) hwndNewTarget = nexttar;
+        newDropTargetNode = OLEDD_FindDropTarget(nexttar);
+      }
+      while (!newDropTargetNode && (nexttar = GetParent(nexttar)) != 0);
+
+      if (nexttar)
+        hwndNewTarget = nexttar;
 
       trackerInfo->curDragTargetHWND = hwndNewTarget;
@@ -2051 +2054 @@
       if (trackerInfo->curDragTarget!=0)
       {
-        POINTL  mousePosParam;
-        
-        /*
-         * The documentation tells me that the coordinate should be in the target
-         * window's coordinate space. However, the tests I made tell me the
-         * coordinates should be in screen coordinates.
-         */
-        mousePosParam.x = mousePos.x;
-        mousePosParam.y = mousePos.y;
-        
+        POINTL  mousePosParam;
+
+        /*
+         * The documentation tells me that the coordinate should be in the target
+         * window's coordinate space. However, the tests I made tell me the
+         * coordinates should be in screen coordinates.
+         */
+        mousePosParam.x = mousePos.x;
+        mousePosParam.y = mousePos.y;
+
 #ifdef __WIN32OS2__
         hr =
 #endif
-        IDropTarget_DragEnter(trackerInfo->curDragTarget,
-                              trackerInfo->dataObject,
-                              keyState,
-                              mousePosParam,
-                              trackerInfo->pdwEffect);
+        IDropTarget_DragEnter(trackerInfo->curDragTarget,
+                              trackerInfo->dataObject,
+                              keyState,
+                              mousePosParam,
+                              trackerInfo->pdwEffect);
 #ifdef __WIN32OS2__
         TRACE("OLEDD_TrackMouseMove: IDropTarget_DragEnter -> %x, *pdwEffect=%x\n", hr, *trackerInfo->pdwEffect);
@@ -2189 +2192 @@
       switch (trackerInfo->returnValue)
       {
-        /*
-         * If the source wants us to complete the operation, we tell
-         * the drop target that we just dropped the object in it.
-         */
+        /*
+         * If the source wants us to complete the operation, we tell
+         * the drop target that we just dropped the object in it.
+         */
         case DRAGDROP_S_DROP:
-        {
-          POINTL  mousePosParam;
-        
-          /*
-           * The documentation tells me that the coordinate should be
-           * in the target window's coordinate space. However, the tests
-           * I made tell me the coordinates should be in screen coordinates.
-           */
-          mousePosParam.x = mousePos.x;
-          mousePosParam.y = mousePos.y;
-        
-          IDropTarget_Drop(trackerInfo->curDragTarget,
-                           trackerInfo->dataObject,
-                           keyState,
-                           mousePosParam,
-                           trackerInfo->pdwEffect);
-          break;
-        }
-        /*
-         * If the source told us that we should cancel, fool the drop
-         * target by telling it that the mouse left it's window.
-         * Also set the drop effect to "NONE" in case the application
-         * ignores the result of DoDragDrop.
-         */
+        {
+          POINTL  mousePosParam;
+
+          /*
+           * The documentation tells me that the coordinate should be
+           * in the target window's coordinate space. However, the tests
+           * I made tell me the coordinates should be in screen coordinates.
+           */
+          mousePosParam.x = mousePos.x;
+          mousePosParam.y = mousePos.y;
+
+          IDropTarget_Drop(trackerInfo->curDragTarget,
+                           trackerInfo->dataObject,
+                           keyState,
+                           mousePosParam,
+                           trackerInfo->pdwEffect);
+          break;
+        }
+        /*
+         * If the source told us that we should cancel, fool the drop
+         * target by telling it that the mouse left it's window.
+         * Also set the drop effect to "NONE" in case the application
+         * ignores the result of DoDragDrop.
+         */
         case DRAGDROP_S_CANCEL:
-          IDropTarget_DragLeave(trackerInfo->curDragTarget);
-          *trackerInfo->pdwEffect = DROPEFFECT_NONE;
-          break;
+          IDropTarget_DragLeave(trackerInfo->curDragTarget);
+          *trackerInfo->pdwEffect = DROPEFFECT_NONE;
+          break;
 
 #ifdef __WIN32OS2__
@@ -2699 +2702 @@
         IEnumFORMATETCImpl* ef;
         DWORD size=cfmt * sizeof(FORMATETC);
-        
+
         ef=(IEnumFORMATETCImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumFORMATETCImpl));
 
@@ -2855 +2858 @@
           ICOM_VTBL(dto) = &dtovt;
         }
-        
+
         return (LPDATAOBJECT)dto;
 }
@@ -2959 +2962 @@
 {
         ICOM_THIS(IDataObjectImpl,iface);
-        
+
     dprintf(("IDataObject_fnGetDataHere %x %x STUB", pformatetc, pmedium));
         return E_NOTIMPL;
@@ -2968 +2971 @@
         ICOM_THIS(IDataObjectImpl,iface);
         UINT i;
-        
+
         dprintf(("IDataObject_fnQueryGetData (%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed));
-        
+
         if(!(DVASPECT_CONTENT & pformatetc->dwAspect))
           return DV_E_DVASPECT;
@@ -2993 +2996 @@
 {
         ICOM_THIS(IDataObjectImpl,iface);
-        
+
     dprintf(("IDataObject_fnGetCanonicalFormatEtc STUB"));
     return DATA_S_SAMEFORMATETC;
@@ -3075 +3078 @@
           return (*ppenumFormatEtc) ? S_OK : E_FAIL;
         }
-        
+
         return E_NOTIMPL;
 }
@@ -3433 +3436 @@
       if(IDataObject_EnumFormatEtc(pDataObject, DATADIR_GET, &enumfmt) == S_OK) {
           for (;;) {
-        
+
              FORMATETC tmp;
              ULONG     actual = 1, res;
@@ -3621 +3624 @@
           ICOM_VTBL(dto) = &droptarget;
         }
-        
+
         return (IDropTarget *)dto;
 }