Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

shellext: eliminate dead #if .. #else .. #endif

Changeset 2c24468b7f9e…

Parent bdeea56e8ddb…

by Adrian Buehlmann

Changes to one file · Browse files at 2c24468b7f9e Showing diff from parent bdeea56e8ddb Diff from another changeset...

Change 1 of 2 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
319
320
321
322
323
324
325
 
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
 
319
320
321
 
322
323
324
 
353
354
355
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
356
357
358
@@ -319,7 +319,6 @@
    if (pDataObj)   { -#if 1   FORMATETC fmt = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };   STGMEDIUM stg = { TYMED_HGLOBAL };   if (SUCCEEDED(pDataObj->GetData(&fmt, &stg)) && stg.hGlobal) @@ -354,52 +353,6 @@
  {   TDEBUG_TRACE(" pDataObj->GetData failed");   } - -#else - - STGMEDIUM medium; - FORMATETC fmte = { RegisterClipboardFormat(CFSTR_SHELLIDLIST), - NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; - HRESULT hres = pDataObj->GetData(&fmte, &medium); - - if (SUCCEEDED(hres) && medium.hGlobal) - { - // Enumerate PIDLs which the user has selected - CIDA* cida = (CIDA*) GlobalLock(medium.hGlobal); - LPCITEMIDLIST parentFolder = GetPIDLFolder(cida); - TDEBUG_TRACE("Parent folder: " << GetPathFromIDList(parentFolder)); - int count = cida->cidl; - TDEBUG_TRACE("Selected items: " << count); - for (int i = 0; i < count; ++i) - { - LPCITEMIDLIST child = GetPIDLItem(cida, i); - LPITEMIDLIST absolute = AppendPIDL(parentFolder, child); - std::string name = GetPathFromIDList(absolute); - TDEBUG_TRACE("Processing " << GetPathFromIDList(absolute)); - if (IsShortcut(absolute)) - { - TDEBUG_TRACE("IsShortCut " << name); - LPITEMIDLIST target = GetShortcutTarget(absolute); - ItemListFree(absolute); - absolute = target; - name = GetPathFromIDList(target); - } - - name = GetPathFromIDList(absolute); - TDEBUG_TRACE("myFiles pusing " << name); - myFiles.push_back(name); - - ItemListFree(absolute); - } - - GlobalUnlock(medium.hGlobal); - if (medium.pUnkForRelease) - { - IUnknown* relInterface = (IUnknown*) medium.pUnkForRelease; - relInterface->Release(); - } - } -#endif   }     // if a directory background