Fix some issues found looking at the code....

base/base_drop_target.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <windows.h>
+#include "base/base_drop_target.h"
+
 #include <shlobj.h>
 
-#include "base/base_drop_target.h"
-
 #include "base/logging.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 IDropTargetHelper* BaseDropTarget::cached_drop_target_helper_ = NULL;
 
 BaseDropTarget::BaseDropTarget(HWND hwnd)
-    : suspend_(false),
-      ref_count_(0),
-      hwnd_(hwnd) {
+    : hwnd_(hwnd),
+      suspend_(false),
+      ref_count_(0) {
   DCHECK(hwnd);
   HRESULT result = RegisterDragDrop(hwnd, this);
+  DCHECK(SUCCEEDED(result));
 }
 
 BaseDropTarget::~BaseDropTarget() {

[Dean McNamee, 2008/09/30 20:47:26]

Maybe just put this on one line

[cpu_(ooo_6.6-7.5), 2008/09/30 23:35:05]

I rather have a way to put a breakpoint in the dtor

+  
 }
 
 // static
 IDropTargetHelper* BaseDropTarget::DropHelper() {
   if (!cached_drop_target_helper_) {
     CoCreateInstance(CLSID_DragDropHelper, 0, CLSCTX_INPROC_SERVER,
                      IID_IDropTargetHelper,
                      reinterpret_cast<void**>(&cached_drop_target_helper_));
   }
   return cached_drop_target_helper_;
@@ skipping 83 matching lines @@
   if (IsEqualIID(iid, IID_IUnknown) || IsEqualIID(iid, IID_IDropTarget)) {
     *object = this;
   } else {
     return E_NOINTERFACE;
   }
   AddRef();
   return S_OK;
 }
 
 ULONG BaseDropTarget::AddRef() {
-  return InterlockedIncrement(&ref_count_);
+  return ++ref_count_;
 }
 
 ULONG BaseDropTarget::Release() {
-  if (InterlockedDecrement(&ref_count_) == 0) {
-    ULONG copied_refcnt = ref_count_;
+  if (--ref_count_ == 0) {
     delete this;
-    return copied_refcnt;
+    return 0U;
   }
   return ref_count_;
 }
 
 DWORD BaseDropTarget::OnDragEnter(IDataObject* data_object,
                                   DWORD key_state,
                                   POINT cursor_position,
                                   DWORD effect) {
   return DROPEFFECT_NONE;
 }
 
 DWORD BaseDropTarget::OnDragOver(IDataObject* data_object,
                                  DWORD key_state,
                                  POINT cursor_position,
                                  DWORD effect) {
   return DROPEFFECT_NONE;
 }
 
 void BaseDropTarget::OnDragLeave(IDataObject* data_object) {
 }
 
 DWORD BaseDropTarget::OnDrop(IDataObject* data_object,
                              DWORD key_state,
                              POINT cursor_position,
                              DWORD effect) {
   return DROPEFFECT_NONE;
 }