September 2010 - Wine-Commits

Andrew Nguyen : msvcrt: Implement _set_doserrno.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 67088eb34c9ed44eed4be437c83c5af45c4ae309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67088eb34c9ed44eed4be437c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 28 03:49:03 2010 -0500 msvcrt: Implement _set_doserrno. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/errno.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/misc.c | 32 ++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 7 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4c44402..7b8be69 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1070,7 +1070,7 @@ @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ stub _set_abort_behavior @ stub _set_controlfp -@ stub _set_doserrno +@ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3703af5..27c4088 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -923,7 +923,7 @@ @ stub _set_abort_behavior @ stub _set_amblksiz @ stub _set_controlfp -@ stub _set_doserrno +@ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 78ff662..00ccade 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -909,7 +909,7 @@ @ stub _set_abort_behavior @ stub _set_amblksiz @ stub _set_controlfp -@ stub _set_doserrno +@ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 1c369af..266b6db 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -237,6 +237,15 @@ int CDECL _set_errno(int value) } /********************************************************************* + * _set_doserrno (MSVCRT.@) + */ +int CDECL _set_doserrno(int value) +{ + *MSVCRT___doserrno() = value; + return 0; +} + +/********************************************************************* * strerror (MSVCRT.@) */ char* CDECL MSVCRT_strerror(int err) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8c2626d..5325227 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -848,7 +848,7 @@ @ stdcall -i386 _seh_longjmp_unwind(ptr) @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable # stub _set_controlfp -# stub _set_doserrno +@ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) # stub _set_fileinfo diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 620f09e..a4a1bd3 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -28,6 +28,7 @@ static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); 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 init(void) @@ -40,6 +41,7 @@ static void init(void) pstrerror_s = (void *)GetProcAddress(hmod, "strerror_s"); p_get_doserrno = (void *)GetProcAddress(hmod, "_get_doserrno"); p_get_errno = (void *)GetProcAddress(hmod, "_get_errno"); + p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno"); p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); } @@ -294,6 +296,35 @@ static void test__get_errno(void) ok(out == EBADF, "Expected output variable to be EBADF, got %d\n", out); } +static void test__set_doserrno(void) +{ + int ret; + + if (!p_set_doserrno) + { + win_skip("_set_doserrno is not available\n"); + return; + } + + _doserrno = ERROR_INVALID_CMM; + ret = p_set_doserrno(ERROR_FILE_NOT_FOUND); + ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret); + ok(_doserrno == ERROR_FILE_NOT_FOUND, + "Expected _doserrno to be ERROR_FILE_NOT_FOUND, got %d\n", _doserrno); + + _doserrno = ERROR_INVALID_CMM; + ret = p_set_doserrno(-1); + ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret); + ok(_doserrno == -1, + "Expected _doserrno to be -1, got %d\n", _doserrno); + + _doserrno = ERROR_INVALID_CMM; + ret = p_set_doserrno(0xdeadbeef); + ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret); + ok(_doserrno == 0xdeadbeef, + "Expected _doserrno to be 0xdeadbeef, got %d\n", _doserrno); +} + static void test__set_errno(void) { int ret; @@ -330,5 +361,6 @@ START_TEST(misc) test_strerror_s(); test__get_doserrno(); test__get_errno(); + test__set_doserrno(); test__set_errno(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 1331ac5..bef83f4 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -130,6 +130,7 @@ extern int* __cdecl _errno(void); errno_t __cdecl _get_doserrno(int*); errno_t __cdecl _get_errno(int*); +errno_t __cdecl _set_doserrno(int); errno_t __cdecl _set_errno(int); typedef int (__cdecl *_onexit_t)(void);

1 0

Andrew Nguyen : msvcrt: Implement strerror_s.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: b7a74d24f5e4b5c0d0ecaa63efaa15c5dda13b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a74d24f5e4b5c0d0ecaa63e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 28 03:48:13 2010 -0500 msvcrt: Implement strerror_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/errno.c | 27 +++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/misc.c | 50 +++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/string.h | 1 + 7 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5590d47..6d90b3b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1581,7 +1581,7 @@ @ cdecl strcpy_s(ptr long str) msvcrt.strcpy_s @ cdecl strcspn(str str) msvcrt.strcspn @ cdecl strerror(long) msvcrt.strerror -@ stub strerror_s +@ cdecl strerror_s(ptr long long) msvcrt.strerror_s @ cdecl strftime(str long str ptr) msvcrt.strftime @ cdecl strlen(str) msvcrt.strlen @ cdecl strncat(str str long) msvcrt.strncat diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8f547cf..c30ef6e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1435,7 +1435,7 @@ @ cdecl strcpy_s(ptr long str) msvcrt.strcpy_s @ cdecl strcspn(str str) msvcrt.strcspn @ cdecl strerror(long) msvcrt.strerror -@ stub strerror_s +@ cdecl strerror_s(ptr long long) msvcrt.strerror_s @ cdecl strftime(str long str ptr) msvcrt.strftime @ cdecl strlen(str) msvcrt.strlen @ cdecl strncat(str str long) msvcrt.strncat diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 01df496..4e07480 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1419,7 +1419,7 @@ @ cdecl strcpy_s(ptr long str) msvcrt.strcpy_s @ cdecl strcspn(str str) msvcrt.strcspn @ cdecl strerror(long) msvcrt.strerror -@ stub strerror_s +@ cdecl strerror_s(ptr long long) msvcrt.strerror_s @ cdecl strftime(str long str ptr) msvcrt.strftime @ cdecl strlen(str) msvcrt.strlen @ cdecl strncat(str str long) msvcrt.strncat diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 4d97051..2e03ec1 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -219,6 +219,33 @@ char* CDECL MSVCRT_strerror(int err) } /********************************************************************** + * strerror_s (MSVCRT.@) + */ +int CDECL strerror_s(char *buffer, MSVCRT_size_t numberOfElements, int errnum) +{ + char *ptr; + + if (!buffer || !numberOfElements) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (errnum < 0 || errnum > MSVCRT__sys_nerr) + errnum = MSVCRT__sys_nerr; + + ptr = MSVCRT__sys_errlist[errnum]; + while (*ptr && numberOfElements > 1) + { + *buffer++ = *ptr++; + numberOfElements--; + } + + *buffer = '\0'; + return 0; +} + +/********************************************************************** * _strerror (MSVCRT.@) */ char* CDECL _strerror(const char* str) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ccd3c6a..4fb9f8d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1374,7 +1374,7 @@ @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror -# stub strerror_s +@ cdecl strerror_s(ptr long long) @ cdecl strftime(str long str ptr) MSVCRT_strftime @ cdecl strlen(str) ntdll.strlen @ cdecl strncat(str str long) ntdll.strncat diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 0e45eba..34980eb 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -25,6 +25,7 @@ static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pmemcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); +static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); static void init(void) { @@ -33,6 +34,7 @@ static void init(void) prand_s = (void *)GetProcAddress(hmod, "rand_s"); pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT"); + pstrerror_s = (void *)GetProcAddress(hmod, "strerror_s"); } static void test_rand_s(void) @@ -192,6 +194,53 @@ static void test_I10_OUTPUT(void) } } +static void test_strerror_s(void) +{ + int ret; + char buf[256]; + + if (!pstrerror_s) + { + win_skip("strerror_s is not available\n"); + return; + } + + errno = EBADF; + ret = pstrerror_s(NULL, 0, 0); + ok(ret == EINVAL, "Expected strerror_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = pstrerror_s(NULL, sizeof(buf), 0); + ok(ret == EINVAL, "Expected strerror_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memset(buf, 'X', sizeof(buf)); + errno = EBADF; + ret = pstrerror_s(buf, 0, 0); + ok(ret == EINVAL, "Expected strerror_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buf[0] == 'X', "Expected output buffer to be untouched\n"); + + memset(buf, 'X', sizeof(buf)); + ret = pstrerror_s(buf, 1, 0); + ok(ret == 0, "Expected strerror_s to return 0, got %d\n", ret); + ok(strlen(buf) == 0, "Expected output buffer to be null terminated\n"); + + memset(buf, 'X', sizeof(buf)); + ret = pstrerror_s(buf, 2, 0); + ok(ret == 0, "Expected strerror_s to return 0, got %d\n", ret); + ok(strlen(buf) == 1, "Expected output buffer to be truncated\n"); + + memset(buf, 'X', sizeof(buf)); + ret = pstrerror_s(buf, sizeof(buf), 0); + ok(ret == 0, "Expected strerror_s to return 0, got %d\n", ret); + + memset(buf, 'X', sizeof(buf)); + ret = pstrerror_s(buf, sizeof(buf), -1); + ok(ret == 0, "Expected strerror_s to return 0, got %d\n", ret); +} + START_TEST(misc) { init(); @@ -199,4 +248,5 @@ START_TEST(misc) test_rand_s(); test_memcpy_s(); test_I10_OUTPUT(); + test_strerror_s(); } diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 3e60a4d..614fa85 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -44,6 +44,7 @@ static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return int __cdecl _strcmpi(const char*,const char*); char* __cdecl _strdup(const char*); char* __cdecl _strerror(const char*); +errno_t __cdecl strerror_s(char*,size_t,int); int __cdecl _stricmp(const char*,const char*); int __cdecl _stricoll(const char*,const char*); char* __cdecl _strlwr(char*);

1 0

Andrew Nguyen : msvcrt: Implement _get_errno.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 79ab715272921f426d2b2c23f1dc80703c5c2631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ab715272921f426d2b2c23f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 28 03:48:24 2010 -0500 msvcrt: Implement _get_errno. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/errno.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/misc.c | 25 +++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 7 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6d90b3b..bece7c5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -679,7 +679,7 @@ @ stub _get_daylight @ stub _get_doserrno @ stub _get_dstbias -@ stub _get_errno +@ cdecl _get_errno(ptr) msvcrt._get_errno @ stub _get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c30ef6e..d44ce22 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -521,7 +521,7 @@ @ stub _get_daylight @ stub _get_doserrno @ stub _get_dstbias -@ stub _get_errno +@ cdecl _get_errno(ptr) msvcrt._get_errno @ stub _get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4e07480..f7f43fb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -513,7 +513,7 @@ @ stub _get_daylight @ stub _get_doserrno @ stub _get_dstbias -@ stub _get_errno +@ cdecl _get_errno(ptr) msvcrt._get_errno @ stub _get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 2e03ec1..7d1ebe2 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -204,6 +204,18 @@ MSVCRT_ulong* CDECL MSVCRT___doserrno(void) } /********************************************************************* + * _get_errno (MSVCRT.@) + */ +int CDECL _get_errno(int *pValue) +{ + if (!pValue) + return MSVCRT_EINVAL; + + *pValue = *MSVCRT__errno(); + return 0; +} + +/********************************************************************* * strerror (MSVCRT.@) */ char* CDECL MSVCRT_strerror(int err) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4fb9f8d..fb30d3d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -464,7 +464,7 @@ @ cdecl _gcvt_s(ptr long double long) # stub _get_doserrno # stub _get_environ -# stub _get_errno +@ cdecl _get_errno(ptr) # stub _get_fileinfo # stub _get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 34980eb..21d9b5c 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -26,6 +26,7 @@ static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pmemcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); +static int (__cdecl *p_get_errno)(int *); static void init(void) { @@ -35,6 +36,7 @@ static void init(void) pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT"); pstrerror_s = (void *)GetProcAddress(hmod, "strerror_s"); + p_get_errno = (void *)GetProcAddress(hmod, "_get_errno"); } static void test_rand_s(void) @@ -241,6 +243,28 @@ static void test_strerror_s(void) ok(ret == 0, "Expected strerror_s to return 0, got %d\n", ret); } +static void test__get_errno(void) +{ + int ret, out; + + if (!p_get_errno) + { + win_skip("_get_errno is not available\n"); + return; + } + + errno = EBADF; + ret = p_get_errno(NULL); + ok(ret == EINVAL, "Expected _get_errno to return EINVAL, got %d\n", ret); + ok(errno == EBADF, "Expected errno to be EBADF, got %d\n", errno); + + errno = EBADF; + out = 0xdeadbeef; + ret = p_get_errno(&out); + ok(ret == 0, "Expected _get_errno to return 0, got %d\n", ret); + ok(out == EBADF, "Expected output variable to be EBADF, got %d\n", out); +} + START_TEST(misc) { init(); @@ -249,4 +273,5 @@ START_TEST(misc) test_memcpy_s(); test_I10_OUTPUT(); test_strerror_s(); + test__get_errno(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 5e95d35..0eb2a21 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -128,6 +128,7 @@ extern int* __cdecl _errno(void); * char** _sys_errlist; */ +errno_t __cdecl _get_errno(int*); typedef int (__cdecl *_onexit_t)(void);

1 0

Andrew Nguyen : msvcrt: Implement _get_doserrno.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: c3b127f5661bd8958ca3ab6f12003c0356410f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b127f5661bd8958ca3ab6f1… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 28 03:48:42 2010 -0500 msvcrt: Implement _get_doserrno. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/errno.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/misc.c | 28 ++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 7 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index bece7c5..b76f19b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -677,7 +677,7 @@ @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_current_locale @ stub _get_daylight -@ stub _get_doserrno +@ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno @ stub _get_fmode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d44ce22..5d47caa 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -519,7 +519,7 @@ @ stub _get_amblksiz @ stub _get_current_locale @ stub _get_daylight -@ stub _get_doserrno +@ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno @ stub _get_fmode diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f7f43fb..78152d2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -511,7 +511,7 @@ @ stub _get_amblksiz @ stub _get_current_locale @ stub _get_daylight -@ stub _get_doserrno +@ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno @ stub _get_fmode diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 7d1ebe2..b3f506b 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -216,6 +216,18 @@ int CDECL _get_errno(int *pValue) } /********************************************************************* + * _get_doserrno (MSVCRT.@) + */ +int CDECL _get_doserrno(int *pValue) +{ + if (!pValue) + return MSVCRT_EINVAL; + + *pValue = *MSVCRT___doserrno(); + return 0; +} + +/********************************************************************* * strerror (MSVCRT.@) */ char* CDECL MSVCRT_strerror(int err) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index fb30d3d..4cb882b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -462,7 +462,7 @@ @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) @ cdecl _gcvt_s(ptr long double long) -# stub _get_doserrno +@ cdecl _get_doserrno(ptr) # stub _get_environ @ cdecl _get_errno(ptr) # stub _get_fileinfo diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 21d9b5c..6ad8e59 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -26,6 +26,7 @@ static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pmemcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); +static int (__cdecl *p_get_doserrno)(int *); static int (__cdecl *p_get_errno)(int *); static void init(void) @@ -36,6 +37,7 @@ static void init(void) pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT"); pstrerror_s = (void *)GetProcAddress(hmod, "strerror_s"); + p_get_doserrno = (void *)GetProcAddress(hmod, "_get_doserrno"); p_get_errno = (void *)GetProcAddress(hmod, "_get_errno"); } @@ -243,6 +245,31 @@ static void test_strerror_s(void) ok(ret == 0, "Expected strerror_s to return 0, got %d\n", ret); } +static void test__get_doserrno(void) +{ + int ret, out; + + if (!p_get_doserrno) + { + win_skip("_get_doserrno is not available\n"); + return; + } + + _doserrno = ERROR_INVALID_CMM; + errno = EBADF; + ret = p_get_doserrno(NULL); + ok(ret == EINVAL, "Expected _get_doserrno to return EINVAL, got %d\n", ret); + ok(_doserrno = ERROR_INVALID_CMM, "Expected _doserrno to be ERROR_INVALID_CMM, got %d\n", _doserrno); + ok(errno == EBADF, "Expected errno to be EBADF, got %d\n", errno); + + _doserrno = ERROR_INVALID_CMM; + errno = EBADF; + out = 0xdeadbeef; + ret = p_get_doserrno(&out); + ok(ret == 0, "Expected _get_doserrno to return 0, got %d\n", ret); + ok(out == ERROR_INVALID_CMM, "Expected output variable to be ERROR_INVAID_CMM, got %d\n", out); +} + static void test__get_errno(void) { int ret, out; @@ -273,5 +300,6 @@ START_TEST(misc) test_memcpy_s(); test_I10_OUTPUT(); test_strerror_s(); + test__get_doserrno(); test__get_errno(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 0eb2a21..707d390 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -128,6 +128,7 @@ extern int* __cdecl _errno(void); * char** _sys_errlist; */ +errno_t __cdecl _get_doserrno(int*); errno_t __cdecl _get_errno(int*); typedef int (__cdecl *_onexit_t)(void);

1 0

Andrew Nguyen : msvcrt: Implement _set_errno.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: ad68c0bd3cbb5d55fc34ebf34d7587bc19db3cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad68c0bd3cbb5d55fc34ebf34… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 28 03:48:52 2010 -0500 msvcrt: Implement _set_errno. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/errno.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/misc.c | 29 +++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 7 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b76f19b..4c44402 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1071,7 +1071,7 @@ @ stub _set_abort_behavior @ stub _set_controlfp @ stub _set_doserrno -@ stub _set_errno +@ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5d47caa..3703af5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -924,7 +924,7 @@ @ stub _set_amblksiz @ stub _set_controlfp @ stub _set_doserrno -@ stub _set_errno +@ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 78152d2..78ff662 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -910,7 +910,7 @@ @ stub _set_amblksiz @ stub _set_controlfp @ stub _set_doserrno -@ stub _set_errno +@ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index b3f506b..1c369af 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -228,6 +228,15 @@ int CDECL _get_doserrno(int *pValue) } /********************************************************************* + * _set_errno (MSVCRT.@) + */ +int CDECL _set_errno(int value) +{ + *MSVCRT__errno() = value; + return 0; +} + +/********************************************************************* * strerror (MSVCRT.@) */ char* CDECL MSVCRT_strerror(int err) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4cb882b..8c2626d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -849,7 +849,7 @@ @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable # stub _set_controlfp # stub _set_doserrno -# stub _set_errno +@ cdecl _set_errno(long) @ cdecl _set_error_mode(long) # stub _set_fileinfo # stub _set_fmode diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 6ad8e59..620f09e 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -28,6 +28,7 @@ static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); static int (__cdecl *p_get_doserrno)(int *); static int (__cdecl *p_get_errno)(int *); +static int (__cdecl *p_set_errno)(int); static void init(void) { @@ -39,6 +40,7 @@ static void init(void) pstrerror_s = (void *)GetProcAddress(hmod, "strerror_s"); p_get_doserrno = (void *)GetProcAddress(hmod, "_get_doserrno"); p_get_errno = (void *)GetProcAddress(hmod, "_get_errno"); + p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); } static void test_rand_s(void) @@ -292,6 +294,32 @@ static void test__get_errno(void) ok(out == EBADF, "Expected output variable to be EBADF, got %d\n", out); } +static void test__set_errno(void) +{ + int ret; + + if (!p_set_errno) + { + win_skip("_set_errno is not available\n"); + return; + } + + errno = EBADF; + ret = p_set_errno(EINVAL); + ok(ret == 0, "Expected _set_errno to return 0, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_set_errno(-1); + ok(ret == 0, "Expected _set_errno to return 0, got %d\n", ret); + ok(errno == -1, "Expected errno to be -1, got %d\n", errno); + + errno = EBADF; + ret = p_set_errno(0xdeadbeef); + ok(ret == 0, "Expected _set_errno to return 0, got %d\n", ret); + ok(errno == 0xdeadbeef, "Expected errno to be 0xdeadbeef, got %d\n", errno); +} + START_TEST(misc) { init(); @@ -302,4 +330,5 @@ START_TEST(misc) test_strerror_s(); test__get_doserrno(); test__get_errno(); + test__set_errno(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 707d390..1331ac5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -130,6 +130,7 @@ extern int* __cdecl _errno(void); errno_t __cdecl _get_doserrno(int*); errno_t __cdecl _get_errno(int*); +errno_t __cdecl _set_errno(int); typedef int (__cdecl *_onexit_t)(void);

1 0

Luca Bennati : msacm32: Update Italian translation.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 68abad937d3dae67d0c4cec175b84af5d667d561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68abad937d3dae67d0c4cec17… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 16:05:47 2010 +0200 msacm32: Update Italian translation. --- dlls/msacm32/msacm_It.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/msacm_It.rc b/dlls/msacm32/msacm_It.rc index bd0d589..64636cd 100644 --- a/dlls/msacm32/msacm_It.rc +++ b/dlls/msacm32/msacm_It.rc @@ -21,6 +21,9 @@ #include "wineacm.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 @@ -49,6 +52,6 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 PUSHBUTTON "Annulla", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Aiuto", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "A&iuto", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END

1 0

Luca Bennati : comctl32: Update Italian translation.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: d345c8dd9392fd481b24c5ea22830657716df7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d345c8dd9392fd481b24c5ea2… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 16:20:24 2010 +0200 comctl32: Update Italian translation. --- dlls/comctl32/comctl_It.rc | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/comctl_It.rc b/dlls/comctl32/comctl_It.rc index 8253dab..d2f721f 100644 --- a/dlls/comctl32/comctl_It.rc +++ b/dlls/comctl32/comctl_It.rc @@ -19,11 +19,14 @@ #include "comctl32.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriet� per %s" +CAPTION "Proprietà per %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -57,14 +60,14 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Chiudi", IDCANCEL,308,6,44,14 PUSHBUTTON "R&eimpostare", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Aiuto", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Muovi &Su", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Muovi &Gi�", IDC_MOVEDN_BTN,308,91,44,14 + PUSHBUTTON "A&iuto", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Muovi &su", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Muovi &giù", IDC_MOVEDN_BTN,308,91,44,14 LTEXT "&Tasti disponibili:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Aggiungi ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- &Rimuovi", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Tasti della barra degli strumenti:", -1,182,5,78,10 + LTEXT "Tasti della &barra degli strumenti:", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END

1 0

Luca Bennati : mpr: Update Italian translation.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 3c77b1b976e0faa681db275b3708105dfd6e6e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c77b1b976e0faa681db275b3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 15:59:41 2010 +0200 mpr: Update Italian translation. --- dlls/mpr/mpr_It.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/mpr_It.rc b/dlls/mpr/mpr_It.rc index 3a6a2f8..b1cc06f 100644 --- a/dlls/mpr/mpr_It.rc +++ b/dlls/mpr/mpr_It.rc @@ -21,6 +21,9 @@ #include "mprres.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE @@ -30,19 +33,19 @@ STRINGTABLE IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Inserisci la Password di Rete" +CAPTION "Inserisci la password di rete" FONT 8, "MS Shell Dlg" { LTEXT "Inserire nome utente e password:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ +/* LTEXT "Dominio", -1, 40, 46, 50, 10 */ LTEXT "Utente", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD -CHECKBOX "&Memorizza la password ( RISCHIOSO! )", IDC_SAVEPASSWORD, +CHECKBOX "&Memorizza la password (non sicuro)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annulla", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP

1 0

Andrew Nguyen : msvcrt: Convert the Unix asctime string from CP_UNIXCP to CP_ACP.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: ac26d786c4845e3fba688c8b52ca70f281084dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac26d786c4845e3fba688c8b5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 28 03:47:56 2010 -0500 msvcrt: Convert the Unix asctime string from CP_UNIXCP to CP_ACP. --- dlls/msvcrt/time.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 54bbd74..df31593 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -756,6 +756,9 @@ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, */ char * CDECL MSVCRT_asctime(const struct MSVCRT_tm *mstm) { + char bufferA[30]; + WCHAR bufferW[30]; + thread_data_t *data = msvcrt_get_thread_data(); struct tm tm; @@ -764,12 +767,13 @@ char * CDECL MSVCRT_asctime(const struct MSVCRT_tm *mstm) if (!data->asctime_buffer) data->asctime_buffer = MSVCRT_malloc( 30 ); /* ought to be enough */ - /* FIXME: may want to map from Unix codepage to CP_ACP */ #ifdef HAVE_ASCTIME_R - asctime_r( &tm, data->asctime_buffer ); + asctime_r( &tm, bufferA ); #else - strcpy( data->asctime_buffer, asctime(&tm) ); + strcpy( bufferA, asctime(&tm) ); #endif + MultiByteToWideChar( CP_UNIXCP, 0, bufferA, -1, bufferW, 30 ); + WideCharToMultiByte( CP_ACP, 0, bufferW, -1, data->asctime_buffer, 30, NULL, NULL ); return data->asctime_buffer; }

1 0

Luca Bennati : serialui: Update Italian translation.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: fba4c2f66173c034bc1c4e1f5a9164e3e2c9274a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba4c2f66173c034bc1c4e1f5… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 15:52:30 2010 +0200 serialui: Update Italian translation. --- dlls/serialui/It.rc | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/serialui/It.rc b/dlls/serialui/It.rc index 3d2b65d..7b4c4a5 100644 --- a/dlls/serialui/It.rc +++ b/dlls/serialui/It.rc @@ -1,4 +1,6 @@ /* + * Serialui Italian language support + * * Copyright 2000 Mike McCormack * Copyright 2003 Ivan Leo Puoti * @@ -19,16 +21,19 @@ #include "serialui.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriet� per " +CAPTION "Proprietà per " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bit per secondo", -1,5,20,55,10 + LTEXT "Bit per secondo (baud)", -1,5,20,55,10 COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Parit�", -1,5,40,55,10 + LTEXT "Parità", -1,5,40,55,10 COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Controllo di flusso", -1,5,60,55,10 COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP

1 0