September 2014 - Wine-commits

André Hentschel : news: Fix typo in German translation
by Jeremy Newman 11 Sep '14

11 Sep '14

Module: website Branch: master Commit: 5f9fab6813c86667c333e1cc3163415a58785f61 URL: http://source.winehq.org/git/website.git/?a=commit;h=5f9fab6813c86667c333e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 11 22:52:00 2014 +0200 news: Fix typo in German translation --- news/de/2014082901.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/de/2014082901.xml b/news/de/2014082901.xml index 1af9566..7f1318b 100644 --- a/news/de/2014082901.xml +++ b/news/de/2014082901.xml @@ -1,5 +1,5 @@ <news> - <date>15. August 2014</date> + <date>29. August 2014</date> <title>World Wine News Ausgabe 374</title> <body> <a href="{$root}/wwn/374">WWN Ausgabe 374 (en)</a> wurde heute veröffentlicht.

1 0

Austin English : ws2_32: Don't assume AI_V4MAPPED is available.
by Alexandre Julliard 11 Sep '14

11 Sep '14

Module: wine Branch: master Commit: f6dad55dabe0dab2efbcb30458c4a999cefe664f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dad55dabe0dab2efbcb3045… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 10 20:59:39 2014 -0500 ws2_32: Don't assume AI_V4MAPPED is available. --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d5e9fd1..d78d9cd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -529,7 +529,9 @@ static const int ws_aiflag_map[][2] = #ifdef AI_NUMERICSERV MAP_OPTION( AI_NUMERICSERV ), #endif +#ifdef AI_V4MAPPED MAP_OPTION( AI_V4MAPPED ), +#endif MAP_OPTION( AI_ADDRCONFIG ), };

1 0

Jacek Caban : mshtml: Added semi-stub IHTMLElement4:: onmousewheel propery implementation.
by Alexandre Julliard 11 Sep '14

11 Sep '14

Module: wine Branch: master Commit: 6b180082026c20c56c53cbb7d34db086042fa9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b180082026c20c56c53cbb7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 11:03:24 2014 +0200 mshtml: Added semi-stub IHTMLElement4::onmousewheel propery implementation. --- dlls/mshtml/htmlelem3.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index 07f4854..bcd6eb2 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -557,15 +557,19 @@ static HRESULT WINAPI HTMLElement4_Invoke(IHTMLElement4 *iface, DISPID dispIdMem static HRESULT WINAPI HTMLElement4_put_onmousewheel(IHTMLElement4 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_MOUSEWHEEL, &v); } static HRESULT WINAPI HTMLElement4_get_onmousewheel(IHTMLElement4 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_MOUSEWHEEL, p); } static HRESULT WINAPI HTMLElement4_normalize(IHTMLElement4 *iface) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 75b41d3..bcf4864 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -111,6 +111,9 @@ static const WCHAR onmouseoverW[] = {'o','n','m','o','u','s','e','o','v','e','r' static const WCHAR mouseupW[] = {'m','o','u','s','e','u','p',0}; static const WCHAR onmouseupW[] = {'o','n','m','o','u','s','e','u','p',0}; +static const WCHAR mousewheelW[] = {'m','o','u','s','e','w','h','e','e','l',0}; +static const WCHAR onmousewheelW[] = {'o','n','m','o','u','s','e','w','h','e','e','l',0}; + static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR onpasteW[] = {'o','n','p','a','s','t','e',0}; @@ -207,6 +210,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseupW, onmouseupW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEUP, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mousewheelW, onmousewheelW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, + 0}, {pasteW, onpasteW, EVENTT_NONE, DISPID_EVMETH_ONPASTE, EVENT_CANCELABLE}, {readystatechangeW, onreadystatechangeW, EVENTT_NONE, DISPID_EVMETH_ONREADYSTATECHANGE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index d2426d3..bc81171 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -39,6 +39,7 @@ typedef enum { EVENTID_MOUSEOUT, EVENTID_MOUSEOVER, EVENTID_MOUSEUP, + EVENTID_MOUSEWHEEL, EVENTID_PASTE, EVENTID_READYSTATECHANGE, EVENTID_RESIZE,

1 0

Francois Gouget : dpnet/tests: Make test_lobbyclient() static.
by Alexandre Julliard 11 Sep '14

11 Sep '14

Module: wine Branch: master Commit: 345b8d0e268492db4af07bf41450e5bef3150457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=345b8d0e268492db4af07bf41… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 11 12:29:30 2014 +0200 dpnet/tests: Make test_lobbyclient() static. --- dlls/dpnet/tests/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 7f10439..253526a 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -211,7 +211,7 @@ static void test_get_sp_caps(void) "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); } -void test_lobbyclient(void) +static void test_lobbyclient(void) { HRESULT hr; IDirectPlay8LobbyClient *client = NULL;

1 0

Akihiro Sagawa : reg: Add reg.exe test suite.
by Alexandre Julliard 11 Sep '14

11 Sep '14

Module: wine Branch: master Commit: a99d3c5bffe0840df932ed3d32354bdd579d139d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99d3c5bffe0840df932ed3d3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Sep 11 23:27:31 2014 +0900 reg: Add reg.exe test suite. --- configure | 1 + configure.ac | 1 + programs/reg/tests/Makefile.in | 5 + programs/reg/tests/reg.c | 264 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 271 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a99d3c5bffe0840df932e…

1 0

Jacek Caban : oleacc: Added DllRegisterServer and DllUnregisterServer implementations.
by Alexandre Julliard 11 Sep '14

11 Sep '14

Module: wine Branch: master Commit: f7733d651c80a370e35a7b66cb98c286702a3b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7733d651c80a370e35a7b66c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 16:49:24 2014 +0200 oleacc: Added DllRegisterServer and DllUnregisterServer implementations. --- dlls/oleacc/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 2c66fa2..7b2f06a 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "ole2.h" #include "commctrl.h" +#include "rpcproxy.h" #include "initguid.h" #include "oleacc_private.h" @@ -414,14 +415,14 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) HRESULT WINAPI DllRegisterServer(void) { - FIXME("\n"); - return S_OK; + TRACE("()\n"); + return __wine_register_resources(oleacc_handle); } HRESULT WINAPI DllUnregisterServer(void) { - FIXME("\n"); - return S_OK; + TRACE("()\n"); + return __wine_unregister_resources(oleacc_handle); } void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild)

1 0

Jacek Caban : oleacc: Register CAccPropServices class.
by Alexandre Julliard 11 Sep '14

11 Sep '14

Module: wine Branch: master Commit: 7ae1f45d7911c2992a2c1ed2465e7bd974d9054b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae1f45d7911c2992a2c1ed24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 16:49:33 2014 +0200 oleacc: Register CAccPropServices class. --- include/oleacc.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index daf7dec..97b7858 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -18,6 +18,10 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#endif + cpp_quote("#define NAVDIR_MIN 0") cpp_quote("#define NAVDIR_UP 1") cpp_quote("#define NAVDIR_DOWN 2") @@ -303,7 +307,8 @@ library Accessibility interface IAccPropServices; [ - uuid(b5f8350b-0548-48b1-a6ee-88bd00b4a5e7) + uuid(b5f8350b-0548-48b1-a6ee-88bd00b4a5e7), + threading(apartment) ] coclass CAccPropServices {

1 0

Daniel Lehman : ntdll: Use the configured CriticalSection timeout in RtlpWaitForCriticalSection.
by Alexandre Julliard 11 Sep '14

11 Sep '14

Module: wine Branch: master Commit: 27b3a5cce4e7092fe9776dfb57fcf1b602a92538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b3a5cce4e7092fe9776dfb5… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Sep 9 11:25:46 2014 -0700 ntdll: Use the configured CriticalSection timeout in RtlpWaitForCriticalSection. --- dlls/ntdll/critsection.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 839c7ca..6e0332b 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -435,10 +435,12 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) */ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { + LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; for (;;) { EXCEPTION_RECORD rec; NTSTATUS status = wait_semaphore( crit, 5 ); + timeout -= 5; if ( status == STATUS_TIMEOUT ) { @@ -448,11 +450,14 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); status = wait_semaphore( crit, 60 ); + timeout -= 60; + if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) { ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (5 min)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); status = wait_semaphore( crit, 300 ); + timeout -= 300; } } if (status == STATUS_WAIT_0) break; @@ -460,6 +465,9 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) /* Throw exception only for Wine internal locks */ if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[0])) continue; + /* only throw deadlock exception if configured timeout is reached */ + if (timeout > 0) continue; + rec.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; rec.ExceptionFlags = 0; rec.ExceptionRecord = NULL;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.26
by Jeremy Newman 11 Sep '14

11 Sep '14

Module: website Branch: master Commit: 30f3becbbb267cfed418c072dcb3d7db1d4c4c7f URL: http://source.winehq.org/git/website.git/?a=commit;h=30f3becbbb267cfed418c0… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Sep 10 15:14:00 2014 +0200 Polish translation for release 1.7.26 --- news/pl/2014090501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014090501.xml b/news/pl/2014090501.xml new file mode 100644 index 0000000..d149a58 --- /dev/null +++ b/news/pl/2014090501.xml @@ -0,0 +1,15 @@ +<news> +<date>Wrzesień 5, 2014</date> +<title>Wydano Wine 1.7.26</title> +<body> + Wydanie rozwojowe Wine 1.7.26 jest już dostępne. + <a href="{$root}/announce/1.7.26">Co nowego</a> w tym wydaniu: +<ul> + <li>Po raz kolejny więcej funkcji DirectWrite.</li> + <li>Ulepszenia dla powszechnego okna dialogowego plików.</li> + <li>Kilka ulepszeń w bibliotece uruchomieniowej C.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.26.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Vincent Povirk : mscoree: Implement CorBindToCurrentRuntime.
by Alexandre Julliard 10 Sep '14

10 Sep '14

Module: wine Branch: master Commit: 4aa1af901635434e2f7692fd13d7c3e2e48af4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa1af901635434e2f7692fd1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 9 14:31:41 2014 -0500 mscoree: Implement CorBindToCurrentRuntime. --- dlls/mscoree/mscoree_main.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9ac1e3e..7534108 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -485,8 +485,23 @@ HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD HRESULT WINAPI CorBindToCurrentRuntime(LPCWSTR filename, REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - FIXME("(%s, %s, %s, %p): stub\n", debugstr_w(filename), debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return E_NOTIMPL; + HRESULT ret; + ICLRRuntimeInfo *info; + + TRACE("(%s, %s, %s, %p)\n", debugstr_w(filename), debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + *ppv = NULL; + + ret = get_runtime_info(NULL, NULL, filename, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + + if (SUCCEEDED(ret)) + { + ret = ICLRRuntimeInfo_GetInterface(info, rclsid, riid, ppv); + + ICLRRuntimeInfo_Release(info); + } + + return ret; } STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject)

1 0