ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

explorer: Avoid repeated notifications on device removal.

Browse Source
This commit is contained in:
Alexandre Julliard 2006-10-03 12:40:39 +02:00
parent dde935d111
commit ab6fa810d7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
programs/explorer/device.c
View File

@ -143,13 +143,14 @@ done:
return drive; return drive;
} }
static void set_mount_point( struct dos_drive *drive, const char *mount_point ) static BOOL set_mount_point( struct dos_drive *drive, const char *mount_point )
{ {
char *path, *p; char *path, *p;
struct stat path_st, mnt_st; struct stat path_st, mnt_st;
BOOL modified = FALSE;
if (drive->drive == -1) return; if (drive->drive == -1) return FALSE;
if (!(path = get_dosdevices_path())) return; if (!(path = get_dosdevices_path())) return FALSE;
p = path + strlen(path) - 3; p = path + strlen(path) - 3;
*p = 'a' + drive->drive; *p = 'a' + drive->drive;
p[2] = 0; p[2] = 0;
@ -162,11 +163,16 @@ static void set_mount_point( struct dos_drive *drive, const char *mount_point )
{ {
unlink( path ); unlink( path );
symlink( mount_point, path ); symlink( mount_point, path );
modified = TRUE;
} }
} }
else unlink( path ); else
{
if (unlink( path ) != -1) modified = TRUE;
}
HeapFree( GetProcessHeap(), 0, path ); HeapFree( GetProcessHeap(), 0, path );
return modified;
} }
BOOL add_dos_device( const char *udi, const char *device, BOOL add_dos_device( const char *udi, const char *device,
@ -227,7 +233,7 @@ BOOL remove_dos_device( const char *udi )
if (drive->drive != -1) if (drive->drive != -1)
{ {
set_mount_point( drive, "" ); BOOL modified = set_mount_point( drive, "" );
/* clear the registry key too */ /* clear the registry key too */
if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey )) if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey ))
@ -238,7 +244,7 @@ BOOL remove_dos_device( const char *udi )
RegCloseKey( hkey ); RegCloseKey( hkey );
} }
send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); if (modified) send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE );
} }
list_remove( &drive->entry ); list_remove( &drive->entry );