wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Bruno Jesus : rsaenh: CALG_AES cannot be used if the key length was not specified.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: f5c687e3652004e4efebe9352aadd02d179603cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c687e3652004e4efebe9352… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:48:51 2014 -0300 rsaenh: CALG_AES cannot be used if the key length was not specified. --- dlls/rsaenh/rsaenh.c | 10 +++++++++- dlls/rsaenh/tests/rsaenh.c | 17 ----------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0f0111b..b4829f0 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -780,7 +780,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK { HCRYPTKEY hCryptKey; CRYPTKEY *pCryptKey; - DWORD dwKeyLen = HIWORD(dwFlags); + DWORD dwKeyLen = HIWORD(dwFlags), bKeyLen = dwKeyLen; const PROV_ENUMALGS_EX *peaAlgidInfo; *ppCryptKey = NULL; @@ -839,6 +839,14 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK */ break; + case CALG_AES: + if (!bKeyLen) + { + TRACE("missing key len for CALG_AES\n"); + SetLastError(NTE_BAD_ALGID); + return (HCRYPTKEY)INVALID_HANDLE_VALUE; + } + /* fall through */ default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c49bd92..7106c80 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -3511,13 +3511,6 @@ static void test_key_derivation(const char *prov) /* 47 */ }, }; - - /* Temporary struct to hold wine broken cases */ - struct broken - { - int mode, exp_data, blen; - } wine_broken[sizeof(tests)/sizeof(tests[0])]; - /* Due to differences between encryption from <= 2000 and >= XP some tests need to be skipped */ int old_broken[sizeof(tests)/sizeof(tests[0])]; memset(old_broken, 0, sizeof(old_broken)); @@ -3525,10 +3518,6 @@ static void test_key_derivation(const char *prov) old_broken[27] = old_broken[28] = old_broken[39] = old_broken[40] = 1; uniquecontainer(NULL); - memset(wine_broken, 0, sizeof(wine_broken)); - wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; - for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { if (win2k && old_broken[i]) continue; @@ -3567,23 +3556,17 @@ static void test_key_derivation(const char *prov) mode = 0xdeadbeef; result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&mode, &len, 0); ok(result, "Test [%s %d]: CryptGetKeyParam failed with error %08x\n", prov, i, GetLastError()); - if (wine_broken[i].mode) winetest_start_todo("wine"); ok(mode == tests[i].chain_mode, "Test [%s %d]: Expected chaining mode %d, got %d\n", prov, i, tests[i].chain_mode, mode); - if (wine_broken[i].mode) winetest_end_todo("wine"); SetLastError(0xdeadbeef); len = 4; result = CryptEncrypt(hKey, 0, TRUE, 0, dvData, &len, sizeof(dvData)); ok(result, "Test [%s %d]: CryptEncrypt failed with error 0x%08x\n", prov, i, GetLastError()); - if (wine_broken[i].blen) winetest_start_todo("wine"); ok(len == tests[i].blocklen, "Test [%s %d]: Expected block len %d, got %d\n", prov, i, tests[i].blocklen, len); - if (wine_broken[i].blen) winetest_end_todo("wine"); - if (wine_broken[i].exp_data) winetest_start_todo("wine"); ok(!memcmp(dvData, tests[i].expected_enc, tests[i].blocklen), "Test [%s %d]: Encrypted data comparison failed\n", prov, i); - if (wine_broken[i].exp_data) winetest_end_todo("wine"); CryptDestroyKey(hKey); err:

1 0

Bruno Jesus : rsaenh: Change the way AES 128 is derived to match Windows behavior.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 453d6dc105ee69df2a58c24c7cbebc9c6da0ad58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453d6dc105ee69df2a58c24c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:48:09 2014 -0300 rsaenh: Change the way AES 128 is derived to match Windows behavior. --- dlls/rsaenh/rsaenh.c | 26 +++++++++++++++++++++++--- dlls/rsaenh/tests/rsaenh.c | 5 ----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index dd49618..0f0111b 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3926,6 +3926,8 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD switch (GET_ALG_CLASS(Algid)) { case ALG_CLASS_DATA_ENCRYPT: + { + int need_padding; *phKey = new_key(hProv, Algid, dwFlags, &pCryptKey); if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; @@ -3936,8 +3938,26 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD */ dwLen = RSAENH_MAX_HASH_SIZE; RSAENH_CPGetHashParam(pCryptHash->hProv, hBaseData, HP_HASHVAL, abHashValue, &dwLen, 0); - - if (dwLen < pCryptKey->dwKeyLen) { + + /* + * The usage of padding seems to vary from algorithm to algorithm. + * For now the only different case found was for AES with 128 bit key. + */ + switch(Algid) + { + case CALG_AES_128: + /* To reduce the chance of regressions we will only deviate + * from the old behavior for the tested hash lengths */ + if (dwLen == 16 || dwLen == 20) + { + need_padding = 1; + break; + } + default: + need_padding = dwLen < pCryptKey->dwKeyLen; + } + + if (need_padding) { BYTE pad1[RSAENH_HMAC_DEF_PAD_LEN], pad2[RSAENH_HMAC_DEF_PAD_LEN]; BYTE old_hashval[RSAENH_MAX_HASH_SIZE]; DWORD i; @@ -3966,7 +3986,7 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD memcpy(pCryptKey->abKeyValue, abHashValue, RSAENH_MIN(pCryptKey->dwKeyLen, sizeof(pCryptKey->abKeyValue))); break; - + } case ALG_CLASS_MSG_ENCRYPT: if (!lookup_handle(&handle_table, pCryptHash->hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pMasterKey)) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index dad6a27..c49bd92 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1140,9 +1140,6 @@ static void test_aes(int keylen) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); ok(result, "Expected OK, got last error %d\n", GetLastError()); ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); - if(i == 0) todo_wine - ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); - else ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); @@ -3530,9 +3527,7 @@ static void test_key_derivation(const char *prov) memset(wine_broken, 0, sizeof(wine_broken)); wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[9].exp_data = 1; wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; - wine_broken[21] = wine_broken[33] = wine_broken[45] = wine_broken[9]; for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {

1 0

Bruno Jesus : rsaenh: Change the default AES chaining mode to CBC.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: e55dc350209e15ff9d8c05a12be01c93dbd3e318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55dc350209e15ff9d8c05a12… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:47:53 2014 -0300 rsaenh: Change the default AES chaining mode to CBC. --- dlls/rsaenh/rsaenh.c | 2 +- dlls/rsaenh/tests/rsaenh.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b5ab7a9..dd49618 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -900,7 +900,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK case CALG_AES_192: case CALG_AES_256: pCryptKey->dwBlockLen = 16; - pCryptKey->dwMode = CRYPT_MODE_ECB; + pCryptKey->dwMode = CRYPT_MODE_CBC; break; case CALG_RSA_KEYX: diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 3e1dc59..dad6a27 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1140,7 +1140,9 @@ static void test_aes(int keylen) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); ok(result, "Expected OK, got last error %d\n", GetLastError()); ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); -todo_wine + if(i == 0) todo_wine + ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); + else ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); @@ -1161,7 +1163,6 @@ todo_wine dwLen = sizeof(dwMode); result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); ok(result, "%08x\n", GetLastError()); -todo_wine ok(dwMode == CRYPT_MODE_CBC, "Wrong default chaining\n"); dwLen = 13; @@ -3529,12 +3530,9 @@ static void test_key_derivation(const char *prov) memset(wine_broken, 0, sizeof(wine_broken)); wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[9].mode = wine_broken[9].exp_data = 1; - wine_broken[10].mode = 1; + wine_broken[9].exp_data = 1; wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; wine_broken[21] = wine_broken[33] = wine_broken[45] = wine_broken[9]; - wine_broken[22] = wine_broken[23] = wine_broken[34] = wine_broken[35] = wine_broken[10]; - wine_broken[46] = wine_broken[47] = wine_broken[11] = wine_broken[10]; for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {

1 0

Bruno Jesus : rsaenh/tests: Add many tests related to key derivation.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 0f31d82c04e14a87ce993ac94017dd9e3da605a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f31d82c04e14a87ce993ac94… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:47:33 2014 -0300 rsaenh/tests: Add many tests related to key derivation. --- dlls/rsaenh/tests/rsaenh.c | 350 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 350 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f31d82c04e14a87ce993…

1 0

Bruno Jesus : crypt32: CertGetIssuerCertificateFromStore must return error for self-signed certificates.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 7a40fdbf8cb68df269c1a1c47f6cc276ba1929e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a40fdbf8cb68df269c1a1c47… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 22 20:43:06 2014 -0300 crypt32: CertGetIssuerCertificateFromStore must return error for self-signed certificates. --- dlls/crypt32/cert.c | 6 ++++++ dlls/crypt32/chain.c | 2 +- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/tests/cert.c | 4 ---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 074b924..c35f504 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1883,6 +1883,12 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore, CertFreeCertificateContext(ret); ret = NULL; } + if (CRYPT_IsCertificateSelfSigned(pSubjectContext)) + { + CertFreeCertificateContext(ret); + ret = NULL; + SetLastError(CRYPT_E_SELF_SIGNED); + } } TRACE("returning %p\n", ret); return ret; diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 94d228a..056910f 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -265,7 +265,7 @@ typedef struct _CertificateChain LONG ref; } CertificateChain; -static BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) +BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { PCERT_EXTENSION ext; DWORD size; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 02bd902..fb5c5c3 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -337,6 +337,7 @@ WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) DECLSPEC_HIDDEN; WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) DECLSPEC_HIDDEN; +BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) DECLSPEC_HIDDEN; /* Allocates and initializes a certificate chain engine, but without creating * the root store. Instead, it uses root, and assumes the caller has done any diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a19ef1e..259361c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1728,9 +1728,7 @@ static void testGetIssuerCert(void) SetLastError(0xdeadbeef); flags = 0; parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); -todo_wine ok(!parent, "Expected NULL\n"); -todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); CertFreeCertificateContext(child); @@ -1747,9 +1745,7 @@ todo_wine ok(cert1 != NULL, "CertEnumCertificatesInStore should have worked\n"); SetLastError(0xdeadbeef); parent = CertGetIssuerCertificateFromStore(store, cert1, NULL, &flags); -todo_wine ok(!parent, "Expected NULL\n"); -todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); CertCloseStore(store, 0);

1 0

Alexandre Julliard : ntdll: Use the standard mcontext_t type for the signal context on Android.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 69d198a9eb95393851410be044245ed7b48a26f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d198a9eb95393851410be04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 19:30:14 2014 +0200 ntdll: Use the standard mcontext_t type for the signal context on Android. --- dlls/ntdll/signal_i386.c | 86 ++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 52aeb60..447e97c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -100,50 +100,58 @@ typedef struct * signal context platform-specific definitions */ -#ifdef __ANDROID__ +#ifdef __linux__ #ifndef HAVE_SYS_UCONTEXT_H + +enum +{ + REG_GS, REG_FS, REG_ES, REG_DS, REG_EDI, REG_ESI, REG_EBP, REG_ESP, + REG_EBX, REG_EDX, REG_ECX, REG_EAX, REG_TRAPNO, REG_ERR, REG_EIP, + REG_CS, REG_EFL, REG_UESP, REG_SS, NGREG +}; + +typedef int greg_t; +typedef greg_t gregset_t[NGREG]; + +struct _libc_fpreg +{ + unsigned short significand[4]; + unsigned short exponent; +}; + +struct _libc_fpstate +{ + unsigned long cw; + unsigned long sw; + unsigned long tag; + unsigned long ipoff; + unsigned long cssel; + unsigned long dataoff; + unsigned long datasel; + struct _libc_fpreg _st[8]; + unsigned long status; +}; + +typedef struct _libc_fpstate* fpregset_t; + +typedef struct +{ + gregset_t gregs; + fpregset_t fpregs; + unsigned long oldmask; + unsigned long cr2; +} mcontext_t; + typedef struct ucontext { unsigned long uc_flags; struct ucontext *uc_link; stack_t uc_stack; - struct sigcontext uc_mcontext; + mcontext_t uc_mcontext; sigset_t uc_sigmask; } ucontext_t; -#endif - -#define EAX_sig(context) ((context)->uc_mcontext.eax) -#define EBX_sig(context) ((context)->uc_mcontext.ebx) -#define ECX_sig(context) ((context)->uc_mcontext.ecx) -#define EDX_sig(context) ((context)->uc_mcontext.edx) -#define ESI_sig(context) ((context)->uc_mcontext.esi) -#define EDI_sig(context) ((context)->uc_mcontext.edi) -#define EBP_sig(context) ((context)->uc_mcontext.ebp) -#define ESP_sig(context) ((context)->uc_mcontext.esp) - -#define CS_sig(context) ((context)->uc_mcontext.cs) -#define DS_sig(context) ((context)->uc_mcontext.ds) -#define ES_sig(context) ((context)->uc_mcontext.es) -#define SS_sig(context) ((context)->uc_mcontext.ss) -#define FS_sig(context) ((context)->uc_mcontext.fs) -#define GS_sig(context) ((context)->uc_mcontext.gs) - -#define EFL_sig(context) ((context)->uc_mcontext.eflags) -#define EIP_sig(context) ((context)->uc_mcontext.eip) -#define TRAP_sig(context) ((context)->uc_mcontext.trapno) -#define ERROR_sig(context) ((context)->uc_mcontext.err) - -#define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpstate)) -#define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpstate->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) - -/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ -void rt_sigreturn(void); -__ASM_GLOBAL_FUNC( rt_sigreturn, - "movl $173,%eax\n\t" /* NR_rt_sigreturn */ - "int $0x80" ); - -#elif defined (__linux__) +#endif /* HAVE_SYS_UCONTEXT_H */ #define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX]) #define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX]) @@ -219,6 +227,14 @@ __ASM_GLOBAL_FUNC(vm86_enter, # define __HAVE_VM86 #endif +#ifdef __ANDROID__ +/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ +void rt_sigreturn(void); +__ASM_GLOBAL_FUNC( rt_sigreturn, + "movl $173,%eax\n\t" /* NR_rt_sigreturn */ + "int $0x80" ); +#endif + #elif defined (__BSDI__) #include <machine/frame.h>

1 0

Alexandre Julliard : ntdll: Directly use ucontext_t instead of SIGCONTEXT on all platforms.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 775263aa5c4f0fe7fd8679c15c861eb5ed8768eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=775263aa5c4f0fe7fd8679c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 16:32:33 2014 +0200 ntdll: Directly use ucontext_t instead of SIGCONTEXT on all platforms. --- dlls/ntdll/signal_arm.c | 14 ++++++-------- dlls/ntdll/signal_arm64.c | 14 ++++++-------- dlls/ntdll/signal_i386.c | 41 ++++++++++++++--------------------------- 3 files changed, 26 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=775263aa5c4f0fe7fd867…

1 0

Alexandre Julliard : configure: Add a check for sys/ ucontext.h and include it where appropriate.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 8d817997cea784bcf784759e1d3aa93c571c500e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d817997cea784bcf784759e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 16:30:13 2014 +0200 configure: Add a check for sys/ucontext.h and include it where appropriate. --- configure | 12 ++++++------ configure.ac | 6 +++--- dlls/ntdll/server.c | 4 +++- dlls/ntdll/signal_arm.c | 6 ++++-- dlls/ntdll/signal_arm64.c | 4 +++- dlls/ntdll/signal_i386.c | 11 +++-------- dlls/ntdll/signal_powerpc.c | 9 ++++----- dlls/ntdll/signal_x86_64.c | 15 ++++----------- include/config.h.in | 6 +++--- server/ptrace.c | 4 +++- 10 files changed, 36 insertions(+), 41 deletions(-) diff --git a/configure b/configure index 97a3d08..4b8f784 100755 --- a/configure +++ b/configure @@ -6812,13 +6812,13 @@ fi done -for ac_header in ucontext.h +for ac_header in sys/ucontext.h do : - ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "#include <signal.h> + ac_fn_c_check_header_compile "$LINENO" "sys/ucontext.h" "ac_cv_header_sys_ucontext_h" "#include <signal.h> " -if test "x$ac_cv_header_ucontext_h" = xyes; then : +if test "x$ac_cv_header_sys_ucontext_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_UCONTEXT_H 1 +#define HAVE_SYS_UCONTEXT_H 1 _ACEOF fi @@ -6829,8 +6829,8 @@ done for ac_header in sys/thr.h do : ac_fn_c_check_header_compile "$LINENO" "sys/thr.h" "ac_cv_header_sys_thr_h" "#include <sys/types.h> -#ifdef HAVE_UCONTEXT_H -#include <ucontext.h> +#ifdef HAVE_SYS_UCONTEXT_H +#include <sys/ucontext.h> #endif " if test "x$ac_cv_header_sys_thr_h" = xyes; then : diff --git a/configure.ac b/configure.ac index 872d97a..a56cda0 100644 --- a/configure.ac +++ b/configure.ac @@ -631,12 +631,12 @@ AC_CHECK_HEADERS([resolv.h],,, AC_CHECK_HEADERS([ifaddrs.h],,,[#include <sys/types.h>]) -AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) +AC_CHECK_HEADERS(sys/ucontext.h,,,[#include <signal.h>]) AC_CHECK_HEADERS([sys/thr.h],,, [#include <sys/types.h> -#ifdef HAVE_UCONTEXT_H -#include <ucontext.h> +#ifdef HAVE_SYS_UCONTEXT_H +#include <sys/ucontext.h> #endif]) AC_CHECK_HEADERS([pthread_np.h],,, diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f3c6b38..aabda4f 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -63,8 +63,10 @@ #ifdef HAVE_SYS_UIO_H #include <sys/uio.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #ifdef HAVE_SYS_THR_H -#include <sys/ucontext.h> #include <sys/thr.h> #endif #ifdef HAVE_UNISTD_H diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0eb7ce0..4671b6d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -32,7 +32,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -46,6 +45,9 @@ #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -68,7 +70,7 @@ static pthread_key_t teb_key; */ #ifdef linux -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(HAVE_SYS_UCONTEXT_H) typedef struct ucontext { unsigned long uc_flags; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2b82952..69bc806 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -31,7 +31,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -45,6 +44,9 @@ #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7b4bc72..3180138 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -32,7 +32,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -43,17 +42,18 @@ # include <sys/syscall.h> # endif #endif - #ifdef HAVE_SYS_VM86_H # include <sys/vm86.h> #endif - #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -313,7 +313,6 @@ typedef struct sigcontext SIGCONTEXT; #ifdef _SCO_DS #include <sys/regset.h> #endif -#include <sys/ucontext.h> typedef struct ucontext SIGCONTEXT; #ifdef _SCO_DS @@ -357,7 +356,6 @@ typedef struct ucontext SIGCONTEXT; #define FPUX_sig(context) NULL /* FIXME */ #elif defined (__APPLE__) -# include <sys/ucontext.h> typedef ucontext_t SIGCONTEXT; @@ -407,9 +405,6 @@ typedef ucontext_t SIGCONTEXT; #endif #elif defined(__NetBSD__) -# include <sys/ucontext.h> -# include <sys/types.h> -# include <signal.h> typedef ucontext_t SIGCONTEXT; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index a457bdf..0fca342 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -28,10 +28,10 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> +#include <sys/types.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -42,10 +42,12 @@ # include <sys/syscall.h> # endif #endif - #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -94,9 +96,6 @@ static pthread_key_t teb_key; #ifdef __APPLE__ -# include <sys/ucontext.h> -# include <sys/types.h> - /* All Registers access - only for local access */ # define REG_sig(reg_name, context) ((context)->uc_mcontext->ss.reg_name) # define FLOATREG_sig(reg_name, context) ((context)->uc_mcontext->fs.reg_name) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7007db0..5658537 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -28,25 +28,22 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> - -#ifdef HAVE_UCONTEXT_H -# include <ucontext.h> -#endif - +#include <sys/types.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_MACHINE_SYSARCH_H # include <machine/sysarch.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -165,7 +162,6 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.fpregs)) #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) -#include <sys/ucontext.h> #define RAX_sig(context) ((context)->uc_mcontext.mc_rax) #define RBX_sig(context) ((context)->uc_mcontext.mc_rbx) @@ -200,9 +196,6 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.mc_fpstate)) #elif defined(__NetBSD__) -#include <sys/ucontext.h> -#include <sys/types.h> -#include <signal.h> #define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) #define RBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBX]) diff --git a/include/config.h.in b/include/config.h.in index 79f8b45..50cfcb8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1038,6 +1038,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the <sys/ucontext.h> header file. */ +#undef HAVE_SYS_UCONTEXT_H + /* Define to 1 if you have the <sys/uio.h> header file. */ #undef HAVE_SYS_UIO_H @@ -1077,9 +1080,6 @@ /* Define if you have the timezone variable */ #undef HAVE_TIMEZONE -/* Define to 1 if you have the <ucontext.h> header file. */ -#undef HAVE_UCONTEXT_H - /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H diff --git a/server/ptrace.c b/server/ptrace.c index aea821d..cb436b6 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -40,8 +40,10 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_SYS_THR_H +#ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> +#endif +#ifdef HAVE_SYS_THR_H # include <sys/thr.h> #endif #include <unistd.h>

1 0

Alexandre Julliard : configure: Improve the check for the resolver library.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 1b2977420e21bd638f9417ac65fc5f36e4d2248a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2977420e21bd638f9417ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 15:23:07 2014 +0200 configure: Improve the check for the resolver library. --- configure | 49 +++++++++++++++++++++++++++++++++---------------- configure.ac | 33 ++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/configure b/configure index d7efbfd..97a3d08 100755 --- a/configure +++ b/configure @@ -11687,11 +11687,16 @@ fi if test "$ac_cv_header_resolv_h" = "yes" then - ac_save_LIBS="$LIBS" - for lib in '' -lresolv - do - LIBS="$lib $ac_save_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver library" >&5 +$as_echo_n "checking for resolver library... " >&6; } +if ${ac_cv_have_resolv+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_LIBS="$LIBS" + for lib in '' -lresolv + do + LIBS="$lib $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -11700,25 +11705,37 @@ then int main () { -res_query("foo",ns_c_in,0,0,0); +if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0) ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - -$as_echo "#define HAVE_RESOLV 1" >>confdefs.h - - RESOLV_LIBS="$lib" - + ac_cv_have_resolv=${lib:-"none required"} +else + ac_cv_have_resolv="not found" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "${RESOLV_LIBS+set}" = set; then - break - fi - done - LIBS="$ac_save_LIBS" + test "x$ac_cv_have_resolv" = "xnot found" || break + done + LIBS="$ac_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_resolv" >&5 +$as_echo "$ac_cv_have_resolv" >&6; } + + case "$ac_cv_have_resolv" in + "not found") ;; + "none required") + +$as_echo "#define HAVE_RESOLV 1" >>confdefs.h + ;; + *) + $as_echo "#define HAVE_RESOLV 1" >>confdefs.h + + RESOLV_LIBS=$ac_cv_have_resolv + ;; + esac fi if test "x$with_lcms2" != "xno" diff --git a/configure.ac b/configure.ac index c913f9f..872d97a 100644 --- a/configure.ac +++ b/configure.ac @@ -1419,21 +1419,28 @@ WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_port_gp_port_info_list_new" != dnl **** Check for resolver library *** if test "$ac_cv_header_resolv_h" = "yes" then - ac_save_LIBS="$LIBS" - for lib in '' -lresolv - do - LIBS="$lib $ac_save_LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H + AC_CACHE_CHECK([for resolver library], ac_cv_have_resolv, + [ac_save_LIBS="$LIBS" + for lib in '' -lresolv + do + LIBS="$lib $ac_save_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include <resolv.h>]],[[res_query("foo",ns_c_in,0,0,0);]])], - [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) - AC_SUBST(RESOLV_LIBS,"$lib")]) - if test "${RESOLV_LIBS+set}" = set; then - break - fi - done - LIBS="$ac_save_LIBS" +#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0)]])], + [ac_cv_have_resolv=${lib:-"none required"}],[ac_cv_have_resolv="not found"]) + test "x$ac_cv_have_resolv" = "xnot found" || break + done + LIBS="$ac_save_LIBS"]) + + case "$ac_cv_have_resolv" in + "not found") ;; + "none required") + AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) ;; + *) + AC_DEFINE(HAVE_RESOLV, 1) + AC_SUBST(RESOLV_LIBS,$ac_cv_have_resolv) ;; + esac fi dnl **** Check for LittleCMS ***

1 0

André Hentschel : Add news for WWN 372
by Jeremy Newman 23 Jul '14

23 Jul '14

Module: website Branch: master Commit: 84e03d9cc8f98a3099fb1d6bfe305a784419029f URL: http://source.winehq.org/git/website.git/?a=commit;h=84e03d9cc8f98a3099fb1d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 23 21:12:49 2014 +0200 Add news for WWN 372 --- news/de/2014072301.xml | 12 ++++++++++++ news/en/2014072301.xml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/news/de/2014072301.xml b/news/de/2014072301.xml new file mode 100644 index 0000000..66dc365 --- /dev/null +++ b/news/de/2014072301.xml @@ -0,0 +1,12 @@ +<news> + <date>23. Juli 2014</date> + <title>World Wine News Ausgabe 372</title> + <body> +<a href="{$root}/wwn/372">WWN Ausgabe 372 (en)</a> wurde heute veröffentlicht. +<ul> +<li><a href="{$root}/wwn/372#New WineHQ Server">Neuer WineHQ Server</a></li> +<li><a href="{$root}/wwn/372#Failing tests on test bots">Fehlschlagende Tests auf den Testbots</a></li> +<li><a href="{$root}/wwn/372#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> +</ul> + </body> +</news> diff --git a/news/en/2014072301.xml b/news/en/2014072301.xml new file mode 100644 index 0000000..c4e5b73 --- /dev/null +++ b/news/en/2014072301.xml @@ -0,0 +1,12 @@ +<news> + <date>July 23, 2014</date> + <title>World Wine News Issue 372</title> + <body> +<a href="{$root}/wwn/372">WWN Issue 372</a> was released today. +<ul> +<li><a href="{$root}/wwn/372#New WineHQ Server">New WineHQ Server</a></li> +<li><a href="{$root}/wwn/372#Failing tests on test bots">Failing tests on test bots</a></li> +<li><a href="{$root}/wwn/372#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Status Changes</a></li> +</ul> + </body> +</news>

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
29
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 July 2014