wine-devel

wine-devel@winehq.org

84463 discussions

Re: WSAStartup fix
by Eric Pouech 16 Jul '02

16 Jul '02

Rein Klazes a écrit : > > Hi, > > This fixes a case of stack corruption in "the bat!" email program. > > Windows WSAStartup() (tested with win98 and win2K') doesn't fill in or > use the WSADATA's lpVendorInfo field, and apparently this program has > cut the field from the structure accordingly according to MSDN, this should only be done if version >= 2 is requested IMO, your patch should take care of the version requested before filling the different fields A+

2 1

Re: __sparc__ not defined with Forte C
by Gregg Mattinson 16 Jul '02

16 Jul '02

Alright, makes sense. Since I don't know what you mean by "all compilers," I added a configure test and I will make sure __sparc__ is used everywhere. In regards to the second point (@function vs. 2), something has been bugging me for a while... Why do the .spec.c files have so much assembly code in them? To me, it looks like most of it could be replaced with an array and some creative use of global variables. I'm willing to tackle the task of converting the .spec.c files to use as much C as possible, but I can only test it on sparc. Someone else would have to test it on i386 and with native .dlls Gregg >To: Gregg Mattinson <gm138242(a)opcom-mail.canada.sun.com> >Cc: wine-devel(a)winehq.com >Subject: Re: __sparc__ not defined with Forte C >From: Alexandre Julliard <julliard(a)winehq.com> >Date: 15 Jul 2002 18:49:04 -0700 >User-Agent: Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Common Lisp) >MIME-Version: 1.0 > >Gregg Mattinson <gm138242(a)scot.canada.sun.com> writes: > >> ChangeLog: dlls/ntdll/signal_sparc.c include/basetsd.h >> include/wine/port.h server/context_sparc.c >> - __sparc__ is not defined with Forte C, but __sparc is defined with both Forte >> and GCC. Same goes for __sun__ > >If __sparc and __sun work for all compilers we should use them >everywhere, no need to try to support other forms. Otherwise it should >be done with a configure test like we do for __i386__. > >> - Forte C doesn't like @function. Replaced it with 2. > >This needs a configure test. A #ifdef SUNPRO_C is almost always the >wrong thing to do. > >-- >Alexandre Julliard >julliard(a)winehq.com

2 1

OLE classes registration
by Andriy Palamarchuk 16 Jul '02

16 Jul '02

While researching bug 853 I found out that OleLoadFromStream fails if the specified OLE class is not registered. Many our OLE classes are not registered. Just submitted a patch to register CLSID_StdFont class which fixes the bug. Should I also add the registry etries for all other OLE classes? Thanks, Andriy __________________________________________________ Do You Yahoo!? Yahoo! Autos - Get free new car price quotes http://autos.yahoo.com

2 2

Re: Avoid crash
by P. Christeas 16 Jul '02

16 Jul '02

Dominik Strasser wrote: > I had a crash where This->pTypeInfo was 0. > I didn't investigate the real culprit. > > Changelog: avoid crash on NULL pointer I read your patch; I didn't investigate it either. I think you should put the test inside the ITypeInfo_Release() fn. Your patch may solve this case, but what happens when that fn is mis-called from somewhere else? This is a general matter of programming style. Moreover, you could add some TRACE or warning point. There was a conversation on what to do in such cases (where we could handle a NULL, but M$ may not). I suggest: warn and try to go on..

1 0

Re: SHLWAPI ole32 (delay-load of dlls)
by juergen.schmied＠debitel.net 16 Jul '02

16 Jul '02

The LoadLibrary call comes from the implementation of DelayLoad ;-). ------------x8----------- http://www.microsoft.com/MSJ/1298/win32/win321298.htm When the application runs, a call to a delay-loaded function actually calls the __delayLoadHelper function instead. This function references the special table I mentioned previously, and knows to call LoadLibrary followed by GetProcAddress. Once the address of the delay-loaded function is obtained, __delayLoadHelper fixes up calls to this function so that future calls go directly to the delay-loaded function. Note that other functions in the same DLL will still have to be fixed up the first time you call them. Also, you can specify the /DelayLoad linker switch multiple times, once for every DLL that you want to delay-load. ------------x8----------- juergen Jon Griffiths <jon_p_griffiths(a)yahoo.com> schrieb: > Hi, > > The following (shortened) trace from native SHLWAPI v6 shows that > StrRetToBufA is implemented using LoadLibrary/GetProcAddress to call > CoTaskMemFree, even though ole32 is imported by this version. > > 08073b00:CALL xpshlwapi.790: StrRetToBufA(<unknown, check > return>08073b00 > 08073b00:Call kernel32.LoadLibraryA(70bf2c30 "ole32.dll") > ret=70c29f2a > 08073b00:Ret kernel32.LoadLibraryA() retval=40a99000 ret=70c29f2a > 08073b00:Call kernel32.GetProcAddress(40a99000,70c2a412 > "CoTaskMemFree") ret=70c2a027 > 08073b00:Call ole32.CoTaskMemFree(403979e0) ret=70bfa1e2 > 08073b00:Ret ole32.CoTaskMemFree() retval=00000001 ret=70bfa1e2 > 08073b00:RET xpshlwapi.790: > StrRetToBufA(405c6c3c,00000000,405c6d4c,00000100) retval = 00000000 > ret=4001d283 > > If you still want to link directly in this case, ignore the patch > "SHLWAPI ole32" and apply the one below instead. This one just > removes winreg.h from shlwapi_main.c. > > Cheers, > Jon >

2 1

Re: Bug Fix: WM_GETTEXT should return NULL string if LB_GETCURSEL is LB_ERR
by Carl Sopchak 16 Jul '02

16 Jul '02

On Monday, July 15, 2002 10:15 pm, wine-devel-request(a)winehq.com wrote: > > If VC does have a "one correct way", while gcc doesn't, shouldn't we > > prefer the VC correct one? > > No - you should the one that is in the C standard. > > > In this case '0' should be ok under ALL circumstances. > (Unless M$ have completely stuffed their compiler) > > > David I'd have to agree with David, that the code should work under all circumstances. So, should this be modified, and another patch submitted? I'd be happy to do that, if it makes life easier... (Reiterating: I'm no C guru, and I know less about unicode, so let me know "the best way", and I'll be happy to change it if needed...) Once again, the code in question: if (unicode) { LPWSTR lpText = (LPWSTR)lParam; lpText[0] = '\0'; } else { LPSTR lpText = (LPSTR)lParam; lpText[0] = '\0'; } return 0; Carl

1 0

Re: PATCH: [Bug 671] Valve Hammer Editor does not run - recursion in buddySupperClassWndProc
by Dimitrie O. Paun 16 Jul '02

16 Jul '02

On June 5, 2002 12:31 am, Guy L. Albertelli wrote: > Ok, the loop was due to constant setting of the buddy wndproc because the > retrieve of the wndproc did not match. The match failed because the > application > program added a wndproc (its own) to the buddy window. The fix will be > submitted to wine-patches. Hmm, I see. But with this fix, it means that you can not change the wndproc of the buddy once set. This can not be right... Also, you broke the UDM_SETBUDDY. I this the correct fix is to add the flag as a property on the buddy, not on the UpDown... -- Dimi.

3 2

Re: SHBrowseForFolderW
by Uwe Bonnes 16 Jul '02

16 Jul '02

>>>>> "Jon" == Jon Griffiths <jon_p_griffiths(a)yahoo.com> writes: Jon> ChangeLog: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Jon> +dlls/shell32/shell32.spec,dlls/shell32/brsfolder.c Implement Jon> SHBrowseForFolderW Where's the patch? :-) Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0

Re: __sparc__ not defined with Forte C
by Alexandre Julliard 16 Jul '02

16 Jul '02

Gregg Mattinson <gm138242(a)scot.canada.sun.com> writes: > ChangeLog: dlls/ntdll/signal_sparc.c include/basetsd.h > include/wine/port.h server/context_sparc.c > - __sparc__ is not defined with Forte C, but __sparc is defined with both Forte > and GCC. Same goes for __sun__ If __sparc and __sun work for all compilers we should use them everywhere, no need to try to support other forms. Otherwise it should be done with a configure test like we do for __i386__. > - Forte C doesn't like @function. Replaced it with 2. This needs a configure test. A #ifdef SUNPRO_C is almost always the wrong thing to do. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: About VirtualQueryEx hack
by Eric Pouech 15 Jul '02

15 Jul '02

> > I have a hack for VirtualQueryEx for Linux, but Alexandre will never > > accept it (but if someone needs it, I can provide it) > > May you post it to me ? cc'ing wine-devel if others are interested of course, it'll only work on linux (but it wouldn't be too hard to make it work on other OSes) (you need to run tools/make_request after applying the patch and before re-configuring and re-compiling) A+ Name: vqex ChangeLog: added implementation for VirtualQueryEx (linux only) License: X11 GenDate: 2002/07/15 18:59:12 UTC ModifiedFiles: memory/virtual.c server/Makefile.in server/protocol.def AddedFiles: server/virtual.c =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/memory/virtual.c,v retrieving revision 1.80 diff -u -u -r1.80 virtual.c --- memory/virtual.c 3 Jul 2002 21:10:44 -0000 1.80 +++ memory/virtual.c 10 Jul 2002 21:46:31 -0000 @@ -1243,15 +1243,42 @@ * Number of bytes returned in information buffer */ DWORD WINAPI VirtualQueryEx( - HANDLE handle, /* [in] Handle of process */ - LPCVOID addr, /* [in] Address of region */ - LPMEMORY_BASIC_INFORMATION info, /* [out] Address of info buffer */ - DWORD len /* [in] Size of buffer */ ) + HANDLE handle, /* [in] Handle of process */ + LPCVOID addr, /* [in] Address of region */ + LPMEMORY_BASIC_INFORMATION pinfo, /* [out] Address of info buffer */ + DWORD len /* [in] Size of buffer */ ) { + int res; + MEMORY_BASIC_INFORMATION info; + if (MapProcessHandle( handle ) == GetCurrentProcessId()) - return VirtualQuery( addr, info, len ); - ERR("Unsupported on other process\n"); - return 0; + return VirtualQuery( addr, pinfo, len ); + + if (addr >= (void*)0xc0000000) return 0; + + SERVER_START_REQ( query_virtual_memory_info ) + { + req->handle = handle; + req->addr = ROUND_ADDR( addr, page_mask ); + + res = wine_server_call_err( req ); + if (!res) + { + info.State = reply->state; + info.Protect = VIRTUAL_Win32Flags[reply->protect]; + info.AllocationProtect = VIRTUAL_Win32Flags[reply->protect_other]; + info.Type = reply->type; + info.BaseAddress = reply->base_address; + info.AllocationBase = reply->alloc_base; + info.RegionSize = reply->size; + } + } + SERVER_END_REQ; + if (res) return 0; + + len = min(len, sizeof(info)); + memcpy(pinfo, &info, len); + return len; } Index: server/Makefile.in =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/server/Makefile.in,v retrieving revision 1.33 diff -u -u -r1.33 Makefile.in --- server/Makefile.in 9 May 2002 04:31:40 -0000 1.33 +++ server/Makefile.in 14 Jul 2002 17:00:22 -0000 @@ -39,6 +39,7 @@ trace.c \ unicode.c \ user.c \ + virtual.c \ window.c PROGRAMS = wineserver Index: server/protocol.def =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/server/protocol.def,v retrieving revision 1.39 diff -u -u -r1.39 protocol.def --- server/protocol.def 2 Jun 2002 21:22:22 -0000 1.39 +++ server/protocol.def 10 Jul 2002 21:44:11 -0000 @@ -1038,6 +1038,21 @@ @END +/* query a process virtual memory */ +@REQ(query_virtual_memory_info) + obj_handle_t handle; /* handle to the process */ + void* addr; /* address where to look at */ +@REPLY + int state; + int protect; + int protect_other; + int type; + void* base_address; + void* alloc_base; + int size; +@END + + /* Create a file mapping */ @REQ(create_mapping) int size_high; /* mapping size */ --- /dev/null Thu Jan 1 01:00:00 1970 +++ server/virtual.c Wed Jul 10 23:31:31 2002 @@ -0,0 +1,103 @@ +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +#include "process.h" +#include "request.h" + +static void query_virtual_memory_info(struct process* process, unsigned base, + struct query_virtual_memory_info_reply* reply) +{ + char buffer[MAX_PATH]; + FILE* file = NULL; + unsigned alloc_base = 0; + unsigned size = 0; + unsigned start, end; + unsigned vprot; + +#ifdef linux + if (process->thread_list) + { + sprintf(buffer, "/proc/%d/maps", process->thread_list->unix_pid); + file = fopen(buffer, "r"); + } +#endif + if (!file) + { + set_error(STATUS_NOT_SUPPORTED); + return; + } + + while (fgets(buffer, sizeof(buffer) - 1, file)) + { +#ifdef linux + char prot[5]; + unsigned shift, minor, major; + /* 407ac000-407ae000 rw-p 00007000 */ + + if (sscanf(buffer, "%x-%x %4s %08x %x:%x", &start, &end, prot, &shift, &major, &minor) != 6) + { + if (sscanf(buffer, "%x-%x %4s", &start, &end, prot) != 3) continue; + shift = 0; + major = minor = 0; + } + + vprot = 0; + if (prot[0] == 'r') vprot |= VPROT_READ; + if (prot[1] == 'w') vprot |= VPROT_WRITE; + if (prot[2] == 'x') vprot |= VPROT_EXEC; + if (prot[3] == 'p') vprot |= VPROT_WRITECOPY; +#endif + + if (end <= base) + continue; + if (base < start) + { + size = start - alloc_base; + goto noMap; + } + if (base < end) + { + alloc_base = start; + size = end - start; + + reply->state = MEM_COMMIT; /* FIXME: hard to tell MEM_RESERVE */ + reply->protect = vprot; + reply->protect_other = reply->protect; /* FIXME: hard to guesss */ + + reply->type = (major && minor) ? MEM_MAPPED : 0; /* FIXME */ + goto final; + } + alloc_base = end; + } + + size = 0xffff0000 - alloc_base; + + noMap: + reply->state = MEM_FREE; + reply->protect = 0; + reply->protect_other = 0; + reply->type = 0; + final: + reply->base_address = (LPVOID)base; + reply->alloc_base = (LPVOID)alloc_base; + reply->size = size - (base - alloc_base); + + fclose(file); + return; +} + +/* query information about a part of the memory */ +DECL_HANDLER(query_virtual_memory_info) +{ + struct process* process; + + if (!(process = get_process_from_handle( req->handle, PROCESS_VM_READ ))) + return; + + query_virtual_memory_info(process, (unsigned)req->addr, reply); +}

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