projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eac6ed6
)
[ITSS] Sync with Wine Staging 4.18. CORE-16441
author
Amine Khaldi
<amine.khaldi@reactos.org>
Sat, 2 Nov 2019 17:37:34 +0000
(18:37 +0100)
committer
Amine Khaldi
<amine.khaldi@reactos.org>
Sat, 2 Nov 2019 17:37:34 +0000
(18:37 +0100)
dll/win32/itss/chm_lib.c
patch
|
blob
|
history
dll/win32/itss/itss.c
patch
|
blob
|
history
dll/win32/itss/lzx.c
patch
|
blob
|
history
dll/win32/itss/moniker.c
patch
|
blob
|
history
dll/win32/itss/precomp.h
patch
|
blob
|
history
dll/win32/itss/protocol.c
patch
|
blob
|
history
dll/win32/itss/storage.c
patch
|
blob
|
history
media/doc/README.WINE
patch
|
blob
|
history
diff --git
a/dll/win32/itss/chm_lib.c
b/dll/win32/itss/chm_lib.c
index
829f758
..
f550176
100644
(file)
--- a/
dll/win32/itss/chm_lib.c
+++ b/
dll/win32/itss/chm_lib.c
@@
-54,8
+54,6
@@
* *
***************************************************************************/
* *
***************************************************************************/
-#include "config.h"
-#include "wine/port.h"
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
@@
-64,7
+62,7
@@
#include "windef.h"
#include "winbase.h"
#include "windef.h"
#include "winbase.h"
-#include "win
e/unicode
.h"
+#include "win
nls
.h"
#include "chm_lib.h"
#include "lzx.h"
#include "chm_lib.h"
#include "lzx.h"
@@
-995,7
+993,7
@@
static UChar *_chm_find_in_PMGL(UChar *page_buf,
return NULL;
/* check if it is the right name */
return NULL;
/* check if it is the right name */
- if (!
strcmpiW
(buffer, objPath))
+ if (!
wcsicmp
(buffer, objPath))
return temp;
_chm_skip_PMGL_entry_data(&cur);
return temp;
_chm_skip_PMGL_entry_data(&cur);
@@
-1036,7
+1034,7
@@
static Int32 _chm_find_in_PMGI(UChar *page_buf,
return -1;
/* check if it is the right name */
return -1;
/* check if it is the right name */
- if (
strcmpiW
(buffer, objPath) > 0)
+ if (
wcsicmp
(buffer, objPath) > 0)
return page;
/* load next value for path */
return page;
/* load next value for path */
@@
-1327,9
+1325,8
@@
static Int64 _chm_decompress_region(struct chmFile *h,
/* data request not satisfied, so... start up the decompressor machine */
if (! h->lzx_state)
{
/* data request not satisfied, so... start up the decompressor machine */
if (! h->lzx_state)
{
- int window_size = ffs(h->window_size) - 1;
h->lzx_last_block = -1;
h->lzx_last_block = -1;
- h->lzx_state = LZXinit(window_size);
+ h->lzx_state = LZXinit(
h->
window_size);
}
/* decompress some data */
}
/* decompress some data */
@@
-1438,7
+1435,7
@@
BOOL chm_enumerate_dir(struct chmFile *h,
/* initialize pathname state */
lstrcpynW(prefixRectified, prefix, CHM_MAX_PATHLEN);
/* initialize pathname state */
lstrcpynW(prefixRectified, prefix, CHM_MAX_PATHLEN);
- prefixLen = strlenW(prefixRectified);
+ prefixLen =
l
strlenW(prefixRectified);
if (prefixLen != 0)
{
if (prefixRectified[prefixLen-1] != '/')
if (prefixLen != 0)
{
if (prefixRectified[prefixLen-1] != '/')
@@
-1487,7
+1484,7
@@
BOOL chm_enumerate_dir(struct chmFile *h,
/* check if we should start */
if (! it_has_begun)
{
/* check if we should start */
if (! it_has_begun)
{
- if (ui.length == 0 &&
strncmpiW
(ui.path, prefixRectified, prefixLen) == 0)
+ if (ui.length == 0 &&
_wcsnicmp
(ui.path, prefixRectified, prefixLen) == 0)
it_has_begun = TRUE;
else
continue;
it_has_begun = TRUE;
else
continue;
@@
-1499,7
+1496,7
@@
BOOL chm_enumerate_dir(struct chmFile *h,
/* check if we should stop */
else
{
/* check if we should stop */
else
{
- if (
strncmpiW
(ui.path, prefixRectified, prefixLen) != 0)
+ if (
_wcsnicmp
(ui.path, prefixRectified, prefixLen) != 0)
{
HeapFree(GetProcessHeap(), 0, page_buf);
return TRUE;
{
HeapFree(GetProcessHeap(), 0, page_buf);
return TRUE;
@@
-1509,14
+1506,14
@@
BOOL chm_enumerate_dir(struct chmFile *h,
/* check if we should include this path */
if (lastPathLen != -1)
{
/* check if we should include this path */
if (lastPathLen != -1)
{
- if (
strncmpiW
(ui.path, lastPath, lastPathLen) == 0)
+ if (
_wcsnicmp
(ui.path, lastPath, lastPathLen) == 0)
continue;
}
continue;
}
- strcpyW(lastPath, ui.path);
- lastPathLen = strlenW(lastPath);
+
l
strcpyW(lastPath, ui.path);
+ lastPathLen =
l
strlenW(lastPath);
/* get the length of the path */
/* get the length of the path */
- ui_path_len = strlenW(ui.path)-1;
+ ui_path_len =
l
strlenW(ui.path)-1;
/* check for DIRS */
if (ui.path[ui_path_len] == '/' && !(what & CHM_ENUMERATE_DIRS))
/* check for DIRS */
if (ui.path[ui_path_len] == '/' && !(what & CHM_ENUMERATE_DIRS))
diff --git
a/dll/win32/itss/itss.c
b/dll/win32/itss/itss.c
index
1d236a5
..
e284400
100644
(file)
--- a/
dll/win32/itss/itss.c
+++ b/
dll/win32/itss/itss.c
@@
-21,7
+21,6
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
@@
-36,7
+35,6
@@
#include "rpcproxy.h"
#include "advpub.h"
#include "rpcproxy.h"
#include "advpub.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include "itsstor.h"
#include "wine/debug.h"
#include "itsstor.h"
diff --git
a/dll/win32/itss/lzx.c
b/dll/win32/itss/lzx.c
index
01a9492
..
e14de3a
100644
(file)
--- a/
dll/win32/itss/lzx.c
+++ b/
dll/win32/itss/lzx.c
@@
-169,16
+169,11
@@
static const ULONG position_base[51] = {
1835008, 1966080, 2097152
};
1835008, 1966080, 2097152
};
-struct LZXstate *LZXinit(int w
indow
)
+struct LZXstate *LZXinit(int w
ndsize
)
{
struct LZXstate *pState=NULL;
{
struct LZXstate *pState=NULL;
- ULONG wndsize = 1 << window;
int i, posn_slots;
int i, posn_slots;
- /* LZX supports window sizes of 2^15 (32Kb) through 2^21 (2Mb) */
- /* if a previously allocated window is big enough, keep it */
- if (window < 15 || window > 21) return NULL;
-
/* allocate state and associated window */
pState = HeapAlloc(GetProcessHeap(), 0, sizeof(struct LZXstate));
if (!(pState->window = HeapAlloc(GetProcessHeap(), 0, wndsize)))
/* allocate state and associated window */
pState = HeapAlloc(GetProcessHeap(), 0, sizeof(struct LZXstate));
if (!(pState->window = HeapAlloc(GetProcessHeap(), 0, wndsize)))
@@
-190,12
+185,8
@@
struct LZXstate *LZXinit(int window)
pState->window_size = wndsize;
/* calculate required position slots */
pState->window_size = wndsize;
/* calculate required position slots */
- if (window == 20) posn_slots = 42;
- else if (window == 21) posn_slots = 50;
- else posn_slots = window << 1;
-
- /** alternatively **/
- /* posn_slots=i=0; while (i < wndsize) i += 1 << extra_bits[posn_slots++]; */
+ posn_slots = i = 0;
+ while (i < wndsize) i += 1 << extra_bits[posn_slots++];
/* initialize other state */
pState->R0 = pState->R1 = pState->R2 = 1;
/* initialize other state */
pState->R0 = pState->R1 = pState->R2 = 1;
@@
-797,7
+788,7
@@
int main(int c, char **v)
int i;
int count=0;
int w = atoi(v[1]);
int i;
int count=0;
int w = atoi(v[1]);
- LZXinit(&state, w);
+ LZXinit(&state,
1 <<
w);
fout = fopen(v[2], "wb");
for (i=3; i<c; i++)
{
fout = fopen(v[2], "wb");
for (i=3; i<c; i++)
{
diff --git
a/dll/win32/itss/moniker.c
b/dll/win32/itss/moniker.c
index
6c61f47
..
e74b6e3
100644
(file)
--- a/
dll/win32/itss/moniker.c
+++ b/
dll/win32/itss/moniker.c
@@
-20,7
+20,6
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
@@
-33,7
+32,6
@@
#include "ole2.h"
#include "wine/itss.h"
#include "ole2.h"
#include "wine/itss.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include "itsstor.h"
#include "wine/debug.h"
#include "itsstor.h"
@@
-292,9
+290,9
@@
static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName(
TRACE("%p %p %p %p\n", iface, pbc, pmkToLeft, ppszDisplayName);
TRACE("%p %p %p %p\n", iface, pbc, pmkToLeft, ppszDisplayName);
- len =
strlenW( This->szFile ) +
strlenW( This->szHtml );
+ len =
lstrlenW( This->szFile ) + l
strlenW( This->szHtml );
str = CoTaskMemAlloc( len*sizeof(WCHAR) );
str = CoTaskMemAlloc( len*sizeof(WCHAR) );
- s
printfW
( str, szFormat, This->szFile, This->szHtml );
+ s
wprintf
( str, szFormat, This->szFile, This->szHtml );
*ppszDisplayName = str;
*ppszDisplayName = str;
@@
-354,12
+352,12
@@
static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPCWSTR name, DWORD n )
DWORD sz;
/* szFile[1] has space for one character already */
DWORD sz;
/* szFile[1] has space for one character already */
- sz = FIELD_OFFSET( ITS_IMonikerImpl, szFile[strlenW( name ) + 1] );
+ sz = FIELD_OFFSET( ITS_IMonikerImpl, szFile[
l
strlenW( name ) + 1] );
itsmon = HeapAlloc( GetProcessHeap(), 0, sz );
itsmon->IMoniker_iface.lpVtbl = &ITS_IMonikerImpl_Vtbl;
itsmon->ref = 1;
itsmon = HeapAlloc( GetProcessHeap(), 0, sz );
itsmon->IMoniker_iface.lpVtbl = &ITS_IMonikerImpl_Vtbl;
itsmon->ref = 1;
- strcpyW( itsmon->szFile, name );
+
l
strcpyW( itsmon->szFile, name );
itsmon->szHtml = &itsmon->szFile[n];
while( *itsmon->szHtml == ':' )
itsmon->szHtml = &itsmon->szFile[n];
while( *itsmon->szHtml == ':' )
@@
-443,11
+441,11
@@
static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName(
TRACE("%p %s %p %p\n", This,
debugstr_w( pszDisplayName ), pchEaten, ppmkOut );
TRACE("%p %s %p %p\n", This,
debugstr_w( pszDisplayName ), pchEaten, ppmkOut );
- if(
strncmpiW
( pszDisplayName, szPrefix, prefix_len ) )
+ if(
_wcsnicmp
( pszDisplayName, szPrefix, prefix_len ) )
return MK_E_SYNTAX;
/* search backwards for a double colon */
return MK_E_SYNTAX;
/* search backwards for a double colon */
- for( n = strlenW( pszDisplayName ) - 3; prefix_len <= n; n-- )
+ for( n =
l
strlenW( pszDisplayName ) - 3; prefix_len <= n; n-- )
if( ( pszDisplayName[n] == ':' ) && ( pszDisplayName[n+1] == ':' ) )
break;
if( ( pszDisplayName[n] == ':' ) && ( pszDisplayName[n+1] == ':' ) )
break;
@@
-457,7
+455,7
@@
static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName(
if( !pszDisplayName[n+2] )
return MK_E_SYNTAX;
if( !pszDisplayName[n+2] )
return MK_E_SYNTAX;
- *pchEaten = strlenW( pszDisplayName ) - n - 3;
+ *pchEaten =
l
strlenW( pszDisplayName ) - n - 3;
return ITS_IMoniker_create( ppmkOut,
&pszDisplayName[prefix_len], n-prefix_len );
return ITS_IMoniker_create( ppmkOut,
&pszDisplayName[prefix_len], n-prefix_len );
diff --git
a/dll/win32/itss/precomp.h
b/dll/win32/itss/precomp.h
index
5f9be91
..
e7e6598
100644
(file)
--- a/
dll/win32/itss/precomp.h
+++ b/
dll/win32/itss/precomp.h
@@
-2,9
+2,6
@@
#ifndef _ITSS_PCH_
#define _ITSS_PCH_
#ifndef _ITSS_PCH_
#define _ITSS_PCH_
-#include <wine/config.h>
-#include <wine/port.h>
-
#include <stdarg.h>
#define WIN32_NO_STATUS
#include <stdarg.h>
#define WIN32_NO_STATUS
@@
-18,7
+15,6
@@
#include <objbase.h>
#include <wine/itss.h>
#include <objbase.h>
#include <wine/itss.h>
-#include <wine/unicode.h>
#include <wine/debug.h>
#include "chm_lib.h"
#include <wine/debug.h>
#include "chm_lib.h"
diff --git
a/dll/win32/itss/protocol.c
b/dll/win32/itss/protocol.c
index
a7c4007
..
1f63626
100644
(file)
--- a/
dll/win32/itss/protocol.c
+++ b/
dll/win32/itss/protocol.c
@@
-31,7
+31,6
@@
#include "chm_lib.h"
#include "wine/debug.h"
#include "chm_lib.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(itss);
WINE_DEFAULT_DEBUG_CHANNEL(itss);
@@
-153,11
+152,11
@@
static LPCWSTR skip_schema(LPCWSTR url)
static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'};
static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'};
static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'};
static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'};
- if(!
strncmpiW
(its_schema, url, ARRAY_SIZE(its_schema)))
+ if(!
_wcsnicmp
(its_schema, url, ARRAY_SIZE(its_schema)))
return url + ARRAY_SIZE(its_schema);
return url + ARRAY_SIZE(its_schema);
- if(!
strncmpiW
(msits_schema, url, ARRAY_SIZE(msits_schema)))
+ if(!
_wcsnicmp
(msits_schema, url, ARRAY_SIZE(msits_schema)))
return url + ARRAY_SIZE(msits_schema);
return url + ARRAY_SIZE(msits_schema);
- if(!
strncmpiW
(mk_schema, url, ARRAY_SIZE(mk_schema)))
+ if(!
_wcsnicmp
(mk_schema, url, ARRAY_SIZE(mk_schema)))
return url + ARRAY_SIZE(mk_schema);
return NULL;
return url + ARRAY_SIZE(mk_schema);
return NULL;
@@
-251,7
+250,7
@@
static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
ReleaseBindInfo(&bindinfo);
ReleaseBindInfo(&bindinfo);
- len = strlenW(ptr)+3;
+ len =
l
strlenW(ptr)+3;
file_name = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
memcpy(file_name, ptr, len*sizeof(WCHAR));
hres = UrlUnescapeW(file_name, NULL, &len, URL_UNESCAPE_INPLACE);
file_name = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
memcpy(file_name, ptr, len*sizeof(WCHAR));
hres = UrlUnescapeW(file_name, NULL, &len, URL_UNESCAPE_INPLACE);
@@
-261,7
+260,7
@@
static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
return hres;
}
return hres;
}
- p =
strstrW
(file_name, separator);
+ p =
wcsstr
(file_name, separator);
if(!p) {
WARN("invalid url\n");
HeapFree(GetProcessHeap(), 0, file_name);
if(!p) {
WARN("invalid url\n");
HeapFree(GetProcessHeap(), 0, file_name);
@@
-277,7
+276,7
@@
static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
}
object_name = p+2;
}
object_name = p+2;
- len = strlenW(object_name);
+ len =
l
strlenW(object_name);
if(*object_name != '/' && *object_name != '\\') {
memmove(object_name+1, object_name, (len+1)*sizeof(WCHAR));
if(*object_name != '/' && *object_name != '\\') {
memmove(object_name+1, object_name, (len+1)*sizeof(WCHAR));
@@
-307,7
+306,7
@@
static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
}
IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST,
}
IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST,
-
strrchrW
(object_name, '/')+1);
+
wcsrchr
(object_name, '/')+1);
/* FIXME: Native doesn't use FindMimeFromData */
hres = FindMimeFromData(NULL, object_name, NULL, 0, NULL, 0, &mime, 0);
/* FIXME: Native doesn't use FindMimeFromData */
hres = FindMimeFromData(NULL, object_name, NULL, 0, NULL, 0, &mime, 0);
@@
-487,7
+486,7
@@
static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface,
debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult,
pcchResult, dwReserved);
debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult,
pcchResult, dwReserved);
- base_end =
strstrW
(pwzBaseUrl, separator);
+ base_end =
wcsstr
(pwzBaseUrl, separator);
if(!base_end)
return 0x80041001;
base_end += 2;
if(!base_end)
return 0x80041001;
base_end += 2;
@@
-495,20
+494,20
@@
static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface,
if(!skip_schema(pwzBaseUrl))
return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
if(!skip_schema(pwzBaseUrl))
return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
- if(
strchrW
(pwzRelativeUrl, ':'))
+ if(
wcschr
(pwzRelativeUrl, ':'))
return STG_E_INVALIDNAME;
if(pwzRelativeUrl[0] == '#') {
return STG_E_INVALIDNAME;
if(pwzRelativeUrl[0] == '#') {
- base_end += strlenW(base_end);
+ base_end +=
l
strlenW(base_end);
}else if(pwzRelativeUrl[0] != '/') {
}else if(pwzRelativeUrl[0] != '/') {
- ptr =
strrchrW
(base_end, '/');
+ ptr =
wcsrchr
(base_end, '/');
if(ptr)
base_end = ptr+1;
else
if(ptr)
base_end = ptr+1;
else
- base_end += strlenW(base_end);
+ base_end +=
l
strlenW(base_end);
}
}
- rel_len = strlenW(pwzRelativeUrl)+1;
+ rel_len =
l
strlenW(pwzRelativeUrl)+1;
*pcchResult = rel_len + (base_end-pwzBaseUrl);
*pcchResult = rel_len + (base_end-pwzBaseUrl);
@@
-516,7
+515,7
@@
static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface,
return E_OUTOFMEMORY;
memcpy(pwzResult, pwzBaseUrl, (base_end-pwzBaseUrl)*sizeof(WCHAR));
return E_OUTOFMEMORY;
memcpy(pwzResult, pwzBaseUrl, (base_end-pwzBaseUrl)*sizeof(WCHAR));
- strcpyW(pwzResult + (base_end-pwzBaseUrl), pwzRelativeUrl);
+
l
strcpyW(pwzResult + (base_end-pwzBaseUrl), pwzRelativeUrl);
return S_OK;
}
return S_OK;
}
diff --git
a/dll/win32/itss/storage.c
b/dll/win32/itss/storage.c
index
f20c5bc
..
86d33f2
100644
(file)
--- a/
dll/win32/itss/storage.c
+++ b/
dll/win32/itss/storage.c
@@
-20,7
+20,6
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
@@
-36,7
+35,6
@@
#include "itsstor.h"
#include "wine/itss.h"
#include "itsstor.h"
#include "wine/itss.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(itss);
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(itss);
@@
-167,9
+165,9
@@
static HRESULT WINAPI ITSS_IEnumSTATSTG_Next(
str = cur->ui.path;
if( *str == '/' )
str++;
str = cur->ui.path;
if( *str == '/' )
str++;
- len = strlenW( str ) + 1;
+ len =
l
strlenW( str ) + 1;
rgelt->pwcsName = CoTaskMemAlloc( len*sizeof(WCHAR) );
rgelt->pwcsName = CoTaskMemAlloc( len*sizeof(WCHAR) );
- strcpyW( rgelt->pwcsName, str );
+
l
strcpyW( rgelt->pwcsName, str );
/* determine the type */
if( rgelt->pwcsName[len-2] == '/' )
/* determine the type */
if( rgelt->pwcsName[len-2] == '/' )
@@
-345,17
+343,17
@@
static HRESULT WINAPI ITSS_IStorageImpl_OpenStream(
TRACE("%p %s %p %u %u %p\n", This, debugstr_w(pwcsName),
reserved1, grfMode, reserved2, ppstm );
TRACE("%p %s %p %u %u %p\n", This, debugstr_w(pwcsName),
reserved1, grfMode, reserved2, ppstm );
- len =
strlenW( This->dir ) +
strlenW( pwcsName ) + 1;
+ len =
lstrlenW( This->dir ) + l
strlenW( pwcsName ) + 1;
path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
- strcpyW( path, This->dir );
+
l
strcpyW( path, This->dir );
if( pwcsName[0] == '/' || pwcsName[0] == '\\' )
{
if( pwcsName[0] == '/' || pwcsName[0] == '\\' )
{
- p = &path[strlenW( path ) - 1];
+ p = &path[
l
strlenW( path ) - 1];
while( ( path <= p ) && ( *p == '/' ) )
*p-- = 0;
}
while( ( path <= p ) && ( *p == '/' ) )
*p-- = 0;
}
- strcatW( path, pwcsName );
+
l
strcatW( path, pwcsName );
for(p=path; *p; p++) {
if(*p == '\\')
for(p=path; *p; p++) {
if(*p == '\\')
@@
-417,17
+415,17
@@
static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
if( !chmfile )
return E_FAIL;
if( !chmfile )
return E_FAIL;
- len =
strlenW( This->dir ) +
strlenW( pwcsName ) + 2; /* need room for a terminating slash */
+ len =
lstrlenW( This->dir ) + l
strlenW( pwcsName ) + 2; /* need room for a terminating slash */
path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
- strcpyW( path, This->dir );
+
l
strcpyW( path, This->dir );
if( pwcsName[0] == '/' || pwcsName[0] == '\\' )
{
if( pwcsName[0] == '/' || pwcsName[0] == '\\' )
{
- p = &path[strlenW( path ) - 1];
+ p = &path[
l
strlenW( path ) - 1];
while( ( path <= p ) && ( *p == '/' ) )
*p-- = 0;
}
while( ( path <= p ) && ( *p == '/' ) )
*p-- = 0;
}
- strcatW( path, pwcsName );
+
l
strcatW( path, pwcsName );
for(p=path; *p; p++) {
if(*p == '\\')
for(p=path; *p; p++) {
if(*p == '\\')
@@
-620,11
+618,11
@@
static HRESULT ITSS_create_chm_storage(
TRACE("%p %s\n", chmfile, debugstr_w( dir ) );
stg = HeapAlloc( GetProcessHeap(), 0,
TRACE("%p %s\n", chmfile, debugstr_w( dir ) );
stg = HeapAlloc( GetProcessHeap(), 0,
- FIELD_OFFSET( ITSS_IStorageImpl, dir[strlenW( dir ) + 1] ));
+ FIELD_OFFSET( ITSS_IStorageImpl, dir[
l
strlenW( dir ) + 1] ));
stg->IStorage_iface.lpVtbl = &ITSS_IStorageImpl_Vtbl;
stg->ref = 1;
stg->chmfile = chmfile;
stg->IStorage_iface.lpVtbl = &ITSS_IStorageImpl_Vtbl;
stg->ref = 1;
stg->chmfile = chmfile;
- strcpyW( stg->dir, dir );
+
l
strcpyW( stg->dir, dir );
*ppstgOpen = &stg->IStorage_iface;
*ppstgOpen = &stg->IStorage_iface;
diff --git
a/media/doc/README.WINE
b/media/doc/README.WINE
index
fdb4205
..
7404dc3
100644
(file)
--- a/
media/doc/README.WINE
+++ b/
media/doc/README.WINE
@@
-85,7
+85,7
@@
dll/win32/initpki # Synced to WineStaging-4.18
dll/win32/inseng # Synced to WineStaging-4.18
dll/win32/iphlpapi # Out of sync
dll/win32/itircl # Synced to WineStaging-4.18
dll/win32/inseng # Synced to WineStaging-4.18
dll/win32/iphlpapi # Out of sync
dll/win32/itircl # Synced to WineStaging-4.18
-dll/win32/itss # Synced to WineStaging-
3.17
+dll/win32/itss # Synced to WineStaging-
4.18
dll/win32/jscript # Synced to WineStaging-4.0
dll/win32/jsproxy # Synced to WineStaging-4.0
dll/win32/loadperf # Synced to WineStaging-3.3
dll/win32/jscript # Synced to WineStaging-4.0
dll/win32/jsproxy # Synced to WineStaging-4.0
dll/win32/loadperf # Synced to WineStaging-3.3