November 2017 - Wine-Commits

Alexandre Julliard : patches: Remove some no longer used patch states.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: d84c6603d7bf9db05318d2c17db6ff9529cb92f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d84c6603d7bf9db05318d2c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 21:08:25 2017 +0100 patches: Remove some no longer used patch states. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 15 ++------------- patches/patches.css | 2 -- patches/update | 5 ----- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/patches/expire b/patches/expire index 4dd8a1a..305e7e5 100755 --- a/patches/expire +++ b/patches/expire @@ -24,7 +24,6 @@ my %status_expiry = ( "nil" => 30, - "pending" => 30, "assigned" => 30, "applied" => 30, "committed" => 1, @@ -35,12 +34,11 @@ my %status_expiry = "formatting" => 7, "other" => 7, "nopatch" => 3, - "reply" => 7, + "reply" => 1, "rejected" => 7, "split" => 7, "depend" => 7, "sequence" => 7, - "signoff" => 1, "superseded" => 1, "testcase" => 7, "testfail" => 7, @@ -49,7 +47,6 @@ my %status_expiry = my %status_descr = ( "nil" => "New", - "pending" => "Pending", "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", @@ -65,7 +62,6 @@ my %status_descr = "split" => "Needs splitting", "depend" => "Dependency", "sequence" => "Bad sequence", - "signoff" => "Sign-off", "superseded" => "Superseded", "testcase" => "Needs tests", "testfail" => "Test failure", @@ -73,12 +69,6 @@ my %status_descr = my %status_explanation = ( - "pending" => -"This means that the patch is not necessarily wrong, but its -correctness is not obvious. You should either write a test case -demonstrating that it is correct, try to fix the problem in a more -straightforward way, or better explain why you are doing things this -way.", "assigned" => "This means that the patch has been assigned to a reviewer. If the reviewer signs off on the patch, it will be committed, otherwise @@ -142,7 +132,6 @@ to enable the Testbot to figure it out.", the patch is correct.", # No notifications are sent for the following: # "nil" -# "signoff" # "reply" # "superseded" # "testfail" @@ -213,7 +202,7 @@ sub get_patch_state($) { $status = <STATUS>; chomp $status; - $mtime = (stat STATUS)[9] unless ($status eq "nil" || $status eq "pending"); + $mtime = (stat STATUS)[9] unless $status eq "nil"; close STATUS; } $mtime ||= (stat "$dir/$file")[9]; diff --git a/patches/patches.css b/patches/patches.css index f7bb560..24e8f37 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -153,7 +153,6 @@ tr.odd { background-color: #f8e8e8; } .id :hover, .sha1 :hover, .subject :hover { color: #FF6666; text-decoration: underline; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } -.pending, .pending :link, .pending :visited { color: blue; } .assigned, .assigned :link, .assigned :visited { color: blue; } .committed, .committed :link, .committed :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } @@ -161,7 +160,6 @@ tr.odd { background-color: #f8e8e8; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } -.signoff, .signoff :link, .signoff :visited { color: #e08000; } .reply, .reply :link, .reply :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } diff --git a/patches/update b/patches/update index ca4d2e5..5e82927 100755 --- a/patches/update +++ b/patches/update @@ -24,7 +24,6 @@ use CGI qw(:standard); my %status_descr = ( "nil" => "New", - "pending" => "Pending", "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", @@ -42,14 +41,12 @@ my %status_descr = "sequence" => "Bad sequence", "testcase" => "Needs tests", "testfail" => "Test failure", - "signoff" => "Sign-off", "reply" => "Reply", ); my @legend = ( [ "nil", "<ul><li>Patch not even looked at yet, there's still hope...</li></ul>" ], - [ "pending", "<ul><li>The patch is not obviously correct at first glance. Making a more convincing argument, preferably in the form of a test case, may help.</li></ul>" ], [ "assigned", "<ul><li>Waiting for sign-off or feedback from the assigned reviewer. If you don't hear anything after a couple of weeks, please resend the patch.</li></ul>" ], [ "committed", "<ul><li>You have done everything right; congratulations!</li>" . "<li>You screwed up but AJ missed it, send a fix before someone notices ;-)</li></ul>" ], @@ -59,8 +56,6 @@ my @legend = "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], - [ "signoff", "<ul><li>This is a Signed-off-by reply to another patch.</li></ul>" ], - [ "reply", "<ul><li>The mail is a reply to another patch.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" .

1 0

Alexandre Julliard : patches: Expire replies along with their parent patch.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: 1654c8a28e36627fba4097c7493663675c7a7e24 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1654c8a28e36627fba4097c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 21:08:44 2017 +0100 patches: Expire replies along with their parent patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 96 +++++++++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 58 deletions(-) diff --git a/patches/expire b/patches/expire index cba6246..4dd8a1a 100755 --- a/patches/expire +++ b/patches/expire @@ -193,6 +193,21 @@ sub get_patch_state($) my $file = shift; my $status = "nil"; my $mtime = 0; + my ($subject, $msgid, $reply); + + return undef unless open PATCH, "<$dir/$file"; + while (<PATCH>) + { + if (/^Subject: (.*)$/) { $subject = $1; } + elsif (/^Message-Id: (.*)$/) { $msgid = $1; } + elsif (/^In-Reply-To: (.*)$/) { $reply = $1; } + last if (/^$/); + } + while (<PATCH>) + { + if (/^diff --git a\//) { $reply = undef; last; } + } + close PATCH; if (open STATUS, "<$dir/$file.status") { @@ -201,11 +216,8 @@ sub get_patch_state($) $mtime = (stat STATUS)[9] unless ($status eq "nil" || $status eq "pending"); close STATUS; } - if (!$mtime && $file !~ /^OLD\//) - { - $mtime = (stat "$dir/$file")[9]; - } - return ($status, $mtime); + $mtime ||= (stat "$dir/$file")[9]; + return ($subject, $msgid, $reply, $status, $mtime); } sub get_previous_state($) @@ -364,81 +376,49 @@ EOF # expire current patches +my %patches; + opendir DIR, $dir or die "cannot open '$dir': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; - my ($status, $mtime) = get_patch_state( $file ); + my ($subject, $msgid, $reply, $status, $mtime) = get_patch_state( $file ); my $prev_status = get_previous_state( $file ); my $limit = $status_expiry{$status} || 7; + my $expire = (($now - $mtime - 12*60*60) / (24*60*60) > $limit); notify_state_change( $file, $prev_status, $status ); - if (($now - $mtime - 12*60*60) / (24*60*60) > $limit) - { - if ($status eq "nil" || $status eq "pending") - { - # move to OLD - printf "rename $file -> OLD %s %s\n", $status, get_patch_subject( "$file" ) unless $quiet; - unless ($dry_run) - { - rename "$dir/$file", "$dir/OLD/$file"; - rename "$dir/$file.status", "$dir/OLD/$file.status"; - rename "$dir/$file.order", "$dir/OLD/$file.order"; - rename "$dir/$file.review", "$dir/OLD/$file.review"; - rename "$dir/$file.signoff", "$dir/OLD/$file.signoff"; - rename "$dir/$file.testbot", "$dir/OLD/$file.testbot"; - rename "$dir/$file.testfail", "$dir/OLD/$file.testfail"; - } - } - else - { - printf "unlink $file %s %s\n", $status, get_patch_subject( "$file" ) unless $quiet; - unless ($dry_run) - { - unlink "$dir/$file"; - unlink "$dir/$file.status"; - unlink "$dir/$file.order"; - unlink "$dir/$file.signoff"; - unlink "$dir/$file.review"; - unlink "$dir/$file.testbot"; - unlink "$dir/$file.testfail"; - unlink "$dir/OLD/$file.status"; - } - } - } + $patches{$msgid} = [ $file, $subject, $reply, $status, $expire ]; } closedir DIR; -# expire old patches whose status has changed - -opendir DIR, "$dir/OLD" or die "cannot open '$dir/OLD': $!\n"; -foreach my $file (sort readdir DIR) +foreach my $p (keys %patches) { - next unless $file =~ /^[0-9]+$/; - my ($status, $mtime) = get_patch_state( "OLD/$file" ); + my ($file, $subject, $reply, $status, $expire) = @{$patches{$p}}; + my $orig_status = $status; - if ($status eq "pending") + # for replies, inherit expire flag from top parent + while ($reply && $status eq "reply") { - # remove status file - printf "unlink OLD/$file.status\n" unless $quiet; - unlink "$dir/OLD/$file.status" unless $dry_run; + last unless defined $patches{$reply}; + (undef, undef, $reply, $status, $expire) = @{$patches{$reply}}; } - elsif ($status ne "nil") + + if ($expire) { - printf "unlink OLD/$file %s %s\n", $status, get_patch_subject( "OLD/$file" ) unless $quiet; + printf "unlink $file %s %s\n", $orig_status, $subject unless $quiet; unless ($dry_run) { - unlink "$dir/OLD/$file"; + unlink "$dir/$file"; + unlink "$dir/$file.status"; + unlink "$dir/$file.order"; + unlink "$dir/$file.review"; + unlink "$dir/$file.testbot"; + unlink "$dir/$file.testfail"; unlink "$dir/OLD/$file.status"; - unlink "$dir/OLD/$file.order"; - unlink "$dir/OLD/$file.review"; - unlink "$dir/OLD/$file.signoff"; - unlink "$dir/OLD/$file.testbot"; - unlink "$dir/OLD/$file.testfail"; } } } -closedir DIR; notify_reviewers();

1 0

Ziqing Hui : mlang: Add more Chinese code pages support.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: 88cc2d114a1c393e17cd6175ec805a5f14a194ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cc2d114a1c393e17cd6175e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 9 21:17:49 2017 +0800 mlang: Add more Chinese code pages support. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 36 ++++++++++++++++++++++++++++++++---- dlls/mlang/tests/mlang.c | 6 ------ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9c76c11..47f9d98 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -118,13 +118,33 @@ static const MIME_CP_INFO baltic_cp[] = }; static const MIME_CP_INFO chinese_simplified_cp[] = { + { "Chinese Simplified (Auto-Select)", + 50936, MIMECONTF_IMPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_LATEST, + "_autodetect_chs", "_autodetect_chs", "_autodetect_chs" }, { "Chinese Simplified (GB2312)", 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | - MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | + MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, "gb2312", "gb2312", "gb2312" }, - { "Chinese Simplified (GBK)", + { "Chinese Simplified (GB2312-80)", + 20936, MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_VALID | + MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, + "x-cp20936", "x-cp20936", "x-cp20936" }, + { "Chinese Simplified (HZ)", + 52936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT | + MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | + MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | + MIMECONTF_MIME_LATEST, + "hz-gb-2312", "hz-gb-2312", "hz-gb-2312" }, + { "Chinese Simplified (GB18030)", + 54936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | + MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | + MIMECONTF_EXPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_LATEST, + "GB18030", "GB18030", "GB18030" }, + { "Chinese Simplified (GBK)", 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | @@ -133,12 +153,20 @@ static const MIME_CP_INFO chinese_simplified_cp[] = }; static const MIME_CP_INFO chinese_traditional_cp[] = { + { "Chinese Traditional (Auto-Select)", + 50950, MIMECONTF_IMPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_LATEST, + "_autodetect_cht", "_autodetect_cht", "_autodetect_cht" }, { "Chinese Traditional (Big5)", 950, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | - MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | + MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, - "big5", "big5", "big5" } + "big5", "big5", "big5" }, + { "Chinese Traditional (CNS)", + 20000, MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_VALID | + MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, + "x-Chinese-CNS", "x-Chinese-CNS", "x-Chinese-CNS" } }; static const MIME_CP_INFO central_european_cp[] = { diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index ffa422c..141af39 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -254,7 +254,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - TRUE }, /* 1. Chinese Simplified (GB2312) */ { @@ -282,7 +281,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - TRUE }, /* 3. Chinese Simplified (HZ) */ { @@ -297,7 +295,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - TRUE }, /* 4. Chinese Simplified (GB18030) */ { @@ -312,7 +309,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - TRUE }, /* 5. Chinese Traditional (Auto-Select) */ { @@ -325,7 +321,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'M','i','n','g','L','i','u',0}, {'N','e','w',' ','M','i','n','g','L','i','u',0}, 136 }, - TRUE }, /* 6. Chinese Traditional (Big5) */ { @@ -353,7 +348,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'M','i','n','g','L','i','u',0}, {'N','e','w',' ','M','i','n','g','L','i','u',0}, 136 }, - TRUE } };

1 0

Piotr Caban : fusion: Add support for ASM_NAME_ARCHITECTURE in IAssemblyNameImpl_GetProperty.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: b0aca40d78a9ac95ffe7776a63e665bbf7717b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0aca40d78a9ac95ffe7776a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 9 16:07:53 2017 +0100 fusion: Add support for ASM_NAME_ARCHITECTURE in IAssemblyNameImpl_GetProperty. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/fusion/tests/asmname.c | 25 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index e3f1ee4..6be8bf6 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -55,6 +55,8 @@ typedef struct { BYTE pubkey[8]; BOOL haspubkey; + PEKIND pekind; + LONG ref; } IAssemblyNameImpl; @@ -232,6 +234,17 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, } break; + case ASM_NAME_ARCHITECTURE: + *pcbProperty = 0; + if (name->pekind != peNone) + { + *pcbProperty = sizeof(PEKIND); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((PEKIND *)pvProperty) = name->pekind; + } + break; + default: *pcbProperty = 0; break; @@ -616,6 +629,30 @@ static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) return S_OK; } +static HRESULT parse_procarch(IAssemblyNameImpl *name, LPCWSTR procarch) +{ + static const WCHAR msilW[] = {'m','s','i','l',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR ia64W[] = {'i','a','6','4',0}; + static const WCHAR amd64W[] = {'a','m','d','6','4',0}; + + if (!lstrcmpiW(procarch, msilW)) + name->pekind = peMSIL; + else if (!lstrcmpiW(procarch, x86W)) + name->pekind = peI386; + else if (!lstrcmpiW(procarch, ia64W)) + name->pekind = peIA64; + else if (!lstrcmpiW(procarch, amd64W)) + name->pekind = peAMD64; + else + { + ERR("unrecognized architecture: %s\n", wine_dbgstr_w(procarch)); + return FUSION_E_INVALID_NAME; + } + + return S_OK; +} + static WCHAR *parse_value( const WCHAR *str, unsigned int len ) { WCHAR *ret; @@ -726,6 +763,8 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam { name->procarch = value; value = NULL; + + hr = parse_procarch( name, name->procarch ); } HeapFree( GetProcessHeap(), 0, value ); diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 556a143..aa7e11b 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -397,6 +397,7 @@ static void test_CreateAssemblyNameObject(void) WCHAR str[MAX_PATH]; WCHAR namestr[MAX_PATH]; DWORD size, hi, lo; + PEKIND arch; HRESULT hr; static const WCHAR empty[] = {0}; @@ -794,6 +795,12 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine, processorArchitecture=x86", str); ok(size == 32, "Expected 32, got %d\n", size); + size = sizeof(arch); + hr = IAssemblyName_GetProperty(name, ASM_NAME_ARCHITECTURE, &arch, &size); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(arch == peI386, "Expected peI386, got %d\n", arch); + ok(size == sizeof(arch), "Wrong size %d\n", size); + IAssemblyName_Release(name); /* amd64 */ @@ -808,6 +815,12 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine, processorArchitecture=AMD64", str); ok(size == 34, "Expected 34, got %d\n", size); + size = sizeof(arch); + hr = IAssemblyName_GetProperty(name, ASM_NAME_ARCHITECTURE, &arch, &size); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(arch == peAMD64, "Expected peAMD64, got %d\n", arch); + ok(size == sizeof(arch), "Wrong size %d\n", size); + IAssemblyName_Release(name); /* ia64 */ @@ -822,6 +835,12 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine, processorArchitecture=IA64", str); ok(size == 33, "Expected 33, got %d\n", size); + size = sizeof(arch); + hr = IAssemblyName_GetProperty(name, ASM_NAME_ARCHITECTURE, &arch, &size); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(arch == peIA64, "Expected peIA64, got %d\n", arch); + ok(size == sizeof(arch), "Wrong size %d\n", size); + IAssemblyName_Release(name); /* msil */ @@ -836,6 +855,12 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine, processorArchitecture=MSIL", str); ok(size == 33, "Expected 33, got %d\n", size); + size = sizeof(arch); + hr = IAssemblyName_GetProperty(name, ASM_NAME_ARCHITECTURE, &arch, &size); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(arch == peMSIL, "Expected peMSIL, got %d\n", arch); + ok(size == sizeof(arch), "Wrong size %d\n", size); + IAssemblyName_Release(name); }

1 0

Piotr Caban : fusion: Respect buffer size in IAssemblyNameImpl_GetProperty.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: fac2e9a28297a0186254408bf4fd2a343e822103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac2e9a28297a0186254408bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 9 16:07:48 2017 +0100 fusion: Respect buffer size in IAssemblyNameImpl_GetProperty. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 41 ++++++++++++++++++++++++++++++++--------- dlls/fusion/tests/asmname.c | 16 +++++++++++++++- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 1bfe9c1..e3f1ee4 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -31,6 +31,7 @@ #include "guiddef.h" #include "fusion.h" #include "corerror.h" +#include "strsafe.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -138,11 +139,11 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, LPDWORD pcbProperty) { IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); + DWORD size; TRACE("(%p, %d, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty); - *((LPWSTR)pvProperty) = '\0'; - + size = *pcbProperty; switch (PropertyId) { case ASM_NAME_NULL_PUBLIC_KEY: @@ -158,45 +159,65 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, *pcbProperty = 0; if (name->name) { - lstrcpyW(pvProperty, name->name); *pcbProperty = (lstrlenW(name->name) + 1) * 2; + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + lstrcpyW(pvProperty, name->name); } break; case ASM_NAME_MAJOR_VERSION: *pcbProperty = 0; - *((WORD *)pvProperty) = name->version[0]; if (name->versize >= 1) + { *pcbProperty = sizeof(WORD); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((WORD *)pvProperty) = name->version[0]; + } break; case ASM_NAME_MINOR_VERSION: *pcbProperty = 0; - *((WORD *)pvProperty) = name->version[1]; if (name->versize >= 2) + { *pcbProperty = sizeof(WORD); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((WORD *)pvProperty) = name->version[1]; + } break; case ASM_NAME_BUILD_NUMBER: *pcbProperty = 0; - *((WORD *)pvProperty) = name->version[2]; if (name->versize >= 3) + { *pcbProperty = sizeof(WORD); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((WORD *)pvProperty) = name->version[2]; + } break; case ASM_NAME_REVISION_NUMBER: *pcbProperty = 0; - *((WORD *)pvProperty) = name->version[3]; if (name->versize >= 4) + { *pcbProperty = sizeof(WORD); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((WORD *)pvProperty) = name->version[3]; + } break; case ASM_NAME_CULTURE: *pcbProperty = 0; if (name->culture) { - lstrcpyW(pvProperty, name->culture); *pcbProperty = (lstrlenW(name->culture) + 1) * 2; + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + lstrcpyW(pvProperty, name->culture); } break; @@ -204,8 +225,10 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, *pcbProperty = 0; if (name->haspubkey) { - memcpy(pvProperty, name->pubkey, sizeof(DWORD) * 2); *pcbProperty = sizeof(DWORD) * 2; + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + memcpy(pvProperty, name->pubkey, sizeof(DWORD) * 2); } break; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index b93f289..556a143 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -24,6 +24,7 @@ #include <mscoree.h> #include <fusion.h> #include <corerror.h> +#include <strsafe.h> #include "wine/test.h" @@ -362,7 +363,11 @@ static void test_assembly_name_props_line(IAssemblyName *name, if (hr != E_INVALIDARG) { ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size); - if (size && size != MAX_PATH) + if (!size) + { + ok(str[0] == 0xcccc, "%d: prop %d: str[0] = %x\n", line, i, str[0]); + } + else if (size != MAX_PATH) { if (i != ASM_NAME_NAME && i != ASM_NAME_CULTURE) ok( !memcmp( vals[i].val, str, size ), "%d: prop %d: wrong value\n", line, i ); @@ -370,6 +375,15 @@ static void test_assembly_name_props_line(IAssemblyName *name, ok( !lstrcmpW( expect, str ), "%d: prop %d: Expected %s, got %s\n", line, i, wine_dbgstr_w(expect), wine_dbgstr_w(str) ); } + + if (size != 0 && size != MAX_PATH) + { + size--; + hr = IAssemblyName_GetProperty(name, i, str, &size); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, + "%d: prop %d: Expected STRSAFE_E_INSUFFICIENT_BUFFER, got %08x\n", line, i, hr); + ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size); + } } } }

1 0

Andrew Eikum : explorer: Don't leak PIDL.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: a484bf495e83f873fee2aa1729769323684488bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a484bf495e83f873fee2aa172… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 9 08:43:10 2017 -0600 explorer: Don't leak PIDL. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index cc3244d..5144e74 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -609,6 +609,7 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) hres = IShellFolder_BindToObject(desktop,root_pidl,NULL, &IID_IShellFolder, (void**)&folder); + ILFree(root_pidl); if(FAILED(hres)) { return desktop;

1 0

Ziqing Hui : mlang: Fix font name of Chinese code pages.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: 1f88a35a90ae2199ab14cab732f191982c5f2e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f88a35a90ae2199ab14cab73… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 9 21:17:35 2017 +0800 mlang: Fix font name of Chinese code pages. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 4 ++-- dlls/mlang/tests/mlang.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d9a167a..9c76c11 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -470,9 +470,9 @@ static const struct mlang_data { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, - "Courier","Arial", sidHan }, /* FIXME */ + "Simsun","Simsun", sidHan }, { "Chinese Traditional",950,sizeof(chinese_traditional_cp)/sizeof(chinese_traditional_cp[0]),chinese_traditional_cp, - "Courier","Arial", sidBopomofo }, /* FIXME */ + "MingLiu","New MingLiu", sidBopomofo }, { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 80dcd75..ffa422c 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -269,7 +269,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 2. Chinese Simplified (GB2312-80) */ { @@ -341,7 +340,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'M','i','n','g','L','i','u',0}, {'N','e','w',' ','M','i','n','g','L','i','u',0}, 136 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 7. Chinese Traditional (CNS) */ {

1 0

Alex Henrie : d3dx9/tests: Provide 8 significant digits in matrix reference values.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: 79b6035441981b5833b57e21114b80819d4eb0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b6035441981b5833b57e211… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 9 06:05:51 2017 -0700 d3dx9/tests: Provide 8 significant digits in matrix reference values. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 130 ++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79b6035441981b5833b57…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: 0346738b717007ab275c449f931f498fae8ae2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0346738b717007ab275c449f9… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Nov 9 17:48:53 2017 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index aaf7ee3..4ae368a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14869,10 +14869,8 @@ msgid "Expert" msgstr "Ekspertti" #: winemine.rc:72 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Tulos" +msgstr "Poista tulokset" #: winemine.rc:78 msgid "Congratulations!"

1 0

Andrey Gusev : d3dx10: Add D3DX10PreprocessShaderFromMemory stub.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: 010119085b4cee3d7edbad2c5a46d35daa95000d URL: http://source.winehq.org/git/wine.git/?a=commit;h=010119085b4cee3d7edbad2c5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 9 16:25:05 2017 +0200 d3dx10: Add D3DX10PreprocessShaderFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 11 +++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10async.h | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index c638904..c910b4a 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -397,3 +397,14 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return S_OK; } + +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult) +{ + FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, errors %p, " + "hresult %p stub!\n", + debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 49a6d3a..a36220f 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -57,7 +57,7 @@ @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) -@ stub D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) +@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) @ stub D3DX10SHProjectCubeMap(long ptr ptr ptr ptr) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 6663be4..c8204bc 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -54,6 +54,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult); + HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader);

1 0