April 2014 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Remove _set_invalid_parameter_handler calls from msvcrt tests.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: f60b888bb2b0408dbe2d257586763234ad0028fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60b888bb2b0408dbe2d25758… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 21 13:08:10 2014 +0200 msvcrt: Remove _set_invalid_parameter_handler calls from msvcrt tests. --- dlls/msvcrt/tests/string.c | 59 -------------------------------------------- 1 file changed, 59 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7d820e1..c9d1c1d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -49,13 +49,6 @@ static char *buf_to_string(const unsigned char *bin, int len, int nr) return buf[nr]; } -static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, - const wchar_t *function, const wchar_t *file, - unsigned line, uintptr_t arg) -{ - /* we just ignore handler calls */ -} - #define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } #define expect_bin(buf, value, len) { ok(memcmp((buf), value, len) == 0, "Binary buffer mismatch - expected %s, got %s\n", buf_to_string((unsigned char *)value, len, 1), buf_to_string((buf), len, 0)); } @@ -86,7 +79,6 @@ static errno_t (__cdecl *p_strlwr_s)(char*,size_t); static errno_t (__cdecl *p_ultoa_s)(__msvcrt_ulong,char*,size_t,int); static int *p__mb_cur_max; static unsigned char *p_mbctype; -static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); @@ -565,10 +557,6 @@ static void test_memcpy_s(void) return; } - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - /* Normal */ memset(dest, 'X', sizeof(dest)); ret = p_memcpy_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); @@ -612,10 +600,6 @@ static void test_memcpy_s(void) ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); - - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } static void test_memmove_s(void) @@ -629,10 +613,6 @@ static void test_memmove_s(void) return; } - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - /* Normal */ memset(dest, 'X', sizeof(dest)); ret = p_memmove_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); @@ -682,10 +662,6 @@ static void test_memmove_s(void) ok(ret == EINVAL, "Moving a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); - - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } static void test_strcat_s(void) @@ -811,10 +787,6 @@ static void test_wcscpy_s(void) return; } - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - /* Test NULL Dest */ errno = EBADF; ret = p_wcscpy_s(NULL, 18, szLongText); @@ -856,10 +828,6 @@ static void test_wcscpy_s(void) if(!p_wcsncpy_s) { win_skip("wcsncpy_s not found\n"); - - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); return; } @@ -905,10 +873,6 @@ static void test_wcscpy_s(void) ok(ret == STRUNCATE, "expected ERROR_SUCCESS got %d\n", ret); ok(szDestShort[0]=='1' && szDestShort[1]=='1' && szDestShort[2]=='1' && szDestShort[3]=='1', "szDestShort = %s\n", wine_dbgstr_w(szDestShort)); - - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } static void test__wcsupr_s(void) @@ -1750,16 +1714,10 @@ static void test_mbstowcs(void) ok(wOut[2] == 0, "wOut[2] = %x\n", wOut[2]); ok(!pmbstr, "pmbstr != NULL\n"); - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); errno = EBADF; ret = p_mbsrtowcs(wOut, NULL, 6, &state); ok(ret == -1, "mbsrtowcs did not return -1\n"); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); setlocale(LC_ALL, "C"); } @@ -1810,10 +1768,6 @@ static void test__itoa_s(void) return; } - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - errno = EBADF; ret = p_itoa_s(0, NULL, 0, 0); ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); @@ -1897,10 +1851,6 @@ static void test__itoa_s(void) itoa(100, buffer, 100); ok(!strcmp(buffer, "10"), "Expected output buffer string to be \"10\", got \"%s\"\n", buffer); - - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } static void test__strlwr_s(void) @@ -1973,10 +1923,6 @@ static void test_wcsncat_s(void) return; } - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, - "Invalid parameter handler was already set\n"); - memcpy(src, abcW, sizeof(abcW)); dst[0] = 0; ret = p_wcsncat_s(NULL, 4, src, 4); @@ -2001,10 +1947,6 @@ static void test_wcsncat_s(void) dst[3] = 'd'; ret = p_wcsncat_s(dst, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); - - if (p_set_invalid_parameter_handler) - ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, - "Cannot reset invalid parameter handler\n"); } static void test__mbsnbcat_s(void) @@ -2706,7 +2648,6 @@ START_TEST(string) p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); p_strlwr_s = (void *)GetProcAddress(hMsvcrt, "_strlwr_s"); p_ultoa_s = (void *)GetProcAddress(hMsvcrt, "_ultoa_s"); - p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s");

1 0

Piotr Caban : msvcrt: Remove no longer needed exports.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 49e503c55ad8b9c8c681b7f7f672b1c4f606b56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e503c55ad8b9c8c681b7f7f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 21 13:08:20 2014 +0200 msvcrt: Remove no longer needed exports. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/mbcs.c | 7 ++---- dlls/msvcrt/msvcrt.spec | 53 ------------------------------------------- dlls/msvcrt/string.c | 6 +++-- 9 files changed, 18 insertions(+), 72 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 71c03fc..6a9461b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1186,7 +1186,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) @ stub _mbsstr_l -@ cdecl _mbstok(str str) MSVCR100__mbstok +@ cdecl _mbstok(str str) @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) @@ -1633,7 +1633,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCR100_atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0744c40..68b48b7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1544,7 +1544,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) @ stub _mbsstr_l -@ cdecl _mbstok(str str) MSVCR100__mbstok +@ cdecl _mbstok(str str) @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) @@ -1991,7 +1991,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCR100_atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 5d83cb5..cf3e236 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -468,7 +468,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspnp(str str) @ cdecl _mbsstr(str str) -@ cdecl _mbstok(str str) MSVCR100__mbstok +@ cdecl _mbstok(str str) @ cdecl _mbstrlen(str) @ cdecl _mbsupr(str) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @@ -688,7 +688,7 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCR100_atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl calloc(long long) MSVCRT_calloc diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 2252b3a..2912b2d 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -463,7 +463,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspnp(str str) @ cdecl _mbsstr(str str) -@ cdecl _mbstok(str str) MSVCR100__mbstok +@ cdecl _mbstok(str str) @ cdecl _mbstrlen(str) @ cdecl _mbsupr(str) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @@ -684,7 +684,7 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCR100_atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl calloc(long long) MSVCRT_calloc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 19774cc..105970a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -858,7 +858,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) @ stub _mbsstr_l -@ cdecl _mbstok(str str) MSVCR100__mbstok +@ cdecl _mbstok(str str) @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) @@ -1315,7 +1315,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCR100_atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8059939..20260e2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -836,7 +836,7 @@ @ stub _mbsspnp_l @ cdecl _mbsstr(str str) @ stub _mbsstr_l -@ cdecl _mbstok(str str) MSVCR100__mbstok +@ cdecl _mbstok(str str) @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) @@ -1288,7 +1288,7 @@ @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCR100_atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 512f59a..60464c3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1151,17 +1151,14 @@ unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) { thread_data_t *data = msvcrt_get_thread_data(); +#if _MSVCR_VER == 0 if(!str && !data->mbstok_next) return NULL; +#endif return _mbstok_s_l(str, delim, &data->mbstok_next, NULL); } -unsigned char* CDECL MSVCR100__mbstok(unsigned char *str, const unsigned char *delim) -{ - return _mbstok_l(str, delim, NULL); -} - /********************************************************************* * _mbbtombc(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c04cee3..739914a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1517,56 +1517,3 @@ @ varargs wprintf_s(wstr) MSVCRT_wprintf_s @ varargs wscanf(wstr) MSVCRT_wscanf @ varargs wscanf_s(wstr) MSVCRT_wscanf_s - -# Functions not exported in native dll: -@ cdecl ___mb_cur_max_l_func(ptr) -@ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ cdecl _configthreadlocale(long) -@ cdecl _dupenv_s(ptr ptr str) -@ cdecl _get_invalid_parameter_handler() -@ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior -@ cdecl _set_invalid_parameter_handler(ptr) -@ cdecl _set_purecall_handler(ptr) -@ cdecl _set_security_error_handler(ptr) -@ cdecl __security_error_handler(long ptr) -@ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _wdupenv_s(ptr ptr wstr) -@ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output -@ cdecl _getptd() -@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s -@ cdecl _fstat32(long ptr) MSVCRT__fstat32 -@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ cdecl _is_exception_typeof(ptr ptr) -@ cdecl -arch=i386 __libm_sse2_sqrt_precise() -@ cdecl wmemmove_s(ptr long ptr long) -@ cdecl wmemcpy_s(ptr long ptr long) -@ cdecl _encoded_null() -@ cdecl _invalid_parameter_noinfo() -@ cdecl __sys_nerr() -@ cdecl __sys_errlist() -@ cdecl __clean_type_info_names_internal(ptr) -@ cdecl _recalloc(ptr long long) -@ cdecl _stat32(str ptr) MSVCRT__stat32 -@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64 -@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32 -@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32 -@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64 -@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32 -@ cdecl _atoflt(ptr str) MSVCRT__atoflt -@ cdecl -arch=arm ?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method -@ thiscall -arch=i386 ?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method -@ cdecl -arch=win64 ?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method -@ cdecl _CRT_RTC_INIT(ptr ptr long long long) -@ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ cdecl _byteswap_uint64(int64) -@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong -@ cdecl _byteswap_ushort(long) -@ cdecl _aligned_msize(ptr long long) -@ cdecl _get_daylight(ptr) -@ cdecl _get_timezone(ptr) -@ varargs _sprintf_p(ptr long str) MSVCRT__sprintf_p -@ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p -@ cdecl _vswprintf_p(ptr long wstr ptr) MSVCRT__vswprintf_p -@ cdecl MSVCR100_atoi(str) -@ cdecl MSVCR100__mbstok(str str) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 160bafe..e1a14ac 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -862,6 +862,7 @@ int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) /********************************************************************* * atoi (MSVCRT.@) */ +#if _MSVCR_VER == 0 int __cdecl MSVCRT_atoi(const char *str) { BOOL minus = FALSE; @@ -886,11 +887,12 @@ int __cdecl MSVCRT_atoi(const char *str) return minus ? -ret : ret; } - -int CDECL MSVCR100_atoi(const char *str) +#else +int CDECL MSVCRT_atoi(const char *str) { return MSVCRT__atoi_l(str, NULL); } +#endif /****************************************************************** * strtol (MSVCRT.@)

1 0

Alexandre Julliard : msvcrt: Update comments for non-exported functions.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 0c496f02804af77eb89cbc820b36787624bedec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c496f02804af77eb89cbc820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 14:32:40 2014 +0200 msvcrt: Update comments for non-exported functions. --- dlls/msvcrt/errno.c | 8 ++++++-- dlls/msvcrt/except.c | 10 +++++++--- dlls/msvcrt/exit.c | 8 ++++---- dlls/msvcrt/file.c | 12 +++++++++--- dlls/msvcrt/locale.c | 4 +++- dlls/msvcrt/math.c | 4 +++- dlls/msvcrt/mbcs.c | 4 +++- dlls/msvcrt/thread.c | 2 +- dlls/msvcrt/wcs.c | 8 ++++++-- 9 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index e8e964a..6c1a912 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -451,14 +451,18 @@ void CDECL _invalid_parameter_noinfo(void) MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); } -/* _get_invalid_parameter_handler - not exported in native msvcrt, added in msvcr80 */ +/********************************************************************* + * _get_invalid_parameter_handler (MSVCR80.@) + */ MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) { TRACE("\n"); return invalid_parameter_handler; } -/* _set_invalid_parameter_handler - not exproted in native msvcrt, added in msvcr80 */ +/********************************************************************* + * _set_invalid_parameter_handler (MSVCR80.@) + */ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( MSVCRT_invalid_parameter_handler handler) { diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index a1dd41a..f5c8b03 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -285,14 +285,16 @@ int CDECL _abnormal_termination(void) } /****************************************************************** - * MSVCRT___uncaught_exception + * __uncaught_exception (MSVCRT.@) */ BOOL CDECL MSVCRT___uncaught_exception(void) { return FALSE; } -/* _set_security_error_handler - not exported in native msvcrt, added in msvcr70 */ +/********************************************************************* + * _set_security_error_handler (MSVCR70.@) + */ MSVCRT_security_error_handler CDECL _set_security_error_handler( MSVCRT_security_error_handler handler ) { @@ -304,7 +306,9 @@ MSVCRT_security_error_handler CDECL _set_security_error_handler( return old; } -/* __security_error_handler - not exported in native msvcrt */ +/********************************************************************* + * __security_error_handler (MSVCR70.@) + */ void CDECL __security_error_handler(int code, void *data) { if(security_error_handler) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 11373b5..0d2992d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -184,9 +184,7 @@ void CDECL MSVCRT_abort(void) } /********************************************************************* - * _set_abort_behavior (MSVCRT.@) - * - * Not exported by native msvcrt, added in msvcr80 + * _set_abort_behavior (MSVCR80.@) */ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int mask) { @@ -327,7 +325,9 @@ int CDECL MSVCRT_atexit(void (*func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } -/* _set_purecall_handler - not exported in native msvcrt */ +/********************************************************************* + * _set_purecall_handler (MSVCR71.@) + */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) { MSVCRT_purecall_handler ret = purecall_handler; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4090839..aff5a89 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1628,7 +1628,9 @@ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf) return ret; } -/* _fstat32 - not exported in native msvcrt */ +/********************************************************************* + * _fstat32 (MSVCR80.@) + */ int CDECL MSVCRT__fstat32(int fd, struct MSVCRT__stat32* buf) { int ret; @@ -1640,7 +1642,9 @@ int CDECL MSVCRT__fstat32(int fd, struct MSVCRT__stat32* buf) return ret; } -/* _fstat64i32 - not exported in native msvcrt */ +/********************************************************************* + * _fstat64i32 (MSVCR80.@) + */ int CDECL MSVCRT__fstat64i32(int fd, struct MSVCRT__stat64i32* buf) { int ret; @@ -3976,7 +3980,9 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm } -/* fread_s - not exported in native msvcrt */ +/********************************************************************* + * fread_s (MSVCR80.@) + */ MSVCRT_size_t CDECL MSVCRT_fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t elem_size, MSVCRT_size_t count, MSVCRT_FILE *stream) { diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7a33376..992aa3e 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1455,7 +1455,9 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlo return ret ? current_lc_all : NULL; } -/* _configthreadlocale - not exported in native msvcrt */ +/********************************************************************* + * _configthreadlocale (MSVCR80.@) + */ int CDECL _configthreadlocale(int type) { thread_data_t *data = msvcrt_get_thread_data(); diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1d6977d..2c5a8f3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2185,7 +2185,9 @@ void __cdecl __libm_sse2_tanf(void) __asm__ __volatile__( "movd %0,%%xmm0" : : "g" (f) ); } -/* __libm_sse2_sqrt_precise */ +/*********************************************************************** + * __libm_sse2_sqrt_precise (MSVCR110.@) + */ void __cdecl __libm_sse2_sqrt_precise(void) { double d; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 60464c3..dd14abd 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,9 @@ int CDECL MSVCRT____mb_cur_max_func(void) return get_locinfo()->mb_cur_max; } -/* ___mb_cur_max_l_func - not exported in native msvcrt */ +/********************************************************************* + * ___mb_cur_max_l_func (MSVCR80.@) + */ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 8d00e8b..5e62354 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -155,7 +155,7 @@ void CDECL _endthreadex( } /********************************************************************* - * _getptd - not exported in native msvcrt + * _getptd (MSVCR80.@) */ thread_data_t* CDECL _getptd(void) { diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fcc6c6b..37ca3fb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -40,13 +40,17 @@ static BOOL n_format_enabled = TRUE; #include "printf.h" #undef PRINTF_WIDE -/* _get_printf_count_output - not exported in native msvcrt */ +/********************************************************************* + * _get_printf_count_output (MSVCR80.@) + */ int CDECL MSVCRT__get_printf_count_output( void ) { return n_format_enabled ? 1 : 0; } -/* _set_printf_count_output - not exported in native msvcrt */ +/********************************************************************* + * _set_printf_count_output (MSVCR80.@) + */ int CDECL MSVCRT__set_printf_count_output( int enable ) { BOOL old = n_format_enabled;

1 0

Jacek Caban : mshtml: Added IHTMLElementCollection:: get__newEnum implementation.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: f7635f17b3cabf81b05ad948a107a8810a4f31ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7635f17b3cabf81b05ad948a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 13:48:23 2014 +0200 mshtml: Added IHTMLElementCollection::get__newEnum implementation. --- dlls/mshtml/htmlelemcol.c | 139 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 102a438..e9cd1af 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -42,6 +42,15 @@ typedef struct { } HTMLElementCollection; typedef struct { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + ULONG iter; + HTMLElementCollection *col; +} HTMLElementCollectionEnum; + +typedef struct { HTMLElement **buf; DWORD len; DWORD size; @@ -86,6 +95,117 @@ static inline BOOL is_elem_node(nsIDOMNode *node) return type == ELEMENT_NODE || type == COMMENT_NODE; } +static inline HTMLElementCollectionEnum *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, HTMLElementCollectionEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI HTMLElementCollectionEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + TRACE("(%p)->(IID_IEnumVARIANT %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLElementCollectionEnum_AddRef(IEnumVARIANT *iface) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLElementCollectionEnum_Release(IEnumVARIANT *iface) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IHTMLElementCollection_Release(&This->col->IHTMLElementCollection_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLElementCollectionEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + ULONG fetched = 0; + + TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, pCeltFetched); + + while(This->iter+fetched < This->col->len && fetched < celt) { + V_VT(rgVar+fetched) = VT_DISPATCH; + V_DISPATCH(rgVar+fetched) = (IDispatch*)&This->col->elems[This->iter+fetched]->IHTMLElement_iface; + IDispatch_AddRef(V_DISPATCH(rgVar+fetched)); + fetched++; + } + + This->iter += fetched; + *pCeltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI HTMLElementCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%d)\n", This, celt); + + if(This->iter + celt > This->col->len) { + This->iter = This->col->len; + return S_FALSE; + } + + This->iter += celt; + return S_OK; +} + +static HRESULT WINAPI HTMLElementCollectionEnum_Reset(IEnumVARIANT *iface) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->()\n", This); + + This->iter = 0; + return S_OK; +} + +static HRESULT WINAPI HTMLElementCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl HTMLElementCollectionEnumVtbl = { + HTMLElementCollectionEnum_QueryInterface, + HTMLElementCollectionEnum_AddRef, + HTMLElementCollectionEnum_Release, + HTMLElementCollectionEnum_Next, + HTMLElementCollectionEnum_Skip, + HTMLElementCollectionEnum_Reset, + HTMLElementCollectionEnum_Clone +}; + static inline HTMLElementCollection *impl_from_IHTMLElementCollection(IHTMLElementCollection *iface) { return CONTAINING_RECORD(iface, HTMLElementCollection, IHTMLElementCollection_iface); @@ -210,8 +330,23 @@ static HRESULT WINAPI HTMLElementCollection_get__newEnum(IHTMLElementCollection IUnknown **p) { HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLElementCollectionEnum *ret; + + TRACE("(%p)->(%p)\n", This, p); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &HTMLElementCollectionEnumVtbl; + ret->ref = 1; + ret->iter = 0; + + IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); + ret->col = This; + + *p = (IUnknown*)&ret->IEnumVARIANT_iface; + return S_OK; } static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name)

1 0

Piotr Caban : msvcrt/tests: Fix _popen test failures when path contains spaces.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 1d865f90d6b2223eca48128ac93968ce8f3a0005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d865f90d6b2223eca48128ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 21 14:07:49 2014 +0200 msvcrt/tests: Fix _popen test failures when path contains spaces. --- dlls/msvcrt/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 3a72e68..523d277 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -327,7 +327,7 @@ static void test__popen(const char *name) char buf[1024]; int ret; - sprintf(buf, "%s misc popen", name); + sprintf(buf, "\"%s\" misc popen", name); pipe = _popen(buf, "r"); ok(pipe != NULL, "_popen failed with error: %d\n", errno);

1 0

Gerald Pfeifer : readme: Raise the minimum version of FreeBSD to 8.0.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 1ca38f1dd71191527df96ad7e541a0ebe96d36d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca38f1dd71191527df96ad7e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Apr 20 21:35:15 2014 -0600 readme: Raise the minimum version of FreeBSD to 8.0. --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 8dbc614..1627081 100644 --- a/README +++ b/README @@ -29,7 +29,7 @@ especially the wealth of information found at http://www.winehq.org. To compile and run Wine, you must have one of the following: Linux version 2.0.36 or later - FreeBSD 7.0 or later + FreeBSD 8.0 or later Solaris x86 9 or later NetBSD-current Mac OS X 10.5 or later @@ -39,7 +39,7 @@ systems mentioned above are supported. Other operating systems which support kernel threads may be supported in the future. FreeBSD info: - Wine will generally not work properly on versions before FreeBSD 7.0. + Wine will generally not work properly on versions before FreeBSD 8.0. See http://wiki.freebsd.org/Wine for more information. Solaris info:

1 0

Piotr Caban : msvcrt: Don't raise exception in _invalid_parameter.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 0cb5067698470d3beec827a9b41b3d23d606eb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb5067698470d3beec827a9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 21 13:08:00 2014 +0200 msvcrt: Don't raise exception in _invalid_parameter. --- dlls/msvcrt/errno.c | 2 ++ dlls/msvcrt/tests/misc.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 97e37c0..e8e964a 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -437,7 +437,9 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ else { ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg ); +#if _MSVCR_VER > 0 RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL ); +#endif } } diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 26225f3..3a72e68 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -30,6 +30,8 @@ static int (__cdecl *p_get_doserrno)(int *); static int (__cdecl *p_get_errno)(int *); static int (__cdecl *p_set_doserrno)(int); static int (__cdecl *p_set_errno)(int); +static void (__cdecl *p__invalid_parameter)(const wchar_t*, + const wchar_t*, const wchar_t*, unsigned int, uintptr_t); static void init(void) { @@ -42,6 +44,7 @@ static void init(void) p_get_errno = (void *)GetProcAddress(hmod, "_get_errno"); p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno"); p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); + p__invalid_parameter = (void *)GetProcAddress(hmod, "_invalid_parameter"); } static void test_rand_s(void) @@ -341,6 +344,16 @@ static void test__popen(const char *name) ok(errno == EBADF, "errno = %d\n", errno); } +static void test__invalid_parameter(void) +{ + if(!p__invalid_parameter) { + win_skip("_invalid_parameter not available\n"); + return; + } + + p__invalid_parameter(NULL, NULL, NULL, 0, 0); +} + START_TEST(misc) { int arg_c; @@ -366,4 +379,5 @@ START_TEST(misc) test__set_doserrno(); test__set_errno(); test__popen(arg_v[0]); + test__invalid_parameter(); }

1 0

Henri Verbeet : d3d8/tests: Use a separate device for clear_test().
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 00630f67a44e7a63f010a0cad04284c38bbdc2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=00630f67a44e7a63f010a0cad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 21 08:10:35 2014 +0200 d3d8/tests: Use a separate device for clear_test(). --- dlls/d3d8/tests/visual.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 47c2d59..1238398 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -297,13 +297,26 @@ static void lighting_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr); } -static void clear_test(IDirect3DDevice8 *device) +static void clear_test(void) { /* Tests the correctness of clearing parameters */ + D3DRECT rect_negneg, rect[2]; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - D3DRECT rect[2]; - D3DRECT rect_negneg; - DWORD color; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed with %#08x\n", hr); @@ -370,6 +383,12 @@ static void clear_test(IDirect3DDevice8 *device) "Clear with count = 1, rect = NULL has color %#08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void fog_test(void) @@ -4980,7 +4999,6 @@ START_TEST(visual) test_sanity(device_ptr); depth_clamp_test(device_ptr); lighting_test(device_ptr); - clear_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4988,6 +5006,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + clear_test(); fog_test(); z_range_test(); offscreen_test();

1 0

Dmitry Timoshkov : user32/tests: Add AppendMenu/ModifyMenu MF_POPUP tests.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 7744c7003b998fc5dc7cf375004840060ca1ddbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7744c7003b998fc5dc7cf3750… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 21 14:16:37 2014 +0900 user32/tests: Add AppendMenu/ModifyMenu MF_POPUP tests. --- dlls/user32/tests/menu.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index dc91c6a..2f3c481 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2510,6 +2510,11 @@ if (0) if (mii.hSubMenu) { ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); + if (!GetMenuItemCount(mii.hSubMenu)) + { + ok(mii.fType == checked_type, "id %u: expected fType %04x, got %04x\n", checked_cmd, checked_type, mii.fType); + ok(mii.fState == checked_state, "id %u: expected fState %04x, got %04x\n", checked_cmd, checked_state, mii.fState); + } check_menu_items(mii.hSubMenu, checked_cmd, checked_type, checked_state); } else @@ -3618,6 +3623,129 @@ static void test_emptypopup(void) ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); } +static void test_AppendMenu(void) +{ + MENUITEMINFOA mii; + HMENU hmenu, hsubmenu; + BOOL ret; + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, 201, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, 201, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, 202, "item 1"); +todo_wine + ok(ret, "AppendMenu failed\n"); +if (ret) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 202, MF_STRING, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, 203, "item 1"); +todo_wine + ok(ret, "AppendMenu failed\n"); +if (ret) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 203, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_STRING, 204, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, 204, MF_STRING, 0); + ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, 205, "item 2"); +todo_wine + ok(ret, "ModifyMenu failed\n"); +if (ret) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 205, MF_STRING, 0); + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_SUBMENU; + mii.hSubMenu = (HMENU)204; + ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); + ok(!ret, "InsertMenuItem should fail\n"); + ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); + ok(!ret, "SetMenuItemInfo should fail\n"); + mii.fMask = MIIM_ID; + mii.wID = 206; + ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); + ok(ret, "InsertMenuItem failed\n"); +if (0) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); + mii.wID = 207; + ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); + ok(ret, "SetMenuItemInfo failed\n"); +if (0) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); + DestroyMenu(hmenu); +} + START_TEST(menu) { init_function_pointers(); @@ -3655,4 +3783,5 @@ START_TEST(menu) test_menu_maxdepth(); test_menu_circref(); test_emptypopup(); + test_AppendMenu(); }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 828b48c644f1fa7d8aaa82dffa889457fee58bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828b48c644f1fa7d8aaa82dff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 21 09:15:12 2014 +0400 po: Update Russian translation. --- po/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 8c745df..72f171d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6786,7 +6786,7 @@ msgstr "" "\t/q{|n|b|r|f|n+|b+|b-}\n" "Зарегистрировать службу MSI:\n" "\t/y\n" -"Разрегистрировать службу MSI:\n" +"Удалить регистрационные данные службы MSI:\n" "\t/z\n" "Вывести эту справку:\n" "\t/help\n" @@ -11702,7 +11702,7 @@ msgstr "" " regsvr32 [/u] [/s] [/n] [/i[:cmdline]] имя_dll\n" "\n" "Параметры:\n" -" [/u] Разрегистрировать сервер.\n" +" [/u] Удалить регистрационные данные сервера.\n" " [/s] Тихий режим (сообщения не выводятся).\n" " [/i] Вызвать DllInstall с дополнительными параметрами [cmdline].\n" "\tПри использовании с [/u] DllInstall будет вызвана в режиме удаления.\n" @@ -11735,11 +11735,11 @@ msgstr "regsvr32: DLL «%1» успешно зарегистрирована\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "regsvr32: не удалось разрегистрировать DLL «%1»\n" +msgstr "regsvr32: не удалось удалить регистрационные данные DLL «%1»\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "regsvr32: DLL «%1» успешно разрегистрирована\n" +msgstr "regsvr32: регистрационные данные DLL «%1» успешно удалены\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n"

1 0