wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

RE: Close X after one hour and half
by Robert Yaklin 02 Jun '02

02 Jun '02

The problem may be a memory leak in Wine. Try running top while your Wine application is running and keep an eye on the amount of memory Wine is using. If you are using the latest Wine from CVS you may notice that you application runs longer, thanks to a bug-fix by Andreas Mohr. Robert You Wrote: > Hello friends > > a run my applicationwith wine and xinit like: > > xinit wine myapp.exe -- :0 > > running very well, but after one hour and half this broken my X > session and back to text console... > > i not see a messagem that refer to this problem in the screen and > logs are equal > > I dont understand what happen with X to make... > > anybody help me..? > > > Marcelo

1 0

Keyboard layout detection not working??
by Shachar Shemesh 02 Jun '02

02 Jun '02

Hi all, I am using Debian SID with KDE. In KDE, I defined two keyboard layouts (US and IL). I tried to add Israeli keyboard detection using the attached patch (layout.diff). When trying to test that patch, however, I perform the following task: I type in the command as suggested in the docs (wine --debugmsg +key,+keyboard >& key.log). Attached are two run attempts. key.log is with the US keyboard selected, key2.log is with the Hebrew keyboard selected. Comparing the two outputs, several things become evident: 1. The Israeli keyboard is not detected. It fails to match even the non-Hebrew characters (such as the '/' instead of lower case 'q'). It's as if WINE did not notice that a non-English keymap was installed. On the other hand, there are some differences between the two runs. What's going on? 2. The dvorak keyboard has 0 mismatches???? I noticed that the code has some different virtual mapping of the keyboard. I am not aware that dvorak keyboards generate a different scan code mapping. Am I missing something here? 3. There does not appear to be any code that detects layout changes in X11, and sends the apropriate WM_INPUTLANGCHANGE message. I understood that implementing an event trigered by X layout change is a difficult matter, but it is highly necessary for my BiDi support (many programs, including Office, know the current direction, and have visual representation when it changes. Not implementing this message may prove to be problematic in that respect). I currently don't have the capacity to go after this particular problem, but if it remains unsolved by the time it becomes crucial to me, I will. If anyone has any leads on solving this problem, please let me know. I have entered bug #735 on this issue. Many thanks for your input, Shachar Index: dlls/x11drv/keyboard.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/keyboard.c,v retrieving revision 1.1 diff -u -r1.1 keyboard.c --- dlls/x11drv/keyboard.c 30 Apr 2002 21:16:39 -0000 1.1 +++ dlls/x11drv/keyboard.c 28 May 2002 13:20:04 -0000 @@ -531,6 +531,15 @@ "zZ","xX","cC","vV","bB","nN","mM","öÖ","çÇ",".:" }; +/*** Israeli keyboard layout */ +static const char main_key_IL[MAIN_LEN][4] = +{ + "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "/Q","'W","÷E","øR","àT","èY","åU","ïI","íO","ôP","[{","]}", + "ùA","ãS","âD","ëF","òG","éH","çJ","ìK","êL","ó:",",\"","\\|", + "æZ","ñX","áC","äV","ðB","îN","öM","ú<","õ>",".?" +}; + /*** VNC keyboard layout */ static const WORD main_key_scan_vnc[MAIN_LEN] = { @@ -600,6 +609,7 @@ {"Latin American keyboard layout", 28591, &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {"Lithuanian (Baltic) keyboard layout", 28603, &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {"Turkish keyboard layout", 28599, &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {"Israeli keyboard layout", 28598, &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {"VNC keyboard layout", 28591, &main_key_vnc, &main_key_scan_vnc, &main_key_vkey_vnc}, {NULL, 0, NULL, NULL, NULL} /* sentinel */

4 14

PATCH: DragQueryFileW (shellole.c; shell32)
by Sander van Leeuwen 02 Jun '02

02 Jun '02

Hi, There appears to be a little bug in DragQueryFileW. According to MSDN pFiles is the offset in bytes. Did somebody make a mistake or was the LPWSTR cast added on purpose? Sander Changelog: - Fixed wrong cast; MSDN says lpDropFileStruct->pFiles is offset in bytes (regardless of ascii/unicode) Author: Sander van Leeuwen (sandervl(a)xs4all.nl) --- shellole.co Sun Mar 17 11:20:10 2002 +++ shellole.c Sun Jun 2 13:15:54 2002 @@ -627,7 +627,7 @@ if(!lpDropFileStruct) goto end; - lpwDrop = (LPWSTR) lpDropFileStruct + lpDropFileStruct->pFiles; + lpwDrop = (LPWSTR) ((LPSTR)lpDropFileStruct + lpDropFileStruct->pFiles); i = 0; while (i++ < lFile)

1 0

Shlwapi and user32 question
by Steven Edwards 02 Jun '02

02 Jun '02

Hola, The only thing keeping me from building shlwapi is that its import the non-win32 call wvsnprintfA and wvsnprintfW from user32 to implement wvnsprintfA and wvnsprintfW. I did a search of the wine source tree and nothing else seems to depend on these functions being exported from user32. Can they be moved somewhere else or removed? Thanks Steven "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

2 1

Possible minor bug in bin2res
by Steven Edwards 02 Jun '02

02 Jun '02

Hola, I have been working on a small project that I am going to be submitting to the wine tree that used binary resources under windows and when I went to convert the files with bin2res I get this error "rename: File exists" It dumps the right wine resource information to the resouce-tmp file but when it goes to unlink the tmp file is when the error happens and the information must be manualy added to the rsrc.rc I traced it down, made sure that all other tmp file acces works in bin2res and and I think the problem is on line 245 if (rename(tmpfile, g_lpstrInputFile) == -1) { perror("rename"); unlink(tmpfile); return 0; } return 1; I have followed the directions on www.winehq.com for creation of a rsrc.rc to dump the resource information so I don't think I'm doing anything wrong. Can someone check this on windows to make sure I'm not just on the crack rock again? Thanks Steven "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

2 1

User (developer ?) friendly execution trace
by max 01 Jun '02

01 Jun '02

I find tracing a wine problem with wine --debugmsg for large programs unpractical. Usually you can know about exactly when a program hangs or behaves badly, but there's no way to activate/deactivate tracing after program start (afaik...) Being also a windoze (sigh) programmer, I find very useful some utilities like winspy that presents a window log in which you can start/stop tracing or logging of wine messages, system calls and so on, and activate/deactivate filters on the fly. This would allow spotting the bug when it arises instead of having tenths or hundreds of mbyte of logs. I could implement it as a filter taking input from wine, but I guess it'll slow downn much apps, having to parse wine output on the fly. Much better would be an internal implementation.... Some comments about ? Regards Max

3 2

DOS memory Question..... or How to increase base memory for DOS apps
by Christian Costa 01 Jun '02

01 Jun '02

Hi, Many DOS apps needs a lot of base memory even if EMS or XMS memory are used. The first 64K of memory being lock to catch null pointer, the DOS memory must start at 0x10000 as you can see in the code below (msdos/dosmem.c) : /*********************************************************************** * DOSMEM_InfoBlock * * Gets the DOS memory info block. */ static dosmem_info *DOSMEM_InfoBlock(void) { return (dosmem_info*)(DOSMEM_dosmem+0x10000); /* 64K */ } /*********************************************************************** * DOSMEM_InitMemory * * Initialises the DOS memory structures. */ static void DOSMEM_InitMemory(void) { /* Low 64Kb are reserved for DOS/BIOS so the useable area starts at * 1000:0000 and ends at 9FFF:FFEF. */ Changing this value to the end of the BIOS DATA area (0x500) does the job and things work as expected (at least for DOS apps). But I was told that this causes problems for others apps. Probably for Win16 ones that use DOS3CALL and not int21h via DPMI. If it's true, a solution could be to initialize DOS memory differently for pure DOS apps by modifying the DOSMEM_Init function. DOSMEM_Init is called at 3 different places : - process_attach in dlls/kernel/kernel_main.c - DOSVM_Init in dlls/winedos/dosvm.c - MZ_InitMemory in dlls/winedos.dosvm.c and acts differently the first and second calls. Since I don't know wine internals enough and the "flow of execution", I have no idea how to do it in a clean way that do not break everything. If someone can help me or give me hints? A+ Christian

3 3

How to fix SizeOfImage when loading a builtin dll ?
by Laurent Pinchart 01 Jun '02

01 Jun '02

Hi everybody, I noticed that, when a builtin dll (.so) is loaded, the SizeOfImage field in the OptionalHeader is not updated and stays equal to page_size (see winebuild, spec32). I need to get the correct value in SizeOfImage. I thought about updating that field in map_dll(a)library/loader.c, but don't know how to get the size of the image. Could anyone help me ? I'm not familiar with the PE loader. Thanks in advance, Laurent Pinchart

5 12

translating docs
by Damian Wojslaw 31 May '02

31 May '02

Hello I just posted similiar thing on wine-users, but Anriy Palamarchuk said, that he intend to say something about it here. I thought I might as well give him a good opportunity and ask: what about translating docs? Those at WineHQ and within Wine tree? What I would like to know is, which of them would you like to see translated first (as for now, I am, unfortunately, the only person I know of, that intends to do this)? What about user interface? How do you want to distribute it - want to have it at your site, or ony host a link? And so on, and so forth, and whatever... :)))) -- Damian Wojslaw

1 0

Re: wine can't find regedit.exe.so when it is not on the path
by Alexandre Julliard 31 May '02

31 May '02

Andriy Palamarchuk <apa3a(a)yahoo.com> writes: > I can't start just installed regedit manually, > wine gets confused by symbolic links in the windows > directory: > regedit.exe -> /usr/local/bin/regedit > regedit.exe.so -> /usr/local/bin/regedit.so These symlinks should be removed too, they are no longer necessary. -- Alexandre Julliard julliard(a)winehq.com

2 4

Re: [Bug 751] Changed - GetDiskFreeSpace should return >2GB on some systems
by Andreas Mohr 31 May '02

31 May '02

Hi all, could you have a look at bug #751 and check the values on your Windows version and add a comment to the bug on what your version does ? (please don't forget to only check for partitions > 2GB !!) Thanks ! On Thu, May 30, 2002 at 11:19:14PM -0500, wine-bugs(a)winehq.com wrote: > http://bugs.winehq.com/show_bug.cgi?id=751 > > *** shadow/751 Thu May 30 23:18:08 2002 > --- shadow/751.tmp.27844 Thu May 30 23:19:14 2002 > *************** > *** 25,27 **** > --- 25,31 ---- > the selected emulated version, or always return the actual free size. > > I'll attach a small program to obtain the return values from GetDiskFreeSpaceA. > + > + ------- Additional Comments From vberon(a)mecano.gme.usherb.ca 2002-05-30 23:19 ------- > + Created an attachment (id=150) > + Test program to obtain the return values of GetDiskFreeSpaceA -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://mohr.de.tt

2 1

Re: PATCH: libntddl.so not found
by Alexandre Julliard 31 May '02

31 May '02

Marcus Meissner <marcus(a)jet.franken.de> writes: > This adds a helpful messages for the users who do > ./configure > make > make install > and do not have /usr/local/lib in their ld.so.conf. I think this should be in the top-level Makefile to avoid having it scroll off the screen. Also it would be nice to check LD_LIBRARY_PATH to avoid needlessly scaring users who have a working config already. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: PATCH: libntddl.so not found
by Dustin Navea 31 May '02

31 May '02

Hmmm, I found some problems with this: +print NEWMAKE <<EOF; shouldn't that be printf ? + \@if test -f /etc/ld.so.conf -a -z "`grep \$(libdir) /etc/ld.so.conf`" ; \\ shouldn't that be \$(LIBDIR) + echo " Add the line '\$(libdir)' to /etc/ld.so.conf" ; \\ I think that escaping the $ in this line is unnecessary as it this prints "$(libdir)" instead of the contents of that variable, and also libdir should be capitalized there too... + echo " export LD_LIBRARY_PATH=\$(libdir):\$LD_LIBRARY_PATH" ; \\ Same as above except that it doesn't apply to \$LD_LIBRARY_PATH as we want "$LD_LIBRARY_PATH" to be printed... -Dustin __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

2 2

Re: Idea for people with priveleges
by Dustin Navea 31 May '02

31 May '02

--- Andriy Palamarchuk <apa3a(a)yahoo.com> wrote: > > --- Dustin Navea <speeddymon(a)yahoo.com> wrote: > > Well, AFAIK, there isn't reall a QA team, and if > > there > > is, they aren't checking out the bugs, because > > several > > bugs marked as resolved for over a year weren't > > closed > > until I went in and closed them.... > > Agree, we can simplify the things for now - skip > VERIFIED and RESOLVED steps in most cases - just > close > the bugs. > We can change the process later. > > Andriy > That is why I started this thread, we cant "just close the bugs" we have to resolve them first... We need 3 more options, probably would be easiest to implement in BugZilla 2.11: Close as Unresolved More information needed from User More testing Needed __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

1 0

Problem with 64-bit file functions declarations
by Andriy Palamarchuk 31 May '02

31 May '02

I'm researching an issue when started regedit.exe fails to export registry. This started to happen after Alexandre's patch which included "config.h" in the regedit source file. I found out this problem was triggered by declaration #define _FILE_OFFSET_BITS 64 in config.h. The test case: ******************************************** /* Set this to 64 to enable 64-bit file support on Linux */ #define _FILE_OFFSET_BITS 64 #include <stdio.h> #include <windows.h> void test_write(void) { FILE *f = fopen("1.reg", "w"); printf("sizeof FILE: %d\n", sizeof(FILE)); fputs("DEBUG1\n", f); fclose(f); } int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { test_write(); exit(0); } ******************************************** Comment out the macro definition and it works, with macro it creates file of 0 length. With the defined macro many file functions are defined as functions for 64-bit access and are linked to the native platform calls instead of msvcrt ones. Differences in precompilation output: Without macro: # 203 "/usr/include/stdio.h" 3 extern FILE *fopen (__const char *__restrict __filename, __const char *__restrict __modes) ; With macro: # 211 "/usr/include/stdio.h" 3 extern FILE *fopen (__const char *__restrict __filename, __const char *__restrict __modes) __asm__ ("" "fopen64"); The same happens for some other file functions. What is the correct fix for this problem? Andriy __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

3 4

fwait bug
by admiral coeyman 31 May '02

31 May '02

Developers, From what I've been reading on the subject, the best way of handling int 3d is to return successful. Any fpu emmulation that we'll do should not require the fwait. The problem is that I cannot find enough information on the subject to know what the successful return conditions for this interrupt are. On a system that detects an FPU, self-modifying code is used. The interrupts that emmulate the FPU functions are rewritten in the executable to use the machine code for the real FPU instructions. I'm not sure if that can be done with the current memory scheme since that is outside of my area. God Bless, --Robert 'Admiral' Coeyman -- --- May you live as long as you wish and age but a single day. http://www.dotguy.net/ admiral(a)corner.net Webmaster/ Linux Administrator Computer Co-Op/CornerNet

1 0

Re: [Bug 377] Changed - mIRC crashes while backspacing to erase entry
by Tony Lambregts 31 May '02

31 May '02

Sam'l Bassett wrote: >With: > > codeweavers-wine-20011108-5 > >and > > mIRC 5.91 > > Yep -- still has the problem > >On Thursday 30 May 2002 12:35 pm, wine-bugs(a)winehq.com wrote: > > >>http://bugs.winehq.com/show_bug.cgi?id=377 >> >> >> Why do you not post in bugzilla the link was given . The reports come from the people looking at your bug report in bugzilla, where you reported it in the first place. Thats where you should respond. Tony Lambregts.

1 0

Re: PATCH: win32/device.c -- addresses two warnings
by Marcus Meissner 30 May '02

30 May '02

On Thu, May 30, 2002 at 09:26:56AM +0200, Gerald Pfeifer wrote: > This addresses two compiler warnings seen on FreeBSD 4.5-RELEASE. > The first should appear on any non GNU/Linux-system, the second on > all systems. > > Gerald > > ChangeLog: > Move floppy_params into #ifdef linux. > Fix printf format in OpenVxDHandle(). > > Index: device.c > =================================================================== > RCS file: /home/wine/wine/win32/device.c,v > retrieving revision 1.63 > diff -u -3 -p -r1.63 device.c > --- device.c 25 May 2002 22:04:43 -0000 1.63 > +++ device.c 30 May 2002 07:24:18 -0000 > @@ -1187,12 +1187,6 @@ static const DWORD VWIN32_DriveTypeInfo[ > 0x4f24 /* 2.88 M */ > }; > > -static BYTE floppy_params[2][13] = > -{ > - { 0xaf, 0x02, 0x25, 0x02, 0x12, 0x1b, 0xff, 0x6c, 0xf6, 0x0f, 0x08 }, > - { 0xaf, 0x02, 0x25, 0x02, 0x12, 0x1b, 0xff, 0x6c, 0xf6, 0x0f, 0x08 } > -}; > - > /********************************************************************** > * VWIN32_ReadFloppyParams > * > @@ -1201,6 +1195,12 @@ static BYTE floppy_params[2][13] = > static VOID VWIN32_ReadFloppyParams(DIOC_REGISTERS *regs) > { > #ifdef linux > + static BYTE floppy_params[2][13] = > + { > + { 0xaf, 0x02, 0x25, 0x02, 0x12, 0x1b, 0xff, 0x6c, 0xf6, 0x0f, 0x08 }, > + { 0xaf, 0x02, 0x25, 0x02, 0x12, 0x1b, 0xff, 0x6c, 0xf6, 0x0f, 0x08 } > + }; > + I think this is not recommended C (and might fail on other compilers). Not that linux would have any other but gcc. Ciao, Marcus

1 0

Re:Please how do I post the following and get help? "VT_STREAMED_OBJECT out of MSMQ"
by Hans 30 May '02

30 May '02

I was looking at some of your postings recently and I thought that maybe you have come across the situation where you have tried to send a VT_STREAMED_OBJECT into (OleSaveToStream) a queue body and tried to retrieve it at a later time (OleLoadFromStream). I am struggling to work with this (I hope that the code is self explanatory): pMsgProps->aPropID[iter] = PROPID_M_BODY_TYPE; pMsgProps->aPropVar[iter].vt = VT_UI4; pMsgProps->aPropVar[iter].ulVal = VT_STREAMED_OBJECT; iter++; pMsgProps->aPropID[iter] = PROPID_M_BODY; pMsgProps->aPropVar[iter].vt = VT_VECTOR|VT_UI1; STATSTG stat; hResult = ptrStream0->Stat(&stat,STATFLAG_NONAME); pMsgProps->aPropVar[iter].caub.cElems = stat.cbSize.LowPart; pMsgProps->aPropVar[iter].caub.pElems = (unsigned char *)static_cast<void *>(ptrStream0); The above part seems to go through fine. But I cannot extract the information from the receiving end: IStream* ptrStream0 = reinterpret_cast<IStream*>(pMsgProps->aPropVar[3].caub.pElems); // the subscript 3 is where the message body is being extracted, also memory has been allocated as UCHAR in the ..pElems hResult = ptrStream0->Stat(&stat,STATFLAG_NONAME); // the above line of code gives you garbage values for both STATMSG.cbSize.(HighPart and LowPart) Do you think that you could help? Thanks. Hans

1 0

Re: Patch to fix bug_report.pl
by Andreas Mohr 30 May '02

30 May '02

On Thu, May 30, 2002 at 09:47:07AM -0600, Tony Lambregts wrote: > The bug_report.pl script was broken by the removal of -managed command > line option This patch fixes it. That's all fine and dandy, but I think the real fix is to a) nuke bug_report.pl or b) improve it *a lot* bug_report.pl is so darn old that the Wine version it had originally been written for is *completely* different from what we're using today. Thus bug_report.pl should at least strip all "irrelevant" bug lines (*CriticalSection, Interlocked*crement, Tls*, ...). Furthermore it should really include many more debug lines (we're also tracing wine internal dlls now sometimes !). I'd suggest about 1500 lines of censored output, if not even more. Otherwise you can just kiss the debug log goodbye in about 98.5% of all cases. -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://mohr.de.tt

3 2

Debug information
by tijs＠connectux.com 30 May '02

30 May '02

Hi, I compiled a simple Hello World test using VC++ 6.0, with default settings. This generates a .PDB file, which is not read by the most recent winedbg. Perhaps this is due to an overly strict sanity check. In debugger/msc.c I found the following check if ( mpd_nth->Signature != IMAGE_NT_SIGNATURE || mpd_nth->FileHeader.NumberOfSections != nth->FileHeader.NumberOfSections || !(mpd_nth->FileHeader.Characteristics & IMAGE_FILE_DEBUG_STRIPPED )) goto leave; Now unfortunately, the characteristics for my file are 0x10e, and hence the IMAGE_FILE_DEBUG_STRIPPED flag is not set. Disabling the check solves this problem, but perhaps I should try to instruct VC++ to enable the bit? Trying the same with Visual Studio .NET is somewhat more cumbersome. I haven't been able to read in the debugging information generated by C++ projects using winedbg. Has anyone else tried this? Greetings, -- Tijs van Bakel, ConnecTUX, <tijs(a)connectux.com>

2 3

RE: Stripping of whitespaces at the end of lines
by Patrik Stridvall 30 May '02

30 May '02

> Alexandre Julliard a écrit : > > > > Vincent Béron <vberon(a)mecano.gme.usherb.ca> writes: > > > > > If Alexandre wants to do it locally, I support him (our > mailboxes will > > > appreciate). > > > > If you want me to do that please send me a script that I can run > > across the tree to do the change. Please don't send patches for this > > kind of things. > > > > -- > > Alexandre Julliard > > julliard(a)winehq.com > > Here it is. It only targets .c and .h files. Looks good. <shameless-plug-for-perl> However the script can be written much shorter in Perl find . -name '*.[ch]' | xargs perl -i -pe 's/[ \t]+$//; s/;;+$/;/' </shameless-plug-for-perl> > The diff was ~4MB in size between before and after. The savings in a > .tar.gz of the whole tree were modest, around 25KB. I have read through the diff (rather quickly) and it seem to be OK. In fact I can't think of anything in the C semantics that can make a difference if trailing whitespace or extra semicolon is removed. > Now to find a good set of arguments to feed indent(1) so we > all use the > same coding style... > > Not! ;) Good luck finding something that everybody can agree upon. :-)

3 2

RE: Stripping of whitespaces at the end of lines
by Medland, Bill 30 May '02

30 May '02

> -----Original Message----- > From: Vincent Béron [mailto:vberon@mecano.gme.usherb.ca] > Sent: Tuesday, May 28, 2002 10:44 PM > To: wine-patches(a)winehq.org > Subject: Stripping of whitespaces at the end of lines > > > This is the first post in a series of posts about the same > subject. The > plan is to post the rest in the following days (as the total is >2MB > uncompressed, I don't want to send it all at once). Each patch will be > compressed (diff.gz) for that same reason. > > Alexandre, if you don't intend to apply it, please say so (along with > why), so I won't post some big patches for nothing. > > Changelog > - Strips whitespaces at the end of some C lines. > > Vincent I would have thought it would be safer simply for Alexandre to do the stripping locally rather than posting a whole load of patches. At the same time how about agreeing the size of a tab or removing them altogether or agreeing always to use tabs for progra, indentation or ....; Bill

11 19

Re: PATCH: ImageList_LoadImageW (comctl32)
by Tony Lambregts 30 May '02

30 May '02

Sander van Leeuwen wrote: >Changelog: >- Match behaviour of ImageList_LoadImageA wrt cx parameter (when set to zero) > >Author: Sander van Leeuwen/Odin (sandervl(a)xs4all.nl) > > >--- imagelist.c Wed May 29 17:31:28 2002 >+++ imagelist.co Wed May 29 17:32:38 2002 >@@ -1907,19 +1907,6 @@ > if (uType == IMAGE_BITMAP) { > BITMAP bmp; > GetObjectA (handle, sizeof(BITMAP), &bmp); >- >- /* To match windows behavior, if cx is set to zero and >- the flag DI_DEFAULTSIZE is specified, cx becomes the >- system metric value for icons. If the flag is not specified >- the function sets the size to the height of the bitmap */ >- if (cx == 0) >- { >- if (uFlags & DI_DEFAULTSIZE) >- cx = GetSystemMetrics (SM_CXICON); >- else >- cx = bmp.bmHeight; >- } >- > nImageCount = bmp.bmWidth / cx; > > himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR, > > > > > > Seems to me that you got this patch backward. - should + Tony Lambregts

1 0

Re: SafeDisc-1 semi-cleaned note...
by Laurent Pinchart 29 May '02

29 May '02

> i hope i am not asking to much by this, but is there > any chance you could send me a copy of the diff's with > some fixme comments so I know exactly which things > need to be cleaned up? I know that you said the > server suspension code needs to be checked, and the > 0x7ffe0000 page needs to be properly implemented, but > im not sure what all would need to be changed to get > this done. Ok, here's a first version of safedisc.safe.diff with comments. I don't think it's usefull to comment safedisc.dmca.diff for now, but if you need some information about it let me know. --- memory/emulate.c Thu Jan 1 01:00:00 1970 +++ memory/emulate.c Thu May 9 17:35:27 2002 @@ -0,0 +1,53 @@ +/* + * Emulation of privileged memory + * + * Copyright 2002 Laurent Pinchart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "wingdi.h" +#include "wine/winuser16.h" +#include "module.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(virtual); + +#ifdef __i386__ + +/*********************************************************************** + * MEMORY_SharedUserData + * + * Handles exceptions for the SharedUserData access. + */ +BOOL MEMORY_SharedUserData( LPVOID arg, LPCVOID addr ) +{ + DWORD dwProtection; + BOOL ret; + + TRACE( "MEMORY_SharedUserData\n" ); + + ret = VirtualProtect( (LPVOID)0x7ffe0000, 0x10000, PAGE_READWRITE, &dwProtection ); + if ( ret ) + { + *(LPDWORD)0x7ffe0000 = 0x12345678; + ret = VirtualProtect( (LPVOID)0x7ffe0000, 0x10000, PAGE_READONLY, &dwProtection ); + } + + return ret; +} + +#endif /* __i386__ */ This is the emulation of "SharedUserData". SharedUserData is a page of memory located right before the kernel space (0x80000000), so at address 0x7ffe0000. It contains miscelaneous information, and is read-only in user space and read-write in kernel space. You can find more information about it in ntddk.h (not included in wine). We need 3 things here: 1) Write support for the other fields, not only TickCount (kernel timer). This is optional but quite easy for some fields. 2) Find a way to either remove the read rights after the read access, so that the next read access would trigger an exception again, and the information could be updated (this is IMHO *very* difficult), or periodically update the information contained in that page (mostly TickCount). The later should be easier, but implies a slow down. If would be nice to trigger that periodical update only after the first read of TickCount, so that programs which don't read it wouldn't suffer from that slow down. We could also remove the read rights after some time (instead of right after the read operation). That might be the best way, as it wouldn't imply a slow down (not periodical update). 3) Replace 0x12345678 with a correct value. Don't forget that secdrv.c needs to know that value (or at least a close enough value), so we need a portable and accurate way to set and retrieve it from inside wine. Index: dlls/ntdll/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/ntdll/Makefile.in,v retrieving revision 1.27 diff -u -r1.27 Makefile.in --- dlls/ntdll/Makefile.in 14 May 2002 20:55:01 -0000 1.27 +++ dlls/ntdll/Makefile.in 23 May 2002 18:54:33 -0000 @@ -32,6 +32,7 @@ $(TOPOBJDIR)/loader/ne/segment.c \ $(TOPOBJDIR)/memory/atom.c \ $(TOPOBJDIR)/memory/codepage.c \ + $(TOPOBJDIR)/memory/emulate.c \ $(TOPOBJDIR)/memory/environ.c \ $(TOPOBJDIR)/memory/global.c \ $(TOPOBJDIR)/memory/heap.c \ When emulate.c will be applied this will be too :-) Index: dlls/ntdll/signal_i386.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/signal_i386.c,v retrieving revision 1.35 diff -u -r1.35 signal_i386.c --- dlls/ntdll/signal_i386.c 16 May 2002 20:32:16 -0000 1.35 +++ dlls/ntdll/signal_i386.c 23 May 2002 18:54:40 -0000 @@ -679,6 +679,7 @@ { EXCEPTION_RECORD rec; DWORD page_fault_code = EXCEPTION_ACCESS_VIOLATION; + DWORD priv_instr_code = EXCEPTION_PRIV_INSTRUCTION; #ifdef CR2_sig /* we want the page-fault case to be fast */ @@ -708,8 +709,8 @@ case T_SEGNPFLT: /* Segment not present exception */ case T_PROTFLT: /* General protection fault */ case T_UNKNOWN: /* Unknown fault code */ - if (INSTR_EmulateInstruction( context )) return; - rec.ExceptionCode = EXCEPTION_PRIV_INSTRUCTION; + if (INSTR_EmulateInstruction( context, &priv_instr_code )) return; + rec.ExceptionCode = priv_instr_code; break; case T_PAGEFLT: /* Page fault */ #ifdef CR2_sig Index: include/miscemu.h =================================================================== RCS file: /home/wine/wine/include/miscemu.h,v retrieving revision 1.46 diff -u -r1.46 miscemu.h --- include/miscemu.h 10 Mar 2002 00:02:34 -0000 1.46 +++ include/miscemu.h 23 May 2002 18:54:49 -0000 @@ -167,7 +167,7 @@ extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ /* memory/instr.c */ -extern BOOL INSTR_EmulateInstruction( CONTEXT86 *context ); +extern BOOL INSTR_EmulateInstruction( CONTEXT86 *context, DWORD *exception_code ); /* msdos/interrupts.c */ typedef void (WINAPI *INTPROC)(CONTEXT86*); Index: memory/instr.c =================================================================== RCS file: /home/wine/wine/memory/instr.c,v retrieving revision 1.15 diff -u -r1.15 instr.c --- memory/instr.c 11 May 2002 23:01:12 -0000 1.15 +++ memory/instr.c 23 May 2002 18:54:58 -0000 @@ -396,7 +396,7 @@ * * Emulate a privileged instruction. Returns TRUE if emulation successful. */ -BOOL INSTR_EmulateInstruction( CONTEXT86 *context ) +BOOL INSTR_EmulateInstruction( CONTEXT86 *context, DWORD *exception_code ) { int prefix, segprefix, prefixlen, len, repX, long_op, long_addr; SEGPTR gpHandler; @@ -686,7 +686,9 @@ case 0xcd: /* int <XX> */ if (long_op) { - ERR("int xx from 32-bit code is not supported.\n"); + ERR("int 0x%02x from 32-bit code is not supported.\n", instr[1]); + if (instr[1] == 0x01) + *exception_code = EXCEPTION_ACCESS_VIOLATION; break; /* Unable to emulate it */ } else This probably hasn't been applied because it lacks testing. It seems that some instructions which are emulated by wine (int 0x01 is one of them) should generate an EXCEPTION_PRIV_INSTRUCTION instead of EXCEPTION_ACCESS_VIOLATION. Or maybe my code is not clean enough to commit. I'd like to hear comments from Alexandre about this specific part of the patch. Index: include/wine/server_protocol.h =================================================================== RCS file: /home/wine/wine/include/wine/server_protocol.h,v retrieving revision 1.35 diff -u -r1.35 server_protocol.h --- include/wine/server_protocol.h 25 Apr 2002 22:58:59 -0000 1.35 +++ include/wine/server_protocol.h 23 May 2002 18:54:56 -0000 @@ -296,6 +296,7 @@ struct init_process_done_reply { struct reply_header __header; + int suspended; int debugged; }; @@ -3198,6 +3199,6 @@ struct get_window_properties_reply get_window_properties_reply; }; -#define SERVER_PROTOCOL_VERSION 79 +#define SERVER_PROTOCOL_VERSION 80 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ Index: scheduler/process.c =================================================================== RCS file: /home/wine/wine/scheduler/process.c,v retrieving revision 1.182 diff -u -r1.182 process.c --- scheduler/process.c 22 May 2002 21:32:50 -0000 1.182 +++ scheduler/process.c 23 May 2002 18:55:04 -0000 @@ -25,6 +25,7 @@ #include <ctype.h> #include <errno.h> #include <fcntl.h> +#include <signal.h> #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -43,6 +44,7 @@ #include "wine/server.h" #include "options.h" #include "wine/debug.h" +#include "global.h" WINE_DEFAULT_DEBUG_CHANNEL(process); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -126,6 +128,9 @@ /* scheduler/pthread.c */ extern void PTHREAD_init_done(void); +/* memory/emulate.c */ +extern BOOL MEMORY_SharedUserData(LPVOID, LPCVOID); + extern BOOL MAIN_MainInit(void); typedef WORD (WINAPI *pUserSignalProc)( UINT, DWORD, DWORD, HMODULE16 ); @@ -416,6 +421,20 @@ SetStdHandle( STD_ERROR_HANDLE, current_startupinfo.hStdError ); } + /* Reserves a PAGE_NOACCESS at 0x7ffe0000. That page is used as shared + * memory between kernel space and user space (see SharedUserData in + * ntddk.h). It looks like it is at 0xffdf0000 on NT5. That is still to + * be checked. + */ + if ( VirtualAlloc( (LPVOID)0x7ffe0000, 0x10000, MEM_RESERVE|MEM_COMMIT, PAGE_NOACCESS ) == (LPCVOID)0x07ffe0000 ) + { + VIRTUAL_SetFaultHandler( (LPCVOID)0x7ffe0000, MEMORY_SharedUserData, 0 ); + } + else + { + WARN( "Unable to map SharedUserData, SafeDisc protection won't be supported\n" ); + } + /* Now we can use the pthreads routines */ PTHREAD_init_done(); @@ -440,7 +459,7 @@ */ static void start_process(void) { - int debugged, console_app; + int suspended, debugged, console_app; LPTHREAD_START_ROUTINE entry; WINE_MODREF *wm; HFILE main_file = main_exe_file; @@ -481,7 +500,8 @@ req->gui = !console_app; wine_server_add_data( req, main_exe_name, strlen(main_exe_name) ); wine_server_call( req ); - debugged = reply->debugged; + suspended = reply->suspended; + debugged = reply->debugged; } SERVER_END_REQ; @@ -513,6 +533,8 @@ PROCESS_CallUserSignalProc( USIG_PROCESS_LOADED, 0 ); /* Call UserSignalProc ( USIG_PROCESS_RUNNING ... ) only for non-GUI win32 apps */ if (console_app) PROCESS_CallUserSignalProc( USIG_PROCESS_RUNNING, 0 ); + + if (suspended) raise( SIGSTOP ); if (TRACE_ON(relay)) DPRINTF( "%08lx:Starting process %s (entryproc=%p)\n", Index: server/process.c =================================================================== RCS file: /home/wine/wine/server/process.c,v retrieving revision 1.83 diff -u -r1.83 process.c --- server/process.c 26 Apr 2002 19:05:18 -0000 1.83 +++ server/process.c 23 May 2002 18:55:07 -0000 @@ -382,6 +382,14 @@ } +/* signal the parent that a process init is finished */ +void process_init_done( struct process *process ) +{ + set_event( process->init_event ); + release_object( process->init_event ); + process->init_event = NULL; +} + /* get a process from an id (and increment the refcount) */ struct process *get_process_from_id( void *id ) { @@ -896,13 +904,27 @@ if ((process->exe.namelen = get_req_data_size())) process->exe.filename = memdup( get_req_data(), process->exe.namelen ); - generate_startup_debug_events( current->process, req->entry ); - set_event( process->init_event ); - release_object( process->init_event ); - process->init_event = NULL; + generate_startup_debug_events( process, req->entry ); if (req->gui) process->idle_event = create_event( NULL, 0, 1, 0 ); - if (current->suspend + current->process->suspend > 0) stop_thread( current ); - reply->debugged = (current->process->debugger != 0); + + reply->suspended = 0; + reply->debugged = (current->process->debugger != 0); + if (current->suspend + current->process->suspend > 0) + { + /* temporarily clear the init event so that ptrace functions work */ + struct event *init_event = process->init_event; + process->init_event = NULL; + stop_thread( current ); + process->init_event = init_event; + + if (current->attached) + { + reply->suspended = 1; + continue_thread( current ); /* it will suspend itself */ + return; + } + } + process_init_done( process ); } /* open a handle to a process */ Index: server/process.h =================================================================== RCS file: /home/wine/wine/server/process.h,v retrieving revision 1.27 diff -u -r1.27 process.h --- server/process.h 22 Mar 2002 00:21:23 -0000 1.27 +++ server/process.h 23 May 2002 18:55:07 -0000 @@ -90,6 +90,7 @@ extern struct thread *create_process( int fd ); extern struct process *get_process_from_id( void *id ); extern struct process *get_process_from_handle( handle_t handle, unsigned int access ); +extern void process_init_done( struct process *process ); extern int process_set_debugger( struct process *process, struct thread *thread ); extern int debugger_detach( struct process* process, struct thread* debugger ); Index: server/protocol.def =================================================================== RCS file: /home/wine/wine/server/protocol.def,v retrieving revision 1.36 diff -u -r1.36 protocol.def --- server/protocol.def 25 Apr 2002 22:58:59 -0000 1.36 +++ server/protocol.def 23 May 2002 18:55:12 -0000 @@ -276,6 +276,7 @@ int gui; /* is it a GUI process? */ VARARG(filename,string); /* file name of main exe */ @REPLY + int suspended; /* created suspended? */ int debugged; /* being debugged? */ @END Index: server/ptrace.c =================================================================== RCS file: /home/wine/wine/server/ptrace.c,v retrieving revision 1.14 diff -u -r1.14 ptrace.c --- server/ptrace.c 10 Mar 2002 00:18:36 -0000 1.14 +++ server/ptrace.c 23 May 2002 18:55:13 -0000 @@ -79,7 +79,12 @@ switch(sig) { case SIGSTOP: /* continue at once if not suspended */ - if (thread && (thread->process->suspend + thread->suspend)) break; + if (thread && (thread->process->suspend + thread->suspend)) + { + /* check if this was the self-suspend upon process init */ + if (thread->process->init_event) process_init_done( thread->process ); + break; + } /* fall through */ default: /* ignore other signals for now */ if (thread && get_thread_single_step( thread )) Index: server/trace.c =================================================================== RCS file: /home/wine/wine/server/trace.c,v retrieving revision 1.132 diff -u -r1.132 trace.c --- server/trace.c 26 Apr 2002 19:05:18 -0000 1.132 +++ server/trace.c 23 May 2002 18:55:20 -0000 @@ -441,6 +441,7 @@ static void dump_init_process_done_reply( const struct init_process_done_reply *req ) { + fprintf( stderr, " suspended=%d,", req->suspended ); fprintf( stderr, " debugged=%d", req->debugged ); } There are two patches in there. The first one sets a fault handler for the SharedUserData. This looks fine to me, and will probably be applied when memory/emulate.c will be applied. The second one has been written by Alexandre to fix the process suspension at creation time. Once again I'd like to hear from him to know what he doesn't like about the code, as he's the one who wrote it :-) Hope this helps. I'm available if you need more information Laurent Pinchart

3 9

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