Commit 14225907d10d57dea5dcf0548c09bb28c8c79a76

Authored by decalage2
1 parent aeecbf17

mraptor: added macro trigger InkPicture_Painted

Showing 1 changed file with 5 additions and 2 deletions
oletools/mraptor.py
@@ -50,8 +50,9 @@ http://www.decalage.info/python/oletools @@ -50,8 +50,9 @@ http://www.decalage.info/python/oletools
50 # 2016-02-29 v0.02 PL: - added Workbook_Activate, FileSaveAs 50 # 2016-02-29 v0.02 PL: - added Workbook_Activate, FileSaveAs
51 # 2016-03-04 v0.03 PL: - returns an exit code based on the overall result 51 # 2016-03-04 v0.03 PL: - returns an exit code based on the overall result
52 # 2016-03-08 v0.04 PL: - collapse long lines before analysis 52 # 2016-03-08 v0.04 PL: - collapse long lines before analysis
  53 +# 2016-08-31 v0.50 PL: - added macro trigger InkPicture_Painted
53 54
54 -__version__ = '0.04' 55 +__version__ = '0.50'
55 56
56 #------------------------------------------------------------------------------ 57 #------------------------------------------------------------------------------
57 # TODO: 58 # TODO:
@@ -85,11 +86,13 @@ MSG_ISSUES = 'Please report this issue on %s' % URL_ISSUES @@ -85,11 +86,13 @@ MSG_ISSUES = 'Please report this issue on %s' % URL_ISSUES
85 # 'DocumentChange','Document_New', 86 # 'DocumentChange','Document_New',
86 # 'NewDocument' 87 # 'NewDocument'
87 # 'Workbook_Open', 'Workbook_Close', 88 # 'Workbook_Open', 'Workbook_Close',
  89 +# *_Painted such as InkPicture1_Painted
88 90
89 # TODO: check if line also contains Sub or Function 91 # TODO: check if line also contains Sub or Function
90 re_autoexec = re.compile(r'(?i)\b(?:Auto(?:Exec|_?Open|_?Close|Exit|New)' + 92 re_autoexec = re.compile(r'(?i)\b(?:Auto(?:Exec|_?Open|_?Close|Exit|New)' +
91 r'|Document(?:_?Open|_Close|BeforeClose|Change|_New)' + 93 r'|Document(?:_?Open|_Close|BeforeClose|Change|_New)' +
92 - r'|NewDocument|Workbook(?:_Open|_Activate|_Close))\b') 94 + r'|NewDocument|Workbook(?:_Open|_Activate|_Close)' +
  95 + r'|\w+_Painted)\b')
93 96
94 # MS-VBAL 5.4.5.1 Open Statement: 97 # MS-VBAL 5.4.5.1 Open Statement:
95 RE_OPEN_WRITE = r'(?:\bOpen\b[^\n]+\b(?:Write|Append|Binary|Output|Random)\b)' 98 RE_OPEN_WRITE = r'(?:\bOpen\b[^\n]+\b(?:Write|Append|Binary|Output|Random)\b)'