September 2012 - Wine-Commits

Francois Gouget : shlwapi: Fix the PathCreateFromUrlW() implementation.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: fad0bea304ee1908ad021df22f1483800cd55eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad0bea304ee1908ad021df22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 26 04:22:00 2012 +0200 shlwapi: Fix the PathCreateFromUrlW() implementation. --- dlls/shlwapi/path.c | 139 ++++++++++++++++++++++++++++++++++---------- dlls/shlwapi/tests/path.c | 66 +++++++++++----------- 2 files changed, 140 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fad0bea304ee1908ad021…

1 0

Francois Gouget : shlwapi: UrlIs()'s check for the 'file:' protocol is case insensitive.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 7c42bfe107cb79418e6540825eb9176b7d78021c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c42bfe107cb79418e6540825… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 26 04:20:00 2012 +0200 shlwapi: UrlIs()'s check for the 'file:' protocol is case insensitive. --- dlls/shlwapi/tests/url.c | 3 ++- dlls/shlwapi/url.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b24a277..6cef9d6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -450,7 +450,8 @@ static const struct { { "file://e:/b/c", FALSE, TRUE }, { "http:partial", FALSE, FALSE }, { "mailto://www.winehq.org/test.html", TRUE, FALSE }, - { "file:partial", FALSE, TRUE } + { "file:partial", FALSE, TRUE }, + { "File:partial", FALSE, TRUE }, }; /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index f483db3..70a0b87 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1864,7 +1864,8 @@ BOOL WINAPI UrlIsA(LPCSTR pszUrl, URLIS Urlis) return FALSE; case URLIS_FILEURL: - return !StrCmpNA("file:", pszUrl, 5); + return (CompareStringA(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + "file:", 5) == CSTR_EQUAL); case URLIS_DIRECTORY: last = pszUrl + strlen(pszUrl) - 1; @@ -1889,7 +1890,7 @@ BOOL WINAPI UrlIsA(LPCSTR pszUrl, URLIS Urlis) */ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) { - static const WCHAR stemp[] = { 'f','i','l','e',':',0 }; + static const WCHAR file_colon[] = { 'f','i','l','e',':',0 }; PARSEDURLW base; DWORD res1; LPCWSTR last; @@ -1917,7 +1918,8 @@ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) return FALSE; case URLIS_FILEURL: - return !strncmpW(stemp, pszUrl, 5); + return (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + file_colon, 5) == CSTR_EQUAL); case URLIS_DIRECTORY: last = pszUrl + strlenW(pszUrl) - 1;

1 0

Dmitry Timoshkov : windowscodecs: Use appropriate helper to release GIF decoder.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 7fcf7e831cf2927e130ce2683b3c298f43ab5cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcf7e831cf2927e130ce2683… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 26 10:56:56 2012 +0900 windowscodecs: Use appropriate helper to release GIF decoder. --- dlls/windowscodecs/gifformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 78371b0..4fa10e0 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -661,7 +661,7 @@ static ULONG WINAPI GifFrameDecode_Release(IWICBitmapFrameDecode *iface) if (ref == 0) { - IUnknown_Release((IUnknown*)This->parent); + IWICBitmapDecoder_Release(&This->parent->IWICBitmapDecoder_iface); HeapFree(GetProcessHeap(), 0, This); }

1 0

Michael Stefaniuc : dsound: DirectSoundDevice_RemoveBuffer() cannot fail.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: cea6329483260e866a7f2c2b64bb997534c83057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea6329483260e866a7f2c2b6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 25 23:25:45 2012 +0200 dsound: DirectSoundDevice_RemoveBuffer() cannot fail. --- dlls/dsound/dsound.c | 7 +------ dlls/dsound/dsound_private.h | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 666f29f..e5b0e3c 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1080,12 +1080,9 @@ HRESULT DirectSoundDevice_AddBuffer( * Remove secondary buffer from buffer list. * Gets exclusive access to buffer for writing. */ -HRESULT DirectSoundDevice_RemoveBuffer( - DirectSoundDevice * device, - IDirectSoundBufferImpl * pDSB) +void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) { int i; - HRESULT hr = DS_OK; TRACE("(%p, %p)\n", device, pDSB); @@ -1108,6 +1105,4 @@ HRESULT DirectSoundDevice_RemoveBuffer( TRACE("buffer count is now %d\n", device->nrofbuffers); RtlReleaseResource(&(device->buffer_list_lock)); - - return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d5fb415..247f229 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -118,9 +118,7 @@ HRESULT DirectSoundDevice_Initialize( HRESULT DirectSoundDevice_AddBuffer( DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; -HRESULT DirectSoundDevice_RemoveBuffer( - DirectSoundDevice * device, - IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; +void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; HRESULT DirectSoundDevice_CreateSoundBuffer( DirectSoundDevice * device, LPCDSBUFFERDESC dsbd,

1 0

Piotr Caban : wininet: Ignore unsupported flags in GetUrlCacheEntryInfoEx functions.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: f9e80f588a4716016483cd05dcc8191e8ddfdc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e80f588a4716016483cd05d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:35 2012 +0200 wininet: Ignore unsupported flags in GetUrlCacheEntryInfoEx functions. --- dlls/wininet/urlcache.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index befb9b7..eac3402 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1735,11 +1735,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( return FALSE; } if (dwFlags & ~GET_INSTALLED_ENTRY) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } + FIXME("ignorring unsupported flags: %x", dwFlags); error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1879,12 +1875,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags != 0) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } + if (dwFlags) + FIXME("ignorring unsupported flags: %x", dwFlags); error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS)

1 0

Piotr Caban : wininet: Added more GetUrlCacheEntryInfo tests with GET_INSTALLED_ENTRY flag.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 306f53cbf25c37fc439e73a0530e013b50303f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306f53cbf25c37fc439e73a05… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:55 2012 +0200 wininet: Added more GetUrlCacheEntryInfo tests with GET_INSTALLED_ENTRY flag. --- dlls/wininet/tests/urlcache.c | 188 ++++++++++++++++++++++------------------- 1 files changed, 101 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=306f53cbf25c37fc439e7…

1 0

Piotr Caban : inetcpl.cpl: Added support for clearing cookies and history cache.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 04453937e5cbff9e4c0bff815d22c1ee66188967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04453937e5cbff9e4c0bff815… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 18:12:48 2012 +0200 inetcpl.cpl: Added support for clearing cookies and history cache. --- dlls/inetcpl.cpl/Makefile.in | 2 +- dlls/inetcpl.cpl/general.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index aedaaa9..2f0c1f1 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,6 +1,6 @@ MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 -DELAYIMPORTS = cryptui wininet ole32 urlmon +DELAYIMPORTS = cryptui wininet ole32 urlmon shell32 C_SRCS = \ content.c \ diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index 1d8f027..42948ea 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -29,6 +29,7 @@ #include <winreg.h> #include <shlwapi.h> #include <prsht.h> +#include <shlobj.h> #include "inetcpl.h" #include "wine/debug.h" @@ -47,9 +48,7 @@ static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, IDC_HOME_DEFAULT, IDC_HISTORY_SETTINGS, 0}; -static DWORD disabled_delhist_buttons[] = {IDC_DELETE_COOKIES, - IDC_DELETE_HISTORY, - IDC_DELETE_FORM_DATA, +static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA, IDC_DELETE_PASSWORDS, 0}; @@ -64,8 +63,25 @@ static INT_PTR delhist_on_command(HWND hdlg, WPARAM wparam) switch (wparam) { case MAKEWPARAM(IDOK, BN_CLICKED): - if (!FreeUrlCacheSpaceW(NULL, 100, FCS_PERCENT_CACHE_SPACE)) - break; /* Don't close the dialog. */ + if (IsDlgButtonChecked(hdlg, IDC_DELETE_TEMP_FILES)) + FreeUrlCacheSpaceW(NULL, 100, 0); + + if (IsDlgButtonChecked(hdlg, IDC_DELETE_COOKIES)) + { + WCHAR pathW[MAX_PATH]; + + if(SHGetSpecialFolderPathW(NULL, pathW, CSIDL_COOKIES, TRUE)) + FreeUrlCacheSpaceW(pathW, 100, 0); + } + + if (IsDlgButtonChecked(hdlg, IDC_DELETE_HISTORY)) + { + WCHAR pathW[MAX_PATH]; + + if(SHGetSpecialFolderPathW(NULL, pathW, CSIDL_HISTORY, TRUE)) + FreeUrlCacheSpaceW(pathW, 100, 0); + } + EndDialog(hdlg, IDOK); return TRUE;

1 0

Piotr Caban : wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoW.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 7c6f0c947041f9dbc230f2c0c5dcc66e2b89cb0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6f0c947041f9dbc230f2c0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:19 2012 +0200 wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoW. --- dlls/wininet/urlcache.c | 99 ++++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 48 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c0d11b6..befb9b7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1835,6 +1835,23 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, LPDWORD lpdwCacheEntryInfoBufferSize) { + return GetUrlCacheEntryInfoExW(lpszUrl, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, NULL, NULL, NULL, 0); +} + +/*********************************************************************** + * GetUrlCacheEntryInfoExW (WININET.@) + * + */ +BOOL WINAPI GetUrlCacheEntryInfoExW( + LPCWSTR lpszUrl, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufSize, + LPWSTR lpszReserved, + LPDWORD lpdwReserved, + LPVOID lpReserved, + DWORD dwFlags) +{ LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; const CACHEFILE_ENTRY * pEntry; @@ -1842,7 +1859,32 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, URLCACHECONTAINER * pContainer; DWORD error; - TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); + TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", + debugstr_w(lpszUrl), + lpCacheEntryInfo, + lpdwCacheEntryInfoBufSize, + lpszReserved, + lpdwReserved, + lpReserved, + dwFlags); + + /* Ignore GET_INSTALLED_ENTRY flag in unicode version of function */ + dwFlags &= ~GET_INSTALLED_ENTRY; + + if ((lpszReserved != NULL) || + (lpdwReserved != NULL) || + (lpReserved != NULL)) + { + ERR("Reserved value was not 0\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (dwFlags != 0) + { + FIXME("Undocumented flag(s): %x\n", dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1882,18 +1924,18 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); - if (lpdwCacheEntryInfoBufferSize) + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo) - *lpdwCacheEntryInfoBufferSize = 0; + *lpdwCacheEntryInfoBufSize = 0; error = URLCache_CopyEntry( - pContainer, - pHeader, - (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - pUrlEntry, - TRUE /* UNICODE */); + pContainer, + pHeader, + (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, + lpdwCacheEntryInfoBufSize, + pUrlEntry, + TRUE /* UNICODE */); if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1909,45 +1951,6 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, } /*********************************************************************** - * GetUrlCacheEntryInfoExW (WININET.@) - * - */ -BOOL WINAPI GetUrlCacheEntryInfoExW( - LPCWSTR lpszUrl, - LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, - LPDWORD lpdwCacheEntryInfoBufSize, - LPWSTR lpszReserved, - LPDWORD lpdwReserved, - LPVOID lpReserved, - DWORD dwFlags) -{ - TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", - debugstr_w(lpszUrl), - lpCacheEntryInfo, - lpdwCacheEntryInfoBufSize, - lpszReserved, - lpdwReserved, - lpReserved, - dwFlags); - - if ((lpszReserved != NULL) || - (lpdwReserved != NULL) || - (lpReserved != NULL)) - { - ERR("Reserved value was not 0\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (dwFlags != 0) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - return GetUrlCacheEntryInfoW(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize); -} - -/*********************************************************************** * SetUrlCacheEntryInfoA (WININET.@) */ BOOL WINAPI SetUrlCacheEntryInfoA(

1 0

Piotr Caban : wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoA.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: a342ded2887997e7b4734a4b0c946e10a40835e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a342ded2887997e7b4734a4b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:30:58 2012 +0200 wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoA. --- dlls/wininet/urlcache.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 25e2ecf..c0d11b6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -81,6 +81,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_FLAG_BITS 6 #define PENDING_DELETE_CACHE_ENTRY 0x00400000 +#define INSTALLED_CACHE_ENTRY 0x10000000 +#define GET_INSTALLED_ENTRY 0x200 #define CACHE_CONTAINER_NO_SUBDIR 0xFE #define CACHE_HEADER_DATA_ROOT_LEAK_OFFSET 0x16 @@ -1732,7 +1734,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags != 0) + if (dwFlags & ~GET_INSTALLED_ENTRY) { FIXME("Undocumented flag(s): %x\n", dwFlags); SetLastError(ERROR_FILE_NOT_FOUND); @@ -1778,6 +1780,13 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + if((dwFlags & GET_INSTALLED_ENTRY) && !(pUrlEntry->CacheEntryType & INSTALLED_CACHE_ENTRY)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo)

1 0

Jacek Caban : vbscript: Added Space() implementation.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 7308be6c0ad06a6d2b8384fcc8a9396556dcc0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7308be6c0ad06a6d2b8384fcc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:25:22 2012 +0200 vbscript: Added Space() implementation. --- dlls/vbscript/global.c | 30 ++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 4 ++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0513664..f7d8efe 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -672,8 +672,34 @@ static HRESULT Global_Trim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Space(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str; + int n, i; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + hres = to_int(arg, &n); + if(FAILED(hres)) + return hres; + + if(n < 0) { + FIXME("n = %d\n", n); + return E_NOTIMPL; + } + + if(!res) + return S_OK; + + str = SysAllocStringLen(NULL, n); + if(!str) + return E_OUTOFMEMORY; + + for(i=0; i<n; i++) + str[i] = ' '; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + return S_OK; } static HRESULT Global_String(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c17c5b4..2ad9404 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -179,4 +179,8 @@ Call ok(Len(1) = 1, "Len(1) = " & Len(1)) Call ok(isNull(Len(null)), "Len(null) = " & Len(null)) Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) +Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") +Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") +Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") + Call reportSuccess()

1 0