mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2940 from metalefty/astyle 

Update astyle to 3.4.12
This commit is contained in:
metalefty 2024-02-08 21:39:19 +09:00 committed by GitHub
parent 8af430e197 b8f0094603
commit 4f8301f38a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -194,8 +194,8 @@ jobs:
CC: gcc
# This is required to use a version of astyle other than that
# supplied with the operating system
ASTYLE_VER: 3.1
ASTYLE_REPO: https://svn.code.sf.net/p/astyle/code/tags
ASTYLE_VER: 3.4.12
ASTYLE_REPO: https://gitlab.com/saalen/astyle.git
steps:
# Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')
- name: Get operating system name and version.

6
astyle_config.as
View File

@ -19,13 +19,13 @@
--convert-tabs
# requires --convert-tabs to work properly
--indent-preprocessor
--indent-preproc-define
--indent-col1-comments
--min-conditional-indent=2
--max-instatement-indent=40
--max-continuation-indent=40
# Insert space padding around operators.
--pad-oper
@ -35,7 +35,7 @@
# Add brackets to unbracketed one line conditional statements (e.g. 'if', 'for', 'while'...).
--add-brackets
--add-braces
--align-pointer=name

16
common/parse.h
View File

@ -613,14 +613,14 @@ in_utf16_le_terminated_as_utf8_length(struct stream *s);
do \
{ \
_v = \
(tui64)(*((unsigned char *)_s->p)) | \
(((tui64) (*(((unsigned char *)_s->p) + 1))) << 8) | \
(((tui64) (*(((unsigned char *)_s->p) + 2))) << 16) | \
(((tui64) (*(((unsigned char *)_s->p) + 3))) << 24) | \
(((tui64) (*(((unsigned char *)_s->p) + 4))) << 32) | \
(((tui64) (*(((unsigned char *)_s->p) + 5))) << 40) | \
(((tui64) (*(((unsigned char *)_s->p) + 6))) << 48) | \
(((tui64) (*(((unsigned char *)_s->p) + 7))) << 56); \
(tui64)(*((unsigned char *)_s->p)) | \
(((tui64) (*(((unsigned char *)_s->p) + 1))) << 8) | \
(((tui64) (*(((unsigned char *)_s->p) + 2))) << 16) | \
(((tui64) (*(((unsigned char *)_s->p) + 3))) << 24) | \
(((tui64) (*(((unsigned char *)_s->p) + 4))) << 32) | \
(((tui64) (*(((unsigned char *)_s->p) + 5))) << 40) | \
(((tui64) (*(((unsigned char *)_s->p) + 6))) << 48) | \
(((tui64) (*(((unsigned char *)_s->p) + 7))) << 56); \
_s->p += 8; \
} while (0)

2
common/pixman-region.c
View File

@ -2655,7 +2655,7 @@ PREFIX (_selfcheck) (region_type_t *reg)
}
else
{
box_type_t *pbox_p, * pbox_n;
box_type_t *pbox_p, *pbox_n;
box_type_t box;
pbox_p = PIXREGION_RECTS (reg);

2
libxrdp/xrdp_mppc_enc.c
View File

@ -41,7 +41,7 @@
#define CRC_INIT 0xFFFF
#define CRC(_crcval, _newchar) _crcval = \
((_crcval) >> 8) ^ g_crc_table[((_crcval) ^ (_newchar)) & 0x00ff]
((_crcval) >> 8) ^ g_crc_table[((_crcval) ^ (_newchar)) & 0x00ff]
/* CRC16 defs */
static const tui16 g_crc_table[256] =

2
neutrinordp/xrdp-neutrinordp.c
View File

@ -1945,7 +1945,7 @@ lfreerdp_pre_connect(freerdp *instance)
(mod->client_info.rail_support_level > 0))
{
instance->settings->performance_flags |= (PERF_DISABLE_WALLPAPER |
PERF_DISABLE_FULLWINDOWDRAG);
PERF_DISABLE_FULLWINDOWDRAG);
LOG(LOG_LEVEL_DEBUG, "Add in performance setting for Railsupport:"
"[0x%08x]", PERF_DISABLE_WALLPAPER |
PERF_DISABLE_FULLWINDOWDRAG);

9
scripts/install_astyle.sh
View File

@ -15,8 +15,8 @@ INSTALL_ROOT=~/astyle.local
# ----------------------------------------------------------------------------
usage()
{
echo "** Usage: $0 <svn-tags-url> <tag-name>"
echo " e.g. $0 https://svn.code.sf.net/p/astyle/code/tags 3.1"
echo "** Usage: $0 <git-repo> <version-tag>"
echo " e.g. $0 https://gitlab.com/saalen/astyle.git 3.4.12"
} >&2
# ----------------------------------------------------------------------------
@ -80,9 +80,8 @@ fi
# Put everything in this directory
FILESDIR=$INSTALL_ROOT/$ASTYLE_VER
svn checkout ${REPO_URL}/${ASTYLE_VER}/AStyle "$workdir"
cd "$workdir"
git clone -b "${ASTYLE_VER}" --depth 1 ${REPO_URL} "$workdir"
cd "$workdir"/AStyle
make_args="DESTDIR=$FILESDIR"

2
scripts/run_astyle.sh
View File

@ -7,7 +7,7 @@
# Note: the script must be run from the root directory of the xrdp repository
INSTALL_ROOT=~/astyle.local
ASTYLE_FROM_XRDP=$INSTALL_ROOT/3.1/usr/bin/astyle
ASTYLE_FROM_XRDP=$INSTALL_ROOT/3.4.12/usr/bin/astyle
MIN_ASTYLE_VER="3.1"
# ----------------------------------------------------------------------------

52
sesman/chansrv/devredir.c
View File

@ -1390,9 +1390,9 @@ devredir_get_dir_listing(struct state_dirscan *fusep, tui32 device_id,
CreateDisposition = CD_FILE_OPEN;
rval = devredir_send_drive_create_request(device_id, irp->pathname,
DesiredAccess, CreateOptions,
0, CreateDisposition,
irp->CompletionId);
DesiredAccess, CreateOptions,
0, CreateDisposition,
irp->CompletionId);
LOG_DEVEL(LOG_LEVEL_DEBUG, "looking for device_id=%d path=%s", device_id, irp->pathname);
@ -1457,10 +1457,10 @@ devredir_lookup_entry(struct state_lookup *fusep, tui32 device_id,
device_id, irp->pathname, irp->CompletionId);
rval = devredir_send_drive_create_request(device_id,
irp->pathname,
DesiredAccess, CreateOptions,
0, CreateDisposition,
irp->CompletionId);
irp->pathname,
DesiredAccess, CreateOptions,
0, CreateDisposition,
irp->CompletionId);
}
return rval;
@ -1526,10 +1526,10 @@ devredir_setattr_for_entry(struct state_setattr *fusep, tui32 device_id,
device_id, irp->pathname);
rval = devredir_send_drive_create_request(device_id,
irp->pathname,
DesiredAccess, CreateOptions,
0, CreateDisposition,
irp->CompletionId);
irp->pathname,
DesiredAccess, CreateOptions,
0, CreateDisposition,
irp->CompletionId);
}
return rval;
@ -1578,10 +1578,10 @@ devredir_file_create(struct state_create *fusep, tui32 device_id,
CreateDisposition = 0x02; /* got this value from windows */
rval = devredir_send_drive_create_request(device_id, path,
DesiredAccess, CreateOptions,
FileAttributes,
CreateDisposition,
irp->CompletionId);
DesiredAccess, CreateOptions,
FileAttributes,
CreateDisposition,
irp->CompletionId);
}
return rval;
@ -1640,10 +1640,10 @@ devredir_file_open(struct state_open *fusep, tui32 device_id,
CreateDisposition = CD_FILE_OPEN; // WAS 1
rval = devredir_send_drive_create_request(device_id, path,
DesiredAccess, CreateOptions,
FileAttributes,
CreateDisposition,
irp->CompletionId);
DesiredAccess, CreateOptions,
FileAttributes,
CreateDisposition,
irp->CompletionId);
}
return rval;
@ -1720,9 +1720,9 @@ devredir_rmdir_or_file(struct state_remove *fusep, tui32 device_id,
CreateDisposition = 0x01; /* got this value from windows */
rval = devredir_send_drive_create_request(device_id, path,
DesiredAccess, CreateOptions,
0, CreateDisposition,
irp->CompletionId);
DesiredAccess, CreateOptions,
0, CreateDisposition,
irp->CompletionId);
}
return rval;
@ -1898,10 +1898,10 @@ int devredir_file_rename(struct state_rename *fusep, tui32 device_id,
CreateDisposition = CD_FILE_OPEN; // WAS 1
rval = devredir_send_drive_create_request(device_id, old_name,
DesiredAccess, CreateOptions,
FileAttributes,
CreateDisposition,
irp->CompletionId);
DesiredAccess, CreateOptions,
FileAttributes,
CreateDisposition,
irp->CompletionId);
}
return rval;