wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Octavian Voicu : msi: Use standard window class for combo control and add error checking.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 2793a4fd52112f25de3e32620a0b141f5b852211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2793a4fd52112f25de3e32620… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Apr 19 12:59:01 2010 +0300 msi: Use standard window class for combo control and add error checking. --- dlls/msi/dialog.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ac2e95a..5afced2 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1224,7 +1224,7 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) { - static const WCHAR szCombo[] = { 'C','O','M','B','O','B','O','X',0 }; + msi_control *control; DWORD attributes, style; style = CBS_AUTOHSCROLL | WS_TABSTOP | WS_GROUP | WS_CHILD; @@ -1236,7 +1236,10 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) else style |= CBS_DROPDOWN; - msi_dialog_add_control( dialog, rec, szCombo, style ); + control = msi_dialog_add_control( dialog, rec, WC_COMBOBOXW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + return ERROR_SUCCESS; }

1 0

Octavian Voicu : msi: Fix crash when calling MsiGetActiveDatabase with invalid remote handle.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 9c892430ba3d9cf5c6c507ca258f0cb08400e2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c892430ba3d9cf5c6c507ca2… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Apr 19 12:49:40 2010 +0300 msi: Fix crash when calling MsiGetActiveDatabase with invalid remote handle. --- dlls/msi/package.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b1741ae..71346f4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1357,6 +1357,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) { MSIPACKAGE *package; MSIHANDLE handle = 0; + IUnknown *remote_unk; IWineMsiRemotePackage *remote_package; TRACE("(%d)\n",hInstall); @@ -1367,10 +1368,19 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) handle = alloc_msihandle( &package->db->hdr ); msiobj_release( &package->hdr ); } - else if ((remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ))) + else if ((remote_unk = msi_get_remote(hInstall))) { - IWineMsiRemotePackage_GetActiveDatabase(remote_package, &handle); - IWineMsiRemotePackage_Release(remote_package); + if (IUnknown_QueryInterface(remote_unk, &IID_IWineMsiRemotePackage, + (LPVOID *)&remote_package) == S_OK) + { + IWineMsiRemotePackage_GetActiveDatabase(remote_package, &handle); + IWineMsiRemotePackage_Release(remote_package); + } + else + { + WARN("remote handle %d is not a package\n", hInstall); + } + IUnknown_Release(remote_unk); } return handle;

1 0

Piotr Caban : msvcrt: Added fopen_s implementation.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 1b4bacea8c9b8bb4208cc5e91c473d595f7fbca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4bacea8c9b8bb4208cc5e91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:59:02 2010 +0200 msvcrt: Added fopen_s implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 30 +++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 04535b3..44507ec 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1259,7 +1259,7 @@ @ cdecl floor(double) msvcrt.floor @ cdecl fmod(double double) msvcrt.fmod @ cdecl fopen(str str) msvcrt.fopen -@ stub fopen_s +@ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf @ stub fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ae13be4..1e6731f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1243,7 +1243,7 @@ @ cdecl floor(double) msvcrt.floor @ cdecl fmod(double double) msvcrt.fmod @ cdecl fopen(str str) msvcrt.fopen -@ stub fopen_s +@ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf @ stub fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c5b2798..6641999 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -218,6 +218,7 @@ static int msvcrt_alloc_fd_from(HANDLE hand, int flag, int fd) if (fd >= MSVCRT_MAX_FILES) { WARN(":files exhausted!\n"); + *MSVCRT__errno() = MSVCRT_ENFILE; return -1; } MSVCRT_fdesc[fd].handle = hand; @@ -1033,6 +1034,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st *stream_flags = plus ? MSVCRT__IORW : MSVCRT__IOWRT; break; default: + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; return -1; } @@ -2649,10 +2652,16 @@ MSVCRT_FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share MSVCRT_FILE *ret; MSVCRT_wchar_t *pathW = NULL, *modeW = NULL; - if (path && !(pathW = msvcrt_wstrdupa(path))) return NULL; + if (path && !(pathW = msvcrt_wstrdupa(path))) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return NULL; + } if (mode && !(modeW = msvcrt_wstrdupa(mode))) { MSVCRT_free(pathW); + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } @@ -2672,6 +2681,25 @@ MSVCRT_FILE * CDECL MSVCRT_fopen(const char *path, const char *mode) } /********************************************************************* + * fopen_s (MSVCRT.@) + */ +int CDECL MSVCRT_fopen_s(MSVCRT_FILE** pFile, + const char *filename, const char *mode) +{ + if(!pFile) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *pFile = MSVCRT_fopen(filename, mode); + + if(!*pFile) + return *MSVCRT__errno(); + return 0; +} + +/********************************************************************* * _wfopen (MSVCRT.@) */ MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f4f9ee8..fdd58c2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1190,7 +1190,7 @@ @ cdecl floor(double) MSVCRT_floor @ cdecl fmod(double double) MSVCRT_fmod @ cdecl fopen(str str) MSVCRT_fopen -# stub fopen_s +@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s @ varargs fprintf(ptr str) MSVCRT_fprintf # stub fprintf_s @ cdecl fputc(long ptr) MSVCRT_fputc

1 0

Piotr Caban : msvcrt: Return correct strings in setlocale.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 8adfd63c2156a95bf5eddb2b283cfd14ff195da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adfd63c2156a95bf5eddb2b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:51 2010 +0200 msvcrt: Return correct strings in setlocale. --- dlls/msvcrt/locale.c | 52 ++++++++++++++++++++++++++++++------------- dlls/msvcrt/tests/locale.c | 4 +- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fe77b83..84bd73b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -348,6 +348,32 @@ MSVCRT__locale_t get_locale(void) { return data->locale; } +/* INTERNAL: constructs string returned by setlocale */ +static inline char* construct_lc_all(MSVCRT__locale_t cur) { + static char current_lc_all[MAX_LOCALE_LENGTH]; + + int i; + + for(i=MSVCRT_LC_MIN+1; i<MSVCRT_LC_MAX; i++) { + if(strcmp(cur->locinfo->lc_category[i].locale, + cur->locinfo->lc_category[i+1].locale)) + break; + } + + if(i==MSVCRT_LC_MAX) + return cur->locinfo->lc_category[MSVCRT_LC_COLLATE].locale; + + sprintf(current_lc_all, + "LC_COLLATE=%s;LC_CTYPE=%s;LC_MONETARY=%s;LC_NUMERIC=%s;LC_TIME=%s", + cur->locinfo->lc_category[MSVCRT_LC_COLLATE].locale, + cur->locinfo->lc_category[MSVCRT_LC_CTYPE].locale, + cur->locinfo->lc_category[MSVCRT_LC_MONETARY].locale, + cur->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale, + cur->locinfo->lc_category[MSVCRT_LC_TIME].locale); + + return current_lc_all; +} + /********************************************************************* * wsetlocale (MSVCRT.@) @@ -1020,31 +1046,25 @@ int CDECL _configthreadlocale(int type) */ char* CDECL MSVCRT_setlocale(int category, const char* locale) { - static char current_lc_all[MAX_LOCALE_LENGTH]; - MSVCRT__locale_t loc, cur; cur = get_locale(); - if(locale == NULL) { - if(category == MSVCRT_LC_ALL) { - sprintf(current_lc_all, - "LC_COLLATE=%s;LC_CTYPE=%s;LC_MONETARY=%s;LC_NUMERIC=%s;LC_TIME=%s", - cur->locinfo->lc_category[MSVCRT_LC_COLLATE].locale, - cur->locinfo->lc_category[MSVCRT_LC_CTYPE].locale, - cur->locinfo->lc_category[MSVCRT_LC_MONETARY].locale, - cur->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale, - cur->locinfo->lc_category[MSVCRT_LC_TIME].locale); - - return current_lc_all; - } + if(category<MSVCRT_LC_MIN || category>MSVCRT_LC_MAX) + return NULL; + + if(!locale) { + if(category == MSVCRT_LC_ALL) + return construct_lc_all(cur); return cur->locinfo->lc_category[category].locale; } loc = _create_locale(category, locale); - if(!loc) + if(!loc) { + WARN("%d %s failed\n", category, locale); return NULL; + } LOCK_LOCALE; @@ -1163,7 +1183,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) } if(category == MSVCRT_LC_ALL) - return cur->locinfo->lc_category[MSVCRT_LC_COLLATE].locale; + return construct_lc_all(cur); return cur->locinfo->lc_category[category].locale; } diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 45ab9b7..4c4b7a9 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -51,7 +51,7 @@ static void test_setlocale(void) ok(!strcmp(ret, "C"), "ret = %s\n", ret); ret = setlocale(LC_ALL, NULL); - todo_wine ok(!strcmp(ret, "C"), "ret = %s\n", ret); + ok(!strcmp(ret, "C"), "ret = %s\n", ret); if(!setlocale(LC_NUMERIC, "Polish") || !setlocale(LC_NUMERIC, "Greek") @@ -72,7 +72,7 @@ static void test_setlocale(void) strcpy(buf, ret); ret = setlocale(LC_ALL, buf); - todo_wine ok(!strcmp(ret, lc_all), "ret = %s\n", ret); + ok(!strcmp(ret, lc_all), "ret = %s\n", ret); ret = setlocale(LC_ALL, "German"); todo_wine ok(!strcmp(ret, "German_Germany.1252"), "ret = %s\n", ret);

1 0

Piotr Caban : msvcrt/tests: Added __crtGetStringTypeW tests.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 0d79b4b6539a1e162a24c00e727e8a3cbc11391a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d79b4b6539a1e162a24c00e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:40 2010 +0200 msvcrt/tests: Added __crtGetStringTypeW tests. --- dlls/msvcrt/tests/locale.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index ce44347..45ab9b7 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -19,7 +19,20 @@ */ #include <locale.h> + #include "wine/test.h" +#include "winnls.h" + +static BOOL (__cdecl *p__crtGetStringTypeW)(DWORD, DWORD, const wchar_t*, int, WORD*); +static int (__cdecl *pmemcpy_s)(void *, size_t, void*, size_t); + +static void init(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + p__crtGetStringTypeW = (void*)GetProcAddress(hmod, "__crtGetStringTypeW"); + pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); +} static void test_setlocale(void) { @@ -75,7 +88,55 @@ static void test_setlocale(void) ok(!strcmp(ret, "English_United States.1252"), "ret = %s\n", ret); } +static void test_crtGetStringTypeW(void) +{ + static const wchar_t str0[] = { '0', '\0' }; + static const wchar_t strA[] = { 'A', '\0' }; + static const wchar_t str_space[] = { ' ', '\0' }; + static const wchar_t str_null[] = { '\0', '\0' }; + static const wchar_t str_rand[] = { 1234, '\0' }; + + const wchar_t *str[] = { str0, strA, str_space, str_null, str_rand }; + + WORD out_crt, out; + BOOL ret_crt, ret; + int i; + + if(!p__crtGetStringTypeW) { + win_skip("Skipping __crtGetStringTypeW tests\n"); + return; + } + + if(!pmemcpy_s) { + win_skip("To old version of msvcrt.dll\n"); + return; + } + + for(i=0; i<sizeof(str)/sizeof(*str); i++) { + ret_crt = p__crtGetStringTypeW(0, CT_CTYPE1, str[i], 1, &out_crt); + ret = GetStringTypeW(CT_CTYPE1, str[i], 1, &out); + ok(ret == ret_crt, "%d) ret_crt = %d\n", i, (int)ret_crt); + ok(out == out_crt, "%d) out_crt = %x, expected %x\n", i, (int)out_crt, (int)out); + + ret_crt = p__crtGetStringTypeW(0, CT_CTYPE2, str[i], 1, &out_crt); + ret = GetStringTypeW(CT_CTYPE2, str[i], 1, &out); + ok(ret == ret_crt, "%d) ret_crt = %d\n", i, (int)ret_crt); + ok(out == out_crt, "%d) out_crt = %x, expected %x\n", i, (int)out_crt, (int)out); + + ret_crt = p__crtGetStringTypeW(0, CT_CTYPE3, str[i], 1, &out_crt); + ret = GetStringTypeW(CT_CTYPE3, str[i], 1, &out); + ok(ret == ret_crt, "%d) ret_crt = %d\n", i, (int)ret_crt); + ok(out == out_crt, "%d) out_crt = %x, expected %x\n", i, (int)out_crt, (int)out); + } + + ret = p__crtGetStringTypeW(0, 3, str[0], 1, &out); + ok(!ret, "ret == TRUE\n"); +} + START_TEST(locale) { + init(); + + test_crtGetStringTypeW(); test_setlocale(); }

1 0

Piotr Caban : msvcrt/tests: Added setlocale tests.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: d03020a976581253435fc345d82f320314aac5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03020a976581253435fc345d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:30 2010 +0200 msvcrt/tests: Added setlocale tests. --- dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/locale.c | 81 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 79958ea..60348f5 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ file.c \ headers.c \ heap.c \ + locale.c \ misc.c \ printf.c \ scanf.c \ diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c new file mode 100644 index 0000000..ce44347 --- /dev/null +++ b/dlls/msvcrt/tests/locale.c @@ -0,0 +1,81 @@ +/* + * Unit test suite for locale functions. + * + * Copyright 2010 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <locale.h> +#include "wine/test.h" + +static void test_setlocale(void) +{ + static const char lc_all[] = "LC_COLLATE=C;LC_CTYPE=C;" + "LC_MONETARY=Greek_Greece.1253;LC_NUMERIC=Polish_Poland.1250;LC_TIME=C"; + + char *ret, buf[100]; + + ret = setlocale(20, "C"); + ok(ret == NULL, "ret = %s\n", ret); + + ret = setlocale(LC_ALL, ""); + ok(ret != NULL, "ret == NULL\n"); + + ret = setlocale(LC_ALL, "C"); + ok(!strcmp(ret, "C"), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, NULL); + todo_wine ok(!strcmp(ret, "C"), "ret = %s\n", ret); + + if(!setlocale(LC_NUMERIC, "Polish") + || !setlocale(LC_NUMERIC, "Greek") + || !setlocale(LC_NUMERIC, "German") + || !setlocale(LC_NUMERIC, "English")) { + win_skip("System with limited locales\n"); + return; + } + + ret = setlocale(LC_NUMERIC, "Polish"); + ok(!strcmp(ret, "Polish_Poland.1250"), "ret = %s\n", ret); + + ret = setlocale(LC_MONETARY, "Greek"); + ok(!strcmp(ret, "Greek_Greece.1253"), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, NULL); + ok(!strcmp(ret, lc_all), "ret = %s\n", ret); + + strcpy(buf, ret); + ret = setlocale(LC_ALL, buf); + todo_wine ok(!strcmp(ret, lc_all), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, "German"); + todo_wine ok(!strcmp(ret, "German_Germany.1252"), "ret = %s\n", ret); + + /* This test shows that _country_synonims table is incorrect */ + /* It translates "America" to "US" */ + ret = setlocale(LC_ALL, "America"); + ok(ret == NULL, "ret = %s\n", ret); + + ret = setlocale(LC_ALL, "US"); + todo_wine ok(ret != NULL, "ret == NULL\n"); + if(ret) + ok(!strcmp(ret, "English_United States.1252"), "ret = %s\n", ret); +} + +START_TEST(locale) +{ + test_setlocale(); +}

1 0

Piotr Caban : msvcrt: Added implementation of __crtGetStringTypeW.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: be5a6a03a6e2c1f0a5c23eff6c475481c2d25153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5a6a03a6e2c1f0a5c23eff6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:19 2010 +0200 msvcrt: Added implementation of __crtGetStringTypeW. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d872571..04535b3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -148,7 +148,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW -@ stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringW @ stub __daylight diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 75740ec..ae13be4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -145,7 +145,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW -@ stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringW @ stub __daylight diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fe36976..fe77b83 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -54,6 +54,7 @@ unsigned char charmax = CHAR_MAX; #define UNLOCK_LOCALE _munlock(_SETLOCALE_LOCK); #define MSVCRT_LEADBYTE 0x8000 +#define MSVCRT_C1_DEFINED 0x200 /* Friendly country strings & iso codes for synonym support. * Based on MS documentation for setlocale(). @@ -458,6 +459,21 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i } /********************************************************************* + * __crtGetStringTypeW(MSVCRT.@) + * + * This function was accepting different number of arguments in older + * versions of msvcrt. + */ +BOOL CDECL __crtGetStringTypeW(DWORD unk, DWORD type, + MSVCRT_wchar_t *buffer, int len, WORD *out) +{ + FIXME("(unk %x, type %x, wstr %p(%d), %p) partial stub\n", + unk, type, buffer, len, out); + + return GetStringTypeW(type, buffer, len, out); +} + +/********************************************************************* * localeconv (MSVCRT.@) */ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dffd749..f4f9ee8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -138,7 +138,7 @@ @ cdecl __crtCompareStringA(long long str long str long) @ cdecl __crtCompareStringW(long long wstr long wstr long) @ cdecl __crtGetLocaleInfoW(long long ptr long) -# stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) # stub __crtLCMapStringW # stub __daylight

1 0

Piotr Caban : msvcrt: Fix multiple locales parsing in _create_locale.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: f11dfcb7a6dc7d552ef1ad7abb123268424bd357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11dfcb7a6dc7d552ef1ad7ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:10 2010 +0200 msvcrt: Fix multiple locales parsing in _create_locale. --- dlls/msvcrt/locale.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e8af46b..fe36976 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -214,8 +214,8 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) if(cp) { lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); - if(cp-region < MAX_ELEM_LEN) - search.search_country[cp-region] = '\0'; + if(cp-region-1 < MAX_ELEM_LEN) + search.search_country[cp-region-1] = '\0'; if(cp-locale < MAX_ELEM_LEN) search.search_language[cp-locale] = '\0'; } else @@ -229,11 +229,11 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) (LONG_PTR)&search); if (!search.match_flags) - return 0; + return -1; /* If we were given something that didn't match, fail */ if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY)) - return 0; + return -1; lcid = MAKELCID(search.found_lang_id, SORT_DEFAULT); @@ -253,10 +253,10 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, search.found_codepage, MAX_ELEM_LEN); } else - return 0; + return -1; if (!atoi(search.found_codepage)) - return 0; + return -1; } } else { /* Prefer ANSI codepages if present */ @@ -583,23 +583,25 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) return NULL; p = strchr(locale, ';'); - if(p) { + if(locale[0]=='C' && (locale[1]==';' || locale[1]=='\0')) + lcid[i] = 0; + else if(p) { memcpy(buf, locale, p-locale); lcid[i] = MSVCRT_locale_to_LCID(buf); } else lcid[i] = MSVCRT_locale_to_LCID(locale); - if(!lcid[i]) + if(lcid[i] == -1) return NULL; if(!p || *(p+1)!='L' || *(p+2)!='C' || *(p+3)!='_') break; - locale = p+4; + locale = p+1; } } else { lcid[0] = MSVCRT_locale_to_LCID(locale); - if(!lcid[0]) + if(lcid[0] == -1) return NULL; }

1 0

Piotr Caban : msvcrt: Added implementations of _vswprintf* functions.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 97bad691842b1e5e1204aa95af05b86ceffd09e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bad691842b1e5e1204aa95a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:00 2010 +0200 msvcrt: Added implementations of _vswprintf* functions. --- dlls/msvcr80/msvcr80.spec | 14 +++++++------- dlls/msvcr90/msvcr90.spec | 14 +++++++------- dlls/msvcrt/msvcrt.spec | 12 ++++++------ dlls/msvcrt/wcs.c | 17 ++++++++++++++--- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index eb2f474..d872571 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1061,13 +1061,13 @@ @ stub _vsprintf_p @ stub _vsprintf_p_l @ stub _vsprintf_s_l -@ stub _vswprintf -@ stub _vswprintf_c -@ stub _vswprintf_c_l -@ stub _vswprintf_l -@ stub _vswprintf_p -@ stub _vswprintf_p_l -@ stub _vswprintf_s_l +@ cdecl _vswprintf(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c +@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l +@ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l +@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l +@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l @ stub _vwprintf_p @ stub _vwprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7ffb0b9..75740ec 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1048,13 +1048,13 @@ @ stub _vsprintf_p @ stub _vsprintf_p_l @ stub _vsprintf_s_l -@ stub _vswprintf -@ stub _vswprintf_c -@ stub _vswprintf_c_l -@ stub _vswprintf_l -@ stub _vswprintf_p -@ stub _vswprintf_p_l -@ stub _vswprintf_s_l +@ cdecl _vswprintf(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c +@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l +@ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l +@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l +@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l @ stub _vwprintf_p @ stub _vwprintf_p_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 59ed3b3..dffd749 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -990,12 +990,12 @@ # stub _vsprintf_p # stub _vsprintf_p_l # stub _vsprintf_s_l -# stub _vswprintf -# stub _vswprintf_c -# stub _vswprintf_c_l -# stub _vswprintf_l -# stub _vswprintf_p_l -# stub _vswprintf_s_l +@ cdecl _vswprintf(ptr long wstr ptr) MSVCRT_vsnwprintf +@ cdecl _vswprintf_c(ptr long wstr ptr) MSVCRT_vsnwprintf +@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vswprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) MSVCRT_vswprintf_s_l # stub _vwprintf_l # stub _vwprintf_p # stub _vwprintf_p_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 652cbd7..df0ac03 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1083,10 +1083,21 @@ int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args ) /********************************************************************* * vswprintf_s (MSVCRT.@) */ -int CDECL MSVCRT_vswprintf_s( MSVCRT_wchar_t* str, MSVCRT_size_t num, const MSVCRT_wchar_t* format, __ms_va_list args ) +int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t* format, __ms_va_list args) { - /* FIXME: must handle positional arguments */ - return MSVCRT_vsnwprintf( str, num, format, args ); + return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), + INT_MAX, format, args); +} + +/********************************************************************* + * _vswprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args) +{ + return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t), + INT_MAX, format, locale, args ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added _vsnwprintf* implementation.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 743e6ba6886d962034b41a80e906450d97761724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743e6ba6886d962034b41a80e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:57:50 2010 +0200 msvcrt: Added _vsnwprintf* implementation. --- dlls/msvcr80/msvcr80.spec | 6 ++-- dlls/msvcr90/msvcr90.spec | 6 ++-- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 6 ++-- dlls/msvcrt/wcs.c | 67 ++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 02ecbfc..eb2f474 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1054,9 +1054,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf -@ stub _vsnwprintf_l -@ stub _vsnwprintf_s -@ stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l @ stub _vsprintf_l @ stub _vsprintf_p @ stub _vsprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5814fb2..7ffb0b9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1041,9 +1041,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf -@ stub _vsnwprintf_l -@ stub _vsnwprintf_s -@ stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l @ stub _vsprintf_l @ stub _vsprintf_p @ stub _vsprintf_p_l diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 81b0f4b..8d66eef 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -738,7 +738,7 @@ MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*); MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); -int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, unsigned int len, +int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); int __cdecl MSVCRT_raise(int sig); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a7070df..59ed3b3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -983,9 +983,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) MSVCRT_vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) MSVCRT_vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf -# stub _vsnwprintf_l -# stub _vsnwprintf_s -# stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnprintf_s_l # stub _vsprintf_l # stub _vsprintf_p # stub _vsprintf_p_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4ebb0e0..652cbd7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -935,10 +935,11 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* - * _vsnwsprintf (MSVCRT.@) + * vsnwsprintf_internal (INTERNAL) */ -int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, - const MSVCRT_wchar_t *format, __ms_va_list valist ) +static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, BOOL valid, + __ms_va_list valist) { pf_output out; @@ -947,7 +948,65 @@ int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, out.used = 0; out.len = len; - return pf_vsnprintf( &out, format, NULL, FALSE, valist ); + return pf_vsnprintf( &out, format, locale, valid, valist ); +} + +/********************************************************************* + * _vsnwsprintf (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + return vsnwprintf_internal(str, len, format, NULL, FALSE, valist); +} + +/********************************************************************* + * _vsnwsprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, + __ms_va_list valist) +{ + return vsnwprintf_internal(str, len, format, locale, FALSE, valist); +} + +/********************************************************************* + * _vsnwsprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + int len, ret; + + len = sizeOfBuffer/sizeof(MSVCRT_wchar_t); + if(count!=-1 && len>count+1) + len = count+1; + + ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); + + if(ret<0 || ret==len) { + if(count!=_TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { + MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + *MSVCRT__errno() = MSVCRT_ERANGE; + memset(str, 0, sizeOfBuffer); + } else + str[len-1] = '\0'; + + return -1; + } + + return ret; +} + +/********************************************************************* + * _vsnwsprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + return MSVCRT_vsnwprintf_s_l(str, sizeOfBuffer, count, + format, NULL, valist); } /*********************************************************************

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010