October 2008 - Wine-Commits

Alexander Nicolaysen Sørnes : queued items: fix editing applications' vendors & versions
by Chris Morgan Oct. 1, 2008

Oct. 1, 2008

Module: appdb Branch: master Commit: 6eccc11979f8bc5201db7bc081f7c98a2e4405ef URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6eccc11979f8bc5201db7bc0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 2 00:30:34 2008 +0200 queued items: fix editing applications' vendors & versions --- include/application.php | 14 +++++++++++--- include/application_queue.php | 6 ++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/include/application.php b/include/application.php index da2bab3..dd39597 100644 --- a/include/application.php +++ b/include/application.php @@ -580,9 +580,17 @@ class Application { "using the form below."; } else { - $sVendorHelp .= "The user added a new one; review ". - "it in the vendor form below or ". - "replace it with an existing one."; + if($this->iSubmitterId != $_SESSION['current']->iUserId) + { + $sVendorHelp .= "The user added a new one; review ". + "it in the vendor form below or ". + "replace it with an existing one."; + } else + { + $sVendorHelp .= 'You added a new one; it can be edited '. + 'using the form below, or replaced with '. + 'one from this list.'; + } } } // vendor name diff --git a/include/application_queue.php b/include/application_queue.php index 14e1767..c2b31e2 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -23,11 +23,13 @@ class application_queue { /* Normal users do not get a aVersionsIds property, so we have to fetch the versionId manually. Normal users only have access to rejected - applications */ + applications, unless they submitted them */ if($_SESSION['current']->hasPriv("admin")) { $iVersionId = $this->oApp->aVersionsIds[0]; - } else if($this->oApp->objectGetState() == 'rejected') + } else if($this->oApp->objectGetState() == 'rejected' || + ($this->oApp->objectGetState() == 'queued' && + $this->oApp->objectGetSubmitterId() == $_SESSION['current']->iUserId)) { $sQuery = "SELECT versionId FROM appVersion WHERE appId = '?' LIMIT 1"; $hResult = query_parameters($sQuery, $this->oApp->iAppId);

1 0

Alexander Nicolaysen Sørnes : Fix edit link on queued items page
by Chris Morgan Oct. 1, 2008

Oct. 1, 2008

Module: appdb Branch: master Commit: 4a9c24d596fa90c7add0ede5047a0a8187de2baa URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4a9c24d596fa90c7add0ede5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 2 00:26:43 2008 +0200 Fix edit link on queued items page --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 57fcb57..da2bab3 100644 --- a/include/application.php +++ b/include/application.php @@ -911,7 +911,7 @@ class Application { if($bQueued) { - $oM = new objectManager('application'); + $oM = new objectManager('application_queue'); $oM->setReturnTo(array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : ""); $shDeleteLink = '<a href="'.$oM->makeUrl("delete", $oApp->iAppId, "Delete entry").'">delete</a>'; $shEditLink = '<a href="'.$oM->makeUrl("edit", $oApp->iAppId, "Edit entry").'">edit</a>';

1 0

Aric Stewart : mlang/tests: Skip testing a codepage returning the buggy, legacy unicodeFEFF charset (only appears to exist on windows 2008).
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 4e8dcf89e9b3019d464b1816e5d65df66f63e225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8dcf89e9b3019d464b1816e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Sep 28 14:48:29 2008 -0500 mlang/tests: Skip testing a codepage returning the buggy, legacy unicodeFEFF charset (only appears to exist on windows 2008). --- dlls/mlang/tests/mlang.c | 164 +++++++++++++++++++++++++--------------------- 1 files changed, 90 insertions(+), 74 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index ab1e4dd..96aef1c 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -330,6 +330,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) BOOL convertible; HRESULT check = S_OK; static const WCHAR autoW[] = {'_','a','u','t','o',0}; + static const WCHAR feffW[] = {'u','n','i','c','o','d','e','F','E','F','F',0}; #ifdef DUMP_CP_INFO trace("MIMECPINFO #%u:\n" @@ -390,83 +391,98 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) else trace("IsValidCodePage failed for cp %u\n", cpinfo[i].uiCodePage); - ret = IMultiLanguage2_GetCharsetInfo(iML2, cpinfo[i].wszWebCharset, &mcsi); - /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ - if (memcmp(cpinfo[i].wszWebCharset, autoW, 5 * sizeof(WCHAR))) - { - ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); -#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 - - if (0) - { - /* native mlang returns completely messed up encodings in some cases */ - ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, - "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); - ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, - "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); + if (memcmp(cpinfo[i].wszWebCharset,feffW,sizeof(WCHAR)*11)==0) + skip("Legacy windows bug returning invalid charset of unicodeFEFF\n"); + else + { + ret = IMultiLanguage2_GetCharsetInfo(iML2, cpinfo[i].wszWebCharset, &mcsi); + /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ + if (memcmp(cpinfo[i].wszWebCharset, autoW, 5 * sizeof(WCHAR))) + { + ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); + #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 + + if (0) + { + /* native mlang returns completely messed up encodings in some cases */ + ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, + "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); + ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, + "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); + } } - } - - ret = IMultiLanguage2_GetCharsetInfo(iML2, cpinfo[i].wszHeaderCharset, &mcsi); - /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ - if (memcmp(cpinfo[i].wszHeaderCharset, autoW, 5 * sizeof(WCHAR))) - { - ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); -#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 - - if (0) - { - /* native mlang returns completely messed up encodings in some cases */ - ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, - "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); - ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, - "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); - } - } + } - ret = IMultiLanguage2_GetCharsetInfo(iML2, cpinfo[i].wszBodyCharset, &mcsi); - /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ - if (memcmp(cpinfo[i].wszBodyCharset, autoW, 5 * sizeof(WCHAR))) - { - ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); -#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 + if (memcmp(cpinfo[i].wszHeaderCharset,feffW,sizeof(WCHAR)*11)==0) + skip("Legacy windows bug returning invalid charset of unicodeFEFF\n"); + else + { + ret = IMultiLanguage2_GetCharsetInfo(iML2, cpinfo[i].wszHeaderCharset, &mcsi); + /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ + if (memcmp(cpinfo[i].wszHeaderCharset, autoW, 5 * sizeof(WCHAR))) + { + ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); + #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 + + if (0) + { + /* native mlang returns completely messed up encodings in some cases */ + ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, + "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); + ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, + "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); + } + } + } - if (0) - { - /* native mlang returns completely messed up encodings in some cases */ - ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, - "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); - ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, - "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); - } - } + if (memcmp(cpinfo[i].wszBodyCharset,feffW,sizeof(WCHAR)*11)==0) + skip("Legacy windows bug returning invalid charset of unicodeFEFF\n"); + else + { + ret = IMultiLanguage2_GetCharsetInfo(iML2, cpinfo[i].wszBodyCharset, &mcsi); + /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ + if (memcmp(cpinfo[i].wszBodyCharset, autoW, 5 * sizeof(WCHAR))) + { + ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); + #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 + + if (0) + { + /* native mlang returns completely messed up encodings in some cases */ + ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, + "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); + ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, + "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); + } + } + } } /* now IEnumCodePage_Next should fail, since pointer is at the end */

1 0

Aric Stewart : mlang/tests: windows 2008' s version of mlang E_FAILs when you pass in a rgelt in IEnumCodePage::Next.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 99c23ccf353fc517bbe1ef266df173dfe5a6d206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c23ccf353fc517bbe1ef266… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Sep 28 14:48:40 2008 -0500 mlang/tests: windows 2008's version of mlang E_FAILs when you pass in a rgelt in IEnumCodePage::Next. --- dlls/mlang/tests/mlang.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 96aef1c..f5e7c01 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -298,9 +298,15 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08x\n", ret); n = 65536; ret = IEnumCodePage_Next(iEnumCP, 0, NULL, &n); - ok(n == 0 && ret == S_FALSE, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); + if (ret == S_FALSE) + ok(n == 0 && ret == S_FALSE, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); + else if (ret == E_FAIL) + ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); ret = IEnumCodePage_Next(iEnumCP, 0, NULL, NULL); - ok(ret == S_FALSE, "IEnumCodePage_Next: expected S_FALSE, got %08x\n", ret); + if (ret == S_FALSE) + ok(ret == S_FALSE, "IEnumCodePage_Next: expected S_FALSE, got %08x\n", ret); + else if (ret == E_FAIL) + ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); cpinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*cpinfo) * total * 2);

1 0

Aric Stewart : mlang/tests: IMultiLanguage2_GetRfc1766FromLcid can return S_FALSE on partial name matching so deal with this properly .
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: b91783c341fb49a02f7d90079d8a38d92f730cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91783c341fb49a02f7d90079… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Sep 27 16:10:51 2008 -0500 mlang/tests: IMultiLanguage2_GetRfc1766FromLcid can return S_FALSE on partial name matching so deal with this properly. --- dlls/mlang/tests/mlang.c | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index ed63cc6..695dcb7 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -734,10 +734,28 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_them); - ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); + ok((ret == E_FAIL || ret == S_FALSE), "GetLcidFromRfc1766 returned: %08x\n", ret); + if (ret == S_FALSE) + { + BSTR rfcstr; + static WCHAR en[] = {'e','n',0}; + + ret = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); + ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok_w2("Expected \"%s\", got \"%s\"n", en, rfcstr); + } ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, english); - ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); + ok((ret == E_FAIL || ret == S_FALSE), "GetLcidFromRfc1766 returned: %08x\n", ret); + if (ret == S_FALSE) + { + BSTR rfcstr; + static WCHAR en[] = {'e','n',0}; + + ret = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); + ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok_w2("Expected \"%s\", got \"%s\"n", en, rfcstr); + } lcid = 0; @@ -763,12 +781,19 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) static WCHAR kok[] = {'k','o','k',0}; hr = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, kok); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - - hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"n", kok, rfcstr); + /* + * S_FALSE happens when 'kok' instead matches to a different Rfc1766 name + * for example 'ko' so it is not a failure but does not give us what + * we are looking for + */ + if (hr != S_FALSE) + { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok_w2("Expected \"%s\", got \"%s\"n", kok, rfcstr); + } SysFreeString(rfcstr); }

1 0

Aric Stewart : mlang/tests: GetLastError may not be set if Japanese conversions fail with S_FAIL so do not require that to skip the Japanese tests .
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: c209245f17fd2eab706508f9c640bda1ee9bed9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c209245f17fd2eab706508f9c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Sep 28 10:52:20 2008 -0500 mlang/tests: GetLastError may not be set if Japanese conversions fail with S_FAIL so do not require that to skip the Japanese tests. --- dlls/mlang/tests/mlang.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index f8a2ced..ab1e4dd 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1197,9 +1197,8 @@ static void test_JapaneseConversion(void) destsz = 30; outlen = jis_jp[i][0]; srcsz = unc_jp[i][0]; - SetLastError(0xdeadbeef); hr = pConvertINetUnicodeToMultiByte(NULL, 50220, &unc_jp[i][1], &srcsz, output, &destsz); - if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME) + if (hr == S_FALSE) { skip("Code page identifier 50220 is not supported\n"); break; @@ -1236,9 +1235,8 @@ static void test_JapaneseConversion(void) outlen = sjis_jp[i][0]; srcsz = unc_jp[i][0]; - SetLastError(0xdeadbeef); hr = pConvertINetUnicodeToMultiByte(NULL, 932, &unc_jp[i][1], &srcsz, output, &destsz); - if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME) + if (hr == S_FALSE) { skip("Code page identifier 932 is not supported\n"); break; @@ -1265,9 +1263,8 @@ static void test_JapaneseConversion(void) outlen = euc_jp[i][0]; srcsz = unc_jp[i][0]; - SetLastError(0xdeadbeef); hr = pConvertINetUnicodeToMultiByte(NULL, 51932, &unc_jp[i][1], &srcsz, output, &destsz); - if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME) + if (hr == S_FALSE) { skip("Code page identifier 51932 is not supported\n"); break; @@ -1291,9 +1288,8 @@ static void test_JapaneseConversion(void) i = 0; destsz = 30; srcsz = jis_jp[i][0]; - SetLastError(0xdeadbeef); hr = pConvertINetMultiByteToUnicode(NULL, 50932, &jis_jp[i][1], &srcsz, outputW, &destsz); - if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME) + if (hr == S_FALSE) { skip("Code page identifier 50932 is not supported\n"); return;

1 0

Aric Stewart : mlang/tests: Some versions of native mlang return E_FAIL when source string is NULL and a source length is supplied .
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 86de5c254652579cc218bc86746d2502b2c2392c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86de5c254652579cc218bc867… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Sep 28 09:03:03 2008 -0500 mlang/tests: Some versions of native mlang return E_FAIL when source string is NULL and a source length is supplied. --- dlls/mlang/tests/mlang.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 695dcb7..f8a2ced 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -814,9 +814,18 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, NULL, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(srcsz == lstrlenW(src) + 1, - "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); + ok(hr == S_OK || hr == E_FAIL,"expected S_OK or E_FAIL, got %08x\n",hr); + if (hr == S_OK) + { + ok(srcsz == lstrlenW(src) + 1, + "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); + } + else if (hr == E_FAIL) + { + ok(srcsz == 0, + "Expected %u, got %u\n", 0, srcsz); + } + ok(!memcmp(dest, invariate, sizeof(dest)), "Expected dest to be unchanged, got %s\n", dest); ok(destsz == 0, "Expected 0, got %u\n", destsz); @@ -839,7 +848,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, NULL, NULL, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08x\n", hr); ok(!memcmp(dest, invariate, sizeof(dest)), "Expected dest to be unchanged, got %s\n", dest); ok(destsz == 0, "Expected 0, got %u\n", destsz); @@ -977,9 +986,13 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = lstrlenW(src) + 1; destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, NULL, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(srcsz == lstrlenW(src) + 1, - "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); + ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08x\n", hr); + if (hr == S_OK) + ok(srcsz == lstrlenW(src) + 1, + "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); + else if (hr == E_FAIL) + ok(srcsz == 0, + "Expected %u, got %u\n", 0, srcsz); ok(!memcmp(dest, invariate, sizeof(dest)), "Expected dest to be unchanged, got %s\n", dest); ok(destsz == 0, "Expected 0, got %u\n", destsz); @@ -1000,7 +1013,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) memset(dest, 'x', sizeof(dest)); destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, NULL, NULL, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08x\n", hr); ok(!memcmp(dest, invariate, sizeof(dest)), "Expected dest to be unchanged, got %s\n", dest); ok(destsz == 0, "Expected 0, got %u\n", destsz);

1 0

Aric Stewart : imm32: ImmConfigureIME should return 0 when the type is IME_CONFIG_REGISTERWORD and the data is NULL .
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: d63eccc602cb30b61e107c95c461e923d6e2faa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63eccc602cb30b61e107c95c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Sep 27 13:30:43 2008 -0500 imm32: ImmConfigureIME should return 0 when the type is IME_CONFIG_REGISTERWORD and the data is NULL. --- dlls/imm32/imm.c | 6 ++++++ dlls/imm32/tests/imm32.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index abcff55..2c9489a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -513,6 +513,9 @@ BOOL WINAPI ImmConfigureIMEA( TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); + if (dwMode == IME_CONFIG_REGISTERWORD && !lpData) + return FALSE; + if (immHkl->hIME && immHkl->pImeConfigure) { if (dwMode != IME_CONFIG_REGISTERWORD || !is_kbd_ime_unicode(immHkl)) @@ -545,6 +548,9 @@ BOOL WINAPI ImmConfigureIMEW( TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); + if (dwMode == IME_CONFIG_REGISTERWORD && !lpData) + return FALSE; + if (immHkl->hIME && immHkl->pImeConfigure) { if (dwMode != IME_CONFIG_REGISTERWORD || is_kbd_ime_unicode(immHkl)) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7208092..29ac553 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -254,11 +254,29 @@ static int test_ImmGetCompositionString(void) return 0; } +static int test_ImmIME(void) +{ + HIMC imc; + + imc = ImmGetContext(hwnd); + if (imc) + { + BOOL rc; + rc = ImmConfigureIMEA(imc, NULL, IME_CONFIG_REGISTERWORD, NULL); + ok (rc == 0, "ImmConfigureIMEA did not fail\n"); + rc = ImmConfigureIMEW(imc, NULL, IME_CONFIG_REGISTERWORD, NULL); + ok (rc == 0, "ImmConfigureIMEW did not fail\n"); + } + ImmReleaseContext(hwnd,imc); + return 0; +} + START_TEST(imm32) { if (init()) { test_ImmNotifyIME(); test_ImmGetCompositionString(); + test_ImmIME(); } cleanup(); }

1 0

Rob Shearman : include: Generate error codes with correct type in urlmon. idl.
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 55a28dd364a3570e0e0dcee8ea89da83856efec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a28dd364a3570e0e0dcee8e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:19:58 2008 +0100 include: Generate error codes with correct type in urlmon.idl. Use the _HRESULT_TYPEDEF_ macro to ensure that the error codes get the correct type. --- include/urlmon.idl | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 83bc58b..5ac78f2 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1381,32 +1381,32 @@ cpp_quote("#define URLMON_OPTION_USERAGENT 0x10000001") cpp_quote("#define URLMON_OPTION_USERAGENT_REFRESH 0x10000002") cpp_quote("#define URLMON_OPTION_URL_ENCODING 0x10000004") -cpp_quote("#define MK_S_ASYNCHRONOUS 0x000401E8") +cpp_quote("#define MK_S_ASYNCHRONOUS _HRESULT_TYPEDEF_(0x000401E8)") cpp_quote("#ifndef S_ASYNCHRONOUS") cpp_quote("#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS") cpp_quote("#endif") -cpp_quote("#define INET_E_ERROR_FIRST 0x800C0002") -cpp_quote("#define INET_E_INVALID_URL 0x800C0002") -cpp_quote("#define INET_E_NO_SESSION 0x800C0003") -cpp_quote("#define INET_E_CANNOT_CONNECT 0x800C0004") -cpp_quote("#define INET_E_RESOURCE_NOT_FOUND 0x800C0005") -cpp_quote("#define INET_E_OBJECT_NOT_FOUND 0x800C0006") -cpp_quote("#define INET_E_DATA_NOT_AVAILABLE 0x800C0007") -cpp_quote("#define INET_E_DOWNLOAD_FAILURE 0x800C0008") -cpp_quote("#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009") -cpp_quote("#define INET_E_NO_VALID_MEDIA 0x800C000A") -cpp_quote("#define INET_E_CONNECTION_TIMEOUT 0x800C000B") -cpp_quote("#define INET_E_INVALID_REQUEST 0x800C000C") -cpp_quote("#define INET_E_UNKNOWN_PROTOCOL 0x800C000D") -cpp_quote("#define INET_E_SECURITY_PROBLEM 0x800C000E") -cpp_quote("#define INET_E_CANNOT_LOAD_DATA 0x800C000F") -cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010") -cpp_quote("#define INET_E_USE_DEFAULT_PROTOCOLHANDLER 0x800C0011") -cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013") -cpp_quote("#define INET_E_REDIRECT_FAILED 0x800C0014") -cpp_quote("#define INET_E_REDIRECT_TO_DIR 0x800C0015") -cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016") +cpp_quote("#define INET_E_ERROR_FIRST _HRESULT_TYPEDEF_(0x800C0002)") +cpp_quote("#define INET_E_INVALID_URL _HRESULT_TYPEDEF_(0x800C0002)") +cpp_quote("#define INET_E_NO_SESSION _HRESULT_TYPEDEF_(0x800C0003)") +cpp_quote("#define INET_E_CANNOT_CONNECT _HRESULT_TYPEDEF_(0x800C0004)") +cpp_quote("#define INET_E_RESOURCE_NOT_FOUND _HRESULT_TYPEDEF_(0x800C0005)") +cpp_quote("#define INET_E_OBJECT_NOT_FOUND _HRESULT_TYPEDEF_(0x800C0006)") +cpp_quote("#define INET_E_DATA_NOT_AVAILABLE _HRESULT_TYPEDEF_(0x800C0007)") +cpp_quote("#define INET_E_DOWNLOAD_FAILURE _HRESULT_TYPEDEF_(0x800C0008)") +cpp_quote("#define INET_E_AUTHENTICATION_REQUIRED _HRESULT_TYPEDEF_(0x800C0009)") +cpp_quote("#define INET_E_NO_VALID_MEDIA _HRESULT_TYPEDEF_(0x800C000A)") +cpp_quote("#define INET_E_CONNECTION_TIMEOUT _HRESULT_TYPEDEF_(0x800C000B)") +cpp_quote("#define INET_E_INVALID_REQUEST _HRESULT_TYPEDEF_(0x800C000C)") +cpp_quote("#define INET_E_UNKNOWN_PROTOCOL _HRESULT_TYPEDEF_(0x800C000D)") +cpp_quote("#define INET_E_SECURITY_PROBLEM _HRESULT_TYPEDEF_(0x800C000E)") +cpp_quote("#define INET_E_CANNOT_LOAD_DATA _HRESULT_TYPEDEF_(0x800C000F)") +cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT _HRESULT_TYPEDEF_(0x800C0010)") +cpp_quote("#define INET_E_USE_DEFAULT_PROTOCOLHANDLER _HRESULT_TYPEDEF_(0x800C0011)") +cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN _HRESULT_TYPEDEF_(0x800C0013)") +cpp_quote("#define INET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x800C0014)") +cpp_quote("#define INET_E_REDIRECT_TO_DIR _HRESULT_TYPEDEF_(0x800C0015)") +cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST _HRESULT_TYPEDEF_(0x800C0016)") cpp_quote("#define INET_E_ERROR_LAST INET_E_REDIRECT_TO_DIR") cpp_quote("#define INET_E_DEFAULT_ACTION INET_E_USE_DEFAULT_PROTOCOLHANDLER")

1 0

Rob Shearman : wininet: Make WININET_AllocHandle 64-bit safe by using the correct type in the sizeof expression .
by Alexandre Julliard Oct. 1, 2008

Oct. 1, 2008

Module: wine Branch: master Commit: 573abdca4a41d33a9e9e55c7e101905b5e811cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=573abdca4a41d33a9e9e55c7e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Oct 1 11:20:03 2008 +0100 wininet: Make WININET_AllocHandle 64-bit safe by using the correct type in the sizeof expression. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d06298f..6166ff8 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -113,7 +113,7 @@ HINTERNET WININET_AllocHandle( LPWININETHANDLEHEADER info ) { num = HANDLE_CHUNK_SIZE; p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof (UINT)* num); + sizeof (*WININET_Handles)* num); if( !p ) goto end; WININET_Handles = p; @@ -123,7 +123,7 @@ HINTERNET WININET_AllocHandle( LPWININETHANDLEHEADER info ) { num = WININET_dwMaxHandles + HANDLE_CHUNK_SIZE; p = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - WININET_Handles, sizeof (UINT)* num); + WININET_Handles, sizeof (*WININET_Handles)* num); if( !p ) goto end; WININET_Handles = p;

1 0