August 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 1.7.1
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: website Branch: master Commit: df3af5303930063cea75bdc998b1bba56319bf5c URL: http://source.winehq.org/git/website.git/?a=commit;h=df3af5303930063cea75bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 20:03:10 2013 +0200 Wine release 1.7.1 --- news/en/2013083001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2013083001.xml b/news/en/2013083001.xml new file mode 100644 index 0000000..3b536d8 --- /dev/null +++ b/news/en/2013083001.xml @@ -0,0 +1,18 @@ +<news> +<date>August 30, 2013</date> +<title>Wine 1.7.1 Released</title> +<body> + The Wine development release 1.7.1 is now available. + <a href="{$root}/announce/1.7.1">What's new</a> in this release: +<ul> + <li>Support for keyed event objects.</li> + <li>Support for the "init once" synchronization mechanism.</li> + <li>Activation context support for DLLs, typelibs, and COM classes.</li> + <li>Support for loading 32-bit typelibs on 64-bit.</li> + <li>Various Mac driver fixes.</li> + <li>Some fixes for serial port devices.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.1 : Alexandre Julliard : Release 1.7.1
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: refs/tags/wine-1.7.1 Tag: 0bebfb2472318832856aa795a913a921116480e1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=0bebfb2472318832856aa795a913… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 19:55:16 2013 +0200 Release 1.7.1

1 0

Alexandre Julliard : Release 1.7.1.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: c71bbc7d24647f225e95beee3299d48b62e6b80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71bbc7d24647f225e95beee3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 19:55:16 2013 +0200 Release 1.7.1. --- ANNOUNCE | 860 +++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 514 insertions(+), 369 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c71bbc7d24647f225e95b…

1 0

Dmitry Timoshkov : kernel32/tests: Add a FlushFileBuffers test for a COM port.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: f69ec2c61c675974cafc4161d74aab60fe751338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69ec2c61c675974cafc4161d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 30 18:20:26 2013 +0900 kernel32/tests: Add a FlushFileBuffers test for a COM port. --- dlls/kernel32/tests/comm.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 647c07a..e5264c8 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1872,9 +1872,35 @@ done: CloseHandle(hcom); } +static void test_FlushFileBuffers(void) +{ + HANDLE hcom; + DWORD ret, bytes, errors; + COMSTAT stat; + + hcom = test_OpenComm(FALSE); + if (hcom == INVALID_HANDLE_VALUE) return; + + ret = WriteFile(hcom, "\0\0\0\0\0\0\0", 7, &bytes, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + ok(bytes == 7, "expected 7, got %u\n", bytes); + + ret = FlushFileBuffers(hcom); + ok(ret, "FlushFileBuffers error %d\n", GetLastError()); + + ret = ClearCommError(hcom, &errors, &stat); + ok(ret, "ClearCommError error %d\n", GetLastError()); + ok(stat.cbInQue == 0, "expected 0, got %d bytes in InQueue\n", stat.cbInQue); + ok(stat.cbOutQue == 0, "expected 0, got %d bytes in OutQueue\n", stat.cbOutQue); + ok(errors == 0, "expected errors 0, got %#x\n", errors); + + CloseHandle(hcom); +} + START_TEST(comm) { test_ClearCommError(); /* keep it the very first test */ + test_FlushFileBuffers(); test_BuildCommDCB(); test_ReadTimeOut(); test_waittxempty();

1 0

Nikolay Sivov : ole32/tests: Some tests for redirection in CoGetPSClsid().
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 8902aae99171320416076e8ba96b209d5b7045f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8902aae99171320416076e8ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 12:59:06 2013 +0400 ole32/tests: Some tests for redirection in CoGetPSClsid(). --- dlls/ole32/tests/compobj.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 519cb74..8912498 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -55,6 +55,12 @@ static void (WINAPI *pReleaseActCtx)(HANDLE); static const CLSID CLSID_non_existent = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const CLSID CLSID_StdFont = { 0x0be35203, 0x8f91, 0x11ce, { 0x9d, 0xe3, 0x00, 0xaa, 0x00, 0x4b, 0xb8, 0x51 } }; +static const GUID IID_Testiface = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface2 = { 0x32222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface3 = { 0x42222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface4 = { 0x52222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 } }; + static WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; static WCHAR wszCLSID_StdFont[] = @@ -230,7 +236,26 @@ static const char actctx_manifest[] = " <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" " progid=\"StdFont\"" " />" +" <comInterfaceProxyStub " +" name=\"Iifaceps\"" +" iid=\"{22222222-1234-1234-1234-56789abcdef0}\"" +" proxyStubClsid32=\"{66666666-8888-7777-6666-555555555555}\"" +" />" "</file>" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps2\"" +" iid=\"{32222222-1234-1234-1234-56789abcdef0}\"" +" />" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps3\"" +" iid=\"{42222222-1234-1234-1234-56789abcdef0}\"" +" proxyStubClsid32=\"{66666666-8888-7777-6666-555555555555}\"" +" />" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps4\"" +" iid=\"{52222222-1234-1234-1234-56789abcdef0}\"" +" proxyStubClsid32=\"{00000000-0000-0000-0000-000000000000}\"" +" />" "</assembly>"; DEFINE_GUID(CLSID_Testclass, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0); @@ -904,6 +929,8 @@ static void test_CoRegisterPSClsid(void) static void test_CoGetPSClsid(void) { + ULONG_PTR cookie; + HANDLE handle; HRESULT hr; CLSID clsid; HKEY hkey; @@ -952,6 +979,38 @@ static void test_CoGetPSClsid(void) ok(!res, "RegOverridePredefKey returned %d\n", res); RegCloseKey(hkey); + + /* not registered CLSID */ + hr = CoGetPSClsid(&IID_Testiface, &clsid); + ok(hr == REGDB_E_IIDNOTREG, "got 0x%08x\n", hr); + + if ((handle = activate_context(actctx_manifest, &cookie))) + { +todo_wine { + memset(&clsid, 0, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_Testiface), "got clsid %s\n", debugstr_guid(&clsid)); + + memset(&clsid, 0, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface2, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_Testiface2), "got clsid %s\n", debugstr_guid(&clsid)); + + memset(&clsid, 0, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface3, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", debugstr_guid(&clsid)); + + memset(&clsid, 0xaa, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface4, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", debugstr_guid(&clsid)); +} + pDeactivateActCtx(0, cookie); + pReleaseActCtx(handle); + } + CoUninitialize(); }

1 0

Nikolay Sivov : mshtml: Use defined dispid instead of a magic value.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: e07dabf2d91f5659ab17a2d7a0d36cb054d4eb43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07dabf2d91f5659ab17a2d7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 14:56:41 2013 +0400 mshtml: Use defined dispid instead of a magic value. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ce9320c..0df30da 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -453,7 +453,7 @@ static HRESULT WINAPI HTMLDocument_put_designMode(IHTMLDocument2 *iface, BSTR v) if(FAILED(hres)) return hres; - call_property_onchanged(&This->cp_container, 1014); + call_property_onchanged(&This->cp_container, DISPID_IHTMLDOCUMENT2_DESIGNMODE); return S_OK; }

1 0

Andrew Eikum : comctl32: Return the number of visible months for MCM_GETMONTHDELTA.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 75fbef2ded1f47d5034a6ffc3d0ece99901304b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fbef2ded1f47d5034a6ffc3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 29 14:57:48 2013 -0500 comctl32: Return the number of visible months for MCM_GETMONTHDELTA. --- dlls/comctl32/monthcal.c | 5 ++--- dlls/comctl32/tests/monthcal.c | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ef2ad68..84a01da 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -123,7 +123,6 @@ typedef struct int width_increment; INT delta; /* scroll rate; # of months that the */ /* control moves when user clicks a scroll button */ - int visible; /* # of months visible */ int firstDay; /* Start month calendar with firstDay's day, stored in SYSTEMTIME format */ BOOL firstDaySet; /* first week day differs from locale defined */ @@ -1302,8 +1301,8 @@ MONTHCAL_GetMonthDelta(const MONTHCAL_INFO *infoPtr) if(infoPtr->delta) return infoPtr->delta; - else - return infoPtr->visible; + + return MONTHCAL_GetMonthRange(infoPtr, GMR_VISIBLE, NULL); } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 5440f49..1cadf44 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1325,6 +1325,9 @@ static void test_scroll(void) hwnd = create_monthcal_control(0); + res = SendMessage(hwnd, MCM_GETMONTHDELTA, 0, 0); + expect(2, res); + flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Setter and Getters for scroll rate */

1 0

Nikolay Sivov : ntdll: Implement compatible comClass section.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 88070accd22323cfcf0756861ec9fd9a4c57196f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88070accd22323cfcf0756861… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 08:03:28 2013 +0400 ntdll: Implement compatible comClass section. --- dlls/kernel32/tests/actctx.c | 9 +- dlls/ntdll/actctx.c | 282 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88070accd22323cfcf075…

1 0

Nikolay Sivov : kernel32/tests: Test search with alias guid.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: 2c31fce106cf43128d0b9a59ae7a72315a7e3633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c31fce106cf43128d0b9a59a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 08:03:53 2013 +0400 kernel32/tests: Test search with alias guid. --- dlls/kernel32/tests/actctx.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index fe7aa67..a4e6655 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1117,8 +1117,8 @@ struct comclassredirect_data { static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GUID *tlid, ULONG exid, int line) { - struct comclassredirect_data *comclass; - ACTCTX_SECTION_KEYED_DATA data; + struct comclassredirect_data *comclass, *comclass2; + ACTCTX_SECTION_KEYED_DATA data, data2; BOOL ret; memset(&data, 0xfe, sizeof(data)); @@ -1189,6 +1189,18 @@ todo_wine { ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", data.ulAssemblyRosterIndex, exid); + + /* generated guid for this class works as key guid in search */ + memset(&data2, 0xfe, sizeof(data2)); + data2.cbSize = sizeof(data2); + ret = pFindActCtxSectionGuid(0, NULL, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + &comclass->alias, &data2); + ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); + + comclass2 = (struct comclassredirect_data*)data2.lpData; + ok_(__FILE__, line)(comclass->size == comclass2->size, "got wrong data length %d, expected %d\n", comclass2->size, comclass->size); + ok_(__FILE__, line)(!memcmp(comclass, comclass2, comclass->size), "got wrong data\n"); } static void test_wndclass_section(void)

1 0

Ken Thomases : winemac: Don' t reorder clicked window relative to sibling owned windows if it' s in the right place.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Module: wine Branch: master Commit: d14f787192c66a5d339c60fb1bcdb849c1eefa67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14f787192c66a5d339c60fb1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:35 2013 -0500 winemac: Don't reorder clicked window relative to sibling owned windows if it's in the right place. The right place may not be the end of the list of Cocoa child windows if some of the siblings are at a higher window level (i.e. floating if the clicked window is not). --- dlls/winemac.drv/cocoa_app.m | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8de68bb..4cb09e7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1480,8 +1480,28 @@ int macdrv_err_on; // respect to its siblings, but we want it to. We have to do it // manually. NSWindow* parent = [window parentWindow]; - [parent removeChildWindow:window]; - [parent addChildWindow:window ordered:NSWindowAbove]; + NSInteger level = [window level]; + __block BOOL needReorder = FALSE; + + // If the window is already the last child or if it's only below + // children with higher window level, then no need to reorder it. + [[parent childWindows] enumerateObjectsWithOptions:NSEnumerationReverse + usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ + WineWindow* child = obj; + if (child == window) + *stop = TRUE; + else if ([child level] <= level) + { + needReorder = TRUE; + *stop = TRUE; + } + }]; + + if (needReorder) + { + [parent removeChildWindow:window]; + [parent addChildWindow:window ordered:NSWindowAbove]; + } } }

1 0