May 2010 - Wine-commits - list.winehq.org

Luca Bennati : mapi32: Add Italian translation.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: 3e4935b9e37d81c44ed5723c6034b6870ffc49d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e4935b9e37d81c44ed5723c6… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun May 30 10:36:56 2010 +0200 mapi32: Add Italian translation. --- dlls/mapi32/It.rc | 34 ++++++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/It.rc b/dlls/mapi32/It.rc new file mode 100644 index 0000000..6e2b5e2 --- /dev/null +++ b/dlls/mapi32/It.rc @@ -0,0 +1,34 @@ +/* +* MAPI32 Italian resources +* +* Copyright 2009 Owen Rudge for CodeWeavers +* Copyright 2010 Luca Bennati +* +* 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 "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Impossibile inviare la mail poiché non hai un client di posta MAPI installato." + IDS_SEND_MAIL, "Invia Mail" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index ba38288..9c0fb71 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ En.rc \ Es.rc \ Fr.rc \ + It.rc \ Lt.rc \ Nl.rc \ Ro.rc \

1 0

Luca Bennati : taskmgr: Add Italian translation.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: 64b62a3fefcc56399c6a20471241fdd6b40389b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b62a3fefcc56399c6a20471… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun May 30 19:59:20 2010 +0200 taskmgr: Add Italian translation. --- programs/taskmgr/It.rc | 578 ++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/Makefile.in | 1 + 2 files changed, 579 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64b62a3fefcc56399c6a2…

1 0

Luca Bennati : jscript: Add Italian translation.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: 7388cb4a68a2fb3fcffc7e0ce9f14e7a7cc028a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7388cb4a68a2fb3fcffc7e0ce… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun May 30 20:21:18 2010 +0200 jscript: Add Italian translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_It.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 932dabe..0a20c41 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -9,6 +9,7 @@ RC_SRCS = \ jscript_De.rc \ jscript_En.rc \ jscript_Fr.rc \ + jscript_It.rc \ jscript_Ko.rc \ jscript_Lt.rc \ jscript_Nl.rc \ diff --git a/dlls/jscript/jscript_It.rc b/dlls/jscript/jscript_It.rc new file mode 100644 index 0000000..1d843be --- /dev/null +++ b/dlls/jscript/jscript_It.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2009 Piotr Caban + * Copyright 2010 Luca Bennati + * + * 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" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Errore nel convertire un oggetto ad un tipo primitivo" + IDS_INVALID_CALL_ARG "Chiamata o argomento di procedura non valido" + IDS_CREATE_OBJ_ERROR "Il server di automazione non può creare l'oggetto" + IDS_NO_PROPERTY "L'oggetto non supporta questa proprietà o metodo" + IDS_ARG_NOT_OPT "Argomento non opzionale" + IDS_SYNTAX_ERROR "Errore di sintassi" + IDS_SEMICOLON "Richiesto ';'" + IDS_LBRACKET "Richiesto '('" + IDS_RBRACKET "Richiesto ')'" + IDS_UNTERMINATED_STR "Costante stringa non terminata" + IDS_NOT_FUNC "Richiesta una funzione" + IDS_NOT_DATE "'[oggetto]' non è un oggetto data" + IDS_NOT_NUM "Richiesto un numero" + IDS_OBJECT_EXPECTED "Richiesto un oggetto" + IDS_ILLEGAL_ASSIGN "Assegnamento illegale" + IDS_UNDEFINED "'|' non è definito" + IDS_NOT_BOOL "Richiesto un oggetto Booleano" + IDS_JSCRIPT_EXPECTED "Richiesto un oggetto JScript" + IDS_REGEXP_SYNTAX_ERROR "Errore di sintassi nell'espressione regolare" + IDS_URI_INVALID_CHAR "L'URI da codificare contiene caratteri non validi" + IDS_INVALID_LENGTH "La lunghezza dell'array deve essere un intero finito e positivo" + IDS_ARRAY_EXPECTED "Richiesto un oggetto array" +}

1 0

Luca Bennati : iccvid: Add Italian translation.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: adc70a22ce1ce94857bd939864756894889ac1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc70a22ce1ce94857bd93986… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun May 30 10:47:18 2010 +0200 iccvid: Add Italian translation. --- dlls/iccvid/Makefile.in | 1 + dlls/iccvid/iccvid_It.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index e0d98ff..5381d11 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ iccvid_Es.rc \ iccvid_Fr.rc \ iccvid_Hu.rc \ + iccvid_It.rc \ iccvid_Ja.rc \ iccvid_Ko.rc \ iccvid_Lt.rc \ diff --git a/dlls/iccvid/iccvid_It.rc b/dlls/iccvid/iccvid_It.rc new file mode 100644 index 0000000..fae6387 --- /dev/null +++ b/dlls/iccvid/iccvid_It.rc @@ -0,0 +1,30 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * 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 "iccvid_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak Video codec" + IDS_DESCRIPTION "Cinepak Video codec" +}

1 0

Thomas Mullaly : urlmon/tests: Added more test data for the IUri tests.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: 2e5b76dbf7c7abb87d918f38edf8dd3786d18871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5b76dbf7c7abb87d918f38e… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri May 28 13:07:49 2010 -0400 urlmon/tests: Added more test data for the IUri tests. --- dlls/urlmon/tests/uri.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 58f39b9..a641f6a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -283,6 +283,106 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK,TRUE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "http://127.0.0.1/tests/../test dir/./test.txt", 0, S_OK, FALSE, + { + {"http://127.0.0.1/test%20dir/test.txt",S_OK,TRUE}, + {"127.0.0.1",S_OK,TRUE}, + {"http://127.0.0.1/test%20dir/test.txt",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {".txt",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"127.0.0.1",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"/test%20dir/test.txt",S_OK,TRUE}, + {"/test%20dir/test.txt",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://127.0.0.1/tests/../test dir/./test.txt",S_OK,TRUE}, + {"http",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_IPV4,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]", 0, S_OK, FALSE, + { + {"http://[fedc:ba98:7654:3210:fedc:ba98:7654:3210]/",S_OK,TRUE}, + {"[fedc:ba98:7654:3210:fedc:ba98:7654:3210]",S_OK,TRUE}, + {"http://[fedc:ba98:7654:3210:fedc:ba98:7654:3210]/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"fedc:ba98:7654:3210:fedc:ba98:7654:3210",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]",S_OK,TRUE}, + {"http",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_IPV6,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "ftp://[::13.1.68.3]", 0, S_OK, FALSE, + { + {"ftp://[::13.1.68.3]/",S_OK,TRUE}, + {"[::13.1.68.3]",S_OK,TRUE}, + {"ftp://[::13.1.68.3]/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"::13.1.68.3",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"ftp://[::13.1.68.3]",S_OK,TRUE}, + {"ftp",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE} + }, + { + {Uri_HOST_IPV6,S_OK,TRUE}, + {21,S_OK,TRUE}, + {URL_SCHEME_FTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "http://[FEDC:BA98:0:0:0:0:0:3210]", 0, S_OK, FALSE, + { + {"http://[fedc:ba98::3210]/",S_OK,TRUE}, + {"[fedc:ba98::3210]",S_OK,TRUE}, + {"http://[fedc:ba98::3210]/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"fedc:ba98::3210",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://[FEDC:BA98:0:0:0:0:0:3210]",S_OK,TRUE}, + {"http",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + }, + { + {Uri_HOST_IPV6,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,TRUE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } };

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_GetPropertyLength.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: f16fa49f4dd6bfc40e66b242cbe665962d613892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16fa49f4dd6bfc40e66b242c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri May 28 14:06:34 2010 -0400 urlmon/tests: Added tests for IUri_GetPropertyLength. --- dlls/urlmon/tests/uri.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 10 +++++- 2 files changed, 86 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a641f6a..9124c1c 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -1062,6 +1062,80 @@ static void test_IUri_GetDwordProperties(void) { } } +static void test_IUri_GetPropertyLength(void) { + IUri *uri = NULL; + HRESULT hr; + DWORD i; + + /* Make sure it handles invalid args correctly. */ + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + DWORD received = 0xdeadbeef; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_STRING_START, NULL, 0); + ok(hr == E_INVALIDARG, "Error: GetPropertyLength returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_DWORD_START, &received, 0); + ok(hr == E_INVALIDARG, "Error: GetPropertyLength return 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(received == 0xdeadbeef, "Error: Expected 0xdeadbeef but got 0x%08x.\n", received); + } + if(uri) IUri_Release(uri); + + for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + uri_properties test = uri_tests[i]; + LPWSTR uriW; + uri = NULL; + + uriW = a2w(test.uri); + hr = pCreateUri(uriW, test.create_flags, 0, &uri); + if(test.create_todo) { + todo_wine { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, test.create_expected, i); + } + } else { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x on uri_test[%d].\n", + hr, test.create_expected, i); + } + + if(SUCCEEDED(hr)) { + DWORD j; + + for(j = Uri_PROPERTY_STRING_START; j <= Uri_PROPERTY_STRING_LAST; ++j) { + DWORD expectedLen, receivedLen; + uri_str_property prop = test.str_props[j]; + + expectedLen = lstrlen(prop.value); + + /* This won't be neccessary once GetPropertyLength is implemented. */ + receivedLen = -1; + + hr = IUri_GetPropertyLength(uri, j, &receivedLen, 0); + if(prop.todo) { + todo_wine { + ok(hr == prop.expected, "Error: GetPropertyLength returned 0x%08x, expected 0x%08x on uri_tests[%d].str_props[%d].\n", + hr, prop.expected, i, j); + } + todo_wine { + ok(receivedLen == expectedLen, "Error: Expected a length of %d but got %d on uri_tests[%d].str_props[%d].\n", + expectedLen, receivedLen, i, j); + } + } else { + ok(hr == prop.expected, "Error: GetPropertyLength returned 0x%08x, expected 0x%08x on uri_tests[%d].str_props[%d].\n", + hr, prop.expected, i, j); + ok(receivedLen == expectedLen, "Error: Expected a length of %d but %d on uri_tests[%d].str_props[%d].\n", + expectedLen, receivedLen, i, j); + } + } + } + + if(uri) IUri_Release(uri); + + heap_free(uriW); + } +} + START_TEST(uri) { HMODULE hurlmon; @@ -1090,4 +1164,7 @@ START_TEST(uri) { trace("test IUri_GetDwordProperties...\n"); test_IUri_GetDwordProperties(); + + trace("test IUri_GetPropertyLength...\n"); + test_IUri_GetPropertyLength(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 27b0863..95ca907 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -91,6 +91,14 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D { Uri *This = URI_THIS(iface); FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + + if(!pcchProperty) + return E_INVALIDARG; + + /* Can only return a length for a property if it's a string. */ + if(uriProp > Uri_PROPERTY_STRING_LAST) + return E_INVALIDARG; + return E_NOTIMPL; } @@ -118,7 +126,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *pfHasProperty) { Uri *This = URI_THIS(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%d %p)\n", This, uriProp, pfHasProperty); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added test for invalid args to IUri_GetPropertyBSTR and IUri_GetPropertyDWORD .
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: a6f1ebfe4118d8502f1ae9f06c35fd55740d0aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6f1ebfe4118d8502f1ae9f06… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun May 30 11:06:10 2010 -0400 urlmon/tests: Added test for invalid args to IUri_GetPropertyBSTR and IUri_GetPropertyDWORD. --- dlls/urlmon/Makefile.in | 2 +- dlls/urlmon/tests/uri.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/urlmon/uri.c | 20 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 419745b..91277a5 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = urlmon.dll IMPORTLIB = urlmon -IMPORTS = uuid ole32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll +IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll EXTRADEFS = -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL \ -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}" diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9124c1c..3142a1b 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -442,13 +442,40 @@ static void test_CreateUri_InvalidArgs(void) { } static void test_IUri_GetPropertyBSTR(void) { + IUri *uri = NULL; + HRESULT hr; DWORD i; + /* Make sure GetPropertyBSTR handles invalid args correctly. */ + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + BSTR received = NULL; + + hr = IUri_GetPropertyBSTR(uri, Uri_PROPERTY_RAW_URI, NULL, 0); + ok(hr == E_POINTER, "Error: GetPropertyBSTR returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); + + /* Make sure it handles a invalid Uri_PROPERTY's correctly. */ + hr = IUri_GetPropertyBSTR(uri, Uri_PROPERTY_PORT, &received, 0); + ok(hr == S_OK, "Error: GetPropertyBSTR returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + ok(received != NULL, "Error: Expected the string not to be NULL.\n"); + ok(!SysStringLen(received), "Error: Expected the string to be of len=0 but it was %d instead.\n", SysStringLen(received)); + SysFreeString(received); + + /* Make sure it handles the ZONE property correctly. */ + received = NULL; + hr = IUri_GetPropertyBSTR(uri, Uri_PROPERTY_ZONE, &received, 0); + ok(hr == S_FALSE, "Error: GetPropertyBSTR returned 0x%08x, expected 0x%08x.\n", hr, S_FALSE); + ok(received != NULL, "Error: Expected the string not to be NULL.\n"); + ok(!SysStringLen(received), "Error: Expected the string to be of len=0 but it was %d instead.\n", SysStringLen(received)); + SysFreeString(received); + } + if(uri) IUri_Release(uri); + for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { uri_properties test = uri_tests[i]; - HRESULT hr; - IUri *uri = NULL; LPWSTR uriW; + uri = NULL; uriW = a2w(test.uri); hr = pCreateUri(uriW, test.create_flags, 0, &uri); @@ -505,8 +532,14 @@ static void test_IUri_GetPropertyDWORD(void) { hr = pCreateUri(http_urlW, 0, 0, &uri); ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { + DWORD received = 0xdeadbeef; + hr = IUri_GetPropertyDWORD(uri, Uri_PROPERTY_DWORD_START, NULL, 0); ok(hr == E_INVALIDARG, "Error: GetPropertyDWORD returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + + hr = IUri_GetPropertyDWORD(uri, Uri_PROPERTY_ABSOLUTE_URI, &received, 0); + ok(hr == E_INVALIDARG, "Error: GetPropertyDWORD returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(received == 0, "Error: Expected received=%d but instead received=%d.\n", 0, received); } if(uri) IUri_Release(uri); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 95ca907..a87bd7e 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -84,6 +84,21 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST { Uri *This = URI_THIS(iface); FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + + if(!pbstrProperty) + return E_POINTER; + + if(uriProp > Uri_PROPERTY_STRING_LAST) { + /* Windows allocates an empty BSTR for invalid Uri_PROPERTY's. */ + *pbstrProperty = SysAllocStringLen(NULL, 0); + + /* It only returns S_FALSE for the ZONE property... */ + if(uriProp == Uri_PROPERTY_ZONE) + return S_FALSE; + else + return S_OK; + } + return E_NOTIMPL; } @@ -120,6 +135,11 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW return E_NOTIMPL; } + if(uriProp < Uri_PROPERTY_DWORD_START) { + *pcchProperty = 0; + return E_INVALIDARG; + } + return E_NOTIMPL; }

1 0

Alexandre Julliard : mlang/tests: Fix some nasty #ifdef syntax.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: 71678645ad31a0130eaf92a761967fbcfb949eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71678645ad31a0130eaf92a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 30 20:26:56 2010 +0200 mlang/tests: Fix some nasty #ifdef syntax. --- dlls/mlang/tests/mlang.c | 37 ++++++++----------------------------- 1 files changed, 8 insertions(+), 29 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 7ab3ff9..2c4e0c1 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -36,14 +36,8 @@ #define CP_UNICODE 1200 #endif -#if 0 -#define DUMP_CP_INFO -#define DUMP_SCRIPT_INFO - -#if defined DUMP_CP_INFO || defined DUMP_SCRIPT_INFO -#include "wine/debug.h" -#endif -#endif /* 0 */ +/* #define DUMP_CP_INFO */ +/* #define DUMP_SCRIPT_INFO */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); static HRESULT (WINAPI *pConvertINetMultiByteToUnicode)(LPDWORD, DWORD, LPCSTR, @@ -630,13 +624,8 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) #ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszWebCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); #endif - ok(!lstrcmpiW(cpinfo[i].wszWebCharset, mcsi.wszCharset), -#ifdef DUMP_CP_INFO - "%s != %s\n", - wine_dbgstr_w(cpinfo[i].wszWebCharset), wine_dbgstr_w(mcsi.wszCharset)); -#else - "wszWebCharset mismatch\n"); -#endif + ok(!lstrcmpiW(cpinfo[i].wszWebCharset, mcsi.wszCharset), "%s != %s\n", + wine_dbgstr_w(cpinfo[i].wszWebCharset), wine_dbgstr_w(mcsi.wszCharset)); if (0) { @@ -661,13 +650,8 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) #ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszHeaderCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); #endif - ok(!lstrcmpiW(cpinfo[i].wszHeaderCharset, mcsi.wszCharset), -#ifdef DUMP_CP_INFO - "%s != %s\n", - wine_dbgstr_w(cpinfo[i].wszHeaderCharset), wine_dbgstr_w(mcsi.wszCharset)); -#else - "wszHeaderCharset mismatch\n"); -#endif + ok(!lstrcmpiW(cpinfo[i].wszHeaderCharset, mcsi.wszCharset), "%s != %s\n", + wine_dbgstr_w(cpinfo[i].wszHeaderCharset), wine_dbgstr_w(mcsi.wszCharset)); if (0) { @@ -692,13 +676,8 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) #ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszBodyCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); #endif - ok(!lstrcmpiW(cpinfo[i].wszBodyCharset, mcsi.wszCharset), -#ifdef DUMP_CP_INFO - "%s != %s\n", - wine_dbgstr_w(cpinfo[i].wszBodyCharset), wine_dbgstr_w(mcsi.wszCharset)); -#else - "wszBodyCharset mismatch\n"); -#endif + ok(!lstrcmpiW(cpinfo[i].wszBodyCharset, mcsi.wszCharset), "%s != %s\n", + wine_dbgstr_w(cpinfo[i].wszBodyCharset), wine_dbgstr_w(mcsi.wszCharset)); if (0) {

1 0

Luca Bennati : sane.ds: Add Italian translation.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: e15caca5c421868b6f9605ab42899d8bd1cae3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15caca5c421868b6f9605ab4… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun May 30 10:33:24 2010 +0200 sane.ds: Add Italian translation. --- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/sane_It.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 1c065d9..bf2070c 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ sane_Es.rc \ sane_Fi.rc \ sane_Fr.rc \ + sane_It.rc \ sane_Ja.rc \ sane_Ko.rc \ sane_Lt.rc \ diff --git a/dlls/sane.ds/sane_It.rc b/dlls/sane.ds/sane_It.rc new file mode 100644 index 0000000..307414a --- /dev/null +++ b/dlls/sane.ds/sane_It.rc @@ -0,0 +1,46 @@ +/* + * Italian resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2010 Luca Bennati + * + * 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" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Scansione" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "SCANSIONE... Aspetta un momento",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0

Frédéric Delanoy : comctl32: Fix French translation.
by Alexandre Julliard 31 May '10

31 May '10

Module: wine Branch: master Commit: 1bb4513a06b91271ef1919d5b3eb048d46a02ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb4513a06b91271ef1919d5b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat May 29 17:19:18 2010 +0200 comctl32: Fix French translation. --- dlls/comctl32/comctl_Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_Fr.rc b/dlls/comctl32/comctl_Fr.rc index 2fd2f89..6c766cf 100644 --- a/dlls/comctl32/comctl_Fr.rc +++ b/dlls/comctl32/comctl_Fr.rc @@ -81,7 +81,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - IDM_TODAY "Aujourd'hui:" + IDM_TODAY "Aujourd'hui :" IDM_GOTODAY "Aller à aujourd'hui" }

1 0