wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Adam Martinson : msxml3: Implement schema_cache_get_namespaceURI().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: d87b8b8eb94e703cc4b910504e1a87e0d09162bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87b8b8eb94e703cc4b910504… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:37:06 2010 -0500 msxml3: Implement schema_cache_get_namespaceURI(). --- dlls/msxml3/schema.c | 29 +++++++++- dlls/msxml3/tests/schema.c | 138 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2df038f..93aa2ca 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -85,6 +85,12 @@ typedef struct _cache_entry LONG ref; } cache_entry; +typedef struct _cache_index_data +{ + LONG index; + BSTR* out; +} cache_index_data; + static LONG cache_entry_add_ref(cache_entry* entry) { LONG ref = InterlockedIncrement(&entry->ref); @@ -468,10 +474,29 @@ static HRESULT WINAPI schema_cache_get_length(IXMLDOMSchemaCollection *iface, LO return S_OK; } +static void cache_index(void* data /* ignored */, void* index, xmlChar* name) +{ + cache_index_data* index_data = (cache_index_data*)index; + + if (index_data->index-- == 0) + *index_data->out = bstr_from_xmlChar(name); +} + static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection *iface, LONG index, BSTR *len) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache* This = impl_from_IXMLDOMSchemaCollection(iface); + cache_index_data data = {index,len}; + TRACE("(%p)->(%i, %p)\n", This, index, len); + + if (!len) + return E_POINTER; + *len = NULL; + + if (index >= xmlHashSize(This->cache)) + return E_FAIL; + + xmlHashScan(This->cache, cache_index, &data); + return S_OK; } static void cache_copy(void* data, void* dest, xmlChar* name) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 0754a1b..69a0dc3 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -530,6 +530,143 @@ static void test_length(void) free_bstrs(); } +static void test_collection_content(void) +{ + IXMLDOMDocument2 *schema1, *schema2, *schema3, *schema4, *schema5; + IXMLDOMSchemaCollection *cache1, *cache2; + VARIANT_BOOL b; + BSTR bstr; + BSTR content[5] = {NULL, NULL, NULL, NULL, NULL}; + LONG length; + int i, j; + + schema1 = create_document_version(30, &IID_IXMLDOMDocument2); + schema2 = create_document_version(30, &IID_IXMLDOMDocument2); + schema3 = create_document_version(30, &IID_IXMLDOMDocument2); + + cache1 = create_cache_version(30, &IID_IXMLDOMSchemaCollection); + cache2 = create_cache_version(40, &IID_IXMLDOMSchemaCollection); + + if (!schema1 || !schema2 || !schema3 || !cache1) + { + if (schema1) IXMLDOMDocument2_Release(schema1); + if (schema2) IXMLDOMDocument2_Release(schema2); + if (schema3) IXMLDOMDocument2_Release(schema3); + + if (cache1) IXMLDOMSchemaCollection_Release(cache1); + + return; + } + + ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_check(IXMLDOMDocument2_loadXML(schema2, _bstr_(xdr_schema2_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_check(IXMLDOMDocument2_loadXML(schema3, _bstr_(xdr_schema3_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_check(IXMLDOMSchemaCollection_add(cache1, _bstr_(xdr_schema1_uri), _variantdoc_(schema1))); + ole_check(IXMLDOMSchemaCollection_add(cache1, _bstr_(xdr_schema2_uri), _variantdoc_(schema2))); + ole_check(IXMLDOMSchemaCollection_add(cache1, _bstr_(xdr_schema3_uri), _variantdoc_(schema3))); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache1, &length)); + ok(length == 3, "expected length 3, got %i\n", length); + + IXMLDOMDocument2_Release(schema1); + IXMLDOMDocument2_Release(schema2); + IXMLDOMDocument2_Release(schema3); + + if (cache2) + { + schema1 = create_document_version(40, &IID_IXMLDOMDocument2); + schema2 = create_document_version(40, &IID_IXMLDOMDocument2); + schema3 = create_document_version(40, &IID_IXMLDOMDocument2); + schema4 = create_document_version(40, &IID_IXMLDOMDocument2); + schema5 = create_document_version(40, &IID_IXMLDOMDocument2); + ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + ole_check(IXMLDOMDocument2_loadXML(schema2, _bstr_(xdr_schema2_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + ole_check(IXMLDOMDocument2_loadXML(schema3, _bstr_(xsd_schema1_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + ole_check(IXMLDOMDocument2_loadXML(schema4, _bstr_(xsd_schema2_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + ole_check(IXMLDOMDocument2_loadXML(schema5, _bstr_(xsd_schema3_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + /* combining XDR and XSD schemas in the same cache is fine */ + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xdr_schema1_uri), _variantdoc_(schema1))); + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xdr_schema2_uri), _variantdoc_(schema2))); + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xsd_schema1_uri), _variantdoc_(schema3))); + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xsd_schema2_uri), _variantdoc_(schema4))); + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xsd_schema3_uri), _variantdoc_(schema5))); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache2, &length)); + ok(length == 5, "expected length 5, got %i\n", length); + + IXMLDOMDocument2_Release(schema1); + IXMLDOMDocument2_Release(schema2); + IXMLDOMDocument2_Release(schema3); + IXMLDOMDocument2_Release(schema4); + IXMLDOMDocument2_Release(schema5); + } + + bstr = NULL; + /* error if index is out of range */ + ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, &bstr), E_FAIL); + if (bstr) SysFreeString(bstr); + /* error if return pointer is NULL */ + ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 0, NULL), E_POINTER); + /* pointer is checked first */ + ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, NULL), E_POINTER); + + for (i = 0; i < 3; ++i) + { + bstr = NULL; + ole_check(IXMLDOMSchemaCollection_get_namespaceURI(cache1, i, &bstr)); + ok(bstr != NULL && *bstr, "expected non-empty string\n"); + content[i] = bstr; + + for (j = 0; j < i; ++j) + ok(lstrcmpW(content[j], bstr), "got duplicate entry\n"); + } + + for (i = 0; i < 3; ++i) + { + SysFreeString(content[i]); + content[i] = NULL; + } + + if (cache2) + { + for (i = 0; i < 5; ++i) + { + bstr = NULL; + ole_check(IXMLDOMSchemaCollection_get_namespaceURI(cache2, i, &bstr)); + ok(bstr != NULL && *bstr, "expected non-empty string\n"); + + for (j = 0; j < i; ++j) + ok(lstrcmpW(content[j], bstr), "got duplicate entry\n"); + content[i] = bstr; + } + + for (i = 0; i < 5; ++i) + { + SysFreeString(content[i]); + content[i] = NULL; + } + } + + IXMLDOMSchemaCollection_Release(cache1); + if (cache2) IXMLDOMSchemaCollection_Release(cache2); + + free_bstrs(); +} + START_TEST(schema) { HRESULT r; @@ -540,6 +677,7 @@ START_TEST(schema) test_schema_refs(); test_collection_refs(); test_length(); + test_collection_content(); CoUninitialize(); }

1 0

Adam Martinson : msxml3: Implement schema_cache_addCollection().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 491ec41f5a5433d9387a1da1de137819084fa033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491ec41f5a5433d9387a1da1d… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:36:50 2010 -0500 msxml3: Implement schema_cache_addCollection(). --- dlls/msxml3/schema.c | 25 +++++++++++++++++++++++-- dlls/msxml3/tests/schema.c | 19 +++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 7eadd51..2df038f 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -474,10 +474,31 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection *ifa return E_NOTIMPL; } +static void cache_copy(void* data, void* dest, xmlChar* name) +{ + schema_cache* This = (schema_cache*) dest; + cache_entry* entry = (cache_entry*) data; + + if (xmlHashLookup(This->cache, name) == NULL) + { + cache_entry_add_ref(entry); + xmlHashAddEntry(This->cache, name, entry); + } +} + static HRESULT WINAPI schema_cache_addCollection(IXMLDOMSchemaCollection *iface, IXMLDOMSchemaCollection *otherCollection) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache* This = impl_from_IXMLDOMSchemaCollection(iface); + schema_cache* That = impl_from_IXMLDOMSchemaCollection(otherCollection); + TRACE("(%p)->(%p)\n", This, That); + + if (!otherCollection) + return E_POINTER; + + /* TODO: detect errors while copying & return E_FAIL */ + xmlHashScan(That->cache, cache_copy, This); + + return S_OK; } static HRESULT WINAPI schema_cache_get__newEnum(IXMLDOMSchemaCollection *iface, IUnknown **ppUnk) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index ba99c28..0754a1b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -324,6 +324,7 @@ static void test_collection_refs(void) IXMLDOMDocument2 *schema1, *schema2, *schema3; IXMLDOMSchemaCollection *cache1, *cache2, *cache3; VARIANT_BOOL b; + LONG length; schema1 = create_document(&IID_IXMLDOMDocument2); schema2 = create_document(&IID_IXMLDOMDocument2); @@ -376,8 +377,22 @@ static void test_collection_refs(void) if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); - todo_wine ole_check(IXMLDOMSchemaCollection_addCollection(cache2, cache1)); - todo_wine ole_check(IXMLDOMSchemaCollection_addCollection(cache3, cache2)); + ole_expect(IXMLDOMSchemaCollection_addCollection(cache1, NULL), E_POINTER); + ole_check(IXMLDOMSchemaCollection_addCollection(cache2, cache1)); + ole_check(IXMLDOMSchemaCollection_addCollection(cache3, cache2)); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache1, &length)); + ok(length == 1, "expected length 1, got %i", length); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache2, &length)); + ok(length == 2, "expected length 2, got %i", length); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache3, &length)); + ok(length == 3, "expected length 3, got %i", length); + /* merging collections does not affect the ref count */ check_refs(IXMLDOMSchemaCollection, cache1, 1);

1 0

Adam Martinson : msxml3: Implement schema_cache_remove().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: eac6ed018ca96fd73fd8fb5145cd0b5875745d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac6ed018ca96fd73fd8fb514… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:35:55 2010 -0500 msxml3: Implement schema_cache_remove(). --- dlls/msxml3/schema.c | 9 +++++++-- dlls/msxml3/tests/schema.c | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 9ef08a3..7eadd51 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -448,8 +448,13 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection *iface, BSTR uri, static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection *iface, BSTR uri) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache *This = impl_from_IXMLDOMSchemaCollection(iface); + xmlChar* name = xmlChar_from_wchar(uri); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(uri)); + + xmlHashRemoveEntry(This->cache, name, cache_free); + heap_free(name); + return S_OK; } static HRESULT WINAPI schema_cache_get_length(IXMLDOMSchemaCollection *iface, LONG *length) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index f889af4..ba99c28 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -461,6 +461,10 @@ static void test_length(void) ole_expect(IXMLDOMSchemaCollection_get_length(cache, NULL), E_POINTER); + /* MSDN lies; removing a non-existant entry produces no error */ + ole_check(IXMLDOMSchemaCollection_remove(cache, NULL)); + ole_check(IXMLDOMSchemaCollection_remove(cache, _bstr_(xdr_schema1_uri))); + length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); ok(length == 0, "expected length 0, got %i\n", length); @@ -491,13 +495,13 @@ static void test_length(void) ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); ok(length == 2, "expected length 2, got %i\n", length); - ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(xdr_schema2_uri), v)); + ole_check(IXMLDOMSchemaCollection_remove(cache, _bstr_(xdr_schema2_uri))); length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); ok(length == 1, "expected length 1, got %i\n", length); - ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(xdr_schema3_uri), v)); + ole_check(IXMLDOMSchemaCollection_remove(cache, _bstr_(xdr_schema3_uri))); length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache, &length));

1 0

Adam Martinson : msxml3: Implement schema_cache_get_length().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: f8bdf8b5affc112f3802d2dfd0bc21d63ac163d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8bdf8b5affc112f3802d2dfd… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:35:34 2010 -0500 msxml3: Implement schema_cache_get_length(). --- dlls/msxml3/schema.c | 15 +++++-- dlls/msxml3/tests/schema.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 77a7270..9ef08a3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -347,7 +347,7 @@ static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection *iface, static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection *iface, BSTR uri, VARIANT var) { - schema_cache *This = impl_from_IXMLDOMSchemaCollection( iface ); + schema_cache *This = impl_from_IXMLDOMSchemaCollection(iface); xmlChar* name = xmlChar_from_wchar(uri); TRACE("(%p)->(%s, var(vt %x))\n", This, debugstr_w(uri), V_VT(&var)); @@ -454,8 +454,13 @@ static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection *iface, BSTR u static HRESULT WINAPI schema_cache_get_length(IXMLDOMSchemaCollection *iface, LONG *length) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache *This = impl_from_IXMLDOMSchemaCollection(iface); + TRACE("(%p)->(%p)\n", This, length); + + if (!length) + return E_POINTER; + *length = xmlHashSize(This->cache); + return S_OK; } static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection *iface, LONG index, BSTR *len) @@ -497,8 +502,8 @@ static const struct IXMLDOMSchemaCollectionVtbl schema_vtbl = HRESULT SchemaCache_create(IUnknown *pUnkOuter, LPVOID *ppObj) { - schema_cache *schema = heap_alloc( sizeof (*schema) ); - if( !schema ) + schema_cache *schema = heap_alloc(sizeof(*schema)); + if (!schema) return E_OUTOFMEMORY; schema->lpVtbl = &schema_vtbl; diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 0731d59..f889af4 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -423,6 +423,94 @@ static void test_collection_refs(void) free_bstrs(); } +static void test_length(void) +{ + IXMLDOMDocument2 *schema1, *schema2, *schema3; + IXMLDOMSchemaCollection *cache; + VARIANT_BOOL b; + VARIANT v; + LONG length; + + schema1 = create_document(&IID_IXMLDOMDocument2); + schema2 = create_document(&IID_IXMLDOMDocument2); + schema3 = create_document(&IID_IXMLDOMDocument2); + + cache = create_cache(&IID_IXMLDOMSchemaCollection); + + if (!schema1 || !schema2 || !schema3 || !cache) + { + if (schema1) IXMLDOMDocument2_Release(schema1); + if (schema2) IXMLDOMDocument2_Release(schema2); + if (schema3) IXMLDOMDocument2_Release(schema3); + + if (cache) IXMLDOMSchemaCollection_Release(cache); + + return; + } + + VariantInit(&v); + + ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_check(IXMLDOMDocument2_loadXML(schema2, _bstr_(xdr_schema2_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_check(IXMLDOMDocument2_loadXML(schema3, _bstr_(xdr_schema3_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_expect(IXMLDOMSchemaCollection_get_length(cache, NULL), E_POINTER); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); + ok(length == 0, "expected length 0, got %i\n", length); + + ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(xdr_schema1_uri), _variantdoc_(schema1))); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); + ok(length == 1, "expected length 1, got %i\n", length); + + ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(xdr_schema2_uri), _variantdoc_(schema2))); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); + ok(length == 2, "expected length 2, got %i\n", length); + + ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(xdr_schema3_uri), _variantdoc_(schema3))); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); + ok(length == 3, "expected length 3, got %i\n", length); + + /* adding with VT_NULL is the same as removing */ + V_VT(&v) = VT_NULL; + ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(xdr_schema1_uri), v)); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); + ok(length == 2, "expected length 2, got %i\n", length); + + ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(xdr_schema2_uri), v)); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); + ok(length == 1, "expected length 1, got %i\n", length); + + ole_check(IXMLDOMSchemaCollection_add(cache, _bstr_(xdr_schema3_uri), v)); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &length)); + ok(length == 0, "expected length 0, got %i\n", length); + + IXMLDOMDocument2_Release(schema1); + IXMLDOMDocument2_Release(schema2); + IXMLDOMDocument2_Release(schema3); + IXMLDOMSchemaCollection_Release(cache); + + free_bstrs(); +} + START_TEST(schema) { HRESULT r; @@ -432,6 +520,7 @@ START_TEST(schema) test_schema_refs(); test_collection_refs(); + test_length(); CoUninitialize(); }

1 0

Adam Martinson : msxml3/tests: Internal schema doc storage tests.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: ab136a4fc29247432db0e3602130e2f180a552da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab136a4fc29247432db0e3602… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:35:09 2010 -0500 msxml3/tests: Internal schema doc storage tests. --- dlls/msxml3/tests/schema.c | 433 +++++++++++++++++++++++++++++++++----------- 1 files changed, 329 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab136a4fc29247432db0e…

1 0

Paul Vriens : wineboot: Add the Serbian Cyrillic and fix the Latin translation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 26a1b62df96e21a6c1585a1b806db539a110e97e URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a1b62df96e21a6c1585a1b8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 21 11:59:08 2010 +0200 wineboot: Add the Serbian Cyrillic and fix the Latin translation. Translation by Đorđe Vasiljević. --- programs/wineboot/wineboot_Sr.rc | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/programs/wineboot/wineboot_Sr.rc b/programs/wineboot/wineboot_Sr.rc index bc9a534..cbff8f7 100644 --- a/programs/wineboot/wineboot_Sr.rc +++ b/programs/wineboot/wineboot_Sr.rc @@ -3,6 +3,7 @@ * * Copyright 2010 Nenad Vujic * Paul Vriens + * Copyright 2010 Đorđe Vasiljević * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +23,6 @@ #include "resource.h" -/* UTF-8 */ #pragma code_page(65001) LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN @@ -33,10 +33,10 @@ CAPTION "Čekanje programa" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Otkaži",IDCANCEL,129,49,50,15 - PUSHBUTTON "Prekini proces",IDOK,51,49,71,15 - LTEXT "Simulacija odjave ili restarta je u toku, ali ovaj program ne reaguje.", + PUSHBUTTON "Okončaj proces",IDOK,51,49,71,15 + LTEXT "Oponašanje odjave ili gašenja računara je u toku, ali ovaj program ne odgovara.", IDC_STATIC,7,7,172,19 - LTEXT "Ako prekinete proces izgubićete sve sto nije sačuvano.", + LTEXT "Ako okončate proces, sve nesačuvane radnje će biti izgubljene.", IDC_STATIC,7,28,172,15 END @@ -46,6 +46,31 @@ CAPTION "Wine" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_WAITICON, 3, 3, 10, 10 - LTEXT "Wine konfiguracija u %s se osvežava. Molim sačekajte...", + LTEXT "Wine postavke u %s se ažuriraju. Molimo, sačekajte...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_ENDTASK DIALOG 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Чекање програма" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Откажи",IDCANCEL,129,49,50,15 + PUSHBUTTON "Окончај процес",IDOK,51,49,71,15 + LTEXT "Опонашање одјаве или гашења рачунара је у току, али овај програм не одговара.", + IDC_STATIC,7,7,172,19 + LTEXT "Ако окончате процес, све несачуване радње ће бити изгубљене.", + IDC_STATIC,7,28,172,15 +END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "Wine поставке у %s се ажурирају. Молимо, сачекајте...", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END

1 0

Paul Vriens : uninstaller: Add the Serbian (Latin and Cyrillic) translation .
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 467c1cf1f96608b62534ef395dfd7a48c64acd49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467c1cf1f96608b62534ef395… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 21 10:22:46 2010 +0200 uninstaller: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- programs/uninstaller/Makefile.in | 1 + programs/uninstaller/Sr.rc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 1a8fe42..70b34b6 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -31,6 +31,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/programs/uninstaller/Sr.rc b/programs/uninstaller/Sr.rc new file mode 100644 index 0000000..5bbf91e --- /dev/null +++ b/programs/uninstaller/Sr.rc @@ -0,0 +1,38 @@ +/* + * Uninstaller (Serbian Resources) + * + * Copyright 2005 Jonathan Ernst + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE { + IDS_APPNAME, "Wine деинсталациони програм" + IDS_UNINSTALLFAILED, "Извршавање наредбе за деинсталацију „%s“ није успело вероватно због тога што недостаје извршна датотека.\nЖелите ли да уклоните деинсталациони унос из регистра?" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE { + IDS_APPNAME, "Wine deinstalacioni program" + IDS_UNINSTALLFAILED, "Izvršavanje naredbe za deinstalaciju „%s“ nije uspelo verovatno zbog toga što nedostaje izvršna datoteka.\nŽelite li da uklonite deinstalacioni unos iz registra?" +}

1 0

Paul Vriens : notepad: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: e654be2961ab74169de46cc989592eb6cddc534d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e654be2961ab74169de46cc98… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 21 10:00:37 2010 +0200 notepad: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- programs/notepad/Makefile.in | 1 + programs/notepad/Sr.rc | 260 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 261 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e654be2961ab74169de46…

1 0

Andrew Nguyen : msvcrt: Implement _ultoa_s.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: ed357e5ca6ebbb52a07c75c0a0f1eade3b89d923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed357e5ca6ebbb52a07c75c0a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu Oct 21 02:57:44 2010 -0500 msvcrt: Implement _ultoa_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 54 ++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 81 +++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 7 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 212f30e..ec0a1ba 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1199,7 +1199,7 @@ @ cdecl _ui64tow(int64 ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa -@ stub _ultoa_s +@ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow @ stub _ultow_s @ cdecl _umask(long) msvcrt._umask diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 43c0032..a5bb126 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1052,7 +1052,7 @@ @ cdecl _ui64tow(int64 ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa -@ stub _ultoa_s +@ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow @ stub _ultow_s @ cdecl _umask(long) msvcrt._umask diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 74480af..14eec1b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1039,7 +1039,7 @@ @ cdecl _ui64tow(int64 ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa -@ stub _ultoa_s +@ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow @ stub _ultow_s @ cdecl _umask(long) msvcrt._umask diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1b3739f..1e8f06d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -974,7 +974,7 @@ @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow # stub _ui64tow_s @ cdecl _ultoa(long ptr long) ntdll._ultoa -# stub _ultoa_s +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow # stub _ultow_s @ cdecl _umask(long) MSVCRT__umask diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 02bd0a5..944c7e6 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -784,6 +784,60 @@ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, return 0; } +/********************************************************************* + * _ultoa_s (MSVCRT.@) + */ +int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix) +{ + MSVCRT_ulong digit; + char buffer[33], *pos; + size_t len; + + if (!str || !size || radix < 2 || radix > 36) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + pos = buffer + 32; + *pos = '\0'; + + do + { + digit = value % radix; + value /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (value != 0); + + len = buffer + 33 - pos; + if (len > size) + { + size_t i; + char *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. */ + + for (pos = buffer + 31, i = 0; i < size; i++) + *p++ = *pos--; + + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len); + return 0; +} + #define I10_OUTPUT_MAX_PREC 21 /* Internal structure used by $I10_OUTPUT */ struct _I10_OUTPUT_DATA { diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9f7370e..ab647db 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -63,6 +63,7 @@ static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); static errno_t (__cdecl *p_strlwr_s)(char*,size_t); +static errno_t (__cdecl *p_ultoa_s)(__msvcrt_ulong,char*,size_t,int); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -1596,6 +1597,84 @@ static void test__mbsnbcat_s(void) "Expected the output buffer string to be \"\\0inosaurdu\" without ending null terminator\n"); } +static void test__ultoa_s(void) +{ + errno_t ret; + char buffer[33]; + + if (!p_ultoa_s) + { + win_skip("Skipping _ultoa_s tests\n"); + return; + } + + errno = EBADF; + ret = p_ultoa_s(0, NULL, 0, 0); + ok(ret == EINVAL, "Expected _ultoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_ultoa_s(0, buffer, 0, 0); + ok(ret == EINVAL, "Expected _ultoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == 'X', "Expected the output buffer to be untouched\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_ultoa_s(0, buffer, sizeof(buffer), 0); + ok(ret == EINVAL, "Expected _ultoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "Expected the output buffer to be null terminated\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_ultoa_s(0, buffer, sizeof(buffer), 64); + ok(ret == EINVAL, "Expected _ultoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "Expected the output buffer to be null terminated\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_ultoa_s(12345678, buffer, 4, 10); + ok(ret == ERANGE, "Expected _ultoa_s to return ERANGE, got %d\n", ret); + ok(errno == ERANGE, "Expected errno to be ERANGE, got %d\n", errno); + ok(!memcmp(buffer, "\000765", 4), + "Expected the output buffer to be null terminated with truncated output\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_ultoa_s(12345678, buffer, 8, 10); + ok(ret == ERANGE, "Expected _ultoa_s to return ERANGE, got %d\n", ret); + ok(errno == ERANGE, "Expected errno to be ERANGE, got %d\n", errno); + ok(!memcmp(buffer, "\0007654321", 8), + "Expected the output buffer to be null terminated with truncated output\n"); + + ret = p_ultoa_s(12345678, buffer, 9, 10); + ok(ret == 0, "Expected _ultoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "12345678"), + "Expected output buffer string to be \"12345678\", got \"%s\"\n", + buffer); + + ret = p_ultoa_s(43690, buffer, sizeof(buffer), 2); + ok(ret == 0, "Expected _ultoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "1010101010101010"), + "Expected output buffer string to be \"1010101010101010\", got \"%s\"\n", + buffer); + + ret = p_ultoa_s(1092009, buffer, sizeof(buffer), 36); + ok(ret == 0, "Expected _ultoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "nell"), + "Expected output buffer string to be \"nell\", got \"%s\"\n", + buffer); + + ret = p_ultoa_s(5704, buffer, sizeof(buffer), 18); + ok(ret == 0, "Expected _ultoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "hag"), + "Expected output buffer string to be \"hag\", got \"%s\"\n", + buffer); +} + START_TEST(string) { char mem[100]; @@ -1625,6 +1704,7 @@ START_TEST(string) p_gcvt_s = (void *)GetProcAddress(hMsvcrt, "_gcvt_s"); p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); p_strlwr_s = (void *)GetProcAddress(hMsvcrt, "_strlwr_s"); + p_ultoa_s = (void *)GetProcAddress(hMsvcrt, "_ultoa_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1663,4 +1743,5 @@ START_TEST(string) test__strlwr_s(); test_wcsncat_s(); test__mbsnbcat_s(); + test__ultoa_s(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 086c3e1..49783c0 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -169,6 +169,7 @@ void __cdecl _swab(char*,char*,int); char* __cdecl _ui64toa(unsigned __int64,char*,int); errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int); char* __cdecl _ultoa(__msvcrt_ulong,char*,int); +errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int); void __cdecl _exit(int); void __cdecl abort(void);

1 0

Andrew Nguyen : msvcrt: Implement _mbsnbcat_s.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: a622af49a7cda0c35d6f45ab68922fa93e0331e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a622af49a7cda0c35d6f45ab6… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu Oct 21 02:55:43 2010 -0500 msvcrt: Implement _mbsnbcat_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 49 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/tests/string.c | 130 +++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/mbstring.h | 1 + 7 files changed, 185 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a622af49a7cda0c35d6f4…

1 0

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 October 2010