wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

André Hentschel : config.php.sample: Add 1. 4 as stable branch
by Alexander Nicolaysen Sørnes 10 Jun '12

10 Jun '12

Module: appdb Branch: master Commit: 9764374a1fece2c839f69fdb0186974e888a7ed5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9764374a1fece2c839f69fdb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 10 10:54:18 2012 +0000 config.php.sample: Add 1.4 as stable branch --- include/config.php.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index 0eb1fc3..813379e 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -35,7 +35,7 @@ define("TESTDATA_AGED_THRESHOLD", 175); // Show versions from these branches even if they are not among the most recent ones // Separate by commas if there are more than one -define("STABLE_BRANCHES", "1.0.,1.2."); +define("STABLE_BRANCHES", "1.0.,1.2.,1.4."); /* * apps database info

1 0

Alexandre Julliard : Wine release 1.5.6
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: website Branch: master Commit: 2943ca2c6512c3b509988be7cd732470e383d74a URL: http://source.winehq.org/git/website.git/?a=commit;h=2943ca2c6512c3b509988b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 22:25:55 2012 +0200 Wine release 1.5.6 --- news/en/2012060801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2012060801.xml b/news/en/2012060801.xml new file mode 100644 index 0000000..a47671f --- /dev/null +++ b/news/en/2012060801.xml @@ -0,0 +1,18 @@ +<news> +<date>June 8, 2012</date> +<title>Wine 1.5.6 Released</title> +<body> + The Wine development release 1.5.6 is now available. + <a href="{$root}/announce/1.5.6">What's new</a> in this release: +<ul> + <li>Automatic installation of the Mono add-on package.</li> + <li>Control panel applet for joysticks.</li> + <li>Device bitmap rendering now done through the DIB engine.</li> + <li>Support for video rendering through DirectX (VMR-9).</li> + <li>First steps towards a D3D shader compiler.</li> + <li>Build fixes for DragonFly BSD.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.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.5.6 : Alexandre Julliard : Release 1.5.6
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: refs/tags/wine-1.5.6 Tag: 2a21f489aaee7f27395874f78a8b3d5957fc9e9e URL: http://source.winehq.org/git/wine.git/?a=tag;h=2a21f489aaee7f27395874f78a8b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 22:14:13 2012 +0200 Release 1.5.6

1 0

Alexandre Julliard : Release 1.5.6.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 7123e44176ec42bdf9e79181d796061b3ddb0631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7123e44176ec42bdf9e79181d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 22:14:10 2012 +0200 Release 1.5.6. --- ANNOUNCE | 902 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 403 insertions(+), 519 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7123e44176ec42bdf9e79…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 1edb046d9e89cabe9c325625fee9d96e26d519fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edb046d9e89cabe9c325625f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jun 7 22:27:31 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 32 ++++++++++++-------------------- 1 files changed, 12 insertions(+), 20 deletions(-) diff --git a/po/lt.po b/po/lt.po index 81d2f09..873d4c0 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: 2012-05-22 16:06+0300\n" +"PO-Revision-Date: 2012-06-08 21:40+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3432,59 +3432,51 @@ msgstr "Aukštos" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "Vairasvirtės" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" msgstr "&Išjungti" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "įjun&gti" +msgstr "Įj&ungti" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Atjungta" +msgstr "Prijungta" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Išjungti" +msgstr "Išjungta" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "Testuoti vairasvirtę" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "Mygtukai" #: joy.rc:51 msgid "X,Y" -msgstr "" +msgstr "X,Y" #: joy.rc:52 msgid "Rx,Ry" -msgstr "" +msgstr "Rx,Ry" #: joy.rc:53 msgid "Z, Rz" -msgstr "" +msgstr "Z, Rz" #: joy.rc:58 msgid "Test Force Feedback" -msgstr "" +msgstr "Testuoti „Force Feedback“" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Sukurti valdiklį" +msgstr "Žaidimų valdikliai" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Dmitry Timoshkov : windowscodecs: Add WICIfdMetadataReader registration.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 9f58bef1acbc30598023bb531dc6a1d3612d5c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f58bef1acbc30598023bb531… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 14:09:00 2012 +0900 windowscodecs: Add WICIfdMetadataReader registration. --- dlls/windowscodecs/regsvr.c | 45 +++++++++++++++++++----- dlls/windowscodecs/tests/metadata.c | 12 +++++- dlls/windowscodecs/windowscodecs_wincodec.idl | 7 ++++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 9dfe37b..85ebc6f 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1290,18 +1290,43 @@ static struct regsvr_converter const converter_list[] = { { NULL } /* list terminator */ }; +static const BYTE no_magic[1] = { 0 }; +static const BYTE no_mask[1] = { 0 }; + +static const struct metadata_pattern ifd_metadata_pattern[] = { + { 0, 1, no_magic, no_mask, 0 }, + { 0 } +}; + +static const struct reader_containers ifd_containers[] = { + { + &GUID_ContainerFormatTiff, + ifd_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static struct regsvr_metadatareader const metadatareader_list[] = { { &CLSID_WICUnknownMetadataReader, - "The Wine Project", - "Unknown Metadata Reader", - "1.0.0.0", - "1.0.0.0", - &GUID_VendorMicrosoft, - &GUID_MetadataFormatUnknown, - 0, - 0, - 0, - NULL + "The Wine Project", + "Unknown Metadata Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatUnknown, + 0, 0, 0, + NULL + }, + { + &CLSID_WICIfdMetadataReader, + "The Wine Project", + "Ifd Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatIfd, + 1, 1, 0, + ifd_containers }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 9f74c0a..a4f9ad1 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -364,8 +364,7 @@ static void test_metadata_IFD(void) hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void**)&reader); - todo_wine ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); - if (FAILED(hr)) return; + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); hr = IWICMetadataReader_GetCount(reader, NULL); ok(hr == E_INVALIDARG, "GetCount error %#x\n", hr); @@ -378,6 +377,7 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); +todo_wine ok(count == 6, "unexpected count %u\n", count); hr = IWICMetadataReader_GetEnumerator(reader, NULL); @@ -410,14 +410,22 @@ static void test_metadata_IFD(void) IWICEnumMetadataItem_Release(enumerator); hr = IWICMetadataReader_GetMetadataFormat(reader, &format); +todo_wine ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); +todo_wine ok(IsEqualGUID(&format, &GUID_MetadataFormatIfd), "unexpected format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetMetadataFormat(reader, NULL); ok(hr == E_INVALIDARG, "GetMetadataFormat should fail\n"); hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, NULL); +todo_wine ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + if (FAILED(hr)) + { + IWICMetadataReader_Release(reader); + return; + } hr = IWICMetadataReader_GetValueByIndex(reader, count - 1, NULL, NULL, NULL); ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 56cf112..bc4c994 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -128,3 +128,10 @@ coclass WineTgaDecoder { interface IWICBitmapDecoder; } uuid(699745c2-5066-4b82-a8e3-d40478dbec8c) ] coclass WICUnknownMetadataReader { interface IWICMetadataReader; } + +[ + helpstring("WIC Ifd Metadata Reader"), + threading(both), + uuid(8f914656-9d0a-4eb2-9019-0bf96d8a9ee6) +] +coclass WICIfdMetadataReader { interface IWICIfdMetadataReader; }

1 0

Dmitry Timoshkov : windowscodecs: Add WICIfdMetadataReader stub implementation.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 781113f4daa025b3e44ed3fe46b7a6507df83b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781113f4daa025b3e44ed3fe4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 14:08:52 2012 +0900 windowscodecs: Add WICIfdMetadataReader stub implementation. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/metadatahandler.c | 24 +++++++++++++++++++++++- dlls/windowscodecs/wincodecs_private.h | 3 +-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index e55ce0c..40c8df3 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -60,6 +60,7 @@ static classinfo wic_classes[] = { {&CLSID_WICDefaultFormatConverter, FormatConverter_CreateInstance}, {&CLSID_WineTgaDecoder, TgaDecoder_CreateInstance}, {&CLSID_WICUnknownMetadataReader, UnknownMetadataReader_CreateInstance}, + {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index da70b1c..a4dc174 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -325,7 +325,7 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { MetadataHandler_SaveEx }; -HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) +static HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) { MetadataHandler *This; HRESULT hr; @@ -597,3 +597,25 @@ HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, vo { return MetadataReader_Create(&UnknownMetadataReader_Vtbl, pUnkOuter, iid, ppv); } + +static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, + DWORD persist_options, MetadataItem **items, DWORD *item_count) +{ + FIXME("stub\n"); + + *items = NULL; + *item_count = 0; + + return S_OK; +} + +static const MetadataHandlerVtbl IfdMetadataReader_Vtbl = { + 0, + &CLSID_WICIfdMetadataReader, + LoadIfdMetadata +}; + +HRESULT IfdMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) +{ + return MetadataReader_Create(&IfdMetadataReader_Vtbl, pUnkOuter, iid, ppv); +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 5c21afc..92fa7ef 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -84,8 +84,7 @@ typedef struct _MetadataHandlerVtbl ULARGE_INTEGER *size); } MetadataHandlerVtbl; -extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; - extern HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT IfdMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataHandler_GetCount.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 8d71cc1f2d02c427345d38c841806dd8a66eb679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d71cc1f2d02c427345d38c84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 14:08:42 2012 +0900 windowscodecs: Implement MetadataHandler_GetCount. --- dlls/windowscodecs/metadatahandler.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 013fe04..da70b1c 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -149,10 +149,14 @@ static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface, UINT *pcCount) { + MetadataHandler *This = impl_from_IWICMetadataWriter(iface); + + TRACE("%p,%p\n", iface, pcCount); + if (!pcCount) return E_INVALIDARG; - FIXME("(%p,%p): stub\n", iface, pcCount); - return E_NOTIMPL; + *pcCount = This->item_count; + return S_OK; } static HRESULT WINAPI MetadataHandler_GetValueByIndex(IWICMetadataWriter *iface,

1 0

Dmitry Timoshkov : windowscodecs: Protect from invalid input some metadata handler methods.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 1f48c89e04ed9ce63ddbcd95cf8a6b71233e1923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f48c89e04ed9ce63ddbcd95c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 14:08:28 2012 +0900 windowscodecs: Protect from invalid input some metadata handler methods. --- dlls/windowscodecs/metadatahandler.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index afcff21..013fe04 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -133,6 +133,8 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface) static HRESULT WINAPI MetadataHandler_GetMetadataFormat(IWICMetadataWriter *iface, GUID *pguidMetadataFormat) { + if (!pguidMetadataFormat) return E_INVALIDARG; + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidMetadataFormat)); return E_NOTIMPL; } @@ -147,6 +149,8 @@ static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface, UINT *pcCount) { + if (!pcCount) return E_INVALIDARG; + FIXME("(%p,%p): stub\n", iface, pcCount); return E_NOTIMPL; } @@ -514,6 +518,8 @@ static HRESULT MetadataHandlerEnum_Create(MetadataHandler *parent, DWORD index, { MetadataHandlerEnum *This; + if (!ppIEnumMetadataItem) return E_INVALIDARG; + *ppIEnumMetadataItem = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataHandlerEnum));

1 0

Francois Gouget : iphlpapi: Don' t rely on the HAVE_XXX macros having a numeric values.
by Alexandre Julliard 08 Jun '12

08 Jun '12

Module: wine Branch: master Commit: 562b277bb313f05a1ab4cd15381eed5ba697e389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=562b277bb313f05a1ab4cd153… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 8 15:12:57 2012 +0200 iphlpapi: Don't rely on the HAVE_XXX macros having a numeric values. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 0edd011..009dd99 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -659,7 +659,7 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (HAVE_STRUCT_IPSTAT_IPS_TOTAL || HAVE_STRUCT_IP_STATS_IPS_TOTAL) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012