February 2016 - Wine-Devel - list.winehq.org

Re: [PATCH v3] winex11.drv: Make the GL context current even if no drawables were given.

by Henri Verbeet

On 29 February 2016 at 04:33, Ken Thomases <ken(a)codeweavers.com> wrote: > So the reasons to revert are: a) we don't have a real test case, and b) leaving it in causes a success-in-todo_wine test failure specific to the Mac? Seem somewhat tenuous reasons to revert a change that implements functionality from the spec. > Those don't help, but the more important reason is that as far as we know this functionality isn't supported on any Windows OpenGL driver, supposedly because of architectural reasons.

Feb. 29, 2016

Problems in winedbg.1, msiexec.1, winemaker.1

by esr＠thyrsus.com

This is automatically generated email about markup problems in a man page for which you appear to be responsible. If you are not the right person or list, please tell me so I can correct my database. See http://catb.org/~esr/doclifter/bugs.html for details on how and why these patches were generated. Feel free to email me with any questions. Note: These patches do not change the modification date of any manual page. You may wish to do that by hand. I apologize if this message seems spammy or impersonal. The volume of markup bugs I am tracking is over five hundred - there is no real alternative to generating bugmail from a database and template. -- Eric S. Raymond Problems with winedbg.1: Ambiguous or invalid backslash. This doesn't cause groff a problem. but it confuses doclifter and may confuse older troff implementations. --- winedbg.1-unpatched 2014-06-02 09:40:08.604693388 -0400 +++ winedbg.1 2014-06-02 09:41:09.350110336 -0400 @@ -163,7 +163,7 @@ .IP \fBbreak\ \fIN\fR Adds a breakpoint at line \fIN\fR of current source file. .IP \fBbreak\fR -Adds a breakpoint at current \f$PC\fR address. +Adds a breakpoint at current \fB$PC\fR address. .IP \fBwatch\ *\ \fIN\fR Adds a watch command (on write) at address \fIN\fR (on 4 bytes). .IP \fBwatch\ \fIid\fR Problems with msiexec.1: Ambiguous or invalid backslash. This doesn't cause groff a problem. but it confuses doclifter and may confuse older troff implementations. --- msiexec.1-unpatched 2014-06-02 17:15:58.428528019 -0400 +++ msiexec.1 2014-06-02 17:18:59.360645276 -0400 @@ -24,25 +24,25 @@ \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\flp\fR" +.IP "\fBlp\fR" Reinstall the file if it is missing. -.IP "\flo\fR" +.IP "\fBlo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fle\fR" +.IP "\fBle\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fld\fR" +.IP "\fBld\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\flc\fR" +.IP "\fBlc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fla\fR" +.IP "\fBla\fR" Reinstall all files. -.IP "\flu\fR" +.IP "\fBlu\fR" Rewrite all required user registry entries. -.IP "\flm\fR" +.IP "\fBlm\fR" Rewrite all required machine registry entries. -.IP "\fls\fR" +.IP "\fBls\fR" Overwrite any conflicting shortcuts. -.IP "\flv\fR" +.IP "\fBlv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fl*\fR" +.IP "\fBl*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fli\fR" +.IP "\fBli\fR" Log status messages. -.IP "\flw\fR" +.IP "\fBlw\fR" Log nonfatal warnings. -.IP "\fle\fR" +.IP "\fBle\fR" Log all error messages. -.IP "\fla\fR" +.IP "\fBla\fR" Log start of actions. -.IP "\flr\fR" +.IP "\fBlr\fR" Log action specifc records. -.IP "\flu\fR" +.IP "\fBlu\fR" Log user requests. -.IP "\flc\fR" +.IP "\fBlc\fR" Log initial UI parameters. -.IP "\flm\fR" +.IP "\fBlm\fR" Log out of memory errors. -.IP "\flo\fR" +.IP "\fBlo\fR" Log out of diskspace messages. -.IP "\flp \fR" +.IP "\fBlp \fR" Log terminal properties. -.IP "\flv \fR" +.IP "\fBlv \fR" Verbose logging. -.IP "\flx \fR" +.IP "\fBlx \fR" Log extra debugging messages. -.IP "\fl+ \fR" +.IP "\fBl+ \fR" Append logging to existing file. -.IP "\fl! \fR" +.IP "\fBl! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h Problems with winemaker.1: Unbalanced group in command synopis. You probably forgot to open or close a [ ] or { } group properly. --- winemaker.1-unpatched 2014-06-02 09:52:02.517334795 -0400 +++ winemaker.1 2014-06-02 09:54:21.272566508 -0400 @@ -29,7 +29,6 @@ .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "]

Feb. 29, 2016

Re: [PATCH 4/4] d3d10core/tests: Test swapchain buffer cycling.

by Henri Verbeet

On 24 February 2016 at 23:28, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Testing multisampling is not possible because only > DXGI_SWAP_EFFECT_DISCARD supports multisampled swapchains and it allows > only access to buffer 0. > > Not exactly test_flip from ddraw because we can't write to the end of > the chain... > > Plenty of todo_wine in here. The read-only part is missing and texturing > from swapchain buffers doesn't work either. > > foo > Is there a d3d11 version of this as well?

Feb. 29, 2016

Re: xcopy/tests: Reset "current directory" of current process.

by Alexandre Julliard

Jactry Zeng <jzeng(a)codeweavers.com> writes: > @@ -97,4 +99,5 @@ START_TEST(xcopy) > > DeleteFileA("xcopy1"); > RemoveDirectoryA("xcopytest"); > + SetCurrentDirectoryW(curdir); Restoring the directory at process exit is not useful. -- Alexandre Julliard julliard(a)winehq.org

Feb. 29, 2016

Re: shell32/tests: Reset "current directory" of current process.

by Alexandre Julliard

Jactry Zeng <jzeng(a)codeweavers.com> writes: > @@ -1882,6 +1884,7 @@ static void test_ITEMIDLIST_format(void) { > } > > IShellFolder_Release(psfPersonal); > + SetCurrentDirectoryW(curdir); > } You'd need to do that on the various error returns too. -- Alexandre Julliard julliard(a)winehq.org

Feb. 29, 2016

Re: [PATCH 1/2] ntoskrnl.exe: Track drivers created with IoCreateDriver

by Sebastian Lackner

On 29.02.2016 04:38, Aric Stewart wrote: > Thanks for the review! > > > On 2/28/16 9:30 PM, Sebastian Lackner wrote: >> On 26.02.2016 21:22, Aric Stewart wrote: >>> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> >>> --- >>> dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++++++++++++++----------- >>> 1 file changed, 48 insertions(+), 16 deletions(-) >>> >>> >>> >>> 0002-ntoskrnl.exe-Track-drivers-created-with-IoCreateDriver.txt >>> >>> >>> diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c >>> index 3bee2bf..49c8cab 100644 >>> --- a/dlls/ntoskrnl.exe/ntoskrnl.c >>> +++ b/dlls/ntoskrnl.exe/ntoskrnl.c >>> @@ -72,6 +72,16 @@ static DWORD request_thread; >>> static DWORD client_tid; >>> static DWORD client_pid; >>> >>> +typedef struct _created_driver { >>> + struct list entry; >>> + >>> + UNICODE_STRING driver_name; >>> + DRIVER_OBJECT *driver_obj; >>> + DRIVER_EXTENSION *driver_extension; >> >> Isn't it possible to add the DRIVER_OBJECT and DRIVER_EXTENSION struct directly >> (without pointer), to avoid multiple memory allocations? >> > > Yeah, That would be just fine, to have it part of the base structure instead of a separate pointer. > >> I would also suggest to use a more meaningful name than "created_driver", and >> you also don't really need the typedef. Something like "struct wine_driver" >> would make more sense for example, but probably you have a better idea. ;) >> >>> +} created_driver; >>> + >>> +struct list created_drivers = LIST_INIT(created_drivers); >>> + >>> #ifdef __i386__ >>> #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ >>> __ASM_STDCALL_FUNC( name, 4, \ >>> @@ -818,36 +828,47 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, >>> */ >>> NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) >>> { >>> - DRIVER_OBJECT *driver; >>> - DRIVER_EXTENSION *extension; >>> + created_driver *driver; >>> NTSTATUS status; >>> >>> TRACE("(%s, %p)\n", debugstr_us(name), init); >>> >>> if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, >>> - sizeof(*driver) + sizeof(*extension) ))) >>> + sizeof(*driver) ))) >>> + return STATUS_NO_MEMORY; >>> + >>> + if (!(driver->driver_obj = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, >>> + sizeof(*driver->driver_obj) + sizeof(*driver->driver_extension) ))) >>> + { >>> + RtlFreeHeap( GetProcessHeap(), 0, driver ); >>> return STATUS_NO_MEMORY; >>> + } >>> >>> - if ((status = RtlDuplicateUnicodeString( 1, name, &driver->DriverName ))) >>> + if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_name ))) >>> { >>> + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); >>> RtlFreeHeap( GetProcessHeap(), 0, driver ); >>> return status; >>> } >>> >>> - extension = (DRIVER_EXTENSION *)(driver + 1); >>> - driver->Size = sizeof(*driver); >>> - driver->DriverInit = init; >>> - driver->DriverExtension = extension; >>> - extension->DriverObject = driver; >>> - extension->ServiceKeyName = driver->DriverName; >>> + driver->driver_extension = (DRIVER_EXTENSION *)((BYTE*)driver->driver_obj + sizeof(*driver->driver_obj)); >>> + driver->driver_obj->DriverName = driver->driver_name; >>> + driver->driver_obj->Size = sizeof(*driver->driver_obj); >>> + driver->driver_obj->DriverInit = init; >>> + driver->driver_obj->DriverExtension = driver->driver_extension; >>> + driver->driver_extension->DriverObject = driver->driver_obj; >>> + driver->driver_extension->ServiceKeyName = driver->driver_name; >>> >>> - status = driver->DriverInit( driver, name ); >>> + status = driver->driver_obj->DriverInit( driver->driver_obj, name ); >>> >>> if (status) >>> { >>> - RtlFreeUnicodeString( &driver->DriverName ); >>> + RtlFreeUnicodeString( &driver->driver_name ); >>> + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); >>> RtlFreeHeap( GetProcessHeap(), 0, driver ); >>> } >>> + >>> + list_add_tail( &created_drivers, &driver->entry ); >> >> Such a global list will need locking. >> > > You think that a basic critical section would be sufficient or do you think other locking would be better? A basic critical section should be fine. > > > -aric > >>> return status; >>> } >>> >>> @@ -855,12 +876,23 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) >>> /*********************************************************************** >>> * IoDeleteDriver (NTOSKRNL.EXE.@) >>> */ >>> -void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) >>> +void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) >>> { >>> - TRACE("(%p)\n", driver); >>> + created_driver *driver, *next; >>> + >>> + TRACE("(%p)\n", driver_object); >>> + >> >> By putting the driver_object in the same struct, you could use CONTAINING_RECORD here. >> Also, a lock will be required while unlinking the driver from the list. >> >>> + LIST_FOR_EACH_ENTRY_SAFE(driver, next, &created_drivers, created_driver, entry) >>> + { >>> + if (driver->driver_obj == driver_object) >>> + { >>> + list_remove( &driver->entry ); >>> + RtlFreeUnicodeString( &driver->driver_name); >>> + break; >>> + } >>> + } >>> >>> - RtlFreeUnicodeString( &driver->DriverName ); >>> - RtlFreeHeap( GetProcessHeap(), 0, driver ); >>> + RtlFreeHeap( GetProcessHeap(), 0, driver_object ); >>> } >>> >>> >>> >>> >>> >>

Feb. 29, 2016

Re: [PATCH 1/2] ntoskrnl.exe: Track drivers created with IoCreateDriver

by Aric Stewart

Thanks for the review! On 2/28/16 9:30 PM, Sebastian Lackner wrote: > On 26.02.2016 21:22, Aric Stewart wrote: >> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> >> --- >> dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++++++++++++++----------- >> 1 file changed, 48 insertions(+), 16 deletions(-) >> >> >> >> 0002-ntoskrnl.exe-Track-drivers-created-with-IoCreateDriver.txt >> >> >> diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c >> index 3bee2bf..49c8cab 100644 >> --- a/dlls/ntoskrnl.exe/ntoskrnl.c >> +++ b/dlls/ntoskrnl.exe/ntoskrnl.c >> @@ -72,6 +72,16 @@ static DWORD request_thread; >> static DWORD client_tid; >> static DWORD client_pid; >> >> +typedef struct _created_driver { >> + struct list entry; >> + >> + UNICODE_STRING driver_name; >> + DRIVER_OBJECT *driver_obj; >> + DRIVER_EXTENSION *driver_extension; > > Isn't it possible to add the DRIVER_OBJECT and DRIVER_EXTENSION struct directly > (without pointer), to avoid multiple memory allocations? > Yeah, That would be just fine, to have it part of the base structure instead of a separate pointer. > I would also suggest to use a more meaningful name than "created_driver", and > you also don't really need the typedef. Something like "struct wine_driver" > would make more sense for example, but probably you have a better idea. ;) > >> +} created_driver; >> + >> +struct list created_drivers = LIST_INIT(created_drivers); >> + >> #ifdef __i386__ >> #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ >> __ASM_STDCALL_FUNC( name, 4, \ >> @@ -818,36 +828,47 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, >> */ >> NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) >> { >> - DRIVER_OBJECT *driver; >> - DRIVER_EXTENSION *extension; >> + created_driver *driver; >> NTSTATUS status; >> >> TRACE("(%s, %p)\n", debugstr_us(name), init); >> >> if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, >> - sizeof(*driver) + sizeof(*extension) ))) >> + sizeof(*driver) ))) >> + return STATUS_NO_MEMORY; >> + >> + if (!(driver->driver_obj = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, >> + sizeof(*driver->driver_obj) + sizeof(*driver->driver_extension) ))) >> + { >> + RtlFreeHeap( GetProcessHeap(), 0, driver ); >> return STATUS_NO_MEMORY; >> + } >> >> - if ((status = RtlDuplicateUnicodeString( 1, name, &driver->DriverName ))) >> + if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_name ))) >> { >> + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); >> RtlFreeHeap( GetProcessHeap(), 0, driver ); >> return status; >> } >> >> - extension = (DRIVER_EXTENSION *)(driver + 1); >> - driver->Size = sizeof(*driver); >> - driver->DriverInit = init; >> - driver->DriverExtension = extension; >> - extension->DriverObject = driver; >> - extension->ServiceKeyName = driver->DriverName; >> + driver->driver_extension = (DRIVER_EXTENSION *)((BYTE*)driver->driver_obj + sizeof(*driver->driver_obj)); >> + driver->driver_obj->DriverName = driver->driver_name; >> + driver->driver_obj->Size = sizeof(*driver->driver_obj); >> + driver->driver_obj->DriverInit = init; >> + driver->driver_obj->DriverExtension = driver->driver_extension; >> + driver->driver_extension->DriverObject = driver->driver_obj; >> + driver->driver_extension->ServiceKeyName = driver->driver_name; >> >> - status = driver->DriverInit( driver, name ); >> + status = driver->driver_obj->DriverInit( driver->driver_obj, name ); >> >> if (status) >> { >> - RtlFreeUnicodeString( &driver->DriverName ); >> + RtlFreeUnicodeString( &driver->driver_name ); >> + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); >> RtlFreeHeap( GetProcessHeap(), 0, driver ); >> } >> + >> + list_add_tail( &created_drivers, &driver->entry ); > > Such a global list will need locking. > You think that a basic critical section would be sufficient or do you think other locking would be better? -aric >> return status; >> } >> >> @@ -855,12 +876,23 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) >> /*********************************************************************** >> * IoDeleteDriver (NTOSKRNL.EXE.@) >> */ >> -void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) >> +void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) >> { >> - TRACE("(%p)\n", driver); >> + created_driver *driver, *next; >> + >> + TRACE("(%p)\n", driver_object); >> + > > By putting the driver_object in the same struct, you could use CONTAINING_RECORD here. > Also, a lock will be required while unlinking the driver from the list. > >> + LIST_FOR_EACH_ENTRY_SAFE(driver, next, &created_drivers, created_driver, entry) >> + { >> + if (driver->driver_obj == driver_object) >> + { >> + list_remove( &driver->entry ); >> + RtlFreeUnicodeString( &driver->driver_name); >> + break; >> + } >> + } >> >> - RtlFreeUnicodeString( &driver->DriverName ); >> - RtlFreeHeap( GetProcessHeap(), 0, driver ); >> + RtlFreeHeap( GetProcessHeap(), 0, driver_object ); >> } >> >> >> >> >> >

Feb. 29, 2016

Re: [PATCH] programs/winedevice.exe: Use IoCreateDriver and IoDeleteDriver

by Aric Stewart

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(a)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: >> } > >

Feb. 29, 2016

Re: [PATCH v3] winex11.drv: Make the GL context current even if no drawables were given.

by Ken Thomases

On Feb 26, 2016, at 3:48 PM, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > > 2016-02-26 10:42 GMT+01:00 Charles Davis <cdavis5x(a)gmail.com>: >> >> On Thu, Feb 25, 2016 at 7:29 AM, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: >> >>> That seems suspicious... >>> AFAICS the comment right above this hunk is still valid (it is for >>> current Nvidia drivers on Win7 at least), which probably means that >>> this patch is not a good idea. >> >> Yeah, I was afraid of that. >> >> Truth be told, I don't need this for an application. >> Besides the fact that OpenGL 3.0+ is supposed to allow this, >> I added it because I thought it might be useful for wined3d […]. In any case, I'd >> imagine from your comment that you disagree. If you do, I'll >> retract this patch and revert the patch adding this to winemac.drv, since no known apps depend on this. > > […] > > About the related winemac.drv patch, I guess it would be better to > revert it, yes. Sorry that I didn't realize about its implications > earlier. We could in principle change the test with some kind of > "todo_wine_if" shenanigans instead but that doesn't seem preferable. So the reasons to revert are: a) we don't have a real test case, and b) leaving it in causes a success-in-todo_wine test failure specific to the Mac? Seem somewhat tenuous reasons to revert a change that implements functionality from the spec. *shrugs* I guess I don't feel strongly either way. Chip, it's up to you. -Ken

Feb. 29, 2016

Re: [PATCH] programs/winedevice.exe: Use IoCreateDriver and IoDeleteDriver

by Sebastian Lackner

On 26.02.2016 21:15, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)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? > > /* find the LDR_MODULE corresponding to the driver module */ > static LDR_MODULE *find_ldr_module( HMODULE module ) > @@ -133,38 +133,35 @@ error: > }

Feb. 29, 2016