wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 7600cf3ad7d6151bf3719f34acf4a756fad94085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7600cf3ad7d6151bf3719f34a… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Jun 14 15:04:53 2016 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 5c8be83..3dada7d 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-08 20:00+0200\n" +"PO-Revision-Date: 2016-06-10 19:00+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -5701,7 +5701,7 @@ msgstr "Krokprosedyren er ikke installert.\n" #: winerror.mc:2556 msgid "Invalid list box message.\n" -msgstr "Ugyldig melding for listeelement\n" +msgstr "Ugyldig melding for listeelement.\n" #: winerror.mc:2561 msgid "Invalid LB_SETCOUNT sent.\n" @@ -11157,7 +11157,7 @@ msgstr "versjon 1.0" #: oleview.rc:103 msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib-filer (*.tlb; *.olb; *.dll ;*.ocx; *.exe)" +msgstr "TypeLib-filer (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:106 msgid "Bind to file via a File Moniker" @@ -11544,6 +11544,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Bruk:\n" +" REG [operasjon] [parametere]\n" +"\n" +"Støttede operasjoner:\n" +" ADD | DELETE | QUERY\n" +"\n" +"For hjelp med spesifikke operasjoner, skriv:\n" +" REG [operasjon] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11648,24 +11657,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Søk fullført. Antall treff: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: Ugyldig nøkkelnavn\n" +msgstr "reg: Ugyldig syntaks. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "uninstaller: [%1] er et ugyldig valg.\n" +msgstr "reg: [%1] er et ugyldig valg. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Skriv \"REG /?\" for hjelp.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Skriv \"REG %1 /?\" for hjelp.\n" #: regedit.rc:34 msgid "&Registry" @@ -12988,7 +12993,7 @@ msgstr "" #: uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "uninstaller: [%1] er et ugyldig valg.\n" +msgstr "uninstaller: [%1] er et ugyldig valg\n" #: uninstaller.rc:35 msgid "" @@ -13857,7 +13862,7 @@ msgid "" msgstr "" " --backend={user|curses} 'user' lager et nytt vindu, mens 'curses'\n" " prøver å bruke gjeldende terminal som Wine-" -"konsoll\n" +"konsoll.\n" #: wineconsole.rc:53 msgid " <command> The Wine program to launch in the console.\n" @@ -13938,7 +13943,7 @@ msgstr "Klarte ikke lagre" #: winedbg.rc:44 msgid "Loading detailed information, please wait..." -msgstr "Laster detaljert informasjon. Vent litt ..." +msgstr "Laster detaljert informasjon, vent litt ..." #: winefile.rc:29 msgid "&Open\tEnter"

1 0

Jacek Caban : mshtml.idl: Added IDocumentSelector declaration.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 957c020fdc2c4aff987b92bfeb56bc43195c14ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=957c020fdc2c4aff987b92bfe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 14 19:04:47 2016 +0200 mshtml.idl: Added IDocumentSelector declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 4 ++++ include/mshtml.idl | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 341da28..d17af33 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -3330,4 +3330,8 @@ #define DISPID_IDOMPROCESSINGINSTRUCTION_TARGET DISPID_PROCESSINGINSTRUCTION #define DISPID_IDOMPROCESSINGINSTRUCTION_DATA DISPID_PROCESSINGINSTRUCTION+1 +/* IDocumentSelector */ +#define DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR DISPID_OMDOCUMENT+105 +#define DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL DISPID_OMDOCUMENT+106 + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index 8284b25..c73a0f5 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -14947,6 +14947,28 @@ interface IHTMLDocument7 : IDispatch } /***************************************************************************** + * IDocumentSelector interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510462-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocumentSelector : IDispatch +{ + [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR)] + HRESULT querySelector( + [in] BSTR v, + [out, retval] IHTMLElement **pel); + + [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL)] + HRESULT querySelectorAll( + [in] BSTR v, + [out, retval] IHTMLDOMChildrenCollection **pel); +} + +/***************************************************************************** * DispHTMLDocument dispinterface */ [ @@ -15547,6 +15569,12 @@ methods: void updateSettings(); WINE_HTMLDOMNODE_DISPINTERFACE_DECL; + + [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR)] + IHTMLElement *querySelector([in] BSTR v); + + [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL)] + IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v); } /*****************************************************************************

1 0

Jacek Caban : secur32/tests: Don't load crypt32.dll function dynamically.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 76507e0ed2593b405a521e7f30869e5f852781e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76507e0ed2593b405a521e7f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 14 18:29:24 2016 +0200 secur32/tests: Don't load crypt32.dll function dynamically. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/Makefile.in | 2 +- dlls/secur32/tests/schannel.c | 61 ++++++++++++++---------------------------- 2 files changed, 21 insertions(+), 42 deletions(-) diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in index f7afa7b..d06cee9 100644 --- a/dlls/secur32/tests/Makefile.in +++ b/dlls/secur32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = secur32.dll -IMPORTS = advapi32 ws2_32 +IMPORTS = crypt32 advapi32 ws2_32 C_SRCS = \ main.c \ diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 4dc8717..4abe35e 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -29,7 +29,7 @@ #include "wine/test.h" -static HMODULE secdll, crypt32dll; +static HMODULE secdll; static ACQUIRE_CREDENTIALS_HANDLE_FN_A pAcquireCredentialsHandleA; static ENUMERATE_SECURITY_PACKAGES_FN_A pEnumerateSecurityPackagesA; @@ -42,11 +42,6 @@ static DELETE_SECURITY_CONTEXT_FN pDeleteSecurityContext; static DECRYPT_MESSAGE_FN pDecryptMessage; static ENCRYPT_MESSAGE_FN pEncryptMessage; -static PCCERT_CONTEXT (WINAPI *pCertCreateCertificateContext)(DWORD,const BYTE*,DWORD); -static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT); -static BOOL (WINAPI *pCertSetCertificateContextProperty)(PCCERT_CONTEXT,DWORD,DWORD,const void*); -static PCCERT_CONTEXT (WINAPI *pCertEnumCertificatesInStore)(HCERTSTORE,PCCERT_CONTEXT); - static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x22, @@ -114,7 +109,6 @@ static CHAR unisp_name_a[] = UNISP_NAME_A; static void InitFunctionPtrs(void) { - crypt32dll = LoadLibraryA("crypt32.dll"); secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll"); @@ -135,11 +129,6 @@ static void InitFunctionPtrs(void) GET_PROC(secdll, EncryptMessage); } - GET_PROC(crypt32dll, CertFreeCertificateContext); - GET_PROC(crypt32dll, CertSetCertificateContextProperty); - GET_PROC(crypt32dll, CertCreateCertificateContext); - GET_PROC(crypt32dll, CertEnumCertificatesInStore); - #undef GET_PROC } @@ -323,7 +312,7 @@ static void testAcquireSecurityContext(void) HCRYPTKEY key; CRYPT_KEY_PROV_INFO keyProvInfo; - if (!pAcquireCredentialsHandleA || !pCertCreateCertificateContext || + if (!pAcquireCredentialsHandleA || !pEnumerateSecurityPackagesA || !pFreeContextBuffer || !pFreeCredentialsHandle) { @@ -359,10 +348,8 @@ static void testAcquireSecurityContext(void) keyProvInfo.rgProvParam = NULL; keyProvInfo.dwKeySpec = AT_SIGNATURE; - certs[0] = pCertCreateCertificateContext(X509_ASN_ENCODING, bigCert, - sizeof(bigCert)); - certs[1] = pCertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, - sizeof(selfSignedCert)); + certs[0] = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); + certs[1] = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); SetLastError(0xdeadbeef); ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, @@ -484,21 +471,18 @@ static void testAcquireSecurityContext(void) "or SEC_E_INTERNAL_ERROR, got %08x\n", st); /* Good cert, with CRYPT_KEY_PROV_INFO set before it's had a key loaded. */ - if (pCertSetCertificateContextProperty) - { - ret = pCertSetCertificateContextProperty(certs[1], - CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); - schanCred.dwVersion = SCH_CRED_V3; - ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, - NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, - "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, - NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, - "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); - } + ret = CertSetCertificateContextProperty(certs[1], + CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); + schanCred.dwVersion = SCH_CRED_V3; + ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, &schanCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, + NULL, &schanCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); @@ -601,11 +585,8 @@ static void testAcquireSecurityContext(void) CryptReleaseContext(csp, 0); CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - if (pCertFreeCertificateContext) - { - pCertFreeCertificateContext(certs[0]); - pCertFreeCertificateContext(certs[1]); - } + CertFreeCertificateContext(certs[0]); + CertFreeCertificateContext(certs[1]); } static void test_remote_cert(PCCERT_CONTEXT remote_cert) @@ -616,7 +597,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) ok(remote_cert->hCertStore != NULL, "hCertStore == NULL\n"); - while((iter = pCertEnumCertificatesInStore(remote_cert->hCertStore, iter))) { + while((iter = CertEnumCertificatesInStore(remote_cert->hCertStore, iter))) { if(iter == remote_cert) incl_remote = TRUE; cert_cnt++; @@ -903,7 +884,7 @@ todo_wine ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_REMOTE_CERT_CONTEXT) failed: %08x\n", status); if(status == SEC_E_OK) { test_remote_cert(cert); - pCertFreeCertificateContext(cert); + CertFreeCertificateContext(cert); } status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); @@ -1008,6 +989,4 @@ START_TEST(schannel) if(secdll) FreeLibrary(secdll); - if(crypt32dll) - FreeLibrary(crypt32dll); }

1 0

Nikolay Sivov : msscript/tests: Initial test for script engine initialization.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 6e18606274626dea5c44ee0be2e42da8b011e16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e18606274626dea5c44ee0be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 14 15:06:41 2016 +0300 msscript/tests: Initial test for script engine initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/Makefile.in | 2 +- dlls/msscript.ocx/tests/msscript.c | 560 ++++++++++++++++++++++++++++++++++++ 2 files changed, 561 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e18606274626dea5c44e…

1 0

Nikolay Sivov : include: Added IActiveScriptGarbageCollector definition.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 9b387bb1050f57261376fa5f9d66a7c3d0446e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b387bb1050f57261376fa5f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 14 15:06:40 2016 +0300 include: Added IActiveScriptGarbageCollector definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/activscp.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/activscp.idl b/include/activscp.idl index 8a3d75d..e539b04 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -71,6 +71,11 @@ typedef enum tagSCRIPTUICHANDLING { SCRIPTUICHANDLING_NOUIDEFAULT = 2 } SCRIPTUICHANDLING; +typedef enum tagSCRIPTGCTYPE { + SCRIPTGCTYPE_NORMAL = 0, + SCRIPTGCTYPE_EXHAUSTIVE = 1 +} SCRIPTGCTYPE; + typedef DWORD SCRIPTTHREADID; cpp_quote("#define SCRIPTTHREADID_CURRENT ((SCRIPTTHREADID)-1)") cpp_quote("#define SCRIPTTHREADID_BASE ((SCRIPTTHREADID)-2)") @@ -551,3 +556,14 @@ interface IActiveScriptProperty : IUnknown [in] VARIANT *pvarIndex, [in] VARIANT *pvarValue); } + +[ + object, + uuid(6aa2c4a0-2b53-11d4-a2a0-00104bd35090), + pointer_default(unique) +] +interface IActiveScriptGarbageCollector : IUnknown +{ + HRESULT CollectGarbage( + [in] SCRIPTGCTYPE gctype); +}

1 0

Alex Henrie : msvcr90: Add tests for mbstowcs and wcstombs with a negative count.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 0c4e0735512ad3bcbc534045c376dce82eba28c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4e0735512ad3bcbc534045c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 14 11:57:59 2016 +0200 msvcr90: Add tests for mbstowcs and wcstombs with a negative count. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 5e16e8f..ecf25ec 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -123,6 +123,9 @@ static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); static void* (__cdecl *p__AdjustPointer)(void*, const void*); static int (__cdecl *p_fflush_nolock)(FILE*); +static size_t (__cdecl *p_mbstowcs)(wchar_t*, const char*, size_t); +static size_t (__cdecl *p_wcstombs)(char*, const wchar_t*, size_t); +static char* (__cdecl *p_setlocale)(int, const char*); /* make sure we use the correct errno */ #undef errno @@ -383,6 +386,9 @@ static BOOL init(void) SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); SET(p__AdjustPointer, "__AdjustPointer"); SET(p_fflush_nolock, "_fflush_nolock"); + SET(p_mbstowcs, "mbstowcs"); + SET(p_wcstombs, "wcstombs"); + SET(p_setlocale, "setlocale"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1479,6 +1485,68 @@ static void test__AdjustPointer(void) } } +static void test_mbstowcs(void) +{ + wchar_t bufw[16]; + char buf[16]; + size_t ret; + + buf[0] = 'a'; + buf[1] = 0; + memset(bufw, 'x', sizeof(bufw)); + ret = p_mbstowcs(bufw, buf, -1); + ok(ret == 1, "ret = %d\n", (int)ret); + ok(bufw[0] == 'a', "bufw[0] = '%c'\n", bufw[0]); + ok(bufw[1] == 0, "bufw[1] = '%c'\n", bufw[1]); + + memset(bufw, 'x', sizeof(bufw)); + ret = p_mbstowcs(bufw, buf, -1000); + ok(ret == 1, "ret = %d\n", (int)ret); + ok(bufw[0] == 'a', "bufw[0] = '%c'\n", bufw[0]); + ok(bufw[1] == 0, "bufw[1] = '%c'\n", bufw[1]); + + memset(buf, 'x', sizeof(buf)); + ret = p_wcstombs(buf, bufw, -1); + ok(ret == 1, "ret = %d\n", (int)ret); + ok(buf[0] == 'a', "buf[0] = '%c'\n", buf[0]); + ok(buf[1] == 0, "buf[1] = '%c'\n", buf[1]); + + memset(buf, 'x', sizeof(buf)); + ret = p_wcstombs(buf, bufw, -1000); + ok(ret == 1, "ret = %d\n", (int)ret); + ok(buf[0] == 'a', "buf[0] = '%c'\n", buf[0]); + ok(buf[1] == 0, "buf[1] = '%c'\n", buf[1]); + + if(!p_setlocale(LC_ALL, "English")) { + win_skip("English locale not available\n"); + return; + } + + buf[0] = 'a'; + buf[1] = 0; + memset(bufw, 'x', sizeof(bufw)); + ret = p_mbstowcs(bufw, buf, -1); + ok(ret == -1, "ret = %d\n", (int)ret); + ok(bufw[0] == 0, "bufw[0] = '%c'\n", bufw[0]); + + memset(bufw, 'x', sizeof(bufw)); + ret = p_mbstowcs(bufw, buf, -1000); + ok(ret == -1, "ret = %d\n", (int)ret); + ok(bufw[0] == 0, "bufw[0] = '%c'\n", bufw[0]); + + memset(buf, 'x', sizeof(buf)); + ret = p_wcstombs(buf, bufw, -1); + ok(ret == 0, "ret = %d\n", (int)ret); + ok(buf[0] == 0, "buf[0] = '%c'\n", buf[0]); + + memset(buf, 'x', sizeof(buf)); + ret = p_wcstombs(buf, bufw, -1000); + ok(ret == 0, "ret = %d\n", (int)ret); + ok(buf[0] == 0, "buf[0] = '%c'\n", buf[0]); + + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr90) { if(!init()) @@ -1507,4 +1575,5 @@ START_TEST(msvcr90) test_access_s(); test_is_exception_typeof(); test__AdjustPointer(); + test_mbstowcs(); }

1 0

Piotr Caban : msvcrt: Fix C locale handling in wcstombs.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: c4ab42d88ce339c55b2b518520d22d3a0f7ec7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ab42d88ce339c55b2b51852… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 11:57:20 2016 +0200 msvcrt: Fix C locale handling in wcstombs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c6091a8..4935e54 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -477,6 +477,24 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst else locinfo = locale->locinfo; + if(!locinfo->lc_codepage) { + MSVCRT_size_t i; + + if(!mbstr) + return strlenW(*wcstr); + + for(i=0; i<count; i++) { + if((*wcstr)[i] > 255) { + *MSVCRT__errno() = MSVCRT_EILSEQ; + return -1; + } + + mbstr[i] = (*wcstr)[i]; + if(!(*wcstr)[i]) break; + } + return i; + } + if(!mbstr) { tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, *wcstr, -1, NULL, 0, NULL, &used_default)-1;

1 0

Piotr Caban : msvcrt: Fix C locale handling in mbstowcs.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: f091d9edf652eb2b45d8042c598addd7d0ef4d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f091d9edf652eb2b45d8042c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 11:57:16 2016 +0200 msvcrt: Fix C locale handling in mbstowcs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5d389bf..fe88cc7 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2253,6 +2253,17 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, else locinfo = locale->locinfo; + if(!locinfo->lc_codepage) { + if(!wcstr) + return strlen(mbstr); + + for(i=0; i<count; i++) { + wcstr[i] = (unsigned char)mbstr[i]; + if(!wcstr[i]) break; + } + return i; + } + /* Ignore count parameter */ if(!wcstr) return MultiByteToWideChar(locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1;

1 0

Piotr Caban : msvcrt: Return error in mbstowcs if conversion fails.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 7efd0c2c79e6d2773149d824da0aa136973f92f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efd0c2c79e6d2773149d824d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 14 11:57:07 2016 +0200 msvcrt: Return error in mbstowcs if conversion fails. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d307399..5d389bf 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2266,6 +2266,11 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, size = MultiByteToWideChar(locinfo->lc_codepage, 0, mbstr, size, wcstr, count); + if(!size) { + if(count) wcstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return -1; + } if(size<count && wcstr) wcstr[size] = '\0';

1 0

Nikolay Sivov : webservices: Added WsResetError().
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 5310f9690fdb5e37e7757487283569a05293e3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5310f9690fdb5e37e77574872… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 13 19:14:47 2016 +0300 webservices: Added WsResetError(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 17 ++++++++++++ dlls/webservices/tests/reader.c | 58 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 56fa28c..6452e21 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -142,6 +142,23 @@ void WINAPI WsFreeError( WS_ERROR *handle ) heap_free( error ); } +/************************************************************************** + * WsResetError [webservices.@] + */ +HRESULT WINAPI WsResetError( WS_ERROR *handle ) +{ + struct error *error = (struct error *)handle; + ULONG code; + + TRACE( "%p\n", handle ); + + if (!handle) return E_INVALIDARG; + + /* FIXME: release strings added with WsAddErrorString when it's implemented, reset string count */ + code = 0; + return prop_set( error->prop, error->prop_count, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, sizeof(code) ); +} + static const struct prop_desc heap_props[] = { { sizeof(SIZE_T), FALSE }, /* WS_HEAP_PROPERTY_MAX_SIZE */ diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1e167c3..310d973 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3359,6 +3359,63 @@ static void test_WsReadValue(void) WsFreeReader( reader ); } +static void test_WsResetError(void) +{ + WS_ERROR_PROPERTY prop; + ULONG size, code; + WS_ERROR *error; + LANGID langid; + HRESULT hr; + + hr = WsResetError( NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + error = NULL; + hr = WsCreateError( NULL, 0, &error ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( error != NULL, "error not set\n" ); + + code = 0xdeadbeef; + size = sizeof(code); + hr = WsSetErrorProperty( error, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, size ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetError( error ); + ok( hr == S_OK, "got %08x\n", hr ); + + code = 0xdeadbeef; + size = sizeof(code); + hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !code, "got %u\n", code ); + + WsFreeError( error ); + + langid = MAKELANGID( LANG_DUTCH, SUBLANG_DEFAULT ); + prop.id = WS_ERROR_PROPERTY_LANGID; + prop.value = &langid; + prop.valueSize = sizeof(langid); + hr = WsCreateError( &prop, 1, &error ); + ok( hr == S_OK, "got %08x\n", hr ); + + langid = 0xdead; + size = sizeof(langid); + hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_LANGID, &langid, size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( langid == MAKELANGID( LANG_DUTCH, SUBLANG_DEFAULT ), "got %u\n", langid ); + + hr = WsResetError( error ); + ok( hr == S_OK, "got %08x\n", hr ); + + langid = 0xdead; + size = sizeof(langid); + hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_LANGID, &langid, size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( langid == MAKELANGID( LANG_DUTCH, SUBLANG_DEFAULT ), "got %u\n", langid ); + + WsFreeError( error ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3390,4 +3447,5 @@ START_TEST(reader) test_double(); test_WsReadElement(); test_WsReadValue(); + test_WsResetError(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 1ecef6c..3c6262b 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -134,7 +134,7 @@ @ stub WsRequestReply @ stub WsRequestSecurityToken @ stub WsResetChannel -@ stub WsResetError +@ stdcall WsResetError(ptr) @ stdcall WsResetHeap(ptr ptr) @ stub WsResetListener @ stub WsResetMessage diff --git a/include/webservices.h b/include/webservices.h index d9fc9d1..a8d74e9 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1148,6 +1148,7 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsResetError(WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); HRESULT WINAPI WsSendMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*);

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
60
Older →

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 June 2016