Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 20627: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Jacek Caban <jacek(a)codeweavers.com> - urlmon: URL with two slashes is valid. - urlmon: Added GetSecurityId implementation. - urlmon: Removed not used code. - urlmon: Use pluggable protocol for file protocol. Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> - urlmon: Implement BindAsyncMoniker function. Modified: trunk/reactos/lib/urlmon/binding.c Modified: trunk/reactos/lib/urlmon/file.c Modified: trunk/reactos/lib/urlmon/sec_mgr.c Modified: trunk/reactos/lib/urlmon/umon.c Modified: trunk/reactos/lib/urlmon/urlmon.spec _____ Modified: trunk/reactos/lib/urlmon/binding.c --- trunk/reactos/lib/urlmon/binding.c 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/binding.c 2006-01-06 20:42:46 UTC (rev 20627) @@ -225,6 +225,16 @@ memcpy(This->mime, szStatusText, len*sizeof(WCHAR)); break; } + case BINDSTATUS_SENDINGREQUEST: + IBindStatusCallback_OnProgress(This->callback, 0, 0, BINDSTATUS_SENDINGREQUEST, + szStatusText); + break; + case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: + IBindStatusCallback_OnProgress(This->callback, 0, 0, + BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); + break; + case BINDSTATUS_CACHEFILENAMEAVAILABLE: + break; default: FIXME("Unhandled status code %ld\n", ulStatusCode); return E_NOTIMPL; @@ -438,6 +448,8 @@ int len; HRESULT hres; + static const WCHAR wszFile[] = {'f','i','l','e',':'}; + if(!IsEqualGUID(&IID_IStream, riid)) { FIXME("Unsupported riid %s\n", debugstr_guid(riid)); return E_NOTIMPL; @@ -483,9 +495,13 @@ return hres; } - ret->bindf |= (BINDF_FROMURLMON|BINDF_NEEDFILE); + ret->bindf |= BINDF_FROMURLMON; len = strlenW(url)+1; + + if(len < sizeof(wszFile)/sizeof(WCHAR) || memcmp(wszFile, url, sizeof(wszFile))) + ret->bindf |= BINDF_NEEDFILE; + ret->url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); memcpy(ret->url, url, len*sizeof(WCHAR)); _____ Modified: trunk/reactos/lib/urlmon/file.c --- trunk/reactos/lib/urlmon/file.c 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/file.c 2006-01-06 20:42:46 UTC (rev 20627) @@ -145,8 +145,10 @@ IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); file_name = url+sizeof(wszFile)/sizeof(WCHAR); - if(file_name[0] == '/' && file_name[1] == '/' && file_name[2] == '/') - file_name += 3; + if(file_name[0] == '/' && file_name[1] == '/') + file_name += 2; + if(*file_name == '/') + file_name++; This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); _____ Modified: trunk/reactos/lib/urlmon/sec_mgr.c --- trunk/reactos/lib/urlmon/sec_mgr.c 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/sec_mgr.c 2006-01-06 20:42:46 UTC (rev 20627) @@ -109,7 +109,7 @@ size = sizeof(DWORD); res = RegQueryValueExW(hkey, schema, NULL, NULL, (PBYTE)zone, &size); if(res == ERROR_SUCCESS) - return S_OK; + return S_OK; *zone = 3; return S_OK; @@ -268,16 +268,18 @@ } static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *iface, - LPCWSTR pwszUrl, - BYTE *pbSecurityId, DWORD *pcbSecurityId, - DWORD_PTR dwReserved) + LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = SECMGR_THIS(iface); + LPWSTR buf, ptr, ptr2; + DWORD size, zone, len; HRESULT hres; - TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, pcbSecurityId, - dwReserved); + static const WCHAR wszFile[] = {'f','i','l','e',':'}; + TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, + pcbSecurityId, dwReserved); + if(This->custom_manager) { hres = IInternetSecurityManager_GetSecurityId(This->custom_manager, pwszUrl, pbSecurityId, pcbSecurityId, dwReserved); @@ -285,8 +287,65 @@ return hres; } - FIXME("Default action is not implemented\n"); - return E_NOTIMPL; + if(!pwszUrl || !pbSecurityId || !pcbSecurityId) + return E_INVALIDARG; + + if(dwReserved) + FIXME("dwReserved is not supported\n"); + + len = strlenW(pwszUrl)+1; + buf = HeapAlloc(GetProcessHeap(), 0, (len+16)*sizeof(WCHAR)); + + hres = CoInternetParseUrl(pwszUrl, PARSE_SECURITY_URL, 0, buf, len, &size, 0); + if(FAILED(hres)) + memcpy(buf, pwszUrl, len*sizeof(WCHAR)); + + hres = map_url_to_zone(buf, &zone); + if(FAILED(hres)) { + HeapFree(GetProcessHeap(), 0, buf); + return hres == 0x80041001 ? E_INVALIDARG : hres; + } + + /* file protocol is a special case */ + if(strlenW(pwszUrl) >= sizeof(wszFile)/sizeof(WCHAR) + && !memcmp(buf, wszFile, sizeof(wszFile))) { + + static const BYTE secidFile[] = {'f','i','l','e',':'}; + + if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + memcpy(pbSecurityId, secidFile, sizeof(secidFile)); + *(DWORD*)(pbSecurityId+sizeof(secidFile)) = zone; + + *pcbSecurityId = sizeof(secidFile)+sizeof(zone); + return S_OK; + } + + ptr = strchrW(buf, ':'); + ptr2 = ++ptr; + while(*ptr2 == '/') + ptr2++; + if(ptr2 != ptr) + memmove(ptr, ptr2, (strlenW(ptr2)+1)*sizeof(WCHAR)); + + ptr = strchrW(ptr, '/'); + if(ptr) + *ptr = 0; + + len = WideCharToMultiByte(CP_ACP, 0, buf, -1, NULL, 0, NULL, NULL)-1; + + if(len+sizeof(DWORD) > *pcbSecurityId) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + WideCharToMultiByte(CP_ACP, 0, buf, -1, (LPSTR)pbSecurityId, -1, NULL, NULL); + HeapFree(GetProcessHeap(), 0, buf); + + *(DWORD*)(pbSecurityId+len) = zone; + + *pcbSecurityId = len+sizeof(DWORD); + + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/umon.c 2006-01-06 20:42:46 UTC (rev 20627) @@ -3,6 +3,7 @@ * * Copyright 1999 Ulrich Czekalla for Corel Corporation * Copyright 2002 Huw D M Davies for CodeWeavers + * Copyright 2005 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -496,55 +497,6 @@ return E_NOTIMPL; } -typedef struct { - enum {OnProgress, OnDataAvailable} callback; -} URLMON_CallbackData; - - -#if 0 -static LRESULT CALLBACK URLMON_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) -{ - return DefWindowProcA(hwnd, msg, wparam, lparam); -} - -static void PostOnProgress(URLMonikerImpl *This, UINT progress, UINT maxprogress, DWORD status, LPCWSTR *str) -{ -} - -static void CALLBACK URLMON_InternetCallback(HINTERNET hinet, /*DWORD_PTR*/ DWORD context, DWORD status, - void *status_info, DWORD status_info_len) -{ - URLMonikerImpl *This = (URLMonikerImpl *)context; - TRACE("handle %p this %p status %08lx\n", hinet, This, status); - - if(This->filesize == -1) { - switch(status) { - case INTERNET_STATUS_RESOLVING_NAME: - PostOnProgess(This, 0, 0, BINDSTATUS_FINDINGRESOURCE, status_info); - break; - case INTERNET_STATUS_CONNECTING_TO_SERVER: - PostOnProgress(This, 0, 0, BINDSTATUS_CONNECTING, NULL); - break; - case INTERNET_STATUS_SENDING_REQUEST: - PostOnProgress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - break; - case INTERNET_REQUEST_COMPLETE: - { - DWORD len, lensz = sizeof(len); - - HttpQueryInfoW(hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); - TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); - This->filesize = len; - break; - } - } - } - - return; -} -#endif - - /*********************************************************************** ******* * URLMoniker_BindToStorage ************************************************************************ ******/ @@ -601,7 +553,7 @@ if(SUCCEEDED(hres)) { WCHAR *urlcopy, *tmpwc; URL_COMPONENTSW url; - WCHAR *host, *path, *partial_path, *user, *pass; + WCHAR *host, *path, *user, *pass; DWORD lensz = sizeof(bind->expected_size); DWORD dwService = 0; BOOL bSuccess; @@ -622,17 +574,6 @@ if (*tmpwc == '\\') *tmpwc = '/'; -#if 0 - if(!registered_wndclass) { - WNDCLASSA urlmon_wndclass = {0, URLMON_WndProc,0, 0, URLMON_hInstance, 0, 0, 0, NULL, "URLMON_Callback_Window_Class"}; - RegisterClassA(&urlmon_wndclass); - registered_wndclass = TRUE; - } - - This->hwndCallback = CreateWindowA("URLMON_Callback_Window_Class", NULL, 0, 0, 0, 0, 0, 0, 0, - URLMON_hInstance, NULL); - -#endif bind->expected_size = 0; bind->total_read = 0; @@ -667,15 +608,9 @@ pass = 0; } - switch ((DWORD) url.nScheme) - { - case INTERNET_SCHEME_FTP: - case INTERNET_SCHEME_GOPHER: - case INTERNET_SCHEME_HTTP: - case INTERNET_SCHEME_HTTPS: - bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); -/* InternetSetStatusCallback(bind->hinternet, URLMON_InternetCallback);*/ + do { + bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0); if (!bind->hinternet) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -797,48 +732,8 @@ InternetCloseHandle(bind->hconnect); InternetCloseHandle(bind->hinternet); - break; + } while(0); - case INTERNET_SCHEME_FILE: - partial_path = bind->URLName + 5; /* Skip the "file:" part */ - if ((partial_path[0] != '/' && partial_path[0] != '\\') || - (partial_path[1] != '/' && partial_path[1] != '\\')) - { - hres = E_FAIL; - } - else - { - HANDLE h; - - partial_path += 2; - if (partial_path[0] == '/' || partial_path[0] == '\\') - ++partial_path; - h = CreateFileW(partial_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - if (h == (HANDLE) HFILE_ERROR) - { - hres = HRESULT_FROM_WIN32(GetLastError()); - } - else - { - char buf[4096]; - DWORD bufread; - - IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName); - - while (ReadFile(h, buf, sizeof(buf), &bufread, NULL) && bufread > 0) - hres = Binding_MoreCacheData(bind, buf, bufread); - - CloseHandle(h); - hres = S_OK; - } - } - - break; - - default: - FIXME("Unsupported URI scheme"); - break; - } Binding_CloseCacheDownload(bind); Binding_FinishedDownload(bind, hres); @@ -880,8 +775,7 @@ if(url.nScheme == INTERNET_SCHEME_HTTP || url.nScheme== INTERNET_SCHEME_HTTPS || url.nScheme== INTERNET_SCHEME_FTP - || url.nScheme == INTERNET_SCHEME_GOPHER - || url.nScheme == INTERNET_SCHEME_FILE) + || url.nScheme == INTERNET_SCHEME_GOPHER) return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject); TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); @@ -1198,9 +1092,20 @@ HeapFree(GetProcessHeap(), 0, This->URLName); return hres; } + }else { + /* FIXME: + * We probably should use CoInternetParseUrl or something similar here. + */ + + static const WCHAR wszFile[] = {'f','i','l','e',':','/','/',}; + + /* file protocol is a special case */ + if(sizeStr > sizeof(wszFile)/sizeof(WCHAR) + && !memcmp(lpszURLName, wszFile, sizeof(wszFile))) + UrlCanonicalizeW(lpszURLName, This->URLName, &sizeStr, URL_FILE_USE_PATHURL); + else + strcpyW(This->URLName,lpszURLName); } - else - strcpyW(This->URLName,lpszURLName); URLMON_LockModule(); @@ -1350,6 +1255,42 @@ } /*********************************************************************** + * BindAsyncMoniker (URLMON.@) + * + * Bind a bind status callback to an asynchronous URL Moniker. + * + * PARAMS + * pmk [I] Moniker object to bind status callback to + * grfOpt [I] Options, seems not used + * pbsc [I] Status callback to bind + * iidResult [I] Interface to return + * ppvResult [O] Resulting asynchronous moniker object + * + * RETURNS + * Success: S_OK. + * Failure: E_INVALIDARG, if any argument is invalid, or + * E_OUTOFMEMORY if memory allocation fails. + */ +HRESULT WINAPI BindAsyncMoniker(IMoniker *pmk, DWORD grfOpt, IBindStatusCallback *pbsc, REFIID iidResult, LPVOID *ppvResult) +{ + LPBC pbc = NULL; + HRESULT hr = E_INVALIDARG; + + if (pmk && ppvResult) + { + *ppvResult = NULL; + + hr = CreateAsyncBindCtx(0, pbsc, NULL, &pbc); + if (hr == NOERROR) + { + hr = IMoniker_BindToObject(pmk, pbc, NULL, iidResult, ppvResult); + IBindCtx_Release(pbc); + } + } + return hr; +} + +/********************************************************************** * * RegisterBindStatusCallback (URLMON.@) * * Register a bind status callback. _____ Modified: trunk/reactos/lib/urlmon/urlmon.spec --- trunk/reactos/lib/urlmon/urlmon.spec 2006-01-06 20:35:12 UTC (rev 20626) +++ trunk/reactos/lib/urlmon/urlmon.spec 2006-01-06 20:42:46 UTC (rev 20627) @@ -7,7 +7,7 @@ @ stub AsyncGetClassBits @ stub AsyncInstallDistributionUnit -@ stub BindAsyncMoniker +@ stdcall BindAsyncMoniker(ptr long ptr ptr ptr) @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long)

1 0

[gvg] 20626: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Jacek Caban <jacek(a)codeweavers.com> - shlwapi: Fix UrlCanonicalize. - Added support for URL_FILE_USE_PATHURL. - Fix handling of '/' and '\'. Marcus Meissner <marcus(a)jet.franken.de> - shlwapi: Print PathCombine* strings arguments in relay debugging. Modified: trunk/reactos/include/wine/shlwapi.h Modified: trunk/reactos/lib/shlwapi/shlwapi.spec Modified: trunk/reactos/lib/shlwapi/url.c _____ Modified: trunk/reactos/include/wine/shlwapi.h --- trunk/reactos/include/wine/shlwapi.h 2006-01-06 20:30:08 UTC (rev 20625) +++ trunk/reactos/include/wine/shlwapi.h 2006-01-06 20:35:12 UTC (rev 20626) @@ -12,6 +12,8 @@ #ifndef __WINE_SHLWAPI_H #define __WINE_SHLWAPI_H +#define URL_FILE_USE_PATHURL 0x00010000 + #define INTERFACE IQueryAssociations DECLARE_INTERFACE_(IQueryAssociations,IUnknown) { _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.spec --- trunk/reactos/lib/shlwapi/shlwapi.spec 2006-01-06 20:30:08 UTC (rev 20625) +++ trunk/reactos/lib/shlwapi/shlwapi.spec 2006-01-06 20:35:12 UTC (rev 20626) @@ -574,8 +574,8 @@ @ stdcall PathBuildRootW (ptr long) @ stdcall PathCanonicalizeA (ptr str) @ stdcall PathCanonicalizeW (ptr wstr) -@ stdcall PathCombineA (ptr ptr ptr) -@ stdcall PathCombineW (ptr ptr ptr) +@ stdcall PathCombineA (ptr str str) +@ stdcall PathCombineW (ptr wstr wstr) @ stdcall PathCommonPrefixA(str str ptr) @ stdcall PathCommonPrefixW(wstr wstr ptr) @ stdcall PathCompactPathA(long str long) _____ Modified: trunk/reactos/lib/shlwapi/url.c --- trunk/reactos/lib/shlwapi/url.c 2006-01-06 20:30:08 UTC (rev 20625) +++ trunk/reactos/lib/shlwapi/url.c 2006-01-06 20:35:12 UTC (rev 20626) @@ -328,9 +328,10 @@ { HRESULT hr = S_OK; DWORD EscapeFlags; - LPWSTR lpszUrlCpy, wk1, wk2, mp, root; + LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; INT nByteLen, state; DWORD nLen, nWkLen; + WCHAR slash = dwFlags & URL_FILE_USE_PATHURL ? '\\' : '/'; TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -377,31 +378,49 @@ *wk2++ = *wk1++; if (*wk1 != L'/') {state = 6; break;} *wk2++ = *wk1++; + if((dwFlags & URL_FILE_USE_PATHURL) && *wk1 == '/') + wk1++; state = 4; break; case 3: nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + mp = wk2; wk1 += nWkLen; wk2 += nWkLen; + + while(mp < wk2) { + if(*mp == '/' || *mp == '\\') + *mp = slash; + mp++; + } break; case 4: - if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.')) {state = 3; break;} - while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.')) *wk2++ = *wk1++; - state = 5; + if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.') && (*wk1 != ':')) + {state = 3; break;} + while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.') || (*wk1 == ':')) + *wk2++ = *wk1++; + state = 5; + break; + case 5: + if (*wk1 != '/' && *wk1 != '\\') {state = 3; break;} + while(*wk1 == '/') { + *wk2++ = slash; + wk1++; + } + state = 6; break; - case 5: - if (*wk1 != L'/') {state = 3; break;} - *wk2++ = *wk1++; - state = 6; - break; case 6: /* Now at root location, cannot back up any more. */ /* "root" will point at the '/' */ root = wk2-1; while (*wk1) { TRACE("wk1=%c\n", (CHAR)*wk1); - mp = strchrW(wk1, L'/'); + + mp = strchrW(wk1, '/'); + mp2 = strchrW(wk1, '\\'); + if(mp2 && mp2 < mp) + mp = mp2; if (!mp) { nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); @@ -409,35 +428,41 @@ wk2 += nWkLen; continue; } - nLen = mp - wk1 + 1; - memcpy(wk2, wk1, nLen * sizeof(WCHAR)); - wk2 += nLen; - wk1 += nLen; + nLen = mp - wk1; + if(nLen) { + memcpy(wk2, wk1, nLen * sizeof(WCHAR)); + wk2 += nLen; + wk1 += nLen; + } + *wk2++ = slash; + wk1++; + if (*wk1 == L'.') { TRACE("found '/.'\n"); - if (*(wk1+1) == L'/') { + if (wk1[1] == '/' || wk1[1] == '\\') { /* case of /./ -> skip the ./ */ wk1 += 2; } - else if (*(wk1+1) == L'.') { + else if (wk1[1] == '.') { /* found /.. look for next / */ TRACE("found '/..'\n"); - if (*(wk1+2) == L'/' || *(wk1+2) == L'?' || *(wk1+2) == L'#' || *(wk1+2) == 0) { + if (wk1[2] == '/' || wk1[2] == '\\' ||wk1[2] == '?' + || wk1[2] == '#' || !wk1[2]) { /* case /../ -> need to backup wk2 */ TRACE("found '/../'\n"); *(wk2-1) = L'\0'; /* set end of string */ - mp = strrchrW(root, L'/'); + mp = strrchrW(root, slash); if (mp && (mp >= root)) { /* found valid backup point */ wk2 = mp + 1; - if(*(wk1+2) != L'/') + if(wk1[2] != '/' && wk1[2] != '\\') wk1 += 2; else wk1 += 3; } else { - /* did not find point, restore '/' */ - *(wk2-1) = L'/'; + /* did not find point, restore '/' */ + *(wk2-1) = slash; } } } @@ -459,7 +484,7 @@ while ((nLen > 0) && ((lpszUrlCpy[nLen-1] == '\r')||(lpszUrlCpy[nLen-1] == '\n'))) lpszUrlCpy[--nLen]=0; - if(dwFlags & URL_UNESCAPE) + if(dwFlags & (URL_UNESCAPE | URL_FILE_USE_PATHURL)) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |

1 0

[gvg] 20625: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Vitaliy Margolen <wine-patch(a)kievinfo.com> - shell32: Create Local AppData for user profile. Move history and internet tmp files to Local Settings. - shell32: Update Russian resources. Michael Jung <mjung(a)iss.tu-darmstadt.de> - shell32: Helper function for unicode support in folder and file pidls. - shell32/unixfs: Added unicode support in folder and file pidls. Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/pidl.h Modified: trunk/reactos/lib/shell32/shell32_Bg.rc Modified: trunk/reactos/lib/shell32/shell32_De.rc Modified: trunk/reactos/lib/shell32/shell32_En.rc Modified: trunk/reactos/lib/shell32/shell32_Es.rc Modified: trunk/reactos/lib/shell32/shell32_Fi.rc Modified: trunk/reactos/lib/shell32/shell32_Fr.rc Modified: trunk/reactos/lib/shell32/shell32_No.rc Modified: trunk/reactos/lib/shell32/shell32_Pt.rc Modified: trunk/reactos/lib/shell32/shell32_Ru.rc Modified: trunk/reactos/lib/shell32/shellpath.c _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/pidl.c 2006-01-06 20:30:08 UTC (rev 20625) @@ -1811,15 +1811,21 @@ */ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) { - DWORD dwReturn; + DWORD dwReturn; char szTemp[MAX_PATH]; + FileStructW *pFileStructW = _ILGetFileStructW(pidl); TRACE("(%p %p %x)\n",pidl,szOut,uOutSize); - dwReturn = _ILSimpleGetText(pidl, szTemp, uOutSize); + if (pFileStructW) { + lstrcpynW(szOut, pFileStructW->wszName, uOutSize); + dwReturn = lstrlenW(pFileStructW->wszName); + } else { + dwReturn = _ILSimpleGetText(pidl, szTemp, MAX_PATH); - if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut, MAX_PATH)) - *szOut = 0; + if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut, uOutSize)) + *szOut = 0; + } TRACE("-- (%p=%s 0x%08lx)\n",szOut,debugstr_w(szOut),dwReturn); return dwReturn; @@ -1938,6 +1944,45 @@ return NULL; } +/********************************************************************** ******** + * _ILGetFileStructW [Internal] + * + * Get pointer the a SHITEMID's FileStructW field if present + * + * PARAMS + * pidl [I] The SHITEMID + * + * RETURNS + * Success: Pointer to pidl's FileStructW field. + * Failure: NULL + */ +FileStructW* _ILGetFileStructW(LPCITEMIDLIST pidl) { + FileStructW *pFileStructW; + WORD cbOffset; + + if (!(_ILIsValue(pidl) || _ILIsFolder(pidl))) + return NULL; + + cbOffset = *(WORD*)((LPBYTE)pidl + pidl->mkid.cb - sizeof(WORD)); + pFileStructW = (FileStructW*)((LPBYTE)pidl + cbOffset); + + /* Currently I don't see a fool prove way to figure out if a pidl is for sure of WinXP + * style with a FileStructW member. If we switch all our shellfolder-implementations to + * the new format, this won't be a problem. For now, we do as many sanity checks as possible. */ + if (cbOffset & 0x1 || /* FileStructW member is word aligned in the pidl */ + /* FileStructW is positioned after FileStruct */ + cbOffset < sizeof(pidl->mkid.cb) + sizeof(PIDLTYPE) + sizeof(FileStruct) || + /* There has to be enough space at cbOffset in the pidl to hold FileStructW and cbOffset */ + cbOffset > pidl->mkid.cb - sizeof(cbOffset) - sizeof(FileStructW) || + pidl->mkid.cb != cbOffset + pFileStructW->cbLen) + { + WARN("Invalid pidl format (cbOffset = %d)!\n", cbOffset); + return NULL; + } + + return pFileStructW; +} + /*********************************************************************** ** * _ILGetFileDateTime * _____ Modified: trunk/reactos/lib/shell32/pidl.h --- trunk/reactos/lib/shell32/pidl.h 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/pidl.h 2006-01-06 20:30:08 UTC (rev 20625) @@ -143,6 +143,20 @@ The second the dos name when needed or just 0x00 */ } FileStruct; +/* At least on WinXP, this struct is appended with 2-byte-alignment to FileStruct. There follows + * a WORD member after the wszName string, which gives the offset from the beginning of the PIDL + * to the FileStructW member. */ +typedef struct tagFileStructW { + WORD cbLen; + BYTE dummy1[6]; + WORD uCreationDate; + WORD uCreationTime; + WORD uLastAccessDate; + WORD uLastAccessTime; + BYTE dummy2[4]; + WCHAR wszName[1]; +} FileStructW; + typedef struct tagValueW { WCHAR name[1]; @@ -240,6 +254,7 @@ LPSTR _ILGetTextPointer (LPCITEMIDLIST); LPSTR _ILGetSTextPointer (LPCITEMIDLIST); IID *_ILGetGUIDPointer (LPCITEMIDLIST pidl); +FileStructW *_ILGetFileStructW (LPCITEMIDLIST pidl); /* * debug helper _____ Modified: trunk/reactos/lib/shell32/shell32_Bg.rc --- trunk/reactos/lib/shell32/shell32_Bg.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Bg.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -190,9 +190,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "My Documents\\My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" _____ Modified: trunk/reactos/lib/shell32/shell32_De.rc --- trunk/reactos/lib/shell32/shell32_De.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_De.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -190,9 +190,9 @@ IDS_APPDATA "Anwendungsdaten" IDS_PRINTHOOD "Druckumgebung" IDS_LOCAL_APPDATA "Lokale Einstellungen\\Anwendungsdaten" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Lokale Einstellungen\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Verlauf" + IDS_HISTORY "Lokale Einstellungen\\Verlauf" IDS_PROGRAM_FILES "Programme" IDS_MYPICTURES "Eigene Dateien\\Eigene Bilder" IDS_PROGRAM_FILES_COMMON "Programme\\Gemeinsame Dateien" _____ Modified: trunk/reactos/lib/shell32/shell32_En.rc --- trunk/reactos/lib/shell32/shell32_En.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_En.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -189,9 +189,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "My Documents\\My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" _____ Modified: trunk/reactos/lib/shell32/shell32_Es.rc --- trunk/reactos/lib/shell32/shell32_Es.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Es.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -207,9 +207,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Configuraci¾n local\\Datos de programa" - IDS_INTERNET_CACHE "Archivos temporales de Internet" + IDS_INTERNET_CACHE "Configuraci¾n local\\Archivos temporales de Internet" IDS_COOKIES "Cookies" - IDS_HISTORY "Historial" + IDS_HISTORY "Configuraci¾n local\\Historial" IDS_PROGRAM_FILES "Archivos de programa" IDS_MYPICTURES "Mis documentos\\Mis imßgenes" IDS_PROGRAM_FILES_COMMON "Archivos de programa\\Archivos comunes" _____ Modified: trunk/reactos/lib/shell32/shell32_Fi.rc --- trunk/reactos/lib/shell32/shell32_Fi.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Fi.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -189,9 +189,9 @@ IDS_APPDATA "Ohjelmien Tiedot" IDS_PRINTHOOD "Tulostinympõrist÷" IDS_LOCAL_APPDATA "Paikalliset Asetukset\\Ohjelmien Tiedot" - IDS_INTERNET_CACHE "Võliaikaiset Internet-tiedostot" + IDS_INTERNET_CACHE "Paikalliset Asetukset\\Võliaikaiset Internet-tiedostot" IDS_COOKIES "Evõsteet" - IDS_HISTORY "Historia" + IDS_HISTORY "Paikalliset Asetukset\\Historia" IDS_PROGRAM_FILES "Ohjelmat" IDS_MYPICTURES "Omat tiedostot\\Omat kuvatiedostot" IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset Tiedostot" _____ Modified: trunk/reactos/lib/shell32/shell32_Fr.rc --- trunk/reactos/lib/shell32/shell32_Fr.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Fr.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -209,9 +209,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "Voisinage d'impression" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Historique" + IDS_HISTORY "Local Settings\\Historique" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mes documents\\Mes images" IDS_PROGRAM_FILES_COMMON "Program Files\\Fichiers communs" _____ Modified: trunk/reactos/lib/shell32/shell32_No.rc --- trunk/reactos/lib/shell32/shell32_No.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_No.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -189,9 +189,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mine dokumenter\\Mine bilder" IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" _____ Modified: trunk/reactos/lib/shell32/shell32_Pt.rc --- trunk/reactos/lib/shell32/shell32_Pt.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Pt.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -190,9 +190,9 @@ IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Configuraþ§es locais\\Dados de aplicativos" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Configuraþ§es locais\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Hist¾rico" + IDS_HISTORY "Configuraþ§es locais\\Hist¾rico" IDS_PROGRAM_FILES "Arquivos de programas" IDS_MYPICTURES "Meus Documentos\\Minhas Imagens" IDS_PROGRAM_FILES_COMMON "Arquivos de programas\\Arquivos comuns" _____ Modified: trunk/reactos/lib/shell32/shell32_Ru.rc --- trunk/reactos/lib/shell32/shell32_Ru.rc 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shell32_Ru.rc 2006-01-06 20:30:08 UTC (rev 20625) @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2006 Vitaliy Margolen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,92 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_BIGICON + MENUITEM "&?ÕÙÛÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Ð´Þ±¯Û", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&¤¯õ¯ßÝ¯", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&¤¯±ý¯?" + BEGIN + MENUITEM "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_BIGICON + MENUITEM "&?ÕÙÛÞÕ ?Û¯ÝÛÞ", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Ð´Þ±¯Û", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&¤¯õ¯ßÝ¯", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Arrange &Icons" + BEGIN + MENUITEM "¤¯ &?ýÕÝÞ", 0x30 /* column 0 */ + MENUITEM "¤¯ &ÊÞ´¾", 0x32 /* column 2 */ + MENUITEM "¤¯ &ðÓþýÕ¾", 0x31 /* ... */ + MENUITEM "¤¯ &?Ó?Õ", 0x33 + MENUITEM SEPARATOR + MENUITEM "&?Ô?¯ýÓ?Þ¸Õ±ÛÞ", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "?&¹¯ÔÝ ?³ ÞÛ¯ÝÛÞ", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "?&ßÝ¯ÔÞ?³", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "&?±?ÓÔÞ?³", FCIDM_SHVIEW_INSERT + MENUITEM "?±?ÓÔÞ?³ & ÛÙ¹Û", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Ð¯þõÓ?³" + BEGIN + MENUITEM "&¤Ó´ÛÓ", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "&?Ù¹Û", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "ÐÔ¯&Ú±?ÔÓ", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&¤¯Ô¯õÝÞÛ", FCIDM_SHVIEW_EXPLORE + MENUITEM "&??Û¹?³", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "&?¹ÕþÓ?³", FCIDM_SHVIEW_CUT + MENUITEM "&?¯´Þ¯ÔÓ?³", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Ð¯þõÓ?³ &?¯Ù¹Û", FCIDM_SHVIEW_CREATELINK + MENUITEM "&ËõÓÙý?³", FCIDM_SHVIEW_DELETE + MENUITEM "¤ÕÕÞ&ýÕÝ¯ÔÓ?³", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "ÐÔ¯&Ú±?ÔÓ", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "?ßþ¯" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "?Ó", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "??ýÕÝÞ?³", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "? %s" @@ -44,3 +131,75 @@ PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "?ß&þ¯...", 12288, 170, 63, 50, 14, WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "?ý " + IDS_SHV_COLUMN2 "ðÓþýÕ" + IDS_SHV_COLUMN3 "ÊÞ´" + IDS_SHV_COLUMN4 "?þýÕÝÕÝ" + IDS_SHV_COLUMN5 "??Þß¾?¹" + IDS_SHV_COLUMN6 "¤¯ÙÝ¹Ú ¯ß·Õý" + IDS_SHV_COLUMN7 "ÐÔ¯ß¯õÝ¯" + IDS_SHV_COLUMN8 "?ý " + IDS_SHV_COLUMN9 "?¯ýýÕÝ?ÓÞÚ" + IDS_SHV_COLUMN10 "?ÙÓõÕÙÕ÷" + IDS_SHV_COLUMN11 "?¾´´Ó" + + /* special folders */ + IDS_DESKTOP "ðÓß¯¸ÞÚ ±?¯Ù" + IDS_MYCOMPUTER "?¯Ú Û¯ý´³??Õ" + + /* context menus */ + IDS_VIEW_LARGE "&?¯Ù³°ÞÕ ?Û¯ÝÛÞ" + IDS_VIEW_SMALL "&?ÕÙÛÞÕ ?Û¯ÝÛÞ" + IDS_VIEW_LIST "&Ð´Þ±¯Û" + IDS_VIEW_DETAILS "&¤¯õ¯ßÝ¯" + IDS_SELECT "&?¹ßÓ?³" + IDS_OPEN "&??Û¹?³" + + IDS_CREATEFOLDER_DENIED "?ÕÔ¯þý¯µÝ¯ ±¯þõÓ?³ ´Ó´Û¾ - ÝÕ? ´¯ÙÝ¯ý¯¸ÞÚ." + IDS_CREATEFOLDER_CAPTION "?°ÞßÛÓ Ô¯ ÔÕý ±¯þõÓÝÞ ´Ó´ÛÞ" + IDS_DELETEITEM_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ ¾õÓÙÕÝÞ ¶ÓÚÙÓ" + IDS_DELETEFOLDER_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ ¾õÓÙÕÝÞ ´Ó´ÛÞ" + IDS_DELETEITEM_TEXT "ËõÓÙÞ?³ '%1'?" + IDS_DELETEMULTIPLE_TEXT "ËõÓÙÞ?³ ²?Þ ¯ß³ÕÛ?¹ (%1?" + IDS_OVERWRITEFILE_TEXT "ÃÓýÕÝÞ?³ ¶ÓÚÙ(¹) %1?" + IDS_OVERWRITEFILE_CAPTION "¤¯õ?ÔÕµõÕÝÞÕ þÓýÕÝ¹ ¶ÓÚÙÓ" + + /* message box strings */ + IDS_RESTART_TITLE "¤ÕÕþÓÒ¾þÞ?³" + IDS_RESTART_PROMPT "?¹ §¯?Þ?Õ ±Þý¾ÙÞ¯ÔÓ?³ ´ÕÕþÓ´¾±Û Windows?" + IDS_SHUTDOWN_TITLE "?¹ÛÙ?¸Þ?³ ´Þ?ÓÝÞÕ" + IDS_SHUTDOWN_PROMPT "?¹ §¯?Þ?Õ þÓÛÞÝ¸Þ?³ Óß¯?¾ ± Wine?" + + /* shell folder path default values */ + IDS_PROGRAMS "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯ÒÓýý¹" + IDS_PERSONAL "?¯Þ õ¯Û¾ýÕÝ?¹" + IDS_FAVORITES "?þßÓÝÝ¯Õ" + IDS_STARTUP "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯ÒÓýý¹\\?Ô?¯þÓÒ¾þÛÓ" + IDS_RECENT "Recent" + IDS_SENDTO "??´ÔÔÞ?³" + IDS_STARTMENU "?ÙÓÔÝ¯Õ ýÕÝ?" + IDS_MYMUSIC "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯ ý¾þ¹ÛÓ" + IDS_MYVIDEO "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯Þ ¶ÞÙ³ý¹" + IDS_DESKTOPDIRECTORY "ðÓß¯¸ÞÚ ±?¯Ù" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "ÏÓßÙ¯Ý¹" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "?¯Þ õ¯Û¾ýÕÝ?¹\\?¯Þ Þ±¾ÝÛÞ" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "?ß¨ÞÕ õ¯Û¾ýÕÝ?¹" + IDS_ADMINTOOLS "?ÙÓÔÝ¯Õ ýÕÝ?\\¤¯Ò Óýý¹\\Administrative Tools" + IDS_COMMON_MUSIC "?ß¨ÞÕ õ¯Û¾ýÕÝ?¹\\?¯ ý¾þ¹ÛÓ" + IDS_COMMON_PICTURES "?ß¨ÞÕ õ¯Û¾ýÕÝ?¹\\?¯Þ Þ±¾ÝÛÞ" + IDS_COMMON_VIDEO "?ß¨ÞÕ õ¯Û¾ýÕÝ?¹\\?¯Þ ¶ÞÙ³ý¹" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" +} _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2006-01-06 20:24:26 UTC (rev 20624) +++ trunk/reactos/lib/shell32/shellpath.c 2006-01-06 20:30:08 UTC (rev 20625) @@ -1816,6 +1816,8 @@ CSIDL_NETHOOD, CSIDL_TEMPLATES, CSIDL_PRINTHOOD, + CSIDL_LOCAL_APPDATA, + CSIDL_INTERNET_CACHE, CSIDL_COOKIES, CSIDL_HISTORY, CSIDL_MYPICTURES

1 0

[gvg] 20624: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Robert Shearman <rob(a)codeweavers.com> - rpcrt4: Fix race condition in RpcServerListen. The DontWait parameter is used for forcing the function not to wait for the server to finish. - rpcrt4: Implement callback conformance. Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/lib/rpcrt4/rpc_server.c _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2006-01-06 20:21:22 UTC (rev 20623) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2006-01-06 20:24:26 UTC (rev 20624) @@ -375,9 +375,17 @@ ptr = *(LPVOID*)ptr; break; case RPC_FC_CALLBACK: + { + unsigned char *old_stack_top = pStubMsg->StackTop; + pStubMsg->StackTop = ptr; + /* ofs is index into StubDesc->apfnExprEval */ - FIXME("handle callback\n"); + TRACE("callback conformance into apfnExprEval[%d]\n", ofs); + pStubMsg->StubDesc->apfnExprEval[ofs](pStubMsg); + + pStubMsg->StackTop = old_stack_top; goto finish_conf; + } default: break; } _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2006-01-06 20:21:22 UTC (rev 20623) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2006-01-06 20:24:26 UTC (rev 20624) @@ -989,6 +989,9 @@ status = RPCRT4_start_listen(FALSE); + if (status == RPC_S_OK) + RPCRT4_sync_with_server_thread(); + if (DontWait || (status != RPC_S_OK)) return status; return RpcMgmtWaitServerListen(); @@ -1010,8 +1013,6 @@ LeaveCriticalSection(&listen_cs); - RPCRT4_sync_with_server_thread(); - return RPC_S_OK; }

1 0

[gvg] 20623: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Mike McCormack <mike(a)codeweavers.com> - riched20: Add newlines to ERR macro output. Modified: trunk/reactos/lib/riched20/reader.c _____ Modified: trunk/reactos/lib/riched20/reader.c --- trunk/reactos/lib/riched20/reader.c 2006-01-06 20:20:32 UTC (rev 20622) +++ trunk/reactos/lib/riched20/reader.c 2006-01-06 20:21:22 UTC (rev 20623) @@ -219,7 +219,7 @@ info->rtfTextBuf = RTFAlloc (rtfBufSiz); info->pushedTextBuf = RTFAlloc (rtfBufSiz); if (info->rtfTextBuf == NULL || info->pushedTextBuf == NULL) - ERR ("Cannot allocate text buffers."); + ERR ("Cannot allocate text buffers.\n"); info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } @@ -283,7 +283,7 @@ info->inputName = RTFStrSave (name); if (info->inputName == NULL) - ERR ("RTFSetInputName: out of memory"); + ERR ("RTFSetInputName: out of memory\n"); } @@ -299,7 +299,7 @@ info->outputName = RTFStrSave (name); if (info->outputName == NULL) - ERR ("RTFSetOutputName: out of memory"); + ERR ("RTFSetOutputName: out of memory\n"); } @@ -388,7 +388,7 @@ if (info->rtfClass < 0 || info->rtfClass >= rtfMaxClass) /* watchdog */ { - ERR( "Unknown class %d: %s (reader malfunction)", + ERR( "Unknown class %d: %s (reader malfunction)\n", info->rtfClass, info->rtfTextBuf); } if (RTFCheckCM (info, rtfControl, rtfDestination)) @@ -490,9 +490,9 @@ TRACE("\n"); if (info->pushedClass >= 0) /* there's already an ungotten token */ - ERR ("cannot unget two tokens"); + ERR ("cannot unget two tokens\n"); if (info->rtfClass < 0) - ERR ("no token to unget"); + ERR ("no token to unget\n"); info->pushedClass = info->rtfClass; info->pushedMajor = info->rtfMajor; info->pushedMinor = info->rtfMinor; @@ -893,19 +893,19 @@ else if (RTFCheckCM (info, rtfGroup, rtfBeginGroup)) old = 0; /* brace */ else /* can't tell! */ - ERR ( "%s: Cannot determine format", fn); + ERR ( "%s: Cannot determine format\n", fn); } if (old == 0) /* need to find "{" here */ { if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) - ERR ( "%s: missing \"{\"", fn); + ERR ( "%s: missing \"{\"\n", fn); RTFGetToken (info); /* yes, skip to next token */ if (info->rtfClass == rtfEOF) break; } fp = New (RTFFont); if (fp == NULL) - ERR ( "%s: cannot allocate font entry", fn); + ERR ( "%s: cannot allocate font entry\n", fn); fp->rtfNextFont = info->fontList; info->fontList = fp; @@ -991,7 +991,7 @@ *bp = '\0'; fp->rtfFName = RTFStrSave (buf); if (fp->rtfFName == NULL) - ERR ( "%s: cannot allocate font name", fn); + ERR ( "%s: cannot allocate font name\n", fn); /* already have next token; don't read one */ /* at bottom of loop */ continue; @@ -1012,7 +1012,7 @@ { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - ERR ( "%s: missing \"}\"", fn); + ERR ( "%s: missing \"}\"\n", fn); if (info->rtfClass == rtfEOF) break; } @@ -1026,7 +1026,7 @@ } } if (fp->rtfFNum == -1) - ERR( "%s: missing font number", fn); + ERR( "%s: missing font number\n", fn); /* * Could check other pieces of structure here, too, I suppose. */ @@ -1068,7 +1068,7 @@ break; cp = New (RTFColor); if (cp == NULL) - ERR ( "%s: cannot allocate color entry", fn); + ERR ( "%s: cannot allocate color entry\n", fn); cp->rtfCNum = cnum++; cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1; cp->rtfNextColor = info->colorList; @@ -1086,7 +1086,7 @@ if (info->rtfClass == rtfEOF) break; if (!RTFCheckCM (info, rtfText, ';')) - ERR ("%s: malformed entry", fn); + ERR ("%s: malformed entry\n", fn); } RTFRouteToken (info); /* feed "}" back to router */ } @@ -1116,7 +1116,7 @@ break; sp = New (RTFStyle); if (sp == NULL) - ERR ( "%s: cannot allocate stylesheet entry", fn); + ERR ( "%s: cannot allocate stylesheet entry\n", fn); sp->rtfSName = NULL; sp->rtfSNum = -1; sp->rtfSType = rtfParStyle; @@ -1128,7 +1128,7 @@ sp->rtfExpanding = 0; info->styleList = sp; if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) - ERR ( "%s: missing \"{\"", fn); + ERR ( "%s: missing \"{\"\n", fn); real_style = TRUE; for (;;) { @@ -1140,7 +1140,7 @@ { if (RTFCheckMM (info, rtfSpecialChar, rtfOptDest)) { RTFGetToken(info); - ERR( "%s: skipping optional destination", fn); + ERR( "%s: skipping optional destination\n", fn); RTFSkipGroup(info); info->rtfClass = rtfGroup; info->rtfMajor = rtfEndGroup; @@ -1182,14 +1182,14 @@ } sep = New (RTFStyleElt); if (sep == NULL) - ERR ( "%s: cannot allocate style element", fn); + ERR ( "%s: cannot allocate style element\n", fn); sep->rtfSEClass = info->rtfClass; sep->rtfSEMajor = info->rtfMajor; sep->rtfSEMinor = info->rtfMinor; sep->rtfSEParam = info->rtfParam; sep->rtfSEText = RTFStrSave (info->rtfTextBuf); if (sep->rtfSEText == NULL) - ERR ( "%s: cannot allocate style element text", fn); + ERR ( "%s: cannot allocate style element text\n", fn); if (sepLast == NULL) sp->rtfSSEList = sep; /* first element */ else /* add to end */ @@ -1203,7 +1203,7 @@ * This passes over "{\*\keycode ... }, among * other things. A temporary (perhaps) hack. */ - ERR( "%s: skipping begin", fn); + ERR( "%s: skipping begin\n", fn); RTFSkipGroup (info); continue; } @@ -1224,7 +1224,7 @@ *bp = '\0'; sp->rtfSName = RTFStrSave (buf); if (sp->rtfSName == NULL) - ERR ( "%s: cannot allocate style name", fn); + ERR ( "%s: cannot allocate style name\n", fn); } else /* unrecognized */ { @@ -1236,7 +1236,7 @@ if (real_style) { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - ERR ( "%s: missing \"}\"", fn); + ERR ( "%s: missing \"}\"\n", fn); /* * Check over the style structure. A name is a must. * If no style number was specified, check whether it's the @@ -1248,12 +1248,12 @@ * Some German RTF writers use "Standard" instead of "Normal". */ if (sp->rtfSName == NULL) - ERR ( "%s: missing style name", fn); + ERR ( "%s: missing style name\n", fn); if (sp->rtfSNum < 0) { if (strncmp (buf, "Normal", 6) != 0 && strncmp (buf, "Standard", 8) != 0) - ERR ( "%s: missing style number", fn); + ERR ( "%s: missing style number\n", fn); sp->rtfSNum = rtfNormalStyleNum; } if (sp->rtfSNextPar == -1) /* if \snext not given, */ @@ -1359,7 +1359,7 @@ if (s == NULL) return; if (s->rtfExpanding != 0) - ERR ("Style expansion loop, style %d", n); + ERR ("Style expansion loop, style %d\n", n); s->rtfExpanding = 1; /* set expansion flag for loop detection */ /* * Expand "based-on" style (unless it's the same as the current

1 0

[gvg] 20622: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Robert Shearman <rob(a)codeweavers.com> - oleaut32: Convert some tabs to spaces and some other formatting changes. - oleaut32: Initialize member IDs to MEMBERID_NIL inITypeInfo::GetIDsOfNames. Better tracing. - ole: Improve typelib traces. Move the debug channel check from dump_TLBFuncDesc[One] to its callers for more flexibility in which channel controls the output. - oleaut: Small re-organisation of ITypeInfo::Invoke. Only output the one function in the trace for ITypeInfo::Invoke. Process the return value on output in ITypeInfo::Invoke, but only copy it to pVarResult if pVarResult is not NULL. Mike McCormack <mike(a)codeweavers.com> - oleaut32: Allow _invoke to handle up to 17 parameters. Modified: trunk/reactos/lib/oleaut32/typelib.c _____ Modified: trunk/reactos/lib/oleaut32/typelib.c --- trunk/reactos/lib/oleaut32/typelib.c 2006-01-06 20:19:21 UTC (rev 20621) +++ trunk/reactos/lib/oleaut32/typelib.c 2006-01-06 20:20:32 UTC (rev 20622) @@ -1145,8 +1145,6 @@ static void dump_TLBFuncDescOne(const TLBFuncDesc * pfd) { int i; - if (!TRACE_ON(typelib)) - return; MESSAGE("%s(%u)\n", debugstr_w(pfd->Name), pfd->funcdesc.cParams); for (i=0;i<pfd->funcdesc.cParams;i++) MESSAGE("\tparm%d: %s\n",i,debugstr_w(pfd->pParamDesc[i].Name)); @@ -1282,14 +1280,16 @@ static void dump_TypeInfo(const ITypeInfoImpl * pty) { TRACE("%p ref=%lu\n", pty, pty->ref); + TRACE("%s %s\n", debugstr_w(pty->Name), debugstr_w(pty->DocString)); TRACE("attr:%s\n", debugstr_guid(&(pty->TypeAttr.guid))); TRACE("kind:%s\n", typekind_desc[pty->TypeAttr.typekind]); TRACE("fct:%u var:%u impl:%u\n", pty->TypeAttr.cFuncs, pty->TypeAttr.cVars, pty->TypeAttr.cImplTypes); + TRACE("wTypeFlags: 0x%04x\n", pty->TypeAttr.wTypeFlags); TRACE("parent tlb:%p index in TLB:%u\n",pty->pTypeLib, pty->index); - TRACE("%s %s\n", debugstr_w(pty->Name), debugstr_w(pty->DocString)); if (pty->TypeAttr.typekind == TKIND_MODULE) TRACE("dllname:%s\n", debugstr_w(pty->DllName)); - dump_TLBFuncDesc(pty->funclist); + if (TRACE_ON(ole)) + dump_TLBFuncDesc(pty->funclist); dump_TLBVarDesc(pty->varlist); dump_TLBImplType(pty->impltypelist); } @@ -2968,7 +2968,8 @@ if(pFunc->next == 0xffff) break; } pTI->TypeAttr.cFuncs = num; - dump_TLBFuncDesc(pTI->funclist); + if (TRACE_ON(typelib)) + dump_TLBFuncDesc(pTI->funclist); return (SLTG_TypeInfoTail*)(pFirstItem + pMemHeader->cbExtra); } @@ -3613,7 +3614,11 @@ TRACE("(%p)\n\tguid:\t%s)\n",This,debugstr_guid(guid)); - if (!pTypeInfo) return TYPE_E_ELEMENTNOTFOUND; + if (!pTypeInfo) + { + WARN("-- element not found\n"); + return TYPE_E_ELEMENTNOTFOUND; + } /* search linked list for guid */ while( !IsEqualIID(guid,&pTypeInfo->TypeAttr.guid) ) @@ -3623,7 +3628,7 @@ if (!pTypeInfo) { /* end of list reached */ - TRACE("-- element not found\n"); + WARN("-- element not found\n"); return TYPE_E_ELEMENTNOTFOUND; } } @@ -4770,11 +4775,17 @@ TLBFuncDesc * pFDesc; TLBVarDesc * pVDesc; HRESULT ret=S_OK; + int i; TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames), cNames); + + /* init out parameters in case of failure */ + for (i = 0; i < cNames; i++) + pMemId[i] = MEMBERID_NIL; + for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) { - int i, j; + int j; if(!lstrcmpiW(*rgszNames, pFDesc->Name)) { if(cNames) *pMemId=pFDesc->funcdesc.memid; for(i=1; i < cNames; i++){ @@ -4786,6 +4797,7 @@ else ret=DISP_E_UNKNOWNNAME; }; + TRACE("-- 0x%08lx\n", ret); return ret; } } @@ -4878,6 +4890,15 @@ case 14: res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],arg s[8],args[9],args[10],args[11],args[12],args[13]); break; + case 15: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],arg s[8],args[9],args[10],args[11],args[12],args[13],args[14]); + break; + case 16: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],arg s[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15]); + break; + case 17: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],arg s[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[ 16]); + break; default: FIXME("unsupported number of arguments %d in stdcall\n",nrargs); res = -1; @@ -5308,47 +5329,50 @@ if (TRACE_ON(ole)) { TRACE("invoking:\n"); - dump_TLBFuncDesc(pFuncInfo); + dump_TLBFuncDescOne(pFuncInfo); } switch (func_desc->funckind) { case FUNC_PUREVIRTUAL: case FUNC_VIRTUAL: { - DWORD res; - int numargs, numargs2, argspos, args2pos; - DWORD *args , *args2; + DWORD res; + int numargs, numargs2, argspos, args2pos; + DWORD *args , *args2; VARIANT *rgvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT) * func_desc->cParams); memcpy(rgvarg,pDispParams->rgvarg,sizeof(VARIANT)*pDispParams->cArgs); - hres = S_OK; - numargs = 1; /* sizeof(thisptr) */ - numargs2 = 0; - for (i = 0; i < func_desc->cParams; i++) { + hres = S_OK; + numargs = 1; /* sizeof(thisptr) */ + numargs2 = 0; + for (i = 0; i < func_desc->cParams; i++) + { TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; - numargs += _argsize(tdesc->vt); - if (i>=pDispParams->cArgs) { /* arguments to return */ - if (tdesc->vt == VT_PTR) { - numargs2 += _argsize(tdesc->u.lptdesc->vt); - } else { - FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt); - numargs2 += _argsize(tdesc->vt); - } - } - } + numargs += _argsize(tdesc->vt); + if (i>=pDispParams->cArgs) { /* arguments to return */ + if (tdesc->vt == VT_PTR) { + numargs2 += _argsize(tdesc->u.lptdesc->vt); + } else { + FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt); + numargs2 += _argsize(tdesc->vt); + } + } + } - args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs); - args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2); + args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs); + args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2); - args[0] = (DWORD)pIUnk; - argspos = 1; args2pos = 0; - for (i = 0; i < func_desc->cParams; i++) { - ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]); - TYPEDESC *tdesc = &(elemdesc->tdesc); - USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags; - int arglen = _argsize(tdesc->vt); + args[0] = (DWORD)pIUnk; + argspos = 1; args2pos = 0; + for (i = 0; i < func_desc->cParams; i++) + { + ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]); + TYPEDESC *tdesc = &(elemdesc->tdesc); + USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags; + int arglen = _argsize(tdesc->vt); - if (i<pDispParams->cArgs) { + if (i<pDispParams->cArgs) + { VARIANT *arg = &rgvarg[pDispParams->cArgs-i-1]; if (paramFlags & PARAMFLAG_FOPT) { @@ -5369,7 +5393,9 @@ hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); if (FAILED(hres)) goto func_fail; argspos += arglen; - } else if (paramFlags & PARAMFLAG_FOPT) { + } + else if (paramFlags & PARAMFLAG_FOPT) + { VARIANT *arg = &rgvarg[i]; if (i < func_desc->cParams - func_desc->cParamsOpt) @@ -5383,79 +5409,87 @@ hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); if (FAILED(hres)) goto func_fail; argspos += arglen; - } else { - if (tdesc->vt == VT_PTR) - arglen = _argsize(tdesc->u.lptdesc->vt); - else - FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt); + } + else + { + if (tdesc->vt == VT_PTR) + arglen = _argsize(tdesc->u.lptdesc->vt); + else + FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt); - /* Supply pointers for the rest, so propertyget works*/ - args[argspos] = (DWORD)&args2[args2pos]; + /* Supply pointers for the rest, so propertyget works*/ + args[argspos] = (DWORD)&args2[args2pos]; - /* If pointer to variant, pass reference it. */ - if ((tdesc->vt == VT_PTR) && - (tdesc->u.lptdesc->vt == VT_VARIANT) && - pVarResult + /* If pointer to variant, pass reference it. */ + if ((tdesc->vt == VT_PTR) && + (tdesc->u.lptdesc->vt == VT_VARIANT) && + pVarResult ) args[argspos]= (DWORD)pVarResult; - argspos += 1; - args2pos += arglen; - } - } - if (func_desc->cParamsOpt < 0) - FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); + argspos += 1; + args2pos += arglen; + } + } + if (func_desc->cParamsOpt < 0) + FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); - res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], - func_desc->callconv, - numargs, - args - ); + res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], + func_desc->callconv, + numargs, + args + ); - if (pVarResult) { - for (i = 0; i < func_desc->cParams; i++) { - USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; - if (wParamFlags & PARAMFLAG_FRETVAL) { - ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; - TYPEDESC *tdesc = &elemdesc->tdesc; - VARIANTARG varresult; - V_VT(&varresult) = 0; - hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &V_VT(&varresult)); - if (hres) - break; - /* FIXME: this is really messy - we should keep the - * args in VARIANTARGs rather than a DWORD array */ - memcpy(&V_UI4(&varresult), &args[i+1], sizeof(DWORD)); - if (TRACE_ON(ole)) - { - TRACE("varresult: "); - dump_Variant(&varresult); - } - hres = VariantCopyInd(pVarResult, &varresult); - /* free data stored in varresult. Note that - * VariantClear doesn't do what we want because we are - * working with byref types. */ - /* FIXME: clear safearrays, bstrs, records and - * variants here too */ - if ((V_VT(&varresult) == (VT_UNKNOWN | VT_BYREF)) || - (V_VT(&varresult) == (VT_DISPATCH | VT_BYREF))) - { - if(*V_UNKNOWNREF(&varresult)) - IUnknown_Release(*V_UNKNOWNREF(&varresult)); - } + for (i = 0; i < func_desc->cParams; i++) + { + USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + if (wParamFlags & PARAMFLAG_FRETVAL) + { + ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; + TYPEDESC *tdesc = &elemdesc->tdesc; + VARIANTARG varresult; + V_VT(&varresult) = 0; + hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &V_VT(&varresult)); + if (hres) break; - } - } - } + /* FIXME: this is really messy - we should keep the + * args in VARIANTARGs rather than a DWORD array */ + memcpy(&V_UI4(&varresult), &args[i+1], sizeof(DWORD)); + if (TRACE_ON(ole)) + { + TRACE("varresult: "); + dump_Variant(&varresult); + } - if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) { - WARN("invoked function failed with error 0x%08lx\n", res); - hres = DISP_E_EXCEPTION; - if (pExcepInfo) pExcepInfo->scode = res; - } + if (pVarResult) + /* deref return value */ + hres = VariantCopyInd(pVarResult, &varresult); + + /* free data stored in varresult. Note that + * VariantClear doesn't do what we want because we are + * working with byref types. */ + /* FIXME: clear safearrays, bstrs, records and + * variants here too */ + if ((V_VT(&varresult) == (VT_UNKNOWN | VT_BYREF)) || + (V_VT(&varresult) == (VT_DISPATCH | VT_BYREF))) + { + if(*V_UNKNOWNREF(&varresult)) + IUnknown_Release(*V_UNKNOWNREF(&varresult)); + } + break; + } + } + + if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) + { + WARN("invoked function failed with error 0x%08lx\n", res); + hres = DISP_E_EXCEPTION; + if (pExcepInfo) pExcepInfo->scode = res; + } + func_fail: HeapFree(GetProcessHeap(), 0, rgvarg); - HeapFree(GetProcessHeap(),0,args2); - HeapFree(GetProcessHeap(),0,args); + HeapFree(GetProcessHeap(),0,args2); + HeapFree(GetProcessHeap(),0,args); break; } case FUNC_DISPATCH: { @@ -5593,7 +5627,8 @@ for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) if(pFDesc->funcdesc.memid==memid){ dump_TypeInfo(This); - dump_TLBFuncDescOne(pFDesc); + if (TRACE_ON(ole)) + dump_TLBFuncDescOne(pFDesc); if (pBstrDllName) *pBstrDllName = SysAllocString(This->DllName);

1 0

[gvg] 20621: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Robert Shearman <rob(a)codeweavers.com> - ole: Fix mis-handling of return value in StgStreamImpl_Read. BlockChainStream_ReadAt returns a BOOL, not an HRESULT so change StgStreamImpl_Read to handle this, by returning STG_E_READFAULT on failure. - ole: Check the return value of IStream_SetSize in IStream_Read. Check the return value of IStream_SetSize in IStream_Read, since otherwise execution could continue on and cause heap corruption. Modified: trunk/reactos/lib/ole32/hglobalstream.c Modified: trunk/reactos/lib/ole32/stg_stream.c _____ Modified: trunk/reactos/lib/ole32/hglobalstream.c --- trunk/reactos/lib/ole32/hglobalstream.c 2006-01-06 20:14:15 UTC (rev 20620) +++ trunk/reactos/lib/ole32/hglobalstream.c 2006-01-06 20:19:21 UTC (rev 20621) @@ -313,7 +313,12 @@ if (newSize.u.LowPart > This->streamSize.u.LowPart) { /* grow stream */ - IStream_SetSize(iface, newSize); + HRESULT hr = IStream_SetSize(iface, newSize); + if (FAILED(hr)) + { + ERR("IStream_SetSize failed with error 0x%08lx\n", hr); + return hr; + } } /* _____ Modified: trunk/reactos/lib/ole32/stg_stream.c --- trunk/reactos/lib/ole32/stg_stream.c 2006-01-06 20:14:15 UTC (rev 20620) +++ trunk/reactos/lib/ole32/stg_stream.c 2006-01-06 20:19:21 UTC (rev 20621) @@ -249,7 +249,7 @@ ULONG bytesReadBuffer; ULONG bytesToReadFromBuffer; - HRESULT res = S_FALSE; + HRESULT res; TRACE("(%p, %p, %ld, %p)\n", iface, pv, cb, pcbRead); @@ -282,11 +282,15 @@ } else if (This->bigBlockChain!=0) { - res = BlockChainStream_ReadAt(This->bigBlockChain, - This->currentPosition, - bytesToReadFromBuffer, - pv, - pcbRead); + BOOL success = BlockChainStream_ReadAt(This->bigBlockChain, + This->currentPosition, + bytesToReadFromBuffer, + pv, + pcbRead); + if (success) + res = S_OK; + else + res = STG_E_READFAULT; } else {

1 0

[gvg] 20620: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Francois Gouget <fgouget(a)free.fr> - Small documentation tweaks to avoid winapi_check warnings. Mike McCormack <mike(a)codeweavers.com> - msi: Change some FIXME messages to comments. - msi: Add stub actions for CCPSearch and RMCCPSearch. - msi: Fixes for the MaskedEdit control. Allow MaskedEdit masks that aren't enclosed with <>. Allow the MaskedEdit's edit controls to scroll a bit in case things don't line up. - msi: Subclass the Richedit control. Send a "DoAction" control event when the user scrolls the text. - msi: Implement the Reset control event. - MSI: Improve the MsiGetMode stub a little. - msi: Add a stub for MsiGetLastErrorRecord. - msi: Define the property "Intel" if we're running on an Intel processor. - msi: Apply any MSI transforms specified by the TRANSFORMS property. Marcus Meissner <marcus(a)jet.franken.de> - msi: Report the commandline that failed to start in ERR()s. Modified: trunk/reactos/lib/msi/action.c Modified: trunk/reactos/lib/msi/custom.c Modified: trunk/reactos/lib/msi/dialog.c Modified: trunk/reactos/lib/msi/events.c Modified: trunk/reactos/lib/msi/install.c Modified: trunk/reactos/lib/msi/msi.c Modified: trunk/reactos/lib/msi/msi.spec Modified: trunk/reactos/lib/msi/msipriv.h Modified: trunk/reactos/lib/msi/msiquery.c Modified: trunk/reactos/lib/msi/package.c _____ Modified: trunk/reactos/lib/msi/action.c --- trunk/reactos/lib/msi/action.c 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/action.c 2006-01-06 20:14:15 UTC (rev 20620) @@ -569,6 +569,30 @@ return r; } +static UINT msi_apply_transforms( MSIPACKAGE *package ) +{ + static const WCHAR szTransforms[] = { + 'T','R','A','N','S','F','O','R','M','S',0 }; + LPWSTR xform_list, *xforms; + UINT i, r = ERROR_SUCCESS; + + xform_list = msi_dup_property( package, szTransforms ); + xforms = msi_split_string( xform_list, ';' ); + + for( i=0; xforms && xforms[i] && r == ERROR_SUCCESS; i++ ) + { + if (xforms[i][0] == ':') + r = msi_apply_substorage_transform( package, package->db, &xforms[i][1] ); + else + r = MSI_DatabaseApplyTransformW( package->db, xforms[i], 0 ); + } + + msi_free( xforms ); + msi_free( xform_list ); + + return r; +} + /**************************************************** * TOP level entry points *****************************************************/ @@ -618,6 +642,7 @@ msi_parse_command_line( package, szCommandLine ); + msi_apply_transforms( package ); msi_apply_patches( package ); if ( msi_get_property_int(package, szUILevel, 0) >= INSTALLUILEVEL_REDUCED ) @@ -3096,7 +3121,7 @@ } msi_free(buffer); - FIXME("Need to write more keys to the user registry\n"); + /* FIXME: Need to write more keys to the user registry */ hDb= alloc_msihandle( &package->db->hdr ); rc = MsiGetSummaryInformationW(hDb, NULL, 0, &hSumInfo); @@ -3540,7 +3565,7 @@ return rc; /* dump all the info i can grab */ - FIXME("Flesh out more information\n"); + /* FIXME: Flesh out more information */ msi_write_uninstall_property_vals( package, hkey ); @@ -3554,7 +3579,7 @@ RegSetValueExW(hkey,szUninstallString,0,REG_EXPAND_SZ,(LPBYTE)buffer,siz e); msi_free(buffer); - FIXME("Write real Estimated Size when we have it\n"); + /* FIXME: Write real Estimated Size when we have it */ msi_reg_set_val_dword( hkey, szEstimatedSize, 0 ); GetLocalTime(&systime); @@ -4210,11 +4235,23 @@ return msi_unimplemented_action_stub( package, "UnregisterFonts", table ); } +static UINT ACTION_CCPSearch( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','C','P','S','e','a','r','c','h',0 }; + return msi_unimplemented_action_stub( package, "CCPSearch", table ); +} + +static UINT ACTION_RMCCPSearch( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','C','P','S','e','a','r','c','h',0 }; + return msi_unimplemented_action_stub( package, "RMCCPSearch", table ); +} + static struct _actions StandardActions[] = { { szAllocateRegistrySpace, ACTION_AllocateRegistrySpace }, { szAppSearch, ACTION_AppSearch }, { szBindImage, ACTION_BindImage }, - { szCCPSearch, NULL}, + { szCCPSearch, ACTION_CCPSearch}, { szCostFinalize, ACTION_CostFinalize }, { szCostInitialize, ACTION_CostInitialize }, { szCreateFolders, ACTION_CreateFolders }, @@ -4266,7 +4303,7 @@ { szRemoveRegistryValues, NULL}, { szRemoveShortcuts, NULL}, { szResolveSource, ACTION_ResolveSource}, - { szRMCCPSearch, NULL}, + { szRMCCPSearch, ACTION_RMCCPSearch}, { szScheduleReboot, NULL}, { szSelfRegModules, ACTION_SelfRegModules }, { szSelfUnregModules, ACTION_SelfUnregModules }, _____ Modified: trunk/reactos/lib/msi/custom.c --- trunk/reactos/lib/msi/custom.c 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/custom.c 2006-01-06 20:14:15 UTC (rev 20620) @@ -548,13 +548,14 @@ rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - msi_free(cmd); if ( !rc ) { - ERR("Unable to execute command\n"); + ERR("Unable to execute command %s\n", debugstr_w(cmd)); + msi_free(cmd); return ERROR_SUCCESS; } + msi_free(cmd); prc = process_handle(package, type, info.hThread, info.hProcess, action, &finished); @@ -609,13 +610,14 @@ rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - msi_free(cmd); if ( !rc ) { - ERR("Unable to execute command\n"); + ERR("Unable to execute command %s\n", debugstr_w(cmd)); + msi_free(cmd); return ERROR_SUCCESS; } + msi_free(cmd); prc = process_handle(package, type, info.hThread, info.hProcess, action, NULL); @@ -694,13 +696,14 @@ rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - msi_free(cmd); if ( !rc ) { - ERR("Unable to execute command\n"); + ERR("Unable to execute command %s\n", debugstr_w(cmd)); + msi_free(cmd); return ERROR_SUCCESS; } + msi_free(cmd); return process_handle(package, type, info.hThread, info.hProcess, action, NULL); } @@ -733,13 +736,14 @@ rc = CreateProcessW(NULL, deformated, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - msi_free(deformated); if ( !rc ) { - ERR("Unable to execute command\n"); + ERR("Unable to execute command %s\n", debugstr_w(deformated)); + msi_free(deformated); return ERROR_SUCCESS; } + msi_free(deformated); prc = process_handle(package, type, info.hThread, info.hProcess, action, NULL); _____ Modified: trunk/reactos/lib/msi/dialog.c --- trunk/reactos/lib/msi/dialog.c 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/dialog.c 2006-01-06 20:14:15 UTC (rev 20620) @@ -59,7 +59,6 @@ HBITMAP hBitmap; HICON hIcon; LPWSTR tabnext; - HMODULE hDll; WCHAR name[1]; }; @@ -329,7 +328,6 @@ control->value = NULL; control->hBitmap = NULL; control->hIcon = NULL; - control->hDll = NULL; control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); x = MSI_RecordGetInteger( rec, 4 ); @@ -695,6 +693,42 @@ return ERROR_SUCCESS; } +/******************** Scroll Text ********************************************/ + +struct msi_scrolltext_info +{ + msi_dialog *dialog; + msi_control *control; + WNDPROC oldproc; + HMODULE hRichedit; +}; + +static LRESULT WINAPI +MSIScrollText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + struct msi_scrolltext_info *info; + HRESULT r; + + TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam); + + info = GetPropW( hWnd, szButtonData ); + + r = CallWindowProcW( info->oldproc, hWnd, msg, wParam, lParam ); + + switch( msg ) + { + case WM_NCDESTROY: + FreeLibrary( info->hRichedit ); + msi_free( info ); + RemovePropW( hWnd, szButtonData ); + break; + case WM_VSCROLL: + msi_dialog_button_handler( info->dialog, info->control, BN_CLICKED ); + break; + } + return r; +} + struct msi_streamin_info { LPSTR string; @@ -718,41 +752,60 @@ return 0; } +static void msi_scrolltext_add_text( msi_control *control, LPCWSTR text ) +{ + struct msi_streamin_info info; + EDITSTREAM es; + + info.string = strdupWtoA( text ); + info.offset = 0; + info.length = lstrlenA( info.string ) + 1; + + es.dwCookie = (DWORD_PTR) &info; + es.dwError = 0; + es.pfnCallback = msi_richedit_stream_in; + + SendMessageW( control->hwnd, EM_STREAMIN, SF_RTF, (LPARAM) &es ); + + msi_free( info.string ); +} + static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec ) { static const WCHAR szRichEdit20W[] = { 'R','i','c','h','E','d','i','t','2','0','W',0 }; - struct msi_streamin_info info; + struct msi_scrolltext_info *info; msi_control *control; - LPCWSTR text; - EDITSTREAM es; DWORD style; - HMODULE hRichedit; - hRichedit = LoadLibraryA("riched20"); + info = msi_alloc( sizeof *info ); + if (!info) + return ERROR_FUNCTION_FAILED; + info->hRichedit = LoadLibraryA("riched20"); + style = WS_BORDER | ES_MULTILINE | WS_VSCROLL | ES_READONLY | ES_AUTOVSCROLL | WS_TABSTOP; control = msi_dialog_add_control( dialog, rec, szRichEdit20W, style ); if (!control) + { + FreeLibrary( info->hRichedit ); + msi_free( info ); return ERROR_FUNCTION_FAILED; + } - control->hDll = hRichedit; + info->dialog = dialog; + info->control = control; - text = MSI_RecordGetString( rec, 10 ); - info.string = strdupWtoA( text ); - info.offset = 0; - info.length = lstrlenA( info.string ) + 1; + /* subclass the static control */ + info->oldproc = (WNDPROC) SetWindowLongPtrW( control->hwnd, GWLP_WNDPROC, + (LONG_PTR)MSIScrollText_WndProc ); + SetPropW( control->hwnd, szButtonData, info ); - es.dwCookie = (DWORD_PTR) &info; - es.dwError = 0; - es.pfnCallback = msi_richedit_stream_in; + /* add the text into the richedit */ + msi_scrolltext_add_text( control, MSI_RecordGetString( rec, 10 ) ); - SendMessageW( control->hwnd, EM_STREAMIN, SF_RTF, (LPARAM) &es ); - - msi_free( info.string ); - return ERROR_SUCCESS; } @@ -1076,15 +1129,16 @@ if( !mask ) return info; - p = strchrW(mask, '<'); - if( !p ) - return info; - info = msi_alloc_zero( sizeof *info ); if( !info ) return info; - p++; + p = strchrW(mask, '<'); + if( p ) + p++; + else + p = mask; + for( i=0; i<MASK_MAX_GROUPS; i++ ) { /* stop at the end of the string */ @@ -1124,7 +1178,7 @@ HWND hwnd; UINT i; - style = WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP; + style = WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL; GetClientRect( info->hwnd, &rect ); @@ -1512,6 +1566,12 @@ return r; } +UINT msi_dialog_reset( msi_dialog *dialog ) +{ + /* FIXME: should restore the original values of any properties we changed */ + return msi_dialog_evaluate_control_conditions( dialog ); +} + /* figure out the height of 10 point MS Sans Serif */ static INT msi_dialog_get_sans_serif_height( HWND hwnd ) { @@ -2138,8 +2198,6 @@ DestroyIcon( t->hIcon ); msi_free( t->tabnext ); msi_free( t ); - if (t->hDll) - FreeLibrary( t->hDll ); } /* destroy the list of fonts */ _____ Modified: trunk/reactos/lib/msi/events.c --- trunk/reactos/lib/msi/events.c 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/events.c 2006-01-06 20:14:15 UTC (rev 20620) @@ -243,6 +243,13 @@ return r; } +static UINT ControlEvent_Reset(MSIPACKAGE* package, LPCWSTR argument, + msi_dialog* dialog) +{ + msi_dialog_reset(dialog); + return ERROR_SUCCESS; +} + /* * Subscribed events */ @@ -371,6 +378,7 @@ { "Remove",ControlEvent_Remove }, { "AddSource",ControlEvent_AddSource }, { "SetTargetPath",ControlEvent_SetTargetPath }, + { "Reset",ControlEvent_Reset }, { NULL,NULL }, }; _____ Modified: trunk/reactos/lib/msi/install.c --- trunk/reactos/lib/msi/install.c 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/install.c 2006-01-06 20:14:15 UTC (rev 20620) @@ -449,8 +449,31 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) { - FIXME("STUB (iRunMode=%i)\n",iRunMode); - return TRUE; + BOOL r = FALSE; + + switch (iRunMode) + { + case MSIRUNMODE_WINDOWS9X: + if (GetVersion() & 0x80000000) + r = TRUE; + break; + + case MSIRUNMODE_RESERVED11: + case MSIRUNMODE_RESERVED14: + case MSIRUNMODE_RESERVED15: + break; + + case MSIRUNMODE_SCHEDULED: + case MSIRUNMODE_ROLLBACK: + case MSIRUNMODE_COMMIT: + break; + + default: + FIXME("%ld %d\n", hInstall, iRunMode); + r = TRUE; + } + + return r; } /*********************************************************************** _____ Modified: trunk/reactos/lib/msi/msi.c --- trunk/reactos/lib/msi/msi.c 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/msi.c 2006-01-06 20:14:15 UTC (rev 20620) @@ -57,7 +57,7 @@ static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; -/********************************************************************** +/* * Dll lifetime tracking declaration */ static void LockModule(void) _____ Modified: trunk/reactos/lib/msi/msi.spec --- trunk/reactos/lib/msi/msi.spec 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/msi.spec 2006-01-06 20:14:15 UTC (rev 20620) @@ -41,7 +41,7 @@ 45 stdcall MsiEnumProductsW(long ptr) 46 stdcall MsiEvaluateConditionA(long str) 47 stdcall MsiEvaluateConditionW(long wstr) -48 stub MsiGetLastErrorRecord +48 stdcall MsiGetLastErrorRecord() 49 stdcall MsiGetActiveDatabase(long) 50 stdcall MsiGetComponentStateA(long str ptr ptr) 51 stdcall MsiGetComponentStateW(long wstr ptr ptr) _____ Modified: trunk/reactos/lib/msi/msipriv.h --- trunk/reactos/lib/msi/msipriv.h 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/msipriv.h 2006-01-06 20:14:15 UTC (rev 20620) @@ -317,6 +317,8 @@ /* transform functions */ extern UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ); +extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, + LPCWSTR szTransformFile, int iErrorCond ); /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); @@ -414,6 +416,7 @@ extern BOOL msi_dialog_register_class( void ); extern void msi_dialog_unregister_class( void ); extern void msi_dialog_handle_event( msi_dialog*, LPCWSTR, LPCWSTR, MSIRECORD * ); +extern UINT msi_dialog_reset( msi_dialog *dialog ); /* preview */ extern MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE * ); _____ Modified: trunk/reactos/lib/msi/msiquery.c --- trunk/reactos/lib/msi/msiquery.c 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/msiquery.c 2006-01-06 20:14:15 UTC (rev 20620) @@ -639,9 +639,15 @@ return r; } +MSIHANDLE WINAPI MsiGetLastErrorRecord( void ) +{ + FIXME("\n"); + return 0; +} + DEFINE_GUID( CLSID_MsiTransform, 0x000c1082, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -static UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, +UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ) { UINT r; _____ Modified: trunk/reactos/lib/msi/package.c --- trunk/reactos/lib/msi/package.c 2006-01-06 19:59:46 UTC (rev 20619) +++ trunk/reactos/lib/msi/package.c 2006-01-06 20:14:15 UTC (rev 20620) @@ -228,6 +228,8 @@ static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szScreenFormat[] = {'%','d',0}; + static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; + SYSTEM_INFO sys_info; /* * Other things that probably should be set: @@ -353,6 +355,13 @@ sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); MSI_SetPropertyW( package, szVersionMsi, bufstr ); + GetSystemInfo( &sys_info ); + if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + { + sprintfW( bufstr, szScreenFormat, sys_info.wProcessorLevel ); + MSI_SetPropertyW( package, szIntel, bufstr ); + } + /* Screen properties. */ dc = GetDC(0); sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, HORZRES ) );

1 0

[gvg] 20619: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Vitaliy Margolen <wine-patch(a)kievinfo.com> - comctl32: Listview - allow selection toggle with ctrl+space. Robert Reif <reif(a)earthlink.net> - comctl32: Create ipaddress in enabled state. Thomas Weidenmueller <wine-patches(a)reactsoft.com> - comctrl32: ReAlloc should be able to move memory blocks if necessary. - comctl32: Fix error handling in PSM_ADDPAGE in case of memory allocation failure. Modified: trunk/reactos/lib/comctl32/ipaddress.c Modified: trunk/reactos/lib/comctl32/listview.c Modified: trunk/reactos/lib/comctl32/propsheet.c _____ Modified: trunk/reactos/lib/comctl32/ipaddress.c --- trunk/reactos/lib/comctl32/ipaddress.c 2006-01-06 19:56:51 UTC (rev 20618) +++ trunk/reactos/lib/comctl32/ipaddress.c 2006-01-06 19:59:46 UTC (rev 20619) @@ -189,7 +189,7 @@ edit.bottom = rcClient.bottom - 2; infoPtr->Self = hwnd; - infoPtr->Enabled = FALSE; + infoPtr->Enabled = TRUE; infoPtr->Notify = lpCreate->hwndParent; for (i = 0; i < 4; i++) { @@ -208,6 +208,7 @@ part->OrigProc = (WNDPROC) SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, (DWORD_PTR)IPADDRESS_SubclassProc); + EnableWindow(part->EditHwnd, infoPtr->Enabled); } return 0; _____ Modified: trunk/reactos/lib/comctl32/listview.c --- trunk/reactos/lib/comctl32/listview.c 2006-01-06 19:56:51 UTC (rev 20618) +++ trunk/reactos/lib/comctl32/listview.c 2006-01-06 19:59:46 UTC (rev 20619) @@ -3175,6 +3175,7 @@ WORD wCtrl = HIWORD(GetKeyState(VK_CONTROL)); BOOL bResult = FALSE; + TRACE("nItem=%d, wShift=%d, wCtrl=%d\n", nItem, wShift, wCtrl); if ((nItem >= 0) && (nItem < infoPtr->nItemCount)) { if (infoPtr->dwStyle & LVS_SINGLESEL) @@ -3191,6 +3192,14 @@ } else if (wCtrl) { + LVITEMW lvItem; + lvItem.state = ~LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED); + lvItem.stateMask = LVIS_SELECTED; + LISTVIEW_SetItemState(infoPtr, nItem, &lvItem); + + if (lvItem.state & LVIS_SELECTED) + infoPtr->nSelectionMark = nItem; + bResult = LISTVIEW_SetItemFocus(infoPtr, nItem); } else @@ -8020,6 +8029,10 @@ switch (nVirtualKey) { + case VK_SPACE: + nItem = infoPtr->nFocusedItem; + break; + case VK_RETURN: if ((infoPtr->nItemCount > 0) && (infoPtr->nFocusedItem != -1)) { @@ -8086,7 +8099,7 @@ break; } - if ((nItem != -1) && (nItem != infoPtr->nFocusedItem)) + if ((nItem != -1) && (nItem != infoPtr->nFocusedItem || nVirtualKey == VK_SPACE)) LISTVIEW_KeySelection(infoPtr, nItem); return 0; _____ Modified: trunk/reactos/lib/comctl32/propsheet.c --- trunk/reactos/lib/comctl32/propsheet.c 2006-01-06 19:56:51 UTC (rev 20618) +++ trunk/reactos/lib/comctl32/propsheet.c 2006-01-06 19:59:46 UTC (rev 20619) @@ -2288,6 +2288,7 @@ static BOOL PROPSHEET_AddPage(HWND hwndDlg, HPROPSHEETPAGE hpage) { + PropPageInfo * ppi; PropSheetInfo * psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr); HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); @@ -2298,9 +2299,13 @@ /* * Allocate and fill in a new PropPageInfo entry. */ - psInfo->proppage = (PropPageInfo*) ReAlloc(psInfo->proppage, - sizeof(PropPageInfo) * - (psInfo->nPages + 1)); + ppi = (PropPageInfo*) ReAlloc(psInfo->proppage, + sizeof(PropPageInfo) * + (psInfo->nPages + 1)); + if (!ppi) + return FALSE; + + psInfo->proppage = ppi; if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages)) return FALSE;

1 0

[gvg] 20618: Sync to Wine-0_9_5:
by gvg＠svn.reactos.org 06 Jan '06

06 Jan '06

Sync to Wine-0_9_5: Alexandre Julliard <julliard(a)winehq.org> - Support building flex files without debug support. - Added some flex options to avoid compiler warnings. Moved options from the Makefile into the source. Modified: trunk/reactos/tools/wrc/lex.yy.c Modified: trunk/reactos/tools/wrc/parser.l Modified: trunk/reactos/tools/wrc/wrc.c _____ Modified: trunk/reactos/tools/wrc/lex.yy.c --- trunk/reactos/tools/wrc/lex.yy.c 2006-01-06 19:05:34 UTC (rev 20617) +++ trunk/reactos/tools/wrc/lex.yy.c 2006-01-06 19:56:51 UTC (rev 20618) @@ -1,3 +1,4 @@ +#line 2 "tools/wrc/lex.yy.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -261,6529 +262,12 @@ #define YY_AT_BOL() (yy_current_buffer->yy_at_bol) - -#define FLEX_DEBUG typedef unsigned char YY_CHAR; FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; typedef int yy_state_type; - -#define FLEX_DEBUG extern char *yytext; #define yytext_ptr yytext -static yyconst short yy_nxt[][256] = - { - { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0 - }, - - { - 25, 26, 26, 26, 26, 26, 26, 26, 26, 27, - 28, 26, 27, 27, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 27, 26, 29, 26, 26, 26, 26, 30, - - 26, 26, 26, 26, 26, 26, 31, 32, 33, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 26, 35, - 26, 26, 26, 26, 26, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 36, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 26, 37, 26, 26, 31, 26, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 38, 26, 39, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26 - }, - - { - 25, 26, 26, 26, 26, 26, 26, 26, 26, 40, - 28, 26, 40, 40, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 40, 26, 29, 41, 26, 26, 26, 30, - 26, 26, 26, 26, 26, 26, 31, 32, 33, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 26, 35, - 26, 26, 26, 26, 26, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 36, 31, 31, 31, - - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 26, 37, 26, 26, 31, 26, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 38, 26, 39, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26 - }, - - { - 25, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 43, 42, 42, 42, 42, 42, 42, 42, 42, 42, - - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 44, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 45, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42 - }, - - { - 25, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 43, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 44, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 45, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42 - - }, - - { - 25, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 47, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 48, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 49, 46, 46, 46, 46, 46, 46, 46, - - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46 - }, - - { - 25, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 47, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 48, 46, 46, 46, 46, 46, - - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 49, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46 - }, - - { - 25, 50, 50, 50, 50, 50, 50, 50, 50, 51, - 52, 50, 51, 51, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 51, 50, 50, 50, 50, 50, 50, 53, - 50, 50, 50, 50, 50, 50, 50, 50, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 50, 50, - 50, 50, 50, 50, 50, 54, 54, 54, 54, 54, - 54, 50, 50, 50, 50, 50, 50, 50, 50, 50, - - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 54, 54, 54, - 54, 54, 54, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50 - }, - - { - 25, 50, 50, 50, 50, 50, 50, 50, 50, 51, - 52, 50, 51, 51, 50, 50, 50, 50, 50, 50, - - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 51, 50, 50, 50, 50, 50, 50, 53, - 50, 50, 50, 50, 50, 50, 50, 50, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 50, 50, - 50, 50, 50, 50, 50, 54, 54, 54, 54, 54, - 54, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 54, 54, 54, - 54, 54, 54, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50 - }, - - { - 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 56, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 57, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55 - - }, - - { - 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 56, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 57, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55 - }, - - { - 25, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58 - }, - - { - 25, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58 - }, - - { - 25, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 60, 59, 59, 59, 59, 59, 59, 59, 59, 59, - - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 58, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 61, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 62, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - - 59, 59, 59, 63, 59, 64, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59 - }, - - { - 25, 59, 59, 59, 59, 59, 59, 59, 59, 65, - 60, 59, 65, 65, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 65, 59, 59, 66, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 61, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 62, - - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 63, 59, 64, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59 - - }, - - { - 25, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 68, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 58, 67, 67, 67, 67, - 69, 70, 67, 67, 67, 67, 67, 71, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 58, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67 - }, - - { - 25, 67, 67, 67, 67, 67, 67, 67, 67, 72, - 68, 67, 72, 72, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 72, 67, 67, 66, 67, 67, 67, 67, - - 69, 70, 67, 67, 67, 67, 67, 71, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 58, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67 - }, - - { - 25, 73, 73, 73, 73, 73, 73, 73, 73, 74, - 75, 73, 74, 74, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 74, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 76, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73 - }, - - { - 25, 73, 73, 73, 73, 73, 73, 73, 73, 74, - 75, 73, 74, 74, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 74, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 76, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73 - }, - - { - 25, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 58, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77 - - }, - - { - 25, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 58, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77 - }, - - { - 25, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 58, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 79, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78 - }, - - { - 25, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 58, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 79, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78 - }, - - { - 25, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 58, 80, 80, 80, 80, 80, 80, 80, 80, 80, - - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 81, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80 - }, - - { - 25, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 58, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 81, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80 - - }, - - { - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, - -25, -25, -25, -25, -25, -25 - }, - - { - 25, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26 - }, - - { - 25, -27, -27, -27, -27, -27, -27, -27, -27, 82, - -27, -27, 82, 82, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, 82, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, - -27, -27, -27, -27, -27, -27 - }, - - { - 25, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, - -28, -28, -28, -28, -28, -28 - }, - - { - 25, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29 - - }, - - { - 25, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, - -30, -30, -30, -30, -30, -30, -30, -30, -30, -30, [truncated at 1000 lines; 6754 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs