Skip to content

Commit 64b6264

Browse files
RookiestyleRookiestyle
committed
Fix crash with certain KeePass dev builds
Closes #14
1 parent 5a127af commit 64b6264

File tree

4 files changed

+232
-6
lines changed

4 files changed

+232
-6
lines changed

‎.editorconfig‎

Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
3+
4+
# C# files
5+
[*.cs]
6+
7+
#### Core EditorConfig Options ####
8+
9+
# Indentation and spacing
10+
indent_size = 4
11+
indent_style = space
12+
tab_width = 4
13+
trim_trailing_whitespace = false
14+
15+
# New line preferences
16+
end_of_line = lf
17+
insert_final_newline = true
18+
19+
#### .NET Coding Conventions ####
20+
21+
# Organize usings
22+
dotnet_separate_import_directive_groups = false
23+
dotnet_sort_system_directives_first = true
24+
file_header_template = unset
25+
26+
# this. and Me. preferences
27+
dotnet_style_qualification_for_event = false
28+
dotnet_style_qualification_for_field = false
29+
dotnet_style_qualification_for_method = false
30+
dotnet_style_qualification_for_property = false
31+
32+
# Language keywords vs BCL types preferences
33+
dotnet_style_predefined_type_for_locals_parameters_members = true
34+
dotnet_style_predefined_type_for_member_access = true
35+
36+
# Parentheses preferences
37+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
38+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
39+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
40+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
41+
42+
# Modifier preferences
43+
dotnet_style_require_accessibility_modifiers = for_non_interface_members
44+
45+
# Expression-level preferences
46+
dotnet_style_coalesce_expression = true
47+
dotnet_style_collection_initializer = true
48+
dotnet_style_explicit_tuple_names = true
49+
dotnet_style_namespace_match_folder = true
50+
dotnet_style_null_propagation = true
51+
dotnet_style_object_initializer = true
52+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
53+
dotnet_style_prefer_auto_properties = true
54+
dotnet_style_prefer_compound_assignment = true
55+
dotnet_style_prefer_conditional_expression_over_assignment = true
56+
dotnet_style_prefer_conditional_expression_over_return = true
57+
dotnet_style_prefer_inferred_anonymous_type_member_names = true
58+
dotnet_style_prefer_inferred_tuple_names = true
59+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
60+
dotnet_style_prefer_simplified_boolean_expressions = true
61+
dotnet_style_prefer_simplified_interpolation = true
62+
63+
# Field preferences
64+
dotnet_style_readonly_field = true
65+
66+
# Parameter preferences
67+
dotnet_code_quality_unused_parameters = all
68+
69+
# Suppression preferences
70+
dotnet_remove_unnecessary_suppression_exclusions = none
71+
72+
# New line preferences
73+
dotnet_style_allow_multiple_blank_lines_experimental = true
74+
dotnet_style_allow_statement_immediately_after_block_experimental = true
75+
76+
#### C# Coding Conventions ####
77+
78+
# var preferences
79+
csharp_style_var_elsewhere = false
80+
csharp_style_var_for_built_in_types = false
81+
csharp_style_var_when_type_is_apparent = false
82+
83+
# Expression-bodied members
84+
csharp_style_expression_bodied_accessors = true
85+
csharp_style_expression_bodied_constructors = false
86+
csharp_style_expression_bodied_indexers = true
87+
csharp_style_expression_bodied_lambdas = true
88+
csharp_style_expression_bodied_local_functions = false
89+
csharp_style_expression_bodied_methods = false
90+
csharp_style_expression_bodied_operators = false
91+
csharp_style_expression_bodied_properties = true
92+
93+
# Pattern matching preferences
94+
csharp_style_pattern_matching_over_as_with_null_check = true
95+
csharp_style_pattern_matching_over_is_with_cast_check = true
96+
csharp_style_prefer_not_pattern = true
97+
csharp_style_prefer_pattern_matching = true
98+
csharp_style_prefer_switch_expression = true
99+
100+
# Null-checking preferences
101+
csharp_style_conditional_delegate_call = true
102+
103+
# Modifier preferences
104+
csharp_prefer_static_local_function = true
105+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
106+
107+
# Code-block preferences
108+
csharp_prefer_braces = true
109+
csharp_prefer_simple_using_statement = true
110+
111+
# Expression-level preferences
112+
csharp_prefer_simple_default_expression = true
113+
csharp_style_deconstructed_variable_declaration = true
114+
csharp_style_implicit_object_creation_when_type_is_apparent = true
115+
csharp_style_inlined_variable_declaration = true
116+
csharp_style_pattern_local_over_anonymous_function = true
117+
csharp_style_prefer_index_operator = true
118+
csharp_style_prefer_range_operator = true
119+
csharp_style_throw_expression = true
120+
csharp_style_unused_value_assignment_preference = discard_variable
121+
csharp_style_unused_value_expression_statement_preference = discard_variable
122+
123+
# 'using' directive preferences
124+
csharp_using_directive_placement = outside_namespace
125+
126+
# New line preferences
127+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
128+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
129+
csharp_style_allow_embedded_statements_on_same_line_experimental = true
130+
131+
#### C# Formatting Rules ####
132+
133+
# New line preferences
134+
csharp_new_line_before_catch = true
135+
csharp_new_line_before_else = true
136+
csharp_new_line_before_finally = true
137+
csharp_new_line_before_members_in_anonymous_types = true
138+
csharp_new_line_before_members_in_object_initializers = true
139+
csharp_new_line_before_open_brace = all
140+
csharp_new_line_between_query_expression_clauses = true
141+
142+
# Indentation preferences
143+
csharp_indent_block_contents = true
144+
csharp_indent_braces = false
145+
csharp_indent_case_contents = true
146+
csharp_indent_case_contents_when_block = true
147+
csharp_indent_labels = one_less_than_current
148+
csharp_indent_switch_labels = true
149+
150+
# Space preferences
151+
csharp_space_after_cast = false
152+
csharp_space_after_colon_in_inheritance_clause = true
153+
csharp_space_after_comma = true
154+
csharp_space_after_dot = false
155+
csharp_space_after_keywords_in_control_flow_statements = true
156+
csharp_space_after_semicolon_in_for_statement = true
157+
csharp_space_around_binary_operators = before_and_after
158+
csharp_space_around_declaration_statements = false
159+
csharp_space_before_colon_in_inheritance_clause = true
160+
csharp_space_before_comma = false
161+
csharp_space_before_dot = false
162+
csharp_space_before_open_square_brackets = false
163+
csharp_space_before_semicolon_in_for_statement = false
164+
csharp_space_between_empty_square_brackets = false
165+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
166+
csharp_space_between_method_call_name_and_opening_parenthesis = false
167+
csharp_space_between_method_call_parameter_list_parentheses = false
168+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
169+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
170+
csharp_space_between_method_declaration_parameter_list_parentheses = false
171+
csharp_space_between_parentheses = false
172+
csharp_space_between_square_brackets = false
173+
174+
# Wrapping preferences
175+
csharp_preserve_single_line_blocks = true
176+
csharp_preserve_single_line_statements = true
177+
178+
#### Naming styles ####
179+
180+
# Naming rules
181+
182+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
183+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
184+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
185+
186+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
187+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
188+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
189+
190+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
191+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
192+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
193+
194+
# Symbol specifications
195+
196+
dotnet_naming_symbols.interface.applicable_kinds = interface
197+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
198+
dotnet_naming_symbols.interface.required_modifiers =
199+
200+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
201+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
202+
dotnet_naming_symbols.types.required_modifiers =
203+
204+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
205+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
206+
dotnet_naming_symbols.non_field_members.required_modifiers =
207+
208+
# Naming styles
209+
210+
dotnet_naming_style.pascal_case.required_prefix =
211+
dotnet_naming_style.pascal_case.required_suffix =
212+
dotnet_naming_style.pascal_case.word_separator =
213+
dotnet_naming_style.pascal_case.capitalization = pascal_case
214+
215+
dotnet_naming_style.begins_with_i.required_prefix = I
216+
dotnet_naming_style.begins_with_i.required_suffix =
217+
dotnet_naming_style.begins_with_i.word_separator =
218+
dotnet_naming_style.begins_with_i.capitalization = pascal_case
219+
220+
[*.{cs,vb}]
221+
tab_width=2
222+
indent_size=2

‎src/AWM.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ internal static string FirstWindowText
337337
get
338338
{
339339
if (!Valid) return string.Empty;
340+
if (WindowTexts == null) return string.Empty; //https://github.com/Rookiestyle/AdvancedAutoType/issues/14 - excpect the unexpected, maybe this changes once again
340341
if (WindowTexts.Items.Count == 0) return string.Empty;
341342
return WindowTexts.Items[0] as string;
342343
}
@@ -347,6 +348,7 @@ internal static Image FirstWindowImage
347348
get
348349
{
349350
if (!Valid) return null;
351+
if (Images == null) return null; //https://github.com/Rookiestyle/AdvancedAutoType/issues/14 - excpect the unexpected, maybe this changes once again
350352
if (Images.Count == 0) return null;
351353
return Images[0];
352354
}
@@ -401,10 +403,12 @@ private static void Init()
401403
lMsg.Add("Created EditAutoTypeItemForm, handle: " + f.Handle.ToString());
402404

403405
WindowTexts = (ComboBox)Tools.GetControl("m_cmbWindow", f);
404-
Images = (List<Image>)Tools.GetField("m_vWndImages", f);
406+
//https://github.com/Rookiestyle/AdvancedAutoType/issues/14
407+
Images = (List<Image>)Tools.GetField("m_vWndImages", f); //Works up to KeePass 2.54 including
408+
if (Images == null) Images = (List<Image>)Tools.GetField("m_lWndImages", f);
405409

406-
lMsg.Add("m_cmbWindow: " + WindowTexts == null ? "Not found" : "Found");
407-
lMsg.Add("m_vWndImages: " + Images == null ? "Not found" : "Found");
410+
lMsg.Add("m_cmbWindow: " + (WindowTexts == null ? "Not found" : "Found"));
411+
lMsg.Add("m_vWndImages: " + (Images == null ? "Not found" : "Found"));
408412

409413
if (KeePassLib.Native.NativeLib.IsUnix())
410414
m_miPopulateWindowsList = f.GetType().GetMethod("PopulateWindowsListUnix", BindingFlags.Instance | BindingFlags.NonPublic);

‎src/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ KeePass types EITHER everything before OR everything after {AAT}.
2727
//
2828
// You can specify all the values or you can use the default the Revision and
2929
// Build Numbers by using the '*' as shown below:
30-
[assembly: AssemblyVersion("2.1")]
31-
[assembly: AssemblyFileVersion("2.1")]
30+
[assembly: AssemblyVersion("2.1.1")]
31+
[assembly: AssemblyFileVersion("2.1.1")]
3232
[assembly: Guid("78C152F3-EAF8-4FFC-9BE3-F5DC0CD66E5D")]
3333

‎version.info‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:
22
AlternateAutoType:1.20
3-
Advanced Auto-Type:2.1
3+
Advanced Auto-Type:2.1.1
44
Advanced Auto-Type!de:8
55
Advanced Auto-Type!pt:4
66
Advanced Auto-Type!ru:4

0 commit comments

Comments
 (0)