Module: wine Branch: master Commit: 55f5209631253d6361fc05399059423c3aa04390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f5209631253d6361fc053990...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Dec 20 11:04:18 2011 +0100
mountmgr: Rename hal.c to dbus.c.
---
dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/{hal.c => dbus.c} | 36 ++++++++++++++++++---------------- dlls/mountmgr.sys/mountmgr.c | 2 +- dlls/mountmgr.sys/mountmgr.h | 2 +- 4 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 91203e1..6bdb5c4 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -6,9 +6,9 @@ EXTRADEFS = @HALINCL@ EXTRALIBS = @DISKARBITRATIONLIB@
C_SRCS = \ + dbus.c \ device.c \ diskarb.c \ - hal.c \ mountmgr.c
@MAKE_DLL_RULES@ diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/dbus.c similarity index 88% rename from dlls/mountmgr.sys/hal.c rename to dlls/mountmgr.sys/dbus.c index d369879..42974b2 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/dbus.c @@ -1,5 +1,5 @@ /* - * HAL devices support + * DBus devices support * * Copyright 2006 Alexandre Julliard * @@ -26,8 +26,10 @@ #include <stdarg.h> #include <stdio.h> #include <sys/time.h> -#ifdef SONAME_LIBHAL +#ifdef SONAME_LIBDBUS_1 # include <dbus/dbus.h> +#endif +#ifdef SONAME_LIBHAL # include <hal/libhal.h> #endif
@@ -135,7 +137,7 @@ static GUID *parse_uuid( GUID *guid, const char *str ) }
/* HAL callback for new device */ -static void new_device( LibHalContext *ctx, const char *udi ) +static void hal_new_device( LibHalContext *ctx, const char *udi ) { DBusError error; char *parent = NULL; @@ -187,7 +189,7 @@ done: }
/* HAL callback for removed device */ -static void removed_device( LibHalContext *ctx, const char *udi ) +static void hal_removed_device( LibHalContext *ctx, const char *udi ) { DBusError error;
@@ -203,17 +205,17 @@ static void removed_device( LibHalContext *ctx, const char *udi ) }
/* HAL callback for property changes */ -static void property_modified (LibHalContext *ctx, const char *udi, - const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) +static void hal_property_modified (LibHalContext *ctx, const char *udi, + const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) { TRACE( "udi %s key %s %s\n", wine_dbgstr_a(udi), wine_dbgstr_a(key), - is_added ? "added" : is_removed ? "removed" : "modified" ); + is_added ? "added" : is_removed ? "removed" : "modified" );
- if (!strcmp( key, "volume.mount_point" )) new_device( ctx, udi ); + if (!strcmp( key, "volume.mount_point" )) hal_new_device( ctx, udi ); }
-static DWORD WINAPI hal_thread( void *arg ) +static DWORD WINAPI dbus_thread( void *arg ) { DBusError error; DBusConnection *dbc; @@ -232,9 +234,9 @@ static DWORD WINAPI hal_thread( void *arg ) }
p_libhal_ctx_set_dbus_connection( ctx, dbc ); - p_libhal_ctx_set_device_added( ctx, new_device ); - p_libhal_ctx_set_device_removed( ctx, removed_device ); - p_libhal_ctx_set_device_property_modified( ctx, property_modified ); + p_libhal_ctx_set_device_added( ctx, hal_new_device ); + p_libhal_ctx_set_device_removed( ctx, hal_removed_device ); + p_libhal_ctx_set_device_property_modified( ctx, hal_property_modified );
if (!p_libhal_ctx_init( ctx, &error )) { @@ -247,7 +249,7 @@ static DWORD WINAPI hal_thread( void *arg ) if (!(list = p_libhal_get_all_devices( ctx, &num, &error ))) p_dbus_error_free( &error ); else { - for (i = 0; i < num; i++) new_device( ctx, list[i] ); + for (i = 0; i < num; i++) hal_new_device( ctx, list[i] ); p_libhal_free_string_array( list ); }
@@ -269,20 +271,20 @@ static DWORD WINAPI hal_thread( void *arg ) return 0; }
-void initialize_hal(void) +void initialize_dbus(void) { HANDLE handle;
if (!load_functions()) return; - if (!(handle = CreateThread( NULL, 0, hal_thread, NULL, 0, NULL ))) return; + if (!(handle = CreateThread( NULL, 0, dbus_thread, NULL, 0, NULL ))) return; CloseHandle( handle ); }
#else /* SONAME_LIBHAL */
-void initialize_hal(void) +void initialize_dbus(void) { - TRACE( "Skipping, HAL support not compiled in\n" ); + TRACE( "Skipping, DBUS support not compiled in\n" ); }
#endif /* SONAME_LIBHAL */ diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 5cf1017..927e6e8 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -461,7 +461,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RtlInitUnicodeString( &nameW, harddiskW ); status = IoCreateDriver( &nameW, harddisk_driver_entry );
- initialize_hal(); + initialize_dbus(); initialize_diskarbitration();
return status; diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index a47a3e3..d1e814f 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -35,7 +35,7 @@ #define WINE_MOUNTMGR_EXTENSIONS #include "ddk/mountmgr.h"
-extern void initialize_hal(void) DECLSPEC_HIDDEN; +extern void initialize_dbus(void) DECLSPEC_HIDDEN; extern void initialize_diskarbitration(void) DECLSPEC_HIDDEN;
/* device functions */
-
Alexandre Julliard