Fixed compiler warnings and uninitialized data.

This commit is contained in:
Armin Novak 2017-02-17 11:17:45 +01:00
parent bee73adc5b
commit f8d22c00d6
3 changed files with 11 additions and 12 deletions

View File

@ -79,8 +79,7 @@ static BOOL wf_decode_color(wfContext* wfc, const UINT32 srcColor,
if (!gdi || !settings)
return FALSE;
SrcFormat = gdi_get_pixel_format(gdi->context->settings->ColorDepth,
FALSE);
SrcFormat = gdi_get_pixel_format(gdi->context->settings->ColorDepth);
if (format)
*format = SrcFormat;
@ -184,7 +183,7 @@ static HBRUSH wf_create_brush(wfContext* wfc, rdpBrush* brush, UINT32 color,
{
if (brush->bpp > 1)
{
UINT32 format = gdi_get_pixel_format(bpp, FALSE);
UINT32 format = gdi_get_pixel_format(bpp);
pattern = wf_create_dib(wfc, 8, 8, format, brush->data, NULL);
lbr.lbHatch = (ULONG_PTR) pattern;
}

View File

@ -166,7 +166,7 @@ static int testAbort(int port)
static int testSuccess(int port)
{
int rc;
STARTUPINFO si;
STARTUPINFOA si;
PROCESS_INFORMATION process;
char arg1[] = "/v:127.0.0.1:XXXXX";
char* clientArgs[] =

View File

@ -752,6 +752,14 @@ int win_shadow_wds_init(winShadowSubsystem* subsystem)
return -1;
}
file = subsystem->pAssistanceFile = freerdp_assistance_file_new();
if (!file)
{
WLog_ERR(TAG, "freerdp_assistance_file_new() failed");
return -1;
}
status = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) bstrConnectionString,
((UINT32*) bstrConnectionString)[-1], &(file->ConnectionString2), 0, NULL, NULL);
@ -763,14 +771,6 @@ int win_shadow_wds_init(winShadowSubsystem* subsystem)
return -1;
}
file = subsystem->pAssistanceFile = freerdp_assistance_file_new();
if (!file)
{
WLog_ERR(TAG, "freerdp_assistance_file_new() failed");
return -1;
}
status = freerdp_assistance_parse_connection_string2(file);
if (status < 0)