Trying to make hh.exe (html help) just start with a computer with NT installed led to a few misc trivial fixes and stubs. shlwapi.StrRChr : allow both pointers to be null stubs for CreateAsyncBindCtxEx, GetUrlCacheEntryInfoA, CommitUrlCacheEntryA ChangeLog: * dlls/shlwapi/string.c, urlmon/urlmon.c, urlmon.spec, wininet/internet.c, wininet.spec trivial fixes for shlwapi and Internet routines
Index: dlls/shlwapi/string.c =================================================================== RCS file: /home/wine/wine/dlls/shlwapi/string.c,v retrieving revision 1.18 diff -u -r1.18 string.c --- dlls/shlwapi/string.c 2001/12/11 00:30:19 1.18 +++ dlls/shlwapi/string.c 2001/12/22 08:32:05 @@ -327,7 +327,7 @@ BOOL dbcs = IsDBCSLeadByte( LOBYTE(wMatch) ); TRACE("(%p, %p, %x)\n", lpStart, lpEnd, wMatch); - + if (!lpStart && !lpEnd) return NULL; if (!lpEnd) lpEnd = lpStart + strlen(lpStart); for(; lpStart < lpEnd; lpStart = CharNextA(lpStart)) @@ -349,6 +349,7 @@ LPCWSTR lpGotIt = NULL; TRACE("(%p, %p, %x)\n", lpStart, lpEnd, wMatch); + if (!lpStart && !lpEnd) return NULL; if (!lpEnd) lpEnd = lpStart + strlenW(lpStart); for(; lpStart < lpEnd; lpStart = CharNextW(lpStart)) @@ -368,7 +369,7 @@ BOOL dbcs = IsDBCSLeadByte( LOBYTE(wMatch) ); TRACE("(%p, %p, %x)\n", lpStart, lpEnd, wMatch); - + if (!lpStart && !lpEnd) return NULL; if (!lpEnd) lpEnd = lpStart + strlen(lpStart); for(; lpStart < lpEnd; lpStart = CharNextA(lpStart)) @@ -396,6 +397,7 @@ LPCWSTR lpGotIt = NULL; TRACE("(%p, %p, %x)\n", lpStart, lpEnd, wMatch); + if (!lpStart && !lpEnd) return NULL; if (!lpEnd) lpEnd = lpStart + strlenW(lpStart); for(; lpStart < lpEnd; lpStart = CharNextW(lpStart)) Index: dlls/urlmon/umon.c =================================================================== RCS file: /home/wine/wine/dlls/urlmon/umon.c,v retrieving revision 1.6 diff -u -r1.6 umon.c --- dlls/urlmon/umon.c 2001/10/08 20:27:01 1.6 +++ dlls/urlmon/umon.c 2001/12/22 08:32:06 @@ -18,7 +18,23 @@ /* native urlmon.dll uses this key, too */ static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; + /*********************************************************************** + * CreateAsyncBindCtxEx (URLMON.@) + * + * not implemented + * + */ +HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, + IBindStatusCallback *callback, IEnumFORMATETC *format, IBindCtx** pbind, + DWORD reserved) +{ + FIXME("stub, returns failure\n"); + return E_INVALIDARG; +} + + +/*********************************************************************** * CreateURLMoniker (URLMON.@) * * Create a url moniker Index: dlls/urlmon/urlmon.spec =================================================================== RCS file: /home/wine/wine/dlls/urlmon/urlmon.spec,v retrieving revision 1.7 diff -u -r1.7 urlmon.spec --- dlls/urlmon/urlmon.spec 2001/05/31 21:38:38 1.7 +++ dlls/urlmon/urlmon.spec 2001/12/22 08:32:06 @@ -25,7 +25,7 @@ @ stub CopyBindInfo @ stub CopyStgMedium @ stub CreateAsyncBindCtx -@ stub CreateAsyncBindCtxEx +@ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) CreateAsyncBindCtxEx @ stub CreateFormatEnumerator @ stdcall CreateURLMoniker(ptr str ptr) CreateURLMoniker @ stdcall DllCanUnloadNow() URLMON_DllCanUnloadNow Index: dlls/wininet/internet.c =================================================================== RCS file: /home/wine/wine/dlls/wininet/internet.c,v retrieving revision 1.27 diff -u -r1.27 internet.c --- dlls/wininet/internet.c 2001/12/11 00:30:20 1.27 +++ dlls/wininet/internet.c 2001/12/22 08:32:09 @@ -700,6 +700,31 @@ /*********************************************************************** + * GetUrlCacheEntryInfoA (WININET.@) + * + */ +BOOL WINAPI GetUrlCacheEntryInfoA(LPCSTR lpszUrl, + LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntry, + LPDWORD lpCacheEntrySize) +{ + FIXME("stub\n"); + return FALSE; +} + +/*********************************************************************** + * CommitUrlCacheEntryA (WININET.@) + * + */ +BOOL WINAPI CommitUrlCacheEntryA(LPCSTR lpszUrl, LPCSTR lpszLocalName, + FILETIME ExpireTime, FILETIME lastModified, DWORD cacheEntryType, + LPBYTE lpHeaderInfo, DWORD headerSize, LPCSTR fileExtension, + DWORD originalUrl) +{ + FIXME("stub\n"); + return FALSE; +} + +/*********************************************************************** * InternetAttemptConnect (WININET.@) * * Attempt to make a connection to the internet Index: dlls/wininet/wininet.spec =================================================================== RCS file: /home/wine/wine/dlls/wininet/wininet.spec,v retrieving revision 1.12 diff -u -r1.12 wininet.spec --- dlls/wininet/wininet.spec 2001/09/10 23:12:42 1.12 +++ dlls/wininet/wininet.spec 2001/12/22 08:32:10 @@ -11,7 +11,7 @@ @ stub InternetInitializeAutoProxyDll @ stub ShowCertificate -@ stub CommitUrlCacheEntryA +@ stdcall CommitUrlCacheEntryA(str str long long long str long str str) CommitUrlCacheEntryA @ stub CommitUrlCacheEntryW @ stub CreateUrlCacheContainerA @ stub CreateUrlCacheContainerW @@ -61,7 +61,7 @@ @ stub FtpSetCurrentDirectoryW @ stub GetUrlCacheConfigInfoA @ stub GetUrlCacheConfigInfoW -@ stub GetUrlCacheEntryInfoA +@ stdcall GetUrlCacheEntryInfoA(str ptr long) GetUrlCacheEntryInfoA @ stub GetUrlCacheEntryInfoExA @ stub GetUrlCacheEntryInfoExW @ stub GetUrlCacheEntryInfoW