Commit 14d411b8 authored by Alexandre Julliard's avatar Alexandre Julliard

mountmgr.sys: Use the Unix call helpers.

parent d8b77f14
...@@ -46,8 +46,6 @@ struct mount_point ...@@ -46,8 +46,6 @@ struct mount_point
static struct list mount_points_list = LIST_INIT(mount_points_list); static struct list mount_points_list = LIST_INIT(mount_points_list);
static HKEY mount_key; static HKEY mount_key;
unixlib_handle_t mountmgr_handle = 0;
void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len )
{ {
RtlFreeHeap( GetProcessHeap(), 0, mount->id ); RtlFreeHeap( GetProcessHeap(), 0, mount->id );
...@@ -620,7 +618,6 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) ...@@ -620,7 +618,6 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
#ifdef _WIN64 #ifdef _WIN64
HKEY wow64_ports_key = NULL; HKEY wow64_ports_key = NULL;
#endif #endif
void *instance;
UNICODE_STRING nameW, linkW; UNICODE_STRING nameW, linkW;
DEVICE_OBJECT *device; DEVICE_OBJECT *device;
HKEY devicemap_key; HKEY devicemap_key;
...@@ -629,9 +626,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) ...@@ -629,9 +626,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
TRACE( "%s\n", debugstr_w(path->Buffer) ); TRACE( "%s\n", debugstr_w(path->Buffer) );
RtlPcToFileHeader( DriverEntry, &instance ); status = __wine_init_unix_call();
status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs,
&mountmgr_handle, sizeof(mountmgr_handle), NULL );
if (status) return status; if (status) return status;
driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = mountmgr_ioctl; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = mountmgr_ioctl;
......
...@@ -174,9 +174,7 @@ enum mountmgr_funcs ...@@ -174,9 +174,7 @@ enum mountmgr_funcs
unix_enumerate_credentials, unix_enumerate_credentials,
}; };
extern unixlib_handle_t mountmgr_handle; #define MOUNTMGR_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )
#define MOUNTMGR_CALL( func, params ) __wine_unix_call( mountmgr_handle, unix_ ## func, params )
extern void queue_device_op( enum device_op op, const char *udi, const char *device, extern void queue_device_op( enum device_op op, const char *udi, const char *device,
const char *mount_point, enum device_type type, const GUID *guid, const char *mount_point, enum device_type type, const GUID *guid,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment