February 2005 - Wine-Devel - list.winehq.org

Re: Crash in Polar Precision Performance Software

by Ron Jensen

On Mon, 2005-02-28 at 16:11 -0600, Robert Shearman wrote: > Ron Jensen wrote: > > >Hello, > > > >This trace is from Polar's Precision Performance Software > >http://www.codeweavers.com/site/compatibility/browse/name?app_id=681 > >running on CVS wine. > > > >This crash happens with CVS wine, and wine I compiled from > >http://ftp.codeweavers.com/pub/crossover/office/source/office-src-4.1.0.tgz > >It does not happen with the precompiled binaries in CXOffice's Loki installer. > > > >Can someone give me a clue as to were to start looking to fix this? > > > > > > What version of the precompiled binaries are you using? > > Rob 20040716 according to the About WINE dialog box... This is the same version in the sources mentioned above, unless there were patches or CVS updates applied... Perhaps I should pull down a copy of 200406xx and see if that works? Which version of GCC does (did) Code Weavers use to make the 4.1.0 release? Thanks, Ron

Feb. 28, 2005

Re: Tools for identifying what a DLL provides?

by Michael Stefaniuc

Andreas Mohr wrote: > On Mon, Feb 28, 2005 at 09:48:40AM -0600, David D. Hagood wrote: > >>I have a DLL from a manufacturer that I don't have the source for, nor do >>I have the header or the import library for. >> >>Since Wine developers frequently have to reverse engineer what a given DLL >>provides, does anybody have a good recommendation for a tool that can scan >>the DLL and report what functions it exports, and their arg types and >>return types? > > > You really want http://www.dependencywalker.com/ , trust me. > > But probably http://www.pe-explorer.com/ is very useful, too... This would be probably good additions to the Wine resource page ... bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

Feb. 28, 2005

Help with winebuild/winegcc

by Ivan Leo Puoti

Hello, I'm trying to get a program in the programs/ directory to export symbols, I've added -shared path/to/spec/spec.c to the linker command, but I now get a segmentation fault at startup. Can someone knowledgeable about winegcc/winebuild give me a suggestion/solution? I'm really stuck because of this and can't get on with safedisc support. Ivan.

Feb. 28, 2005

Re: Crash in Polar Precision Performance Software

by Robert Shearman

Ron Jensen wrote: >Hello, > >This trace is from Polar's Precision Performance Software >http://www.codeweavers.com/site/compatibility/browse/name?app_id=681 >running on CVS wine. > >This crash happens with CVS wine, and wine I compiled from >http://ftp.codeweavers.com/pub/crossover/office/source/office-src-4.1.0.tgz >It does not happen with the precompiled binaries in CXOffice's Loki installer. > >Can someone give me a clue as to were to start looking to fix this? > > What version of the precompiled binaries are you using? Rob

Feb. 28, 2005

Re: [PATCH] Added 2 functions to shell32

by Jacek Caban

> I doubt shell32 function on windows does this check, also original windows shell32 > function is a lot more complicated and longer, I've compared the results between > real and my code and they are correct. I wrote a small test for this function showing that your implementation is almost correct. It failes in two cases: 1. If a path ends with '\' and is compared with one that doesn't, then it's length is less than the other one, but both are the same paths. 2. If a path doesn't end with '\' and is compared with a longer one that has the same first len chars, but is not the same, ex: c:\test c:\test123 Changelog: Added test for PathIsEqualOrSubFolder Index: dlls/shell32/tests/shellpath.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/tests/shellpath.c,v retrieving revision 1.6 diff -u -p -r1.6 shellpath.c --- dlls/shell32/tests/shellpath.c 10 Feb 2005 19:19:35 -0000 1.6 +++ dlls/shell32/tests/shellpath.c 28 Feb 2005 21:19:31 -0000 @@ -871,6 +871,55 @@ static void testNonExistentPath(void) userShellFolders); } +typedef BOOL (WINAPI*fnPathIsEqualOrSubFolder)(LPCWSTR path1, LPCWSTR path2); + +static void test_PathIsEqualOrSubFolder() +{ + fnPathIsEqualOrSubFolder pPathIsEqualOrSubFolder; + BOOL ret; + static const WCHAR path1[] = {'c',':','\\','t','e','s','t',0}; + static const WCHAR path2[] = {'c',':','\\','t','e','s','t','\\','t','e','s','t',0}; + static const WCHAR path3[] = {'c',':','\\','t','e','s','t','1','2','3',0}; + static const WCHAR path4[] = {'c',':','\\','t','e','s','t','\\',0}; + static const WCHAR path5[] = {'c',':','\\','t','e','s','t','\\','t','e','s','t','2', + '\\','.','.','\\','t','e','s','t',0}; + + pPathIsEqualOrSubFolder = GetProcAddress(hShell32, (LPSTR)755); + if(!pPathIsEqualOrSubFolder) + return; + +#define TEST_PATH(p1, p2, r) \ + ret = pPathIsEqualOrSubFolder(p1, p2); \ + ok(ret == r, "PathIsEqualOrSubFolder(" #p1 " " #p2 ") failed, expected: %x\n", r); + + TEST_PATH(path1, path1, TRUE); + TEST_PATH(path1, path2, TRUE); + TEST_PATH(path1, path3, FALSE); + TEST_PATH(path1, path4, TRUE); + TEST_PATH(path2, path1, FALSE); + TEST_PATH(path2, path2, TRUE); + TEST_PATH(path2, path3, FALSE); + TEST_PATH(path2, path4, FALSE); + TEST_PATH(path3, path1, FALSE); + TEST_PATH(path3, path2, FALSE); + TEST_PATH(path3, path3, TRUE); + TEST_PATH(path3, path4, FALSE); + TEST_PATH(path4, path1, TRUE); + TEST_PATH(path4, path2, TRUE); + TEST_PATH(path4, path3, FALSE); + TEST_PATH(path4, path4, TRUE); + TEST_PATH(path5, path1, FALSE); + TEST_PATH(path5, path2, FALSE); + TEST_PATH(path5, path3, FALSE); + TEST_PATH(path5, path4, FALSE); + TEST_PATH(path5, path5, TRUE); + TEST_PATH(NULL, path1, FALSE); + TEST_PATH(path1, NULL, FALSE); + TEST_PATH(NULL, NULL, FALSE); + +#undef TEST_PATH +} + START_TEST(shellpath) { if (!init()) return; @@ -892,5 +941,6 @@ START_TEST(shellpath) testWinDir(); testSystemDir(); testNonExistentPath(); + test_PathIsEqualOrSubFolder(); } }

Feb. 28, 2005

Re: Implements OleLoadPicturePath

by Maxime Bellengé

Thanks for your reply, I will fix the places you mentioned to clean things up correctly. But other places in olepicture should also be fixed in this case. I will check that. Max On Mon, 2005-02-28 at 15:22 -0600, Robert Shearman wrote: > Maxime Bellengé wrote: > > >Hello, here is an implementation of OleLoadPicturePath. > >The filename can be either a local file or an url. > >In case of a url, I needed a user-agent for wininet. I put a dummy value > >as I didn't find a default wine value. Is there a default value > >somewhere for the whole project ? > > > >a+ > > > >Max > > > >ChangeLog: > > * Implements OleLoadPicturePath > > > > > > > >------------------------------------------------------------------------ > > > >Index: wine/dlls/oleaut32/olepicture.c > >=================================================================== > >RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v > >retrieving revision 1.55 > >diff -u -r1.55 olepicture.c > >--- wine/dlls/oleaut32/olepicture.c 25 Feb 2005 14:07:57 -0000 1.55 > >+++ wine/dlls/oleaut32/olepicture.c 27 Feb 2005 10:51:43 -0000 > >@@ -71,7 +71,9 @@ > > #include "olectl.h" > > #include "oleauto.h" > > #include "connpt.h" > >+#include "wininet.h" > > #include "wine/debug.h" > >+#include "wine/unicode.h" > > > > #include "wine/wingdi16.h" > > #include "cursoricon.h" > >@@ -1998,11 +2000,122 @@ > > DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, > > LPVOID *ppvRet ) > > { > >- FIXME("(%s,%p,%ld,%08lx,%s,%p): stub\n", > >+ static const WCHAR file[] = { 'f','i','l','e',':','/','/',0 }; > >+ static const WCHAR name[] = { 'w','i','n','e','-','a','g','e','n','t',0}; > >+ IPicture *ipicture; > >+ HANDLE hFile; > >+ DWORD dwFileSize; > >+ HGLOBAL hGlobal = NULL; > >+ DWORD dwBytesRead = 0; > >+ IStream *stream; > >+ BOOL bRead; > >+ IPersistStream *pStream; > >+ HRESULT hRes; > >+ > >+ TRACE("(%s,%p,%ld,%08lx,%s,%p): stub\n", > > debugstr_w(szURLorPath), punkCaller, dwReserved, clrReserved, > > debugstr_guid(riid), ppvRet); > > > >- return E_NOTIMPL; > >+ if (!ppvRet) return E_POINTER; > >+ > >+ if (strncmpW(szURLorPath, file, 7) == 0) { > >+ szURLorPath += 7; > >+ > >+ hFile = CreateFileW(szURLorPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, > >+ 0, NULL); > >+ if (hFile == INVALID_HANDLE_VALUE) > >+ return E_UNEXPECTED; > >+ > >+ dwFileSize = GetFileSize(hFile, NULL); > >+ if (dwFileSize != INVALID_FILE_SIZE ) > >+ { > >+ hGlobal = GlobalAlloc(GMEM_FIXED,dwFileSize); > >+ if ( hGlobal) > >+ { > >+ bRead = ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL); > >+ if (!bRead) > >+ { > >+ GlobalFree(hGlobal); > >+ hGlobal = 0; > >+ } > >+ } > >+ } > >+ CloseHandle(hFile); > >+ } else { > >+ HINTERNET hInternet; > >+ BOOL res = FALSE; > >+ > >+ hInternet = InternetOpenW(name, INTERNET_OPEN_TYPE_PRECONFIG, NULL, > >+ NULL, 0); > >+ if (hInternet) > >+ { > >+ HINTERNET hFile; > >+ hFile = InternetOpenUrlW(hInternet, szURLorPath, NULL, -1L, > >+ INTERNET_FLAG_RESYNCHRONIZE, (DWORD_PTR)NULL); > >+ if (hFile) > >+ { > >+ DWORD total = 4096; > >+ DWORD nbRead; > >+ > >+ hGlobal = GlobalAlloc(GMEM_FIXED, 4096); > >+ if (hGlobal) > >+ { > >+ do { > >+ res = InternetReadFile(hFile, hGlobal, 4096, &nbRead); > >+ if (res && (nbRead>0)) > >+ { > >+ HGLOBAL hNewGlobal; > >+ hNewGlobal = GlobalReAlloc(hGlobal, total+4096, 0); > >+ if (!hNewGlobal) > >+ { > >+ res = FALSE; > >+ break; > >+ } > >+ } > >+ } while (res && (nbRead>0)); > >+ } > >+ } > >+ > >+ InternetCloseHandle(hInternet); > >+ } > >+ if (!res) > >+ { > >+ GlobalFree(hGlobal); > >+ } > >+ } > >+ > >+ if (!hGlobal) > >+ return E_UNEXPECTED; > >+ > >+ hRes = CreateStreamOnHGlobal(hGlobal, TRUE, &stream); > >+ if (FAILED(hRes)) > >+ { > >+ if (stream != NULL) IStream_Release(stream); > > > > > > A valid stream will not be returned on failure, so no need for the extra > check here. > > >+ GlobalFree(hGlobal); > >+ return hRes; > >+ } > >+ > >+ hRes = CoCreateInstance(&CLSID_StdPicture, punkCaller, CLSCTX_INPROC_SERVER, > >+ &IID_IPicture, (LPVOID*)&ipicture); > >+ if (hRes != S_OK) { > > > > > > Lack of cleanup code here. > > >+ return hRes; > >+ } > >+ > >+ hRes = IPicture_QueryInterface(ipicture, &IID_IPersistStream, (LPVOID*)&pStream); > >+ if (hRes) { > >+ IPicture_Release(ipicture); > > > > > > And here. > > >+ return hRes; > >+ } > >+ > >+ IPersistStream_Load(pStream, stream); > > > > > > You should probably check the return value from this function as it is > kinda vital to the function you are implementing. > > >+ IPersistStream_Release(pStream); > >+ IStream_Release(stream); > >+ hRes = IPicture_QueryInterface(ipicture,riid,ppvRet); > >+ if (hRes) > >+ FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); > >+ > >+ IPicture_Release(ipicture); > >+ return hRes; > > } > > > > /******************************************************************************* > > > > > > >Index: wine/dlls/oleaut32/Makefile.in > >=================================================================== > >RCS file: /home/wine/wine/dlls/oleaut32/Makefile.in,v > >retrieving revision 1.57 > >diff -u -r1.57 Makefile.in > >--- wine/dlls/oleaut32/Makefile.in 27 Oct 2004 00:47:53 -0000 1.57 > >+++ wine/dlls/oleaut32/Makefile.in 27 Feb 2005 10:52:08 -0000 > >@@ -4,7 +4,7 @@ > > SRCDIR = @srcdir@ > > VPATH = @srcdir@ > > MODULE = oleaut32.dll > >-IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll > >+IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll wininet > > DELAYIMPORTS = comctl32 > > EXTRALIBS = $(LIBUNICODE) -luuid > > > > > > I don't think oleaut32 should be importing from wininet for just the > implementation of OleLoadPicturePath. It surprises me that there is not > already an implementation of IStream for URLs that can be re-used. If > there is no alternative, I think we should just make wininet a delayed > import. > > Rob >

Feb. 28, 2005

Re: [QUARTZ] Handle End Of Stream notifications

by Robert Shearman

Christian Costa wrote: >Index: dlls/quartz/dsoundrender.c >=================================================================== >RCS file: /home/wine/wine/dlls/quartz/dsoundrender.c,v >retrieving revision 1.6 >diff -u -r1.6 dsoundrender.c >--- dlls/quartz/dsoundrender.c 6 Jan 2005 19:36:47 -0000 1.6 >+++ dlls/quartz/dsoundrender.c 27 Feb 2005 20:48:17 -0000 >@@ -550,8 +550,8 @@ > > static HRESULT WINAPI DSoundRender_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) > { >- HRESULT hr; > DSoundRenderImpl *This = (DSoundRenderImpl *)iface; >+ HRESULT hr = S_OK; > > TRACE("(%p/%p)->(%p, %s)\n", This, iface, pGraph, debugstr_w(pName)); > >@@ -563,7 +563,14 @@ > *This->filterInfo.achName = '\0'; > This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ > >- hr = IFilterGraph_QueryInterface(pGraph, &IID_IMediaEventSink, (LPVOID*)&This->pEventSink); >+ This->pEventSink = NULL; >+ if (pGraph) >+ { >+ /* Cache IMediaEventSink interface w/o increasing filtergraph refcount */ > > I appreciate that this works perfectly fine at the moment, but these kind of assumptions can lead to difficult to track memory corruptions, so it would be best to avoid caching the object here and querying for it when it's needed. >+ hr = IFilterGraph_QueryInterface(pGraph, &IID_IMediaEventSink, (LPVOID*)&This->pEventSink); >+ if (SUCCEEDED(hr)) >+ IMediaEventSink_Release(This->pEventSink); >+ } > } > LeaveCriticalSection(&This->csFilter); > > Rob

Feb. 28, 2005

Re: Implements OleLoadPicturePath

by Robert Shearman

Maxime Bellengé wrote: >Hello, here is an implementation of OleLoadPicturePath. >The filename can be either a local file or an url. >In case of a url, I needed a user-agent for wininet. I put a dummy value >as I didn't find a default wine value. Is there a default value >somewhere for the whole project ? > >a+ > >Max > >ChangeLog: > * Implements OleLoadPicturePath > > > >------------------------------------------------------------------------ > >Index: wine/dlls/oleaut32/olepicture.c >=================================================================== >RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v >retrieving revision 1.55 >diff -u -r1.55 olepicture.c >--- wine/dlls/oleaut32/olepicture.c 25 Feb 2005 14:07:57 -0000 1.55 >+++ wine/dlls/oleaut32/olepicture.c 27 Feb 2005 10:51:43 -0000 >@@ -71,7 +71,9 @@ > #include "olectl.h" > #include "oleauto.h" > #include "connpt.h" >+#include "wininet.h" > #include "wine/debug.h" >+#include "wine/unicode.h" > > #include "wine/wingdi16.h" > #include "cursoricon.h" >@@ -1998,11 +2000,122 @@ > DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, > LPVOID *ppvRet ) > { >- FIXME("(%s,%p,%ld,%08lx,%s,%p): stub\n", >+ static const WCHAR file[] = { 'f','i','l','e',':','/','/',0 }; >+ static const WCHAR name[] = { 'w','i','n','e','-','a','g','e','n','t',0}; >+ IPicture *ipicture; >+ HANDLE hFile; >+ DWORD dwFileSize; >+ HGLOBAL hGlobal = NULL; >+ DWORD dwBytesRead = 0; >+ IStream *stream; >+ BOOL bRead; >+ IPersistStream *pStream; >+ HRESULT hRes; >+ >+ TRACE("(%s,%p,%ld,%08lx,%s,%p): stub\n", > debugstr_w(szURLorPath), punkCaller, dwReserved, clrReserved, > debugstr_guid(riid), ppvRet); > >- return E_NOTIMPL; >+ if (!ppvRet) return E_POINTER; >+ >+ if (strncmpW(szURLorPath, file, 7) == 0) { >+ szURLorPath += 7; >+ >+ hFile = CreateFileW(szURLorPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, >+ 0, NULL); >+ if (hFile == INVALID_HANDLE_VALUE) >+ return E_UNEXPECTED; >+ >+ dwFileSize = GetFileSize(hFile, NULL); >+ if (dwFileSize != INVALID_FILE_SIZE ) >+ { >+ hGlobal = GlobalAlloc(GMEM_FIXED,dwFileSize); >+ if ( hGlobal) >+ { >+ bRead = ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL); >+ if (!bRead) >+ { >+ GlobalFree(hGlobal); >+ hGlobal = 0; >+ } >+ } >+ } >+ CloseHandle(hFile); >+ } else { >+ HINTERNET hInternet; >+ BOOL res = FALSE; >+ >+ hInternet = InternetOpenW(name, INTERNET_OPEN_TYPE_PRECONFIG, NULL, >+ NULL, 0); >+ if (hInternet) >+ { >+ HINTERNET hFile; >+ hFile = InternetOpenUrlW(hInternet, szURLorPath, NULL, -1L, >+ INTERNET_FLAG_RESYNCHRONIZE, (DWORD_PTR)NULL); >+ if (hFile) >+ { >+ DWORD total = 4096; >+ DWORD nbRead; >+ >+ hGlobal = GlobalAlloc(GMEM_FIXED, 4096); >+ if (hGlobal) >+ { >+ do { >+ res = InternetReadFile(hFile, hGlobal, 4096, &nbRead); >+ if (res && (nbRead>0)) >+ { >+ HGLOBAL hNewGlobal; >+ hNewGlobal = GlobalReAlloc(hGlobal, total+4096, 0); >+ if (!hNewGlobal) >+ { >+ res = FALSE; >+ break; >+ } >+ } >+ } while (res && (nbRead>0)); >+ } >+ } >+ >+ InternetCloseHandle(hInternet); >+ } >+ if (!res) >+ { >+ GlobalFree(hGlobal); >+ } >+ } >+ >+ if (!hGlobal) >+ return E_UNEXPECTED; >+ >+ hRes = CreateStreamOnHGlobal(hGlobal, TRUE, &stream); >+ if (FAILED(hRes)) >+ { >+ if (stream != NULL) IStream_Release(stream); > > A valid stream will not be returned on failure, so no need for the extra check here. >+ GlobalFree(hGlobal); >+ return hRes; >+ } >+ >+ hRes = CoCreateInstance(&CLSID_StdPicture, punkCaller, CLSCTX_INPROC_SERVER, >+ &IID_IPicture, (LPVOID*)&ipicture); >+ if (hRes != S_OK) { > > Lack of cleanup code here. >+ return hRes; >+ } >+ >+ hRes = IPicture_QueryInterface(ipicture, &IID_IPersistStream, (LPVOID*)&pStream); >+ if (hRes) { >+ IPicture_Release(ipicture); > > And here. >+ return hRes; >+ } >+ >+ IPersistStream_Load(pStream, stream); > > You should probably check the return value from this function as it is kinda vital to the function you are implementing. >+ IPersistStream_Release(pStream); >+ IStream_Release(stream); >+ hRes = IPicture_QueryInterface(ipicture,riid,ppvRet); >+ if (hRes) >+ FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); >+ >+ IPicture_Release(ipicture); >+ return hRes; > } > > /******************************************************************************* > > >Index: wine/dlls/oleaut32/Makefile.in >=================================================================== >RCS file: /home/wine/wine/dlls/oleaut32/Makefile.in,v >retrieving revision 1.57 >diff -u -r1.57 Makefile.in >--- wine/dlls/oleaut32/Makefile.in 27 Oct 2004 00:47:53 -0000 1.57 >+++ wine/dlls/oleaut32/Makefile.in 27 Feb 2005 10:52:08 -0000 >@@ -4,7 +4,7 @@ > SRCDIR = @srcdir@ > VPATH = @srcdir@ > MODULE = oleaut32.dll >-IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll >+IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll wininet > DELAYIMPORTS = comctl32 > EXTRALIBS = $(LIBUNICODE) -luuid > > I don't think oleaut32 should be importing from wininet for just the implementation of OleLoadPicturePath. It surprises me that there is not already an implementation of IStream for URLs that can be re-used. If there is no alternative, I think we should just make wininet a delayed import. Rob

Feb. 28, 2005

Re: [SOLVED] Re: Picasa2- works great, one font issue

by Troy Rollo

On Mon, 28 Feb 2005 11:27, Matthew Mastracci wrote: > Okay - I checked out the latest Wine from CVS and it seems to be fixed. > I think this patch was the one that fixed it: > > revision 1.82 > date: 2005/02/25 13:59:22; author: julliard; state: Exp; lines: +9 -9 > TANABE Hiroshi <hirokun_dayomon(a)infoseek.to> wrote: > Remove (buf && !buflen) checking. > Fixed outline rendering with GGO_GRAY?_BITMAP option. > Improved fixed-pitch fonts detection. Yes, that would be what fixed it. Many DirectX games also had font problems fixed by that patch. In fact any application where the fonts looked like random noise is likely to have been fixed to that extent by that patch.

Feb. 28, 2005

Re: [programs/regedit] Use Favorit* instead of Favourit*

by Robert Shearman

Paul Vriens wrote: >Hi, > >Our regedit displays Favourites in the menu. This patch changes that to >use Favorites. The patch also changes the variables with FAVOURITE in >the name. The reasoning is: > >a. Windows uses Favorite(s) all over the place. >b. We do too. > >That's the only reasoning and not if either one is better (UK/US etc..) > >No functional changes btw. > >Changelog > Change Favourite(s) into Favorite(s) > > Fair enough for strings in the English, US resources, as long as the strings in the English, Neutral resources are still spelt correctly. > Change variables containing FAVOURITE into FAVORITE > > Why do this? Rob

Feb. 28, 2005