niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

mountmgr.sys: Use nameless union/structs.

Browse source
This commit is contained in:
Alexandre Julliard 2023-07-05 10:23:38 +02:00
parent 03ce134d6f
commit 99159c7a0b
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/mountmgr.sys/cred.c
View file

@ -36,8 +36,6 @@
#undef GetCurrentThread #undef GetCurrentThread
#endif #endif
#define NONAMELESSUNION
#include "mountmgr.h" #include "mountmgr.h"
#include "unixlib.h" #include "unixlib.h"
#include "wine/debug.h" #include "wine/debug.h"

6
dlls/mountmgr.sys/device.c
View file

@ -24,8 +24,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#define NONAMELESSUNION
#include "mountmgr.h" #include "mountmgr.h"
#include "winreg.h" #include "winreg.h"
#include "winnls.h" #include "winnls.h"
@ -1749,7 +1747,7 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
} }
done: done:
io->u.Status = status; io->Status = status;
LeaveCriticalSection( &device_section ); LeaveCriticalSection( &device_section );
IoCompleteRequest( irp, IO_NO_INCREMENT ); IoCompleteRequest( irp, IO_NO_INCREMENT );
return status; return status;
@ -1841,7 +1839,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp )
} }
} }
irp->IoStatus.u.Status = status; irp->IoStatus.Status = status;
LeaveCriticalSection( &device_section ); LeaveCriticalSection( &device_section );
IoCompleteRequest( irp, IO_NO_INCREMENT ); IoCompleteRequest( irp, IO_NO_INCREMENT );
return status; return status;

20
dlls/mountmgr.sys/mountmgr.c
View file

@ -21,8 +21,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#define NONAMELESSUNION
#include "mountmgr.h" #include "mountmgr.h"
#include "winreg.h" #include "winreg.h"
#include "unixlib.h" #include "unixlib.h"
@ -378,20 +376,20 @@ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, vo
/* sanity checks */ /* sanity checks */
if (FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]) > insize) if (FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]) > insize)
{ {
irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
goto err; goto err;
} }
for (i = 0; i < query->count; i++) for (i = 0; i < query->count; i++)
if (query->params[i].offset + query->params[i].size > insize) if (query->params[i].offset + query->params[i].size > insize)
{ {
irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
goto err; goto err;
} }
if (!memchr( query->unix_name, 0, sizeof(query->unix_name) )) if (!memchr( query->unix_name, 0, sizeof(query->unix_name) ))
{ {
irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
goto err; goto err;
} }
@ -407,11 +405,11 @@ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, vo
{ {
if (offset >= sizeof(query->size)) query->size = offset; if (offset >= sizeof(query->size)) query->size = offset;
offset = sizeof(query->size); offset = sizeof(query->size);
irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW;
goto err; goto err;
} }
} }
irp->IoStatus.u.Status = STATUS_SUCCESS; irp->IoStatus.Status = STATUS_SUCCESS;
err: err:
irp->IoStatus.Information = offset; irp->IoStatus.Information = offset;
@ -430,7 +428,7 @@ static void WINAPI query_symbol_file_callback( TP_CALLBACK_INSTANCE *instance, v
NTSTATUS status = MOUNTMGR_CALL( query_symbol_file, &params ); NTSTATUS status = MOUNTMGR_CALL( query_symbol_file, &params );
irp->IoStatus.Information = info; irp->IoStatus.Information = info;
irp->IoStatus.u.Status = status; irp->IoStatus.Status = status;
IoCompleteRequest( irp, IO_NO_INCREMENT ); IoCompleteRequest( irp, IO_NO_INCREMENT );
} }
@ -528,7 +526,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
} }
if (TrySubmitThreadpoolCallback( query_dhcp_request_params, irp, NULL )) if (TrySubmitThreadpoolCallback( query_dhcp_request_params, irp, NULL ))
return (irp->IoStatus.u.Status = STATUS_PENDING); return (irp->IoStatus.Status = STATUS_PENDING);
status = STATUS_NO_MEMORY; status = STATUS_NO_MEMORY;
break; break;
case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE: case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE:
@ -538,7 +536,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
break; break;
} }
if (TrySubmitThreadpoolCallback( query_symbol_file_callback, irp, NULL )) if (TrySubmitThreadpoolCallback( query_symbol_file_callback, irp, NULL ))
return (irp->IoStatus.u.Status = STATUS_PENDING); return (irp->IoStatus.Status = STATUS_PENDING);
status = STATUS_NO_MEMORY; status = STATUS_NO_MEMORY;
break; break;
case IOCTL_MOUNTMGR_READ_CREDENTIAL: case IOCTL_MOUNTMGR_READ_CREDENTIAL:
@ -594,7 +592,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
status = STATUS_NOT_SUPPORTED; status = STATUS_NOT_SUPPORTED;
break; break;
} }
irp->IoStatus.u.Status = status; irp->IoStatus.Status = status;
IoCompleteRequest( irp, IO_NO_INCREMENT ); IoCompleteRequest( irp, IO_NO_INCREMENT );
return status; return status;
} }