* Sync to Wine 1.5.4.

svn path=/trunk/; revision=56618
This commit is contained in:
Amine Khaldi 2012-05-19 10:54:54 +00:00
parent 84236b2f25
commit de62bc1e0f
2 changed files with 7 additions and 6 deletions

View file

@ -406,7 +406,6 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
IStorage** ppstg)
{
ITSS_IStorageImpl *This = impl_from_IStorage(iface);
static const WCHAR szRoot[] = { '/', 0 };
struct chmFile *chmfile;
WCHAR *path, *p;
DWORD len;
@ -418,7 +417,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
if( !chmfile )
return E_FAIL;
len = strlenW( This->dir ) + strlenW( pwcsName ) + 1;
len = strlenW( This->dir ) + strlenW( pwcsName ) + 2; /* need room for a terminating slash */
path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
strcpyW( path, This->dir );
@ -435,10 +434,12 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
*p = '/';
}
if(*--p == '/')
/* add a terminating slash if one does not already exist */
if(*(p-1) != '/')
{
*p++ = '/';
*p = 0;
strcatW( path, szRoot );
}
TRACE("Resolving %s\n", debugstr_w(path));

View file

@ -77,7 +77,7 @@ reactos/dll/win32/initpki # Synced to Wine-1.3.37
reactos/dll/win32/inseng # Synced to Wine-1.3.37
reactos/dll/win32/iphlpapi # Out of sync
reactos/dll/win32/itircl # Synced to Wine-1.3.37
reactos/dll/win32/itss # Synced to Wine-1.3.37
reactos/dll/win32/itss # Synced to Wine-1.5.4
reactos/dll/win32/jscript # Autosync
reactos/dll/win32/localspl # Autosync
reactos/dll/win32/localui # Autosync