morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11425 from akallabeth/refactor

Browse Source 
Refactor checks
This commit is contained in:
akallabeth
2025-03-26 17:12:46 +01:00
committed by GitHub
parent 655f88d24b f67e3ca7db
commit 36355f56e5
8 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
channels/drive/client/drive_main.c
View File

@@ -155,7 +155,7 @@ static UINT drive_process_irp_create(DRIVE_DEVICE* drive, IRP* irp)
BYTE Information = 0;
const WCHAR* path = NULL;
if (!drive || !irp || !irp->devman || !irp->Complete)
if (!drive || !irp || !irp->devman)
return ERROR_INVALID_PARAMETER;
if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 6 * 4 + 8))
@@ -227,6 +227,8 @@ static UINT drive_process_irp_create(DRIVE_DEVICE* drive, IRP* irp)
Stream_Write_UINT32(irp->output, FileId);
Stream_Write_UINT8(irp->output, Information);
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -240,7 +242,7 @@ static UINT drive_process_irp_close(DRIVE_DEVICE* drive, IRP* irp)
void* key = NULL;
DRIVE_FILE* file = NULL;
if (!drive || !irp || !irp->Complete || !irp->output)
if (!drive || !irp || !irp->output)
return ERROR_INVALID_PARAMETER;
file = drive_get_file_by_id(drive, irp->FileId);
@@ -259,6 +261,8 @@ static UINT drive_process_irp_close(DRIVE_DEVICE* drive, IRP* irp)
}
Stream_Zero(irp->output, 5); /* Padding(5) */
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -273,7 +277,7 @@ static UINT drive_process_irp_read(DRIVE_DEVICE* drive, IRP* irp)
UINT32 Length = 0;
UINT64 Offset = 0;
if (!drive || !irp || !irp->output || !irp->Complete)
if (!drive || !irp || !irp->output)
return ERROR_INVALID_PARAMETER;
if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 12))
@@ -317,6 +321,7 @@ static UINT drive_process_irp_read(DRIVE_DEVICE* drive, IRP* irp)
}
}
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -331,7 +336,7 @@ static UINT drive_process_irp_write(DRIVE_DEVICE* drive, IRP* irp)
UINT32 Length = 0;
UINT64 Offset = 0;
if (!drive || !irp || !irp->input || !irp->output || !irp->Complete)
if (!drive || !irp || !irp->input || !irp->output)
return ERROR_INVALID_PARAMETER;
if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 32))
@@ -363,6 +368,8 @@ static UINT drive_process_irp_write(DRIVE_DEVICE* drive, IRP* irp)
Stream_Write_UINT32(irp->output, Length);
Stream_Write_UINT8(irp->output, 0); /* Padding */
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -376,7 +383,7 @@ static UINT drive_process_irp_query_information(DRIVE_DEVICE* drive, IRP* irp)
DRIVE_FILE* file = NULL;
UINT32 FsInformationClass = 0;
if (!drive || !irp || !irp->Complete)
if (!drive || !irp)
return ERROR_INVALID_PARAMETER;
if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 4))
@@ -394,6 +401,7 @@ static UINT drive_process_irp_query_information(DRIVE_DEVICE* drive, IRP* irp)
irp->IoStatus = drive_map_windows_err(GetLastError());
}
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -408,7 +416,7 @@ static UINT drive_process_irp_set_information(DRIVE_DEVICE* drive, IRP* irp)
UINT32 FsInformationClass = 0;
UINT32 Length = 0;
if (!drive || !irp || !irp->Complete || !irp->input || !irp->output)
if (!drive || !irp || !irp->input || !irp->output)
return ERROR_INVALID_PARAMETER;
if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 32))
@@ -432,6 +440,8 @@ static UINT drive_process_irp_set_information(DRIVE_DEVICE* drive, IRP* irp)
irp->IoStatus = STATUS_DIRECTORY_NOT_EMPTY;
Stream_Write_UINT32(irp->output, Length);
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -579,6 +589,7 @@ static UINT drive_process_irp_query_volume_information(DRIVE_DEVICE* drive, IRP*
break;
}
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -591,7 +602,7 @@ static UINT drive_process_irp_query_volume_information(DRIVE_DEVICE* drive, IRP*
*/
static UINT drive_process_irp_silent_ignore(DRIVE_DEVICE* drive, IRP* irp)
{
if (!drive || !irp || !irp->output || !irp->Complete)
if (!drive || !irp || !irp->output)
return ERROR_INVALID_PARAMETER;
if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 4))
@@ -601,6 +612,7 @@ static UINT drive_process_irp_silent_ignore(DRIVE_DEVICE* drive, IRP* irp)
WLog_VRB(TAG, "Silently ignore FSInformationClass %s [0x%08" PRIx32 "]",
FSInformationClass2Tag(FsInformationClass), FsInformationClass);
Stream_Write_UINT32(irp->output, 0); /* Length */
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -617,7 +629,7 @@ static UINT drive_process_irp_query_directory(DRIVE_DEVICE* drive, IRP* irp)
UINT32 PathLength = 0;
UINT32 FsInformationClass = 0;
if (!drive || !irp || !irp->Complete)
if (!drive || !irp)
return ERROR_INVALID_PARAMETER;
if (!Stream_CheckAndLogRequiredLength(TAG, irp->input, 32))
@@ -644,6 +656,7 @@ static UINT drive_process_irp_query_directory(DRIVE_DEVICE* drive, IRP* irp)
irp->IoStatus = drive_map_windows_err(GetLastError());
}
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -668,6 +681,7 @@ static UINT drive_process_irp_directory_control(DRIVE_DEVICE* drive, IRP* irp)
default:
irp->IoStatus = STATUS_NOT_SUPPORTED;
Stream_Write_UINT32(irp->output, 0); /* Length */
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -685,6 +699,7 @@ static UINT drive_process_irp_device_control(DRIVE_DEVICE* drive, IRP* irp)
return ERROR_INVALID_PARAMETER;
Stream_Write_UINT32(irp->output, 0); /* OutputBufferLength */
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -746,6 +761,7 @@ static UINT drive_process_irp(DRIVE_DEVICE* drive, IRP* irp)
default:
irp->IoStatus = STATUS_NOT_SUPPORTED;
WINPR_ASSERT(irp->Complete);
error = irp->Complete(irp);
break;
}

5
channels/parallel/client/parallel_main.c
View File

@@ -119,6 +119,7 @@ static UINT parallel_process_irp_create(PARALLEL_DEVICE* parallel, IRP* irp)
Stream_Write_UINT32(irp->output, parallel->id);
Stream_Write_UINT8(irp->output, 0);
free(path);
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -135,6 +136,7 @@ static UINT parallel_process_irp_close(PARALLEL_DEVICE* parallel, IRP* irp)
(void)close(parallel->file);
Stream_Zero(irp->output, 5); /* Padding(5) */
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -196,6 +198,7 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp)
}
free(buffer);
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -244,6 +247,7 @@ static UINT parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp)
Stream_Write_UINT32(irp->output, Length);
Stream_Write_UINT8(irp->output, 0); /* Padding */
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -299,6 +303,7 @@ static UINT parallel_process_irp(PARALLEL_DEVICE* parallel, IRP* irp)
default:
irp->IoStatus = STATUS_NOT_SUPPORTED;
WINPR_ASSERT(irp->Complete);
error = irp->Complete(irp);
break;
}

2
channels/printer/client/printer_main.c
View File

@@ -478,6 +478,7 @@ static UINT printer_process_irp_create(PRINTER_DEVICE* printer_dev, IRP* irp)
irp->IoStatus = STATUS_PRINT_QUEUE_FULL;
}
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}
@@ -509,6 +510,7 @@ static UINT printer_process_irp_close(PRINTER_DEVICE* printer_dev, IRP* irp)
}
Stream_Zero(irp->output, 4); /* Padding(4) */
WINPR_ASSERT(irp->Complete);
return irp->Complete(irp);
}

3
channels/rdpdr/client/rdpdr_main.c
View File

@@ -1408,7 +1408,8 @@ static BOOL device_announce(ULONG_PTR key, void* element, void* data)
arg->count++;
WLog_Print(rdpdr->log, WLOG_INFO,
"registered [%09s] device #%" PRIu32 ": %s (type=%" PRIu32 " id=%" PRIu32 ")",
"registered [%09s] device #%" PRIu32 ": %05s (type=%2" PRIu32 " id=%2" PRIu32
")",
rdpdr_device_type_string(device->type), arg->count, device->name, device->type,
device->id);
}

1
channels/rdpsnd/common/CMakeLists.txt
View File

@@ -20,5 +20,6 @@ set(SRCS rdpsnd_common.h rdpsnd_common.c)
# Library currently header only
add_library(rdpsnd-common STATIC ${SRCS})
set_property(TARGET rdpsnd-common PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Common")
channel_install(rdpsnd-common ${FREERDP_ADDIN_PATH} "FreeRDPTargets")

1
channels/remdesk/common/CMakeLists.txt
View File

@@ -19,5 +19,6 @@
set(SRCS remdesk_common.h remdesk_common.c)
add_library(remdesk-common STATIC ${SRCS})
set_property(TARGET remdesk-common PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Common")
channel_install(remdesk-common ${FREERDP_ADDIN_PATH} "FreeRDPTargets")

2
channels/serial/client/serial_main.c
View File

@@ -529,6 +529,7 @@ static DWORD WINAPI irp_thread_func(LPVOID arg)
}
EnterCriticalSection(&data->serial->TerminatingIrpThreadsLock);
WINPR_ASSERT(data->irp->Complete);
error = data->irp->Complete(data->irp);
LeaveCriticalSection(&data->serial->TerminatingIrpThreadsLock);
error_out:
@@ -697,6 +698,7 @@ error_handle:
if (irpThread)
(void)CloseHandle(irpThread);
irp->IoStatus = STATUS_NO_MEMORY;
WINPR_ASSERT(irp->Complete);
irp->Complete(irp);
free(data);
}

1
channels/urbdrc/common/CMakeLists.txt
View File

@@ -19,5 +19,6 @@
set(SRCS urbdrc_types.h urbdrc_helpers.h urbdrc_helpers.c msusb.h msusb.c)
add_library(urbdrc-common STATIC ${SRCS})
set_property(TARGET urbdrc-common PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Common")
channel_install(urbdrc-common ${FREERDP_ADDIN_PATH} "FreeRDPTargets")