Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
67394207
Commit
67394207
authored
Apr 18, 2006
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
explorer: Reuse drives that point to the same device to avoid memory leaks.
Also print a warning if HAL support is not compiled in.
parent
88bf4d61
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
53 additions
and
42 deletions
+53
-42
hal.c
programs/explorer/hal.c
+53
-42
No files found.
programs/explorer/hal.c
View file @
67394207
...
@@ -21,14 +21,11 @@
...
@@ -21,14 +21,11 @@
#include "config.h"
#include "config.h"
#include "wine/port.h"
#include "wine/port.h"
#ifdef HAVE_LIBHAL
#include <assert.h>
#include <assert.h>
#include <errno.h>
#include <errno.h>
#include <stdarg.h>
#include <stdarg.h>
#include <stdio.h>
#include <sys/time.h>
#include <sys/time.h>
#include <dbus/dbus.h>
#include <hal/libhal.h>
#include "windef.h"
#include "windef.h"
#include "winbase.h"
#include "winbase.h"
...
@@ -44,6 +41,11 @@
...
@@ -44,6 +41,11 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
explorer
);
WINE_DEFAULT_DEBUG_CHANNEL
(
explorer
);
#ifdef HAVE_LIBHAL
#include <dbus/dbus.h>
#include <hal/libhal.h>
struct
dos_drive
struct
dos_drive
{
{
struct
list
entry
;
struct
list
entry
;
...
@@ -142,7 +144,7 @@ static char *get_dosdevices_path(void)
...
@@ -142,7 +144,7 @@ static char *get_dosdevices_path(void)
}
}
/* find or create a DOS drive for the corresponding device */
/* find or create a DOS drive for the corresponding device */
static
int
add_drive
(
const
char
*
device
,
const
char
*
mount_point
,
const
char
*
type
)
static
int
add_drive
(
const
char
*
device
,
const
char
*
type
)
{
{
char
*
path
,
*
p
;
char
*
path
,
*
p
;
char
in_use
[
26
];
char
in_use
[
26
];
...
@@ -189,7 +191,7 @@ static int add_drive( const char *device, const char *mount_point, const char *t
...
@@ -189,7 +191,7 @@ static int add_drive( const char *device, const char *mount_point, const char *t
{
{
in_use
[
drive
]
=
1
;
in_use
[
drive
]
=
1
;
if
(
!
S_ISBLK
(
drive_st
.
st_mode
))
continue
;
if
(
!
S_ISBLK
(
drive_st
.
st_mode
))
continue
;
if
(
dev_st
.
st_rdev
==
drive_st
.
st_rdev
)
goto
update_mount_point
;
if
(
dev_st
.
st_rdev
==
drive_st
.
st_rdev
)
goto
done
;
}
}
}
}
if
(
avail
!=
-
1
)
if
(
avail
!=
-
1
)
...
@@ -197,33 +199,39 @@ static int add_drive( const char *device, const char *mount_point, const char *t
...
@@ -197,33 +199,39 @@ static int add_drive( const char *device, const char *mount_point, const char *t
/* try to use the one we found */
/* try to use the one we found */
drive
=
avail
;
drive
=
avail
;
*
p
=
'a'
+
drive
;
*
p
=
'a'
+
drive
;
if
(
symlink
(
device
,
path
)
!=
-
1
)
goto
update_mount_point
;
if
(
symlink
(
device
,
path
)
!=
-
1
)
goto
done
;
/* failed, retry the search */
/* failed, retry the search */
}
}
}
}
HeapFree
(
GetProcessHeap
(),
0
,
path
);
drive
=
-
1
;
return
-
1
;
update_mount_point:
done:
p
[
2
]
=
0
;
unlink
(
path
);
if
(
mount_point
[
0
])
symlink
(
mount_point
,
path
);
WINE_TRACE
(
"added drive %c: dev %s at %s
\n
"
,
'a'
+
drive
,
wine_dbgstr_a
(
device
),
wine_dbgstr_a
(
mount_point
)
);
HeapFree
(
GetProcessHeap
(),
0
,
path
);
HeapFree
(
GetProcessHeap
(),
0
,
path
);
return
drive
;
return
drive
;
}
}
static
void
remove_drive
(
int
drive
)
static
void
set_mount_point
(
struct
dos_drive
*
drive
,
const
char
*
mount_point
)
{
{
char
*
path
,
*
p
;
char
*
path
,
*
p
;
struct
stat
path_st
,
mnt_st
;
if
(
drive
->
drive
==
-
1
)
return
;
if
(
!
(
path
=
get_dosdevices_path
()))
return
;
if
(
!
(
path
=
get_dosdevices_path
()))
return
;
p
=
path
+
strlen
(
path
)
-
3
;
p
=
path
+
strlen
(
path
)
-
3
;
*
p
=
'a'
+
drive
;
*
p
=
'a'
+
drive
->
drive
;
p
[
2
]
=
0
;
p
[
2
]
=
0
;
unlink
(
path
);
/* we keep the device link around in case the device gets mounted again */
if
(
mount_point
[
0
])
{
/* try to avoid unlinking if already set correctly */
if
(
stat
(
path
,
&
path_st
)
==
-
1
||
stat
(
mount_point
,
&
mnt_st
)
==
-
1
||
path_st
.
st_dev
!=
mnt_st
.
st_dev
||
path_st
.
st_ino
!=
mnt_st
.
st_ino
)
{
unlink
(
path
);
symlink
(
mount_point
,
path
);
}
}
else
unlink
(
path
);
HeapFree
(
GetProcessHeap
(),
0
,
path
);
HeapFree
(
GetProcessHeap
(),
0
,
path
);
}
}
...
@@ -233,6 +241,12 @@ static void add_dos_device( const char *udi, const char *device,
...
@@ -233,6 +241,12 @@ static void add_dos_device( const char *udi, const char *device,
{
{
struct
dos_drive
*
drive
;
struct
dos_drive
*
drive
;
/* first check if it already exists */
LIST_FOR_EACH_ENTRY
(
drive
,
&
drives_list
,
struct
dos_drive
,
entry
)
{
if
(
!
strcmp
(
udi
,
drive
->
udi
))
goto
found
;
}
if
(
!
(
drive
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
*
drive
)
)))
return
;
if
(
!
(
drive
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
*
drive
)
)))
return
;
if
(
!
(
drive
->
udi
=
HeapAlloc
(
GetProcessHeap
(),
0
,
strlen
(
udi
)
+
1
)))
if
(
!
(
drive
->
udi
=
HeapAlloc
(
GetProcessHeap
(),
0
,
strlen
(
udi
)
+
1
)))
{
{
...
@@ -240,24 +254,20 @@ static void add_dos_device( const char *udi, const char *device,
...
@@ -240,24 +254,20 @@ static void add_dos_device( const char *udi, const char *device,
return
;
return
;
}
}
strcpy
(
drive
->
udi
,
udi
);
strcpy
(
drive
->
udi
,
udi
);
list_add_tail
(
&
drives_list
,
&
drive
->
entry
);
drive
->
drive
=
add_drive
(
device
,
mount_point
,
type
);
found:
drive
->
drive
=
add_drive
(
device
,
type
);
if
(
drive
->
drive
==
-
1
)
if
(
drive
->
drive
!=
-
1
)
{
HeapFree
(
GetProcessHeap
(),
0
,
drive
->
udi
);
HeapFree
(
GetProcessHeap
(),
0
,
drive
);
}
else
{
{
HKEY
hkey
;
HKEY
hkey
;
set_mount_point
(
drive
,
mount_point
);
WINE_TRACE
(
"added device %c: udi %s for %s on %s type %s
\n
"
,
WINE_TRACE
(
"added device %c: udi %s for %s on %s type %s
\n
"
,
'a'
+
drive
->
drive
,
wine_dbgstr_a
(
udi
),
wine_dbgstr_a
(
device
),
'a'
+
drive
->
drive
,
wine_dbgstr_a
(
udi
),
wine_dbgstr_a
(
device
),
wine_dbgstr_a
(
mount_point
),
wine_dbgstr_a
(
type
)
);
wine_dbgstr_a
(
mount_point
),
wine_dbgstr_a
(
type
)
);
list_add_tail
(
&
drives_list
,
&
drive
->
entry
);
/* hack: force the drive type in the registry */
/* hack: force the drive type in the registry */
if
(
!
RegCreateKeyA
(
HKEY_LOCAL_MACHINE
,
"Software
\\
Wine
\\
Drives"
,
&
hkey
))
if
(
!
RegCreateKeyA
(
HKEY_LOCAL_MACHINE
,
"Software
\\
Wine
\\
Drives"
,
&
hkey
))
{
{
...
@@ -276,18 +286,21 @@ static void remove_dos_device( struct dos_drive *drive )
...
@@ -276,18 +286,21 @@ static void remove_dos_device( struct dos_drive *drive )
{
{
HKEY
hkey
;
HKEY
hkey
;
remove_drive
(
drive
->
drive
);
if
(
drive
->
drive
!=
-
1
)
/* clear the registry key too */
if
(
!
RegOpenKeyA
(
HKEY_LOCAL_MACHINE
,
"Software
\\
Wine
\\
Drives"
,
&
hkey
))
{
{
char
name
[
3
]
=
"a:"
;
set_mount_point
(
drive
,
""
);
name
[
0
]
+=
drive
->
drive
;
RegDeleteValueA
(
hkey
,
name
);
RegCloseKey
(
hkey
);
}
send_notify
(
drive
->
drive
,
DBT_DEVICEREMOVECOMPLETE
);
/* clear the registry key too */
if
(
!
RegOpenKeyA
(
HKEY_LOCAL_MACHINE
,
"Software
\\
Wine
\\
Drives"
,
&
hkey
))
{
char
name
[
3
]
=
"a:"
;
name
[
0
]
+=
drive
->
drive
;
RegDeleteValueA
(
hkey
,
name
);
RegCloseKey
(
hkey
);
}
send_notify
(
drive
->
drive
,
DBT_DEVICEREMOVECOMPLETE
);
}
list_remove
(
&
drive
->
entry
);
list_remove
(
&
drive
->
entry
);
HeapFree
(
GetProcessHeap
(),
0
,
drive
->
udi
);
HeapFree
(
GetProcessHeap
(),
0
,
drive
->
udi
);
...
@@ -302,9 +315,6 @@ static void new_device( LibHalContext *ctx, const char *udi )
...
@@ -302,9 +315,6 @@ static void new_device( LibHalContext *ctx, const char *udi )
p_dbus_error_init
(
&
error
);
p_dbus_error_init
(
&
error
);
if
(
!
(
mount_point
=
p_libhal_device_get_property_string
(
ctx
,
udi
,
"volume.mount_point"
,
&
error
)))
goto
done
;
if
(
!
(
device
=
p_libhal_device_get_property_string
(
ctx
,
udi
,
"block.device"
,
&
error
)))
if
(
!
(
device
=
p_libhal_device_get_property_string
(
ctx
,
udi
,
"block.device"
,
&
error
)))
goto
done
;
goto
done
;
...
@@ -433,6 +443,7 @@ void initialize_hal(void)
...
@@ -433,6 +443,7 @@ void initialize_hal(void)
void
initialize_hal
(
void
)
void
initialize_hal
(
void
)
{
{
WINE_WARN
(
"HAL support not compiled in
\n
"
);
}
}
#endif
/* HAVE_LIBHAL */
#endif
/* HAVE_LIBHAL */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment