-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathWin32-API-0.68.patch
231 lines (219 loc) · 9.23 KB
/
Win32-API-0.68.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
diff -urN Win32-API-0.68.orig/Struct.pm Win32-API-0.68/Struct.pm
--- Win32-API-0.68.orig/Struct.pm 2012-02-14 06:03:07.000000000 +0900
+++ Win32-API-0.68/Struct.pm 2012-08-16 20:35:04.660686600 +0900
@@ -7,7 +7,7 @@
package Win32::API::Struct;
-$VERSION = '0.62';
+$VERSION = '0.69';
use Carp;
use Win32::API::Type;
@@ -53,6 +53,10 @@
if (is_known($type)) {
$packing = '>';
+ if ($name =~ s/\[(.*)\]$//) {
+ $size = $1;
+ $packing = $packing . '*' . $size;
+ }
return ($name, $packing, $type);
}
else {
@@ -78,9 +82,18 @@
foreach my $member (@{$self->{typedef}}) {
($name, $packing, $type) = @$member;
next unless defined $name;
- if ($packing eq '>') {
+ if ($packing =~ /^>\*(\d+)$/) {
+ $self->{$name} = [];
+ for (0..$1 - 1) {
+ push(@{$self->{$name}},Win32::API::Struct->new($type));
+ }
+ }
+ elsif ($packing eq '>') {
$self->{$name} = Win32::API::Struct->new($type);
}
+ elsif ($packing =~ /^[ABD-Z]\*(\d+)$/i) {
+ $self->{$name} = [];
+ }
}
$self->{__typedef__} = $_[0];
}
@@ -121,7 +134,14 @@
for my $member (@{$self->{typedef}}) {
my ($name, $packing, $type) = @{$member};
next unless defined $name;
- if (ref $self->{$name} eq q{Win32::API::Struct}) {
+ if (ref($self->{$name}) eq "ARRAY" && ref($self->{$name}->[0]) eq "Win32::API::Struct") {
+ for (@{$self->{$name}}) {
+ # If member is a struct, recursively calculate its size
+ # FIXME for subclasses
+ $size += $_->sizeof();
+ }
+ }
+ elsif (ref($self->{$name}) eq "Win32::API::Struct") {
# If member is a struct, recursively calculate its size
# FIXME for subclasses
@@ -130,19 +150,11 @@
else {
# Member is a simple type (LONG, DWORD, etc...)
- if ($packing =~ /\w\*(\d+)/) { # Arrays (ex: 'c*260')
- $size += Win32::API::Type::sizeof($type) * $1;
- $first = Win32::API::Type::sizeof($type) * $1 unless defined $first;
- DEBUG "(PM)Struct::sizeof: sizeof with member($name) now = " . $size
- . "\n";
- }
- else { # Simple types
my $type_size = Win32::API::Type::sizeof($type);
$align = $type_size if $type_size > $align;
- my $type_align = (($size + $type_size) % $type_size);
- $size += $type_size + $type_align;
+ my $type_align = ($size + $type_size) % $type_size ? $type_size - ($size + $type_size) % $type_size : 0;
+ $size += $type_size * ($packing =~ /^\w\*(\d+)$/ ? $1 : 1) + $type_align;
$first = Win32::API::Type::sizeof($type) unless defined $first;
- }
}
}
@@ -169,7 +181,10 @@
foreach my $member (@{$self->{typedef}}) {
my ($name, $packing, $type) = @$member;
- if (ref($self->{$name}) eq "Win32::API::Struct") {
+ if (ref($self->{$name}) eq "ARRAY" && ref($self->{$name}->[0]) eq "Win32::API::Struct") {
+ #### ????
+ }
+ elsif (ref($self->{$name}) eq "Win32::API::Struct") {
#### ????
}
else {
@@ -202,7 +217,18 @@
foreach my $member (@{$self->{typedef}}) {
($name, $type, $orig) = @$member;
- if ($type eq '>') {
+ if ($type =~ /^>\*(\d+)$/) {
+ for (0..$1 - 1) {
+ my ($subpacking, $subitems, $subrecipients, $subpacksize) =
+ $self->{$name}->[$_]->getPack();
+ DEBUG "(PM)Struct::getPack($self->{__typedef__}) ++ $subpacking\n";
+ push(@items, @$subitems);
+ push(@recipients, @$subrecipients);
+ $packing .= $subpacking;
+ $packed_size += $subpacksize;
+ }
+ }
+ elsif ($type eq '>') {
my ($subpacking, $subitems, $subrecipients, $subpacksize) =
$self->{$name}->getPack();
DEBUG "(PM)Struct::getPack($self->{__typedef__}) ++ $subpacking\n";
@@ -213,23 +239,25 @@
}
else {
my $repeat = 1;
- if ($type =~ /\w\*(\d+)/) {
- $repeat = $1;
- $type = "a$repeat";
+ if ($type =~ /^(\w)\*(\d+)$/) {
+ $repeat = $2;
+ $type = (lc($1) eq "c" ? "a" : $1).$repeat;
}
DEBUG "(PM)Struct::getPack($self->{__typedef__}) ++ $type\n";
- if ($type eq 'p') {
- $type = ($Config{ptrsize} == 8) ? 'Q' : 'L';
- push(@items, Win32::API::PointerTo($self->{$name}));
- }
- else {
- push(@items, $self->{$name});
+ for (0..($type =~ /^a/ ? 0 : $repeat - 1)) {
+ if ($type eq 'p') {
+ $type = ($Config{ptrsize} == 8) ? 'Q' : 'L';
+ push(@items,map{Win32::API::PointerTo($_)}(ref($self->{$name}) eq "ARRAY" ? $self->{$name}->[$_] : $self->{$name}));
+ }
+ else {
+ push(@items,ref($self->{$name}) eq "ARRAY" ? $self->{$name}->[$_] : $self->{$name});
+ }
+ push(@recipients, $self);
}
- push(@recipients, $self);
$type_size = Win32::API::Type::sizeof($orig);
- $type_align = (($packed_size + $type_size) % $type_size);
+ $type_align = ($packed_size + $type_size) % $type_size ? $type_size - ($packed_size + $type_size) % $type_size : 0;
$packing .= "x" x $type_align . $type;
$packed_size += ( $type_size * $repeat ) + $type_align;
}
@@ -267,7 +295,16 @@
my $align = $self->align();
foreach my $member (@{$self->{typedef}}) {
($name, $type, $orig) = @$member;
- if ($type eq '>') {
+ if ($type =~ /^>\*(\d+)$/) {
+ for (0..$1 - 1) {
+ my ($subpacking, $subpacksize, @subitems) = $self->{$name}->[$_]->getUnpack();
+ DEBUG "(PM)Struct::getUnpack($self->{__typedef__}) ++ $subpacking\n";
+ $packing .= $subpacking;
+ $packed_size += $subpacksize;
+ push(@items, @subitems);
+ }
+ }
+ elsif ($type eq '>') {
my ($subpacking, $subpacksize, @subitems) = $self->{$name}->getUnpack();
DEBUG "(PM)Struct::getUnpack($self->{__typedef__}) ++ $subpacking\n";
$packing .= $subpacking;
@@ -276,17 +313,20 @@
}
else {
my $repeat = 1;
- if ($type =~ /\w\*(\d+)/) {
- $repeat = $1;
- $type = "Z$repeat";
+ if ($type =~ /^(\w)\*(\d+)$/) {
+ $repeat = $2;
+ $type = (lc($1) eq "c" ? "Z" : $1).$repeat;
}
DEBUG "(PM)Struct::getUnpack($self->{__typedef__}) ++ $type\n";
+ DEBUG "(PM)Struct::getUnpack($self->{__typedef__}) ++ $type\n";
$type_size = Win32::API::Type::sizeof($orig);
- $type_align = (($packed_size + $type_size) % $type_size);
+ $type_align = ($packed_size + $type_size) % $type_size ? $type_size - ($packed_size + $type_size) % $type_size : 0;
$packing .= "x" x $type_align . $type;
$packed_size += ( $type_size * $repeat ) + $type_align;
- push(@items, $name);
+ for (0..($type =~ /^Z/ ? 0 : $repeat - 1)) {
+ push(@items, $name);
+ }
}
}
DEBUG "(PM)Struct::getUnpack($self->{__typedef__}): unpack($packing, @items)\n";
@@ -298,6 +338,7 @@
my ($packing, undef, @items) = $self->getUnpack();
my @itemvalue = unpack($packing, $self->{buffer});
DEBUG "(PM)Struct::Unpack: unpack($packing, buffer) = @itemvalue\n";
+ my %count;
foreach my $i (0 .. $#items) {
my $recipient = $self->{buffer_recipients}->[$i];
DEBUG "(PM)Struct::Unpack: %s(%s) = '%s' (0x%08x)\n",
@@ -306,8 +347,12 @@
$itemvalue[$i],
$itemvalue[$i],
;
- $recipient->{$items[$i]} = $itemvalue[$i];
-
+ if (ref($recipient->{$items[$i]}) eq "ARRAY") {
+ $recipient->{$items[$i]}->[$count{$recipient->{$items[$i]}.":".$items[$i]}++] = $itemvalue[$i];
+ }
+ else {
+ $recipient->{$items[$i]} = $itemvalue[$i];
+ }
# DEBUG "(PM)Struct::Unpack: self.items[$i] = $self->{$items[$i]}\n";
}
}
@@ -330,7 +375,12 @@
my $prefix = shift;
foreach my $member (@{$self->{typedef}}) {
($name, $packing, $type) = @$member;
- if (ref($self->{$name})) {
+ if (ref($self->{$name}) eq "ARRAY" && ref($self->{$name}) eq "Win32::API::Struct") {
+ for (@{$self->{$name}}) {
+ $_->Dump($name);
+ }
+ }
+ elsif (ref($self->{$name}) eq "Win32::API::Struct") {
$self->{$name}->Dump($name);
}
else {