wine-devel June 2006

wine-devel@winehq.org

174 participants
352 discussions

Re: msi patch submission - cond.y
by Mike McCormack 05 Jun '06

05 Jun '06

EA Durbin wrote: > fixed various SQL errors in COND_GetOperator() and compare_int() IMO, both of your patches are incorrect. I'm waiting for your test case. Mike

3 2

To <space> or <tab> or not :-)
by Molle Bestefich 05 Jun '06

05 Jun '06

> isn't it rather insane to require specific editor settings > just to be able to *view* the code? It's a necessity for some editors. The TAB setting can be embedded in ASCII files, there are various magic comments that will cause vim and emacs to switch to a readable tabs setting. What is insane is 8 characters per tab. IMHXP 2 characters is too little to quickly make out the indentation. 3 and 4 are both fine choices. 4 wastes slightly more horizontal space, so I prefer 3. 8 is just nuts, it was probably written by someone who hates tabs and wants to use it as an argument to convince everybody to convert to spaces. Using spaces in place of tabs is bad, because you have to press <backspace> and <space> so much the more, wasting your time and tearing your fingers. And there's a higher risk of misaligning something - you have to pay more attention, which again is a waste of your time. You loose fine-grained control when you use tabs instead of spaces, but fine-grained control also means a jungle of bizarre rules about when-and-where-to-do-fine-grained-indenting, so it never pays off, rather it always ends up ruining the indentation anyway. By far the easiest solution is to just use tabs, and just indent codelines that span more than a screenful (7x chars or what not) with an extra tab.

3 3

Re: rpcrt4: Introduce a new function, safe_multiply, which will raise an exception if a multiply overflows a 4-byte integer.
by Alexandre Julliard 05 Jun '06

05 Jun '06

Robert Shearman <rob(a)codeweavers.com> writes: > + unsigned char overflow; > +#if defined(__i386__) && defined (__GNUC__) > + __asm__( > + "mull %3\n\t" > + "seto %%cl" > + : "=a" (ret), "=c" (overflow) /* outputs: eax, cl */ > + : "%a" (a), "rm" (b) /* inputs: eax, any register or memory > + * address (params are interchangable) */ > + : "edx" /* edx clobbered */); > +#else > + ret = a * b; > + overflow = (b && (ret / b != a)); > +#endif That asm seems really overkill. Something like: ULONGLONG ret = (ULONGLONG)a * b; if (ret > 0xffffffff) will generate pretty much the same code with a recent gcc, and it's a lot more readable. BTW could you please add a sequence number in the subject line for your patches? It makes things a lot easier for me when the mails arrive out of order. Thanks. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: userenv: Add a stub implementation of userenv.dll
by Detlef Riekenberg 05 Jun '06

05 Jun '06

Am Montag, den 05.06.2006, 14:01 +0900 schrieb Mike McCormack: > +++ b/dlls/userenv/userenv_main.c > +typedef struct _PROFILEINFOA { ... > +} PROFILEINFOA, *LPPROFILEINFOA; For mingw, this is in "include/userenv.h" -- By By ... ... Detlef

2 2

Light reading about .net framework 1.1 installer
by Dan Kegel 05 Jun '06

05 Jun '06

I just ran across an nice description of what the .net framework 1.1 installer uses during its execution: http://blogs.msdn.com/astebner/archive/2004/08/02/205936.aspx That's going to be a bit of a challenge. - Dan

1 0

re: Added initial version of Wine OleView
by Dan Kegel 05 Jun '06

05 Jun '06

Hi Piotr! Say, does it *do* anything useful yet? Might be worth waiting until it does before submitting it. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 2

Ecco Pro hangs when accessing "2nd level" dialogs
by Don Dwiggins 04 Jun '06

04 Jun '06

I'm a heavy user of Ecco Pro on Windows, and am trying to port myself as completely as possible to Linux (Ubuntu currently). Wine does a good job of supporting most of Ecco's features, but there are a couple of places (unfortunately important ones) where it hangs up tight. I've just submitted Bug #5335 about this problem. I'm a long-time programmer with good (if rusty) knowledge of C/C++ and Unix, just getting up to speed on Linux. I'm at the point where I might be willing to tackle this myself, if the learning curve isn't too steep. I'm posting this to ask for guidance on the best way to proceed. At least, if there's a good way to get more information on the hangup, I'm definitely willing to add to the bug report. Thanks for any good words, -- Don Dwiggins don(a)dondwiggins.net "The truth will make you free, but first it will make you miserable" -- Tom DeMarco

2 1

Re: FW: RE: My 1.0 wish list
by EA Durbin 04 Jun '06

04 Jun '06

>From: Hans Leidekker <hans(a)it.vu.nl> >To: wine-devel(a)winehq.org >CC: "EA Durbin" <ead1234(a)hotmail.com> >Subject: Re: FW: RE: My 1.0 wish list >Date: Sun, 4 Jun 2006 09:49:47 +0200 > >On Sunday 04 June 2006 09:08, EA Durbin wrote: > > > I wrote a quick test in wine/dlls/msi/tests/db.c to add a 2nd row to the > >Could you share it? > > > database that was being created, then I inserted the `id` of 8 into it >and > > then I ran the query SELECT * FROM phone where `id` > 6, and it returned > > the correct results with `id` of 8. But in the actual wine installer >code a > >Is the table in db.c comparable? Does it have the same fields and types? >Also, you're using > in your select but the failing select statement has >= >which may make a difference. > > -Hans It shouldnt matter whether its >= or >, they both return the wrong results in the actual msi installer and the right results in db.c. I have enclosed my tests, I tested these against the America's Army database installer and I have double checked the actual contents of the msi file in ORCA. I've packaged up some tests and included them with this email. Here are some queries that have returned the wrong results SELECT * FROM `Media` WHERE `LastSequence` > 15 SELECT * FROM `File` WHERE `Sequence` > 10 SELECT * FROM `Media` WHERE `LastSequence` >= 15 SELECT * FROM `File` WHERE `Sequence` >= 10

3 7

DAZ Studio
by Andrew Neil Ramage 04 Jun '06

04 Jun '06

After running winecfg and setting winver for DAZStudio.exe to XP, I get the following. andrew@apollo:~/Download/Windows> wine /home/andrew/.wine/drive_c/Program\ Files/DAZ/Studio/DAZStudio.exe fixme:imm:ImmReleaseContext (0x10020, 0x403cde30): stub fixme:imm:ImmReleaseContext (0xa00a2, 0x403cde30): stub fixme:imm:ImmReleaseContext (0x200aa, 0x403cde30): stub fixme:uniscribe:ScriptItemize L"DAZ|Studio can search for directories that\2028may contain content from other programs\2028that DAZ|Studio can read. Please indicate\2028which drives you want DAZ|Studio to search.\2028NOTE: On large drives or network drives\2028this operation can take several minutes.\4291",249,255,(nil),(nil),0x415ae8a4,0x415af0b0: semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291db70, 10, 10, 0x4232d1ac): semi-stub fixme:uniscribe:ScriptShape (0xac0, 0x4232a600, 0x4291db70, 10, 10, 0x4232d1ac): semi-stub fixme:uniscribe:ScriptPlace (0xac0, 0x4232a600, 0x4232ba40, L"'$=_6WXGLR", 10, 0x4232cea8, 0x4232d1ac, 0x4232bd2c): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291db84, 1, 1, 0x4232d1d4): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba54, L"\0003", 1, 0x4232cebc, 0x4232d1d4, 0x4232bd54): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291db86, 3, 3, 0x4232d1fc): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba56, L"FDQ", 3, 0x4232cebe, 0x4232d1fc, 0x4232bd58): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291db8c, 1, 1, 0x4232d224): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba5c, L"\0003", 1, 0x4232cec4, 0x4232d224, 0x4232bd64): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291db8e, 6, 6, 0x4232d24c): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba5e, L"VHDUFK", 6, 0x4232cec6, 0x4232d24c, 0x4232bd68): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291db9a, 1, 1, 0x4232d274): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba6a, L"\0003", 1, 0x4232ced2, 0x4232d274, 0x4232bd80): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291db9c, 3, 3, 0x4232d29c): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba6c, L"IRU", 3, 0x4232ced4, 0x4232d29c, 0x4232bd84): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291dba2, 1, 1, 0x4232d2c4): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba72, L"\0003", 1, 0x4232ceda, 0x4232d2c4, 0x4232bd90): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291dba4, 11, 11, 0x4232d2ec): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba74, L"GLUHFWRULHV", 11, 0x4232cedc, 0x4232d2ec, 0x4232bd94): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291dbba, 1, 1, 0x4232d314): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba8a, L"\0003", 1, 0x4232cef2, 0x4232d314, 0x4232bdc0): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291dbbc, 4, 4, 0x4232d33c): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba8c, L"WKDW", 4, 0x4232cef4, 0x4232d33c, 0x4232bdc4): semi-stub fixme:uniscribe:ScriptShape ((nil), 0x4232a600, 0x4291dbc4, 1, 1, 0x4232d364): semi-stub fixme:uniscribe:ScriptPlace ((nil), 0x4232a600, 0x4232ba94, L"", 1, 0x4232cefc, 0x4232d364, 0x4232bdd4): semi-stub fixme:win:SetWindowTextA setting text "EAX=00006078 EBX=42A6810C ECX=415AF1D8 EDX=403DFDE0 ESI=4232BA94\nEDI=403DF9D8 EBP=415AF15C ESP=415AF144 EIP=42A66FF5 FLG=00210246\nCS=0073 DS=007B SS=007B ES=007B FS=1007 GS=0033" of other process window (nil) should not use SendMessage -- Andrew When the dragons grow too mighty To slay with pen or sword I grow weary of the battle And the storm I walk toward Madrigal by Rush (A Farewell to Kings, 1974) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

4 4

Shell integration idea
by Mikołaj Zalewski 04 Jun '06

04 Jun '06

As a SoC project I'll try to improve the integration of wine with the Unix shells. My first step will be to implement the freedesktop.org Trash. I've written some code that doesn't add any new features but shows how I want to add it. I'd like to know if this is a good design? The main idea is not to hard-code one implementation of things like the Trash into shell32 - not everything is standardized by the freedesktop and even if it would this might not work on other systems like MacOS X. We should allow for many implementations. The correct one is loaded depending on a registry settings (so that a winecfg entry can be added). My implementation uses COM objects as it's standard dlls provides support for such tasks. Currently there is one interface (IWineShellIntegration) that acts as a factory for specialized objects. That could also be implemented using COM Aggregation - when we do that we could use QueryInterface instead of GetIntegrationObejct. Some COM objects can run in the address space of the calling process - e.g. the trash can be implemented like that. For others it would be a waist of resources (e.g. there is no need for every process to watch is the file associations have changed) - it's enough to load them only once. The explorer seems to be a good candidate to create such objects. In the attached patch there is one specialized interface - the IWineTrash. The SHELL_DeleteFile[AW] is patched to use it - it shows a different icon if the file can be trashed (these are not the correct icons as wine's shell32 uses a message box instead of a special dialog) and calls the trash method then. Currently there is only one built-in trash that can't trash anything. (note that SHELL_DeleteFile is called in the folders that are decendents of My Computer. If choose delete on a file that is a decendent of the '/', it will be deleted without a warning). Mikolaj Zalewski

5 8

Re: mapi32: Write-strings warnings fix
by Peter Oberndorfer 04 Jun '06

04 Jun '06

On Saturday 03 June 2006 16:33, Andrew Talbot wrote: > Changelog: > mapi32: Write-strings warnings fix. > > diff -urN a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c > --- a/dlls/mapi32/sendmail.c 2006-05-23 17:24:40.000000000 +0100 > +++ b/dlls/mapi32/sendmail.c 2006-06-03 14:44:21.000000000 +0100 > @@ -113,8 +113,8 @@ > } > if (message->nFileCount) FIXME("Ignoring attachments\n"); > > - subject = message->lpszSubject ? message->lpszSubject : ""; > - body = message->lpszNoteText ? message->lpszNoteText : ""; > + subject = message->lpszSubject ? message->lpszSubject : NULL; > + body = message->lpszNoteText ? message->lpszNoteText : NULL; I think this is wrong, as it makes the whole "? :" construct unnecessary. (for non NULL it evaluates to "message->lpszNoteText" and for NULL it becomes NULL; > > TRACE( "Subject: %s\n", debugstr_a(subject) ); > TRACE( "Body: %s\n", debugstr_a(body) ); > > > Greetings Peter

3 12

Re: FW: RE: My 1.0 wish list
by EA Durbin 04 Jun '06

04 Jun '06

That can't be used for a test case, for a test case I, or most likely someone elsewho has the ability and the time has to write code under dlls/msi/tests/db.c and make a program in windows to re-illustrate this bug. >From: "Jason Green" <jave27(a)gmail.com> >To: "EA Durbin" <ead1234(a)hotmail.com> >CC: mike(a)codeweavers.com, dank(a)kegel.com, wine-devel(a)winehq.org >Subject: Re: FW: RE: My 1.0 wish list >Date: Sat, 3 Jun 2006 12:02:15 -0400 > >On 6/3/06, EA Durbin <ead1234(a)hotmail.com> wrote: >> >>This problem in MSI spans a multitude of bugs. >> >>ATI demo(Rendering With Natural Light ) - bug # 4712? >> > >I noticed yesterday that just about every ATI Demo had similar >installer problems. Just try a few from here if you need some quick >test cases: > >http://www.ati.com/developer/demos.html > >Thanks, and good luck!

2 3

Re: FW: RE: My 1.0 wish list
by EA Durbin 04 Jun '06

04 Jun '06

I have compiled a list of applications that are affected by the bug in which the query in ready_media_for_file() in MSI returns the wrong results, it returns LastSequence less than the file->Sequence being passed. Here is a detailed analysis of the multiple types of errors this bugs causes. Common debug outputs of this bug are: Error #1: err:msi:ACTION_InstallFiles compressed file wasn't extracted This error is usually caused by the results of the query returning a LastSequence number of Less than that of the working install media and the installer is trying to extract the file from the wrong install medium. Error #2: err:msi:extract_cabinet_file FDICopy failed err:msi:ACTION_InstallFiles Unable to ready media There is a zero in LastSequence Value of the Media table and the query in ready_media_for_file() returns it. For some reason the msi file has a zero in the LastSequence but its really a dummy cabinet file and doesn't exist. The file sequence being passed for the first file is most likely 1, and the query of >= 1 is returning 0 falsely causing this error. This problem in MSI spans a multitude of bugs. America's Army - bug #5139 J2SE - bug # 4280 Half Life 2 - bug # 5004, 4533 Dawn of War Demo - bug # 3749 E-Sword 6.5 - bug # 4251 Rush for Berlin demo - bug #5187 ATI demo(Rendering With Natural Light ) - bug # 4712? There are probably other bugs resulting from this, but the log doesn't detail it well enough, alot of them just have the debug dump at the end and not the pertainent msi err lines. I only included applications where it was obvious from the log, or I tested personally. >From: Mike McCormack <mike(a)codeweavers.com> >To: EA Durbin <ead1234(a)hotmail.com> >Subject: Re: FW: RE: My 1.0 wish list >Date: Sun, 04 Jun 2006 00:30:41 +0900 > > >You can send me as many mails as you like, but I'm not doing anything until >there's a test case showing the problem. > >Mike I wrote a test showing the results of the query in the wine installer and included the source code and resulting logs which clearly displays the problem. That's the best I can do. I'm not up to snuff on my C programming, nor am I familiary with how the official test case for wine is supposed to be layed out. If someone else wants to work on it then thats fine, but I layed out the problem, and debugged it, and I've proven this with code and resulting logs. This problem affects a multitude of applications in wine. If your not willing to work on it then either someone else can, or it can remain broken.

5 4

My 1.0 wish list
by Dan Kegel 04 Jun '06

04 Jun '06

... is now at http://wiki.winehq.org/DanKegel I'm willing to focus some effort on these tasks, too, so it's not just pie-in-the-sky wishing.

3 6

Alsa sound vs OSS with wine and riven
by Stephen Clark 03 Jun '06

03 Jun '06

Hello, I have been working to get "Riven" the sequel to Myst to work with the latest wine from cvs on the latest FC5. It works and the sound is almost perfect with OSS, but is totally screwed up when I use ALSA, I don't know whether this is a WINE or Linux issue, so I am cross posting to both lists. Regards, Steve -- "They that give up essential liberty to obtain temporary safety, deserve neither liberty nor safety." (Ben Franklin) "The course of history shows that as a government grows, liberty decreases." (Thomas Jefferson)

1 0

Re: Added initial version of Wine OleView
by Vitaliy Margolen 03 Jun '06

03 Jun '06

Saturday, June 3, 2006, 11:36:45 AM, Piotr Caban wrote: Please change FSF's address to the new one. Vitaliy Margolen

1 0

ntdll: a simple implementation of cross-process NtAllocateVirtualMemory
by tkho＠ucla.edu 03 Jun '06

03 Jun '06

Hello, I ran across the need to do memory allocations across processes and came upon Alexander Yaworsky's patch at http://www.winehq.org/pipermail/wine-devel/2004-September/029953.html and took a different approach. Instead of waiting for the target process to check a fd, I changed the implementation to use ptrace to interrupt the target process and execute code in kernel32 that does an mmap/munmap. This is a simple implementation that does not do a full-on call to Nt(Allocate|Free)VirtualMemory inside the target process, mainly because the locks taken in the allocation management code would cause deadlocks. I've done informal testing to make sure the code doesn't crash Wine by running applications alongside this memory-churner: http://www.seas.ucla.edu/~kho/wine/alloc_test/alloc_test.exe http://www.seas.ucla.edu/~kho/wine/alloc_test/alloc_test.cpp One thought that has recently crossed my mind: Building off his framework and putting much of the code in the server may not have been a great idea, since the only real need for the server is to get the unix pid of the thread. Is this a step in the right direction? Comments appreciated! Thomas Kho --- Index: dlls/kernel/kernel32.spec =================================================================== RCS file: /home/wine/wine/dlls/kernel/kernel32.spec,v retrieving revision 1.174 diff -u -r1.174 kernel32.spec --- dlls/kernel/kernel32.spec 27 May 2006 11:36:56 -0000 1.174 +++ dlls/kernel/kernel32.spec 2 Jun 2006 05:43:15 -0000 @@ -1239,3 +1239,8 @@ # Init code @ cdecl __wine_kernel_init() + +# Remote memory allocation +# kernel32 is mapped to the same place in every process +@ cdecl wine_remote_NtAllocateVirtualMemory(ptr long long) +@ cdecl wine_remote_NtFreeVirtualMemory(ptr long) Index: dlls/kernel/virtual.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/virtual.c,v retrieving revision 1.18 diff -u -r1.18 virtual.c --- dlls/kernel/virtual.c 23 May 2006 12:48:03 -0000 1.18 +++ dlls/kernel/virtual.c 2 Jun 2006 05:43:15 -0000 @@ -42,6 +42,7 @@ #include "wine/exception.h" #include "excpt.h" #include "wine/debug.h" +#include "wine/library.h" #include "kernel_private.h" @@ -778,3 +779,77 @@ __ENDTRY return FALSE; } + +/*********************************************************************** + * wine_remote_NtAllocateVirtualMemory (KERNEL32.@) + * + * Reentrant function that allocates memory + * + * PARAMS + * base [I] Desired base address + * size [I] Number of bytes to allocate + * prot [I] Memory protection flags + * + * RETURNS + * Success: %eax contains base address of allocated region of pages. + * Failure: %eax is NULL. + */ +void wine_remote_NtAllocateVirtualMemory( LPVOID base, DWORD size, DWORD prot ) +{ + char *mem; + size += sizeof(int *); + mem = wine_anon_mmap(base, size, prot, 0); + /*printf("mmap base=0x%08x size=%d prot=%d, allocated at 0x%x\n", + base, size, prot, mem);*/ + *(int *) mem = size; + + mem += sizeof(int); + /* return base address of allocated memory in eax */ + asm("movl %0, %%eax" + : + :"r"(mem) + :"%eax"); + asm("int3"); /* execution doesn't continue past here */ + return; +} + +/*********************************************************************** + * wine_remote_NtFreeVirtualMemory (KERNEL32.@) + * + * Reentrant function that frees mmap'd memory + * + * PARAMS + * base [I] Desired base address + * size [I] Number of bytes to free + * + * RETURNS + * Success: %eax contains size of unmapped region + * Failure: %eax is 0. + */ +void wine_remote_NtFreeVirtualMemory( LPVOID base, DWORD size ) +{ + int result; + if (size == 0) + { + base = (char *) base - sizeof(int *); + size = *(int *) base; + result = munmap(base, size); + } + else /* FIXME unsafe for invalid base */ + result = 1; + + /*printf("munmap base=0x%08x size=%d, result: %d (%s)\n", + base, size, result, result == 0 ? "success" : "failure");*/ + + if (result == 0) /* munmap success */ + result = size; + else + result = 0; + /* return munmap return value in eax */ + asm("movl %0, %%eax" + : + :"r"(result) + :"%eax"); + asm("int3"); /* execution doesn't continue past here */ + return; +} Index: dlls/ntdll/virtual.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v retrieving revision 1.90 diff -u -r1.90 virtual.c --- dlls/ntdll/virtual.c 23 May 2006 12:48:22 -0000 1.90 +++ dlls/ntdll/virtual.c 2 Jun 2006 05:43:16 -0000 @@ -144,6 +144,36 @@ /*********************************************************************** + * remote_op + * + */ +NTSTATUS remote_op( HANDLE process, int opcode, + void* params, int params_size, + void* result, int* result_size ) +{ + NTSTATUS status, remote_status = 0; + + SERVER_START_REQ( remote_operation ) + { + req->handle = process; + req->code = opcode; + if (params) wine_server_add_data( req, params, params_size ); + wine_server_set_reply( req, result, *result_size ); + if (!(status = wine_server_call( req ))) + { + remote_status = reply->status; + if (result) + *result_size = wine_server_reply_size( reply ); + TRACE("result_size=%d\n", *result_size); + } + } + SERVER_END_REQ; + + return status ? status : remote_status; +} + + +/*********************************************************************** * VIRTUAL_GetProtStr */ static const char *VIRTUAL_GetProtStr( BYTE prot ) @@ -1250,8 +1280,8 @@ * NtAllocateVirtualMemory (NTDLL.@) * ZwAllocateVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_bits, - SIZE_T *size_ptr, ULONG type, ULONG protect ) +NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, + ULONG zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect ) { void *base; BYTE vprot; @@ -1265,8 +1295,48 @@ if (!is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + struct remote_op_params_vm_alloc alloc_params; + struct remote_op_result_vm_alloc alloc_result; + int result_size = sizeof(alloc_result); + typedef void (*allocator_type)(LPVOID base, DWORD size, DWORD prot); + static allocator_type allocator = NULL; + + if (!allocator) + { + HMODULE hkernel32; + UNICODE_STRING module; + ANSI_STRING function; + WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2', + '.','d','l','l',0}; + RtlInitUnicodeString(&module, kernel32W); + RtlInitAnsiString(&function, "wine_remote_NtAllocateVirtualMemory"); + if (LdrGetDllHandle(0, 0, &module, &hkernel32) == STATUS_SUCCESS) + LdrGetProcedureAddress(hkernel32, &function, 0, + (void**)&allocator); + else + return STATUS_DLL_NOT_FOUND; + printf("using allocator in kernel32 at 0x%08x\n", + (unsigned) allocator); + } + + alloc_params.addr = *ret; + alloc_params.zerobits = zero_bits; + alloc_params.size = size; + alloc_params.type = type; + alloc_params.protect = VIRTUAL_GetProt( protect ); + alloc_params.allocator = allocator; + status = remote_op( process, REMOTE_OP_VM_ALLOC, + &alloc_params, sizeof(alloc_params), + &alloc_result, &result_size ); + if (!status) + { + *ret = alloc_result.addr; + *size_ptr = alloc_result.size; + } + printf("NtAllocateVirtualMemory status=0x%08x ptr=0x%08x size=%d\n", + (unsigned) status, (unsigned) alloc_result.addr, + alloc_result.size); + return status; } /* Round parameters to a page boundary */ @@ -1372,8 +1442,42 @@ if (!is_current_process( process )) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + struct remote_op_params_vm_free free_params; + struct remote_op_result_vm_free free_result; + int result_size = sizeof(free_result); + typedef void (*deallocator_type)(LPVOID base, DWORD size); + static deallocator_type deallocator = NULL; + + if (!deallocator) { + HMODULE hkernel32; + UNICODE_STRING module; + ANSI_STRING function; + WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2', + '.','d','l','l',0}; + RtlInitUnicodeString(&module, kernel32W); + RtlInitAnsiString(&function, "wine_remote_NtFreeVirtualMemory"); + + if (LdrGetDllHandle(0, 0, &module, &hkernel32) == STATUS_SUCCESS) + LdrGetProcedureAddress(hkernel32, &function, 0, + (void**)&deallocator); + else + return STATUS_DLL_NOT_FOUND; + printf("using deallocator in kernel32 at 0x%08x\n", + (unsigned) deallocator); + } + + free_params.addr = *addr_ptr; + free_params.size = size; + free_params.type = type; + free_params.deallocator = deallocator; + status = remote_op( process, REMOTE_OP_VM_FREE, + &free_params, sizeof(free_params), + &free_result, &result_size ); + if (!status) + *size_ptr = free_result.size; + printf("NtFreeVirtualMemory status=0x%08x size=%d\n", + (unsigned) status, (unsigned) free_result.size); + return status; } /* Fix the parameters */ Index: include/winternl.h =================================================================== RCS file: /home/wine/wine/include/winternl.h,v retrieving revision 1.181 diff -u -r1.181 winternl.h --- include/winternl.h 27 May 2006 11:37:02 -0000 1.181 +++ include/winternl.h 2 Jun 2006 05:43:17 -0000 @@ -2242,7 +2242,8 @@ extern NTSTATUS wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, UINT disposition, BOOLEAN check_case ); extern NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ); - +extern void wine_remote_NtAllocateVirtualMemory( LPVOID base, DWORD size, DWORD prot ); +extern void wine_remote_NtFreeVirtualMemory( LPVOID base, DWORD size ); /*********************************************************************** * Inline functions Index: include/wine/server_protocol.h =================================================================== RCS file: /home/wine/wine/include/wine/server_protocol.h,v retrieving revision 1.198 diff -u -r1.198 server_protocol.h --- include/wine/server_protocol.h 27 May 2006 11:37:01 -0000 1.198 +++ include/wine/server_protocol.h 2 Jun 2006 05:43:18 -0000 @@ -3727,6 +3727,132 @@ }; + +struct remote_operation_request +{ + struct request_header __header; + obj_handle_t handle; + int code; + /* VARARG(data,bytes); */ +}; +struct remote_operation_reply +{ + struct reply_header __header; + unsigned int status; + /* VARARG(data,bytes); */ +}; +enum remote_op_code +{ + REMOTE_OP_NEW_THREAD, + REMOTE_OP_VM_ALLOC, + REMOTE_OP_VM_FREE, + REMOTE_OP_VM_PROTECT, + REMOTE_OP_VM_QUERY, + REMOTE_OP_VM_MAP, + REMOTE_OP_VM_UNMAP, + REMOTE_OP_VM_FLUSH +}; + +struct remote_op_params_new_thread +{ + int suspend; + void *stack_addr; + unsigned int stack_reserve; + unsigned int stack_commit; + void *start; + void *param; +}; +struct remote_op_result_new_thread +{ + obj_handle_t handle; + thread_id_t tid; +}; + +struct remote_op_params_vm_alloc +{ + void *addr; + unsigned long zerobits; + unsigned long size; + unsigned long type; + unsigned long protect; + void *allocator; +}; +struct remote_op_result_vm_alloc +{ + void *addr; + unsigned long size; +}; + +struct remote_op_params_vm_free +{ + void *addr; + unsigned long size; + unsigned long type; + void *deallocator; +}; +struct remote_op_result_vm_free +{ + unsigned long size; +}; + +struct remote_op_params_vm_protect +{ + void *addr; + unsigned long size; + unsigned long new_prot; +}; +struct remote_op_result_vm_protect +{ + void *base; + unsigned long size; + unsigned long old_prot; +}; + +struct remote_op_params_vm_query +{ + void *addr; + int info_class; +}; + +struct remote_op_params_vm_map +{ + void *addr; + unsigned long zero_bits; + unsigned long commit_size; + unsigned long offset_low; + long offset_high; + unsigned long size; + int inherit; + unsigned long alloc_type; + unsigned long protect; +}; +struct remote_op_result_vm_map +{ + void *base; + unsigned long size; +}; + +struct remote_op_params_vm_flush +{ + void *addr; + unsigned long size; + unsigned long unknown; +}; +struct remote_op_result_vm_flush +{ + void *base; + unsigned long size; +}; + + +struct remote_op_request +{ + enum remote_op_code op_code; + thread_id_t originator; + int params_size; +}; + + enum request { REQ_new_process, @@ -3942,6 +4068,7 @@ REQ_create_symlink, REQ_open_symlink, REQ_query_symlink, + REQ_remote_operation, REQ_NB_REQUESTS }; @@ -4162,6 +4289,7 @@ struct create_symlink_request create_symlink_request; struct open_symlink_request open_symlink_request; struct query_symlink_request query_symlink_request; + struct remote_operation_request remote_operation_request; }; union generic_reply { @@ -4380,8 +4508,9 @@ struct create_symlink_reply create_symlink_reply; struct open_symlink_reply open_symlink_reply; struct query_symlink_reply query_symlink_reply; + struct remote_operation_reply remote_operation_reply; }; -#define SERVER_PROTOCOL_VERSION 234 +#define SERVER_PROTOCOL_VERSION 238 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ Index: server/process.c =================================================================== RCS file: /home/wine/wine/server/process.c,v retrieving revision 1.167 diff -u -r1.167 process.c --- server/process.c 23 May 2006 12:49:34 -0000 1.167 +++ server/process.c 2 Jun 2006 05:43:18 -0000 @@ -22,12 +22,15 @@ #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <limits.h> +#include <linux/user.h> #include <signal.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/ptrace.h> #include <sys/time.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -36,6 +39,7 @@ #ifdef HAVE_POLL_H #include <poll.h> #endif +#include <sys/wait.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -1081,3 +1085,209 @@ release_object( process ); } } + +/* Accept parameters for remote operation and start it */ +DECL_HANDLER(remote_operation) +{ + int access; + struct process *process; + struct thread *thread; + + /* define required access rights */ + switch( req->code ) + { + case REMOTE_OP_NEW_THREAD: + access = PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION + | PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE; + break; + case REMOTE_OP_VM_ALLOC: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_FREE: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_PROTECT: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_QUERY: access = PROCESS_QUERY_INFORMATION; break; + case REMOTE_OP_VM_MAP: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_UNMAP: access = PROCESS_VM_OPERATION; break; + case REMOTE_OP_VM_FLUSH: access = PROCESS_VM_OPERATION; break; /* FIXME: is access right? */ + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + switch( req->code ) + { + case REMOTE_OP_NEW_THREAD: + break; + case REMOTE_OP_VM_ALLOC: + { +#if defined(linux) && defined(__i386__) + int pid; + struct user_regs_struct oldregs, regs; + struct remote_op_params_vm_alloc *params; + struct remote_op_result_vm_alloc result; + + params = (struct remote_op_params_vm_alloc *) get_req_data(); + + /* get process object */ + if (!(process = get_process_from_handle( req->handle, access ))) + return; + + thread = get_process_first_thread(process); + pid = thread->unix_pid; + release_object(process); + + /*printf("attaching to process with pid %d\n", pid);*/ + if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) == -1) + goto errorbeforeattach; + + wait(NULL); + if (ptrace(PTRACE_GETREGS, pid, NULL, &regs) == -1) + goto error; + + memcpy(&oldregs, &regs, sizeof(struct user_regs_struct)); + + regs.eip = (int) params->allocator; + + /* cdecl */ + if (ptrace(PTRACE_POKEDATA, pid, regs.esp-4, params->protect) == -1) + goto error; + if (ptrace(PTRACE_POKEDATA, pid, regs.esp-8, params->size) == -1) + goto error; + if (ptrace(PTRACE_POKEDATA, pid, regs.esp-12, params->addr) == -1) + goto error; + regs.esp -= 16; + + /* prevent the kernel from restarting the system call. + * see i386_linux_write_pc() in gdb/i386-linux-tdep.c of gdb */ + regs.orig_eax = -1; + + if (ptrace(PTRACE_SETREGS, pid, NULL, &regs) == -1) + goto error; + if (ptrace(PTRACE_CONT, pid, NULL, NULL) == -1) + goto error; + + wait(NULL); + if (ptrace(PTRACE_GETREGS, pid, NULL, &regs) == -1) + goto error; + + /* eax has pointer to allocated memory */ + /*printf("mem allocated in target process at 0x%08x\n", + (unsigned) regs.eax);*/ + if (ptrace(PTRACE_SETREGS, pid, NULL, &oldregs) == -1) + goto error; + if (ptrace(PTRACE_DETACH, pid, NULL, NULL) == -1) + goto error; + + reply->status = regs.eax ? STATUS_SUCCESS + : STATUS_INVALID_PARAMETER; + result.addr = (void *) regs.eax; + result.size = params->size; + + assert(sizeof(result) <= get_reply_max_size()); + set_reply_data(&result, sizeof(result)); + + break; + +error: + printf("error!\n"); + ptrace(PTRACE_DETACH, pid, NULL, NULL); + set_error( STATUS_INVALID_PARAMETER ); + break; + +errorbeforeattach: + printf("error before attach!\n"); + set_error( STATUS_INVALID_PARAMETER ); + break; +#else + set_error( STATUS_NOT_IMPLEMENTED ); +#endif + } + case REMOTE_OP_VM_FREE: + { +#if defined(linux) && defined(__i386__) + int pid; + struct user_regs_struct oldregs, regs; + struct remote_op_params_vm_free *params; + struct remote_op_result_vm_free result; + + params = (struct remote_op_params_vm_free *) get_req_data(); + + /* get process object */ + if (!(process = get_process_from_handle( req->handle, access ))) + return; + + thread = get_process_first_thread(process); + pid = thread->unix_pid; + release_object(process); + + /*printf("attaching to process with pid %d\n", pid);*/ + if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) == -1) + goto freeerrorbeforeattach; + + wait(NULL); + if (ptrace(PTRACE_GETREGS, pid, NULL, &regs) == -1) + goto freeerror; + memcpy(&oldregs, &regs, sizeof(struct user_regs_struct)); + + regs.eip = (int) params->deallocator; + + /* cdecl */ + if (ptrace(PTRACE_POKEDATA, pid, regs.esp-4, params->size) == -1) + goto freeerror; + if (ptrace(PTRACE_POKEDATA, pid, regs.esp-8, params->addr) == -1) + goto freeerror; + regs.esp -= 12; + + /* prevent the kernel from restarting the system call. + * see i386_linux_write_pc() in gdb/i386-linux-tdep.c of gdb */ + regs.orig_eax = -1; + + if (ptrace(PTRACE_SETREGS, pid, NULL, &regs) == -1) + goto freeerror; + if (ptrace(PTRACE_CONT, pid, NULL, NULL) == -1) + goto freeerror; + + wait(NULL); + if (ptrace(PTRACE_GETREGS, pid, NULL, &regs) == -1) + goto freeerror; + + /* eax has return value */ + /*printf("munmap'd in target process, result=0x%08x\n", + (unsigned) regs.eax);*/ + if (ptrace(PTRACE_SETREGS, pid, NULL, &oldregs) == -1) + goto freeerror; + if (ptrace(PTRACE_DETACH, pid, NULL, NULL) == -1) + goto freeerror; + + reply->status = regs.eax ? STATUS_SUCCESS + : STATUS_INVALID_PARAMETER; + result.size = regs.eax; + + assert(sizeof(result) <= get_reply_max_size()); + set_reply_data(&result, sizeof(result)); + + break; + +freeerror: + printf("error!\n"); + ptrace(PTRACE_DETACH, pid, NULL, NULL); + set_error( STATUS_INVALID_PARAMETER ); + break; + +freeerrorbeforeattach: + printf("error before attach!\n"); + set_error( STATUS_INVALID_PARAMETER ); + break; +#else + set_error( STATUS_NOT_IMPLEMENTED ); +#endif + } + case REMOTE_OP_VM_PROTECT: + case REMOTE_OP_VM_QUERY: + case REMOTE_OP_VM_MAP: + case REMOTE_OP_VM_UNMAP: + case REMOTE_OP_VM_FLUSH: + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } +} Index: server/protocol.def =================================================================== RCS file: /home/wine/wine/server/protocol.def,v retrieving revision 1.198 diff -u -r1.198 protocol.def --- server/protocol.def 27 May 2006 11:37:01 -0000 1.198 +++ server/protocol.def 2 Jun 2006 05:43:18 -0000 @@ -2615,3 +2615,124 @@ @REPLY VARARG(target_name,unicode_str); /* target name */ @END + + +/* Accept parameters for remote operation and start it */ +@REQ(remote_operation) + obj_handle_t handle; /* process handle */ + int code; /* operation code (see below) */ + VARARG(data,bytes); /* operation parameters (see below) */ +@REPLY + unsigned int status; /* operation status */ + VARARG(data,bytes); /* operation result data (see below) */ +@END +enum remote_op_code +{ + REMOTE_OP_NEW_THREAD, + REMOTE_OP_VM_ALLOC, + REMOTE_OP_VM_FREE, + REMOTE_OP_VM_PROTECT, + REMOTE_OP_VM_QUERY, + REMOTE_OP_VM_MAP, + REMOTE_OP_VM_UNMAP, + REMOTE_OP_VM_FLUSH +}; + +struct remote_op_params_new_thread +{ + int suspend; + void *stack_addr; + unsigned int stack_reserve; + unsigned int stack_commit; + void *start; + void *param; +}; +struct remote_op_result_new_thread +{ + obj_handle_t handle; + thread_id_t tid; +}; + +struct remote_op_params_vm_alloc +{ + void *addr; + unsigned long zerobits; + unsigned long size; + unsigned long type; + unsigned long protect; + void *allocator; +}; +struct remote_op_result_vm_alloc +{ + void *addr; + unsigned long size; +}; + +struct remote_op_params_vm_free +{ + void *addr; + unsigned long size; + unsigned long type; + void *deallocator; +}; +struct remote_op_result_vm_free +{ + unsigned long size; +}; + +struct remote_op_params_vm_protect +{ + void *addr; + unsigned long size; + unsigned long new_prot; +}; +struct remote_op_result_vm_protect +{ + void *base; + unsigned long size; + unsigned long old_prot; +}; + +struct remote_op_params_vm_query +{ + void *addr; + int info_class; +}; + +struct remote_op_params_vm_map +{ + void *addr; + unsigned long zero_bits; + unsigned long commit_size; + unsigned long offset_low; + long offset_high; + unsigned long size; + int inherit; + unsigned long alloc_type; + unsigned long protect; +}; +struct remote_op_result_vm_map +{ + void *base; + unsigned long size; +}; + +struct remote_op_params_vm_flush +{ + void *addr; + unsigned long size; + unsigned long unknown; +}; +struct remote_op_result_vm_flush +{ + void *base; + unsigned long size; +}; + +/* structure for marshalling remote operation requests */ +struct remote_op_request +{ + enum remote_op_code op_code; + thread_id_t originator; + int params_size; +}; Index: server/request.h =================================================================== RCS file: /home/wine/wine/server/request.h,v retrieving revision 1.132 diff -u -r1.132 request.h --- server/request.h 23 May 2006 12:49:34 -0000 1.132 +++ server/request.h 2 Jun 2006 05:43:18 -0000 @@ -323,6 +323,7 @@ DECL_HANDLER(create_symlink); DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); +DECL_HANDLER(remote_operation); #ifdef WANT_REQUEST_HANDLERS @@ -542,6 +543,7 @@ (req_handler)req_create_symlink, (req_handler)req_open_symlink, (req_handler)req_query_symlink, + (req_handler)req_remote_operation, }; #endif /* WANT_REQUEST_HANDLERS */ Index: server/trace.c =================================================================== RCS file: /home/wine/wine/server/trace.c,v retrieving revision 1.310 diff -u -r1.310 trace.c --- server/trace.c 27 May 2006 11:37:01 -0000 1.310 +++ server/trace.c 2 Jun 2006 05:43:19 -0000 @@ -3263,6 +3263,21 @@ dump_varargs_unicode_str( cur_size ); } +static void dump_remote_operation_request( const struct remote_operation_request *req ) +{ + fprintf( stderr, " handle=%p,", req->handle ); + fprintf( stderr, " code=%d,", req->code ); + fprintf( stderr, " data=" ); + dump_varargs_bytes( cur_size ); +} + +static void dump_remote_operation_reply( const struct remote_operation_reply *req ) +{ + fprintf( stderr, " status=%08x,", req->status ); + fprintf( stderr, " data=" ); + dump_varargs_bytes( cur_size ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3477,6 +3492,7 @@ (dump_func)dump_create_symlink_request, (dump_func)dump_open_symlink_request, (dump_func)dump_query_symlink_request, + (dump_func)dump_remote_operation_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -3693,6 +3709,7 @@ (dump_func)dump_create_symlink_reply, (dump_func)dump_open_symlink_reply, (dump_func)dump_query_symlink_reply, + (dump_func)dump_remote_operation_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -3909,6 +3926,7 @@ "create_symlink", "open_symlink", "query_symlink", + "remote_operation", }; static const struct

6 15

re: MSI query tests
by Dan Kegel 03 Jun '06

03 Jun '06

EA Durbin wrote: > I've written some tests to debug the MSI Installer in wine, in which I have > tested various SQL statements against the America's Army installer database > and iterated through the queries. Great. Can you package up the tests as Wine conformance tests? That would be very useful; it might even provide the nudge needed for an MSI expert to fix the problem. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

3 5

Re: Added initial version of Wine OleView
by James Hawkins 03 Jun '06

03 Jun '06

On 6/3/06, Piotr Caban <piotr.caban(a)gmail.com> wrote: > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA The address has changed, and we recently did a sweep of the code base changing to the new address, so we'd like to keep the old address out. * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +/* BINRES toolbar.bmp */ +IDB_TOOLBAR BITMAP DISCARDABLE toolbar.bmp +/* { +'42 4d 36 12 00 00 00 00 00 00 36 00 00 00 28 00' +'00 00 60 00 00 00 10 00 00 00 01 00 18 00 00 00' +'00 00 00 12 00 00 12 0b 00 00 12 0b 00 00 00 00' The patch is quite large by Wine's standards. You could reduce the size by taking out the bitmap for now and sending that separately; otherwise, it looks good and keep up the good work! -- James Hawkins

1 0

Re: Built-in iexplore
by Jonathan Ernst 03 Jun '06

03 Jun '06

Le vendredi 02 juin 2006 à 13:42 -0700, Brandon a écrit : > Daniel Skorka wrote: > > Oleksii Krykun <krikun(a)academy.kiev.ua.nospam> wrote: > > > $ wine iexplore > > > fixme:shdocvw:IEWinMain "" 1 > > > fixme:ole:CoResumeClassObjects stub > > > Could not load Mozilla. HTML rendering will be disabled. > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > Where is aq problem? > > > > Guess. > > I get the same thing even though I have mozilla installed. I'm using > wine in 64-bit linux, though, so that probably has something to do with > it. You don't need mozilla, but the Mozilla activex control : http://source.winehq.org/mozactivex I don't know why shdocvw doesn't prompt the user to install it in this case though (so I'm CCing wine-devel and Jacek to see if something has to be changed in nsembed.c). Best regards. Jonathan Ernst

1 0

Re: Re: Re: Wine 1.0 Tasks
by fenix＠club-internet.fr 03 Jun '06

03 Jun '06

----Message d'origine---- >Date: Fri, 2 Jun 2006 21:27:53 +0200 >De: Lionel Ulmer <lionel.ulmer(a)free.fr> >A: Dan Kegel <dank(a)kegel.com> >Copie à: wine-devel(a)winehq.org, >Sujet: Re: Re: Wine 1.0 Tasks > >On Tue, May 30, 2006 at 05:32:26PM -0700, Dan Kegel wrote: >> On 5/30/06, Scott Ritchie <scott(a)open-vote.org> wrote: >> > > It might be, but the heavy hitters I know of who have taken a look at >> > > it in detail have concluded that an X change really is needed.] >> > >> > Is this really a problem? Another version of X is due out in about 4 >> > months (probably the earliest we could possibly see Wine 1.0), so why >> > can't we just help write an X extension to tackle the bug? >> >> Not really a problem. It'll just take some time to trickle out to the world. >> We may also have to get Nvidia and ATI on board so they can implement >> the extension in their drivers. > >And for it to be taken, I guess we would need to not only write the >extension, but a 'reference implementation' (I would guess in DRI / Mesa) >and get it approved by the FD.o people. > >But ohsix's idea to use 'real' X windows 'overlaid' over the single Wine X >window would be the easiest idea to investigate (because it would not only >fixes this issue but also the mutiple windows with multiple pixel formats >problem that the former 'extension' solution does not). > i thought the same idea. But investigation modifications in x11drv to permit wine x pixmaps access for wined3d/opengl will fix many problems (but not hthe multiple pixel formats) Anyway we must move some code of wined3d and opengl32 (GLX code, etc...) to x11drv as it permit : - to handle this problems without hacks (ie many ExtEscape) - to help macos-X to port wined3d and opengl (all specific cost must be on x11drv/qwartwdrv) > Lionel (in 'not even time to read wine-devel' mode :-) ) > Well, at least i take time for it :) (and reviewing the flood of d3d patches) Waiting for you for coding :p Regards, Raphael

1 0

Re: How are we doing?
by Juan Lang 03 Jun '06

03 Jun '06

> Especially the code that is responded to as , I know it's a mess to > look at, but I didn't write it. Can you give us examples? Mostly Wine attempts to follow how Windows works, so MSDN provides a lot of the documentation. This is becoming increasingly true, with kernel32 being implemented on top of ntdll. There are bits that are hard to understand, certainly, and some areas could use some comments. Unfortunately sometimes the lack of comments demonstrates a lack of understanding, but the code works for someone, somewhere, so we're mostly afraid to touch it until some brave soul comes along. For example, SHFileOperation was a complete mess until James fixed it up. Another example is user32. It's impossible to document (in English) what it's supposed to be doing. For this, and many other cases, a good regression test suite is the best documentation: it tells you what's expected, so if you go mucking around you have checks against introducing regressions. I know you've been working with msi lately. The fact that you've figured out where the problem is indicates to me that it's adequately commented, even if the learning curve is still a bit steep. Patches to add API comments for the Wine API guide (http://source.winehq.org/WineAPI/ ) are always welcome. Patches to document dodgy bits of code may or may not be accepted, but regression tests to justify dodgy bits of code are happily accepted too. http://source.winehq.org/WineAPI/ --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 3

Quartz driver
by Emmanuel Maillard 03 Jun '06

03 Jun '06

Hi all, Quartz driver is up to date on Darwine CVS. Winemine is playable on both PPC and x86 but it look fine only on PPC, x86 driver suffer strange rendering bugs. See wiki for building the driver : http://wiki.opendarwin.org/ index.php/Darwine:quartzdrv I will update wiki soon with issues and todo for Quartz driver. Cheers Emmanuel

3 2

Re: Re: Wine 1.0 Tasks
by fenix＠club-internet.fr 02 Jun '06

02 Jun '06

Hi, >> (Note the #3902 should be renamed as 'DIB Engine rewrite' > >Agreed; done. http://bugs.winehq.org/show_bug.cgi?id=3902 :) >> and i don't think is mandatory for 1.0) > >Probably right. Let's create the next milestone after 1.0, say 1.1, and start >retargeting bugs we don't plan to fix for 1.0. (That's what GCC does; >some bugs they retarget early, some just before the release.) > >> But i think we must fix users most hated bugs as: >> - dsound deadlocks/craps >> - openGL problems (multi contexts, fb/visual configs) >> - lotus problems > >The OpenGL child window bug, >http://bugs.winehq.org/show_bug.cgi?id=2398 >probably won't be fixed for 1.0 because it requires >an X server change. No it must be doable without X changes (But X additions as GLX_EXT_texture_from_pixmap will help a lot). Only problem is to find time to fix it (as lionel, i have no time for now). Anyway i having a simple and downloadable application to reproduce this problem (not lightwave) must help. The only parts who really needs X change are for: - glShareList: sharing fb/visual config between exitings GLX contexts - dinput mouse management >I'm not sure lotus notes problems should block 1.0, as IBM has a native >Linux client now, but if someone wants to fix them (especially the ones >in usp10.dll netapi32.dll, that would be great. agree :) >> Note: it will be interesting to add user votes to wine-bugs (ala kde) to >> better see user needs. > >There are already user votes in bugzilla, that should suffice. >- Dan Oups i never seen it :) Regards, Raphael

9 11

Re: Missing LeaveCriticalSection on error paths (found by Smatch).
by Michael Stefaniuc 02 Jun '06

02 Jun '06

Michael Stefaniuc wrote: > can somebody more familiar with this code confirm that on the error > paths the CriticalSection should be released? I'm not sure about it as > the function is supposed to keep the lock held when exiting without > error; there is a d3ddevice_unlock_update() function that releases the > lock. Asked Lionel Ulmer on irc and the patch is correct. But according to Stefan Dösinger that code will be replaced by his code "in the next couple of days". bye michael > --- > > dlls/ddraw/device_opengl.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > dd0b9b20d26984ae408c1a7727323a08d44e0d95 > diff --git a/dlls/ddraw/device_opengl.c b/dlls/ddraw/device_opengl.c > index d19996e..4c663a6 100644 > --- a/dlls/ddraw/device_opengl.c > +++ b/dlls/ddraw/device_opengl.c > @@ -3775,10 +3775,12 @@ static void d3ddevice_lock_update(IDirec > buffer_color = GL_BGRA; > } else { > ERR(" unsupported pixel format at device locking.\n"); > + LeaveCriticalSection(&(d3d_dev->crit)); > return; > } > } else { > ERR(" unsupported pixel format at device locking - alpha on frame buffer.\n"); > + LeaveCriticalSection(&(d3d_dev->crit)); > return; > } > > > > ------------------------------------------------------------------------ > > -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

1 0

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 June 2006