[ros-diffs] [akhaldi] 56618: [ITSS] * Sync to Wine 1.5.4.

Author: akhaldi
Date: Sat May 19 10:54:54 2012
New Revision: 56618

URL: http://svn.reactos.org/svn/reactos?rev=56618&view=rev
Log:
[ITSS]
* Sync to Wine 1.5.4.

Modified:
    trunk/reactos/dll/win32/itss/storage.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/itss/storage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/storage.c?r…
==============================================================================
--- trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] Sat May 19 10:54:54 2012
@@ -406,7 +406,6 @@
     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 @@
     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 @@
             *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));
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 10:54:54 2012
@@ -77,7 +77,7 @@
 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