wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Re: WoW, er Wine on Windows--Re: Still more fun?
by Steven Edwards 24 Apr '05

24 Apr '05

--- Augustus Saunders <augustus.saunders(a)verilogix.net> wrote: > I appreciate any feedback anybody has. Thanks- It wont work for DirectX. Wine directX structures and implementation is incompatible with Windows currently. Normal Win32 dlls work fine. Thanks Steven __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: [AppDB] Version 1.00 of Warcraft III added by Christopher Morgan
by Jesse Allen 23 Apr '05

23 Apr '05

On 4/23/05, AppDB <appdb(a)winehq.org> wrote: > > Version 1.00 of Warcraft III added by Christopher Morgan > ------------------------------------------------------- > http://appdb.winehq.org/appview.php?versionId=3051 > This version has been submitted by Ben Klein. > > Best regards. > The AppDB team > http://www.winehq.org/ > > If you don't want to receive any other e-mail, please change your preferences: > http://appdb.winehq.org/preferences.php > > Hmmm. Should we be avoiding duplicate information? I already maintain a howto listed under "1.00+". In it I already cover, one running the game, including NoCD patches (though I encourage running official exe's and show how it's done) and second the issues with game movies. What this new note does not cover is running under opengl, working multiplayer and battle.net modes, winver settings to use, differentiation of wine versions, and miscellenous bugs. This new note may be a little misleading because Warcraft 3 uses D3D8 so Oliver's patch is not required, but it may be an improvement, I don't know. I typically run the game in opengl. There are other instances of duplicate information in the Appdb, perhaps we need to clean this up. But it is enormous work. I have a hard time just keeping my howto up to date. Jesse

2 1

Re: Installing Mozilla
by Juan Lang 23 Apr '05

23 Apr '05

--- James Hawkins <truiken(a)gmail.com> wrote: > Just because Mozilla is passing a bad memory address doesn't mean > it's a bug in Mozilla. For example Mozilla could have requested > some information from wine and we gave them the bad memory address. While that's certainly possible in general, that doesn't appear to be the case here. The bad pointer is the destination address of WideCharToMultiByte, not the source. Typically this will some buffer or other internal to Mozilla. I'm not claiming there isn't a bug in Wine. But I think the immediate thing we're seeing is a bug in Mozilla (likely triggered by a bug in Wine.) The nls trace might be interesting, because the source pointer appears to be valid. So, what string are they trying to translate? An error message perhaps? That might point to the cause of the problem. --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

4 6

Re: Installing Mozilla
by Juan Lang 23 Apr '05

23 Apr '05

--- Dustin Navea <speeddymon(a)gmail.com> wrote: > Perhaps they are thinking along the lines of the whole string being for > example "GMT -06:00 Central Time" ? In which case they wouldnt want to > convert just the GMT as it would product the wrong result. Apples and oranges. By "converting," I mean "WideCharToMultiByte," that is, character conversion from Unicode to ANSI. Converting more of the string doesn't help. The correct value in this case would be "CDT", and they wouldn't produce that. See their code. I agree with you a bug (and patch) ought to be filed against Mozilla. I may someday, but in the meanwhile, feel free. --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Re: Installing Mozilla
by Juan Lang 23 Apr '05

23 Apr '05

--- Alexandre Julliard <julliard(a)winehq.org> wrote: > Actually, judging from the pointer values I get on my XP box the > buffers seem to be 64 chars long. Okay, changing patch to match. > Still, I'm not sure why Mozilla feels the need to overwrite them, that > doesn't seem right. No, it doesn't, although their comments explain the motivation: on some versions of Windows NT, the value is incorrectly set for some time zones. Nonetheless the code is doing the wrong thing: it's converting an entire string, e.g. "GMT Standard Time", rather than the time zone portion alone ("GMT"). --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

2 1

Re: ole32: fix for big-endian machines
by Alexandre Julliard 23 Apr '05

23 Apr '05

Juan Lang <juan_lang(a)yahoo.com> writes: > > void StorageUtl_ReadWord(const BYTE* buffer, ULONG offset, WORD* value) > { > - memcpy(value, buffer+offset, sizeof(WORD)); > + *value = le16toh(*(WORD *)(buffer+offset)); > } Why are you removing the memcpy? Are the offsets guaranteed to always be properly aligned? > +#ifdef WORDS_BIGENDIAN > + > +/* FIXME: more-optimal versions may be in <byteswap.h>, <sys/bswap.h>, or > + * <sys/endian.h>. Use config checks to find 'em. No, you don't want config checks, what you want to use here is RtlUshortByteSwap/RtlUlongByteSwap. -- Alexandre Julliard julliard(a)winehq.org

1 0

windows file dialogs with unix file path
by Michael Lin 23 Apr '05

23 Apr '05

Hi all, Back in Nov 2004, there was a brief discussion about extending the Windows file dialogs to allow browsing the Unix file system. Does anyone know if this have been implemented yet? If not, any suggestions on how to implement it? I am porting a windows application to linux using winelib, and using unix file path rather than window file path would be desired. Thanks, Michael

10 16

Re: windows file dialogs with unix file path
by Steven Edwards 23 Apr '05

23 Apr '05

Hi, --- Francois Gouget <fgouget(a)free.fr> wrote: > Hmm, I feel like I've seen that before. Where??? Windows is supposed to be able to be able to handle anything for a drive letter now. I have seen the Euro symbol used for a drive letter. It would be more inituitive to the user to have unix:/ rather than Z: but I don't think GetLogicalDriveStrings() can handle this http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/fs/… so you would need to use RtlDosFilenameToNtFilename or whatever it was called and do some magic with the object manager such as pointing to \\.\unix\ and maybe add "unix:" to the list of built-in device names (like LPTx, AUX, NUL, etc.). Then you might be able to hack a dialog to point to the device name. Thanks Steven __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Installing Mozilla
by Alex Woods 22 Apr '05

22 Apr '05

Hello, I'm encountering a crash when trying to install Mozilla 1.7.7 under wine. I am using a fresh CVS checkout, but I've tried older revisions with the same result. Here is a backtrace. It's falling over trying to write to 0x99806858. Backtrace: =>1 0x557581df wine_cp_wcstombs(table=0x5584855c, flags=0x0, src=0x55c08a38, srclen=0x12, dst=0x99806858, dstlen=0x20, defchar=0x0, used=0x0) [/var/tmp/portage/wine-cvs-1.1/work/wine/libs/unicode/wctomb.c:161] in libwine_unicode.so.1 (0x55c08934) 2 0x55a3a4f1 WideCharToMultiByte+0xe1(page=0x0, flags=0x0, src=0x55c08a38, srclen=0xffffffff, dst=0x99806858, dstlen=0x20, defchar=0x0, used=0x0) [/var/tmp/portage/wine-cvs-1.1/work/wine/dlls/kernel/locale.c:1651] in kernel32 (0x55c08970) 3 0x60f61cfd PR_AttachThread+0x56a in nspr4 (0x55c08ae0) 4 0x60f62956 in nspr4 (+0x12956) (0x55c08b08) 5 0x61d42e13 NS_GetMemoryManager+0x1b in xpcom (0x55c08b30) 6 0x61d7680a public: virtual int __thiscall nsCaseInsensitiveCStringComparator::operator()(char,char)const +0x716 in xpcom (0x55c08b5c) 7 0x61d548ff in xpcom (+0x148ff) (0x55c08b88) 8 0x61d566ed NS_NewNativeLocalFile+0x53 in xpcom (0x55c08ce4) 9 0x00416296 in setup (+0x16296) (0x55c0cd44) 10 0x00405958 in setup (+0x5958) (0x55c0ee5c) 11 0x00415e2f in setup (+0x15e2f) (0x55c0fe94) 12 0x00424375 EntryPoint+0xce in setup (0x55c0ff20) 13 0x55a4e645 start_process+0xf5(arg=0x0) [/var/tmp/portage/wine-cvs-1.1/work/wine/dlls/kernel/process.c:1044] in kernel32 (0x55c0fff4) 14 0x55585c71 wine_switch_to_stack+0x11 in libwine.so.1 (0x00000000) I've created a +relay trace, which shows the following stuff happening just before things go pear shaped: 0011:Ret ntdll.RtlAllocateHeap() retval=559752b0 ret=572beb67 0011:Ret msvcrt.calloc() retval=559752b0 ret=60f53690 0011:Call msvcrt._strdup(60f68130 "shma") ret=60f536a2 0011:Call ntdll.RtlAllocateHeap(558c0000,00000000,00000005) ret=572bebe7 0011:Ret ntdll.RtlAllocateHeap() retval=559752d0 ret=572bebe7 0011:Ret msvcrt._strdup() retval=559752d0 ret=60f536a2 0011:Call msvcrt.getenv(60f664f4 "NSPR_LOG_MODULES") ret=60f58ed1 0011:Ret msvcrt.getenv() retval=00000000 ret=60f58ed1 0011:Call kernel32.GetVersionExA(55c089a0) ret=60f61cbc 0011:Call ntdll.RtlGetVersion(55c0877c) ret=55a71f38 0011:Ret ntdll.RtlGetVersion() retval=00000000 ret=55a71f38 0011:Ret kernel32.GetVersionExA() retval=00000001 ret=60f61cbc 0011:Call kernel32.GetTimeZoneInformation(55c08a34) ret=60f61cd6 0011:Call ntdll.RtlQueryTimeZoneInformation(55c08a34) ret=55a6fae5 0011:Ret ntdll.RtlQueryTimeZoneInformation() retval=00000000 ret=55a6fae5 0011:Call ntdll.NtQuerySystemTime(55c08874) ret=55a6ebc5 0011:Ret ntdll.NtQuerySystemTime() retval=00000000 ret=55a6ebc5 0011:Ret kernel32.GetTimeZoneInformation() retval=00000000 ret=60f61cd6 0011:Call kernel32.WideCharToMultiByte(00000000,00000000,55c08a38 L"GMT Standard Time",ffffffff,99806858,00000020,00000000,00000000) ret=60f61cfd So, it's probably worth saying that I'm on UK time. Possibly also worth noting that I am using an x86_64, with wine -m32 compiled. Any ideas? Cheers. -- Alex

1 1

version change broke InstMsiA.exe
by James Hawkins 22 Apr '05

22 Apr '05

Hi, The following patch broke InstMsiA.exe: Modified files: dlls/ntdll : version.c Log message: Ivan Leo Puoti <puoti(a)inwind.it> Better EXE version check in VERSION_GetLinkedDllVersion. Patch: http://cvs.winehq.org/patch.py?id=14894 Here is +ver: trace:ver:VERSION_Init getting version from L"AppDefaults\\InstMsiA.exe\\Version" trace:ver:VERSION_Init getting default version trace:ver:VERSION_GetLinkedDllVersion L"InstMsiA.exe": 07.00/05.01/05.01/04.00 trace:ver:VERSION_GetLinkedDllVersion 07.00/05.01/05.01/04.00 trace:ver:RtlGetVersion <-- Windows XP (L"Service Pack 2") .... trace:ver:RtlGetVersion <-- Windows XP (L"Service Pack 2") trace:ver:VERSION_Init getting version from L"AppDefaults\\msiinst.exe\\Version" trace:ver:VERSION_Init getting default version trace:ver:VERSION_GetLinkedDllVersion L"msiinst.exe": 07.00/05.01/05.01/04.00 trace:ver:VERSION_GetLinkedDllVersion 07.00/05.01/05.01/04.00 trace:ver:RtlGetVersion <-- Windows XP (L"Service Pack 2") ... Before the change GetLinkedDllVersion recognized InstMsiA.exe as win98, but now it's XP SP2. I'm not sure how to change this test to make it work because both InstMsiA.exe (win9x version) and InstMsiW.exe (nt/xp version) return 07.00/05.01/05.01/04.00 for GetLinkedDllVersion. One solution is to just use the config file and specify win98, but since we are moving away from the config file I think it would be worth figuring out why this isn't working yet. -- James Hawkins

1 0

wine and gcc 4.0
by Florian Goth 22 Apr '05

22 Apr '05

Hi! I've just installed gcc 4.0 and now wine(CVS) stops compiling in ./wine/dlls/msvcrt/tests : gcc -c -I. -I. -I../../../include -I../../../include -I../../../include/msvcrt -I./.. -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -O2 -o headers.o headers.c In file included from headers.c:33: ../../../include/msvcrt/wchar.h:201: warning: conflicting types for built-in function 'iswalnum' ../../../include/msvcrt/wchar.h:202: warning: conflicting types for built-in function 'iswalpha' ../../../include/msvcrt/wchar.h:204: warning: conflicting types for built-in function 'iswcntrl' ../../../include/msvcrt/wchar.h:206: warning: conflicting types for built-in function 'iswdigit' ../../../include/msvcrt/wchar.h:207: warning: conflicting types for built-in function 'iswgraph' ../../../include/msvcrt/wchar.h:208: warning: conflicting types for built-in function 'iswlower' ../../../include/msvcrt/wchar.h:209: warning: conflicting types for built-in function 'iswprint' ../../../include/msvcrt/wchar.h:210: warning: conflicting types for built-in function 'iswpunct' ../../../include/msvcrt/wchar.h:211: warning: conflicting types for built-in function 'iswspace' ../../../include/msvcrt/wchar.h:212: warning: conflicting types for built-in function 'iswupper' ../../../include/msvcrt/wchar.h:213: warning: conflicting types for built-in function 'iswxdigit' ../../../include/msvcrt/wchar.h:214: warning: conflicting types for built-in function 'towlower' ../../../include/msvcrt/wchar.h:215: warning: conflicting types for built-in function 'towupper' ../../../include/msvcrt/io.h:179: error: 'open' aliased to undefined symbol '_open' ../../../include/msvcrt/io.h:180: error: 'sopen' aliased to undefined symbol '_sopen' ../../../include/msvcrt/conio.h:57: error: 'cprintf' aliased to undefined symbol '_cprintf' ../../../include/msvcrt/conio.h:58: error: 'cscanf' aliased to undefined symbol '_cscanf' ../../../include/msvcrt/process.h:129: error: 'execl' aliased to undefined symbol '_execl' ../../../include/msvcrt/process.h:130: error: 'execle' aliased to undefined symbol '_execle' ../../../include/msvcrt/process.h:131: error: 'execlp' aliased to undefined symbol '_execlp' ../../../include/msvcrt/process.h:132: error: 'execlpe' aliased to undefined symbol '_execlpe' ../../../include/msvcrt/process.h:133: error: 'spawnl' aliased to undefined symbol '_spawnl' ../../../include/msvcrt/process.h:134: error: 'spawnle' aliased to undefined symbol '_spawnle' ../../../include/msvcrt/process.h:135: error: 'spawnlp' aliased to undefined symbol '_spawnlp' ../../../include/msvcrt/process.h:136: error: 'spawnlpe' aliased to undefined symbol '_spawnlpe' make: *** [headers.o] Error 1 make died with exit status 2

2 1

/tmp using
by Vitaly Lipatov 22 Apr '05

22 Apr '05

I suppose to make patch for using TMPDIR environment variable as temp directory if it is not empty. There is hardcoded path to /tmp for wine server directory, and I would like to use ~/tmp dir... Will it change accepted and or it is not wrong intention? -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

2 1

Last call for PGP key signing party
by Shachar Shemesh 22 Apr '05

22 Apr '05

Hi all, This is your last chance to get your very own PGP key signed by your community. So far, we have 6.5 participants (hoping to get it to 7 by tomorrow). This means 7 brand new signatures on your PGP key. Read the previous announcement (http://www.winehq.org/hypermail/wine-devel/2005/04/0057.html and http://www.winehq.org/hypermail/wine-devel/2005/04/0084.html) for details on what you need to do. New submissions should be possible to get right up to the party itself, assuming I can get our hosts to lend me the use of a printer (Will you?). Thanks, Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. Have you backed up today's work? http://www.lingnu.com/backup.html

2 1

shell32/shflder_unixfs: Use shell kind ITEMIDLISTs
by Michael Jung 22 Apr '05

22 Apr '05

This silences some ERROR messages when browsing in the namespace extension and allows to apply shell32's helper functions. Changelog: Use the shell32 typical binary format for ITEMIDLISTs. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

Win16 programs and Wine internal messages
by Richard Cohen 22 Apr '05

22 Apr '05

Closing Win16 programs using the Window manager doesn't work any more, because 16 bit programs don't recognize the WINE internal messages, so they don't get processed. This patch moves the internal messages to just below 0xffff, but perhaps there is a better way? Richard.

2 2

Re: USB status ...Who maintains wineserver?
by Damjan Jovanovic 22 Apr '05

22 Apr '05

--- Hiji <hijinio(a)yahoo.com> wrote: > > > --- Lars Segerlund <lars.segerlund(a)comsys.se> > > wrote: > > > > > > > > What is the status of wines USB support ? > > > > Is there anything done yet or am I on my own > ? > > > > Can someone also giva a hint on the > > feasibiliyt, > > > > complexity of managing a USB > > > > implementation for wine ? I am rather good at > > > linux > > > > device drivers and such. > > > > / regards, Lars Segerlund. > > > > There's not much I can say in the way of > > > development, > > > but as a user, getting USB support (beyond > what's > > > supported in the kernel) would be a HUGE leap of > > > improvement for Wine. I think others have said > > > before > > > that there are a lot of apps out there that will > > run > > > on Wine, but are useless because they depend on > > > their > > > hardware counterpart. (In the music world, > > > Guitarport > > > comes to mind.) > > > > > > Hiji > > > I have proposed several possible solutions for > using > > USB under Linux. In fact, I have given 4 possible > > ways > > of doing it, one of which I have hacked up (and > > gotten > > to work, at least partially). > > > > If you're interested in the details, let me know, > > and > > I'll email you (or look at the "Wine device > drivers > > proposal" email in the Wine archives in the past > > month > > or so). > > Phew, I thought I'd type a short reply! Interested > > in > > working on this? I can't do it all alone. > > Damjan > > There's not much I can do other then try to > encourage > you and Lars to work together (as I'm not a C > developer). Damjan, it sounds like you have already > covered a lot of the groundwork through your > research > and understanding of the USB infrastructure (from > both > the Windows, Linux and Wine worlds). Lars, I see > you > have both the motivation and experience with Linux > device drivers to work on Wine USB. > > To me, it sounds like a perfect match for you two to > pair up and work on implementing additional USB > functionality. > > I suppose the last piece missing is to consult the > expert on the wineserver (as far as USB is > concerned) > to see if any changes would truely need to be made > there. Who would that be? I think it might be Alexander, and I think the general suggestion was "avoid changes to the wineserver". Anyone else know? > Hiji > > __________________________________________________ > Do You Yahoo!? > Tired of spam? Yahoo! Mail has the best spam > protection around > http://mail.yahoo.com > > __________________________________ Do you Yahoo!? Plan great trips with Yahoo! Travel: Now over 17,000 guides! http://travel.yahoo.com/p-travelguide

2 1

Re: WineHQ: Janitorial update
by Michael Jung 22 Apr '05

22 Apr '05

Hi Dimitrie, On Friday 22 April 2005 05:47, Dimitrie O. Paun wrote: > ChangeLog > ... > Some W->A warnings are invalid. While you're at it, I think the CryptAcquireContextW W->A call in advapi32/crypt.c should also be considered an invalid warning. CryptAcquireContext calls the CSP dll's CPAcquireContext function, which is only present as an ASCII version. Thus, if we would get rid of this W->A call, we would get an A->W->A conversion chain in case of CryptAcquireContextA. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

Re: Program cannot be run in DOS mode
by Dustin Navea 21 Apr '05

21 Apr '05

I dont think (although I could be wrong) that programs compiled in vs6 would have dependencies on .net, even if they were compiled on xp.. You said that you are able to get other programs to run, such as winzip and solitaire? If that is the case, then what I said above more than likely _is_ wrong :-/ in which case not much can be done. You could always try your hand at implementing the missing .net functions, but this may be a bigger task than it is worth. The other option if you must get it going on linux is to port it to linux using winelib, although if it is dependent on .net that may not be possible either.. Anyone else have any comments on this? Dustin Brendan Clark Ribera wrote: > Yeah, I know enough of Linux to do that. It just strikes me as weird > that all of the executables I've downloaded (WinZip, etc) have produced > no errors. Someone suggested this might be due to .NET dependencies in > the Windows XP binaries, but I might as well try a newer version of Wine. > > Brendan > > On Tue, 19 Apr 2005, Dustin Navea wrote: > >> Hi, that does seem a little strange. It could be that there is >> something wrong with the package. How familiar are you with Linux? >> Familiar enough to know what CVS is and how to use it to get the >> bleeding edge version of wine, and enough to know how to compile it >> from scratch, if I pointed you to the guide that tells you how? >> >> Dustin >> >> Brendan Clark Ribera wrote: >> >>> >>> The version I'm running is from an RPM on winehq.com (I'm running >>> Fedora Core 2). Also, I considered the .NET problem, so I compiled a >>> little "Hello World" program in Visual Studio 6, which also produced >>> this error. I don't know if perhaps VS 6 has been made to >>> encorporate .NET libraries, but I was really surprised to see that >>> program not work. >>> >>> Someone else suggested trying an NT-based winver, which I found not >>> to help. >>> >>> Brendan [-info not relevant to the nature of this specific email snipped-]

1 0

Re: D3D9 Work?
by Ann and Jason Edmeades 21 Apr '05

21 Apr '05

Hi, FYI I stopped d3d9/wined3d work when I got to a point I had completed the parts I was doing, and Oliver had sped ahead so I was ending up duplicating work he was doing - I've put it to one side while waiting on the cvs tree to get up to where he was. The last I heard, Raphael was also willing to look into the shader side of things, and had an outstanding patch for hardware vertex buffer objects to help performance, but I think again this was waiting on Oliver's commits. However, if there seems to be problems, I don't mind continuing, or helping people work through his patch into manageable chunks for submission - I can easily give guidance in this area. I have only limited time, and work a patch at a time, until it gets in cvs, because as is the case with his current patch, basically it needs reworking into submittable chunks! However, I think we should give Oliver a little more time (I wont be touching it until after wineconf anyway). Not knowing anthing about d3d8/9 shouldn't hold you back - I knew nothing when I started on the d3d8 stuff, and it doesn't take that long to pick up the threads. FWIW I tried applying the patch sent on here the other day and it failed to compile (WINED3DFORMAT vs D3DFORMAT), but after fixing that, I tried running a simple textured demo and it failed (Tutorial 5 from http://www.two-kings.de/tutorials/d3d.html) - Any chance you could see if it works for you and if it does send me (offline) a patch for current cvs? Regards, Jason

1 0

Re: wine/server registry.c
by James Hawkins 21 Apr '05

21 Apr '05

On 4/20/05, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Modified files: > server : registry.c > > Log message: > Load system.reg and userdef.reg at server init time. > Hi Alexandre, A while back I sent in a patch that restricted RegCreateKey (and it's internal implementation) from creating keys in HKLM and HKU as stated by msdn and the tests, and you replied: > I don't think there's any point in replicating that behavior. I doubt > there's any such check on Windows either, it's most likely just a side > effect of the way the registry files are "mounted" at different places > in the tree. Once we have a proper implementation of > RegLoadKey/RegUnloadKey we should get the same behavior automatically. We now have an implementation of RegLoadKey and I was wondering if it's time to switch from CreateKey to LoadKey in the registry initialization. If not, what remains to be done? Aside from the reg init topic, is there any other change needed to the registry subsection? I guess what I'm asking for is a registry TODO if you have one in mind. Thanks, James Hawkins

2 3

D3D9 Work?
by Benjamin Cutler 21 Apr '05

21 Apr '05

I was discussing this with some others who hang out in the #winehackers channel, and I'm curious who else might be working on the D3D9 portion of Wine. I was unsure of how ready for inclusion into the main branch the unofficial patches are, but I've heard from a couple sources that most of the patch isn't. I'd like to get some opinions on what's ready and what's not. I'd hate to start submitting pieces of the patch, only to find out that person X was already working on that part and had something better in mind, or even worse to find out that somebody's been maintaining contact with Oliver and I'm just getting overeager to see the patches in Wine. Somebody also mentioned that there are others waiting for Oliver's patches to be submitted so that they can continue their D3D9 work, so I was curious if there were any of you out there that fall into that category. At present, the best I can really do to contribute is help keep the branch synced up with the current CVS (migrating the 20050310 patch to 20050419 resulted in a lot of conflicts that took me most of the night to work through), but given some time I could probably learn enough about DX9 to get a better handle on how things are supposed to work and start making more solid contributions. That will probably have to wait until late May, however, once this college year ends.

2 1

Lotus Notes 6.51 and Wine 20050419
by Kevin DeKorte 21 Apr '05

21 Apr '05

I just installed Wine 20050419 and Lotus Notes 6.5.1 is still hanging and using all the CPU when I click on the bookmark on the left hand side and there are no error messages on the console. Rolling back to 20041201 corrects this behavior. Kevin

1 0

emule and riched20
by Michael Jung 21 Apr '05

21 Apr '05

Hi Krzysztof, thanks to your work on riched20.dll, eMule (http://www.emule-project.net) runs on wine out of the box (Some display glitches in riched, but fully usable otherwise). However, your last patch added an assert statement, which is violated by emule. I did not try to find the real problem, but removing the assert lets emule work again. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

wine on remote X11 displays
by Michael Riedel 21 Apr '05

21 Apr '05

Hi, I compiled wine20050419 under slackware 10.1 via tools/wineinstall. After starting a xterm window on a remote X11 terminal (via properly initialized DISPLAY environment variable) I tried to start several wine progs (wcmd, winefile ...) and Windows applications (wine c:\\...) but each time I get X Error of failed request: BadShmSeg (invalid shared segment parameter) Major opcode of failed request: 144 (MIT-SHM) Minor opcode of failed request: 2 (X_ShmDetach) Segment id in failed request: 0x2400017 Serial number of failed request: 2058 Current serial number in output stream: 2090 If I correctly understand this error message the issue is related to the MIT shared memory extension which indeed is only supported by a local running X server (am I correct?). I tried to use available resources (google ..) but found nothing. What I have to do? Thanks for your time and support. Michael --

6 5

Re: Resend: RICHED20: fall back to simple test
by Mike McCormack 20 Apr '05

20 Apr '05

Hi Phil, This patch broke Internet Explorer 6 installation. The installer gets into an infinite loop reading the License text for the first dialog. Mike Phil Krylov wrote: > Hi, > > this version of patch is made against current CVS. > > ChangeLog: > > Make RTF reader fall back to simple text if a correct RTF header is not > detected. This should fix some installers. > > Patch: > > Index: dlls/riched20/editor.c > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/editor.c,v > retrieving revision 1.22 > diff -p -u -r1.22 editor.c > --- dlls/riched20/editor.c 11 Apr 2005 14:22:21 -0000 1.22 > +++ dlls/riched20/editor.c 13 Apr 2005 07:13:21 -0000 > @@ -233,36 +233,40 @@ ME_TextBuffer *ME_MakeText() { > return buf; > } > > -#define STREAMIN_BUFFER_SIZE 4096 /* M$ compatibility */ > > -static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream, ME_Style *style) > +static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) > { > - BYTE buffer[STREAMIN_BUFFER_SIZE+1]; > WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; > + WCHAR *pText; > > TRACE("%08lx %p\n", dwFormat, stream); > - stream->dwError = 0; > > do { > - long nDataSize = 0, nWideChars = 0; > - stream->dwError = stream->pfnCallback(stream->dwCookie, > - (dwFormat & SF_UNICODE ? (BYTE *)wszText : buffer), > - STREAMIN_BUFFER_SIZE, &nDataSize); > - > - if (stream->dwError) > - break; > - if (!nDataSize) > - break; > + long nWideChars = 0; > + > + if (!stream->dwSize) > + { > + ME_StreamInFill(stream); > + if (stream->editstream->dwError) > + break; > + if (!stream->dwSize) > + break; > + } > > if (!(dwFormat & SF_UNICODE)) > { > /* FIXME? this is doomed to fail on true MBCS like UTF-8, luckily they're unlikely to be used as CP_ACP */ > - nWideChars = MultiByteToWideChar(CP_ACP, 0, buffer, nDataSize, wszText, STREAMIN_BUFFER_SIZE); > + nWideChars = MultiByteToWideChar(CP_ACP, 0, stream->buffer, stream->dwSize, wszText, STREAMIN_BUFFER_SIZE); > + pText = wszText; > } > else > - nWideChars = nDataSize>>1; > - ME_InsertTextFromCursor(editor, 0, wszText, nWideChars, style); > - if (nDataSize<STREAMIN_BUFFER_SIZE) > + { > + nWideChars = stream->dwSize >> 1; > + pText = (WCHAR *)stream->buffer; > + } > + > + ME_InsertTextFromCursor(editor, 0, pText, nWideChars, style); > + if (stream->dwSize < STREAMIN_BUFFER_SIZE) > break; > } while(1); > ME_CommitUndo(editor); > @@ -428,6 +432,16 @@ void ME_RTFReadHook(RTF_Info *info) { > } > } > > +void > +ME_StreamInFill(ME_InStream *stream) > +{ > + stream->editstream->dwError = stream->editstream->pfnCallback(stream->editstream->dwCookie, > + stream->buffer, > + sizeof(stream->buffer), > + &stream->dwSize); > + stream->dwUsed = 0; > +} > + > static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stream) > { > RTF_Info parser; > @@ -435,6 +449,7 @@ static LRESULT ME_StreamIn(ME_TextEditor > int from, to, to2, nUndoMode; > ME_UndoItem *pUI; > int nEventMask = editor->nEventMask; > + ME_InStream inStream; > > TRACE("%p %p\n", stream, editor->hWnd); > editor->nEventMask = 0; > @@ -457,37 +472,60 @@ static LRESULT ME_StreamIn(ME_TextEditor > > nUndoMode = editor->nUndoMode; > editor->nUndoMode = umIgnore; > - if (format & SF_RTF) { > - /* setup the RTF parser */ > - memset(&parser, 0, sizeof parser); > - RTFSetEditStream(&parser, stream); > - parser.rtfFormat = format&(SF_TEXT|SF_RTF); > - parser.hwndEdit = editor->hWnd; > - parser.editor = editor; > - parser.style = style; > - WriterInit(&parser); > - RTFInit(&parser); > - RTFSetReadHook(&parser, ME_RTFReadHook); > - BeginFile(&parser); > - > - /* do the parsing */ > - RTFRead(&parser); > - RTFFlushOutputBuffer(&parser); > - RTFDestroy(&parser); > - > - style = parser.style; > - } > - else if (format & SF_TEXT) > - ME_StreamInText(editor, format, stream, style); > - else > - ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); > - ME_GetSelection(editor, &to, &to2); > - /* put the cursor at the top */ > - if (!(format & SFF_SELECTION)) > - SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); > - else > + > + inStream.editstream = stream; > + inStream.editstream->dwError = 0; > + inStream.dwSize = 0; > + inStream.dwUsed = 0; > + > + if (format & SF_RTF) > { > - /* FIXME where to put cursor now ? */ > + /* Check if it's really RTF, and if it is not, use plain text */ > + ME_StreamInFill(&inStream); > + if (!inStream.editstream->dwError) > + { > + if (strncmp(inStream.buffer, "{\\rtf1", 6) && strncmp(inStream.buffer, "{\\urtf", 6)) > + { > + format &= ~SF_RTF; > + format |= SF_TEXT; > + } > + } > + } > + > + if (!inStream.editstream->dwError) > + { > + if (format & SF_RTF) { > + /* setup the RTF parser */ > + memset(&parser, 0, sizeof parser); > + RTFSetEditStream(&parser, &inStream); > + parser.rtfFormat = format&(SF_TEXT|SF_RTF); > + parser.hwndEdit = editor->hWnd; > + parser.editor = editor; > + parser.style = style; > + WriterInit(&parser); > + RTFInit(&parser); > + RTFSetReadHook(&parser, ME_RTFReadHook); > + BeginFile(&parser); > + > + /* do the parsing */ > + RTFRead(&parser); > + RTFFlushOutputBuffer(&parser); > + RTFDestroy(&parser); > + > + style = parser.style; > + } > + else if (format & SF_TEXT) > + ME_StreamInText(editor, format, &inStream, style); > + else > + ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); > + ME_GetSelection(editor, &to, &to2); > + /* put the cursor at the top */ > + if (!(format & SFF_SELECTION)) > + SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); > + else > + { > + /* FIXME where to put cursor now ? */ > + } > } > > editor->nUndoMode = nUndoMode; > Index: dlls/riched20/editor.h > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/editor.h,v > retrieving revision 1.12 > diff -p -u -r1.12 editor.h > --- dlls/riched20/editor.h 24 Mar 2005 21:01:37 -0000 1.12 > +++ dlls/riched20/editor.h 13 Apr 2005 07:13:21 -0000 > @@ -213,6 +213,7 @@ void ME_Redo(ME_TextEditor *editor); > void ME_EmptyUndoStack(ME_TextEditor *editor); > int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, BOOL bCRLF); > ME_DisplayItem *ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset); > +void ME_StreamInFill(ME_InStream *stream); > > extern int me_debug; > extern HANDLE me_heap; > Index: dlls/riched20/editstr.h > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/editstr.h,v > retrieving revision 1.8 > diff -p -u -r1.8 editstr.h > --- dlls/riched20/editstr.h 22 Mar 2005 16:41:36 -0000 1.8 > +++ dlls/riched20/editstr.h 13 Apr 2005 07:13:21 -0000 > @@ -197,6 +197,18 @@ typedef struct tagME_FontTableItem { > WCHAR *szFaceName; > } ME_FontTableItem; > > + > +#define STREAMIN_BUFFER_SIZE 4096 /* M$ compatibility */ > + > +struct tagME_InStream { > + EDITSTREAM *editstream; > + DWORD dwSize; > + DWORD dwUsed; > + BYTE buffer[STREAMIN_BUFFER_SIZE]; > +}; > +typedef struct tagME_InStream ME_InStream; > + > + > #define STREAMOUT_BUFFER_SIZE 4096 > #define STREAMOUT_FONTTBL_SIZE 8192 > #define STREAMOUT_COLORTBL_SIZE 1024 > Index: dlls/riched20/reader.c > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/reader.c,v > retrieving revision 1.11 > diff -p -u -r1.11 reader.c > --- dlls/riched20/reader.c 22 Mar 2005 16:41:36 -0000 1.11 > +++ dlls/riched20/reader.c 13 Apr 2005 07:13:21 -0000 > @@ -123,41 +123,35 @@ static inline void RTFFree(void *p) > int _RTFGetChar(RTF_Info *info) > { > int ch; > + ME_InStream *stream = info->stream; > > TRACE("\n"); > > /* if the last buffer wasn't full, it's EOF */ > - if (info->dwInputSize > 0 && > - info->dwInputSize == info->dwInputUsed && > - info->dwInputSize < sizeof(info->InputBuffer)) > + if (stream->dwSize > 0 && stream->dwSize == stream->dwUsed > + && stream->dwSize < sizeof(stream->buffer)) > return EOF; > - if (info->dwInputSize <= info->dwInputUsed) > + if (stream->dwSize <= stream->dwUsed) > { > - long count = 0; > - info->editstream.dwError = info->editstream.pfnCallback(info->editstream.dwCookie, > - info->InputBuffer, sizeof(info->InputBuffer), &count); > + ME_StreamInFill(stream); > /* if error, it's EOF */ > - if (info->editstream.dwError) > + if (stream->editstream->dwError) > return EOF; > /* if no bytes read, it's EOF */ > - if (count == 0) > + if (stream->dwSize == 0) > return EOF; > - info->dwInputSize = count; > - info->dwInputUsed = 0; > } > - ch = info->InputBuffer[info->dwInputUsed++]; > + ch = stream->buffer[stream->dwUsed++]; > if (!ch) > return EOF; > return ch; > } > > -void RTFSetEditStream(RTF_Info *info, EDITSTREAM *es) > +void RTFSetEditStream(RTF_Info *info, ME_InStream *stream) > { > TRACE("\n"); > > - info->editstream.dwCookie = es->dwCookie; > - info->editstream.dwError = es->dwError; > - info->editstream.pfnCallback = es->pfnCallback; > + info->stream = stream; > } > > static void > Index: dlls/riched20/rtf.h > =================================================================== > RCS file: /home/wine/wine/dlls/riched20/rtf.h,v > retrieving revision 1.9 > diff -p -u -r1.9 rtf.h > --- dlls/riched20/rtf.h 22 Mar 2005 16:41:36 -0000 1.9 > +++ dlls/riched20/rtf.h 13 Apr 2005 07:13:21 -0000 > @@ -1078,10 +1078,7 @@ struct _RTF_Info { > char *inputName; > char *outputName; > > - EDITSTREAM editstream; > - char InputBuffer[0x1000]; > - DWORD dwInputSize; > - DWORD dwInputUsed; > + ME_InStream *stream; > > /* edit window to output to */ > HWND hwndEdit; > @@ -1155,7 +1152,7 @@ void RTFMsg (RTF_Info *, const char *fmt > void RTFPanic (RTF_Info *, const char *fmt, ...); > > void RTFFlushOutputBuffer( RTF_Info *info ); > -void RTFSetEditStream(RTF_Info *, EDITSTREAM *es); > +void RTFSetEditStream(RTF_Info *info, ME_InStream *stream); > > void WriterInit (RTF_Info *); > int BeginFile (RTF_Info *); >

3 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel