diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index f0c54d7051..59c9849ca2 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -7,7 +7,14 @@ intended to be subclassed with the relevant parts implemented for a particular device. This class handles device detection. ''' -import os, subprocess, time, re, sys, glob +import glob +import os +import re +import struct +import subprocess +import sys +import time + from itertools import repeat from calibre.devices.interface import DevicePlugin @@ -492,7 +499,29 @@ class Device(DeviceConfig, DevicePlugin): self.open_osx() def eject_windows(self): - pass + win32file = __import__('win32file', globals(), locals(), [], -1) + win32con = __import__('win32con', globals(), locals(), [], -1) + win32shell = __import__('win32com.shell.shell', globals(), locals(), [], -1) + win32shellcon = __import__('win32com.shell.shellcon', globals(), locals(), [], -1) + + FSCTL_LOCK_VOLUME = 0x0090018 + FSCTL_DISMOUNT_VOLUME = 0x00090020 + IOCTL_STORAGE_MEDIA_REMOVAL = 0x002D4804 + IOCTL_STORAGE_EJECT_MEDIA = 0x002D4808 + + for x in ('_main_prefix', '_card_a_prefix', '_card_b_prefix'): + x = getattr(self, x, None) + if x is not None: + vol = win32file.CreateFile(x, win32con.GENERIC_READ | win32con.GENERIC_WRITE, win32con.FILE_SHARE_READ | win32con.FILE_SHARE_WRITE, None, win32con.OPEN_EXISTING, 0, None) + try: + win32file.DeviceIoControl(vol, FSCTL_LOCK_VOLUME, '', 0, None) + win32file.DeviceIoControl(vol, FSCTL_DISMOUNT_VOLUME, '', 0, None) + win32file.DeviceIoControl(vol, IOCTL_STORAGE_MEDIA_REMOVAL, struct.pack('B', 0), 0, None) + win32file.DeviceIoControl(vol, IOCTL_STORAGE_EJECT_MEDIA, '', 0, None) + time.sleep(2) + win32shell.SHChangeNotify(win32shellcon.SHCNE_DRIVEREMOVED, win32shellcon.SHCNF_PATH, x) + finally: + win32file.CloseHandle(vol) def eject_osx(self): for x in ('_main_prefix', '_card_a_prefix', '_card_b_prefix'):