February 2016 - Wine-Commits

Hugh McMaster : reg: Fail if strtolW cannot convert the entire data string into a DWORD.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 2fd010110ae7e7c76f9368ec237622fa061148ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd010110ae7e7c76f9368ec2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:06 2016 +1100 reg: Fail if strtolW cannot convert the entire data string into a DWORD. 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 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 20de804..7a66753 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -244,7 +244,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r LPWSTR rest; DWORD val; val = strtolW(data, &rest, 0); - if (rest == data) { + if (*rest) { output_message(STRING_MISSING_INTEGER); break; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2a96dd7..37fc40a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -258,7 +258,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword5 /t reg_dword /d 12345678 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -276,7 +276,7 @@ static void test_add(void) "got wrong data %d, expected %d\n", dword, 123); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d 0xabcdefg /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0xdeadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -299,7 +299,7 @@ static void test_add(void) (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r);

1 0

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

Feb. 16, 2016

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

Jianqiu Zhang : wpcap: Fix crash on pcap_loop.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: eacc448f6c7525cdfa725cea497d5d4e1864213b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eacc448f6c7525cdfa725cea4… Author: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Tue Jan 5 09:12:42 2016 +0800 wpcap: Fix crash on pcap_loop. Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index ae9e482..b770067 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -95,7 +95,6 @@ static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h TRACE("(%p %p %p)\n", user_data, h, p); pcb = (PCAP_HANDLER_CALLBACK *)user_data; pcb->pfn_cb(pcb->user_data, h, p); - HeapFree(GetProcessHeap(), 0, pcb); TRACE("Callback COMPLETED\n"); } @@ -107,11 +106,10 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, if (callback) { - PCAP_HANDLER_CALLBACK *pcb; - pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); - pcb->pfn_cb = callback; - pcb->user_data = user; - return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + PCAP_HANDLER_CALLBACK pcb; + pcb.pfn_cb = callback; + pcb.user_data = user; + return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)&pcb); } return pcap_dispatch(p, cnt, NULL, user); @@ -200,11 +198,10 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt, if (callback) { - PCAP_HANDLER_CALLBACK *pcb; - pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); - pcb->pfn_cb = callback; - pcb->user_data = user; - return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + PCAP_HANDLER_CALLBACK pcb; + pcb.pfn_cb = callback; + pcb.user_data = user; + return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)&pcb); } return pcap_loop(p, cnt, NULL, user);

1 0

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

Feb. 16, 2016

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 : kernel32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

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

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

Feb. 16, 2016

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

Henri Verbeet : ntdll: Add special handling for int $0x2d exceptions.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: e65c89f1c52c8aa4bbc375751138d0aec6bd237a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65c89f1c52c8aa4bbc375751… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:05 2016 +0100 ntdll: Add special handling for int $0x2d exceptions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 29 ++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a3abbff..10235fe 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1553,6 +1553,31 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) } } + +/*********************************************************************** + * handle_interrupt + * + * Handle an interrupt. + */ +static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + switch(interrupt) + { + case 0x2d: + context->Eip += 3; + rec->ExceptionCode = EXCEPTION_BREAKPOINT; + rec->ExceptionAddress = (void *)context->Eip; + rec->NumberParameters = is_wow64 ? 1 : 3; + rec->ExceptionInformation[0] = context->Eax; + rec->ExceptionInformation[1] = context->Ecx; + rec->ExceptionInformation[2] = context->Edx; + return TRUE; + default: + return FALSE; + } +} + + /*********************************************************************** * check_invalid_gs * @@ -2072,8 +2097,10 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_PROTFLT: /* General protection fault */ case TRAP_x86_UNKNOWN: /* Unknown fault code */ { + CONTEXT *win_context = get_exception_context( rec ); WORD err = get_error_code(context); - if (!err && (rec->ExceptionCode = is_privileged_instr( get_exception_context(rec) ))) break; + if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; + if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; rec->ExceptionInformation[0] = 0; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c9e06ea..8ec7408 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -219,6 +219,11 @@ static const struct exception { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, FALSE, STATUS_SINGLE_STEP, 0 }, + { { 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, /* mov $0xb8b8b8b8, %eax */ + 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, /* mov $0xb9b9b9b9, %ecx */ + 0xba, 0xba, 0xba, 0xba, 0xba, /* mov $0xbabababa, %edx */ + 0xcd, 0x2d, 0xc3 }, /* int $0x2d; ret */ + 17, 0, FALSE, STATUS_BREAKPOINT, 3, { 0xb8b8b8b8, 0xb9b9b9b9, 0xbabababa } }, }; static int got_exception; @@ -473,7 +478,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { const struct exception *except = *(const struct exception **)(frame + 1); - unsigned int i, entry = except - exceptions; + unsigned int i, parameter_count, entry = except - exceptions; got_exception++; trace( "exception %u: %x flags:%x addr:%p\n", @@ -482,20 +487,23 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram ok( rec->ExceptionCode == except->status || (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status ); - ok( rec->ExceptionAddress == (char*)code_mem + except->offset, - "%u: Wrong exception address %p/%p\n", entry, - rec->ExceptionAddress, (char*)code_mem + except->offset ); - - if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) - { - ok( rec->NumberParameters == except->nb_params, - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); - } + ok( context->Eip == (DWORD_PTR)code_mem + except->offset, + "%u: Unexpected eip %#x/%#lx\n", entry, + context->Eip, (DWORD_PTR)code_mem + except->offset ); + ok( rec->ExceptionAddress == (char*)context->Eip || + (rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Eip + 1), + "%u: Unexpected exception address %p/%p\n", entry, + rec->ExceptionAddress, (char*)context->Eip ); + + if (except->status == STATUS_BREAKPOINT && is_wow64) + parameter_count = 1; + else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) + parameter_count = except->nb_params; else - { - ok( rec->NumberParameters == except->alt_nb_params, - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); - } + parameter_count = except->alt_nb_params; + + ok( rec->NumberParameters == parameter_count, + "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count ); /* Most CPUs (except Intel Core apparently) report a segment limit violation */ /* instead of page faults for accesses beyond 0xffffffff */ @@ -530,7 +538,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram skip_params: /* don't handle exception if it's not the address we expected */ - if (rec->ExceptionAddress != (char*)code_mem + except->offset) return ExceptionContinueSearch; + if (context->Eip != (DWORD_PTR)code_mem + except->offset) return ExceptionContinueSearch; context->Eip += except->length; return ExceptionContinueExecution;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in resolve_depth_buffer ().
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: c62fe153c64fc2db08be080cb1af7d8de7487ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62fe153c64fc2db08be080cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:04 2016 +0100 wined3d: Use wined3d_texture_blt() in resolve_depth_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d45135..4cebcb8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2013,20 +2013,26 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru static void resolve_depth_buffer(struct wined3d_state *state) { - struct wined3d_texture *texture = state->textures[0]; - struct wined3d_surface *depth_stencil, *surface; + struct wined3d_texture *dst_texture = state->textures[0]; + struct wined3d_rendertarget_view *src_view; RECT src_rect, dst_rect; - if (!texture || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || !(texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D + || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) return; - surface = surface_from_resource(texture->sub_resources[0]); - if (!(depth_stencil = wined3d_rendertarget_view_get_surface(state->fb->depth_stencil))) + + if (!(src_view = state->fb->depth_stencil)) + return; + if (src_view->resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not supported on buffer resources.\n"); return; + } - SetRect(&dst_rect, 0, 0, surface->resource.width, surface->resource.height); - SetRect(&src_rect, 0, 0, depth_stencil->resource.width, depth_stencil->resource.height); - wined3d_surface_blt(surface, &dst_rect, depth_stencil, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + SetRect(&dst_rect, 0, 0, dst_texture->resource.width, dst_texture->resource.height); + SetRect(&src_rect, 0, 0, src_view->width, src_view->height); + wined3d_texture_blt(dst_texture, 0, &dst_rect, wined3d_texture_from_resource(src_view->resource), + src_view->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } void CDECL wined3d_device_set_render_state(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Replace WINEDDBLTFX with a new structure that only includes the used fields.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 9d7221b51d8e365020915fa8eb3501220e24a61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7221b51d8e365020915fa8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:03 2016 +0100 wined3d: Replace WINEDDBLTFX with a new structure that only includes the used fields. It's a happy coincidence that none of the surface pointers are actually used. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 91 ++++++++++++++++++++++------------------ dlls/wined3d/surface.c | 95 ++++++++++++++++-------------------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 57 ++++--------------------- 5 files changed, 97 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d7221b51d8e365020915…

1 0

Henri Verbeet : wined3d: Get rid of unused/ unimplemented WINEDDBLT_* flags.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 0b6b5176cc38ac4b57b37cb729fd9e6af5604d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6b5176cc38ac4b57b37cb72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:02 2016 +0100 wined3d: Get rid of unused/unimplemented WINEDDBLT_* flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 15 +++++--- dlls/wined3d/surface.c | 93 ++++++++++++++++++++++++------------------------ dlls/wined3d/swapchain.c | 8 ++--- include/wine/wined3d.h | 40 +++++++-------------- 4 files changed, 74 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b6b5176cc38ac4b57b37…

1 0