February 2016 - Wine-commits

Stefan Dösinger : wined3d: Remove the DIB extra line hack.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 1bb4b7ece78140fff51dd9d41e393221f71f8105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb4b7ece78140fff51dd9d41… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 15 18:18:06 2016 +0100 wined3d: Remove the DIB extra line hack. Our surface pitch alignment should take care of any writes past unaligned widths. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a335a82..c1d7b18 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -361,9 +361,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) const struct wined3d_format *format = surface->resource.format; unsigned int format_flags = surface->container->resource.format_flags; unsigned int row_pitch, slice_pitch; - SYSTEM_INFO sysInfo; BITMAPINFO *b_info; - int extraline = 0; DWORD *masks; TRACE("surface %p.\n", surface); @@ -396,24 +394,11 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) if (!b_info) return E_OUTOFMEMORY; - /* Some applications access the surface in via DWORDs, and do not take - * the necessary care at the end of the surface. So we need at least - * 4 extra bytes at the end of the surface. Check against the page size, - * if the last page used for the surface has at least 4 spare bytes we're - * safe, otherwise add an extra line to the DIB section. */ - GetSystemInfo(&sysInfo); - if( ((surface->resource.size + 3) % sysInfo.dwPageSize) < 4) - { - extraline = 1; - TRACE("Adding an extra line to the DIB section.\n"); - } - b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - /* TODO: Is there a nicer way to force a specific alignment? (8 byte for ddraw) */ wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); b_info->bmiHeader.biWidth = row_pitch / format->byte_count; - b_info->bmiHeader.biHeight = 0 - surface->resource.height - extraline; - b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) * row_pitch; + b_info->bmiHeader.biHeight = 0 - surface->resource.height; + b_info->bmiHeader.biSizeImage = slice_pitch; b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = format->byte_count * 8;

1 0

Nikolay Sivov : kernel32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: a0ec5fecd021a5fef16a489dcc748a5b6bd06063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ec5fecd021a5fef16a489dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 15 23:06:44 2016 +0300 kernel32/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 17 ++++++----------- dlls/kernel32/tests/loader.c | 20 ++++---------------- dlls/kernel32/tests/locale.c | 45 +++++++------------------------------------- 3 files changed, 17 insertions(+), 65 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 58ddddf..77249fa 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1325,20 +1325,15 @@ static void test_CreateFileA(void) skip("Do not have authority to access volumes. Test for %s skipped\n", filename); } /* otherwise validate results with expectations */ - else if (p[i].todo_flag) - todo_wine ok( - (hFile == INVALID_HANDLE_VALUE && - (p[i].err == GetLastError() || p[i].err2 == GetLastError())) || - (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), - "CreateFileA failed on %s, hFile %p, err=%u, should be %u\n", - filename, hFile, GetLastError(), p[i].err); else - ok( - (hFile == INVALID_HANDLE_VALUE && - (p[i].err == GetLastError() || p[i].err2 == GetLastError())) || - (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), + { + todo_wine_if (p[i].todo_flag) + ok((hFile == INVALID_HANDLE_VALUE && + (p[i].err == GetLastError() || p[i].err2 == GetLastError())) || + (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), "CreateFileA failed on %s, hFile %p, err=%u, should be %u\n", filename, hFile, GetLastError(), p[i].err); + } if (hFile != INVALID_HANDLE_VALUE) CloseHandle( hFile ); i++; diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 25b7b08..c35cf25 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -452,10 +452,7 @@ static void test_Loader(void) ptr = VirtualAlloc(hlib, page_size, MEM_COMMIT, info.Protect); ok(!ptr, "%d: VirtualAlloc should fail\n", i); /* FIXME: Remove once Wine is fixed */ - if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); - else + todo_wine_if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); SetLastError(0xdeadbeef); @@ -541,11 +538,7 @@ todo_wine ptr = VirtualAlloc((char *)hlib + section.VirtualAddress, page_size, MEM_COMMIT, info.Protect); ok(!ptr, "%d: VirtualAlloc should fail\n", i); /* FIXME: Remove once Wine is fixed */ - if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_ADDRESS, - "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); - else + todo_wine_if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_ADDRESS, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } @@ -1139,9 +1132,7 @@ static void test_section_access(void) size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); /* FIXME: remove the condition below once Wine is fixed */ - if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) - todo_wine ok(info.Protect == td[i].scn_page_access_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access_after_write); - else + todo_wine_if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) ok(info.Protect == td[i].scn_page_access_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access_after_write); } @@ -1498,10 +1489,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ret = pRtlDllShutdownInProgress(); /* FIXME: remove once Wine is fixed */ - if (expected_code == STILL_ACTIVE || expected_code == 196) - ok(!ret || broken(ret) /* before Vista */, "RtlDllShutdownInProgress returned %d\n", ret); - else - todo_wine + todo_wine_if (!(expected_code == STILL_ACTIVE || expected_code == 196)) ok(!ret || broken(ret) /* before Vista */, "RtlDllShutdownInProgress returned %d\n", ret); } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d49e0d6..0117a39 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -329,24 +329,13 @@ static void test_GetLocaleInfoW(void) val = 0; GetLocaleInfoW(lcid, LOCALE_ILANGUAGE|LOCALE_RETURN_NUMBER, (WCHAR*)&val, sizeof(val)/sizeof(WCHAR)); - if (ptr->todo & 0x1) - { - todo_wine - ok(val == ptr->lcid || (val && broken(val == ptr->lcid_broken)), "%s: got wrong lcid 0x%04x, expected 0x%04x\n", - wine_dbgstr_w(ptr->name), val, ptr->lcid); - } - else + todo_wine_if (ptr->todo & 0x1) ok(val == ptr->lcid || (val && broken(val == ptr->lcid_broken)), "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), val, ptr->lcid); /* now check LOCALE_SNAME */ GetLocaleInfoW(lcid, LOCALE_SNAME, bufferW, COUNTOF(bufferW)); - if (ptr->todo & 0x2) - todo_wine - ok(!lstrcmpW(bufferW, ptr->sname) || - (*ptr->sname_broken && broken(!lstrcmpW(bufferW, ptr->sname_broken))), - "%s: got %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(bufferW)); - else + todo_wine_if (ptr->todo & 0x2) ok(!lstrcmpW(bufferW, ptr->sname) || (*ptr->sname_broken && broken(!lstrcmpW(bufferW, ptr->sname_broken))), "%s: got %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(bufferW)); @@ -2010,16 +1999,9 @@ static void test_CompareStringEx(void) MultiByteToWideChar(CP_ACP, 0, e->locale, -1, locale, sizeof(locale)/sizeof(WCHAR)); ret = pCompareStringEx(locale, e->flags, e->first, -1, e->second, -1, NULL, NULL, 0); - if (e->todo) - { - todo_wine ok(ret == e->ret || broken(ret == e->broken), - "%d: got %s, expected %s\n", i, op[ret], op[e->ret]); - } - else - { + todo_wine_if (e->todo) ok(ret == e->ret || broken(ret == e->broken), "%d: got %s, expected %s\n", i, op[ret], op[e->ret]); - } } } @@ -2486,11 +2468,7 @@ static void test_LocaleNameToLCID(void) while (*ptr->name) { lcid = pLocaleNameToLCID(ptr->name, 0); - if (ptr->todo) - todo_wine - ok(lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", - wine_dbgstr_w(ptr->name), lcid, ptr->lcid); - else + todo_wine_if (ptr->todo) ok(lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), lcid, ptr->lcid); @@ -3934,16 +3912,10 @@ static void test_IdnToNameprepUnicode(void) test_data[i].in_len, buf, sizeof(buf)/sizeof(WCHAR)); err = GetLastError(); - if (!test_data[i].todo) - { + todo_wine_if (test_data[i].todo) ok(ret == test_data[i].ret || broken(ret == test_data[i].broken_ret), "%d) ret = %d\n", i, ret); - } - else - { - todo_wine ok(ret == test_data[i].ret || - broken(ret == test_data[i].broken_ret), "%d) ret = %d\n", i, ret); - } + if(ret != test_data[i].ret) continue; @@ -4165,10 +4137,7 @@ static void test_GetLocaleInfoEx(void) { val = 0; pGetLocaleInfoEx(ptr->name, LOCALE_ILANGUAGE|LOCALE_RETURN_NUMBER, (WCHAR*)&val, sizeof(val)/sizeof(WCHAR)); - if (ptr->todo) - todo_wine - ok(val == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), val, ptr->lcid); - else + todo_wine_if (ptr->todo) ok(val == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n", wine_dbgstr_w(ptr->name), val, ptr->lcid); bufferW[0] = 0; ret = pGetLocaleInfoEx(ptr->name, LOCALE_SNAME, bufferW, sizeof(bufferW)/sizeof(WCHAR));

1 0

Sebastian Lackner : oleaut32/tests: Avoid misleading assignment in refcounting tests.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: fd8ecd0cfa2425cae8d178c6fa17ff4b655c7c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8ecd0cfa2425cae8d178c6f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Feb 15 22:43:53 2016 +0100 oleaut32/tests: Avoid misleading assignment in refcounting tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8338719..fcce92e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -210,7 +210,8 @@ static void ref_count_test(LPCWSTR type_lib) hRes = ITypeLib_GetTypeInfo(iface, 1, &iti1); ok(hRes == S_OK, "ITypeLib_GetTypeInfo failed on index = 1\n"); - ok(ref_count=ITypeLib_Release(iface) > 0, "ITypeLib destroyed while ITypeInfo has back pointer\n"); + ref_count = ITypeLib_Release(iface); + ok(ref_count > 0, "ITypeLib destroyed while ITypeInfo has back pointer\n"); if(!ref_count) return;

1 0

Nikolay Sivov : dwrite: Force advances to zero for isZeroWidthSpace glyphs.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 297b3d080adf8b154b71031697d5c1764dccef16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=297b3d080adf8b154b7103169… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 00:59:24 2016 +0300 dwrite: Force advances to zero for isZeroWidthSpace glyphs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 15 +++++++++------ dlls/dwrite/tests/analyzer.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 66fa29c..1b52eb7 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1089,13 +1089,16 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 IDWriteFontFace_GetMetrics(fontface, &metrics); for (i = 0; i < glyph_count; i++) { - INT32 a; - - hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &glyphs[i], &a, is_sideways); - if (FAILED(hr)) - a = 0; + if (glyph_props[i].isZeroWidthSpace) + advances[i] = 0.0f; + else { + INT32 a; - advances[i] = get_scaled_advance_width(a, emSize, &metrics); + hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &glyphs[i], &a, is_sideways); + if (FAILED(hr)) + a = 0; + advances[i] = get_scaled_advance_width(a, emSize, &metrics); + } offsets[i].advanceOffset = 0.0f; offsets[i].ascenderOffset = 0.0f; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index b5437c5..07e00af 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1393,6 +1393,18 @@ if (0) { ok(advances[0] == advances2[0], "got %.2f, expected %.2f\n", advances[0], advances2[0]); ok(advances[1] == advances2[1], "got %.2f, expected %.2f\n", advances[1], advances2[1]); + /* DWRITE_SCRIPT_SHAPES_NO_VISUAL run */ + maxglyphcount = 10; + actual_count = 0; + sa.script = 0; + sa.shapes = DWRITE_SCRIPT_SHAPES_NO_VISUAL; + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test1W, lstrlenW(test1W), fontface, FALSE, FALSE, &sa, NULL, + NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(actual_count == 4, "got %d\n", actual_count); + ok(sa.script == 0, "got %u\n", sa.script); + ok(!shapingprops[0].isZeroWidthSpace, "got %d\n", shapingprops[0].isZeroWidthSpace); + IDWriteTextAnalyzer_Release(analyzer); IDWriteFontFace_Release(fontface); } @@ -1582,6 +1594,33 @@ static void test_GetGlyphPlacements(void) ok(offsets[0].advanceOffset == 0.0 && offsets[0].ascenderOffset == 0.0, "got %.2f,%.2f\n", offsets[0].advanceOffset, offsets[0].ascenderOffset); + /* DWRITE_SCRIPT_SHAPES_NO_VISUAL has no effect on placement */ + sa.shapes = DWRITE_SCRIPT_SHAPES_NO_VISUAL; + advances[0] = advances[1] = 1.0f; + memset(offsets, 0xcc, sizeof(offsets)); + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, aW, clustermap, textprops, + len, glyphs, glyphprops, len, fontface, 2048.0f, FALSE, FALSE, &sa, NULL, NULL, + NULL, 0, advances, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advances[0] == 1000.0f, "got %.2f\n", advances[0]); + ok(advances[1] == 1000.0f, "got %.2f\n", advances[1]); + ok(offsets[0].advanceOffset == 0.0f && offsets[0].ascenderOffset == 0.0f, "got %.2f,%.2f\n", + offsets[0].advanceOffset, offsets[0].ascenderOffset); + + /* isZeroWidthSpace */ + sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + advances[0] = advances[1] = 1.0f; + memset(offsets, 0xcc, sizeof(offsets)); + glyphprops[0].isZeroWidthSpace = 1; + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, aW, clustermap, textprops, + len, glyphs, glyphprops, len, fontface, 2048.0f, FALSE, FALSE, &sa, NULL, NULL, + NULL, 0, advances, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advances[0] == 0.0f, "got %.2f\n", advances[0]); + ok(advances[1] == 1000.0f, "got %.2f\n", advances[1]); + ok(offsets[0].advanceOffset == 0.0f && offsets[0].ascenderOffset == 0.0f, "got %.2f,%.2f\n", + offsets[0].advanceOffset, offsets[0].ascenderOffset); + IDWriteTextAnalyzer_Release(analyzer); IDWriteFontFace_Release(fontface); DELETE_FONTFILE(path);

1 0

Alexandre Julliard : patches: Add email notifications for assigned patches.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: tools Branch: master Commit: 816ac2d399b782ca0450251084cdefc36ddaa22c URL: http://source.winehq.org/git/tools.git/?a=commit;h=816ac2d399b782ca04502510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 20:58:34 2016 +0900 patches: Add email notifications for assigned patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/patches/expire b/patches/expire index 0ff3bc7..6bbd5c8 100755 --- a/patches/expire +++ b/patches/expire @@ -149,6 +149,8 @@ my $dry_run = 0; my $quiet = 1; my $now = time(); my $email_from = "Marvin <testbot\(a)winehq.org>"; +my $base_url = "https://source.winehq.org/patches/data"; +my %reviews; foreach my $arg (@ARGV) { @@ -210,6 +212,16 @@ sub get_previous_state($) return $prev_status; } +sub get_patch_reviewer($) +{ + my $file = shift; + + return undef unless open REVIEW, "<$dir/$file.review"; + chomp( my $ret = <REVIEW> ); + close REVIEW; + return $ret; +} + sub get_notify_headers($$) { my $file = shift; @@ -242,7 +254,7 @@ sub get_notify_headers($$) close PATCH; push @headers, "X-Patch-Status: $status_descr{$status}"; - push @headers, "X-Patch-URL: https://source.winehq.org/patches/data/$file"; + push @headers, "X-Patch-URL: $base_url/$file"; push @headers, "Reply-To: wine-devel\(a)winehq.org"; return @headers; } @@ -260,9 +272,17 @@ sub notify_state_change($$$) # if there's no available explanation, don't notify return unless defined $status_explanation{$status}; + if ($status eq "assigned") + { + my $reviewer = get_patch_reviewer( $file ); + push @{$reviews{$reviewer}}, $file if $reviewer; + } + my @headers = get_notify_headers( $file, $status ); return unless @headers; + return if $dry_run; + open PREVSTATUS, ">$dir/OLD/$file.status" or return; printf PREVSTATUS "%s\n", $status; close PREVSTATUS; @@ -290,6 +310,48 @@ EOF close SENDMAIL; } +sub notify_reviewers() +{ + while ((my $rev, $patches) = each( %reviews )) + { + my $patch_urls = join "\n ", map({ "$base_url/$_"; } sort @{$patches}); + my $patch_str = @{$patches} > 1 ? "patches" : "patch"; + + printf "notifying %s about %s\n", $rev, join ", ", sort @{$patches} unless $quiet; + next if $dry_run; + + open SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq" or return; + print SENDMAIL <<"EOF"; +From: $email_from +To: $rev +Subject: Wine $patch_str assigned for review +X-Patch-URL: $patch_urls +Reply-To: wine-devel\(a)winehq.org + +This is an automated notification to let you know that you have been +asked to review the following Wine $patch_str: + + $patch_urls + +If you think that a patch is correct and can be committed, please send +a mail to wine-patches with your Signed-off-by header, as a reply to +the original patch email. + +If you find some issues in a patch, please send a mail to the patch +author and CC wine-devel so that the patch status can be updated +accordingly. + +If you feel that you don't have the time or the qualifications to +review a patch, please send a mail to wine-devel or directly to +julliard\(a)winehq.org so that the patch can be assigned to another +reviewer. + +Thank you for your help! +EOF + close SENDMAIL; + } +} + # expire current patches opendir DIR, $dir or die "cannot open '$dir': $!\n"; @@ -368,3 +430,5 @@ foreach my $file (sort readdir DIR) } } closedir DIR; + +notify_reviewers();

1 0

Hugh McMaster : reg: Call RegCloseKey before exiting if the user chooses to cancel the overwriting operation.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: e0492b27acf1448eb4006aba74194e49303b2fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0492b27acf1448eb4006aba7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:29 2016 +1100 reg: Call RegCloseKey before exiting if the user chooses to cancel the overwriting operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 63b518f..cc8cac2 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -352,6 +352,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) { + RegCloseKey(subkey); output_message(STRING_CANCELLED); return 0; }

1 0

Hugh McMaster : reg: Fail if REG_DWORD is passed with no data argument.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 5061899c4614e87eca58dfd7299e5838e9eb7536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5061899c4614e87eca58dfd72… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:30 2016 +1100 reg: Fail if REG_DWORD is passed with no data argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 6 ++++++ programs/reg/tests/reg.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index cc8cac2..e4289f3 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -366,6 +366,12 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, output_message(STRING_UNSUPPORTED_TYPE, type); return 1; } + if (reg_type == REG_DWORD && !data) + { + RegCloseKey(subkey); + output_message(STRING_INVALID_CMDLINE); + return 1; + } if (data) reg_data = get_regdata(data,reg_type,separator,&reg_count); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cdf8359..4534f7d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -257,7 +257,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword0 /t REG_DWORD /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg: Handle data from REG_NONE.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: f1d45b5f443624229cc9cd98205cf8b84f94ca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d45b5f443624229cc9cd982… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:31 2016 +1100 reg: Handle data from REG_NONE. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + programs/reg/tests/reg.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e4289f3..bc0b261 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -228,6 +228,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r switch (reg_type) { + case REG_NONE: case REG_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4534f7d..74284c7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -149,7 +149,7 @@ static void test_add(void) /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); - verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, TODO_REG_SIZE); + verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0); /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r);

1 0

Hugh McMaster : reg: Handle data for REG_EXPAND_SZ.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 03afd26eb1a5583a17736f646af950747d6b9eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03afd26eb1a5583a17736f646… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:32 2016 +1100 reg: Handle data for REG_EXPAND_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + programs/reg/tests/reg.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index bc0b261..d648cd0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -230,6 +230,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r { case REG_NONE: case REG_SZ: + case REG_EXPAND_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 74284c7..eac5d60 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -186,11 +186,11 @@ static void test_add(void) /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, TODO_REG_SIZE); + verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand1 /t REG_EXpand_sz /d \"dead^%PATH^%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, TODO_REG_SIZE); + verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -198,11 +198,11 @@ static void test_add(void) run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, TODO_REG_SIZE); + verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand3 /f /d \"\"", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0); /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r);

1 0

Hugh McMaster : reg: Handle data for REG_DWORD_LITTLE_ENDIAN and REG_DWORD_BIG_ENDIAN.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: b14e1ba801f5a3323c5e88d46a95355372780356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14e1ba801f5a3323c5e88d46… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:33 2016 +1100 reg: Handle data for REG_DWORD_LITTLE_ENDIAN and REG_DWORD_BIG_ENDIAN. REG_DWORD_LITTLE_ENDIAN is #define'd as REG_DWORD, so the LITTLE_ENDIAN case is just a comment added for clarity. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 ++ programs/reg/tests/reg.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index d648cd0..663f835 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -238,6 +238,8 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r break; } case REG_DWORD: + /* case REG_DWORD_LITTLE_ENDIAN: */ + case REG_DWORD_BIG_ENDIAN: /* Yes, this is correct! */ { LPWSTR rest; DWORD val; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index eac5d60..aedca14 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -308,7 +308,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); dword = 456; - verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), TODO_REG_SIZE); + verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like * an ordinary REG_DWORD - that is little endian. GG */

1 0