January 2013 - Wine-commits

Hans Leidekker : msi: Improve parsing of the supported platforms string.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 07be9f0585c59da2aa521e7ac494d34ff9d1baa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07be9f0585c59da2aa521e7ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 31 15:11:38 2013 +0100 msi: Improve parsing of the supported platforms string. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 31 ++++++++++++++++++++----------- dlls/msi/tests/install.c | 8 ++++++++ 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f709bac..c477405 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -338,6 +338,7 @@ typedef struct msi_dialog_tag msi_dialog; enum platform { + PLATFORM_UNKNOWN, PLATFORM_INTEL, PLATFORM_INTEL64, PLATFORM_X64, diff --git a/dlls/msi/package.c b/dlls/msi/package.c index db0ec25..385000c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1269,9 +1269,18 @@ UINT msi_create_empty_local_file( LPWSTR path, LPCWSTR suffix ) return ERROR_SUCCESS; } +static enum platform parse_platform( WCHAR *str ) +{ + if (!str[0] || !strcmpW( str, szIntel )) return PLATFORM_INTEL; + else if (!strcmpW( str, szIntel64 )) return PLATFORM_INTEL64; + else if (!strcmpW( str, szX64 ) || !strcmpW( str, szAMD64 )) return PLATFORM_X64; + else if (!strcmpW( str, szARM )) return PLATFORM_ARM; + return PLATFORM_UNKNOWN; +} + static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) { - WCHAR *template, *p, *q; + WCHAR *template, *p, *q, *platform; DWORD i, count; package->version = msi_suminfo_get_int32( si, PID_PAGECOUNT ); @@ -1291,16 +1300,16 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) return ERROR_PATCH_PACKAGE_INVALID; } *p = 0; - if ((q = strchrW( template, ',' ))) *q = 0; - if (!template[0] || !strcmpW( template, szIntel )) - package->platform = PLATFORM_INTEL; - else if (!strcmpW( template, szIntel64 )) - package->platform = PLATFORM_INTEL64; - else if (!strcmpW( template, szX64 ) || !strcmpW( template, szAMD64 )) - package->platform = PLATFORM_X64; - else if (!strcmpW( template, szARM )) - package->platform = PLATFORM_ARM; - else + platform = template; + if ((q = strchrW( platform, ',' ))) *q = 0; + package->platform = parse_platform( platform ); + while (package->platform == PLATFORM_UNKNOWN && q) + { + platform = q + 1; + if ((q = strchrW( platform, ',' ))) *q = 0; + package->platform = parse_platform( platform ); + } + if (package->platform == PLATFORM_UNKNOWN) { WARN("unknown platform %s\n", debugstr_w(template)); msi_free( template ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0cf9347..e063a87 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6295,6 +6295,14 @@ static void test_package_validation(void) ok(delete_pf("msitest", FALSE), "directory does not exist\n"); DeleteFile(msifile); + create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Alpha,Beta,Intel;0"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n"); + ok(delete_pf("msitest", FALSE), "directory does not exist\n"); + + DeleteFile(msifile); create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "x64;0"); r = MsiInstallProductA(msifile, NULL);

1 0

Jeremy Newman : rename .cvsignore, to .gitignore
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: f24c6f1c8b0af80824e284748bd8bfc33b509b16 URL: http://source.winehq.org/git/website.git/?a=commit;h=f24c6f1c8b0af80824e284… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:17:23 2013 -0600 rename .cvsignore, to .gitignore --- templates/en/{.cvsignore => .gitignore} | 0 templates/he/.cvsignore | 2 -- 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/templates/en/.cvsignore b/templates/en/.gitignore similarity index 100% rename from templates/en/.cvsignore rename to templates/en/.gitignore diff --git a/templates/he/.cvsignore b/templates/he/.cvsignore deleted file mode 100644 index 0ba44f6..0000000 --- a/templates/he/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -docs -winapi_stats.template

1 0

Jactry Zeng : Added Simplified Chinese translation
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: 5054db446d69730e5290aee265bfd971ccb2f3e6 URL: http://source.winehq.org/git/website.git/?a=commit;h=5054db446d69730e5290ae… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Jan 31 11:34:57 2013 +0800 Added Simplified Chinese translation Hi folks, this is Simplified Chinese translation for Wine's website, it's my first patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. I appreciate for any comment. :-) -- Regards, Jactry Zeng <html> <head> <meta http-equiv="content-type" content="text/html; charset=GB2312"> </head> <body bgcolor="#FFFFFF" text="#000000"> Hi folks, this is Simplified Chinese translation for Wine's website, it's my first patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. <meta charset="utf-8"> I appreciate for any comment. :-) <meta charset="utf-8"> <span style="color: rgb(34, 34, 34); font-family: arial, sans-serif; font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); display: inline !important; float: none;">-- Regards, Jactry Zeng <meta charset="utf-8"> </body> </html> >From 55c688c3519eacf0a8506abfe645aa20ac21e11b Mon Sep 17 00:00:00 2001 From: Jactry Zeng <jactry92(a)gmail.com> Date: Thu, 31 Jan 2013 11:00:41 +0800 Subject: add Simplified Chinese translation for Wine's website To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- include/data.php | 6 +- templates/zh_CN/about.template | 46 ++++++++ templates/zh_CN/download.template | 199 +++++++++++++++++++++++++++++++++++ templates/zh_CN/global/404.template | 16 +++ templates/zh_CN/help.template | 97 +++++++++++++++++ templates/zh_CN/home.template | 90 ++++++++++++++++ templates/zh_CN/lang.template | 12 ++ templates/zh_CN/news.template | 16 +++ templates/zh_CN/search.template | 26 +++++ 9 files changed, 507 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5054db446d69730e52…

1 0

Jeremy Newman : adding zh-cn as availale language
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: b72bbd24e07b88892a87599502c33d9dc6655404 URL: http://source.winehq.org/git/website.git/?a=commit;h=b72bbd24e07b88892a8759… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:14:08 2013 -0600 adding zh-cn as availale language --- include/winehq.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 5a247c1..1eb97fb 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -22,7 +22,7 @@ theme: winehq lang: en # available languages -(a)languages: en, de, es, fr, he, pl, pt, tr +(a)languages: en, de, es, fr, he, pl, pt, tr, zh-cn # default base URLS (if you run the site, in a subdir, set base_root) base_root:

1 0

Jeremy Newman : get_lang(): fix so language variations work, with fallback to parent
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: ea50e81793068139d5026f460cfa390b2c478c64 URL: http://source.winehq.org/git/website.git/?a=commit;h=ea50e81793068139d5026f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:14:39 2013 -0600 get_lang(): fix so language variations work, with fallback to parent --- include/html.php | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/include/html.php b/include/html.php index 9b2e83c..be3c02d 100644 --- a/include/html.php +++ b/include/html.php @@ -322,35 +322,49 @@ class html // default from config $lang = $GLOBALS['config']->lang; - // get lang + // load language from URL or cookie if (isset($_COOKIE['lang']) and in_array($_COOKIE['lang'], $GLOBALS['config']->languages)) { - // load language from URL or cookie debug("global", "lang from cookie: {$_COOKIE['lang']}"); $lang = $_COOKIE['lang']; + return $lang; } - else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) + + // load from web browser environment + if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { - // load from web browser environment $hal = preg_split("/\;/", $_SERVER["HTTP_ACCEPT_LANGUAGE"]); $avail = preg_split('/\,/', array_shift($hal)); - if (isset($avail[0])) + if (!empty($avail)) { - // if first language is a variation, use the parent language - if (strlen($avail[0]) > 2) - $avail[0] = substr($avail[0], 0, 2); - // check to make sure lang is defined in our config - if (in_array($avail[0], $GLOBALS['config']->languages)) + // loop through languages + $avail = array_map("strtolower", $avail); + foreach ($avail as $inLang) { - debug("global", "lang from browser: {$avail[0]}"); - $lang = $avail[0]; + // check to see if langage is available + if (in_array($inLang, $GLOBALS['config']->languages)) + { + debug("global", "lang from browser: {$inLang}"); + return $inLang; + } + + // check to see if variation of langage is available + if (strlen($inLang) > 2) + { + $inLangAlt = substr($inLang, 0, 2); + if (in_array($inLangAlt, $GLOBALS['config']->languages)) + { + debug("global", "lang from browser: {$inLangAlt}"); + return $inLangAlt; + } + } } } unset($hal, $avail); } - - // return language - debug("global", "lang: {$lang}"); + + // return default language + debug("global", "lang default: {$lang}"); return $lang; }

1 0

Jeremy Newman : rename zh_CN to zh-cn
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: faa55d7055a855ed701958ba9cf8fdb55d4b68fb URL: http://source.winehq.org/git/website.git/?a=commit;h=faa55d7055a855ed701958… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:15:28 2013 -0600 rename zh_CN to zh-cn --- images/lang/{zh.png => zh-cn.png} | Bin 494 -> 494 bytes include/data.php | 8 ++++---- templates/{zh_CN => zh-cn}/about.template | 0 templates/{zh_CN => zh-cn}/download.template | 0 templates/{zh_CN => zh-cn}/global/404.template | 0 templates/{zh_CN => zh-cn}/help.template | 0 templates/{zh_CN => zh-cn}/home.template | 0 templates/{zh_CN => zh-cn}/lang.template | 0 templates/{zh_CN => zh-cn}/news.template | 0 templates/{zh_CN => zh-cn}/search.template | 0 10 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/lang/zh.png b/images/lang/zh-cn.png similarity index 100% rename from images/lang/zh.png rename to images/lang/zh-cn.png diff --git a/include/data.php b/include/data.php index 1422f4f..92cf10d 100644 --- a/include/data.php +++ b/include/data.php @@ -64,10 +64,10 @@ class data 'name' => 'Türkçe', 'change' => 'Lisan Değiştir' ), - 'zh_CN' => array( - 'name' => '简体中文', - 'change' => '选择语言' - ) + 'zh-cn' => array( + 'name' => '简体中文', + 'change' => '选择语言' + ) ); } } diff --git a/templates/zh_CN/about.template b/templates/zh-cn/about.template similarity index 100% rename from templates/zh_CN/about.template rename to templates/zh-cn/about.template diff --git a/templates/zh_CN/download.template b/templates/zh-cn/download.template similarity index 100% rename from templates/zh_CN/download.template rename to templates/zh-cn/download.template diff --git a/templates/zh_CN/global/404.template b/templates/zh-cn/global/404.template similarity index 100% rename from templates/zh_CN/global/404.template rename to templates/zh-cn/global/404.template diff --git a/templates/zh_CN/help.template b/templates/zh-cn/help.template similarity index 100% rename from templates/zh_CN/help.template rename to templates/zh-cn/help.template diff --git a/templates/zh_CN/home.template b/templates/zh-cn/home.template similarity index 100% rename from templates/zh_CN/home.template rename to templates/zh-cn/home.template diff --git a/templates/zh_CN/lang.template b/templates/zh-cn/lang.template similarity index 100% rename from templates/zh_CN/lang.template rename to templates/zh-cn/lang.template diff --git a/templates/zh_CN/news.template b/templates/zh-cn/news.template similarity index 100% rename from templates/zh_CN/news.template rename to templates/zh-cn/news.template diff --git a/templates/zh_CN/search.template b/templates/zh-cn/search.template similarity index 100% rename from templates/zh_CN/search.template rename to templates/zh-cn/search.template

1 0

Ludger Sprenker : windowscodecs: Implement IPropertyBag2::GetPropertyInfo.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 987c81bae56601efaf98f81c79892373bfffdba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987c81bae56601efaf98f81c7… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Fri Jan 25 00:04:55 2013 +0100 windowscodecs: Implement IPropertyBag2::GetPropertyInfo. --- dlls/windowscodecs/propertybag.c | 92 ++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/propertybag.c | 2 - 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index f95e7eb..077c600 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "objbase.h" #include "wincodec.h" +#include "wine/unicode.h" #include "wincodecs_private.h" @@ -38,6 +39,7 @@ typedef struct PropertyBag { IPropertyBag2 IPropertyBag2_iface; LONG ref; UINT prop_count; + PROPBAG2 *properties; } PropertyBag; static inline PropertyBag *impl_from_IPropertyBag2(IPropertyBag2 *iface) @@ -87,6 +89,16 @@ static ULONG WINAPI PropertyBag_Release(IPropertyBag2 *iface) if (ref == 0) { + ULONG i; + if (This->properties) + { + for (i=0; i < This->prop_count; i++) + { + HeapFree(GetProcessHeap(), 0, This->properties[i].pstrName); + } + } + + HeapFree(GetProcessHeap(), 0, This->properties); HeapFree(GetProcessHeap(), 0, This); } @@ -121,11 +133,55 @@ static HRESULT WINAPI PropertyBag_CountProperties(IPropertyBag2 *iface, ULONG *p return S_OK; } +static HRESULT copy_propbag2(PROPBAG2 *dest, PROPBAG2 *src, BOOL useCoAlloc) +{ + dest->cfType = src->cfType; + dest->clsid = src->clsid; + dest->dwHint = src->dwHint; + dest->dwType = src->dwType; + dest->vt = src->vt; + if(useCoAlloc) + dest->pstrName = CoTaskMemAlloc((strlenW(src->pstrName)+1) * sizeof(WCHAR)); + else + dest->pstrName = HeapAlloc(GetProcessHeap(), 0, (strlenW(src->pstrName)+1) * sizeof(WCHAR)); + + if(!dest->pstrName) + return E_OUTOFMEMORY; + + strcpyW(dest->pstrName, src->pstrName); + + return S_OK; +} + static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iProperty, ULONG cProperties, PROPBAG2 *pPropBag, ULONG *pcProperties) { - FIXME("(%p,%u,%u,%p,%p): stub\n", iface, iProperty, cProperties, pPropBag, pcProperties); - return E_NOTIMPL; + HRESULT res = S_OK; + ULONG i; + PropertyBag *This = impl_from_IPropertyBag2(iface); + + TRACE("(%p,%u,%u,%p,%p)\n", iface, iProperty, cProperties, pPropBag, pcProperties); + + if (iProperty >= This->prop_count && iProperty > 0) + return WINCODEC_ERR_VALUEOUTOFRANGE; + if (iProperty+cProperties > This->prop_count ) + return WINCODEC_ERR_VALUEOUTOFRANGE; + + *pcProperties = max(cProperties, This->prop_count-iProperty); + + for (i=0; i < *pcProperties; i++) + { + res = copy_propbag2(pPropBag+i, This->properties+iProperty+i, TRUE); + if (FAILED(res)) + { + do { + CoTaskMemFree( pPropBag[--i].pstrName ); + } while (i); + break; + } + } + + return res; } static HRESULT WINAPI PropertyBag_LoadObject(IPropertyBag2 *iface, LPCOLESTR pstrName, @@ -149,6 +205,8 @@ static const IPropertyBag2Vtbl PropertyBag_Vtbl = { HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, IPropertyBag2 **ppPropertyBag2) { + UINT i; + HRESULT res = S_OK; PropertyBag *This; This = HeapAlloc(GetProcessHeap(), 0, sizeof(PropertyBag)); @@ -158,7 +216,33 @@ HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, This->ref = 1; This->prop_count = count; - *ppPropertyBag2 = &This->IPropertyBag2_iface; + if (count == 0) + { + This->properties = NULL; + } + else + { + This->properties = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PROPBAG2)*count); + + if (!This->properties) + res = E_OUTOFMEMORY; + else + for (i=0; i < count; i++) + { + res = copy_propbag2(This->properties+i, options+i, FALSE); + if (FAILED(res)) + break; + This->properties[i].dwHint = i+1; /* 0 means unset, so we start with 1 */ + } + } - return S_OK; + if (FAILED(res)) + { + PropertyBag_Release(&This->IPropertyBag2_iface); + *ppPropertyBag2 = NULL; + } + else + *ppPropertyBag2 = &This->IPropertyBag2_iface; + + return res; } diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index 83141a2..7115f65 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -239,7 +239,6 @@ static void test_empty_propertybag(void) test_propertybag_countproperties(property, 0); -todo_wine test_propertybag_getpropertyinfo(property, 0); IPropertyBag2_Release(property); @@ -268,7 +267,6 @@ static void test_filled_propertybag(void) test_propertybag_countproperties(property, 2); -todo_wine test_propertybag_getpropertyinfo(property, 2); todo_wine

1 0

Ludger Sprenker : windowscodecs: Implement IPropertyBag2::Write.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: d27fe13ffb643a5e0bc1360f1230d756ab976003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27fe13ffb643a5e0bc1360f1… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Fri Jan 25 00:05:08 2013 +0100 windowscodecs: Implement IPropertyBag2::Write. --- dlls/windowscodecs/propertybag.c | 63 ++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/propertybag.c | 1 - 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 077c600..f5729af 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -40,6 +40,7 @@ typedef struct PropertyBag { LONG ref; UINT prop_count; PROPBAG2 *properties; + VARIANT *values; } PropertyBag; static inline PropertyBag *impl_from_IPropertyBag2(IPropertyBag2 *iface) @@ -90,21 +91,40 @@ static ULONG WINAPI PropertyBag_Release(IPropertyBag2 *iface) if (ref == 0) { ULONG i; - if (This->properties) + if (This->properties && This->values) { for (i=0; i < This->prop_count; i++) { HeapFree(GetProcessHeap(), 0, This->properties[i].pstrName); + VariantClear( This->values+i ); } } HeapFree(GetProcessHeap(), 0, This->properties); + HeapFree(GetProcessHeap(), 0, This->values); HeapFree(GetProcessHeap(), 0, This); } return ref; } +static LONG find_item(PropertyBag *This, LPCOLESTR name) +{ + LONG i; + if (!This->properties) + return -1; + if (!name) + return -1; + + for (i=0; i < This->prop_count; i++) + { + if (strcmpW(name, This->properties[i].pstrName) == 0) + return i; + } + + return -1; +} + static HRESULT WINAPI PropertyBag_Read(IPropertyBag2 *iface, ULONG cProperties, PROPBAG2 *pPropBag, IErrorLog *pErrLog, VARIANT *pvarValue, HRESULT *phrError) { @@ -115,8 +135,41 @@ static HRESULT WINAPI PropertyBag_Read(IPropertyBag2 *iface, ULONG cProperties, static HRESULT WINAPI PropertyBag_Write(IPropertyBag2 *iface, ULONG cProperties, PROPBAG2 *pPropBag, VARIANT *pvarValue) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cProperties, pPropBag, pvarValue); - return E_NOTIMPL; + HRESULT res = S_OK; + ULONG i; + PropertyBag *This = impl_from_IPropertyBag2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cProperties, pPropBag, pvarValue); + + for (i=0; i < cProperties; i++) + { + LONG idx; + if (pPropBag[i].dwHint && pPropBag[i].dwHint <= This->prop_count) + idx = pPropBag[i].dwHint-1; + else + idx = find_item(This, pPropBag[i].pstrName); + + if (idx > -1) + { + if (This->properties[idx].vt != V_VT(pvarValue+i)) + return WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE; + res = VariantCopy(This->values+idx, pvarValue+i); + if (FAILED(res)) + return E_FAIL; + } + else + { + if (pPropBag[i].pstrName) + FIXME("Application tried to set the unknown option %s.\n", + debugstr_w(pPropBag[i].pstrName)); + + /* FIXME: Function is not atomar on error, but MSDN does not say anything about it + * (no reset of items between 0 and i-1) */ + return E_FAIL; + } + } + + return res; } static HRESULT WINAPI PropertyBag_CountProperties(IPropertyBag2 *iface, ULONG *pcProperties) @@ -219,12 +272,14 @@ HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, if (count == 0) { This->properties = NULL; + This->values = NULL; } else { This->properties = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PROPBAG2)*count); + This->values = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)*count); - if (!This->properties) + if (!This->properties || !This->values) res = E_OUTOFMEMORY; else for (i=0; i < count; i++) diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index 7115f65..aa62c8c 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -269,7 +269,6 @@ static void test_filled_propertybag(void) test_propertybag_getpropertyinfo(property, 2); -todo_wine test_propertybag_write(property); todo_wine

1 0

Ludger Sprenker : windowscodecs: Implement IPropertyBag2::Read.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 2ee3e8073fe5b5adc2b48f382eec50c21550fdbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee3e8073fe5b5adc2b48f382… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Fri Jan 25 00:05:15 2013 +0100 windowscodecs: Implement IPropertyBag2::Read. --- dlls/windowscodecs/propertybag.c | 32 ++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/propertybag.c | 1 - 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index f5729af..02914ec 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -128,8 +128,36 @@ static LONG find_item(PropertyBag *This, LPCOLESTR name) static HRESULT WINAPI PropertyBag_Read(IPropertyBag2 *iface, ULONG cProperties, PROPBAG2 *pPropBag, IErrorLog *pErrLog, VARIANT *pvarValue, HRESULT *phrError) { - FIXME("(%p,%u,%p,%p,%p,%p): stub\n", iface, cProperties, pPropBag, pErrLog, pvarValue, phrError); - return E_NOTIMPL; + HRESULT res = S_OK; + ULONG i; + PropertyBag *This = impl_from_IPropertyBag2(iface); + + TRACE("(%p,%u,%p,%p,%p,%p)\n", iface, cProperties, pPropBag, pErrLog, pvarValue, phrError); + + for (i=0; i < cProperties; i++) + { + LONG idx; + if (pPropBag[i].dwHint && pPropBag[i].dwHint <= This->prop_count) + idx = pPropBag[i].dwHint-1; + else + idx = find_item(This, pPropBag[i].pstrName); + + if (idx > -1) + { + VariantInit(pvarValue+i); + res = VariantCopy(pvarValue+i, This->values+idx); + if (FAILED(res)) + break; + phrError[i] = res; + } + else + { + res = E_FAIL; + break; + } + } + + return res; } static HRESULT WINAPI PropertyBag_Write(IPropertyBag2 *iface, ULONG cProperties, diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index aa62c8c..b3cf191 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -271,7 +271,6 @@ static void test_filled_propertybag(void) test_propertybag_write(property); -todo_wine test_propertybag_read(property); IPropertyBag2_Release(property);

1 0

Huw Davies : riched20: Add a paragraph ptr to each run.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 95938b7a10ce4f6e0fa1f2214ee53061e7df64b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95938b7a10ce4f6e0fa1f2214… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 30 15:10:18 2013 +0000 riched20: Add a paragraph ptr to each run. --- dlls/riched20/editstr.h | 1 + dlls/riched20/para.c | 10 +++++++--- dlls/riched20/run.c | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 0c49d30..49b461d 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -143,6 +143,7 @@ typedef struct tagME_Run { ME_String *strText; ME_Style *style; + struct tagME_Paragraph *para; /* ptr to the run's paragraph */ int nCharOfs; /* relative to para's offset */ int nWidth; /* width of full run, width of leading&trailing ws */ int nFlags; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 0539431..c909358 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -67,6 +67,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) eol_str = ME_MakeStringN(cr_lf, editor->bEmulateVersion10 ? 2 : 1); run = ME_MakeRun(style, eol_str, MERF_ENDPARA); run->member.run.nCharOfs = 0; + run->member.run.para = &para->member.para; ME_InsertBefore(text->pLast, para); ME_InsertBefore(text->pLast, run); @@ -213,16 +214,17 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } else { /* v1.0 - v3.0 */ assert(!(paraFlags & (MEPF_CELL|MEPF_ROWSTART|MEPF_ROWEND))); } - end_run = ME_MakeRun(style, eol_str, run_flags); - assert(run->type == diRun); run_para = ME_GetParagraph(run); assert(run_para->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); + end_run = ME_MakeRun(style, eol_str, run_flags); ofs = end_run->member.run.nCharOfs = run->member.run.nCharOfs; + end_run->member.run.para = run->member.run.para; + next_para = run_para->member.para.next_para; assert(next_para == ME_FindItemFwd(run_para, diParagraphOrEnd)); - + add_undo_join_paras( editor, run_para->member.para.nCharOfs + ofs ); /* Update selection cursors to point to the correct paragraph. */ @@ -238,6 +240,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, pp = run; while(pp->type == diRun) { pp->member.run.nCharOfs -= ofs; + pp->member.run.para = &new_para->member.para; pp = ME_FindItemFwd(pp, diRunOrParagraphOrEnd); } new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; @@ -409,6 +412,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, break; TRACE("shifting \"%s\" by %d (previous %d)\n", debugstr_w(pTmp->member.run.strText->szData), shift, pTmp->member.run.nCharOfs); pTmp->member.run.nCharOfs += shift; + pTmp->member.run.para = &tp->member.para; } while(1); ME_Remove(pRun); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 10c3da3..0c594d3 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -310,6 +310,7 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) run->member.run.nFlags & MERF_SPLITMASK); new_run->member.run.nCharOfs = run->member.run.nCharOfs + nOffset; + new_run->member.run.para = run->member.run.para; cursor->pRun = new_run; cursor->nOffset = 0; @@ -341,6 +342,7 @@ ME_DisplayItem *ME_MakeRun(ME_Style *s, ME_String *strData, int nFlags) item->member.run.strText = strData; item->member.run.nFlags = nFlags; item->member.run.nCharOfs = -1; + item->member.run.para = NULL; ME_AddRefStyle(s); return item; } @@ -366,6 +368,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, pDI = ME_MakeRun(style, ME_MakeStringN(str, len), flags); pDI->member.run.nCharOfs = cursor->pRun->member.run.nCharOfs; + pDI->member.run.para = cursor->pRun->member.run.para; ME_InsertBefore(cursor->pRun, pDI); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset(cursor->pRun, len);

1 0