fixed some remakes and compiler errors

This commit is contained in:
Martin Haimberger 2015-07-22 02:36:24 -07:00
parent 08b17b5f64
commit 58ada13dd9
5 changed files with 7 additions and 9 deletions

View File

@ -457,10 +457,7 @@ static WIN32ERROR audin_on_close(IWTSVirtualChannelCallback* pChannelCallback)
{
IFCALLRET(audin->device->Close, error, audin->device);
if (error != CHANNEL_RC_OK)
{
WLog_ERR(TAG, "Close failed with errorcode %lu", error);
return error;
}
}
free(callback->formats);

View File

@ -191,7 +191,7 @@ static void* audin_oss_thread_func(void* arg)
if ((pcm_handle = open(dev_name, O_RDONLY)) < 0)
{
OSS_LOG_ERR("sound dev open failed", errno);
error = (WIN32ERROR)errno;
error = (WIN32ERROR)ERROR_INTERNAL_ERROR;
goto err_out;
}

View File

@ -454,9 +454,9 @@ static void* audin_server_thread_func(void* arg)
case MSG_SNDIN_FORMATS:
if ((error = audin_server_recv_formats(audin, s, BytesReturned)))
{
WLog_ERR(TAG, "audin_server_recv_formats failed with error %lu!", error);
goto out_capacity;
}
WLog_ERR(TAG, "audin_server_recv_formats failed with error %lu!", error);
goto out_capacity;
}
if ((error = audin_server_send_open(audin, s)))
{
WLog_ERR(TAG, "audin_server_send_open failed with error %lu!", error);

View File

@ -564,9 +564,10 @@ static WIN32ERROR drive_process_irp_device_control(DRIVE_DEVICE* drive, IRP* irp
static WIN32ERROR drive_process_irp(DRIVE_DEVICE* drive, IRP* irp)
{
irp->IoStatus = STATUS_SUCCESS;
WIN32ERROR error;
irp->IoStatus = STATUS_SUCCESS;
switch (irp->MajorFunction)
{
case IRP_MJ_CREATE:

View File

@ -810,12 +810,12 @@ static WIN32ERROR rdpdr_server_send_user_logged_on(RdpdrServerContext* context)
static WIN32ERROR rdpdr_server_receive_pdu(RdpdrServerContext* context, wStream* s, RDPDR_HEADER* header)
{
WIN32ERROR error = CHANNEL_RC_OK;
WLog_DBG(TAG, "RdpdrServerReceivePdu: Component: 0x%04X PacketId: 0x%04X",
header->Component, header->PacketId);
winpr_HexDump(TAG, WLOG_DEBUG, Stream_Buffer(s), Stream_Length(s));
WIN32ERROR error = CHANNEL_RC_OK;
if (header->Component == RDPDR_CTYP_CORE)
{