wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Octavian Voicu : ntdll: Show one-time ERR if NOFILE limit is reached.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 0d8e7983c14cd0c8f0672dfd16b5a452ded7849e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8e7983c14cd0c8f0672dfd1… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Fri Jun 11 12:13:17 2010 +0300 ntdll: Show one-time ERR if NOFILE limit is reached. --- dlls/ntdll/file.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b5d1c14..30b93aa 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -87,6 +87,7 @@ #include "ddk/ntddser.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +WINE_DECLARE_DEBUG_CHANNEL(winediag); mode_t FILE_umask = 0; @@ -203,6 +204,11 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT break; } } + else if (io->u.Status == STATUS_TOO_MANY_OPENED_FILES) + { + static int once; + if (!once++) ERR_(winediag)( "Too many open files, ulimit -n probably needs to be increased\n" ); + } return io->u.Status; }

1 0

Andrew Nguyen : winealsa.drv: Replicate the snd_pcm_recover alsa-lib implementation to cope with older alsa-lib versions .
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 13a7708abb481f2903db6b62efcf53a0a7f7b79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a7708abb481f2903db6b62e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 11 03:54:24 2010 -0500 winealsa.drv: Replicate the snd_pcm_recover alsa-lib implementation to cope with older alsa-lib versions. --- dlls/winealsa.drv/alsa.c | 45 +++++++++++++++++++++++++++++------------ dlls/winealsa.drv/alsa.h | 2 +- dlls/winealsa.drv/dsoutput.c | 2 +- dlls/winealsa.drv/waveout.c | 4 +- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 9eb50cd..4f0f1ce 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2,6 +2,7 @@ * Wine Driver for ALSA * * Copyright 2002 Eric Pouech + * Copyright 2006 Jaroslav Kysela * Copyright 2007 Maarten Lankhorst * * This file has a few shared generic subroutines shared among the alsa @@ -556,24 +557,42 @@ out: /************************************************************************** - * ALSA_XRUNRecovery [internal] + * wine_snd_pcm_recover [internal] * - * used to recovery from XRUN errors (buffer underflow/overflow) + * Code slightly modified from alsa-lib v1.0.23 snd_pcm_recover implementation. + * used to recover from XRUN errors (buffer underflow/overflow) */ -int ALSA_XRUNRecovery(WINE_WAVEDEV * wwo, int err) +int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent) { - if (err == -EPIPE) { /* under-run */ - err = snd_pcm_prepare(wwo->pcm); - if (err < 0) - ERR( "underrun recovery failed. prepare failed: %s\n", snd_strerror(err)); + if (err > 0) + err = -err; + if (err == -EINTR) /* nothing to do, continue */ return 0; - } else if (err == -ESTRPIPE) { - while ((err = snd_pcm_resume(wwo->pcm)) == -EAGAIN) - sleep(1); /* wait until the suspend flag is released */ + if (err == -EPIPE) { + const char *s; + if (snd_pcm_stream(pcm) == SND_PCM_STREAM_PLAYBACK) + s = "underrun"; + else + s = "overrun"; + if (!silent) + ERR("%s occurred", s); + err = snd_pcm_prepare(pcm); + if (err < 0) { + ERR("cannot recover from %s, prepare failed: %s", s, snd_strerror(err)); + return err; + } + return 0; + } + if (err == -ESTRPIPE) { + while ((err = snd_pcm_resume(pcm)) == -EAGAIN) + /* wait until suspend flag is released */ + poll(NULL, 0, 1000); if (err < 0) { - err = snd_pcm_prepare(wwo->pcm); - if (err < 0) - ERR("recovery from suspend failed, prepare failed: %s\n", snd_strerror(err)); + err = snd_pcm_prepare(pcm); + if (err < 0) { + ERR("cannot recover from suspend, prepare failed: %s", snd_strerror(err)); + return err; + } } return 0; } diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h index 7c2f0f4..d961dce 100644 --- a/dlls/winealsa.drv/alsa.h +++ b/dlls/winealsa.drv/alsa.h @@ -187,7 +187,7 @@ const char * ALSA_getFormat(WORD wFormatTag); BOOL ALSA_NearMatch(int rate1, int rate2); DWORD ALSA_bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format); void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * sw, int full); -int ALSA_XRUNRecovery(WINE_WAVEDEV * wwo, int err); +int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent); void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2); BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf); diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index bb81621..8a277de 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -406,7 +406,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, if (ret == -EPIPE) { WARN("Underrun occurred\n"); - snd_pcm_recover(This->pcm, -EPIPE, 1); + wine_snd_pcm_recover(This->pcm, -EPIPE, 1); ret = snd_pcm_writei(This->pcm, pvAudio1, writelen); /* Advance mmap pointer a little to make dsound notice the underrun and respond to it */ diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 4001f26..18693c1 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -110,7 +110,7 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps) if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED) { WARN("Unexpected state (%d) while updating Total Played, resetting\n", state); - snd_pcm_recover(wwo->pcm, -EPIPE, 0); + wine_snd_pcm_recover(wwo->pcm, -EPIPE, 0); delay=0; } @@ -244,7 +244,7 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEDEV* wwo, DWORD* frames) written = (wwo->write)(wwo->pcm, lpWaveHdr->lpData + wwo->dwPartialOffset, toWrite); if ( written < 0) { /* XRUN occurred. let's try to recover */ - ALSA_XRUNRecovery(wwo, written); + wine_snd_pcm_recover(wwo->pcm, written, 0); written = (wwo->write)(wwo->pcm, lpWaveHdr->lpData + wwo->dwPartialOffset, toWrite); } if (written <= 0) {

1 0

Andrew Nguyen : configure: Avoid breaking compilation if AC_PACKAGE_URL is unavailable when regenerating with older autoconf .
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: dd12cf71100c9ab98439834ac2c54fb0483a2376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd12cf71100c9ab98439834ac… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 11 03:20:38 2010 -0500 configure: Avoid breaking compilation if AC_PACKAGE_URL is unavailable when regenerating with older autoconf. --- configure.ac | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 21c0203..eed1487 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,10 @@ m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF], [AS_IF([test "x$$1" = x""$2], [$3], [$4])], [eval as_val=\$$1 AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl +dnl autoconf versions before 2.64 don't have AC_PACKAGE_URL +m4_ifdef([AC_PACKAGE_URL],, + [AC_DEFINE([PACKAGE_URL], ["http://www.winehq.org"], [Define to the home page for this package.]) + AC_SUBST([PACKAGE_URL], ["http://www.winehq.org"])])dnl dnl **** Command-line arguments ****

1 0

Louis Lenders : xinput1_3: Quiet a noisy fixme.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: ba1659762ee1d4dfec3c9b4909699befc29e98b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1659762ee1d4dfec3c9b490… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri May 28 20:44:51 2010 +0200 xinput1_3: Quiet a noisy fixme. --- dlls/xinput1_3/xinput1_3_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index fc55cef..6d6399f 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -93,7 +93,10 @@ DWORD WINAPI XInputGetKeystroke(DWORD dwUserIndex, DWORD dwReserve, PXINPUT_KEYS DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities) { - FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities); + static int warn_once; + + if (!warn_once++) + FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities); if (dwUserIndex < XUSER_MAX_COUNT) {

1 0

Dylan Smith : wordpad: Provide buffer for replace with text.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 975dd904ef8c1ddf6c08ebe465cc382c073dd1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975dd904ef8c1ddf6c08ebe46… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jun 11 00:44:16 2010 -0400 wordpad: Provide buffer for replace with text. --- programs/wordpad/wordpad.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0bf5d0c..3b8b6bc 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1302,6 +1302,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) static void dialog_find(LPFINDREPLACEW fr, BOOL replace) { static WCHAR findBuffer[MAX_STRING_LEN]; + static WCHAR replaceBuffer[MAX_STRING_LEN]; /* Allow only one search/replace dialog to open */ if(hFindWnd != NULL) @@ -1315,8 +1316,10 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) fr->hwndOwner = hMainWnd; fr->Flags = FR_HIDEUPDOWN; fr->lpstrFindWhat = findBuffer; + fr->lpstrReplaceWith = replaceBuffer; fr->lCustData = -1; - fr->wFindWhatLen = MAX_STRING_LEN*sizeof(WCHAR); + fr->wFindWhatLen = sizeof(findBuffer); + fr->wReplaceWithLen = sizeof(replaceBuffer); if(replace) hFindWnd = ReplaceTextW(fr);

1 0

Dylan Smith : wordpad: Native RegisterClassExW requires cbSize to be set.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: d10ce5df2654dc483d7bc44554e062562a220fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10ce5df2654dc483d7bc4455… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jun 11 00:43:44 2010 -0400 wordpad: Native RegisterClassExW requires cbSize to be set. --- programs/wordpad/wordpad.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c90e7b5..0bf5d0c 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2671,6 +2671,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar hAccel = LoadAcceleratorsW(hInstance, wszAccelTable); + wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0;

1 0

Nikolay Sivov : msvcrt: Fix __lconv_init() prototype.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 90013af6f932d7553290f1eb42490ec7f4d94f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90013af6f932d7553290f1eb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 11 03:57:53 2010 +0400 msvcrt: Fix __lconv_init() prototype. --- dlls/msvcr90/msvcr90.c | 1 + dlls/msvcrt/locale.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 43a1834..0d7d101 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -93,6 +93,7 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) while (!res && table < end) { if (*table) { + TRACE("calling %p\n", **table); res = (**table)(); if (res) TRACE("function %p failed: 0x%x\n", *table, res); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a347962..5a27de0 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -541,10 +541,11 @@ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) /********************************************************************* * __lconv_init (MSVCRT.@) */ -void CDECL __lconv_init(void) +int CDECL __lconv_init(void) { /* this is used to make chars unsigned */ charmax = 255; + return 0; } /*********************************************************************

1 0

Igor Paliychuk : kernel32: Update Ukrainian translations.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 4801209c5c1a2eda950d1c89e53d9e907be79c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4801209c5c1a2eda950d1c89e… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jun 10 19:05:34 2010 +0300 kernel32: Update Ukrainian translations. --- dlls/kernel32/nls/ukr.nls | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls index 865fd2d..a32aac5 100644 --- a/dlls/kernel32/nls/ukr.nls +++ b/dlls/kernel32/nls/ukr.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "UKR" LOCALE_SABBREVDAYNAME1 "��" - LOCALE_SABBREVDAYNAME2 "��" + LOCALE_SABBREVDAYNAME2 "��" LOCALE_SABBREVDAYNAME3 "��" LOCALE_SABBREVDAYNAME4 "��" LOCALE_SABBREVDAYNAME5 "��" @@ -82,7 +82,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME9 "��" LOCALE_SABBREVMONTHNAME10 "��" LOCALE_SABBREVMONTHNAME11 "��" - LOCALE_SABBREVMONTHNAME12 "��" + LOCALE_SABBREVMONTHNAME12 "��" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Ukraine" LOCALE_SCURRENCY "��." @@ -107,18 +107,18 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy' �.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "ѳ��" - LOCALE_SMONTHNAME2 "��" - LOCALE_SMONTHNAME3 "��" - LOCALE_SMONTHNAME4 "��" - LOCALE_SMONTHNAME5 "��" - LOCALE_SMONTHNAME6 "��" - LOCALE_SMONTHNAME7 "��" - LOCALE_SMONTHNAME8 "��" - LOCALE_SMONTHNAME9 "��" - LOCALE_SMONTHNAME10 "��" - LOCALE_SMONTHNAME11 "��" - LOCALE_SMONTHNAME12 "��" + LOCALE_SMONTHNAME1 "ѳ��\0��" + LOCALE_SMONTHNAME2 "��\0��" + LOCALE_SMONTHNAME3 "��\0��" + LOCALE_SMONTHNAME4 "��\0��" + LOCALE_SMONTHNAME5 "��\0��" + LOCALE_SMONTHNAME6 "��\0��" + LOCALE_SMONTHNAME7 "��\0��" + LOCALE_SMONTHNAME8 "��\0��" + LOCALE_SMONTHNAME9 "��\0��" + LOCALE_SMONTHNAME10 "��\0��" + LOCALE_SMONTHNAME11 "��\0��" + LOCALE_SMONTHNAME12 "��\0��" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "�" LOCALE_SNAME "uk-UA"

1 0

Damjan Jovanovic : kernel32: CopyFile cannot overwrite a file with itself.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 3f1404bf29676d79dd76ffd31e2630bb9f2b0b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1404bf29676d79dd76ffd31… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 10 22:14:13 2010 +0200 kernel32: CopyFile cannot overwrite a file with itself. --- dlls/kernel32/path.c | 2 +- dlls/kernel32/tests/file.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c319cb5..2bfd062 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -911,7 +911,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } - if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ, NULL, fail_if_exists ? CREATE_NEW : CREATE_ALWAYS, info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b6f066e..fcc7fc0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -598,6 +598,10 @@ static void test_CopyFileA(void) ok( retok && ret == sizeof(prefix), "WriteFile error %d\n", GetLastError()); ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n"); + /* copying a file to itself must fail */ + retok = CopyFileA(source, source, FALSE); + ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */), + "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); /* get the file time and change it to prove the difference */ ret = GetFileTime(hfile, NULL, NULL, &ft1); ok( ret, "GetFileTime error %d\n", GetLastError()); @@ -618,6 +622,14 @@ static void test_CopyFileA(void) ret = CopyFileA(source, dest, FALSE); ok(ret, "CopyFileA: error %d\n", GetLastError()); + /* destination file is write-locked during copy */ + hfile = CreateFileA(dest, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); + retok = CopyFileA(source, dest, FALSE); + ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION, + "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", ret, GetLastError()); + CloseHandle(hfile); + /* make sure that destination has correct size */ hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");

1 0

Nikolay Sivov : msvcrt: Add _scwprintf implementation.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 97807760cad4bbbb06a072faa0c34b66ba952d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97807760cad4bbbb06a072faa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 23:54:30 2010 +0400 msvcrt: Add _scwprintf implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b0b8172..44c5b31 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1012,7 +1012,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a8ba61e..256031c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -857,7 +857,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index df65a5c..a2bed36 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -843,7 +843,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 88a2ab9..bba06d6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -801,7 +801,7 @@ # stub _scprintf # stub _scprintf_l # stub _scprintf_p_l -# stub _scwprintf +@ varargs _scwprintf(wstr) MSVCRT__scwprintf # stub _scwprintf_l # stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4485db3..03ecc7f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1247,6 +1247,20 @@ int CDECL MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format, .. } /********************************************************************* + * _scwprintf (MSVCRT.@) + */ +int CDECL MSVCRT__scwprintf( const MSVCRT_wchar_t *format, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start( ap, format ); + r = MSVCRT_vsnwprintf( NULL, INT_MAX, format, ap ); + __ms_va_end( ap ); + return r; +} + +/********************************************************************* * swprintf (MSVCRT.@) */ int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ... )

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
67
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 June 2010