- Wine-Devel - list.winehq.org

Re: Implemented CreateUrlCacheEntryW and DeleteUrlCacheEntryW
by Robert Shearman Dec. 23, 2004

Dec. 23, 2004

Jacek Caban wrote: > Changelog: > Implemented CreateUrlCacheEntryW and DeleteUrlCacheEntryW > >------------------------------------------------------------------------ > >Index: dlls/wininet/urlcache.c >=================================================================== >RCS file: /home/wine/wine/dlls/wininet/urlcache.c,v >retrieving revision 1.22 >diff -u -p -r1.22 urlcache.c >--- dlls/wininet/urlcache.c 3 Sep 2004 18:30:28 -0000 1.22 >+++ dlls/wininet/urlcache.c 23 Dec 2004 11:08:39 -0000 >@@ -616,14 +616,14 @@ static BOOL URLCache_DeleteEntry(CACHEFI > static BOOL URLCache_LocalFileNameToPathW( > const URLCACHECONTAINER * pContainer, > LPCURLCACHE_HEADER pHeader, >- LPCSTR szLocalFileName, >+ LPCWSTR szLocalFileName, > BYTE Directory, > LPWSTR wszPath, > LPLONG lpBufferSize) > { > LONG nRequired; > int path_len = strlenW(pContainer->path); >- int file_name_len = MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, NULL, 0); >+ int file_name_len = lstrlenW(szLocalFileName); > > MultiByteWideChar returns the number of characters, including the NULL terminator. lstrlenW does not. Also, since the local file name can only ever be stored in ANSI, there is very little benefit in converting that function to Unicode. In fact, there is very little benefit in making the ANSI API functions convert everything to Unicode strings, only for them to be immediately converted back to ANSI for storage on disk. > if (Directory >= pHeader->DirectoryCount) > { > *lpBufferSize = 0; >@@ -638,7 +638,7 @@ static BOOL URLCache_LocalFileNameToPath > memcpy(wszPath, pContainer->path, path_len * sizeof(WCHAR)); > dir_len = MultiByteToWideChar(CP_ACP, 0, pHeader->directory_data[Directory].filename, DIR_LENGTH, wszPath + path_len, DIR_LENGTH); > wszPath[dir_len + path_len] = '\\'; >- MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len + 1, file_name_len); >+ memcpy(wszPath + dir_len + path_len + 1, szLocalFileName, file_name_len*sizeof(WCHAR)); > *lpBufferSize = nRequired; > return TRUE; > } >@@ -762,9 +762,18 @@ static BOOL URLCache_CopyEntry( > LPSTR lpszLocalFileName; > lpszLocalFileName = (LPSTR)lpCacheEntryInfo + dwRequiredSize; > nLocalFilePathSize = *lpdwBufferSize - dwRequiredSize; >- if ((bUnicode && URLCache_LocalFileNameToPathW(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, (LPWSTR)lpszLocalFileName, &nLocalFilePathSize)) || >- URLCache_LocalFileNameToPathA(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, lpszLocalFileName, &nLocalFilePathSize)) >- { >+ if (bUnicode) { >+ LPWSTR tmpstrw; >+ int len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, -1, NULL, 0); >+ tmpstrw = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); >+ MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, -1, tmpstrw, len); >+ if(URLCache_LocalFileNameToPathW(pContainer, pHeader, tmpstrw, pUrlEntry->CacheDir, >+ (LPWSTR)lpszLocalFileName, &nLocalFilePathSize)) { >+ lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName; >+ } >+ HeapFree(GetProcessHeap(), 0, tmpstrw); >+ }else if(URLCache_LocalFileNameToPathA(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, >+ pUrlEntry->CacheDir, lpszLocalFileName, &nLocalFilePathSize)) { > lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName; > } > dwRequiredSize += nLocalFilePathSize; >@@ -1550,36 +1559,38 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( > } > > /*********************************************************************** >- * CreateUrlCacheEntryA (WININET.@) >+ * CreateUrlCacheEntryW (WININET.@) > * > */ >-BOOL WINAPI CreateUrlCacheEntryA( >- IN LPCSTR lpszUrlName, >+BOOL WINAPI CreateUrlCacheEntryW( >+ IN LPCWSTR lpszUrlName, > IN DWORD dwExpectedFileSize, >- IN LPCSTR lpszFileExtension, >- OUT LPSTR lpszFileName, >+ IN LPCWSTR lpszFileExtension, >+ OUT LPWSTR lpszFileName, > IN DWORD dwReserved > ) > { > URLCACHECONTAINER * pContainer; > LPURLCACHE_HEADER pHeader; >- CHAR szFile[MAX_PATH]; >- CHAR szExtension[MAX_PATH]; >- LPCSTR lpszUrlPart; >- LPCSTR lpszUrlEnd; >- LPCSTR lpszFileNameExtension; >- LPSTR lpszFileNameNoPath; >+ WCHAR szFile[MAX_PATH]; >+ WCHAR szExtension[MAX_PATH]; >+ LPCWSTR lpszUrlPart; >+ LPCWSTR lpszUrlEnd; >+ LPCWSTR lpszFileNameExtension; >+ LPWSTR lpszFileNameNoPath; > int i; > int countnoextension; > BYTE CacheDir; > LONG lBufferSize; > BOOL bFound = FALSE; > int count; >+ static const WCHAR strWWW[] = {'w','w','w',0}; >+ static const WCHAR strFormat[] = {'[','%','u',']','%','s',0}; > > No need to pollute an already congested function header with something that can be put into the appropriate block below. Also, "wsz" is the prefix usually used for Wide Character string constants. > > TRACE("(%s, 0x%08lx, %s, %p, 0x%08lx)\n", >- debugstr_a(lpszUrlName), >+ debugstr_w(lpszUrlName), > dwExpectedFileSize, >- debugstr_a(lpszFileExtension), >+ debugstr_w(lpszFileExtension), > lpszFileName, > dwReserved); > >@@ -1607,16 +1618,14 @@ BOOL WINAPI CreateUrlCacheEntryA( > break; > } > } >- if (!strcmp(lpszUrlPart, "www")) >- { >- lpszUrlPart += strlen("www"); >- } >+ if (!lstrcmpW(lpszUrlPart, strWWW)) >+ lpszUrlPart += sizeof(strWWW)/sizeof(WCHAR) -1; > > count = lpszUrlEnd - lpszUrlPart; > > if (bFound && (count < MAX_PATH)) > { >- memcpy(szFile, lpszUrlPart, count * sizeof(CHAR)); >+ memcpy(szFile, lpszUrlPart, count * sizeof(WCHAR)); > szFile[count] = '\0'; > /* FIXME: get rid of illegal characters like \, / and : */ > } >@@ -1625,9 +1634,9 @@ BOOL WINAPI CreateUrlCacheEntryA( > FIXME("need to generate a random filename\n"); > } > >- TRACE("File name: %s\n", szFile); >+ TRACE("File name: %s\n", debugstr_w(szFile)); > >- if (!URLCacheContainers_FindContainerA(lpszUrlName, &pContainer)) >+ if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) > return FALSE; > > if (!URLCacheContainer_OpenIndex(pContainer)) >@@ -1638,32 +1647,33 @@ BOOL WINAPI CreateUrlCacheEntryA( > > CacheDir = (BYTE)(rand() % pHeader->DirectoryCount); > >- lBufferSize = MAX_PATH * sizeof(CHAR); >- URLCache_LocalFileNameToPathA(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize); >+ lBufferSize = MAX_PATH * sizeof(WCHAR); >+ URLCache_LocalFileNameToPathW(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize); > > URLCacheContainer_UnlockIndex(pContainer, pHeader); > >- lpszFileNameNoPath = lpszFileName + lBufferSize / sizeof(CHAR) + DIR_LENGTH + 1; >+ lpszFileNameNoPath = lpszFileName + lBufferSize / sizeof(WCHAR) + DIR_LENGTH + 1; > >- countnoextension = strlen(lpszFileNameNoPath); >- lpszFileNameExtension = PathFindExtensionA(lpszFileNameNoPath); >+ countnoextension = lstrlenW(lpszFileNameNoPath); >+ lpszFileNameExtension = PathFindExtensionW(lpszFileNameNoPath); > if (lpszFileNameExtension) >- countnoextension -= strlen(lpszFileNameExtension); >+ countnoextension -= lstrlenW(lpszFileNameExtension); > *szExtension = '\0'; > > if (lpszFileExtension) > { > szExtension[0] = '.'; >- strcpy(szExtension+1, lpszFileExtension); >+ lstrcpyW(szExtension+1, lpszFileExtension); > } > > for (i = 0; i < 255; i++) > { > HANDLE hFile; >- strncpy(lpszFileNameNoPath, szFile, countnoextension); >- sprintf(lpszFileNameNoPath + countnoextension, "[%u]%s", i, szExtension); >- TRACE("Trying: %s\n", lpszFileName); >- hFile = CreateFileA(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); >+ int len = lstrlenW(szFile)+1; >+ memcpy(lpszFileNameNoPath, szFile, (len<countnoextension ? len : countnoextension)*sizeof(WCHAR)); > > The strncpyW function exists for a reason. Also, it is better to use strlenW than lstrlenW. >+ wsprintfW(lpszFileNameNoPath + countnoextension, strFormat, i, szExtension); >+ TRACE("Trying: %s\n", debugstr_w(lpszFileName)); >+ hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); > if (hFile != INVALID_HANDLE_VALUE) > { > CloseHandle(hFile); >@@ -1674,6 +1684,45 @@ BOOL WINAPI CreateUrlCacheEntryA( > return FALSE; > } > >+ >+/*********************************************************************** >+ * CreateUrlCacheEntryA (WININET.@) >+ * >+ */ >+BOOL WINAPI CreateUrlCacheEntryA( >+ IN LPCSTR lpszUrlName, >+ IN DWORD dwExpectedFileSize, >+ IN LPCSTR lpszFileExtension, >+ OUT LPSTR lpszFileName, >+ IN DWORD dwReserved >+) >+{ >+ int len; >+ BOOL ret; >+ LPWSTR lpszUrlNamew = NULL; >+ LPWSTR lpszFileExtensionw = NULL; >+ WCHAR lpszFileNamew[MAX_PATH+1]; >+ >+ if(lpszUrlName) { >+ len = MultiByteToWideChar(CP_ACP, 0, lpszUrlName, -1, NULL, 0); >+ lpszUrlNamew = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); >+ MultiByteToWideChar(CP_ACP, 0, lpszUrlName, -1, lpszUrlNamew, len); >+ } >+ >+ if(lpszFileExtension) { >+ len = MultiByteToWideChar(CP_ACP, 0, lpszFileExtension, -1, NULL, 0); >+ lpszFileExtensionw = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); >+ MultiByteToWideChar(CP_ACP, 0, lpszFileExtension, -1, lpszFileExtensionw, len); >+ } >+ >+ ret = CreateUrlCacheEntryW(lpszUrlNamew, dwExpectedFileSize, lpszFileExtensionw, lpszFileNamew, 0); >+ >+ WideCharToMultiByte(CP_ACP, 0, lpszFileNamew, -1, lpszFileName, -1, 0, 0); >+ HeapFree(GetProcessHeap(), 0, lpszUrlNamew); >+ HeapFree(GetProcessHeap(), 0, lpszFileExtensionw); >+ return ret; >+} >+ > /*********************************************************************** > * CommitUrlCacheEntryA (WININET.@) > * >@@ -1999,12 +2048,11 @@ BOOL WINAPI UnlockUrlCacheEntryStream( > return TRUE; > } > >- > /*********************************************************************** >- * DeleteUrlCacheEntryA (WININET.@) >+ * DeleteUrlCacheEntryAW (internal) > > Bad name for the function. This convention is used in shell32 to indicate a function that is implemented as ANSI only on Win9x and Unicode on WinNT. > * > */ >-BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) >+BOOL WINAPI DeleteUrlCacheEntryAW(LPCWSTR lpszUrlName, BOOL bUnicode) > { > URLCACHECONTAINER * pContainer; > LPURLCACHE_HEADER pHeader; >@@ -2012,11 +2060,15 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR > DWORD dwStartBlock; > DWORD dwBlock; > BYTE * AllocationTable; >+ LPSTR lpszUrlNamea = NULL; > >- TRACE("(%s)\n", debugstr_a(lpszUrlName)); >- >- if (!URLCacheContainers_FindContainerA(lpszUrlName, &pContainer)) >- return FALSE; >+ if(bUnicode) { >+ if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) >+ return FALSE; >+ } else { >+ if (!URLCacheContainers_FindContainerA((LPSTR)lpszUrlName, &pContainer)) >+ return FALSE; >+ } > > if (!URLCacheContainer_OpenIndex(pContainer)) > return FALSE; >@@ -2024,11 +2076,20 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR > if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) > return FALSE; > >- if (!URLCache_FindEntryInHash(pHeader, lpszUrlName, &pEntry)) >+ if(bUnicode) { >+ lpszUrlNamea = (LPSTR)lpszUrlName; >+ } else { >+ int len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, -1, 0, 0); >+ WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, lpszUrlNamea, len, 0, 0); >+ } >+ >+ if (!URLCache_FindEntryInHash(pHeader, lpszUrlNamea, &pEntry)) > { > URLCacheContainer_UnlockIndex(pContainer, pHeader); >- TRACE("entry %s not found!\n", lpszUrlName); >+ TRACE("entry not found!\n"); > SetLastError(ERROR_FILE_NOT_FOUND); >+ if(bUnicode) >+ HeapFree(GetProcessHeap(), 0, lpszUrlNamea); > return FALSE; > } > >@@ -2041,11 +2102,34 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR > > URLCache_DeleteEntry(pEntry); > >- URLCache_DeleteEntryFromHash(pHeader, lpszUrlName); >+ URLCache_DeleteEntryFromHash(pHeader, lpszUrlNamea); > > URLCacheContainer_UnlockIndex(pContainer, pHeader); > >+ if(bUnicode) >+ HeapFree(GetProcessHeap(), 0, lpszUrlNamea); >+ > return TRUE; >+} >+ >+/*********************************************************************** >+ * DeleteUrlCacheEntryA (WININET.@) >+ * >+ */ >+BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) >+{ >+ TRACE("(%s)\n", debugstr_a(lpszUrlName)); >+ return DeleteUrlCacheEntryAW((LPCWSTR)lpszUrlName, FALSE); >+} >+ >+/*********************************************************************** >+ * DeleteUrlCacheEntryW (WININET.@) >+ * >+ */ >+BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) >+{ >+ TRACE("(%s)\n", debugstr_w(lpszUrlName)); >+ return DeleteUrlCacheEntryAW(lpszUrlName, TRUE); > } > > /*********************************************************************** > > Rob

2 1

Re: Moved some strings to resources
by Juan Lang Dec. 23, 2004

Dec. 23, 2004

Hi Jacek, small suggestion: > @@ -1391,8 +1393,11 @@ static LRESULT FILEDLG95_InitControls(HW > /* change Open to Save FIXME: use resources */ > if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) > { The comment is out of date, you did use resources. --Juan __________________________________ Do you Yahoo!? Yahoo! Mail - now with 250MB free storage. Learn more. http://info.mail.yahoo.com/mail_250

1 0

winetest failing on Windows 2000, VIA AC 97 audio
by Jakob Eriksson Dec. 23, 2004

Dec. 23, 2004

http://test.winehq.org/data/200412231000/2000_MarcelHekman/winmm:wave.txt Can we blacklist this driver somehow? AFAIK I submitted a black list patch before for this driver but it was silently dropped. regards, Jakob

1 0

MSVCRT, OpenGL bugs to look at (and a WM rewrite regression?)
by Mike Hearn Dec. 23, 2004

Dec. 23, 2004

Hi ho, Every so often I try out my favourite game to see how well it runs in Wine. This time, I found the demo (I have the full game but the demo is easier to debug) was working well! The following snowboarding game: http://www.housemarque.com/games/supremesb/ssb_demo.exe is not only a lot of fun but also Very Nearly There in Wine. There are only two problems preventing it from running perfectly: 1) There seems to be a bug in our msvcrt file reading APIs. I've chased this one before and got nowhere, but maybe somebody more familiar with the code can find it. We seem to pass back corrupt data: with builtin msvcrt the demo complains with a nicely detailed assertion that it can't find a file marker it's looking for. Native MSVCRT from WinXP makes it work (once you set winver=winxp) 2) When racing, the sky is black. An OpenGL bug perhaps? Weirdly when it's showing the pre-recorded demos the sky is just fine. The rest of the graphics are perfect. Finally if you put it in desktop mode, an X protocol error occurs initialising OpenGL. The XGetWindowAttributes call complains of a bad window. I debugged this for a bit and got nowhere, it wasn't as straightforward as it looked. Suffice to say that at the point it died opengl32.dll had been initialised several times already with the same value for root_window, and it worked each time previously (yes sync was enabled). I think this definitely used to work, so it feels like some WM rewrite regression to me. I could well be wrong though. This seems to affect all OpenGL+desktop mode apps. To make the game let you choose OpenGL in the setup program it has to be run in win2k/winxp mode. I do not know why. If you get it going, see if you can beat my best time (when playing on Linux) of 2:02. Have fun! :) thanks -mike

3 5

MSVCRT, OpenGL bugs to look at (and a WM rewrite regression?)
by Jesse Allen Dec. 23, 2004

Dec. 23, 2004

On Thu, 23 Dec 2004 00:43:20 +0000, Mike Hearn <mh(a)codeweavers.com> wrote: > > 2) When racing, the sky is black. An OpenGL bug perhaps? Weirdly when it's > showing the pre-recorded demos the sky is just fine. The rest of the > graphics are perfect. What graphics card and driver do you use? This is important. I use a Radeon 9200 and DRI. In Warcraft III+opengl under wine, things would "disappear", but then re-appear under different conditions. I have screen shots I can upload that shows this in action. I used to use an nvidia card with the official driver. Comparatively, the nvidia graphics setup rendered everything perfectly. > > Finally if you put it in desktop mode, an X protocol error occurs > initialising OpenGL. The XGetWindowAttributes call complains of a bad > window. I debugged this for a bit and got nowhere, it wasn't as > straightforward as it looked. Suffice to say that at the point it died > opengl32.dll had been initialised several times already with the same > value for root_window, and it worked each time previously (yes sync was > enabled). > > I think this definitely used to work, so it feels like some WM rewrite > regression to me. I could well be wrong though. > > This seems to affect all OpenGL+desktop mode apps. You are correct, it used to work. I just tried it yesterday and it didn't work for me either. > > To make the game let you choose OpenGL in the setup program it has to be > run in win2k/winxp mode. I do not know why. > > If you get it going, see if you can beat my best time (when playing on > Linux) of 2:02. Have fun! :) > > thanks -mike > > Unfortunately I can't try your game at the moment cause it will take me too long to download -- 2 KB/s down only =( Jesse

2 1

Re: MSI: First go at thread safety for MSI records
by Alexandre Julliard Dec. 23, 2004

Dec. 23, 2004

Mike McCormack <mike(a)codeweavers.com> writes: > Index: dlls/msi/msipriv.h > =================================================================== > RCS file: /home/wine/wine/dlls/msi/msipriv.h,v > retrieving revision 1.32 > diff -u -r1.32 msipriv.h > --- dlls/msi/msipriv.h 22 Dec 2004 15:05:07 -0000 1.32 > +++ dlls/msi/msipriv.h 23 Dec 2004 01:43:40 -0000 > @@ -54,6 +54,7 @@ > UINT magic; > UINT type; > UINT refcount; > + CRITICAL_SECTION cs; > msihandledestructor destructor; Do you really need a separate critical section for every single MSI object? That seems a bit overkill to me. -- Alexandre Julliard julliard(a)winehq.org

4 3

Going forward with fixing up tests failing because not run on visible desktop.
by Jakob Eriksson Dec. 23, 2004

Dec. 23, 2004

Followup on tests failing because they are run as an invisible service on Windows: ---------------------------------------------------------------------------------- Now that we have bRunningOnVisibleDesktop=0 in the report, how do we make use of it? Do we mark on the server side which tests fail because of it, or should we add a flag to the ok() macro? I would like to have the information stored in the test code somehow. It would document implicitly which functions only work in visible mode. If we had a global variable named "running_on_visible_desktop", we would have code like this in the tests: if (running_on_visible_desktop) { ok(EnumEnhMetaFile(hdcDisplay, hMetafile, emf_enum_proc, dx, &rc), "EnumEnhMetaFile error %ld\n", GetLastError()); } Or we could mark them like this: expect_to_fail_if_running_on_visible_desktop { ok(EnumEnhMetaFile(hdcDisplay, hMetafile, emf_enum_proc, dx, &rc), "EnumEnhMetaFile error %ld\n", GetLastError()); } Where expect_to_fail_if.... should do some magic... regards, Jakob

1 0

Re: [OLE #10] Make out of process COM work with OXID based marshal ids
by Robert Shearman Dec. 23, 2004

Dec. 23, 2004

Mike Hearn wrote: >This patch makes InstallShield work again, and should let you get >further Bill. > >- Ensure all intermediate threads join the original apartment >- Make the listener thread fully apartment scoped (one per apt not per > process) >- Improve "already have mid" error message >- Rename _StubReaderThread to stub_dispatch_thread >- Improve tracing > > Can you submit this patch again, but without the local server changes? You have persuaded me that this is the only way to keep things working for the moment. I'll submit a seperate patch for the local server problem, if that's ok with you. Rob

1 0

Looking for a Wine consultant
by Raetus Egli Dec. 23, 2004

Dec. 23, 2004

I am sending this message for a friend of mine. I am the head of a company that is trying to migrate a VB6 system on WinNT to Linux. We would like to use this application under Debian Sarge using Wine. If you have experience in porting VB6 applications using Wine and have some free time to consult with an in-house developer it would be greatly appreciated. We would like to get the project up and running as soon as possible. If you are interested please get back to me at pyadegar(a)honeymae.com as soon as possible. Thanks.

1 0

Re: Add ntoskrnl.exe.so
by Mike Hearn Dec. 23, 2004

Dec. 23, 2004

On Wed, 22 Dec 2004 13:29:35 -0800, Steven Edwards wrote: > kernel32 can't be a dependancy on ntoskrnl. We are going to need to redesign Wine if we are going > to have a ntoskrnl implementation. Why not? This isn't ReactOS, ntoskrnl is just another DLL from the SafeDisc perspective. Its implementation details shouldn't matter.

3 5