Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
afc88119
Commit
afc88119
authored
Oct 12, 2020
by
Claes
Committed by
Esteban Blanc
Dec 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wb classlistattrref didn't always test for disabled
parent
0448e0a7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
1 deletion
+33
-1
wb/lib/wb/src/wb_trv.cpp
wb/lib/wb/src/wb_trv.cpp
+27
-1
wb/lib/wb/src/wb_volume.cpp
wb/lib/wb/src/wb_volume.cpp
+6
-0
No files found.
wb/lib/wb/src/wb_trv.cpp
View file @
afc88119
...
@@ -1069,6 +1069,7 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
...
@@ -1069,6 +1069,7 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
int
size
;
int
size
;
pwr_tObjid
child
;
pwr_tObjid
child
;
pwr_tCid
child_cid
;
pwr_tCid
child_cid
;
pwr_tDisableAttr
disabled
;
switch
(
depth
)
{
switch
(
depth
)
{
case
trv_eDepth_Deep
:
case
trv_eDepth_Deep
:
...
@@ -1094,6 +1095,12 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
...
@@ -1094,6 +1095,12 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
continue
;
continue
;
}
}
sts
=
ldh_AttributeDisabled
(
ldhses
,
&
aref
,
&
disabled
);
if
(
EVEN
(
sts
))
return
sts
;
if
(
disabled
)
continue
;
sts
=
(
backcall
)(
&
aref
,
arg1
,
arg2
,
arg3
,
arg4
,
arg5
);
sts
=
(
backcall
)(
&
aref
,
arg1
,
arg2
,
arg3
,
arg4
,
arg5
);
if
(
EVEN
(
sts
))
if
(
EVEN
(
sts
))
return
sts
;
return
sts
;
...
@@ -1118,6 +1125,12 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
...
@@ -1118,6 +1125,12 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
continue
;
continue
;
}
}
sts
=
ldh_AttributeDisabled
(
ldhses
,
&
aref
,
&
disabled
);
if
(
EVEN
(
sts
))
return
sts
;
if
(
disabled
)
continue
;
sts
=
(
backcall
)(
&
aref
,
arg1
,
arg2
,
arg3
,
arg4
,
arg5
);
sts
=
(
backcall
)(
&
aref
,
arg1
,
arg2
,
arg3
,
arg4
,
arg5
);
if
(
EVEN
(
sts
))
if
(
EVEN
(
sts
))
return
sts
;
return
sts
;
...
@@ -1155,6 +1168,12 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
...
@@ -1155,6 +1168,12 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
continue
;
continue
;
}
}
sts
=
ldh_AttributeDisabled
(
ldhses
,
&
aref
,
&
disabled
);
if
(
EVEN
(
sts
))
return
sts
;
if
(
disabled
)
continue
;
sts
=
(
backcall
)(
&
aref
,
arg1
,
arg2
,
arg3
,
arg4
,
arg5
);
sts
=
(
backcall
)(
&
aref
,
arg1
,
arg2
,
arg3
,
arg4
,
arg5
);
if
(
EVEN
(
sts
))
if
(
EVEN
(
sts
))
return
sts
;
return
sts
;
...
@@ -1175,6 +1194,13 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
...
@@ -1175,6 +1194,13 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
if
(
trv_wildcard
(
name
,
aname
)
==
1
)
if
(
trv_wildcard
(
name
,
aname
)
==
1
)
continue
;
continue
;
}
}
sts
=
ldh_AttributeDisabled
(
ldhses
,
&
aref
,
&
disabled
);
if
(
EVEN
(
sts
))
return
sts
;
if
(
disabled
)
continue
;
sts
=
(
backcall
)(
&
aref
,
arg1
,
arg2
,
arg3
,
arg4
,
arg5
);
sts
=
(
backcall
)(
&
aref
,
arg1
,
arg2
,
arg3
,
arg4
,
arg5
);
if
(
EVEN
(
sts
))
if
(
EVEN
(
sts
))
return
sts
;
return
sts
;
...
...
wb/lib/wb/src/wb_volume.cpp
View file @
afc88119
...
@@ -1123,7 +1123,13 @@ void wb_volume::aref(pwr_tCid cid, pwr_sAttrRef* arp)
...
@@ -1123,7 +1123,13 @@ void wb_volume::aref(pwr_tCid cid, pwr_sAttrRef* arp)
arp
->
Offset
=
item
->
offset
[
0
];
arp
->
Offset
=
item
->
offset
[
0
];
arp
->
Size
=
bd_size
;
arp
->
Size
=
bd_size
;
arp
->
Body
=
cdh_cidToBid
(
cid
,
pwr_eBix_rt
);
arp
->
Body
=
cdh_cidToBid
(
cid
,
pwr_eBix_rt
);
o
->
unref
();
o
->
unref
();
if
(
item
->
flags
[
0
]
&
PWR_MASK_DISABLEATTR
)
{
wb_attribute
a
=
attribute
(
arp
);
if
(
a
.
disabled
())
continue
;
}
return
;
return
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment