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

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

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(a)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

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

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

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

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

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

Iván Matellanes : msvcirt: Add stub for class ostream.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 849163b1ed5e2586ee9f391e7a8b03f054bb620f URL: http://source.winehq.org/git/wine.git/?a=commit;h=849163b1ed5e2586ee9f391e7… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:15 2016 +0100 msvcirt: Add stub for class ostream. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 254 ++++++++++++++++++++++++++++++++++++++++---- dlls/msvcirt/msvcirt.spec | 100 ++++++++--------- dlls/msvcrt20/msvcrt20.spec | 92 ++++++++-------- dlls/msvcrt40/msvcrt40.spec | 92 ++++++++-------- 4 files changed, 374 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=849163b1ed5e2586ee9f3…

1 0

David Lawrie : winejoystick.drv/joystick_osx.c: Adds multi-axis controller.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: e06bbf0d54fcddc952d079e1f645da65bbb22746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06bbf0d54fcddc952d079e1f… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Sun Jun 12 22:11:19 2016 -0700 winejoystick.drv/joystick_osx.c: Adds multi-axis controller. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 48c05a0..a58c9cf 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -263,7 +263,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_ int usage = IOHIDElementGetUsage(element); if (usage_page == kHIDPage_GenericDesktop && - (usage == kHIDUsage_GD_Joystick || usage == kHIDUsage_GD_GamePad)) + (usage == kHIDUsage_GD_Joystick || usage == kHIDUsage_GD_GamePad || usage == kHIDUsage_GD_MultiAxisController)) { CFArrayAppendValue(main_elements, element); total++; @@ -283,7 +283,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_ static int find_osx_devices(void) { IOHIDManagerRef hid_manager; - int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad }; + int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad, kHIDUsage_GD_MultiAxisController }; int i; CFDictionaryRef matching_dicts[sizeof(usages) / sizeof(usages[0])]; CFArrayRef matching;

1 0

Vincent Povirk : gdiplus: Implement GdipGetImageAttributesAdjustedPalette.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 7fbf0deedef8f582ad5b84682aa9e5fe7a8a7add URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbf0deedef8f582ad5b84682… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 13 16:42:28 2016 -0500 gdiplus: Implement GdipGetImageAttributesAdjustedPalette. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 3 ++ dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/imageattributes.c | 15 ++++++++++ dlls/gdiplus/tests/image.c | 66 ++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 6 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9f7ce5f..c163ef9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -264,7 +264,7 @@ 264 stdcall GdipGetHatchForegroundColor(ptr ptr) 265 stdcall GdipGetHatchStyle(ptr ptr) 266 stdcall GdipGetHemfFromMetafile(ptr ptr) -267 stub GdipGetImageAttributesAdjustedPalette +267 stdcall GdipGetImageAttributesAdjustedPalette(ptr ptr long) 268 stdcall GdipGetImageBounds(ptr ptr ptr) 269 stdcall GdipGetImageDecoders(long long ptr) 270 stdcall GdipGetImageDecodersSize(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9b29d88..22478a3 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -176,6 +176,9 @@ extern GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *palette) DECLSPEC_HIDDEN; +extern PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, + UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) DECLSPEC_HIDDEN; + struct GpMatrix{ REAL matrix[6]; }; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8353809..c74f2eb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -661,7 +661,7 @@ static BOOL color_is_gray(ARGB color) } /* returns preferred pixel format for the applied attributes */ -static PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, +PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) { UINT x, y; diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 2917b46..a76fe3b 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -77,6 +77,21 @@ GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) return Ok; } +GpStatus WINGDIPAPI GdipGetImageAttributesAdjustedPalette(GpImageAttributes *imageattr, + ColorPalette *palette, ColorAdjustType type) +{ + TRACE("(%p,%p,%u)\n", imageattr, palette, type); + + if (!imageattr || !palette || !palette->Count || + type >= ColorAdjustTypeCount || type == ColorAdjustTypeDefault) + return InvalidParameter; + + apply_image_attributes(imageattr, (LPBYTE)palette->Entries, palette->Count, 1, 0, + type, PixelFormat32bppARGB); + + return Ok; +} + GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, ARGB colorLow, ARGB colorHigh) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6a51714..be93a20 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4725,6 +4725,71 @@ static void test_createeffect(void) } } +static void test_getadjustedpalette(void) +{ + ColorMap colormap; + GpImageAttributes *imageattributes; + ColorPalette *palette; + GpStatus stat; + + stat = GdipCreateImageAttributes(&imageattributes); + expect(Ok, stat); + + colormap.oldColor.Argb = 0xffffff00; + colormap.newColor.Argb = 0xffff00ff; + stat = GdipSetImageAttributesRemapTable(imageattributes, ColorAdjustTypeBitmap, + TRUE, 1, &colormap); + expect(Ok, stat); + + colormap.oldColor.Argb = 0xffffff80; + colormap.newColor.Argb = 0xffff80ff; + stat = GdipSetImageAttributesRemapTable(imageattributes, ColorAdjustTypeDefault, + TRUE, 1, &colormap); + expect(Ok, stat); + + palette = GdipAlloc(sizeof(*palette) + sizeof(ARGB) * 2); + palette->Count = 0; + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, ColorAdjustTypeBitmap); + expect(InvalidParameter, stat); + + palette->Count = 3; + palette->Entries[0] = 0xffffff00; + palette->Entries[1] = 0xffffff80; + palette->Entries[2] = 0xffffffff; + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, ColorAdjustTypeBitmap); + expect(Ok, stat); + expect(0xffff00ff, palette->Entries[0]); + expect(0xffffff80, palette->Entries[1]); + expect(0xffffffff, palette->Entries[2]); + + palette->Entries[0] = 0xffffff00; + palette->Entries[1] = 0xffffff80; + palette->Entries[2] = 0xffffffff; + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, ColorAdjustTypeBrush); + expect(Ok, stat); + expect(0xffffff00, palette->Entries[0]); + expect(0xffff80ff, palette->Entries[1]); + expect(0xffffffff, palette->Entries[2]); + + stat = GdipGetImageAttributesAdjustedPalette(NULL, palette, ColorAdjustTypeBitmap); + expect(InvalidParameter, stat); + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, NULL, ColorAdjustTypeBitmap); + expect(InvalidParameter, stat); + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, -1); + expect(InvalidParameter, stat); + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, ColorAdjustTypeDefault); + expect(InvalidParameter, stat); + + GdipFree(palette); + GdipDisposeImageAttributes(imageattributes); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4782,6 +4847,7 @@ START_TEST(image) test_colorkey(); test_dispose(); test_createeffect(); + test_getadjustedpalette(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2e22ff4..c6f16c4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -436,6 +436,8 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage*,GDIPCONST PropertyItem*); /* ImageAttributes */ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); +GpStatus WINGDIPAPI GdipGetImageAttributesAdjustedPalette(GpImageAttributes*, + ColorPalette*,ColorAdjustType); GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes*, BOOL); GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*,

1 0