On 2/28/16 9:33 PM, Sebastian Lackner wrote:
On 26.02.2016 21:15, Aric Stewart wrote:
Signed-off-by: Aric Stewart aric@codeweavers.com
programs/winedevice/device.c | 55 ++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 30 deletions(-)
0001-programs-winedevice.exe-Use-IoCreateDriver-and-IoDelet.txt
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 94132ed..f6dd678 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -43,8 +43,8 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static WCHAR *driver_name; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -static DRIVER_OBJECT driver_obj; -static DRIVER_EXTENSION driver_extension; +static DRIVER_OBJECT *driver_obj; +static HMODULE driver_module;
Most of it looks fine, but isn't the plan to get rid of global variables? Do you plan to remove it again in follow-up patches?
Part of the hope here was to make this patch as non-invasive as possible since you are working on the multiple loading issue. I did not want this to be too much of conflict on your work.
-aric
/* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) @@ -133,38 +133,35 @@ error: }