June 2016 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IDocumentSelector:: querySelectorAll implementation.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 92300cc4dc029fb291e9d363df31cbf475f65a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92300cc4dc029fb291e9d363d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 17:44:11 2016 +0200 mshtml: Added IDocumentSelector::querySelectorAll implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 19 +++++++++++-- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 66 ++++++++++++++++++++++++++++++++++++++------ 4 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1bf3323..eadb90b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4063,8 +4063,23 @@ static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, B static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) { HTMLDocument *This = impl_from_IDocumentSelector(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMNodeList *node_list; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->doc_node->nsdoc, &nsstr, &node_list); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } + + *pel = create_child_collection(This->doc_node, node_list); + nsIDOMNodeList_Release(node_list); + return *pel ? S_OK : E_OUTOFMEMORY; } static const IDocumentSelectorVtbl DocumentSelectorVtbl = { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 2e07c0b..19909ae 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -440,7 +440,7 @@ static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { HTMLDOMChildrenCollection_iface_tids }; -static IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) +IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) { HTMLDOMChildrenCollection *ret; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c1816bf..d378bdd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1026,6 +1026,7 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7a39d34..47c8827 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -147,6 +147,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, @@ -162,6 +163,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_ICustomDoc, @@ -2696,6 +2698,20 @@ static void _test_doc_all(unsigned line, IHTMLDocument2 *doc, const elem_type_t IHTMLElementCollection_Release(col); } +#define test_children_collection_length(a,b) _test_children_collection_length(__LINE__,a,b) +static LONG _test_children_collection_length(unsigned line, IHTMLDOMChildrenCollection *collection, LONG exlen) +{ + LONG length; + HRESULT hres; + + hres = IHTMLDOMChildrenCollection_get_length(collection, &length); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); + if(exlen != -1) + ok_(__FILE__,line)(length == exlen, "length = %d, expected %d\n", length, exlen); + + return length; +} + #define test_elem_getelembytag(a,b,c,d) _test_elem_getelembytag(__LINE__,a,b,c,d) static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t type, LONG exlen, IHTMLElement **ret) { @@ -2791,12 +2807,10 @@ static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const ch col = _get_child_nodes(line, (IUnknown*)elem); ok(col != NULL, "col == NULL\n"); if(col) { - LONG length = 0, type; + LONG type; IHTMLDOMNode *node; - hres = IHTMLDOMChildrenCollection_get_length(col, &length); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(length == 1, "length = %d\n", length); + _test_children_collection_length(line, col, 1); node = _get_child_item(line, col, 0); ok(node != NULL, "node == NULL\n"); @@ -7892,6 +7906,41 @@ static void test_enum_children(IUnknown *unk, unsigned len) IEnumVARIANT_Release(enum_var); } +static void test_doc_selector(IHTMLDocument2 *doc, IHTMLElement *div) +{ + IHTMLDOMChildrenCollection *collection; + IDocumentSelector *doc_selector; + BSTR str; + HRESULT hres; + + test_elem_set_innerhtml((IUnknown*)div, "<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentSelector, (void**)&doc_selector); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDocumentSelector iface: %08x\n", hres); + if(FAILED(hres)) { + win_skip("IDocumentSelector tests skipped.\n"); + return; + } + + collection = NULL; + str = a2bstr("nomatch"); + hres = IDocumentSelector_querySelectorAll(doc_selector, str, &collection); + ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_children_collection_length(collection, 0); + IHTMLDOMChildrenCollection_Release(collection); + + collection = NULL; + str = a2bstr(".cl1"); + hres = IDocumentSelector_querySelectorAll(doc_selector, str, &collection); + ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_children_collection_length(collection, 2); + IHTMLDOMChildrenCollection_Release(collection); + + IDocumentSelector_Release(doc_selector); +} + static void test_elems(IHTMLDocument2 *doc) { IHTMLElementCollection *col; @@ -8418,13 +8467,10 @@ static void test_elems(IHTMLDocument2 *doc) ok(child_col != NULL, "child_coll == NULL\n"); if(child_col) { IUnknown *enum_unk; - LONG length = 0; + LONG length; test_disp((IUnknown*)child_col, &DIID_DispDOMChildrenCollection, "[object]"); - - hres = IHTMLDOMChildrenCollection_get_length(child_col, &length); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(length, "length=0\n"); + length = test_children_collection_length(child_col, -1); node2 = NULL; node = get_child_item(child_col, 0); @@ -8959,6 +9005,8 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); } + test_doc_selector(doc, div); + test_elem_set_innerhtml((IUnknown*)div, "<div id=\"elemid\">test</div>"); elem = get_elem_by_id(doc, "elemid", TRUE); if(elem) {

1 0

Jacek Caban : jscript: Allow Function.apply() to be called on non-jscript objects.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: db6b86cbbd725bb42d2124c24a00bfa68451853a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6b86cbbd725bb42d2124c24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 18:37:13 2016 +0200 jscript: Allow Function.apply() to be called on non-jscript objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 18 +++++++++++++++--- dlls/jscript/tests/run.c | 23 +++++++++++++++++++---- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 1e8d563..6817aa7 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -426,7 +426,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - if(!(function = function_this(jsthis))) + if(!(function = function_this(jsthis)) && (jsthis->flags & VDISP_JSDISP)) return throw_type_error(ctx, JS_E_FUNCTION_EXPECTED, NULL); if(argc) { @@ -458,8 +458,20 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } } - if(SUCCEEDED(hres)) - hres = call_function(ctx, function, this_obj, cnt, args, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); + if(SUCCEEDED(hres)) { + if(function) { + hres = call_function(ctx, function, this_obj, cnt, args, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); + }else { + jsval_t res; + hres = disp_call_value(ctx, jsthis->u.disp, this_obj, DISPATCH_METHOD, cnt, args, &res); + if(SUCCEEDED(hres)) { + if(r) + *r = res; + else + jsval_release(res); + } + } + } if(this_obj) IDispatch_Release(this_obj); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 85f7e1c..0101f15 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -483,11 +483,15 @@ static HRESULT WINAPI dispexFunc_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); ok(res != NULL, "res == NULL\n"); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(pei != NULL, "pei == NULL\n"); ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(pdp->rgvarg+1) = %d\n", V_VT(pdp->rgvarg+1)); - ok(!V_BOOL(pdp->rgvarg+1), "V_BOOL(pdp->rgvarg+1) = %x\n", V_BOOL(pdp->rgvarg+1)); + + if(V_BOOL(pdp->rgvarg+1)) + /* NOTE: If called by Function.apply(), native doesn't set DISPATCH_PROPERTYGET flag. */ + todo_wine ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + else + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok(V_DISPATCH(pdp->rgvarg) != NULL, "V_DISPATCH(pdp->rgvarg) == NULL\n"); @@ -567,12 +571,15 @@ static HRESULT WINAPI pureDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, R ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); ok(res != NULL, "res == NULL\n"); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(ei != NULL, "ei == NULL\n"); ok(puArgErr != NULL, "puArgErr == NULL\n"); ok(V_VT(pdp->rgvarg) == VT_BOOL, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); - ok(!V_BOOL(pdp->rgvarg), "V_BOOL(pdp->rgvarg) = %x\n", V_BOOL(pdp->rgvarg)); + + if(V_BOOL(pdp->rgvarg)) + todo_wine ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + else + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); if(res) V_VT(res) = VT_NULL; @@ -2501,6 +2508,14 @@ static BOOL run_tests(void) parse_script_a("var t = {func: dispexFunc}; t = t.func(false);"); CHECK_CALLED(dispexfunc_value); + SET_EXPECT(dispexfunc_value); + parse_script_a("Function.prototype.apply.call(dispexFunc, testObj, [true]);"); + CHECK_CALLED(dispexfunc_value); + + SET_EXPECT(puredisp_value); + parse_script_a("Function.prototype.apply.call(pureDisp, testObj, [true]);"); + CHECK_CALLED(puredisp_value); + parse_script_a("(function reportSuccess() {})()"); parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");");

1 0

Vincent Povirk : windowscodecs: Add test for png cHRM metadata.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 9b27a178a941a2c1fdd60fa4cb6c25ae18933884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b27a178a941a2c1fdd60fa4c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:39 2016 -0500 windowscodecs: Add test for png cHRM metadata. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 72 +++++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 ++ 2 files changed, 74 insertions(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index aa096f0..c44cf9f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -144,6 +144,16 @@ static const char metadata_gAMA[] = { 0xff,0xff,0xff,0xff /* chunk CRC */ }; +static const char metadata_cHRM[] = { + 0,0,0,32, /* chunk length */ + 'c','H','R','M', /* chunk type */ + 0,0,122,38, 0,0,128,132, /* white point */ + 0,0,250,0, 0,0,128,232, /* red */ + 0,0,117,48, 0,0,234,96, /* green */ + 0,0,58,152, 0,0,23,112, /* blue */ + 0xff,0xff,0xff,0xff /* chunk CRC */ +}; + static const char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, @@ -457,6 +467,67 @@ static void test_metadata_gAMA(void) IWICMetadataReader_Release(reader); } +static void test_metadata_cHRM(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT schema, id, value; + ULONG count; + GUID format; + int i; + static const WCHAR expected_names[8][12] = { + {'W','h','i','t','e','P','o','i','n','t','X',0}, + {'W','h','i','t','e','P','o','i','n','t','Y',0}, + {'R','e','d','X',0}, + {'R','e','d','Y',0}, + {'G','r','e','e','n','X',0}, + {'G','r','e','e','n','Y',0}, + {'B','l','u','e','X',0}, + {'B','l','u','e','Y',0}, + }; + static const ULONG expected_vals[8] = { + 31270,32900, 64000,33000, 30000,60000, 15000,6000 + }; + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = CoCreateInstance(&CLSID_WICPngChrmMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionsDefault); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatChunkcHRM), "unexpected format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 8, "unexpected count %i\n", count); + + for (i=0; i<8; i++) + { + hr = IWICMetadataReader_GetValueByIndex(reader, i, &schema, &id, &value); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + PropVariantClear(&schema); + + ok(id.vt == VT_LPWSTR, "unexpected vt: %i\n", id.vt); + ok(!lstrcmpW(U(id).pwszVal, expected_names[i]), "got %s, expected %s\n", wine_dbgstr_w(U(id).pwszVal), wine_dbgstr_w(expected_names[i])); + PropVariantClear(&id); + + ok(value.vt == VT_UI4, "unexpected vt: %i\n", value.vt); + ok(U(value).ulVal == expected_vals[i], "got %u, expected %u\n", U(value).ulVal, expected_vals[i]); + PropVariantClear(&value); + } + + IWICMetadataReader_Release(reader); +} + static inline USHORT ushort_bswap(USHORT s) { return (s >> 8) | (s << 8); @@ -1896,6 +1967,7 @@ START_TEST(metadata) test_metadata_unknown(); test_metadata_tEXt(); test_metadata_gAMA(); + test_metadata_cHRM(); test_metadata_IFD(); test_metadata_Exif(); test_create_reader(); diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 7fc07b8..9ce3f30 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -37,6 +37,7 @@ typedef enum WICMetadataCreationOptions { } WICMetadataCreationOptions; cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkcHRM, 0x9db3655b,0x2842,0x44b3,0x80,0x67,0x12,0xe9,0xb3,0x75,0x55,0x6a);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkgAMA, 0xf00935a5,0x1d5d,0x4cd1,0x81,0xb2,0x93,0x24,0xd7,0xec,0xa7,0x81);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktIME, 0x6b00ae2d,0xe24b,0x460a,0x98,0xb6,0x87,0x8b,0xd0,0x30,0x72,0xfd);") @@ -52,6 +53,7 @@ cpp_quote("DEFINE_GUID(GUID_MetadataFormatGifComment, 0xc4b6e0e0,0xcfb4,0x4ad3,0 cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") +cpp_quote("DEFINE_GUID(CLSID_WICPngChrmMetadataReader, 0xf90b5f36,0x367b,0x402a,0x9d,0xd1,0xbc,0x0f,0xd5,0x9d,0x8f,0x62);") cpp_quote("DEFINE_GUID(CLSID_WICPngGamaMetadataReader, 0x3692ca39,0xe082,0x4350,0x9e,0x1f,0x37,0x04,0xcb,0x08,0x3c,0xd5);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);")

1 0

Vincent Povirk : windowscodecs: Implement png cHRM metadata reader.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 2e16630a61c1ac581ba2a2ee84f20aa2c7d0f9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e16630a61c1ac581ba2a2ee8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:40 2016 -0500 windowscodecs: Implement png cHRM metadata reader. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/pngformat.c | 78 +++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 +++++++++ dlls/windowscodecs/tests/metadata.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 +++ 6 files changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index d4c524a..77eeedc 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -59,6 +59,7 @@ static const classinfo wic_classes[] = { {&CLSID_WineTgaDecoder, TgaDecoder_CreateInstance}, {&CLSID_WICUnknownMetadataReader, UnknownMetadataReader_CreateInstance}, {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, + {&CLSID_WICPngChrmMetadataReader, PngChrmReader_CreateInstance}, {&CLSID_WICPngGamaMetadataReader, PngGamaReader_CreateInstance}, {&CLSID_WICPngTextMetadataReader, PngTextReader_CreateInstance}, {&CLSID_WICLSDMetadataReader, LSDReader_CreateInstance}, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3eb4d0e..bb2aef9 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -220,6 +220,84 @@ HRESULT PngGamaReader_CreateInstance(REFIID iid, void** ppv) return MetadataReader_Create(&GamaReader_Vtbl, iid, ppv); } +static HRESULT LoadChrmMetadata(IStream *stream, const GUID *preferred_vendor, + DWORD persist_options, MetadataItem **items, DWORD *item_count) +{ + HRESULT hr; + BYTE type[4]; + BYTE *data; + ULONG data_size; + static const WCHAR names[8][12] = { + {'W','h','i','t','e','P','o','i','n','t','X',0}, + {'W','h','i','t','e','P','o','i','n','t','Y',0}, + {'R','e','d','X',0}, + {'R','e','d','Y',0}, + {'G','r','e','e','n','X',0}, + {'G','r','e','e','n','Y',0}, + {'B','l','u','e','X',0}, + {'B','l','u','e','Y',0}, + }; + LPWSTR dyn_names[8] = {0}; + MetadataItem *result; + int i; + + hr = read_png_chunk(stream, type, &data, &data_size); + if (FAILED(hr)) return hr; + + if (data_size < 32) + { + HeapFree(GetProcessHeap(), 0, data); + return E_FAIL; + } + + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem)*8); + for (i=0; i<8; i++) + { + dyn_names[i] = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(lstrlenW(names[i])+1)); + if (!dyn_names[i]) break; + } + if (!result || i < 8) + { + HeapFree(GetProcessHeap(), 0, result); + for (i=0; i<8; i++) + HeapFree(GetProcessHeap(), 0, dyn_names[i]); + HeapFree(GetProcessHeap(), 0, data); + return E_OUTOFMEMORY; + } + + for (i=0; i<8; i++) + { + PropVariantInit(&result[i].schema); + + PropVariantInit(&result[i].id); + result[i].id.vt = VT_LPWSTR; + result[i].id.u.pwszVal = dyn_names[i]; + lstrcpyW(dyn_names[i], names[i]); + + PropVariantInit(&result[i].value); + result[i].value.vt = VT_UI4; + result[i].value.u.ulVal = read_ulong_be(&data[i*4]); + } + + *items = result; + *item_count = 8; + + HeapFree(GetProcessHeap(), 0, data); + + return S_OK; +} + +static const MetadataHandlerVtbl ChrmReader_Vtbl = { + 0, + &CLSID_WICPngChrmMetadataReader, + LoadChrmMetadata +}; + +HRESULT PngChrmReader_CreateInstance(REFIID iid, void** ppv) +{ + return MetadataReader_Create(&ChrmReader_Vtbl, iid, ppv); +} + #ifdef SONAME_LIBPNG static void *libpng_handle; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 9c4062e..ff499e5 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1515,6 +1515,21 @@ static const struct reader_containers pnggama_containers[] = { { NULL } /* list terminator */ }; +static const BYTE cHRM[] = "cHRM"; + +static const struct metadata_pattern pngchrm_metadata_pattern[] = { + { 4, 4, cHRM, mask_all, 4 }, + { 0 } +}; + +static const struct reader_containers pngchrm_containers[] = { + { + &GUID_ContainerFormatPng, + pngchrm_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static const struct metadata_pattern lsd_metadata_patterns[] = { { 0, 6, gif87a_magic, mask_all, 0 }, { 0, 6, gif89a_magic, mask_all, 0 }, @@ -1610,6 +1625,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 1, 1, 0, ifd_containers }, + { &CLSID_WICPngChrmMetadataReader, + "The Wine Project", + "Chunk cHRM Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatChunkcHRM, + 0, 0, 0, + pngchrm_containers + }, { &CLSID_WICPngGamaMetadataReader, "The Wine Project", "Chunk gAMA Reader", diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index c44cf9f..3912209 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -495,7 +495,7 @@ static void test_metadata_cHRM(void) hr = CoCreateInstance(&CLSID_WICPngChrmMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void**)&reader); - todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); if (FAILED(hr)) return; load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionsDefault); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index f54403c..a8af0d6 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -154,6 +154,7 @@ extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, REFIID i extern HRESULT UnknownMetadataReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT IfdMetadataReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT PngChrmReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT PngGamaReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT PngTextReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT LSDReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 089bb39..fd7ff01 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -140,6 +140,13 @@ coclass WICUnknownMetadataReader { interface IWICMetadataReader; } coclass WICIfdMetadataReader { interface IWICIfdMetadataReader; } [ + helpstring("WIC Png cHRM Metadata Reader"), + threading(both), + uuid(f90b5f36-367b-402a-9dd1-bc0fd59d8f62) +] +coclass WICPngChrmMetadataReader { interface IWICMetadataReader; } + +[ helpstring("WIC Png gAMA Metadata Reader"), threading(both), uuid(3692ca39-e082-4350-9e1f-3704cb083cd5)

1 0

Vincent Povirk : gdiplus: Add support for reading png cHRM chunks.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: bf4a2ba26405aacddd93a1cef16d0eda331f3c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4a2ba26405aacddd93a1cef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:41 2016 -0500 gdiplus: Add support for reading png cHRM chunks. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d1a5593..1681099 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3483,7 +3483,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI { "Source", PropertyTagEquipModel }, { "Comment", PropertyTagExifUserComment }, }; - BOOL seen_gamma=FALSE; + BOOL seen_gamma=FALSE, seen_whitepoint=FALSE, seen_chrm=FALSE; hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); if (hr != S_OK) return; @@ -3552,6 +3552,57 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI } } } + else if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunkcHRM, &format)) + { + PropertyItem* item; + + if (!seen_whitepoint) + { + item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 4); + if (item) + { + ULONG *rational; + item->length = sizeof(ULONG) * 4; + item->type = PropertyTagTypeRational; + item->id = PropertyTagWhitePoint; + rational = item->value = item + 1; + rational[0] = get_ulong_by_index(reader, 0); + rational[1] = 100000; + rational[2] = get_ulong_by_index(reader, 1); + rational[3] = 100000; + add_property(bitmap, item); + seen_whitepoint = TRUE; + GdipFree(item); + } + } + if (!seen_chrm) + { + item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 12); + if (item) + { + ULONG *rational; + item->length = sizeof(ULONG) * 12; + item->type = PropertyTagTypeRational; + item->id = PropertyTagPrimaryChromaticities; + rational = item->value = item + 1; + rational[0] = get_ulong_by_index(reader, 2); + rational[1] = 100000; + rational[2] = get_ulong_by_index(reader, 3); + rational[3] = 100000; + rational[4] = get_ulong_by_index(reader, 4); + rational[5] = 100000; + rational[6] = get_ulong_by_index(reader, 5); + rational[7] = 100000; + rational[8] = get_ulong_by_index(reader, 6); + rational[9] = 100000; + rational[10] = get_ulong_by_index(reader, 7); + rational[11] = 100000; + add_property(bitmap, item); + seen_chrm = TRUE; + GdipFree(item); + } + } + } IWICMetadataReader_Release(reader); }

1 0

Frédéric Delanoy : French translation for release 1.9.12
by Jeremy Newman 16 Jun '16

16 Jun '16

Module: website Branch: master Commit: 883c679bc39dec740537b086d8504f83c58fc780 URL: http://source.winehq.org/git/website.git/?a=commit;h=883c679bc39dec740537b0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jun 16 09:37:48 2016 +0200 French translation for release 1.9.12 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016061001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2016061001.xml b/news/fr/2016061001.xml new file mode 100644 index 0000000..f4e0e5c --- /dev/null +++ b/news/fr/2016061001.xml @@ -0,0 +1,16 @@ +<news> +<date>10 juin 2016</date> +<title>Sortie de Wine 1.9.12</title> +<body> +<p>La version de développement 1.9.12 de Wine est disponible.</p> +<p><a href="{$root}/announce/1.9.12">Nouveautés</a> de cette version : +<ul> + <li>Mise à jour corrective du moteur Mono.</li> + <li>Version initiale d'une barre des tâches en mode bureau.</li> + <li>Correctifs pour les langues s'écrivant de droite à gauche dans Uniscribe.</li> + <li>Meilleure prise en charge de Shader Model 4 dans Direct3D.</li> + <li>Meilleure prise en charge des métafichiers dans RichEdit.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p>Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.12.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. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.9.11
by Jeremy Newman 16 Jun '16

16 Jun '16

Module: website Branch: master Commit: 0a9b9dcd0635f7ceea157928b6441a8795670105 URL: http://source.winehq.org/git/website.git/?a=commit;h=0a9b9dcd0635f7ceea1579… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jun 16 09:37:47 2016 +0200 French translation for release 1.9.11 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016052701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016052701.xml b/news/fr/2016052701.xml new file mode 100644 index 0000000..6ef6668 --- /dev/null +++ b/news/fr/2016052701.xml @@ -0,0 +1,15 @@ +<news> +<date>27 mai 2016</date> +<title>Sortie de Wine 1.9.11</title> +<body> +<p>La version de développement 1.9.11 de Wine est disponible.</p> +<p><a href="{$root}/announce/1.9.11">Nouveautés</a> de cette version : +<ul> + <li>Meilleure prise en charge des URL longues dans WinInet.</li> + <li>Diverses améliorations Direct3D 11.</li> + <li>Prise en charge du mixage réducteur dans DirectSound.</li> + <li>Quelques améliorations cosmétiques dans le mode bureau.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p>Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.11.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. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.8.3
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: website Branch: master Commit: f421004608fc45aa5f509140a278fe30077c2f1d URL: http://source.winehq.org/git/website.git/?a=commit;h=f421004608fc45aa5f5091… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 17:45:55 2016 +0900 Wine release 1.8.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016061601.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2016061601.xml b/news/en/2016061601.xml new file mode 100644 index 0000000..1982f89 --- /dev/null +++ b/news/en/2016061601.xml @@ -0,0 +1,14 @@ +<news> +<date>June 16, 2016</date> +<title>Wine 1.8.3 Released</title> +<body> +<p> The Wine maintenance release 1.8.3 is now available.</p> +<p> <a href="{$root}/announce/1.8.3">What's new</a> in this release: +<ul> + <li>Various bug fixes.</li> + <li>A lot of NVidia cards added to the GPU description table.</li> + <li>Updates to the National Language Support files.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.3.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>. +</p></body></news>

1 0

Nikolay Sivov : kernel32/nls: Fix shortest day names for Thai and Vietnamese.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: d4056466aecc5c4bcf36913d1d659b945ebae194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4056466aecc5c4bcf36913d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 08:42:34 2016 +0300 kernel32/nls: Fix shortest day names for Thai and Vietnamese. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 45edebfb4f07ab3533821e50b20369482df91d2a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/tha.nls | 16 ++++++++-------- dlls/kernel32/nls/vit.nls | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 7e2e6ad..1b35e19 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -134,13 +134,13 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Thai;" LOCALE_SSHORTDATE "d/M/yyyy" - LOCALE_SSHORTESTDAYNAME1 "จ." - LOCALE_SSHORTESTDAYNAME2 "อ." - LOCALE_SSHORTESTDAYNAME3 "พ." - LOCALE_SSHORTESTDAYNAME4 "พฤ." - LOCALE_SSHORTESTDAYNAME5 "ศ." - LOCALE_SSHORTESTDAYNAME6 "ส." - LOCALE_SSHORTESTDAYNAME7 "อา." + LOCALE_SSHORTESTDAYNAME1 "จ" + LOCALE_SSHORTESTDAYNAME2 "อ" + LOCALE_SSHORTESTDAYNAME3 "พ" + LOCALE_SSHORTESTDAYNAME4 "พฤ" + LOCALE_SSHORTESTDAYNAME5 "ศ" + LOCALE_SSHORTESTDAYNAME6 "ส" + LOCALE_SSHORTESTDAYNAME7 "อา" LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," @@ -160,7 +160,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 89b030c..b66c796 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -134,13 +134,13 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" LOCALE_SSHORTDATE "dd/MM/yyyy" - LOCALE_SSHORTESTDAYNAME1 "hai" - LOCALE_SSHORTESTDAYNAME2 "ba" - LOCALE_SSHORTESTDAYNAME3 "tư" - LOCALE_SSHORTESTDAYNAME4 "năm" - LOCALE_SSHORTESTDAYNAME5 "sáu" - LOCALE_SSHORTESTDAYNAME6 "bảy" - LOCALE_SSHORTESTDAYNAME7 "cn" + LOCALE_SSHORTESTDAYNAME1 "H" + LOCALE_SSHORTESTDAYNAME2 "B" + LOCALE_SSHORTESTDAYNAME3 "T" + LOCALE_SSHORTESTDAYNAME4 "N" + LOCALE_SSHORTESTDAYNAME5 "S" + LOCALE_SSHORTESTDAYNAME6 "B" + LOCALE_SSHORTESTDAYNAME7 "C" LOCALE_SSHORTTIME "h:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "." @@ -160,7 +160,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian"

1 0

Henri Verbeet : kernel32/nls: Persian uses a right-to-left writing system.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: fc0f2466fb16968b6345aa019f7aaa5172a49c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0f2466fb16968b6345aa019… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:19 2016 +0200 kernel32/nls: Persian uses a right-to-left writing system. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f2af3b9b57e45ff121656a339759bdc1b4193b70) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index fa71dc0..859239b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -58,7 +58,7 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" - LOCALE_IREADINGLAYOUT "0" + LOCALE_IREADINGLAYOUT "1" LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1"

1 0