February 2014 - Wine-commits

Michael Stefaniuc : qedit: Return the correct iface in IEnumPins_QueryInterface().
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: ec9d32adf88eecc898916488bbcb647d9ff46a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9d32adf88eecc898916488b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 12 01:07:08 2014 +0100 qedit: Return the correct iface in IEnumPins_QueryInterface(). --- dlls/qedit/samplegrabber.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 046f912..de3d797 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -79,20 +79,18 @@ Fixed_IEnumPins_Release(IEnumPins *iface) } /* IUnknown */ -static HRESULT WINAPI -Fixed_IEnumPins_QueryInterface(IEnumPins *iface, REFIID riid, void **ppvObject) +static HRESULT WINAPI Fixed_IEnumPins_QueryInterface(IEnumPins *iface, REFIID riid, + void **ret_iface) { - PE_Impl *This = (PE_Impl *)iface; - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ret_iface); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IEnumPins)) { - Fixed_IEnumPins_AddRef(iface); - *ppvObject = This->pins; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumPins)) { + IEnumPins_AddRef(iface); + *ret_iface = iface; return S_OK; } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); + *ret_iface = NULL; + WARN("(%p, %s, %p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; }

1 0

Michael Stefaniuc : qedit/tests: COM tests for IEnumPins from SampleGrabber.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 37e5d4c53c9045cea966d245ed565dba782ab043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e5d4c53c9045cea966d245e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 12 01:10:54 2014 +0100 qedit/tests: COM tests for IEnumPins from SampleGrabber. --- dlls/qedit/tests/mediadet.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index cc16b6b..fce3e97 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -432,6 +432,38 @@ static void test_samplegrabber(void) while (ISampleGrabber_Release(sg)); } +static void test_COM_sg_enumpins(void) +{ + IBaseFilter *bf; + IEnumPins *pins, *pins2; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, + (void**)&bf); + ok(hr == S_OK, "SampleGrabber create failed: %08x, expected S_OK\n", hr); + hr = IBaseFilter_EnumPins(bf, &pins); + ok(hr == S_OK, "EnumPins create failed: %08x, expected S_OK\n", hr); + + /* Same refcount for all EnumPins interfaces */ + refcount = IEnumPins_AddRef(pins); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IEnumPins_QueryInterface(pins, &IID_IEnumPins, (void**)&pins2); + ok(hr == S_OK, "QueryInterface for IID_IEnumPins failed: %08x\n", hr); + ok(pins == pins2, "QueryInterface for self failed (%p != %p)\n", pins, pins2); + IEnumPins_Release(pins2); + + hr = IEnumPins_QueryInterface(pins, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IEnumPins_Release(pins)); + IBaseFilter_Release(bf); +} + START_TEST(mediadet) { if (!init_tests()) @@ -443,5 +475,6 @@ START_TEST(mediadet) CoInitialize(NULL); test_mediadet(); test_samplegrabber(); + test_COM_sg_enumpins(); CoUninitialize(); }

1 0

Alexandre Julliard : kernel32: Set correct binary type for COM and PIF files.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 7066ce0b1e22bc490bd791fd948bbbb3a1400bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7066ce0b1e22bc490bd791fd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 11:22:53 2014 +0100 kernel32: Set correct binary type for COM and PIF files. --- dlls/kernel32/process.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index bf113d6..60156aa 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2368,6 +2368,8 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (!strcmpiW( p, comW ) || !strcmpiW( p, pifW )) { TRACE( "starting %s as DOS binary\n", debugstr_w(name) ); + binary_info.type = BINARY_DOS; + binary_info.arch = IMAGE_FILE_MACHINE_I386; retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); @@ -2502,6 +2504,8 @@ static void exec_process( LPCWSTR name ) /* check for .com or .pif extension */ if (!(p = strrchrW( name, '.' ))) break; if (strcmpiW( p, comW ) && strcmpiW( p, pifW )) break; + binary_info.type = BINARY_DOS; + binary_info.arch = IMAGE_FILE_MACHINE_I386; /* fall through */ case BINARY_OS216: case BINARY_WIN16:

1 0

Nikolay Sivov : kernel32/tests: Fix some test failures in older XP/ Win2k3 versions.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 0a20d4680194e557f0f71b3f52965dca4d522313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a20d4680194e557f0f71b3f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 12 09:06:41 2014 +0400 kernel32/tests: Fix some test failures in older XP/Win2k3 versions. --- dlls/kernel32/tests/actctx.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 8499333..06b5c9c 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -723,7 +723,8 @@ static HANDLE test_create(const char *file) actctx.lpSource = path; handle = pCreateActCtxW(&actctx); - ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + /* to be tested outside of this helper, including last error */ + if (handle == INVALID_HANDLE_VALUE) return handle; ok(actctx.cbSize == sizeof(actctx), "actctx.cbSize=%d\n", actctx.cbSize); ok(actctx.dwFlags == 0, "actctx.dwFlags=%d\n", actctx.dwFlags); @@ -1556,6 +1557,8 @@ static void test_wndclass_section(void) create_manifest_file("main_wndcls.manifest", manifest_wndcls_main, -1, NULL, NULL); handle = test_create("main_wndcls.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + DeleteFileA("testdep1.manifest"); DeleteFileA("testdep2.manifest"); DeleteFileA("main_wndcls.manifest"); @@ -1618,6 +1621,8 @@ static void test_dllredirect_section(void) create_manifest_file("main_wndcls.manifest", manifest_wndcls_main, -1, NULL, NULL); handle = test_create("main_wndcls.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + DeleteFileA("testdep1.manifest"); DeleteFileA("testdep2.manifest"); DeleteFileA("main_wndcls.manifest"); @@ -1671,6 +1676,8 @@ static void test_typelib_section(void) create_manifest_file("main_wndcls.manifest", manifest_wndcls_main, -1, NULL, NULL); handle = test_create("main_wndcls.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + DeleteFileA("testdep1.manifest"); DeleteFileA("testdep2.manifest"); DeleteFileA("main_wndcls.manifest"); @@ -1744,7 +1751,7 @@ static void test_actctx(void) /* test for whitespace handling in Eq ::= S? '=' S? */ create_manifest_file("test1_1.manifest", manifest1_1, -1, NULL, NULL); handle = test_create("test1_1.manifest"); - ok(handle != INVALID_HANDLE_VALUE, "got %p\n", handle); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test1_1.manifest"); pReleaseActCtx(handle); @@ -1756,6 +1763,7 @@ static void test_actctx(void) trace("manifest1\n"); handle = test_create("test1.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test1.manifest"); if(handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__); @@ -1781,6 +1789,7 @@ static void test_actctx(void) trace("manifest2 depmanifest1\n"); handle = test_create("test2.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test2.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { @@ -1799,6 +1808,7 @@ static void test_actctx(void) trace("manifest2 depmanifest2\n"); handle = test_create("test2-2.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test2-2.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { @@ -1827,6 +1837,7 @@ static void test_actctx(void) } handle = test_create("test2-3.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test2-3.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { @@ -1857,6 +1868,10 @@ static void test_actctx(void) } handle = test_create("test3.manifest"); + ok(handle != INVALID_HANDLE_VALUE || broken(handle == INVALID_HANDLE_VALUE) /* XP pre-SP2, win2k3 w/o SP */, + "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + if (handle == INVALID_HANDLE_VALUE) + win_skip("Some activation context features not supported, skipping a test (possibly old XP/Win2k3 system\n"); DeleteFileA("test3.manifest"); if(handle != INVALID_HANDLE_VALUE) { static const WCHAR nameW[] = {'t','e','s','t','s','u','r','r','o','g','a','t','e',0}; @@ -1909,6 +1924,7 @@ static void test_actctx(void) } handle = test_create("test4.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test4.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { @@ -1929,6 +1945,7 @@ static void test_actctx(void) return; } handle = test_create("..\\test1.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("..\\test1.manifest"); if(handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__); @@ -1949,6 +1966,7 @@ static void test_actctx(void) } handle = test_create("test1.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test1.manifest"); if (handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__); @@ -1964,6 +1982,7 @@ static void test_actctx(void) } handle = test_create("test1.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); DeleteFileA("test1.manifest"); if (handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__);

1 0

Nikolay Sivov : kernel32/tests: Don't test last error when there' s no failure.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: ee518b5e3611bfa106d36e98aa250e251e4d50e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee518b5e3611bfa106d36e98a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 12 08:27:24 2014 +0400 kernel32/tests: Don't test last error when there's no failure. --- dlls/kernel32/tests/codepage.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index a269c7e..8423c75 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -546,32 +546,22 @@ static void test_threadcp(void) SetLastError(0xdeadbeef); memset(&cpi, 0, sizeof(cpi)); ret = GetCPInfoExA(CP_ACP, 0, &cpi); - ok(ret, "GetCPInfoExA failed for lcid %04x\n", lcids[i].lcid); - ok(GetLastError() == 0xdeadbeef || - broken(GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND), /* win2k */ - "GetLastError() is %u for lcid %04x\n", GetLastError(), lcids[i].lcid); + ok(ret, "GetCPInfoExA failed for lcid %04x, error %d\n", lcids[i].lcid, GetLastError()); ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, acp); /* WideCharToMultiByte - CP_ACP */ - SetLastError(0xdeadbeef); num = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); - ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); /* MultiByteToWideChar - CP_ACP */ - SetLastError(0xdeadbeef); num = MultiByteToWideChar(CP_ACP, 0, "foobar", -1, NULL, 0); ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); - ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); /* GetCPInfoEx/GetCPInfo - CP_THREAD_ACP */ SetLastError(0xdeadbeef); memset(&cpi, 0, sizeof(cpi)); ret = GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); - ok(ret, "GetCPInfoExA failed for lcid %04x\n", lcids[i].lcid); - ok(GetLastError() == 0xdeadbeef || - broken(GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND), /* win2k */ - "GetLastError() is %u for lcid %04x\n", GetLastError(), lcids[i].lcid); + ok(ret, "GetCPInfoExA failed for lcid %04x, error %d\n", lcids[i].lcid, GetLastError()); if (lcids[i].threadcp) ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); @@ -580,16 +570,12 @@ static void test_threadcp(void) cpi.CodePage, lcids[i].lcid, acp); /* WideCharToMultiByte - CP_THREAD_ACP */ - SetLastError(0xdeadbeef); num = WideCharToMultiByte(CP_THREAD_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); - ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); /* MultiByteToWideChar - CP_THREAD_ACP */ - SetLastError(0xdeadbeef); num = MultiByteToWideChar(CP_THREAD_ACP, 0, "foobar", -1, NULL, 0); ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); - ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); } /* IsDBCSLeadByteEx - locales without codepage */

1 0

Francois Gouget : inetmib1/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 899cb20eb9f5b173a37483c198b3fac9246ef9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899cb20eb9f5b173a37483c19… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 12 10:28:38 2014 +0100 inetmib1/tests: Add a trailing '\n' to an ok() call. --- dlls/inetmib1/tests/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 29876b1..d7739f1 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -30,7 +30,7 @@ static HMODULE init_test_functions(void) { HMODULE mod = LoadLibraryA("inetmib1"); - ok(mod != NULL, "failed to load inetmib1.dll"); + ok(mod != NULL, "failed to load inetmib1.dll\n"); if (!mod) return NULL;

1 0

Francois Gouget : dpnet/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: c92f773a3d166078d6ffa63bc0b8a0fc8fe25ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92f773a3d166078d6ffa63bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 12 10:28:44 2014 +0100 dpnet/tests: Add a trailing '\n' to an ok() call. --- dlls/dpnet/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 723f829..c4de81e 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -69,7 +69,7 @@ static void create_server(void) DPN_APPLICATION_DESC appdesc; hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); - ok(hr == S_OK, "Failed to create IDirectPlay8Address object"); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Jacek Caban : msxml3: Fixed qname leak.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 7dc605ae78e6ba24800c47fc8de5421b433c704d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc605ae78e6ba24800c47fc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 12 11:14:49 2014 +0100 msxml3: Fixed qname leak. Spotted by Hans Leidekker. --- dlls/msxml3/saxreader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index f861a25..45f6186 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -491,6 +491,7 @@ static void free_element_entry(element_entry *element) SysFreeString(element->prefix); SysFreeString(element->local); + SysFreeString(element->qname); heap_free(element->ns); heap_free(element);

1 0

Jactry Zeng : riched20/tests: Add tests to check the content open by ITextDocument_fnOpen.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 1841426616d97356c725a79fd9cce90231082f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1841426616d97356c725a79fd… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Feb 11 19:05:33 2014 +0800 riched20/tests: Add tests to check the content open by ITextDocument_fnOpen. --- dlls/riched20/tests/richole.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 63208ee..3781e68 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -159,6 +159,16 @@ static void test_ITextDocument_Open(void) HANDLE hFile; VARIANT testfile; WCHAR filename[] = {'t', 'e', 's', 't','.','t','x','t', 0}; + int result; + DWORD dw; + static const CHAR chACP[] = "TestSomeText"; + static const CHAR chUTF8[] = "\xef\xbb\xbfTextWithUTF8BOM"; + static const WCHAR chUTF16[] = {0xfeff, 'T', 'e', 's', 't', 'S', 'o', 'm', + 'e', 'T', 'e', 'x', 't', 0}; + +#define MAX_BUF_LEN 1024 + CHAR bufACP[MAX_BUF_LEN]; + WCHAR bufUnicode[MAX_BUF_LEN]; static const int tomConstantsSingle[] = { @@ -328,6 +338,46 @@ static void test_ITextDocument_Open(void) CloseHandle(hFile); release_interfaces(&w, &reOle, &txtDoc, &txtSel); DeleteFileW(filename); + + /* tests to check the content */ + hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(hFile, chACP, sizeof(chACP)-sizeof(CHAR), &dw, NULL); + CloseHandle(hFile); + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + ITextDocument_Open(txtDoc, &testfile, tomReadOnly, CP_ACP); + result = SendMessageA(w, WM_GETTEXT, 1024, (LPARAM)bufACP); + todo_wine ok(result == 12, "ITextDocument_Open: Test ASCII returned %d, expected 12\n", result); + result = strcmp(bufACP, chACP); + todo_wine ok(result == 0, "ITextDocument_Open: Test ASCII set wrong text: Result: %s\n", bufACP); + release_interfaces(&w, &reOle, &txtDoc, &txtSel); + DeleteFileW(filename); + + hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(hFile, chUTF8, sizeof(chUTF8)-sizeof(CHAR), &dw, NULL); + CloseHandle(hFile); + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + ITextDocument_Open(txtDoc, &testfile, tomReadOnly, CP_UTF8); + result = SendMessageA(w, WM_GETTEXT, 1024, (LPARAM)bufACP); + todo_wine ok(result == 15, "ITextDocument_Open: Test UTF-8 returned %d, expected 15\n", result); + result = strcmp(bufACP, &chUTF8[3]); + todo_wine ok(result == 0, "ITextDocument_Open: Test UTF-8 set wrong text: Result: %s\n", bufACP); + release_interfaces(&w, &reOle, &txtDoc, &txtSel); + DeleteFileW(filename); + + hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(hFile, chUTF16, sizeof(chUTF16)-sizeof(WCHAR), &dw, NULL); + CloseHandle(hFile); + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + ITextDocument_Open(txtDoc, &testfile, tomReadOnly, 1200); + result = SendMessageW(w, WM_GETTEXT, 1024, (LPARAM)bufUnicode); + todo_wine ok(result == 12, "ITextDocument_Open: Test UTF-16 returned %d, expected 12\n", result); + result = lstrcmpW(bufUnicode, &chUTF16[1]); + todo_wine ok(result == 0, "ITextDocument_Open: Test UTF-16 set wrong text: Result: %s\n", wine_dbgstr_w(bufUnicode)); + release_interfaces(&w, &reOle, &txtDoc, &txtSel); + DeleteFileW(filename); } START_TEST(richole)

1 0

Alexandre Julliard : winebuild: Generate position-independent code for ARM.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 4e4acd5f705c770b7c361605e11d9d7c044ca0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4acd5f705c770b7c361605e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 11 20:46:25 2014 +0100 winebuild: Generate position-independent code for ARM. --- tools/winebuild/import.c | 59 ++++++++++++++++++++++------------------------ tools/winebuild/spec32.c | 42 +++++++++++++++++---------------- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f8de47e..6bafd86 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -650,9 +650,9 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); break; case CPU_ARM: - output( "\tldr IP,[PC,#0]\n"); - output( "\tldr PC,[IP,#%d]\n", pos); - output( "\t.long %s\n", table ); + output( "\tldr IP,1f\n"); + output( "\tldr PC,[PC,IP]\n" ); + output( "1:\t.long %s+%u-(1b+4)\n", table, pos ); break; case CPU_ARM64: output( "\tadr x9, 1f\n" ); @@ -967,15 +967,15 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp *%%rax\n" ); break; case CPU_ARM: - output( "\tstmfd SP!, {r4-r10,FP,LR}\n" ); - output( "\tmov LR,PC\n"); - output( "\tadd LR,LR,#8\n"); - output( "\tldr PC,[PC,#-4]\n"); - output( "\t.long %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov IP,r0\n"); - output( "\tldmfd SP!, {r4-r10,FP,LR}\n" ); - output( "\tldmfd SP!, {r0-r3}\n" ); - output( "\tmov PC,IP\n"); + output( "\tpush {r0-r3,FP,LR}\n" ); + output( "\tmov r0,IP\n" ); + output( "\tldr IP,2f\n"); + output( "\tadd IP,PC\n"); + output( "\tblx IP\n"); + output( "1:\tmov IP,r0\n"); + output( "\tpop {r0-r3,FP,LR}\n" ); + output( "\tbx IP\n"); + output( "2:\t.long %s-1b\n", asm_name("__wine_spec_delay_load") ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); @@ -1067,18 +1067,15 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_ARM: - output( "\tstmfd SP!, {r0-r3}\n" ); - output( "\tmov r0, #%d\n", idx ); - output( "\tmov r1, #16384\n" ); - output( "\tmul r1, r0, r1\n" ); - output( "\tmov r0, r1\n" ); - output( "\tmov r1, #4\n" ); - output( "\tmul r1, r0, r1\n" ); - output( "\tmov r0, r1\n" ); - output( "\tadd r0, #%d\n", j ); - output( "\tldr PC,[PC,#-4]\n"); - output( "\t.long %s\n", asm_name("__wine_delay_load_asm") ); + { + unsigned int mask, count = 0, val = (idx << 16) | j; + + for (mask = 0xff; mask; mask <<= 8) + if (val & mask) output( "\t%s IP,#%u\n", count++ ? "add" : "mov", val & mask ); + if (!count) output( "\tmov IP,#0\n" ); + output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); break; + } case CPU_ARM64: output( "\tstp x6, x7, [sp,#-80]!\n" ); output( "\tstp x4, x5, [sp,#48]\n" ); @@ -1268,19 +1265,19 @@ void output_stubs( DLLSPEC *spec ) output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; case CPU_ARM: - output( "\tldr r0,[PC,#0]\n"); - output( "\tmov PC,PC\n"); - output( "\t.long .L__wine_spec_file_name\n" ); - output( "\tldr r1,[PC,#0]\n"); - output( "\tmov PC,PC\n"); + output( "\tldr r0,2f\n"); + output( "\tadd r0,PC\n"); + output( "\tldr r1,2f+4\n"); + output( "1:" ); if (exp_name) { - output( "\t.long .L%s_string\n", name ); + output( "\tadd r1,PC\n"); count++; } - else - output( "\t.long %d\n", odp->ordinal ); output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "2:\t.long .L__wine_spec_file_name-1b\n" ); + if (exp_name) output( "\t.long .L%s_string-2b\n", name ); + else output( "\t.long %u\n", odp->ordinal ); break; default: assert(0); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 0ed38ed..35fe144 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -210,32 +210,34 @@ static void output_relay_debug( DLLSPEC *spec ) break; case CPU_ARM: - switch (args) + { + unsigned int mask, val, count = 0; + unsigned int stack_size = min( 16, (args * 4 + 7) & ~7 ); + + if (odp->flags & FLAG_RET64) flags |= 1; + val = (flags << 24) | (args << 16) | (i - spec->base); + switch (stack_size) { - default: output( "\tpush {r0-r3}\n" ); break; - case 3: output( "\tpush {r0-r2}\n" ); break; - case 2: output( "\tpush {r0-r1}\n" ); break; - case 1: output( "\tpush {r0}\n" ); break; + case 16: output( "\tpush {r0-r3}\n" ); break; + case 8: output( "\tpush {r0-r1}\n" ); break; case 0: break; } output( "\tpush {LR}\n" ); output( "\tmov r2, SP\n"); - if (odp->flags & FLAG_RET64) flags |= 1; - output( "\tmov r1, #%u\n", (flags << 24) ); - if (args) output( "\tadd r1, #%u\n", (args << 16) ); - if ((i - spec->base) & 0xf000) output( "\tadd r1, #%u\n", (i - spec->base) & 0xf000 ); - if ((i - spec->base) & 0x0f00) output( "\tadd r1, #%u\n", (i - spec->base) & 0x0f00 ); - if ((i - spec->base) & 0x00f0) output( "\tadd r1, #%u\n", (i - spec->base) & 0x00f0 ); - if ((i - spec->base) & 0x000f) output( "\tadd r1, #%u\n", (i - spec->base) & 0x000f ); - output( "\tldr r0, [PC, #0]\n"); - output( "\tmov PC, PC\n"); - output( "\t.long .L__wine_spec_relay_descr\n" ); - output( "\tldr r3, [r0, #4]\n"); - output( "\tblx r3\n"); - output( "\tpop {r3}\n" ); - if (args) output( "\tadd SP, SP, #%u\n", min(args*4, 16) ); - output( "\tbx r3\n"); + output( "\tsub SP, #4\n"); + for (mask = 0xff; mask; mask <<= 8) + if (val & mask) output( "\t%s r1,#%u\n", count++ ? "add" : "mov", val & mask ); + if (!count) output( "\tmov r1,#0\n" ); + output( "\tldr r0, 2f\n"); + output( "\tadd r0, PC\n"); + output( "\tldr IP, [r0, #4]\n"); + output( "1:\tblx IP\n"); + output( "\tldr IP, [SP, #4]\n" ); + output( "\tadd SP, #%u\n", stack_size + 8 ); + output( "\tbx IP\n"); + output( "2:\t.long .L__wine_spec_relay_descr-1b\n" ); break; + } case CPU_x86_64: output( "\tsubq $40,%%rsp\n" );

1 0