May 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : scrrun/tests: Fix tests to depend on current codepage.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 2b628405cd2edaf771399abb8ed34f5891608900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b628405cd2edaf771399abb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 14:42:05 2014 +0400 scrrun/tests: Fix tests to depend on current codepage. --- dlls/scrrun/tests/filesystem.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 409cf4b..c004eaf 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -41,6 +41,7 @@ static inline ULONG get_refcount(IUnknown *iface) } static const WCHAR crlfW[] = {'\r','\n',0}; +static const char utf16bom[] = {0xff,0xfe,0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) @@ -1317,8 +1318,7 @@ static void test_CreateTextFile(void) { static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; - static const WCHAR bomAW[] = {0xff,0xfe,0}; - WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; ITextStream *stream; BSTR nameW, str; HANDLE file; @@ -1365,11 +1365,16 @@ static void test_CreateTextFile(void) ok(hr == S_OK, "got 0x%08x\n", hr); ITextStream_Release(stream); + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, bomAW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); SysFreeString(str); ITextStream_Release(stream); @@ -1506,7 +1511,9 @@ static void test_ReadAll(void) str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1653,7 +1660,11 @@ static void test_Read(void) str = NULL; hr = ITextStream_Read(stream, 2, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream);

1 0

Zhenbo Li : mshtml: Added IHTMLLocation::assign method implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 8d275952875efa268c4034103d6f4e1b9254e8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d275952875efa268c4034103… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri May 16 21:47:41 2014 +0800 mshtml: Added IHTMLLocation::assign method implementation. --- dlls/mshtml/htmllocation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 0c50609..6411eb7 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -575,8 +575,8 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstr)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(bstr)); + return IHTMLLocation_put_href(iface, bstr); } static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String)

1 0

Hans Leidekker : wbemprox: Handle NULL out parameter to object methods.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 464c884542e95399caeaca3204ad4c3289c57ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464c884542e95399caeaca320… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 19 12:30:46 2014 +0200 wbemprox: Handle NULL out parameter to object methods. --- dlls/wbemprox/process.c | 35 ++++++++++------ dlls/wbemprox/reg.c | 105 +++++++++++++++++++++++++++++++---------------- dlls/wbemprox/service.c | 104 +++++++++++++++++++++++++++++++--------------- 3 files changed, 164 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=464c884542e95399caeac…

1 0

Henri Verbeet : d2d1: Add the ID2D1HwndRenderTarget interface.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: d76e60501059a29fd632a7b321da459400c8f10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76e60501059a29fd632a7b32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:20:59 2014 +0200 d2d1: Add the ID2D1HwndRenderTarget interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 722f65f..899c1d7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -265,6 +265,13 @@ typedef enum D2D1_FEATURE_LEVEL D2D1_FEATURE_LEVEL_FORCE_DWORD = 0xffffffff, } D2D1_FEATURE_LEVEL; +typedef enum D2D1_WINDOW_STATE +{ + D2D1_WINDOW_STATE_NONE = 0x0000000, + D2D1_WINDOW_STATE_OCCLUDED = 0x0000001, + D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, +} D2D1_WINDOW_STATE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -1092,5 +1099,19 @@ interface ID2D1BitmapRenderTarget : ID2D1RenderTarget ); } +[ + local, + object, + uuid(2cd90698-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1HwndRenderTarget : ID2D1RenderTarget +{ + D2D1_WINDOW_STATE CheckWindowState(); + HRESULT Resize( + [in] const D2D1_SIZE_U size + ); + HWND GetHwnd(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Andrey Gusev : Ukrainian translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: daeef820ee11bd4f89dc5f88282db10bd20bccce URL: http://source.winehq.org/git/website.git/?a=commit;h=daeef820ee11bd4f89dc5f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 17 00:35:21 2014 +0300 Ukrainian translation for release 1.7.19 --- news/uk/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2014051601.xml b/news/uk/2014051601.xml new file mode 100644 index 0000000..52616e9 --- /dev/null +++ b/news/uk/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>16 травня 2014</date> +<title>Випущено Wine 1.7.19</title> +<body> + Розробницький реліз Wine 1.7.19 наразі доступний. + <a href="{$root}/announce/1.7.19">Що нового</a> в цьому релізі: +<ul> + <li>Додана нова DLL бібліотека JSProxy для автоматичного налаштування проксі.</li> + <li>Покращена підтримка OLE Accessible Object.</li> + <li>Покращення для запису XML.</li> + <li>Виправлення різних проблем з пам'яттю знайдених за допомогою Valgrind.</li> + <li>Додано початкові заголовки для підтримки Direct2D.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 76aaaf217c73961cbe21d504d8f04ccc6ea67077 URL: http://source.winehq.org/git/website.git/?a=commit;h=76aaaf217c73961cbe21d5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 17 07:44:53 2014 +0200 Polish translation for release 1.7.19 --- news/pl/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014051601.xml b/news/pl/2014051601.xml new file mode 100644 index 0000000..0a9709b --- /dev/null +++ b/news/pl/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>Maj 16, 2014</date> +<title>Wydano Wine 1.7.19</title> +<body> + Wydanie rozwojowe Wine 1.7.19 jest już dostępne. + <a href="{$root}/announce/1.7.19">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa biblioteka DLL JSProxy do samoczynnego ustawiania pośrednika.</li> + <li>Większa obsługa Obiektów Dostępu OLE.</li> + <li>Ulepszenia w programie piszącym XML.</li> + <li>Poprawki różnych wycieków do pamięci znalezione przy pomocy Valgrind.</li> + <li>Wstępne nagłówki do obsługi Direct2D.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.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

Julian Rüger : German translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 67544bb8a84a2b53667092b9649f6abce0355c8b URL: http://source.winehq.org/git/website.git/?a=commit;h=67544bb8a84a2b53667092… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat May 17 17:39:51 2014 +0200 German translation for release 1.7.19 --- news/de/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2014051601.xml b/news/de/2014051601.xml new file mode 100644 index 0000000..58ae6e5 --- /dev/null +++ b/news/de/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>16. Mai 2014</date> +<title>Wine 1.7.19 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue DLL JSProxy für automatische Proxy-Konfiguration.</li> + <li>OLE Accessible Object Unterstützung weiter ausgebaut.</li> + <li>Verbesserungen am XML writer.</li> + <li>Fehlerkorrekturen für verschiedene Speicherprobleme, die mit Valgrind gefunden wurden.</li> + <li>Anfänge der Header für Direct2D-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 2251e68252229bf477b6a79decdbb023ad6583b6 URL: http://source.winehq.org/git/website.git/?a=commit;h=2251e68252229bf477b6a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 16 21:48:24 2014 +0200 French translation for release 1.7.19 --- news/fr/2014051601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014051601.xml b/news/fr/2014051601.xml new file mode 100644 index 0000000..4c8ad2f --- /dev/null +++ b/news/fr/2014051601.xml @@ -0,0 +1,16 @@ +<news> +<date>16 mai 2014</date> +<title>Sortie de Wine 1.7.19</title> +<body> + La version de développement 1.7.19 de Wine est disponible. + <a href="{$root}/announce/1.7.19">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle DLL JSProxy pour une configuration automatique des serveurs mandataires.</li> + <li>Meilleurs prise en charge de l'API OLE Accessible Object.</li> + <li>Améliorations dans le rédacteur XML.</li> + <li>Correctifs pour divers problèmes mémoire détectés par Valgrind.</li> + <li>Fichiers d'en-tête initiaux pour la prise en charge de Direct2D.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.19
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: website Branch: master Commit: d5791fde1177363568a886e55e6a64882074e762 URL: http://source.winehq.org/git/website.git/?a=commit;h=d5791fde1177363568a886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:15:53 2014 +0200 Wine release 1.7.19 --- news/en/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2014051601.xml b/news/en/2014051601.xml new file mode 100644 index 0000000..94a5190 --- /dev/null +++ b/news/en/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>May 16, 2014</date> +<title>Wine 1.7.19 Released</title> +<body> + The Wine development release 1.7.19 is now available. + <a href="{$root}/announce/1.7.19">What's new</a> in this release: +<ul> + <li>New JSProxy DLL for automatic proxy configuration.</li> + <li>More OLE Accessible Object support.</li> + <li>Improvements to the XML writer.</li> + <li>Fixes for various memory issues found by Valgrind.</li> + <li>Initial headers for Direct2D support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.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.19 : Alexandre Julliard : Release 1.7.19
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: refs/tags/wine-1.7.19 Tag: 1098c57e53df5416544991e25cadcb8b01ab1a64 URL: http://source.winehq.org/git/wine.git/?a=tag;h=1098c57e53df5416544991e25cad… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:06:49 2014 +0200 Release 1.7.19

1 0

Alexandre Julliard : Release 1.7.19.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 613c104562b1ee03a902484f93a8da30e89302d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613c104562b1ee03a902484f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:06:48 2014 +0200 Release 1.7.19. --- ANNOUNCE | 718 +++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 396 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=613c104562b1ee03a9024…

1 0

Piotr Caban : oleacc: Add IID_IAccessible, IID_IAccessibleHandler and LIBID_Accessibility exports.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 76302af67e4d7222c8cc18d3b3a308aebebe704e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76302af67e4d7222c8cc18d3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 16:36:56 2014 +0200 oleacc: Add IID_IAccessible, IID_IAccessibleHandler and LIBID_Accessibility exports. --- dlls/oleacc/oleacc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index caeb6d3..9f3a9a0 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -14,9 +14,9 @@ @ stdcall GetRoleTextW(long ptr long) @ stdcall GetStateTextA(long ptr long) @ stdcall GetStateTextW(long ptr long) -@ stub IID_IAccessible -@ stub IID_IAccessibleHandler -@ stub LIBID_Accessibility +@ extern IID_IAccessible +@ extern IID_IAccessibleHandler +@ extern LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) @ stdcall ObjectFromLresult(long ptr long ptr) @ stdcall WindowFromAccessibleObject(ptr ptr)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 8fcb8ea16c4902fdbfe1f9f9acf4e887fb411424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcb8ea16c4902fdbfe1f9f9a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri May 16 16:46:44 2014 +0300 po: Update Finnish translation. --- po/fi.po | 106 +++++++++++++++++++------------------------------------------- 1 file changed, 32 insertions(+), 74 deletions(-) diff --git a/po/fi.po b/po/fi.po index ab30652..8fc4bbb 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7113,206 +7113,164 @@ msgid "outline button" msgstr "rungon painike" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Normaali" +msgstr "normaali" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Ei käytettävissä" +msgstr "ei käytettävissä" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Valitse" +msgstr "valittu" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pysäytetty" +msgstr "kohdistettu" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "Paka&ttu" +msgstr "painettu" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "valittu" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Sekamuotoinen" +msgstr "osittainen" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Vain luku" +msgstr "vain luku" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Aktiivinen elementti" +msgstr "osoitettu" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Oletukset" +msgstr "oletus" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "laajennettu" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "kutistettu" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "varattu" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "kelluva" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "vierivä" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animaatio" +msgstr "animoitu" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "näkymätön" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "poissa ruudulta" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&käytä" +msgstr "koko muutettava" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&käytä" +msgstr "siirrettävä" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "itse puhuva" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pysäytetty" +msgstr "kohdistettava" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "taulukko" +msgstr "valittava" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "linkki" +msgstr "linkitetty" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "käyty" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "taulukko" +msgstr "monivalittava" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Valitse tiedosto." +msgstr "laajentaen valittava" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "hälytys" +msgstr "vähäinen hälytys" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "hälytys" +msgstr "keskitason hälytys" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "hälytys" +msgstr "tärkeä hälytys" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Kirjoitussuojattu.\n" +msgstr "suojattu" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "sisältää ponnahdusvalikon tai -ikkunan" #: oleaut32.rc:30 oleview.rc:147 msgid "True"

1 0

Henri Verbeet : d2d1: Add the ID2D1BitmapRenderTarget interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 7e5bcb0b0b6745bb58b4864764e7b142713c2763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5bcb0b0b6745bb58b486476… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:23 2014 +0200 d2d1: Add the ID2D1BitmapRenderTarget interface. --- include/d2d1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 436f9cc..722f65f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1080,5 +1080,17 @@ interface ID2D1RenderTarget : ID2D1Resource ); } +[ + local, + object, + uuid(2cd90695-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1BitmapRenderTarget : ID2D1RenderTarget +{ + HRESULT GetBitmap( + [out] ID2D1Bitmap **bitmap + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Piotr Caban : oleacc: Prepare CreateStdAccessibleObject to support class specific accessibility objects.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: e73bbd0c810332f0eef93bd3d44149a82115edfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73bbd0c810332f0eef93bd3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 16:37:03 2014 +0200 oleacc: Prepare CreateStdAccessibleObject to support class specific accessibility objects. --- dlls/oleacc/main.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 9d5320e..c7a622b 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "commctrl.h" #include "initguid.h" #include "oleacc_private.h" @@ -36,6 +37,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; +static const WCHAR menuW[] = {'#','3','2','7','6','8',0}; +static const WCHAR desktopW[] = {'#','3','2','7','6','9',0}; +static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; +static const WCHAR winswitchW[] = {'#','3','2','7','7','1',0}; +static const WCHAR mdi_clientW[] = {'M','D','I','C','l','i','e','n','t',0}; +static const WCHAR richeditW[] = {'R','I','C','H','E','D','I','T',0}; +static const WCHAR richedit20aW[] = {'R','i','c','h','E','d','i','t','2','0','A',0}; +static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; + +typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); + +static struct { + const WCHAR *name; + DWORD idx; + accessible_create create_client; + accessible_create create_window; +} builtin_classes[] = { + {WC_LISTBOXW, 0x10000, NULL, NULL}, + {menuW, 0x10001, NULL, NULL}, + {WC_BUTTONW, 0x10002, NULL, NULL}, + {WC_STATICW, 0x10003, NULL, NULL}, + {WC_EDITW, 0x10004, NULL, NULL}, + {WC_COMBOBOXW, 0x10005, NULL, NULL}, + {dialogW, 0x10006, NULL, NULL}, + {winswitchW, 0x10007, NULL, NULL}, + {mdi_clientW, 0x10008, NULL, NULL}, + {desktopW, 0x10009, NULL, NULL}, + {WC_SCROLLBARW, 0x1000a, NULL, NULL}, + {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, + {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, + {PROGRESS_CLASSW, 0x1000d, NULL, NULL}, + {ANIMATE_CLASSW, 0x1000e, NULL, NULL}, + {WC_TABCONTROLW, 0x1000f, NULL, NULL}, + {HOTKEY_CLASSW, 0x10010, NULL, NULL}, + {WC_HEADERW, 0x10011, NULL, NULL}, + {TRACKBAR_CLASSW, 0x10012, NULL, NULL}, + {WC_LISTVIEWW, 0x10013, NULL, NULL}, + {UPDOWN_CLASSW, 0x10016, NULL, NULL}, + {TOOLTIPS_CLASSW, 0x10018, NULL, NULL}, + {WC_TREEVIEWW, 0x10019, NULL, NULL}, + {MONTHCAL_CLASSW, 0, NULL, NULL}, + {DATETIMEPICK_CLASSW, 0, NULL, NULL}, + {WC_IPADDRESSW, 0, NULL, NULL}, + {richeditW, 0x1001c, NULL, NULL}, + {richedit20aW, 0, NULL, NULL}, + {richedit20wW, 0, NULL, NULL}, +}; + static HINSTANCE oleacc_handle = 0; const char *debugstr_variant(const VARIANT *v) @@ -81,20 +130,65 @@ int convert_child_id(VARIANT *v) } } +static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) +{ + WCHAR class_name[64]; + int i, idx; + + if(!RealGetWindowClassW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) + return NULL; + TRACE("got window class: %s\n", debugstr_w(class_name)); + + for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + if(!strcmpiW(class_name, builtin_classes[i].name)) { + accessible_create ret; + + ret = (objid==OBJID_CLIENT ? + builtin_classes[i].create_client : + builtin_classes[i].create_window); + if(!ret) + FIXME("unhandled window class: %s\n", debugstr_w(class_name)); + return ret; + } + } + + idx = SendMessageW(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); + if(idx) { + for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + if(idx == builtin_classes[i].idx) { + accessible_create ret; + + ret = (objid==OBJID_CLIENT ? + builtin_classes[i].create_client : + builtin_classes[i].create_window); + if(!ret) + FIXME("unhandled class name idx: %x\n", idx); + return ret; + } + } + + WARN("unhandled class name idx: %x\n", idx); + } + + return NULL; +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { - WCHAR class_name[64]; + accessible_create create; TRACE("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); - if(GetClassNameW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) - FIXME("unhandled window class: %s\n", debugstr_w(class_name)); switch(idObject) { case OBJID_CLIENT: + create = get_builtin_accessible_obj(hwnd, idObject); + if(create) return create(hwnd, riidInterface, ppvObject); return create_client_object(hwnd, riidInterface, ppvObject); case OBJID_WINDOW: + create = get_builtin_accessible_obj(hwnd, idObject); + if(create) return create(hwnd, riidInterface, ppvObject); return create_window_object(hwnd, riidInterface, ppvObject); default: FIXME("unhandled object id: %d\n", idObject);

1 0

Henri Verbeet : d2d1: Add the ID2D1RenderTarget interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: c68a8f3415e05f823693343e254514cbb312988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68a8f3415e05f823693343e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 12:45:55 2014 +0200 d2d1: Add the ID2D1RenderTarget interface. --- include/d2d1.idl | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68a8f3415e05f8236933…

1 0

Henri Verbeet : d2d1: Add the ID2D1Mesh interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: ff4131128500fb3849c461e6fa1b2322593796f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4131128500fb3849c461e6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:21 2014 +0200 d2d1: Add the ID2D1Mesh interface. --- include/d2d1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index b8d8531..eb44bd6 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -717,5 +717,17 @@ interface ID2D1Layer : ID2D1Resource D2D1_SIZE_F GetSize(); } +[ + local, + object, + uuid(2cd906c2-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Mesh : ID2D1Resource +{ + HRESULT Open( + [out] ID2D1TessellationSink **sink + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 4a06f84b9f6108ef5bc1a2fbb69f0332fdcbebb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a06f84b9f6108ef5bc1a2fbb… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri May 16 08:21:22 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 110 +++++++++++++++++++------------------------------------------- 1 file changed, 34 insertions(+), 76 deletions(-) diff --git a/po/lt.po b/po/lt.po index e142410..a3a2e51 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-04-03 21:16+0300\n" +"PO-Revision-Date: 2014-05-16 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7124,206 +7124,164 @@ msgid "outline button" msgstr "plano mygtukas" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "&Normalus" +msgstr "normalus" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Nepasiekiamas" +msgstr "nepasiekiamas" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Iš&rinkti" +msgstr "pasirinktas" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pristabdyta" +msgstr "židinyje" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "Su&glaudintas" +msgstr "paspaustas" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "pažymėtas" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Maišytas" +msgstr "mišrus" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Tik skaitymui" +msgstr "tik skaitymui" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Pažymėtas elementas" +msgstr "sekamas" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Numatytosios reikšmės" +msgstr "numatytasis" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "išplėstas" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "sutrauktas" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "užimtas" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "slankus" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "grupėje" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animacija" +msgstr "animuotas" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "nematomas" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "ne ekrane" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "įjun&gti" +msgstr "didinamas" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "įjun&gti" +msgstr "perkeliamas" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "save įgarsina" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pristabdyta" +msgstr "fokusuojamas" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "lentelė" +msgstr "pasirenkamas" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "nuoroda" +msgstr "susietas" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "pereitas" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "lentelė" +msgstr "pasirenkama daug" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Išrinkite failą." +msgstr "pasirenkama išplėstai" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "įspėjimas" +msgstr "žemas įspėjimas" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "įspėjimas" +msgstr "vidutinis įspėjimas" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "įspėjimas" +msgstr "aukštas įspėjimas" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Apsaugotas nuo rašymo.\n" +msgstr "apsaugotas" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "turi iškylantį langą" #: oleaut32.rc:30 oleview.rc:147 msgid "True" @@ -13435,7 +13393,7 @@ msgstr "Valdiklių alternatyvus fonas" #: winecfg.rc:120 msgid "Hot Tracked Item" -msgstr "Pažymėtas elementas" +msgstr "Sekamas elementas" #: winecfg.rc:121 msgid "Active Title Bar Gradient"

1 0

Nikolay Sivov : ntdll: Implement non-blocking mode for LdrLockLoaderLock() .
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 97e2af1f73b6985bd9c91fce18d0de1a1d95dc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e2af1f73b6985bd9c91fce1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 09:03:27 2014 +0400 ntdll: Implement non-blocking mode for LdrLockLoaderLock(). --- dlls/ntdll/loader.c | 26 +++++++++++++++++----- dlls/ntdll/tests/rtl.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d458a31..6471290 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1337,17 +1337,33 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * - * Note: flags are not implemented. + * Note: some flags are not implemented. * Flag 0x01 is used to raise exceptions on errors. - * Flag 0x02 is used to avoid waiting on the section (does RtlTryEnterCriticalSection instead). */ NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) { - if (flags) FIXME( "flags %x not supported\n", flags ); + if (flags & ~0x2) FIXME( "flags %x not supported\n", flags ); - if (result) *result = 1; + if (result) *result = 0; + if (magic) *magic = 0; + if (flags & ~0x3) return STATUS_INVALID_PARAMETER_1; + if (!result && (flags & 0x2)) return STATUS_INVALID_PARAMETER_2; if (!magic) return STATUS_INVALID_PARAMETER_3; - RtlEnterCriticalSection( &loader_section ); + + if (flags & 0x2) + { + if (!RtlTryEnterCriticalSection( &loader_section )) + { + *result = 2; + return STATUS_SUCCESS; + } + *result = 1; + } + else + { + RtlEnterCriticalSection( &loader_section ); + if (result) *result = 1; + } *magic = GetCurrentThreadId(); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 6eb6de3..72cee05 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -90,6 +90,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG*); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -135,6 +137,8 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); + pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); + pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1543,6 +1547,57 @@ static void test_LdrAddRefDll(void) ok(mod2 != NULL, "got %p\n", mod2); } +static void test_LdrLockLoaderLock(void) +{ + ULONG result, magic; + NTSTATUS status; + + if (!pLdrLockLoaderLock) + { + win_skip("LdrLockLoaderLock() is not available\n"); + return; + } + + /* invalid flags */ + result = 10; + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x10, &result, &magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + ok(magic == 0, "got 0x%08x\n", magic); + + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x10, NULL, &magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(magic == 0, "got 0x%08x\n", magic); + + result = 10; + status = pLdrLockLoaderLock(0x10, &result, NULL); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + + /* non-blocking mode, result is null */ + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x2, NULL, &magic); + ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08x\n", status); + ok(magic == 0, "got 0x%08x\n", magic); + + /* magic pointer is null */ + result = 10; + status = pLdrLockLoaderLock(0, &result, NULL); + ok(status == STATUS_INVALID_PARAMETER_3, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + + /* lock in non-blocking mode */ + result = 0; + magic = 0; + status = pLdrLockLoaderLock(0x2, &result, &magic); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(result == 1, "got %d\n", result); + ok(magic != 0, "got 0x%08x\n", magic); + pLdrUnlockLoaderLock(0, magic); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1568,4 +1623,5 @@ START_TEST(rtl) test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); test_LdrAddRefDll(); + test_LdrLockLoaderLock(); }

1 0

Alexandre Julliard : wnaspi32: Remove unnecessary DllMain implementation on non-Linux.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 9222e4e0ea83e782f9b6e33134fe00b3cd518fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9222e4e0ea83e782f9b6e3313… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:51 2014 +0200 wnaspi32: Remove unnecessary DllMain implementation on non-Linux. --- dlls/wnaspi32/winaspi32.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 68bda01..0ce72aa 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -63,12 +63,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION ASPI_CritSection = { &critsect_debug, -1, 0, 0, 0, 0 }; -#endif /* defined(linux) */ - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { -#ifdef linux switch( fdwReason ) { case DLL_PROCESS_ATTACH: @@ -80,13 +77,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) DeleteCriticalSection( &ASPI_CritSection ); break; } -#endif /* defined(linux) */ return TRUE; } -#ifdef linux - static int ASPI_OpenDevice(SRB_ExecSCSICmd *prb) {

1 0

Alexandre Julliard : d2d1: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: ddfaafc16d59771dcc4d3ad472448fcc774177b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfaafc16d59771dcc4d3ad47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:40 2014 +0200 d2d1: Remove unnecessary DllMain implementation. --- dlls/d2d1/d2d1_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d2d1/d2d1_main.c b/dlls/d2d1/d2d1_main.c index 9a389a2..f438de9 100644 --- a/dlls/d2d1/d2d1_main.c +++ b/dlls/d2d1/d2d1_main.c @@ -26,18 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory) {

1 0

Henri Verbeet : d2d1: Add the ID2D1RadialGradientBrush interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 7d30886296ef74e9e998effd872482b1d1874d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d30886296ef74e9e998effd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:19 2014 +0200 d2d1: Add the ID2D1RadialGradientBrush interface. --- include/d2d1.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 3a7901f..c96b67e 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -679,5 +679,33 @@ interface ID2D1LinearGradientBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd906ac-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1RadialGradientBrush : ID2D1Brush +{ + void SetCenter( + [in] D2D1_POINT_2F center + ); + void SetGradientOriginOffset( + [in] D2D1_POINT_2F offset + ); + void SetRadiusX( + [in] float radius + ); + void SetRadiusY( + [in] float radius + ); + D2D1_POINT_2F GetCenter(); + D2D1_POINT_2F GetGradientOriginOffset(); + float GetRadiusX(); + float GetRadiusY(); + void GetGradientStopCollection( + [out] ID2D1GradientStopCollection **gradient + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Alexandre Julliard : bcrypt: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: cf40121ed67c65e83999bc04a1e86aae724c5fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf40121ed67c65e83999bc04a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:29 2014 +0200 bcrypt: Remove unnecessary DllMain implementation. --- dlls/bcrypt/bcrypt_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fcad58c..ee203a6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -31,20 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - - return TRUE; -} - NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) {

1 0

Michael Stefaniuc : dmusic: Move a struct to the .c file it is used.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 176b7aa8423ada08261d26ca6343ce6687984c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=176b7aa8423ada08261d26ca6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 15 23:55:43 2014 +0200 dmusic: Move a struct to the .c file it is used. --- dlls/dmusic/collection.c | 25 ++++++++++++++++++++++--- dlls/dmusic/dmusic_private.h | 25 ------------------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 90a7918..acbc2a5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -23,6 +23,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +/***************************************************************************** + * IDirectMusicCollectionImpl implementation + */ +typedef struct IDirectMusicCollectionImpl { + IDirectMusicCollection IDirectMusicCollection_iface; + IDirectMusicObject IDirectMusicObject_iface; + IPersistStream IPersistStream_iface; + LONG ref; + /* IDirectMusicCollectionImpl fields */ + IStream *pStm; /* stream from which we load collection and later instruments */ + LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ + LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ + DMUS_OBJECTDESC *pDesc; + CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ + DLSHEADER *pHeader; + /* pool table */ + POOLTABLE *pPoolTable; + POOLCUE *pPoolCues; + /* instruments */ + struct list Instruments; +} IDirectMusicCollectionImpl; + static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface) { return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface); @@ -38,9 +60,6 @@ static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStrea return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IPersistStream_iface); } -/***************************************************************************** - * IDirectMusicCollectionImpl implementation - */ /* IDirectMusicCollectionImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface) { diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index badc2df..6a87bee 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -51,7 +51,6 @@ typedef struct IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstru typedef struct IDirectMusicDownloadImpl IDirectMusicDownloadImpl; typedef struct IReferenceClockImpl IReferenceClockImpl; -typedef struct IDirectMusicCollectionImpl IDirectMusicCollectionImpl; typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; typedef struct SynthPortImpl SynthPortImpl; @@ -210,30 +209,6 @@ typedef struct _DMUS_PRIVATE_POOLCUE { } DMUS_PRIVATE_POOLCUE, *LPDMUS_PRIVATE_POOLCUE; /***************************************************************************** - * IDirectMusicCollectionImpl implementation structure - */ -struct IDirectMusicCollectionImpl { - /* IUnknown fields */ - IDirectMusicCollection IDirectMusicCollection_iface; - IDirectMusicObject IDirectMusicObject_iface; - IPersistStream IPersistStream_iface; - LONG ref; - - /* IDirectMusicCollectionImpl fields */ - IStream *pStm; /* stream from which we load collection and later instruments */ - LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ - LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - LPDMUS_OBJECTDESC pDesc; - CHAR* szCopyright; /* FIXME: should probably placed somewhere else */ - LPDLSHEADER pHeader; - /* pool table */ - LPPOOLTABLE pPoolTable; - LPPOOLCUE pPoolCues; - /* instruments */ - struct list Instruments; -}; - -/***************************************************************************** * IDirectMusicInstrumentImpl implementation structure */ struct IDirectMusicInstrumentImpl {

1 0

Alexandre Julliard : sane.ds: Remove unnecessary DllMain implementation when SANE is missing.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 3f6c6dbbb3d44fe72388b03bd49a0daad6463f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6c6dbbb3d44fe72388b03bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:37 2014 +0200 sane.ds: Remove unnecessary DllMain implementation when SANE is missing. --- dlls/sane.ds/sane_main.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index c01baeb..7484ca5 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,10 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); -HINSTANCE SANE_instance; - #ifdef SONAME_LIBSANE +HINSTANCE SANE_instance; + static void *libsane_handle; static void close_libsane(void *h) @@ -79,8 +79,6 @@ static void *open_libsane(void) return h; } -#endif /* SONAME_LIBSANE */ - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -88,7 +86,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: { -#ifdef SONAME_LIBSANE SANE_Int version_code; libsane_handle = open_libsane(); @@ -96,28 +93,25 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; psane_init (&version_code, NULL); -#endif SANE_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; } case DLL_PROCESS_DETACH: if (lpvReserved) break; -#ifdef SONAME_LIBSANE TRACE("calling sane_exit()\n"); psane_exit (); close_libsane(libsane_handle); -#endif break; } return TRUE; } -#ifdef SONAME_LIBSANE static TW_UINT16 SANE_GetIdentity( pTW_IDENTITY, pTW_IDENTITY); static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); -#endif + +#endif /* SONAME_LIBSANE */ static TW_UINT16 SANE_SourceControlHandler ( pTW_IDENTITY pOrigin,

1 0