March 2013 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Sync spec files.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 4237b8506357e7d7e561aae89a722cf41fc433ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4237b8506357e7d7e561aae89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:13:57 2013 +0100 msvcrt: Sync spec files. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 93bddbf..efba85a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1509,7 +1509,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l -@ stub _wcstoul_l +@ cdecl _wcstoul_l(wstr ptr long ptr) msvcrt._wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s @@ -1607,7 +1607,7 @@ @ stub _wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol -@ stub _wtol_l +@ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime32(wstr ptr) msvcrt._wutime32 @ cdecl _wutime64(wstr ptr) msvcrt._wutime64 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7f6b0d9..3718eae 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1872,7 +1872,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l -@ stub _wcstoul_l +@ cdecl _wcstoul_l(wstr ptr long ptr) msvcrt._wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s @@ -1969,7 +1969,7 @@ @ stub _wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol -@ stub _wtol_l +@ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime32(wstr ptr) msvcrt._wutime32 @ cdecl _wutime64(wstr ptr) msvcrt._wutime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a2e2929..0d6b8f8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1169,7 +1169,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l -@ stub _wcstoul_l +@ cdecl _wcstoul_l(wstr ptr long ptr) msvcrt._wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s @@ -1270,7 +1270,7 @@ @ stub _wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol -@ stub _wtol_l +@ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime32(wstr ptr) msvcrt._wutime32 @ cdecl _wutime64(wstr ptr) msvcrt._wutime64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 998349f..0aa1ed4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1163,7 +1163,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l -@ stub _wcstoul_l +@ cdecl _wcstoul_l(wstr ptr long ptr) msvcrt._wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s @@ -1261,7 +1261,7 @@ @ stub _wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol -@ stub _wtol_l +@ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime32(wstr ptr) msvcrt._wutime32 @ cdecl _wutime64(wstr ptr) msvcrt._wutime64

1 0

Piotr Caban : msvcrt: Don't forward strncpy to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: b6265562728787500d7d6762cdbad7473d408165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6265562728787500d7d6762c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:34 2013 +0100 msvcrt: Don't forward strncpy to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cd756e4..278932e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1424,7 +1424,7 @@ @ cdecl strncat(str str long) ntdll.strncat @ cdecl strncat_s(str long str long) MSVCRT_strncat_s @ cdecl strncmp(str str long) MSVCRT_strncmp -@ cdecl strncpy(ptr str long) ntdll.strncpy +@ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(str long) MSVCRT_strnlen @ cdecl strpbrk(str str) ntdll.strpbrk diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index bf33644..6049dce 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -572,6 +572,19 @@ int CDECL MSVCRT__strnicoll( const char* str1, const char* str2, MSVCRT_size_t c } /********************************************************************* + * strncpy (MSVCRT.@) + */ +char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len) +{ + MSVCRT_size_t i; + + for(i=0; i<len; i++) + if((dst[i] = src[i]) == '\0') break; + + return dst; +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src )

1 0

Piotr Caban : msvcrt: Don't forward strncmp to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: e66e95045924a9d37202925fbb29b466ce0b9881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66e95045924a9d37202925fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:19 2013 +0100 msvcrt: Don't forward strncmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6b11ba4..cd756e4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1423,7 +1423,7 @@ @ cdecl strlen(str) ntdll.strlen @ cdecl strncat(str str long) ntdll.strncat @ cdecl strncat_s(str long str long) MSVCRT_strncat_s -@ cdecl strncmp(str str long) ntdll.strncmp +@ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) ntdll.strncpy @ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(str long) MSVCRT_strnlen diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6d56cc0..bf33644 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1583,6 +1583,14 @@ char* __cdecl MSVCRT_strchr(const char *str, int c) } /********************************************************************* + * strncmp (MSVCRT.@) + */ +int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len) +{ + return strncmp(str1, str2, len); +} + +/********************************************************************* * _strnicmp_l (MSVCRT.@) */ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2,

1 0

Piotr Caban : msvcrt: Don't forward memset to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 1278080901b72eafd9613b4076d89c2078746293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1278080901b72eafd9613b407… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:59 2013 +0100 msvcrt: Don't forward memset to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7b27220..be94008 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1368,7 +1368,7 @@ @ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) ntdll.memmove @ cdecl memmove_s(ptr long ptr long) -@ cdecl memset(ptr long long) ntdll.memset +@ cdecl memset(ptr long long) MSVCRT_memset @ cdecl mktime(ptr) MSVCRT_mktime @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 0002ff0..f7c2118 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1567,6 +1567,14 @@ void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) } /********************************************************************* + * memset (MSVCRT.@) + */ +void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) +{ + return memset(dst, c, n); +} + +/********************************************************************* * _strnicmp_l (MSVCRT.@) */ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2,

1 0

Piotr Caban : msvcrt: Don't forward atoi to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 15b40e7b9c3740d0cb5da2f7d82058ee53adb812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b40e7b9c3740d0cb5da2f7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:49 2013 +0100 msvcrt: Don't forward atoi to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 36e1510..7b27220 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1249,7 +1249,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) ntdll.atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 1b2dea8..0002ff0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -861,7 +861,7 @@ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) /********************************************************************* * _atoi_l (MSVCRT.@) */ -int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) +int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); @@ -876,6 +876,14 @@ int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) } /********************************************************************* + * atoi (MSVCRT.@) + */ +int __cdecl MSVCRT_atoi(const char *str) +{ + return MSVCRT__atoi_l(str, NULL); +} + +/********************************************************************* * _strtoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Don't forward _wcsicmp to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 0ffc970aa483792ec1b080ad01beea34f688dd55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffc970aa483792ec1b080ad0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:06 2013 +0100 msvcrt: Don't forward _wcsicmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 99072aa..b648f88 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1098,7 +1098,7 @@ @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) # stub _wcsftime_l(ptr long wstr ptr ptr) -@ cdecl _wcsicmp(wstr wstr) ntdll._wcsicmp +@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp # stub _wcsicmp_l(wstr wstr ptr) @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll # stub _wcsicoll_l(wstr wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ba53084..fe0b6ac 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -70,6 +70,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) } /********************************************************************* + * _wcsicmp (MSVCRT.@) + */ +INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) +{ + return strcmpiW( str1, str2 ); +} + +/********************************************************************* * _wcsicoll (MSVCRT.@) */ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 )

1 0

Jacek Caban : secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 79c5d5cc176727a45505db73734b87ba214a8c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c5d5cc176727a45505db737… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:48 2013 +0100 secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS tests. --- dlls/secur32/tests/schannel.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7d4c532..5076767 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -166,6 +166,31 @@ static void test_strength(PCredHandle handle) trace("strength %d - %d\n", strength.dwMinimumCipherStrength, strength.dwMaximumCipherStrength); } +static void test_supported_protocols(CredHandle *handle, unsigned exprots) +{ + SecPkgCred_SupportedProtocols protocols; + SECURITY_STATUS status; + + status = pQueryCredentialsAttributesA(handle, SECPKG_ATTR_SUPPORTED_PROTOCOLS, &protocols); + ok(status == SEC_E_OK, "QueryCredentialsAttributes failed: %08x\n", status); + + if(exprots) + ok(protocols.grbitProtocol == exprots, "protocols.grbitProtocol = %x, expected %x\n", protocols.grbitProtocol, exprots); + + trace("Supported protocols:\n"); + +#define X(flag, name) do { if(protocols.grbitProtocol & flag) { trace(name "\n"); protocols.grbitProtocol &= ~flag; } }while(0) + X(SP_PROT_SSL2_CLIENT, "SSL 2 client"); + X(SP_PROT_SSL3_CLIENT, "SSL 3 client"); + X(SP_PROT_TLS1_0_CLIENT, "TLS 1.0 client"); + X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); + X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); +#undef X + + if(protocols.grbitProtocol) + trace("Unknown flags: %x\n", protocols.grbitProtocol); +} + static void testAcquireSecurityContext(void) { BOOL has_schannel = FALSE; @@ -261,8 +286,13 @@ static void testAcquireSecurityContext(void) st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, NULL); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); - if(st == SEC_E_OK) + if(st == SEC_E_OK) { + st = pQueryCredentialsAttributesA(&cred, SECPKG_ATTR_SUPPORTED_PROTOCOLS, NULL); + ok(st == SEC_E_INTERNAL_ERROR, "QueryCredentialsAttributes failed: %08x, expected SEC_E_INTERNAL_ERROR\n", st); + + test_supported_protocols(&cred, 0); pFreeCredentialsHandle(&cred); + } memset(&cred, 0, sizeof(cred)); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &exp); @@ -650,6 +680,8 @@ static void test_communication(void) ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); if (status != SEC_E_OK) return; + test_supported_protocols(&cred_handle, SP_PROT_SSL3_CLIENT); + /* Initialize the connection */ init_buffers(&buffers[0], 4, buf_size); init_buffers(&buffers[1], 4, buf_size);

1 0

Ken Thomases : winemac: Use kCGLPFANoRecovery for accelerated pixel formats in create_context().
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 484cf761fcd75fb14da0d6a9865b6a597b9668d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484cf761fcd75fb14da0d6a98… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 07:01:22 2013 -0500 winemac: Use kCGLPFANoRecovery for accelerated pixel formats in create_context(). --- dlls/winemac.drv/opengl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 8627b70..58fd951 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2991,7 +2991,10 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share) attribs[n++] = kCGLPFAClosestPolicy; if (pf->accelerated) + { attribs[n++] = kCGLPFAAccelerated; + attribs[n++] = kCGLPFANoRecovery; + } else { attribs[n++] = kCGLPFARendererID;

1 0

Akihiro Sagawa : msvcrt/tests: Add unicode fgetwc tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: cf2ce8c64ba0734762ac3ecb716b332daeafca43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2ce8c64ba0734762ac3ecb7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 27 23:16:50 2013 +0900 msvcrt/tests: Add unicode fgetwc tests. --- dlls/msvcrt/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 25eab7a..5731437 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -865,6 +865,63 @@ static void test_fgetwc_locale(const char* text, const char* locale, int codepag unlink(tempfile); } +static void test_fgetwc_unicode(void) +{ + char temppath[MAX_PATH], tempfile[MAX_PATH]; + FILE *tempfh; + static const WCHAR wchar_text[] = { 0xfeff, 0xff1f, '!' }; + char utf8_text[BUFSIZ]; + int ret, i; + wint_t ch; + + GetTempPath(MAX_PATH, temppath); + GetTempFileName(temppath, "", 0, tempfile); + + if (!p_fopen_s) + { + win_skip("fopen_s not available\n"); + return; + } + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(wchar_text, 1, sizeof(wchar_text), tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt,ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text, sizeof(wchar_text)/sizeof(wchar_text[0]), + utf8_text, sizeof(utf8_text), NULL, NULL); + ok(ret > 0, "utf-8 conversion failed\n"); + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + unlink(temppath); +} + static void test_fputwc(void) { char temppath[MAX_PATH]; @@ -2127,6 +2184,7 @@ START_TEST(file) test_fgetwc_locale("AB\x83\xa9", "English", 1252); /* \x83 is U+0083 */ test_fgetwc_locale("AB\x83\xa9", "C", 0); + test_fgetwc_unicode(); test_fputwc(); test_ctrlz(); test_file_put_get();

1 0

Akihiro Sagawa : msvcrt/tests: Add locale dependent fgetwc tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: c2ce2fa06e0e8977b25823d64b9d6436fa3792fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ce2fa06e0e8977b25823d64… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 27 23:16:47 2013 +0900 msvcrt/tests: Add locale dependent fgetwc tests. --- dlls/msvcrt/tests/file.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 938161c..25eab7a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -33,6 +33,7 @@ #include <winnls.h> #include <process.h> #include <errno.h> +#include <locale.h> static HANDLE proc_handles[2]; @@ -43,6 +44,8 @@ static void init(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + setlocale(LC_CTYPE, "C"); + p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); } @@ -792,6 +795,76 @@ static void test_fgetwc( void ) free(tempf); } +static void test_fgetwc_locale(const char* text, const char* locale, int codepage) +{ + char temppath[MAX_PATH], tempfile[MAX_PATH]; + FILE *tempfh; + static const WCHAR wchar_text[] = { 0xfeff, 0xff1f, '!' }; + WCHAR wtextW[BUFSIZ]; + int ret = 0, i; + wint_t ch; + + if (!setlocale(LC_CTYPE, locale)) + { + win_skip("%s locale not available\n", locale); + return; + } + + GetTempPath(MAX_PATH, temppath); + GetTempFileName(temppath, "", 0, tempfile); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(text, 1, strlen(text), tempfh); + fclose(tempfh); + + if (codepage != 0) + { + /* mbstowcs rejects invalid multibyte sequence, + so we use MultiByteToWideChar here. */ + ret = MultiByteToWideChar(codepage, 0, text, -1, + wtextW, sizeof(wtextW)/sizeof(wtextW[0])); + ok(ret > 0, "MultiByteToWideChar failed\n"); + } + else + { + /* C locale */ + const char *p; + for (p = text; *p != '\0'; p++) + wtextW[ret++] = (unsigned char)*p; + wtextW[ret++] = 0; + } + + tempfh = fopen(tempfile, "rt"); + ok(tempfh != NULL, "can't open tempfile\n"); + + for (i = 0; i < ret-1; i++) + { + ch = fgetwc(tempfh); + ok(ch == wtextW[i], "got %04hx, expected %04hx (cp%d[%d])\n", ch, wtextW[i], codepage, i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (cp%d)\n", ch, codepage); + fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(wchar_text, 1, sizeof(wchar_text), tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rb"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], "got %04hx, expected %04x (cp%d[%d])\n", ch, wchar_text[i], codepage, i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (cp%d)\n", ch, codepage); + fclose(tempfh); + unlink(tempfile); +} + static void test_fputwc(void) { char temppath[MAX_PATH]; @@ -2048,6 +2121,12 @@ START_TEST(file) test_flsbuf(); test_fflush(); test_fgetwc(); + /* \x83\xa9 is double byte character, \xe0\x7f is not (undefined). */ + test_fgetwc_locale("AB\x83\xa9\xe0\x7f", "Japanese_Japan.932", 932); + /* \x83 is U+0192 */ + test_fgetwc_locale("AB\x83\xa9", "English", 1252); + /* \x83 is U+0083 */ + test_fgetwc_locale("AB\x83\xa9", "C", 0); test_fputwc(); test_ctrlz(); test_file_put_get();

1 0

Piotr Caban : msvcrt: Added _wtol_l implementation.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 06c677384402d30c2868feca59d0708bdcf635cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c677384402d30c2868feca5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:32 2013 +0100 msvcrt: Added _wtol_l implementation. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 07e2984..69ad7a7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -42,6 +42,7 @@ #include "winbase.h" #define MSVCRT_LONG_MAX 0x7fffffffL +#define MSVCRT_LONG_MIN (-MSVCRT_LONG_MAX-1) #define MSVCRT_ULONG_MAX 0xffffffffUL #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ef5823c..36e1510 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1226,8 +1226,8 @@ @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l -@ cdecl _wtol(wstr) ntdll._wtol -# stub _wtol_l(wstr ptr) +@ cdecl _wtol(wstr) MSVCRT__wtol +@ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l @ cdecl _wunlink(wstr) MSVCRT__wunlink @ cdecl _wutime(wstr ptr) @ cdecl _wutime32(wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e00cb83..b0a52d7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1472,6 +1472,31 @@ int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) } /********************************************************************* + * _wtol_l (MSVCRT.@) + */ +MSVCRT_long __cdecl MSVCRT__wtol_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); + + if(ret > MSVCRT_LONG_MAX) { + ret = MSVCRT_LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < MSVCRT_LONG_MIN) { + ret = MSVCRT_LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* + * _wtol (MSVCRT.@) + */ +MSVCRT_long __cdecl MSVCRT__wtol(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtol_l(str, NULL); +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Jacek Caban : secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS implementation .
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: e413b8a5054bc1c4ca1ddb35b6d21e3379b6a79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e413b8a5054bc1c4ca1ddb35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:35 2013 +0100 secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS implementation. --- dlls/secur32/schannel.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 87bb942..9a83a76 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -281,14 +281,14 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes( ret = SEC_E_INTERNAL_ERROR; break; case SECPKG_ATTR_SUPPORTED_PROTOCOLS: - if (pBuffer) - { - /* FIXME: get from OpenSSL? */ - FIXME("SECPKG_ATTR_SUPPORTED_PROTOCOLS: stub\n"); - ret = SEC_E_UNSUPPORTED_FUNCTION; - } - else + if(pBuffer) { + /* Regardless of MSDN documentation, tests show that this attribute takes into account + * what protocols are enabled for given credential. */ + ((SecPkgCred_SupportedProtocols*)pBuffer)->grbitProtocol = cred->enabled_protocols; + ret = SEC_E_OK; + }else { ret = SEC_E_INTERNAL_ERROR; + } break; default: ret = SEC_E_UNSUPPORTED_FUNCTION;

1 0

Akihiro Sagawa : msvcrt: Fix mbtowc_l in C locale.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 23b8c4df1910832dd409f6c8cc8906ac64be4279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b8c4df1910832dd409f6c8c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 27 23:16:44 2013 +0900 msvcrt: Fix mbtowc_l in C locale. --- dlls/msvcrt/mbcs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 121edbb..fdc5422 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2016,7 +2016,9 @@ int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n, if(n <= 0 || !str) return 0; - if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) + if(!locinfo->lc_codepage) + tmpdst = (unsigned char)*str; + else if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) return -1; if(dst) *dst = tmpdst;

1 0

Piotr Caban : msvcrt: Don't forward _wtoi to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 5c03a35f7a78f158e79b86ab0cfb72b594439da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c03a35f7a78f158e79b86ab0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:23 2013 +0100 msvcrt: Don't forward _wtoi to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b648f88..ef5823c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1222,7 +1222,7 @@ # stub _wtmpnam_s(ptr long) @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l -@ cdecl _wtoi(wstr) ntdll._wtoi +@ cdecl _wtoi(wstr) MSVCRT__wtoi @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fe0b6ac..e00cb83 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1449,7 +1449,7 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, /********************************************************************* * _wtoi_l (MSVCRT.@) */ -int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +int __cdecl MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); @@ -1464,6 +1464,14 @@ int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) } /********************************************************************* + * _wtoi (MSVCRT.@) + */ +int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtoi_l(str, NULL); +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Jacek Caban : secur32: Added support for grbitEnabledProtocols in schan_AcquireClientCredentials.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 0f2e0365ea1f5c6baba4cfd9c0ff69defe66d7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2e0365ea1f5c6baba4cfd9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:23 2013 +0100 secur32: Added support for grbitEnabledProtocols in schan_AcquireClientCredentials. --- dlls/secur32/schannel.c | 169 ++++++++++++++++++++++++++++++++++++------- dlls/secur32/secur32_priv.h | 1 + 2 files changed, 145 insertions(+), 25 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 387eaad..87bb942 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -25,10 +25,13 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winnls.h" #include "sspi.h" #include "schannel.h" #include "secur32_priv.h" + +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -62,6 +65,12 @@ static struct schan_handle *schan_free_handles; static SIZE_T schan_handle_table_size; static SIZE_T schan_handle_count; +/* Protocols enabled, only those may be used for the connection. */ +static DWORD config_enabled_protocols; + +/* Protocols disabled by default. They are enabled for using, but disabled when caller asks for default settings. */ +static DWORD config_default_disabled_protocols; + static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) { struct schan_handle *handle; @@ -141,11 +150,110 @@ static void *schan_get_object(ULONG_PTR handle_idx, enum schan_handle_type type) return handle->object; } +static void read_config(void) +{ + DWORD enabled = 0, default_disabled = 0; + HKEY protocols_key, key; + WCHAR subkey_name[64]; + unsigned i; + DWORD res; + + static BOOL config_read = FALSE; + + static const WCHAR protocol_config_key_name[] = { + 'S','Y','S','T','E','M','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','c','u','r','i','t','y','P','r','o','v','i','d','e','r','s','\\', + 'S','C','H','A','N','N','E','L','\\', + 'P','r','o','t','o','c','o','l','s',0 }; + + static const WCHAR clientW[] = {'\\','C','l','i','e','n','t',0}; + static const WCHAR enabledW[] = {'e','n','a','b','l','e','d',0}; + static const WCHAR disabledbydefaultW[] = {'D','i','s','a','b','l','e','d','B','y','D','e','f','a','u','l','t',0}; + + static const struct { + WCHAR key_name[20]; + DWORD prot_client_flag; + BOOL enabled; /* If no config is present, enable the protocol */ + BOOL disabled_by_default; /* Disable if caller asks for default protocol set */ + } protocol_config_keys[] = { + {{'S','S','L',' ','2','.','0',0}, SP_PROT_SSL2_CLIENT, TRUE, TRUE}, + {{'S','S','L',' ','3','.','0',0}, SP_PROT_SSL3_CLIENT, TRUE, FALSE}, + {{'T','L','S',' ','1','.','0',0}, SP_PROT_TLS1_0_CLIENT, TRUE, FALSE}, + {{'T','L','S',' ','1','.','1',0}, SP_PROT_TLS1_1_CLIENT, TRUE, FALSE /* NOTE: not enabled by default on Windows */ }, + {{'T','L','S',' ','1','.','2',0}, SP_PROT_TLS1_2_CLIENT, TRUE, FALSE /* NOTE: not enabled by default on Windows */ } + }; + + /* No need for thread safety */ + if(config_read) + return; + + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, protocol_config_key_name, 0, KEY_READ, &protocols_key); + if(res == ERROR_SUCCESS) { + DWORD type, size, value; + + for(i=0; i < sizeof(protocol_config_keys)/sizeof(*protocol_config_keys); i++) { + strcpyW(subkey_name, protocol_config_keys[i].key_name); + strcatW(subkey_name, clientW); + res = RegOpenKeyExW(protocols_key, subkey_name, 0, KEY_READ, &key); + if(res != ERROR_SUCCESS) { + if(protocol_config_keys[i].enabled) + enabled |= protocol_config_keys[i].prot_client_flag; + if(protocol_config_keys[i].disabled_by_default) + default_disabled |= protocol_config_keys[i].prot_client_flag; + continue; + } + + size = sizeof(value); + res = RegQueryValueExW(key, enabledW, NULL, &type, (BYTE*)&value, &size); + if(res == ERROR_SUCCESS) { + if(type == REG_DWORD && value) + enabled |= protocol_config_keys[i].prot_client_flag; + }else if(protocol_config_keys[i].enabled) { + enabled |= protocol_config_keys[i].prot_client_flag; + } + + size = sizeof(value); + res = RegQueryValueExW(key, disabledbydefaultW, NULL, &type, (BYTE*)&value, &size); + if(res == ERROR_SUCCESS) { + if(type != REG_DWORD || value) + default_disabled |= protocol_config_keys[i].prot_client_flag; + }else if(protocol_config_keys[i].disabled_by_default) { + default_disabled |= protocol_config_keys[i].prot_client_flag; + } + + RegCloseKey(key); + } + }else { + /* No config, enable all known protocols. */ + for(i=0; i < sizeof(protocol_config_keys)/sizeof(*protocol_config_keys); i++) { + if(protocol_config_keys[i].enabled) + enabled |= protocol_config_keys[i].prot_client_flag; + if(protocol_config_keys[i].disabled_by_default) + default_disabled |= protocol_config_keys[i].prot_client_flag; + } + } + + RegCloseKey(protocols_key); + + config_enabled_protocols = enabled; + config_default_disabled_protocols = default_disabled; + config_read = TRUE; + + TRACE("enabled %x, disabled by default %x\n", config_enabled_protocols, config_default_disabled_protocols); +} + static SECURITY_STATUS schan_QueryCredentialsAttributes( PCredHandle phCredential, ULONG ulAttribute, VOID *pBuffer) { + struct schan_credentials *cred; SECURITY_STATUS ret; + cred = schan_get_object(phCredential->dwLower, SCHAN_HANDLE_CRED); + if(!cred) + return SEC_E_INVALID_HANDLE; + switch (ulAttribute) { case SECPKG_ATTR_SUPPORTED_ALGS: @@ -285,6 +393,8 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan PCredHandle phCredential, PTimeStamp ptsExpiry) { struct schan_credentials *creds; + unsigned enabled_protocols; + ULONG_PTR handle; SECURITY_STATUS st = SEC_E_OK; TRACE("schanCred %p, phCredential %p, ptsExpiry %p\n", schanCred, phCredential, ptsExpiry); @@ -292,40 +402,49 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (schanCred) { st = schan_CheckCreds(schanCred); - if (st == SEC_E_NO_CREDENTIALS) - st = SEC_E_OK; + if (st != SEC_E_OK && st != SEC_E_NO_CREDENTIALS) + return st; + + st = SEC_E_OK; + } + + read_config(); + if(schanCred && schanCred->grbitEnabledProtocols) + enabled_protocols = schanCred->grbitEnabledProtocols & config_enabled_protocols; + else + enabled_protocols = config_enabled_protocols & ~config_default_disabled_protocols; + if(!enabled_protocols) { + ERR("Could not find matching protocol\n"); + return SEC_E_NO_AUTHENTICATING_AUTHORITY; } /* For now, the only thing I'm interested in is the direction of the * connection, so just store it. */ - if (st == SEC_E_OK) - { - ULONG_PTR handle; + creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); + if (!creds) return SEC_E_INSUFFICIENT_MEMORY; - creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); - if (!creds) return SEC_E_INSUFFICIENT_MEMORY; - - handle = schan_alloc_handle(creds, SCHAN_HANDLE_CRED); - if (handle == SCHAN_INVALID_HANDLE) goto fail; + handle = schan_alloc_handle(creds, SCHAN_HANDLE_CRED); + if (handle == SCHAN_INVALID_HANDLE) goto fail; - creds->credential_use = SECPKG_CRED_OUTBOUND; - if (!schan_imp_allocate_certificate_credentials(creds)) - { - schan_free_handle(handle, SCHAN_HANDLE_CRED); - goto fail; - } + creds->credential_use = SECPKG_CRED_OUTBOUND; + if (!schan_imp_allocate_certificate_credentials(creds)) + { + schan_free_handle(handle, SCHAN_HANDLE_CRED); + goto fail; + } - phCredential->dwLower = handle; - phCredential->dwUpper = 0; + creds->enabled_protocols = enabled_protocols; + phCredential->dwLower = handle; + phCredential->dwUpper = 0; - /* Outbound credentials have no expiry */ - if (ptsExpiry) - { - ptsExpiry->LowPart = 0; - ptsExpiry->HighPart = 0; - } + /* Outbound credentials have no expiry */ + if (ptsExpiry) + { + ptsExpiry->LowPart = 0; + ptsExpiry->HighPart = 0; } + return st; fail: @@ -348,7 +467,7 @@ static SECURITY_STATUS schan_AcquireServerCredentials(const SCHANNEL_CRED *schan ULONG_PTR handle; struct schan_credentials *creds; - creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); + creds = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*creds)); if (!creds) return SEC_E_INSUFFICIENT_MEMORY; creds->credential_use = SECPKG_CRED_INBOUND; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index bc4b74b..5b2ac89 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -214,6 +214,7 @@ typedef struct schan_credentials { ULONG credential_use; void *credentials; + DWORD enabled_protocols; } schan_credentials; struct schan_transport;

1 0

Ken Thomases : winemac: Set the ordering of color modes explicitly to reduce chance of picking an odd one .
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 81d1bfd65d45c6565bce7effaf54aa4507bcd450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d1bfd65d45c6565bce7effa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 07:01:37 2013 -0500 winemac: Set the ordering of color modes explicitly to reduce chance of picking an odd one. --- dlls/winemac.drv/opengl.c | 91 ++++++++++++++++++++++++--------------------- 1 files changed, 49 insertions(+), 42 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 58fd951..8a29d89 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -115,33 +115,55 @@ struct color_mode { int blue_bits, blue_shift; GLint alpha_bits, alpha_shift; BOOL is_float; + int color_ordering; }; +/* The value of "color_ordering" is somewhat arbitrary. It incorporates some + observations of the behavior of Windows systems, but also subjective judgments + about what color formats are more "normal" than others. + + On at least some Windows systems, integer color formats are listed before + floating-point formats. Within the integer formats, higher color bits were + usually listed before lower color bits, while for floating-point formats it + was the reverse. However, that leads D3D to select 64-bit integer formats in + preference to 32-bit formats when the latter would be sufficient. It seems + that a 32-bit format is much more likely to be normally used in that case. + + Also, there are certain odd color formats supported on the Mac which seem like + they would be less appropriate than more common ones. For instance, the color + formats with alpha in a separate byte (e.g. kCGLRGB888A8Bit with R8G8B8 in one + 32-bit value and A8 in a separate 8-bit value) and the formats with 10-bit RGB + components. + + For two color formats which differ only in whether or not they have alpha bits, + we use the same ordering. pixel_format_comparator() gives alpha bits a + different weight than color formats. + */ static const struct color_mode color_modes[] = { - { kCGLRGB444Bit, 16, 12, 4, 8, 4, 4, 4, 0, 0, 0, FALSE }, - { kCGLARGB4444Bit, 16, 16, 4, 8, 4, 4, 4, 0, 4, 12, FALSE }, - { kCGLRGB444A8Bit, 24, 20, 4, 8, 4, 4, 4, 0, 8, 16, FALSE }, - { kCGLRGB555Bit, 16, 15, 5, 10, 5, 5, 5, 0, 0, 0, FALSE }, - { kCGLARGB1555Bit, 16, 16, 5, 10, 5, 5, 5, 0, 1, 15, FALSE }, - { kCGLRGB555A8Bit, 24, 23, 5, 10, 5, 5, 5, 0, 8, 16, FALSE }, - { kCGLRGB565Bit, 16, 16, 5, 11, 6, 5, 5, 0, 0, 0, FALSE }, - { kCGLRGB565A8Bit, 24, 24, 5, 11, 6, 5, 5, 0, 8, 16, FALSE }, - { kCGLRGB888Bit, 32, 24, 8, 16, 8, 8, 8, 0, 0, 0, FALSE }, - { kCGLARGB8888Bit, 32, 32, 8, 16, 8, 8, 8, 0, 8, 24, FALSE }, - { kCGLRGB888A8Bit, 40, 32, 8, 16, 8, 8, 8, 0, 8, 32, FALSE }, - { kCGLRGB101010Bit, 32, 30, 10, 20, 10, 10, 10, 0, 0, 0, FALSE }, - { kCGLARGB2101010Bit, 32, 32, 10, 20, 10, 10, 10, 0, 2, 30, FALSE }, - { kCGLRGB101010_A8Bit, 40, 38, 10, 20, 10, 10, 10, 0, 8, 32, FALSE }, - { kCGLRGB121212Bit, 48, 36, 12, 24, 12, 12, 12, 0, 0, 0, FALSE }, - { kCGLARGB12121212Bit, 48, 48, 12, 24, 12, 12, 12, 0, 12, 36, FALSE }, - { kCGLRGB161616Bit, 64, 48, 16, 48, 16, 32, 16, 16, 0, 0, FALSE }, - { kCGLRGBA16161616Bit, 64, 64, 16, 48, 16, 32, 16, 16, 16, 0, FALSE }, - { kCGLRGBFloat64Bit, 64, 48, 16, 32, 16, 16, 16, 0, 0, 0, TRUE }, - { kCGLRGBAFloat64Bit, 64, 64, 16, 48, 16, 32, 16, 16, 16, 0, TRUE }, - { kCGLRGBFloat128Bit, 128, 96, 32, 96, 32, 64, 32, 32, 0, 0, TRUE }, - { kCGLRGBAFloat128Bit, 128, 128, 32, 96, 32, 64, 32, 32, 32, 0, TRUE }, - { kCGLRGBFloat256Bit, 256, 192, 64, 192, 64, 128, 64, 64, 0, 0, TRUE }, - { kCGLRGBAFloat256Bit, 256, 256, 64, 192, 64, 128, 64, 64, 64, 0, TRUE }, + { kCGLRGB444Bit, 16, 12, 4, 8, 4, 4, 4, 0, 0, 0, FALSE, 5 }, + { kCGLARGB4444Bit, 16, 16, 4, 8, 4, 4, 4, 0, 4, 12, FALSE, 5 }, + { kCGLRGB444A8Bit, 24, 20, 4, 8, 4, 4, 4, 0, 8, 16, FALSE, 10 }, + { kCGLRGB555Bit, 16, 15, 5, 10, 5, 5, 5, 0, 0, 0, FALSE, 4 }, + { kCGLARGB1555Bit, 16, 16, 5, 10, 5, 5, 5, 0, 1, 15, FALSE, 4 }, + { kCGLRGB555A8Bit, 24, 23, 5, 10, 5, 5, 5, 0, 8, 16, FALSE, 9 }, + { kCGLRGB565Bit, 16, 16, 5, 11, 6, 5, 5, 0, 0, 0, FALSE, 3 }, + { kCGLRGB565A8Bit, 24, 24, 5, 11, 6, 5, 5, 0, 8, 16, FALSE, 8 }, + { kCGLRGB888Bit, 32, 24, 8, 16, 8, 8, 8, 0, 0, 0, FALSE, 0 }, + { kCGLARGB8888Bit, 32, 32, 8, 16, 8, 8, 8, 0, 8, 24, FALSE, 0 }, + { kCGLRGB888A8Bit, 40, 32, 8, 16, 8, 8, 8, 0, 8, 32, FALSE, 7 }, + { kCGLRGB101010Bit, 32, 30, 10, 20, 10, 10, 10, 0, 0, 0, FALSE, 6 }, + { kCGLARGB2101010Bit, 32, 32, 10, 20, 10, 10, 10, 0, 2, 30, FALSE, 6 }, + { kCGLRGB101010_A8Bit, 40, 38, 10, 20, 10, 10, 10, 0, 8, 32, FALSE, 11 }, + { kCGLRGB121212Bit, 48, 36, 12, 24, 12, 12, 12, 0, 0, 0, FALSE, 2 }, + { kCGLARGB12121212Bit, 48, 48, 12, 24, 12, 12, 12, 0, 12, 36, FALSE, 2 }, + { kCGLRGB161616Bit, 64, 48, 16, 48, 16, 32, 16, 16, 0, 0, FALSE, 1 }, + { kCGLRGBA16161616Bit, 64, 64, 16, 48, 16, 32, 16, 16, 16, 0, FALSE, 1 }, + { kCGLRGBFloat64Bit, 64, 48, 16, 32, 16, 16, 16, 0, 0, 0, TRUE, 12 }, + { kCGLRGBAFloat64Bit, 64, 64, 16, 48, 16, 32, 16, 16, 16, 0, TRUE, 12 }, + { kCGLRGBFloat128Bit, 128, 96, 32, 96, 32, 64, 32, 32, 0, 0, TRUE, 13 }, + { kCGLRGBAFloat128Bit, 128, 128, 32, 96, 32, 64, 32, 32, 32, 0, TRUE, 13 }, + { kCGLRGBFloat256Bit, 256, 192, 64, 192, 64, 128, 64, 64, 0, 0, TRUE, 14 }, + { kCGLRGBAFloat256Bit, 256, 256, 64, 192, 64, 128, 64, 64, 64, 0, TRUE, 15 }, }; @@ -837,25 +859,10 @@ static CFComparisonResult pixel_format_comparator(const void *val1, const void * if (!pf1.accelerated && pf2.accelerated) return kCFCompareGreaterThan; - /* Integer color modes before floating-point. */ - if (!color_modes[pf1.color_mode].is_float && color_modes[pf2.color_mode].is_float) - return kCFCompareLessThan; - if (color_modes[pf1.color_mode].is_float && !color_modes[pf2.color_mode].is_float) - return kCFCompareGreaterThan; - - /* For integer color modes, higher color bits before lower. For floating-point mode, - the reverse. */ - if (color_modes[pf1.color_mode].color_bits - color_modes[pf1.color_mode].alpha_bits > - color_modes[pf2.color_mode].color_bits - color_modes[pf2.color_mode].alpha_bits) - return color_modes[pf1.color_mode].is_float ? kCFCompareGreaterThan : kCFCompareLessThan; - if (color_modes[pf1.color_mode].color_bits - color_modes[pf1.color_mode].alpha_bits < - color_modes[pf2.color_mode].color_bits - color_modes[pf2.color_mode].alpha_bits) - return color_modes[pf1.color_mode].is_float ? kCFCompareLessThan : kCFCompareGreaterThan; - - /* Mac-ism: in the rare case that color bits are equal but bpp are not, prefer fewer bpp. */ - if (color_modes[pf1.color_mode].bits_per_pixel < color_modes[pf2.color_mode].bits_per_pixel) + /* Explicit color mode ordering. */ + if (color_modes[pf1.color_mode].color_ordering < color_modes[pf2.color_mode].color_ordering) return kCFCompareLessThan; - if (color_modes[pf1.color_mode].bits_per_pixel > color_modes[pf2.color_mode].bits_per_pixel) + if (color_modes[pf1.color_mode].color_ordering > color_modes[pf2.color_mode].color_ordering) return kCFCompareGreaterThan; /* Non-pbuffer-capable before pbuffer-capable. */

1 0

Alexandre Julliard : winetest: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: c94d461731bd64f831e0bafd932e1125fa2e9dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94d461731bd64f831e0bafd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:02:29 2013 +0100 winetest: Add a 256x256 icon. --- programs/winetest/winetest.ico | Bin 25214 -> 56697 bytes programs/winetest/winetest.svg | 1587 +++++++++++++++++++++++++++++++++++----- 2 files changed, 1396 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c94d461731bd64f831e0b…

1 0

Alexandre Julliard : winemine: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 182fbdc64f0b719aa763a51c960da2f6ff4589d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=182fbdc64f0b719aa763a51c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:02:23 2013 +0100 winemine: Add a 256x256 icon. --- programs/winemine/winemine.ico | Bin 25214 -> 67842 bytes programs/winemine/winemine.svg | 994 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 896 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=182fbdc64f0b719aa763a…

1 0

Alexandre Julliard : winefile: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: e8cc9c69a4d55a3c37de8f80752c6251c1b179c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cc9c69a4d55a3c37de8f807… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:58:39 2013 +0100 winefile: Add a 256x256 icon. --- programs/winefile/winefile.ico | Bin 25214 -> 47032 bytes programs/winefile/winefile.svg | 1775 +++++++++++++++++++++++++++++++++++----- 2 files changed, 1575 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cc9c69a4d55a3c37de8…

1 0

Alexandre Julliard : winecfg: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 5a0e0717c323e4eb9ed53b9e71743602e395e763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0e0717c323e4eb9ed53b9e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:56:19 2013 +0100 winecfg: Add a 256x256 icon. --- programs/winecfg/winecfg.ico | Bin 25214 -> 65188 bytes programs/winecfg/winecfg.svg | 2604 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2305 insertions(+), 299 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a0e0717c323e4eb9ed53…

1 0

Alexandre Julliard : taskmgr: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 24ac29e19021c3c5afd327d9edcdd2ca358bbd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ac29e19021c3c5afd327d9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:53:09 2013 +0100 taskmgr: Add a 256x256 icon. --- programs/taskmgr/taskmgr.ico | Bin 25214 -> 66719 bytes programs/taskmgr/taskmgr.svg | 2410 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2144 insertions(+), 266 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24ac29e19021c3c5afd32…

1 0

Alexandre Julliard : regedit: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 1090077e73b368feec8d9fac4688f5094b65baad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1090077e73b368feec8d9fac4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:51:20 2013 +0100 regedit: Add a 256x256 icon. --- programs/regedit/regedit.ico | Bin 25214 -> 60340 bytes programs/regedit/regedit.svg | 1865 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 1650 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1090077e73b368feec8d9…

1 0

Alexandre Julliard : inetcpl.cpl: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 27a93bfc13c9025b64e43200477cca33cf7b50c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a93bfc13c9025b64e432004… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:34:36 2013 +0100 inetcpl.cpl: Add a 256x256 icon. --- dlls/inetcpl.cpl/inetcpl.ico | Bin 25214 -> 82992 bytes dlls/inetcpl.cpl/inetcpl.svg | 2620 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2358 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27a93bfc13c9025b64e43…

1 0

Alexandre Julliard : appwiz.cpl: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 7964bd820f4bbbe4bf0c90108f711071ab2b49e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7964bd820f4bbbe4bf0c90108… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:34:29 2013 +0100 appwiz.cpl: Add a 256x256 icon. --- dlls/appwiz.cpl/appwiz.ico | Bin 25214 -> 49609 bytes dlls/appwiz.cpl/appwiz.svg | 2157 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 1903 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7964bd820f4bbbe4bf0c9…

1 0

Alexandre Julliard : wordpad: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: d1cebac78d527e0bf46f9d4b059f81ccd284edef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1cebac78d527e0bf46f9d4b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:06:16 2013 +0100 wordpad: Add a 256x256 icon. --- programs/wordpad/wordpad.ico | Bin 25214 -> 58342 bytes programs/wordpad/wordpad.svg | 3816 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 3473 insertions(+), 343 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1cebac78d527e0bf46f9…

1 0

Alexandre Julliard : winhlp32: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 4a99f2d4ca3553421a57cb2d54d8c741ee025120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a99f2d4ca3553421a57cb2d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:04:29 2013 +0100 winhlp32: Add a 256x256 icon. --- programs/winhlp32/winhelp.ico | Bin 25214 -> 67901 bytes programs/winhlp32/winhelp.svg | 2063 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 1843 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a99f2d4ca3553421a57c…

1 0

Piotr Caban : d3dx10: Match parameters list with function we' re forwarding to.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 9f855ae4bb61ff5fed518397b8cebac36fa3e32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f855ae4bb61ff5fed518397b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:01 2013 +0100 d3dx10: Match parameters list with function we're forwarding to. --- dlls/d3dx10_33/d3dx10_33.spec | 8 ++++---- dlls/d3dx10_34/d3dx10_34.spec | 8 ++++---- dlls/d3dx10_35/d3dx10_35.spec | 8 ++++---- dlls/d3dx10_36/d3dx10_36.spec | 8 ++++---- dlls/d3dx10_37/d3dx10_37.spec | 8 ++++---- dlls/d3dx10_38/d3dx10_38.spec | 8 ++++---- dlls/d3dx10_39/d3dx10_39.spec | 8 ++++---- dlls/d3dx10_40/d3dx10_40.spec | 8 ++++---- dlls/d3dx10_41/d3dx10_41.spec | 8 ++++---- dlls/d3dx10_42/d3dx10_42.spec | 8 ++++---- dlls/d3dx10_43/d3dx10_43.spec | 8 ++++---- 11 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f855ae4bb61ff5fed518…

1 0

Alexandre Julliard : buildimage: Store large images as raw PNG files in icons.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 0aa3ae18f8ef828fe08be6ff182862c3ed1086f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa3ae18f8ef828fe08be6ff1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 13:44:18 2013 +0100 buildimage: Store large images as raw PNG files in icons. --- tools/buildimage | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/buildimage b/tools/buildimage index b307497..442bb3e 100755 --- a/tools/buildimage +++ b/tools/buildimage @@ -38,6 +38,7 @@ die "Only BMP and ICO outputs are supported" unless $ext eq "bmp" or $ext eq "ic my $renderedSVGFileName = "$svgFileName.png"; my @pngFiles; +my @pngFilesRaw; # Get the programs from the environment variables my $convert = $ENV{"CONVERT"} || "convert"; @@ -49,6 +50,7 @@ sub cleanup() { unlink $renderedSVGFileName; unlink $_ foreach(@pngFiles); + unlink $_ foreach(@pngFilesRaw); } $SIG{"INT"} = "cleanup"; @@ -73,6 +75,8 @@ sub svg_element_start my $size = 0; my $depth = 0; + my $width = 0; + my $height = 0; if($ext eq "ico") { return unless $id =~ /icon:(\d*)-(\d*)/; @@ -100,8 +104,8 @@ sub svg_element_start # Extract SVG vector images my $x = $attr{'x'}; my $y = $attr{'y'}; - my $width = $attr{'width'}; - my $height = $attr{'height'}; + $width = $attr{'width'}; + $height = $attr{'height'}; if(defined($x) and defined($x)) { if($x =~ /\d*/ and $y =~ /\d*/) { @@ -126,7 +130,14 @@ sub svg_element_start return; } - push(@pngFiles, $pngFileName); + if ($width >= 128 && $height >= 128) + { + push(@pngFilesRaw, $pngFileName); + } + else + { + push(@pngFiles, $pngFileName); + } } # Render the SVG image @@ -138,7 +149,7 @@ my $parser = new XML::Parser( $parser->parsefile("$svgFileName"); # If no render directives were found, take the full image as-is -unless(@pngFiles) { +unless (@pngFiles || @pngFilesRaw) { my $pngFileName = "bmp$renderedSVGFileName"; copy($renderedSVGFileName, $pngFileName) or die "File could not be copied"; push(@pngFiles, $pngFileName); @@ -148,7 +159,7 @@ unless(@pngFiles) { if($ext eq "ico") { # Place images into the ICO - shell $icotool, "-c", "-o", $outFileName, @pngFiles; + shell $icotool, "-c", "-o", $outFileName, @pngFiles, map { "--raw=$_"; } @pngFilesRaw; } elsif($ext eq "bmp") {

1 0

Alexandre Julliard : wrc: Add support for PNG icons.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: c9d806a0d19379ee8f6dd50bb0945e714bfa847d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d806a0d19379ee8f6dd50bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 13:26:22 2013 +0100 wrc: Add support for PNG icons. --- tools/wrc/newstruc.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 4651617..52bafbd 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -34,6 +34,8 @@ #include "wingdi.h" /* for BITMAPINFOHEADER */ +#define ICO_PNG_MAGIC 0x474e5089 + #include <pshpack2.h> typedef struct { @@ -397,27 +399,28 @@ static int convert_bitmap(char *data, int size) } bmsize = bih->bV5Size; - if (bmsize >> 16) /* assume swapped */ - { -#ifndef WORDS_BIGENDIAN - type |= FL_SIZEBE; -#endif - bmsize = BYTESWAP_DWORD( bmsize ); - } - else - { -#ifdef WORDS_BIGENDIAN - type |= FL_SIZEBE; -#endif - } - switch (bmsize) { case sizeof(BITMAPOS2HEADER): case sizeof(BITMAPINFOHEADER): case sizeof(BITMAPV4HEADER): case sizeof(BITMAPV5HEADER): +#ifdef WORDS_BIGENDIAN + type |= FL_SIZEBE; +#endif + break; + case BYTESWAP_DWORD( sizeof(BITMAPOS2HEADER) ): + case BYTESWAP_DWORD( sizeof(BITMAPINFOHEADER) ): + case BYTESWAP_DWORD( sizeof(BITMAPV4HEADER) ): + case BYTESWAP_DWORD( sizeof(BITMAPV5HEADER) ): +#ifndef WORDS_BIGENDIAN + type |= FL_SIZEBE; +#endif + bmsize = BYTESWAP_DWORD( bmsize ); break; + case ICO_PNG_MAGIC: + case BYTESWAP_DWORD( ICO_PNG_MAGIC ): + return 0; /* nothing to convert */ default: parser_error("Invalid bitmap format, bih->biSize = %d", bih->bV5Size); }

1 0

Alistair Leslie-Hughes : iads.idl: Add missing interfaces.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: a4cb7c46fe26e638fd7f4e1bf86dece636c08363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4cb7c46fe26e638fd7f4e1bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 21 09:20:02 2013 +1100 iads.idl: Add missing interfaces. --- include/iads.idl | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 287 insertions(+), 0 deletions(-) diff --git a/include/iads.idl b/include/iads.idl index 2a1aa13..de5730d 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -60,6 +60,269 @@ typedef enum ADS_AUTH_RESERVED = 0x80000000 } ADS_AUTHENTICATION_ENUM; +typedef enum +{ + ADS_SEARCHPREF_ASYNCHRONOUS, + ADS_SEARCHPREF_DEREF_ALIASES, + ADS_SEARCHPREF_SIZE_LIMIT, + ADS_SEARCHPREF_TIME_LIMIT, + ADS_SEARCHPREF_ATTRIBTYPES_ONLY, + ADS_SEARCHPREF_SEARCH_SCOPE, + ADS_SEARCHPREF_TIMEOUT, + ADS_SEARCHPREF_PAGESIZE, + ADS_SEARCHPREF_PAGED_TIME_LIMIT, + ADS_SEARCHPREF_CHASE_REFERRALS, + ADS_SEARCHPREF_SORT_ON, + ADS_SEARCHPREF_CACHE_RESULTS, + ADS_SEARCHPREF_DIRSYNC, + ADS_SEARCHPREF_TOMBSTONE, + ADS_SEARCHPREF_VLV, + ADS_SEARCHPREF_ATTRIBUTE_QUERY, + ADS_SEARCHPREF_SECURITY_MASK, + ADS_SEARCHPREF_DIRSYNC_FLAG, + ADS_SEARCHPREF_EXTENDED_DN +} ADS_SEARCHPREF_ENUM; + +typedef ADS_SEARCHPREF_ENUM *PADS_SEARCHPREF_INFO; + +typedef enum +{ + ADS_STATUS_S_OK, + ADS_STATUS_INVALID_SEARCHPREF, + ADS_STATUS_INVALID_SEARCHPREFVALUE +} ADS_STATUSENUM; + +typedef enum +{ + ADSTYPE_INVALID, + ADSTYPE_DN_STRING, + ADSTYPE_CASE_EXACT_STRING, + ADSTYPE_CASE_IGNORE_STRING, + ADSTYPE_PRINTABLE_STRING, + ADSTYPE_NUMERIC_STRING, + ADSTYPE_BOOLEAN, + ADSTYPE_INTEGER, + ADSTYPE_OCTET_STRING, + ADSTYPE_UTC_TIME, + ADSTYPE_LARGE_INTEGER, + ADSTYPE_PROV_SPECIFIC, + ADSTYPE_OBJECT_CLASS, + ADSTYPE_CASEIGNORE_LIST, + ADSTYPE_OCTET_LIST, + ADSTYPE_PATH, + ADSTYPE_POSTALADDRESS, + ADSTYPE_TIMESTAMP, + ADSTYPE_BACKLINK, + ADSTYPE_TYPEDNAME, + ADSTYPE_HOLD, + ADSTYPE_NETADDRESS, + ADSTYPE_REPLICAPOINTER, + ADSTYPE_FAXNUMBER, + ADSTYPE_EMAIL, + ADSTYPE_NT_SECURITY_DESCRIPTOR, + ADSTYPE_UNKNOWN, + ADSTYPE_DN_WITH_BINARY, + ADSTYPE_DN_WITH_STRING +} ADSTYPEENUM; + +typedef enum +{ + ADS_PASSWORD_ENCODE_REQUIRE_SSL, + ADS_PASSWORD_ENCODE_CLEAR +} ADS_PASSWORD_ENCODING_ENUM; + +typedef struct _ADS_CASEIGNORE_LIST +{ + struct _ADS_CASEIGNORE_LIST *Next; + LPWSTR String; +} ADS_CASEIGNORE_LIST; + +typedef struct _ADS_OCTET_LIST +{ + struct _ADS_OCTET_LIST *Next; + DWORD Length; + BYTE *Data; +} ADS_OCTET_LIST; + +typedef struct +{ + DWORD Type; + LPWSTR VolumeName; + LPWSTR Path; +} ADS_PATH, *PADS_PATH; + +typedef struct +{ + DWORD WholeSeconds; + DWORD EventID; +} ADS_TIMESTAMP; + + +typedef ADSTYPEENUM ADSTYPE; +typedef LPWSTR ADS_DN_STRING; +typedef LPWSTR *PADS_DN_STRING; +typedef LPWSTR ADS_CASE_EXACT_STRING; +typedef LPWSTR *PADS_CASE_EXACT_STRING; +typedef LPWSTR ADS_CASE_IGNORE_STRING; +typedef LPWSTR *PADS_CASE_IGNORE_STRING; +typedef LPWSTR ADS_PRINTABLE_STRING; +typedef LPWSTR *PADS_PRINTABLE_STRING; +typedef LPWSTR ADS_NUMERIC_STRING; +typedef LPWSTR *PADS_NUMERIC_STRING; +typedef DWORD ADS_BOOLEAN; +typedef DWORD *LPNDS_BOOLEAN; +typedef DWORD ADS_INTEGER; +typedef DWORD *PADS_INTEGER; +typedef SYSTEMTIME ADS_UTC_TIME; +typedef SYSTEMTIME *PADS_UTC_TIME; +typedef LARGE_INTEGER ADS_LARGE_INTEGER; +typedef LARGE_INTEGER *PADS_LARGE_INTEGER; +typedef LPWSTR ADS_OBJECT_CLASS; +typedef LPWSTR *PADS_OBJECT_CLASS; +typedef struct _ADS_OCTET_LIST *PADS_OCTET_LIST; +typedef struct _ADS_CASEIGNORE_LIST *PADS_CASEIGNORE_LIST; +typedef ADS_STATUSENUM ADS_STATUS; +typedef ADS_SEARCHPREF_ENUM ADS_SEARCHPREF; +typedef HANDLE ADS_SEARCH_HANDLE; +typedef HANDLE *PADS_SEARCH_HANDLE; + + +typedef struct +{ + DWORD dwLength; + BYTE *lpValue; +} ADS_OCTET_STRING; + +typedef struct +{ + DWORD dwLength; + BYTE *lpValue; +} ADS_PROV_SPECIFIC; + +typedef struct +{ + LPWSTR PostalAddress[ 6 ]; +} ADS_POSTALADDRESS, *PADS_POSTALADDRESS; + +typedef struct +{ + LPWSTR ObjectName; + DWORD Level; + DWORD Interval; +} ADS_TYPEDNAME, *PADS_TYPEDNAME; + +typedef struct +{ + DWORD RemoteID; + LPWSTR ObjectName; +} ADS_BACKLINK; + +typedef struct +{ + LPWSTR ObjectName; + DWORD Amount; +} ADS_HOLD; + +typedef struct +{ + DWORD AddressType; + DWORD AddressLength; + BYTE *Address; +} ADS_NETADDRESS, *PADS_NETADDRESS; + +typedef struct +{ + LPWSTR ServerName; + DWORD ReplicaType; + DWORD ReplicaNumber; + DWORD Count; + PADS_NETADDRESS ReplicaAddressHints; +} ADS_REPLICAPOINTER, *PADS_REPLICAPOINTER; + +typedef struct +{ + LPWSTR TelephoneNumber; + DWORD NumberOfBits; + BYTE *Parameters; +} ADS_FAXNUMBER, *PADS_FAXNUMBER; + + +typedef struct +{ + LPWSTR Address; + DWORD Type; +} ADS_EMAIL, *PADS_EMAIL; + +typedef struct +{ + DWORD dwLength; + BYTE *lpValue; +} ADS_NT_SECURITY_DESCRIPTOR; + +typedef struct +{ + DWORD dwLength; + BYTE *lpBinaryValue; + LPWSTR pszDNString; +} ADS_DN_WITH_BINARY, *PADS_DN_WITH_BINARY; + +typedef struct +{ + LPWSTR pszStringValue; + LPWSTR pszDNString; +} ADS_DN_WITH_STRING, *PADS_DN_WITH_STRING; + +typedef struct _adsvalue +{ + ADSTYPE dwType; + union + { + ADS_DN_STRING DNString; + ADS_CASE_EXACT_STRING CaseExactString; + ADS_CASE_IGNORE_STRING CaseIgnoreString; + ADS_PRINTABLE_STRING PrintableString; + ADS_NUMERIC_STRING NumericString; + ADS_BOOLEAN Boolean; + ADS_INTEGER Integer; + ADS_OCTET_STRING OctetString; + ADS_UTC_TIME UTCTime; + ADS_LARGE_INTEGER LargeInteger; + ADS_OBJECT_CLASS ClassName; + ADS_PROV_SPECIFIC ProviderSpecific; + PADS_CASEIGNORE_LIST pCaseIgnoreList; + PADS_OCTET_LIST pOctetList; + PADS_PATH pPath; + PADS_POSTALADDRESS pPostalAddress; + ADS_TIMESTAMP Timestamp; + ADS_BACKLINK BackLink; + PADS_TYPEDNAME pTypedName; + ADS_HOLD Hold; + PADS_NETADDRESS pNetAddress; + PADS_REPLICAPOINTER pReplicaPointer; + PADS_FAXNUMBER pFaxNumber; + ADS_EMAIL Email; + ADS_NT_SECURITY_DESCRIPTOR SecurityDescriptor; + PADS_DN_WITH_BINARY pDNWithBinary; + PADS_DN_WITH_STRING pDNWithString; + }; +} ADSVALUE, *PADSVALUE; + +typedef struct ads_searchpref_info +{ + ADS_SEARCHPREF dwSearchPref; + ADSVALUE vValue; + ADS_STATUS dwStatus; +} ADS_SEARCHPREF_INFO; + +typedef struct ads_search_column +{ + LPWSTR pszAttrName; + ADSTYPE dwADsType; + PADSVALUE pADsValues; + DWORD dwNumValues; + HANDLE hReserved; +} ADS_SEARCH_COLUMN, *PADS_SEARCH_COLUMN; + /***************************************************************************** * IADsContainer interface */ @@ -490,3 +753,27 @@ interface IADsUser : IADs [id(0x00000044)] HRESULT ChangePassword([in] BSTR bstrOldPassword, [in] BSTR bstrNewPassword); }; + +/***************************************************************************** + * IDirectorySearch interface + */ +[ + odl, + local, + uuid(109BA8EC-92F0-11D0-A790-00C04FD8D5A8) +] +interface IDirectorySearch : IUnknown +{ + HRESULT SetSearchPreference([in] PADS_SEARCHPREF_INFO pSearchPrefs, [in] DWORD dwNumPrefs); + HRESULT ExecuteSearch([in] LPWSTR pszSearchFilter, [in] LPWSTR* pAttributeNames, + [in] DWORD dwNumberAttributes, [out] PADS_SEARCH_HANDLE phSearchResult); + HRESULT AbandonSearch([in] ADS_SEARCH_HANDLE phSearchResult); + HRESULT GetFirstRow([in] ADS_SEARCH_HANDLE hSearchResult); + HRESULT GetNextRow([in] ADS_SEARCH_HANDLE hSearchResult); + HRESULT GetPreviousRow([in] ADS_SEARCH_HANDLE hSearchResult); + HRESULT GetNextColumnName([in] ADS_SEARCH_HANDLE hSearchHandle, [out] LPWSTR* ppszColumnName); + HRESULT GetColumn( [in] ADS_SEARCH_HANDLE hSearchResult, [in] LPWSTR szColumnName, + [out] PADS_SEARCH_COLUMN pSearchColumn); + HRESULT FreeColumn([in] PADS_SEARCH_COLUMN pSearchColumn); + HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); +};

1 0

Austin English : ntdll: Add a stub for RtlConvertToAutoInheritSecurityObject.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 56057acdcddd91169c94c996113b9b379ccb58a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56057acdcddd91169c94c9961… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 26 15:38:08 2013 -0700 ntdll: Add a stub for RtlConvertToAutoInheritSecurityObject. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b0cb43a..60f70b1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -463,7 +463,7 @@ # @ stub RtlConvertPropertyToVariant @ stub RtlConvertSharedToExclusive @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) -# @ stub RtlConvertToAutoInheritSecurityObject +@ stdcall RtlConvertToAutoInheritSecurityObject(ptr ptr ptr ptr long ptr) @ stub RtlConvertUiListToApiList @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) # @ stub RtlConvertVariantToProperty diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 5e27730..b9eeccd 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1807,3 +1807,16 @@ NTSTATUS WINAPI RtlQueryInformationAcl( return status; } + +BOOL WINAPI RtlConvertToAutoInheritSecurityObject( + PSECURITY_DESCRIPTOR pdesc, + PSECURITY_DESCRIPTOR cdesc, + PSECURITY_DESCRIPTOR* ndesc, + GUID* objtype, + BOOL isdir, + PGENERIC_MAPPING genmap ) +{ + FIXME("%p %p %p %p %d %p - stub\n", pdesc, cdesc, ndesc, objtype, isdir, genmap); + + return FALSE; +}

1 0

Jacek Caban : jscript: Use helpers to access string buffer in object.c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: b7ffca591d20c839ddc18ba01e352ae4d6fd0774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ffca591d20c839ddc18ba01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:04:09 2013 +0100 jscript: Use helpers to access string buffer in object.c. --- dlls/jscript/object.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 6f597d6..4ad764b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -130,9 +130,14 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; if(is_jsdisp(jsthis)) { + const WCHAR *name_str; BOOL result; - hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name->str, &result); + name_str = jsstr_flatten(name); + if(name_str) + hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name_str, &result); + else + hres = E_OUTOFMEMORY; jsstr_release(name); if(FAILED(hres)) return hres; @@ -164,7 +169,8 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsstr_t *name; + const WCHAR *name; + jsstr_t *name_str; BOOL ret; HRESULT hres; @@ -180,12 +186,12 @@ static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, W return E_FAIL; } - hres = to_string(ctx, argv[0], &name); + hres = to_flat_string(ctx, argv[0], &name_str, &name); if(FAILED(hres)) return hres; - hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name->str, &ret); - jsstr_release(name); + hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name, &ret); + jsstr_release(name_str); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Use to_flat_string to access string buffer in array. c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: ecdf62d3244baf464765ded17565d3ec6409e842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdf62d3244baf464765ded17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:01:59 2013 +0100 jscript: Use to_flat_string to access string buffer in array.c. --- dlls/jscript/array.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 49a39dd..c98f4fe 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -337,15 +337,16 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne return hres; if(argc) { - jsstr_t *sep; + const WCHAR *sep; + jsstr_t *sep_str; - hres = to_string(ctx, argv[0], &sep); + hres = to_flat_string(ctx, argv[0], &sep_str, &sep); if(FAILED(hres)) return hres; - hres = array_join(ctx, jsthis, length, sep->str, r); + hres = array_join(ctx, jsthis, length, sep, r); - jsstr_release(sep); + jsstr_release(sep_str); }else { hres = array_join(ctx, jsthis, length, default_separatorW, r); }

1 0

Piotr Caban : shell32: Match parameters list with function we' re forwarding to.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 6a0f7521ed439bada37573996524f2d1a699b8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f7521ed439bada37573996… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:15 2013 +0100 shell32: Match parameters list with function we're forwarding to. --- dlls/shell32/shell32.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 790cc9f..0f991a4 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -private @(long long long str long) shell.dll16.RunDLL_CallEntry16 + 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr) @@ -445,13 +445,13 @@ @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA -@ stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrNCmpA(str str long) shlwapi.StrCmpNA @ stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA @ stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA -@ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrNCpyW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrRChrA(str str long) shlwapi.StrRChrA @ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA @ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW

1 0

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_SetCurrentHlink().
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 29d37bd71468f5d10abe6e1bceb1eab1e17f8132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d37bd71468f5d10abe6e1bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 27 10:41:07 2013 +0400 hlink: Implement IHlinkBrowseContext_SetCurrentHlink(). --- dlls/hlink/browse_ctx.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index d09d59d..d90aad9 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -295,11 +295,19 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, return S_OK; } -static HRESULT WINAPI IHlinkBC_SetCurrentHlink( IHlinkBrowseContext* iface, - ULONG uHLID) +static HRESULT WINAPI IHlinkBC_SetCurrentHlink(IHlinkBrowseContext* iface, ULONG hlid) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + + TRACE("(%p)->(0x%08x)\n", This, hlid); + + link = context_get_entry(This, hlid); + if (!link) + return E_FAIL; + + This->current = link; + return S_OK; } static HRESULT WINAPI IHlinkBC_Clone( IHlinkBrowseContext* iface,

1 0

Jacek Caban : jscript: Added to_flat_string helper and use it to access string buffer in activex. c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 3bf7255d2335dfe49359a7b17c551149a55c513f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf7255d2335dfe49359a7b17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:01:43 2013 +0100 jscript: Added to_flat_string helper and use it to access string buffer in activex.c. --- dlls/jscript/activex.c | 9 +++++---- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 58c2574..c7d9a66 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -143,7 +143,8 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsstr_t * progid; + jsstr_t * progid_str; + const WCHAR *progid; IDispatch *disp; IUnknown *obj; HRESULT hres; @@ -166,12 +167,12 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return E_NOTIMPL; } - hres = to_string(ctx, argv[0], &progid); + hres = to_flat_string(ctx, argv[0], &progid_str, &progid); if(FAILED(hres)) return hres; - obj = create_activex_object(ctx, progid->str); - jsstr_release(progid); + obj = create_activex_object(ctx, progid); + jsstr_release(progid_str); if(!obj) return throw_generic_error(ctx, JS_E_CANNOT_CREATE_OBJ, NULL); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 135b77f..aed2585 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -322,6 +322,7 @@ HRESULT to_integer(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,INT*) DECLSPEC_HIDDEN; HRESULT to_uint32(script_ctx_t*,jsval_t,UINT32*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) DECLSPEC_HIDDEN; +HRESULT to_flat_string(script_ctx_t*,jsval_t,jsstr_t**,const WCHAR**) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index d141378..60ca474 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -776,6 +776,23 @@ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str) return *str ? S_OK : E_OUTOFMEMORY; } +HRESULT to_flat_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str, const WCHAR **ret_str) +{ + HRESULT hres; + + hres = to_string(ctx, val, str); + if(FAILED(hres)) + return hres; + + *ret_str = jsstr_flatten(*str); + if(!*ret_str) { + jsstr_release(*str); + return E_OUTOFMEMORY; + } + + return S_OK; +} + /* ECMA-262 3rd Edition 9.9 */ HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) {

1 0

Piotr Caban : msvcrt: Added _set_output_format tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 343122a494b66ad5b58b6f064604a405b36334d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=343122a494b66ad5b58b6f064… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 10:39:42 2013 +0100 msvcrt: Added _set_output_format tests. --- dlls/msvcrt/tests/printf.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 0d4a241..e61ca5f 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -44,6 +44,7 @@ static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); static unsigned int (__cdecl *p__get_output_format)(void); +static unsigned int (__cdecl *p__set_output_format)(unsigned int); static int (__cdecl *p__vsprintf_p)(char*, size_t, const char*, __ms_va_list); static int (__cdecl *p_vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist); static int (__cdecl *p__vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist); @@ -66,6 +67,7 @@ static void init( void ) p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); p__get_output_format = (void *)GetProcAddress(hmod, "_get_output_format"); + p__set_output_format = (void *)GetProcAddress(hmod, "_set_output_format"); p__vsprintf_p = (void*)GetProcAddress(hmod, "_vsprintf_p"); p_vswprintf = (void*)GetProcAddress(hmod, "vswprintf"); p__vswprintf = (void*)GetProcAddress(hmod, "_vswprintf"); @@ -1316,15 +1318,34 @@ static void test_vsprintf_p(void) static void test__get_output_format(void) { unsigned int ret; + char buf[64]; + int c; - if (!p__get_output_format) + if (!p__get_output_format || !p__set_output_format) { - win_skip("_get_output_format not available\n"); + win_skip("_get_output_format or _set_output_format is not available\n"); return; } ret = p__get_output_format(); ok(ret == 0, "got %d\n", ret); + + c = sprintf(buf, "%E", 1.23); + ok(c == 13, "c = %d\n", c); + ok(!strcmp(buf, "1.230000E+000"), "buf = %s\n", buf); + + ret = p__set_output_format(_TWO_DIGIT_EXPONENT); + ok(ret == 0, "got %d\n", ret); + + c = sprintf(buf, "%E", 1.23); + ok(c == 12, "c = %d\n", c); + ok(!strcmp(buf, "1.230000E+00"), "buf = %s\n", buf); + + ret = p__get_output_format(); + ok(ret == _TWO_DIGIT_EXPONENT, "got %d\n", ret); + + ret = p__set_output_format(_TWO_DIGIT_EXPONENT); + ok(ret == _TWO_DIGIT_EXPONENT, "got %d\n", ret); } START_TEST(printf)

1 0

Alexandre Julliard : msiexec: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: bed3e87d4e893b779e7e09280ac51b9eff4f097b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed3e87d4e893b779e7e09280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:49:40 2013 +0100 msiexec: Add a 256x256 icon. --- programs/msiexec/msiexec.ico | Bin 25214 -> 49609 bytes programs/msiexec/msiexec.svg | 2157 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 1903 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bed3e87d4e893b779e7e0…

1 0

Alexandre Julliard : iexplore: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 2cf2741a3072bd8b19b1310408c6f932edab9194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf2741a3072bd8b19b131040… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:47:12 2013 +0100 iexplore: Add a 256x256 icon. --- programs/iexplore/iexplore.ico | Bin 25214 -> 82992 bytes programs/iexplore/iexplore.svg | 2620 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 2358 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cf2741a3072bd8b19b13…

1 0

Alexandre Julliard : cmd: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 64ea72b66797bc105e37e50b26b72b37b4dfbc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ea72b66797bc105e37e50b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:44:19 2013 +0100 cmd: Add a 256x256 icon. --- programs/cmd/wcmd.ico | Bin 25214 -> 55841 bytes programs/cmd/wcmd.svg | 2680 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 2391 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64ea72b66797bc105e37e…

1 0

Frédéric Delanoy : wined3d: Add NVIDIA GeForce 410M.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 8e9af2869cd571a2d9eea35a7503b4fbb785e962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9af2869cd571a2d9eea35a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 27 01:06:11 2013 +0100 wined3d: Add NVIDIA GeForce 410M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60a4b2d..6b6bc8e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1099,6 +1099,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE6, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE6, 256}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE6, 512}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1553,6 +1554,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ + {"410M", CARD_NVIDIA_GEFORCE_410M}, /* Geforce 400 - lowend mobile */ {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9a593d..2a11286 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1398,6 +1398,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_410M = 0x1055, CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, CARD_NVIDIA_GEFORCE_GT440 = 0x0de0,

1 0

Jacek Caban : jscript: Use helpers to access string buffer in global.c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: e67169c114c48c3053798014731541c9746e8cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67169c114c48c30537980147… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:03:44 2013 +0100 jscript: Use helpers to access string buffer in global.c. --- dlls/jscript/global.c | 69 ++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 32 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 093b1dd..0c0aa29 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -278,7 +278,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u jsval_t *r) { jsstr_t *ret_str, *str; - const WCHAR *ptr; + const WCHAR *ptr, *buf; DWORD len = 0; WCHAR *ret; HRESULT hres; @@ -291,11 +291,11 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &buf); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = buf; *ptr; ptr++) { if(*ptr > 0xff) len += 6; else if(is_ecma_nonblank(*ptr)) @@ -311,7 +311,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } len = 0; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = buf; *ptr; ptr++) { if(*ptr > 0xff) { ret[len++] = '%'; ret[len++] = 'u'; @@ -343,6 +343,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns jsval_t *r) { bytecode_t *code; + const WCHAR *src; HRESULT hres; TRACE("\n"); @@ -364,8 +365,12 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return E_UNEXPECTED; } + src = jsstr_flatten(get_string(argv[0])); + if(!src) + return E_OUTOFMEMORY; + TRACE("parsing %s\n", debugstr_jsval(argv[0])); - hres = compile_script(ctx, get_string(argv[0])->str, NULL, NULL, TRUE, FALSE, &code); + hres = compile_script(ctx, src, NULL, NULL, TRUE, FALSE, &code); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_jsval(argv[0]), hres); return throw_syntax_error(ctx, hres, NULL); @@ -438,10 +443,10 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, jsval_t *r) { BOOL neg = FALSE, empty = TRUE; + const WCHAR *ptr; DOUBLE ret = 0.0; INT radix=0, i; jsstr_t *str; - WCHAR *ptr; HRESULT hres; if(!argc) { @@ -463,11 +468,12 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &ptr); if(FAILED(hres)) return hres; - for(ptr = str->str; isspaceW(*ptr); ptr++); + while(isspaceW(*ptr)) + ptr++; switch(*ptr) { case '+': @@ -520,7 +526,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag LONGLONG d = 0, hlp; jsstr_t *val_str; int exp = 0; - WCHAR *str; + const WCHAR *str; BOOL ret_nan = TRUE, positive = TRUE; HRESULT hres; @@ -530,12 +536,10 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return S_OK; } - hres = to_string(ctx, argv[0], &val_str); + hres = to_flat_string(ctx, argv[0], &val_str, &str); if(FAILED(hres)) return hres; - str = val_str->str; - while(isspaceW(*str)) str++; if(*str == '+') @@ -625,7 +629,7 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, jsval_t *r) { jsstr_t *ret_str, *str; - const WCHAR *ptr; + const WCHAR *ptr, *buf; DWORD len = 0; WCHAR *ret; HRESULT hres; @@ -638,11 +642,11 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &buf); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = buf; *ptr; ptr++) { if(*ptr == '%') { if(hex_to_int(*(ptr+1))!=-1 && hex_to_int(*(ptr+2))!=-1) ptr += 2; @@ -661,7 +665,7 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } len = 0; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = buf; *ptr; ptr++) { if(*ptr == '%') { if(hex_to_int(*(ptr+1))!=-1 && hex_to_int(*(ptr+2))!=-1) { ret[len] = (hex_to_int(*(ptr+1))<<4) + hex_to_int(*(ptr+2)); @@ -758,8 +762,8 @@ static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const WCHAR *ptr, *uri; jsstr_t *str, *ret; - const WCHAR *ptr; DWORD len = 0, i; char buf[4]; WCHAR *rptr; @@ -773,11 +777,11 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &uri); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { len++; }else { @@ -797,7 +801,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return E_OUTOFMEMORY; } - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { *rptr++ = *ptr; }else { @@ -823,10 +827,11 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const WCHAR *ptr, *uri; jsstr_t *str, *ret_str; unsigned len = 0; - WCHAR *ptr, *ret; int i, val, res; + WCHAR *ret; char buf[4]; WCHAR out; HRESULT hres; @@ -839,11 +844,11 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &uri); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(*ptr != '%') { len++; }else { @@ -875,7 +880,7 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return E_OUTOFMEMORY; } - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(*ptr != '%') { *ret++ = *ptr; }else { @@ -910,7 +915,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W { jsstr_t *str, *ret_str; char buf[4]; - const WCHAR *ptr; + const WCHAR *ptr, *uri; DWORD len = 0, size, i; WCHAR *ret; HRESULT hres; @@ -923,11 +928,11 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &uri); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(is_uri_unescaped(*ptr)) len++; else { @@ -946,7 +951,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return E_OUTOFMEMORY; } - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(is_uri_unescaped(*ptr)) { *ret++ = *ptr; }else { @@ -972,8 +977,8 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const WCHAR *ptr, *uri; jsstr_t *str, *ret; - const WCHAR *ptr; WCHAR *out_ptr; DWORD len = 0; HRESULT hres; @@ -986,11 +991,11 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &uri); if(FAILED(hres)) return hres; - ptr = str->str; + ptr = uri; while(*ptr) { if(*ptr == '%') { char octets[4]; @@ -1046,7 +1051,7 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return E_OUTOFMEMORY; } - ptr = str->str; + ptr = uri; while(*ptr) { if(*ptr == '%') { char octets[4];

1 0

Jacek Caban : jscript: Use helpers to access string buffer in engine.c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 20530c55b81304523bf9482c300460f339c0e498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20530c55b81304523bf9482c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:02:42 2013 +0100 jscript: Use helpers to access string buffer in engine.c. --- dlls/jscript/engine.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a8a9aea..a84faec 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -346,7 +346,7 @@ void exec_release(exec_ctx_t *ctx) heap_free(ctx); } -static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR name_bstr, DWORD flags, DISPID *id) +static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, BSTR name_bstr, DWORD flags, DISPID *id) { IDispatchEx *dispex; jsdisp_t *jsdisp; @@ -375,7 +375,7 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR IDispatchEx_Release(dispex); }else { TRACE("using IDispatch\n"); - hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &bstr, 1, 0, id); } if(name_bstr != bstr) @@ -729,10 +729,12 @@ static HRESULT interp_throw_type(exec_ctx_t *ctx) { const HRESULT hres = get_op_uint(ctx, 0); jsstr_t *str = get_op_str(ctx, 1); + const WCHAR *ptr; TRACE("%08x %s\n", hres, debugstr_jsstr(str)); - return throw_type_error(ctx->script, hres, str->str); + ptr = jsstr_flatten(str); + return ptr ? throw_type_error(ctx->script, hres, ptr) : E_OUTOFMEMORY; } /* ECMA-262 3rd Edition 12.14 */ @@ -828,9 +830,10 @@ static HRESULT interp_func(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_array(exec_ctx_t *ctx) { + jsstr_t *name_str; + const WCHAR *name; jsval_t v, namev; IDispatch *obj; - jsstr_t *name; DISPID id; HRESULT hres; @@ -844,15 +847,15 @@ static HRESULT interp_array(exec_ctx_t *ctx) return hres; } - hres = to_string(ctx->script, namev, &name); + hres = to_flat_string(ctx->script, namev, &name_str, &name); jsval_release(namev); if(FAILED(hres)) { IDispatch_Release(obj); return hres; } - hres = disp_get_id(ctx->script, obj, name->str, NULL, 0, &id); - jsstr_release(name); + hres = disp_get_id(ctx->script, obj, name, NULL, 0, &id); + jsstr_release(name_str); if(SUCCEEDED(hres)) { hres = disp_propget(ctx->script, obj, id, &v); }else if(hres == DISP_E_UNKNOWNNAME) { @@ -900,8 +903,9 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) { const unsigned arg = get_op_uint(ctx, 0); jsval_t objv, namev; + const WCHAR *name; + jsstr_t *name_str; IDispatch *obj; - jsstr_t *name; DISPID id; HRESULT hres; @@ -913,7 +917,7 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) hres = to_object(ctx->script, objv, &obj); jsval_release(objv); if(SUCCEEDED(hres)) { - hres = to_string(ctx->script, namev, &name); + hres = to_flat_string(ctx->script, namev, &name_str, &name); if(FAILED(hres)) IDispatch_Release(obj); } @@ -921,8 +925,8 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = disp_get_id(ctx->script, obj, name->str, NULL, arg, &id); - jsstr_release(name); + hres = disp_get_id(ctx->script, obj, name, NULL, arg, &id); + jsstr_release(name_str); if(FAILED(hres)) { IDispatch_Release(obj); if(hres == DISP_E_UNKNOWNNAME && !(arg & fdexNameEnsure)) { @@ -1392,10 +1396,11 @@ static HRESULT interp_instanceof(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.8.7 */ static HRESULT interp_in(exec_ctx_t *ctx) { + const WCHAR *str; + jsstr_t *jsstr; jsval_t obj, v; DISPID id = 0; BOOL ret; - jsstr_t *str; HRESULT hres; TRACE("\n"); @@ -1407,16 +1412,16 @@ static HRESULT interp_in(exec_ctx_t *ctx) } v = stack_pop(ctx); - hres = to_string(ctx->script, v, &str); + hres = to_flat_string(ctx->script, v, &jsstr, &str); jsval_release(v); if(FAILED(hres)) { IDispatch_Release(get_object(obj)); return hres; } - hres = disp_get_id(ctx->script, get_object(obj), str->str, NULL, 0, &id); + hres = disp_get_id(ctx->script, get_object(obj), str, NULL, 0, &id); IDispatch_Release(get_object(obj)); - jsstr_release(str); + jsstr_release(jsstr); if(SUCCEEDED(hres)) ret = TRUE; else if(hres == DISP_E_UNKNOWNNAME)

1 0

Piotr Caban : msvcrt: Added _set_output_format implementation.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 9c4be83a78c5a105d4e3305d9977c213a4503a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4be83a78c5a105d4e3305d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 10:39:30 2013 +0100 msvcrt: Added _set_output_format implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 17 ++++++++++++++++- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/printf.h | 23 +++++++++++++---------- include/msvcrt/stdio.h | 1 + 9 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5938d54..93bddbf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1270,7 +1270,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 81b3fc2..7f6b0d9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1632,7 +1632,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6b7a318..a2e2929 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -931,7 +931,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 81a265d..998349f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -924,7 +924,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 2da2429..75e75e6 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +static unsigned int output_format; /********************************************************************* * _beep (MSVCRT.@) @@ -283,7 +284,21 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, */ unsigned int CDECL _get_output_format(void) { - return 0; + return output_format; +} + +/********************************************************************* + * _set_output_format (MSVCRT.@) + */ +unsigned int CDECL _set_output_format(unsigned int new_output_format) +{ + unsigned int ret = output_format; + + if(!MSVCRT_CHECK_PMT(new_output_format==0 || new_output_format==MSVCRT__TWO_DIGIT_EXPONENT)) + return ret; + + output_format = new_output_format; + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3bbbe93..07e2984 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -982,6 +982,7 @@ int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT_strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +unsigned int __cdecl _get_output_format(void); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b6ae261..99072aa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -894,7 +894,7 @@ @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) @ cdecl _set_fmode(long) -# stub _set_output_format(long) +@ cdecl _set_output_format(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index d02115e..3ccb1c4 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -307,22 +307,25 @@ static inline void FUNC_NAME(pf_fixup_exponent)(char *buf) if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') && isdigit(tmp[2]) && isdigit(tmp[3])) { - char final; + BOOL two_digit_exp = (_get_output_format() == MSVCRT__TWO_DIGIT_EXPONENT); + + tmp += 2; + if(isdigit(tmp[2])) { + if(two_digit_exp && tmp[0]=='0') { + tmp[0] = tmp[1]; + tmp[1] = tmp[2]; + tmp[2] = tmp[3]; + } - if (isdigit(tmp[4])) return; /* Exponent already 3 digits */ + }else if(two_digit_exp) { + return; + } - tmp += 2; - final = tmp[2]; + tmp[3] = tmp[2]; tmp[2] = tmp[1]; tmp[1] = tmp[0]; tmp[0] = '0'; - - if(final == '\0') { - tmp[3] = '\0'; - if(buf[0] == ' ') - memmove(buf, buf + 1, (tmp - buf) + 3); - } } } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f6bf3b5..a01859e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -182,6 +182,7 @@ int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); +unsigned int __cdecl _set_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED

1 0

Piotr Caban : wmi: Match parameters list with function we're forwarding to.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 57fb89200f55460d0f73791d46da7eadd5044e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fb89200f55460d0f73791d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:38 2013 +0100 wmi: Match parameters list with function we're forwarding to. --- dlls/wmi/wmi.spec | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wmi/wmi.spec b/dlls/wmi/wmi.spec index c6ae3cc..4291d4d 100644 --- a/dlls/wmi/wmi.spec +++ b/dlls/wmi/wmi.spec @@ -1,25 +1,25 @@ -@ stdcall CloseTrace(long) advapi32.CloseTrace -@ stdcall ControlTraceA(long long ptr long) advapi32.ControlTraceA -@ stdcall ControlTraceW(long long ptr long) advapi32.ControlTraceW +@ stdcall CloseTrace(int64) advapi32.CloseTrace +@ stdcall ControlTraceA(int64 str ptr long) advapi32.ControlTraceA +@ stdcall ControlTraceW(int64 wstr ptr long) advapi32.ControlTraceW @ stdcall CreateTraceInstanceId(long ptr) advapi32.CreateTraceInstanceId -@ stdcall EnableTrace(long long long ptr long) advapi32.EnableTrace -@ stdcall GetTraceEnableFlags(long) advapi32.GetTraceEnableFlags -@ stdcall GetTraceEnableLevel(long) advapi32.GetTraceEnableLevel -@ stdcall GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle -@ stdcall OpenTraceA(ptr) advapi32.OpenTraceA -@ stdcall OpenTraceW(ptr) advapi32.OpenTraceW +@ stdcall EnableTrace(long long long ptr int64) advapi32.EnableTrace +@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel +@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle +@ stdcall -ret64 OpenTraceA(ptr) advapi32.OpenTraceA +@ stdcall -ret64 OpenTraceW(ptr) advapi32.OpenTraceW @ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace @ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA @ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsA -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsW +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) advapi32.RegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW @ stdcall RemoveTraceCallback(ptr) advapi32.RemoveTraceCallback @ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback -@ stdcall StartTraceA(ptr ptr ptr) advapi32.StartTraceA -@ stdcall StartTraceW(ptr ptr ptr) advapi32.StartTraceW -@ stdcall TraceEvent(long ptr) advapi32.TraceEvent -@ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance -@ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids +@ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA +@ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW +@ stdcall TraceEvent(int64 ptr) advapi32.TraceEvent +@ stdcall TraceEventInstance(int64 ptr ptr ptr) advapi32.TraceEventInstance +@ stdcall UnregisterTraceGuids(int64) advapi32.UnregisterTraceGuids @ stdcall WmiCloseBlock() advapi32.WmiCloseBlock @ stdcall WmiDevInstToInstanceNameA() advapi32.WmiDevInstToInstanceNameA @ stdcall WmiDevInstToInstanceNameW() advapi32.WmiDevInstToInstanceNameW

1 0

Piotr Caban : imagehlp: Match parameters list with function we' re forwarding to.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 60cf24a972bcaecbcc5592305627675d701033bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cf24a972bcaecbcc5592305… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:27 2013 +0100 imagehlp: Match parameters list with function we're forwarding to. --- dlls/imagehlp/imagehlp.spec | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 3ba9efa..744b339 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -3,7 +3,7 @@ @ stdcall CheckSumMappedFile(ptr long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) dbghelp.EnumerateLoadedModules64 @ stdcall EnumerateLoadedModules(long ptr ptr) dbghelp.EnumerateLoadedModules -@ stdcall FindDebugInfoFile(str str str) dbghelp.FindDebugInfoFile +@ stdcall FindDebugInfoFile(str str ptr) dbghelp.FindDebugInfoFile @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) dbghelp.FindDebugInfoFileEx @ stdcall FindExecutableImage(str str str) dbghelp.FindExecutableImage @ stdcall FindExecutableImageEx(str str ptr ptr ptr) dbghelp.FindExecutableImageEx @@ -38,16 +38,16 @@ @ stdcall RemovePrivateCvSymbolic(ptr ptr ptr) @ stub RemovePrivateCvSymbolicEx @ stdcall RemoveRelocations(ptr) -@ stdcall SearchTreeForFile(str str str) dbghelp.SearchTreeForFile +@ stdcall SearchTreeForFile(str str ptr) dbghelp.SearchTreeForFile @ stdcall SetImageConfigInformation(ptr ptr) @ stdcall SplitSymbols(str str str long) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk64 @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk @ stdcall SymCleanup(long) dbghelp.SymCleanup -@ stdcall SymEnumSourceFiles(long long str ptr ptr) dbghelp.SymEnumSourceFiles +@ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) dbghelp.SymEnumSourceFiles @ stub SymEnumSym -@ stdcall SymEnumSymbols(long long str ptr ptr) dbghelp.SymEnumSymbols -@ stdcall SymEnumTypes(long long ptr ptr) dbghelp.SymEnumTypes +@ stdcall SymEnumSymbols(ptr int64 str ptr ptr) dbghelp.SymEnumSymbols +@ stdcall SymEnumTypes(ptr int64 ptr ptr) dbghelp.SymEnumTypes @ stdcall SymEnumerateModules64(long ptr ptr) dbghelp.SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) dbghelp.SymEnumerateModules @ stdcall SymEnumerateSymbols64(long int64 ptr ptr) dbghelp.SymEnumerateSymbols64 @@ -55,7 +55,7 @@ @ stub SymEnumerateSymbolsW64 @ stub SymEnumerateSymbolsW @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) dbghelp.SymFindFileInPath -@ stdcall SymFromAddr(long long ptr ptr) dbghelp.SymFromAddr +@ stdcall SymFromAddr(ptr int64 ptr ptr) dbghelp.SymFromAddr @ stdcall SymFromName(long str ptr) dbghelp.SymFromName @ stdcall SymFunctionTableAccess64(long int64) dbghelp.SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) dbghelp.SymFunctionTableAccess @@ -74,7 +74,7 @@ @ stdcall SymGetModuleInfoW64(long int64 ptr) dbghelp.SymGetModuleInfoW64 @ stdcall SymGetModuleInfoW(long long ptr) dbghelp.SymGetModuleInfoW @ stdcall SymGetOptions() dbghelp.SymGetOptions -@ stdcall SymGetSearchPath(long str long) dbghelp.SymGetSearchPath +@ stdcall SymGetSearchPath(long ptr long) dbghelp.SymGetSearchPath @ stdcall SymGetSymFromAddr64(long int64 ptr ptr) dbghelp.SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) dbghelp.SymGetSymFromAddr @ stdcall SymGetSymFromName64(long str ptr) dbghelp.SymGetSymFromName64 @@ -83,8 +83,8 @@ @ stdcall SymGetSymNext(long ptr) dbghelp.SymGetSymNext @ stdcall SymGetSymPrev64(long ptr) dbghelp.SymGetSymPrev64 @ stdcall SymGetSymPrev(long ptr) dbghelp.SymGetSymPrev -@ stdcall SymGetTypeFromName(long long str ptr) dbghelp.SymGetTypeFromName -@ stdcall SymGetTypeInfo(long long long long ptr) dbghelp.SymGetTypeInfo +@ stdcall SymGetTypeFromName(ptr int64 str ptr) dbghelp.SymGetTypeFromName +@ stdcall SymGetTypeInfo(ptr int64 long long ptr) dbghelp.SymGetTypeInfo @ stdcall SymInitialize(long str long) dbghelp.SymInitialize @ stdcall SymLoadModule64(long long str str int64 long) dbghelp.SymLoadModule64 @ stdcall SymLoadModule(long long str str long long) dbghelp.SymLoadModule

1 0

Alexandre Julliard : notepad: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 3f053c91497843a2d6f4710d4b0fc9111f192163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f053c91497843a2d6f4710d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:39:06 2013 +0100 notepad: Add a 256x256 icon. --- programs/notepad/notepad.ico | Bin 25214 -> 53938 bytes programs/notepad/notepad.svg | 2508 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2218 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f053c91497843a2d6f47…

1 0

Francois Gouget : testbot/web: Remove some dead code in JobDetails.pl.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 508205dfe36c288ee6ec510e252a4585e5b8df8f URL: http://source.winehq.org/git/tools.git/?a=commit;h=508205dfe36c288ee6ec510e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:39:55 2013 +0100 testbot/web: Remove some dead code in JobDetails.pl. --- testbot/web/JobDetails.pl | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a751f11..651335c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -360,7 +360,6 @@ sub GenerateBody my $First = 1; my $CurrentDll = ""; my $PrintedDll = ""; - my $Crashed = !1; my $Line; while (defined($Line = <LOGFILE>)) { @@ -392,10 +391,6 @@ sub GenerateBody print "<pre><code>"; $First = !1; } - if ($Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) - { - $Crashed = 1; - } if (! $FullLog && $Line =~ m/^[^:]+:([^ ]+) done $258$/) { print "$1: Timeout\n";

1 0

Francois Gouget : testbot/testagentd: Sanity check the list sizes.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: b48ed0abc3eeafe5639223576b3ab246af226c20 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b48ed0abc3eeafe563922357… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:37:51 2013 +0100 testbot/testagentd: Sanity check the list sizes. This heuristic normally lets us detect and drop connections that use the wrong protocol. --- testbot/src/testagentd/testagentd.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 75782c4..e99dcb4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -387,10 +387,17 @@ static int skip_entries(SOCKET client, uint32_t count) static int recv_list_size(SOCKET client, uint32_t *u32) { - int success = recv_raw_uint32(client, u32); - if (success) - debug(" recv_list_size() -> %u\n", *u32); - return success; + if (!recv_raw_uint32(client, u32)) + return 0; + debug(" recv_list_size() -> %u\n", *u32); + + if (*u32 >= 1048576) + { + /* The client is in fact most likely not speaking the right protocol */ + set_status(ST_FATAL, "the list size is too big (%d)", *u32); + return 0; + } + return 1; } static int expect_list_size(SOCKET client, uint32_t expected)

1 0

Francois Gouget : testbot/TestAgent: Provide command-line access to the wait RPC.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: ea0744c7908dd06db7bf6c5b4518ae832cd5d993 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ea0744c7908dd06db7bf6c5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:37:06 2013 +0100 testbot/TestAgent: Provide command-line access to the wait RPC. --- testbot/scripts/TestAgent | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 897ca81..bb7dd14 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -53,7 +53,7 @@ sub error(@) } my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); -my (@Run, $RunIn, $RunOut, $RunErr); +my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; my ($Port, $ConnectTimeout, $Timeout, $TunnelOpt); @@ -172,6 +172,11 @@ while (@ARGV) $Cmd = $arg; last; } + elsif ($arg eq "wait") + { + $Cmd = $arg; + $WaitPid = check_opt_val($arg, $WaitPid); + } elsif ($arg eq "rm") { $Cmd = $arg; @@ -216,6 +221,25 @@ if (!defined $Usage) error("the --run-xxx options can only be used with the run command\n"); $Usage = 2; } + elsif ($Cmd eq "wait") + { + my $oldwarn = $SIG{__WARN__}; + $SIG{__WARN__} = sub { die $_[0] }; + my $bad = eval { $WaitPid < 0 }; + if (defined $oldwarn) + { + $SIG{__WARN__} = $oldwarn; + } + else + { + delete $SIG{__WARN__}; + } + if ($bad or $@) + { + error("the pid '$WaitPid' is invalid\n"); + $Usage = 2; + } + } elsif ($Cmd eq "rm" and !@Rm) { error("you must specify the server files to delete\n"); @@ -243,6 +267,7 @@ if (defined $Usage) print "Usage: $name0 [options] <hostname> sendfile <localpath> <serverpath>\n"; print "or $name0 [options] <hostname> getfile <serverpath> <localpath>\n"; print "or $name0 [options] <hostname> run <command> <arguments>\n"; + print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; print "or $name0 [options] <hostname> [ping|version]\n"; print "\n"; @@ -264,6 +289,7 @@ if (defined $Usage) print " --run-err <serverpath> Redirect the stderr or the command being run to the\n"; print " specified server file.\n"; print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; + print " wait Waits for the specified child process on the server.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the version of the server.\n"; print " ping Makes sure the server is still alive.\n"; @@ -318,6 +344,11 @@ elsif ($Cmd eq "run") } } } +elsif ($Cmd eq "wait") +{ + $Result = $TA->Wait($WaitPid, $Timeout); + print "Child exit status: $Result\n" if (defined $Result); +} elsif ($Cmd eq "rm") { $Result = $TA->Rm(@Rm);

1 0