Skip to content

Commit

Permalink
upd code
Browse files Browse the repository at this point in the history
  • Loading branch information
henrypp committed Sep 11, 2023
1 parent c56ee4e commit 28178c2
Show file tree
Hide file tree
Showing 9 changed files with 565 additions and 551 deletions.
70 changes: 33 additions & 37 deletions src/controls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,42 @@ VOID _app_getapptooltipstring (
{
PITEM_APP_INFO ptr_app_info;
PITEM_APP ptr_app;
PR_STRING tmp_string1;
PR_STRING tmp_string2;
PR_STRING tmp_string3;
PR_STRING string;
PR_STRING value;
PR_STRING path = NULL;
R_STRINGBUILDER sb;

ptr_app = _app_getappitem (app_hash);
ptr_app_info = _app_getappinfobyhash2 (app_hash);

// file path
tmp_string3 = NULL;

if (ptr_app)
{
if (ptr_app->real_path)
{
tmp_string3 = ptr_app->real_path;
path = ptr_app->real_path;
}
else if (ptr_app->display_name)
{
tmp_string3 = ptr_app->display_name;
path = ptr_app->display_name;
}
else
{
tmp_string3 = ptr_app->original_path;
path = ptr_app->original_path;
}
}
else if (ptr_network)
{
if (ptr_network->path)
tmp_string3 = ptr_network->path;
path = ptr_network->path;
}
else if (ptr_log)
{
if (ptr_log->path)
tmp_string3 = ptr_log->path;
path = ptr_log->path;
}

if (tmp_string3)
if (path)
{
_r_obj_appendstringbuilder2 (buffer, tmp_string3);
_r_obj_appendstringbuilder2 (buffer, path);
_r_obj_appendstringbuilder (buffer, SZ_CRLF);
}

Expand Down Expand Up @@ -83,34 +79,34 @@ VOID _app_getapptooltipstring (
// compile
if (!_r_obj_isstringempty2 (sb.string))
{
tmp_string1 = _r_obj_concatstrings (
string = _r_obj_concatstrings (
2,
_r_locale_getstring (IDS_FILE),
L":\r\n"
);

_r_obj_insertstringbuilder2 (&sb, 0, tmp_string1);
_r_obj_insertstringbuilder2 (&sb, 0, string);
_r_obj_appendstringbuilder2 (buffer, sb.string);

_r_obj_dereference (tmp_string1);
_r_obj_dereference (string);
}

// file signature
if (ptr_app_info)
{
if (!_r_obj_isstringempty (ptr_app_info->signature_info))
{
tmp_string1 = _r_obj_concatstrings (
string = _r_obj_concatstrings (
4,
_r_locale_getstring (IDS_SIGNATURE),
L":\r\n" SZ_TAB,
ptr_app_info->signature_info->buffer,
SZ_CRLF
);

_r_obj_appendstringbuilder2 (buffer, tmp_string1);
_r_obj_appendstringbuilder2 (buffer, string);

_r_obj_dereference (tmp_string1);
_r_obj_dereference (string);
}
}

Expand All @@ -121,43 +117,43 @@ VOID _app_getapptooltipstring (
{
if (_app_istimerset (ptr_app))
{
tmp_string2 = _r_format_interval (ptr_app->timer - _r_unixtime_now (), 3);
value = _r_format_interval (ptr_app->timer - _r_unixtime_now (), 3);

if (tmp_string2)
if (value)
{
tmp_string1 = _r_obj_concatstrings (
string = _r_obj_concatstrings (
4,
_r_locale_getstring (IDS_TIMELEFT),
L":" SZ_TAB_CRLF,
tmp_string2->buffer,
value->buffer,
SZ_CRLF
);

_r_obj_appendstringbuilder2 (buffer, tmp_string1);
_r_obj_appendstringbuilder2 (buffer, string);

_r_obj_dereference (tmp_string2);
_r_obj_dereference (tmp_string1);
_r_obj_dereference (string);
_r_obj_dereference (value);
}
}
}

// app rules
tmp_string2 = _app_appexpandrules (app_hash, SZ_TAB_CRLF);
value = _app_appexpandrules (app_hash, SZ_TAB_CRLF);

if (tmp_string2)
if (value)
{
tmp_string1 = _r_obj_concatstrings (
string = _r_obj_concatstrings (
4,
_r_locale_getstring (IDS_RULE),
L":" SZ_TAB_CRLF,
tmp_string2->buffer,
value->buffer,
SZ_CRLF
);

_r_obj_appendstringbuilder2 (buffer, tmp_string1);
_r_obj_appendstringbuilder2 (buffer, string);

_r_obj_dereference (tmp_string2);
_r_obj_dereference (tmp_string1);
_r_obj_dereference (string);
_r_obj_dereference (value);
}

// app notes
Expand Down Expand Up @@ -208,14 +204,14 @@ VOID _app_getapptooltipstring (
_r_obj_appendstringbuilder (&sb, SZ_CRLF);
}

tmp_string1 = _r_obj_finalstringbuilder (&sb);
string = _r_obj_finalstringbuilder (&sb);

if (!_r_obj_isstringempty2 (tmp_string1))
if (!_r_obj_isstringempty2 (string))
{
_r_obj_insertstringbuilder (&sb, 0, L":\r\n");
_r_obj_insertstringbuilder (&sb, 0, _r_locale_getstring (IDS_NOTES));

_r_obj_appendstringbuilder2 (buffer, tmp_string1);
_r_obj_appendstringbuilder2 (buffer, string);
}

_r_obj_deletestringbuilder (&sb);
Expand Down
66 changes: 36 additions & 30 deletions src/helper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,35 +211,43 @@ PR_STRING _app_formatarpa (

_r_obj_initializestringbuilder (&formatted_address, 256);

if (af == AF_INET)
{
p4addr = (PIN_ADDR)address;

_r_obj_appendstringbuilderformat (
&formatted_address,
L"%hhu.%hhu.%hhu.%hhu.%s",
p4addr->s_impno,
p4addr->s_lh,
p4addr->s_host,
p4addr->s_net,
DNS_IP4_REVERSE_DOMAIN_STRING_W
);
}
else if (af == AF_INET6)
switch (af)
{
p6addr = (PIN6_ADDR)address;

for (INT i = sizeof (IN6_ADDR) - 1; i >= 0; i--)
case AF_INET:
{
p4addr = (PIN_ADDR)address;

_r_obj_appendstringbuilderformat (
&formatted_address,
L"%hhx.%hhx.",
p6addr->s6_addr[i] & 0xF,
(p6addr->s6_addr[i] >> 4) & 0xF
L"%hhu.%hhu.%hhu.%hhu.%s",
p4addr->s_impno,
p4addr->s_lh,
p4addr->s_host,
p4addr->s_net,
DNS_IP4_REVERSE_DOMAIN_STRING_W
);

break;
}

_r_obj_appendstringbuilder (&formatted_address, DNS_IP6_REVERSE_DOMAIN_STRING_W);
case AF_INET6:
{
p6addr = (PIN6_ADDR)address;

for (INT i = sizeof (IN6_ADDR) - 1; i >= 0; i--)
{
_r_obj_appendstringbuilderformat (
&formatted_address,
L"%hhx.%hhx.",
p6addr->s6_addr[i] & 0xF,
(p6addr->s6_addr[i] >> 4) & 0xF
);
}

_r_obj_appendstringbuilder (&formatted_address, DNS_IP6_REVERSE_DOMAIN_STRING_W);

break;
}
}

return _r_obj_finalstringbuilder (&formatted_address);
Expand Down Expand Up @@ -1579,9 +1587,9 @@ PR_STRING _app_resolveaddress (
return string;
}

status = DnsQuery (arpa_string->buffer, DNS_TYPE_PTR, DNS_QUERY_NO_HOSTS_FILE, NULL, &dns_records, NULL);
status = DnsQuery_W (arpa_string->buffer, DNS_TYPE_PTR, DNS_QUERY_NO_HOSTS_FILE, NULL, &dns_records, NULL);

if (status == NO_ERROR)
if (status == ERROR_SUCCESS)
{
if (dns_records)
{
Expand All @@ -1590,6 +1598,7 @@ PR_STRING _app_resolveaddress (
if (dns_record->wType == DNS_TYPE_PTR)
{
string = _r_obj_createstring (dns_record->Data.PTR.pNameHost);

break;
}
}
Expand All @@ -1598,10 +1607,7 @@ PR_STRING _app_resolveaddress (
}
}

if (!string)
string = _r_obj_referenceemptystring ();

_app_addcachetable (cache_resolution, arpa_hash, &lock_cache_resolution, _r_obj_reference (string));
_app_addcachetable (cache_resolution, arpa_hash, &lock_cache_resolution, _r_obj_referencesafe (string));

_r_obj_dereference (arpa_string);

Expand Down Expand Up @@ -2164,7 +2170,7 @@ VOID _app_wufixenable (
if (is_enable)
{
if (_r_fs_exists (buffer2))
_r_fs_deletefile (buffer2, TRUE);
_r_fs_deletefile (buffer2);

_r_fs_copyfile (buffer1, buffer2);

Expand Down Expand Up @@ -2192,7 +2198,7 @@ VOID _app_wufixenable (
_app_setappinfobyhash (app_hash, INFO_IS_UNDELETABLE, IntToPtr (FALSE));
}

_r_fs_deletefile (buffer2, TRUE);
_r_fs_deletefile (buffer2);
}
}

Expand Down
Loading

0 comments on commit 28178c2

Please sign in to comment.