May 2015 - Wine-commits - list.winehq.org

Huw Davies : riched20/tests: Fix test on 64-bit.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 008ceb662dd617feeea80273c5310fb09b9e046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=008ceb662dd617feeea80273c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 09:17:21 2015 +0100 riched20/tests: Fix test on 64-bit. --- dlls/riched20/tests/richole.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5472ce1..51e5631 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -525,8 +525,11 @@ static void test_ITextSelection_GetText(void) hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); - hres = ITextSelection_GetText(txtSel, NULL); - ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + if (!is64bit) + { + hres = ITextSelection_GetText(txtSel, NULL); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + } ITextSelection_Release(txtSel); }

1 0

Huw Davies : dinput/tests: Send a matching key-up event.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 4b110f7554460bd0743dae966c88e7715339594a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b110f7554460bd0743dae966… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 09:45:02 2015 +0100 dinput/tests: Send a matching key-up event. The user32 msg tests are failing (more than normal) as they still see 'Q' in the down state. --- dlls/dinput/tests/keyboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index a0e7d24..520740d 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -110,6 +110,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); } + keybd_event('Q', 0, KEYEVENTF_KEYUP, 0); if (pKeyboard) IUnknown_Release(pKeyboard); }

1 0

Nikolay Sivov : riched20: Added some tom* constants used with ITextFont:: Reset().
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 1f55764dfcf67cd09f0dd233f99698961c93d692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f55764dfcf67cd09f0dd233f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 11:46:43 2015 +0300 riched20: Added some tom* constants used with ITextFont::Reset(). --- dlls/riched20/riched_tom.idl | 16 ++++++++++++---- dlls/riched20/richole.c | 4 ++-- include/tom.idl | 16 ++++++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/riched_tom.idl b/dlls/riched20/riched_tom.idl index c5e1fe6..4cacbe0 100644 --- a/dlls/riched20/riched_tom.idl +++ b/dlls/riched20/riched_tom.idl @@ -46,10 +46,18 @@ typedef enum tagTomConstants tomDefault = -9999996, tomSuspend = -9999995, tomResume = -9999994, - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, + + /* ITextFont::Reset() modes */ + tomApplyNow = 0, + tomApplyLater = 1, + tomTrackParms = 2, + tomCacheParms = 3, + tomApplyTmp = 4, + tomDisableSmartFont = 8, + tomEnableSmartFont = 9, + tomUsePoints = 10, + tomUseTwips = 11, + tomBackward = 0xc0000001, tomForward = 0x3fffffff, tomMove = 0, diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3a4eb3b..5c6acb4 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1821,14 +1821,14 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret) static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *ret) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, ret); + FIXME("(%p)->(%p %p): stub\n", This, font, ret); return E_NOTIMPL; } static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p): stub\n", This); + FIXME("(%p)->(%d): stub\n", This, value); return E_NOTIMPL; } diff --git a/include/tom.idl b/include/tom.idl index 769e31b..343906d 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -33,10 +33,18 @@ typedef enum tagTomConstants tomDefault = -9999996, tomSuspend = -9999995, tomResume = -9999994, - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, + + /* ITextFont::Reset() modes */ + tomApplyNow = 0, + tomApplyLater = 1, + tomTrackParms = 2, + tomCacheParms = 3, + tomApplyTmp = 4, + tomDisableSmartFont = 8, + tomEnableSmartFont = 9, + tomUsePoints = 10, + tomUseTwips = 11, + tomBackward = 0xc0000001, tomForward = 0x3fffffff, tomMove = 0,

1 0

Nikolay Sivov : dwrite: Fix splitting by bidi levels.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 90ed96a766b4b627a5dd18d601b41257c4f8e390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ed96a766b4b627a5dd18d60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 11:27:51 2015 +0300 dwrite: Fix splitting by bidi levels. --- dlls/dwrite/layout.c | 38 ++++++++++++++------------------------ dlls/dwrite/tests/analyzer.c | 7 +++++++ 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 11d69d8..0a95c4e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2750,15 +2750,17 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink(iface); struct layout_run *cur_run; + TRACE("%u %u %u %u\n", position, length, explicitLevel, resolvedLevel); + LIST_FOR_EACH_ENTRY(cur_run, &layout->runs, struct layout_run, entry) { struct regular_layout_run *cur = &cur_run->u.regular; - struct layout_run *run, *run2; + struct layout_run *run; if (cur_run->kind == LAYOUT_RUN_INLINE) continue; /* FIXME: levels are reported in a natural forward direction, so start loop from a run we ended on */ - if (position < cur->descr.textPosition || position > cur->descr.textPosition + cur->descr.stringLength) + if (position < cur->descr.textPosition || position >= cur->descr.textPosition + cur->descr.stringLength) continue; /* full hit - just set run level */ @@ -2775,35 +2777,23 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink continue; } - /* now starting point is in a run, so it splits it */ + /* all fully covered runs are processed at this point, reuse existing run for remaining + reported bidi range and add another run for the rest of original one */ + run = alloc_layout_run(LAYOUT_RUN_REGULAR); if (!run) return E_OUTOFMEMORY; *run = *cur_run; - run->u.regular.descr.textPosition = position; - run->u.regular.descr.stringLength = cur->descr.stringLength - position + cur->descr.textPosition; - run->u.regular.descr.string = &layout->str[position]; - run->u.regular.run.bidiLevel = resolvedLevel; - cur->descr.stringLength -= position - cur->descr.textPosition; + run->u.regular.descr.textPosition = position + length; + run->u.regular.descr.stringLength = cur->descr.stringLength - length; + run->u.regular.descr.string = &layout->str[position + length]; - list_add_after(&cur_run->entry, &run->entry); - - if (position + length == run->u.regular.descr.textPosition + run->u.regular.descr.stringLength) - break; + /* reduce existing run */ + cur->run.bidiLevel = resolvedLevel; + cur->descr.stringLength -= length; - /* split second time */ - run2 = alloc_layout_run(LAYOUT_RUN_REGULAR); - if (!run2) - return E_OUTOFMEMORY; - - *run2 = *cur_run; - run2->u.regular.descr.textPosition = run->u.regular.descr.textPosition + run->u.regular.descr.stringLength; - run2->u.regular.descr.stringLength = cur->descr.textPosition + cur->descr.stringLength - position - length; - run2->u.regular.descr.string = &layout->str[run2->u.regular.descr.textPosition]; - run->u.regular.descr.stringLength -= run2->u.regular.descr.stringLength; - - list_add_after(&run->entry, &run2->entry); + list_add_after(&cur_run->entry, &run->entry); break; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 0043526..43c2a66 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -878,6 +878,13 @@ static struct sa_test sa_tests[] = { {0x2d30,0x2d4a,0}, 1, { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, + { + /* LRE/PDF */ + {0x202a,0x202c,'a','b','c','\r',0}, 3, + { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL }, + { 2, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 5, 1, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } + }, /* keep this as end marker */ { {0} } };

1 0

Sebastian Lackner : ole32/tests: Add additional tests for CoWaitForMultipleHandles and WM_QUIT.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: fdd83248b6fe9a303c40ddd6f65f1e36b33568a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd83248b6fe9a303c40ddd6f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 12 01:23:06 2014 +0100 ole32/tests: Add additional tests for CoWaitForMultipleHandles and WM_QUIT. --- dlls/ole32/tests/compobj.c | 153 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 220052d..c96d63a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2110,6 +2110,22 @@ static DWORD CALLBACK release_semaphore_thread( LPVOID arg ) return 0; } +static DWORD CALLBACK send_message_thread(LPVOID arg) +{ + HWND hWnd = arg; + Sleep(50); + SendMessageA(hWnd, WM_DDE_FIRST, 0, 0); + return 0; +} + +static DWORD CALLBACK post_message_thread(LPVOID arg) +{ + HWND hWnd = arg; + Sleep(50); + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + return 0; +} + static void test_CoWaitForMultipleHandles(void) { static const char cls_name[] = "cowait_test_class"; @@ -2190,6 +2206,32 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + /* test PostMessageA/SendMessageA from a different thread */ + + index = 0xdeadbeef; + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + ReleaseSemaphore(handles[0], 1, NULL); ReleaseSemaphore(handles[1], 1, NULL); @@ -2271,7 +2313,7 @@ static void test_CoWaitForMultipleHandles(void) hr = CoWaitForMultipleHandles(COWAIT_INPUTAVAILABLE, 50, 2, handles, &index); ok(hr == RPC_S_CALLPENDING || broken(hr == E_INVALIDARG) || broken(hr == S_OK) /* Win 8 */, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - ReleaseSemaphore(handles[1], 1, NULL); + if (hr != S_OK) ReleaseSemaphore(handles[1], 1, NULL); ok(index == 0 || broken(index == 1) /* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success || broken(success && hr == E_INVALIDARG), @@ -2280,6 +2322,115 @@ static void test_CoWaitForMultipleHandles(void) ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread); + /* test behaviour of WM_QUIT (semaphores are still locked) */ + + PostMessageA(hWnd, WM_QUIT, 40, 0); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 40, "expected msg.wParam = 40, got %lu\n", msg.wParam); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostMessageA(hWnd, WM_QUIT, 41, 0); + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(success || broken(!success) /* Win 2000/XP/8 */, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + todo_wine + ok(!success || broken(success) /* Win 2000/XP/8 */, "PeekMessageA succeeded\n"); + if (success) + { + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 41, "expected msg.wParam = 41, got %lu\n", msg.wParam); + } + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostMessageA(hWnd, WM_QUIT, 42, 0); + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump all WM_DDE_FIRST messages\n"); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 42, "expected msg.wParam = 42, got %lu\n", msg.wParam); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + PostQuitMessage(43); + memset(&msg, 0, sizeof(msg)); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(success || broken(!success) /* Win 8 */, "PeekMessageA failed, error %u\n", GetLastError()); + if (!success) + win_skip("PostQuitMessage didn't queue a WM_QUIT message, skipping tests\n"); + else + { + ok(msg.message == WM_QUIT, "expected msg.message = WM_QUIT, got %u\n", msg.message); + ok(msg.wParam == 43, "expected msg.wParam = 43, got %lu\n", msg.wParam); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "PeekMessageA succeeded\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostQuitMessage(44); + thread = CreateThread(NULL, 0, post_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(!success, "PeekMessageA succeeded\n"); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + todo_wine + ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + PostQuitMessage(45); + thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); + ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "PeekMessageA failed, error %u\n", GetLastError()); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + todo_wine + ok(!success, "PeekMessageA succeeded\n"); + success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n"); + index = WaitForSingleObject(thread, 200); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + } + CloseHandle(handles[0]); CloseHandle(handles[1]); DestroyWindow(hWnd);

1 0

André Hentschel : wineboot: Add environment registry keys on ARM64.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: b4a46dbcaa7c9405ecf6783c0abaa0fbcece9d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a46dbcaa7c9405ecf6783c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:12:25 2015 +0200 wineboot: Add environment registry keys on ARM64. --- programs/wineboot/wineboot.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index a20b4e1..0792c2d 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -300,6 +300,7 @@ static void create_environment_registry_keys( void ) static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR armW[] = {'A','R','M',0}; + static const WCHAR arm64W[] = {'A','R','M','6','4',0}; static const WCHAR AMD64W[] = {'A','M','D','6','4',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; @@ -308,7 +309,7 @@ static void create_environment_registry_keys( void ) static const WCHAR Percent04XW[] = {'%','0','4','x',0}; static const WCHAR IntelCpuDescrW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',',',' ','G','e','n','u','i','n','e','I','n','t','e','l',0}; - static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; HKEY env_key; @@ -327,6 +328,7 @@ static void create_environment_registry_keys( void ) { case PROCESSOR_ARCHITECTURE_AMD64: arch = AMD64W; break; case PROCESSOR_ARCHITECTURE_ARM: arch = armW; break; + case PROCESSOR_ARCHITECTURE_ARM64: arch = arm64W; break; default: case PROCESSOR_ARCHITECTURE_INTEL: arch = x86W; break; } @@ -335,7 +337,8 @@ static void create_environment_registry_keys( void ) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: - sprintfW( buffer, ARMCpuDescrW, sci.Level, sci.Revision ); + case PROCESSOR_ARCHITECTURE_ARM64: + sprintfW( buffer, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; default: case PROCESSOR_ARCHITECTURE_INTEL:

1 0

André Hentschel : wineboot: Add hardware registry keys on ARM64.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 48d150dc317bb7edc0c3bbf83df22d7e060a834d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d150dc317bb7edc0c3bbf83… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:12:44 2015 +0200 wineboot: Add hardware registry keys on ARM64. --- programs/wineboot/wineboot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0792c2d..4d70ea9 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -185,7 +185,7 @@ static void create_hardware_registry_keys(void) static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',0}; - static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; static const WCHAR IntelCpuStringW[] = {'I','n','t','e','l','(','R',')',' ','P','e','n','t','i','u','m','(','R',')',' ','4',' ', 'C','P','U',' ','2','.','4','0','G','H','z',0}; @@ -208,7 +208,8 @@ static void create_hardware_registry_keys(void) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: - sprintfW( idW, ARMCpuDescrW, sci.Level, sci.Revision ); + case PROCESSOR_ARCHITECTURE_ARM64: + sprintfW( idW, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; default: case PROCESSOR_ARCHITECTURE_INTEL: @@ -226,6 +227,7 @@ static void create_hardware_registry_keys(void) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: + case PROCESSOR_ARCHITECTURE_ARM64: set_reg_value( system_key, IdentifierW, ARMSysidW ); break; default: @@ -235,6 +237,7 @@ static void create_hardware_registry_keys(void) } if (sci.Architecture == PROCESSOR_ARCHITECTURE_ARM || + sci.Architecture == PROCESSOR_ARCHITECTURE_ARM64 || RegCreateKeyExW( system_key, fpuW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &fpu_key, NULL )) fpu_key = 0; @@ -259,6 +262,7 @@ static void create_hardware_registry_keys(void) RegCloseKey( hkey ); } if (sci.Architecture != PROCESSOR_ARCHITECTURE_ARM && + sci.Architecture != PROCESSOR_ARCHITECTURE_ARM64 && !RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) {

1 0

André Hentschel : ntdll: Parse ARM64 CPU info.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: b5b34220cc8d0c232f7b47f63440696604706eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b34220cc8d0c232f7b47f63… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:13:35 2015 +0200 ntdll: Parse ARM64 CPU info. --- dlls/ntdll/nt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 550a91a..8e6ce06 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1146,7 +1146,54 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) { - info->Level = 8; +#ifdef linux + char line[512]; + char *s, *value; + FILE *f = fopen("/proc/cpuinfo", "r"); + if (f) + { + while (fgets(line, sizeof(line), f) != NULL) + { + /* NOTE: the ':' is the only character we can rely on */ + if (!(value = strchr(line,':'))) + continue; + /* terminate the valuename */ + s = value - 1; + while ((s >= line) && isspace(*s)) s--; + *(s + 1) = '\0'; + /* and strip leading spaces from value */ + value += 1; + while (isspace(*value)) value++; + if ((s = strchr(value,'\n'))) + *s='\0'; + if (!strcasecmp(line, "CPU architecture")) + { + if (isdigit(value[0])) + info->Level = atoi(value); + continue; + } + if (!strcasecmp(line, "CPU revision")) + { + if (isdigit(value[0])) + info->Revision = atoi(value); + continue; + } + if (!strcasecmp(line, "Features")) + { + if (strstr(value, "crc32")) + user_shared_data->ProcessorFeatures[PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(value, "aes")) + user_shared_data->ProcessorFeatures[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = TRUE; + continue; + } + } + fclose(f); + } +#else + FIXME("CPU Feature detection not implemented.\n"); +#endif + info->Level = max(info->Level, 8); + user_shared_data->ProcessorFeatures[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = TRUE; info->Architecture = PROCESSOR_ARCHITECTURE_ARM64; }

1 0

André Hentschel : ntdll: Add ARMv8 detection for ARM32.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: dec7b246f8afe516206f1a34a8d9be5963f14600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec7b246f8afe516206f1a34a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:16:52 2015 +0200 ntdll: Add ARMv8 detection for ARM32. --- dlls/ntdll/nt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8e6ce06..2acaa83 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1139,6 +1139,8 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) #else FIXME("CPU Feature detection not implemented.\n"); #endif + if (info->Level >= 8) + user_shared_data->ProcessorFeatures[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = TRUE; info->Architecture = PROCESSOR_ARCHITECTURE_ARM; }

1 0

Ken Thomases : ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 5514df9d4e4c14cafcc4284e12d26ad6c74709fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5514df9d4e4c14cafcc4284e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 21 11:13:35 2015 -0500 ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system. Extract a new function, get_dir_case_sensitivity_attr_by_id(), from get_dir_case_sensitivity_attr(). Call that instead of get_dir_case_sensitivity() from read_directory_getattrlist(). We get the device and file system IDs from the same getattrlist() call we're already doing, so that avoids an extra call. --- dlls/ntdll/directory.c | 62 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8e4db83..cd9fdb0 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -983,43 +983,35 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) } /*********************************************************************** - * get_dir_case_sensitivity_attr + * get_dir_case_sensitivity_attr_by_id * - * Checks if the volume containing the specified directory is case - * sensitive or not. Uses getattrlist(2). + * Checks if the volume with the specified device and file system IDs + * is case sensitive or not. Uses getattrlist(2). */ -static int get_dir_case_sensitivity_attr( const char *dir ) +static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) { char *mntpoint = NULL; struct attrlist attr; struct vol_caps caps; - struct get_fsid get_fsid; struct fs_cache *entry; - /* First get the FS ID of the volume */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = 0; - attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; - attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; - get_fsid.size = 0; - if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || - get_fsid.size != sizeof(get_fsid)) - return -1; /* Try to look it up in the cache */ - entry = look_up_fs_cache( get_fsid.dev ); - if (entry && !memcmp( &entry->fsid, &get_fsid.fsid, sizeof(fsid_t) )) + entry = look_up_fs_cache( dev ); + if (entry && !memcmp( &entry->fsid, &fsid, sizeof(fsid_t) )) /* Cache lookup succeeded */ return entry->case_sensitive; /* Cache is stale at this point, we have to update it */ - mntpoint = get_device_mount_point( get_fsid.dev ); + mntpoint = get_device_mount_point( dev ); /* Now look up the case-sensitivity */ - attr.commonattr = 0; + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = attr.commonattr = 0; attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; + attr.dirattr = attr.fileattr = attr.forkattr = 0; if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) { RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); - add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); + add_fs_cache( dev, fsid, TRUE ); return TRUE; } RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); @@ -1036,11 +1028,34 @@ static int get_dir_case_sensitivity_attr( const char *dir ) else ret = TRUE; /* Update the cache */ - add_fs_cache( get_fsid.dev, get_fsid.fsid, ret ); + add_fs_cache( dev, fsid, ret ); return ret; } return FALSE; } + +/*********************************************************************** + * get_dir_case_sensitivity_attr + * + * Checks if the volume containing the specified directory is case + * sensitive or not. Uses getattrlist(2). + */ +static int get_dir_case_sensitivity_attr( const char *dir ) +{ + struct attrlist attr; + struct get_fsid get_fsid; + + /* First get the FS ID of the volume */ + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = 0; + attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; + attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; + get_fsid.size = 0; + if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || + get_fsid.size != sizeof(get_fsid)) + return -1; + return get_dir_case_sensitivity_attr_by_id( get_fsid.dev, get_fsid.fsid ); +} #endif /*********************************************************************** @@ -2148,6 +2163,8 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer { u_int32_t length; struct attrreference name_reference; + dev_t devid; + fsid_t fsid; fsobj_type_t type; char name[NAME_MAX * 3 + 1]; } attrlist_buffer; @@ -2179,7 +2196,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer memset( &attrlist, 0, sizeof(attrlist) ); attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; - attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_OBJTYPE; + attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_FSID | ATTR_CMN_OBJTYPE; ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), FSOPT_NOFOLLOW ); /* If unix_name named a symlink, the above may have succeeded even if the symlink is broken. Check that with another call without FSOPT_NOFOLLOW. We don't ask for any attributes. */ @@ -2199,7 +2216,8 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) + else if ((errno == ENOENT || errno == ENOTDIR) && + !get_dir_case_sensitivity_attr_by_id( attrlist_buffer.devid, attrlist_buffer.fsid )) { io->u.Status = STATUS_NO_MORE_FILES; ret = 0;

1 0