wine-devel

wine-devel@winehq.org

11 participants
84462 discussions

Re: RegSetValueEx problem?
by Alexandre Julliard 11 Apr '01

11 Apr '01

gerard patel <gerard.patel(a)asi.fr> writes: > I have browsed server/registry.c and it seems that the registry > stores a terminating null for strings; so if you have in the registry > file a string like "0123456789", it get in memory a length of 11. > So I guess that the fix would be to fix the length by -1 somewhere > in the path server->ntdll->advapi No, the current behavior is correct for NT; what you want is a version check to get the Win95 behavior. Something like the patch below should do it (and of course WineMine should be fixed to work on NT too). Index: dlls/advapi32/registry.c =================================================================== RCS file: /opt/cvs-commit/wine/dlls/advapi32/registry.c,v retrieving revision 1.24 diff -u -r1.24 registry.c --- dlls/advapi32/registry.c 2001/03/23 19:12:01 1.24 +++ dlls/advapi32/registry.c 2001/04/09 20:49:35 @@ -640,8 +640,12 @@ { UNICODE_STRING nameW; - if (count && is_string(type)) + if (GetVersion() & 0x80000000) /* win95 */ { + if (type == REG_SZ) count = strlenW( (WCHAR *)data ) + sizeof(WCHAR); + } + else if (count && is_string(type)) + { LPCWSTR str = (LPCWSTR)data; /* if user forgot to count terminating null, add it (yes NT does this) */ if (str[count / sizeof(WCHAR) - 1] && !str[count / sizeof(WCHAR)]) @@ -663,7 +667,11 @@ WCHAR *dataW = NULL; NTSTATUS status; - if (count && is_string(type)) + if (GetVersion() & 0x80000000) /* win95 */ + { + if (type == REG_SZ) count = strlen(data) + 1; + } + else if (count && is_string(type)) { /* if user forgot to count terminating null, add it (yes NT does this) */ if (data[count-1] && !data[count]) count++; -- Alexandre Julliard julliard(a)winehq.com

2 1

VxD information
by Maurice van der Pot 11 Apr '01

11 Apr '01

I'd like to get started on VxD support, but I'm unable to find any useful documentation on how it's implemented in Wine. I've been looking through the sources (e.g. vxd.c, wprocs.spec) but I can't find the connection between a call to int 2F and a call to the functions in vxd.c. Regards, Maurice van der Pot.

1 0

Re: Traces: fs -> tid
by Alexandre Julliard 10 Apr '01

10 Apr '01

Francois Gouget <fgouget(a)free.fr> writes: > But maybe we could ask for traces generated with +relay,+tid instead > of just +relay. > Also when you're working on a specific application for which you have > determined that threads don't play a role, then you would have the > option of omitting the +tid to get simpler traces. I disagree, I think the thread information is important even if you are not chasing a thread problem, simply to tell you which calls are part of the same sequence. It's not possible to make sense of any relay trace if the calls made from different threads cannot be distinguished. If the tid really disturbs you, you can always pipe the output into a sed 's/tid=.*//' or something similar. -- Alexandre Julliard julliard(a)winehq.com

3 2

Traces: fs -> tid
by Francois Gouget 10 Apr '01

10 Apr '01

I noticed that fs was replaced by tid in relay (and snoop & co too now). I propose a slightly different version based on the following premises: * when suspecting a threading problem it could be nice to tag each trace with the id of the thread that emits it * when there's no thread issue, then fs and tid are unnecessary and only clutter the traces by making lines longer and harder to read * I find that lines are more readable if the thread id comes first as it's always the same length and doesn't mess up the alignment of the other fields So this patch adds a debug channel called 'tid' which activates printing the tid as the first field of all traces. Actually, it might make sense to merge 'tid' with the 'thread' debug channel. 'Screenshot': 08063178:Call user32.DispatchMessageA(405b6e50) ret=00402135 08063178:trace:relay:WINPROC_CallWndProc (wndproc=0x401c74,hwnd=00000138,msg=WM_SYSCOMMAND,wp=0000f060,lp=00000000) 08063178:Call user32.DefWindowProcA(00000138,00000112,0000f060,00000000) ret=0040206c Comments? Changelog: * dlls/ntdll/ntdll.spec Declare the tid debug channel * dlls/ntdll/debugtools.c, relay32/relay386.c, relay32/snoop.c Output the current thread id as the first field if tid is turned on -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ La terre est une bêta...

2 3

Re: [PATCH] Add Callback for wavemapper -> widOpen
by Alexandre Julliard 09 Apr '01

09 Apr '01

"James Hatheway" <james(a)macadamian.com> writes: > I implemented the callback in a very similar way as the Wave out callback > is implemented. You can see this in the functions wodOpen(), wodOpenHelper(), > and WAVEMAP_DstCallback() , look at the data passed in the wom structure > (in dlls/winmm/wavemap/wavemap.c). I don't see any other way that I will > be able to callback into the app when the WineOSS layer notifies the wavemap > layer. The way it is now (wineoss directly calling the app) > causes my app to crash, and doesn't work that way on waveout. But these other functions are not using the WINE_MLD internal winmm structure, so why do you need it in widOpen()? Couldn't you instead do exactly what wodOpen() does? -- Alexandre Julliard julliard(a)winehq.com

3 5

Re: RegSetValueEx problem?
by gerard patel 08 Apr '01

08 Apr '01

At 10:54 AM 08/04/2001 +0100, you wrote: > >I've found time to do some more digging, but I'm still stumped. <snip> I have browsed server/registry.c and it seems that the registry stores a terminating null for strings; so if you have in the registry file a string like "0123456789", it get in memory a length of 11. So I guess that the fix would be to fix the length by -1 somewhere in the path server->ntdll->advapi I have tried this but I am not sure at all this is correct : --- registry.c.orig Mon Mar 5 20:34:21 2001 +++ registry.c Sun Apr 8 18:11:39 2001 @@ -799,14 +799,17 @@ struct key_value *value; int index; size_t ret = 0; + size_t l; if ((value = find_value( key, name, &index ))) { *type = value->type; - *len = value->len; - if (value->data && offset < value->len) + l = value->len; + if ((value->type == REG_SZ) && l) l--; + *len = l; + if (value->data && offset < l) { - if (maxlen > value->len - offset) maxlen = value->len - offset; + if (maxlen > l - offset) maxlen = l - offset; memcpy( data, (char *)value->data + offset, maxlen ); ret = maxlen; } Gerard

2 1

Wrc question
by gerard patel 08 Apr '01

08 Apr '01

I have looked at wrc code and there is a strange 100K limit on the size of mem allocation : assert(size > 0); assert(size < 102400); res = malloc(size); if(res == NULL) { Baffling code - hardcoded limit hidden in a C file :-/ I removed the assert and wrc was able to handle a 1 megabyte bitmap. Anyone has an idea about the meaning of this limit ? Gerard

2 1

Re: debugger startup
by gerard patel 08 Apr '01

08 Apr '01

At 06:32 PM 07/04/2001 +0200, you wrote: <snip> >the setup was that the AeDebug registry key pointed to a shell script, >which in turn, >launched the real debugger (used to set up different context options, >and such) ah that was the problem ? from the bug reports on the news group I had the idea that the key was just not initialized. <snip> >either we decide that shell scripts shouldn't be used (easy solution) The script has an utility, no ? I don't know what it's doing, is the goal to configure the debugger options ? (if yes, maybe using an environment variable could give the same result ??) Gerard

1 0

Re: RegSetValueEx problem?
by davep 08 Apr '01

08 Apr '01

On Sun, 01 Apr 2001, you wrote: > At 01:59 PM 31/03/2001 +0100, you wrote: > > <snip> > >Compiling and running Winemine under Windows 95 this problem doesn't occur. > >Win95 truncates the value at the first null. > > Under NT4 SP6, if I write (for example) '47' + 0 + 13 bytes of garbage, I get > exactly that when querying with the same buffer length (16). > If I use a longer buffer, one binary 0 is appended. > If I use a shorter buffer, nothing is copied and the function does not succeed > (ERROR_MORE_DATA). > > Of course under Regedit the garbage is not displayed; regedit displays only '47' > in this case. I've found time to do some more digging, but I'm still stumped. This is the trace from WineMine saving one parameter in the registry (-debugmsg +relay,+reg): Call advapi32.248: RegSetValueExA(00000038,4038cae0 "Xpos",00000000,00000001,405e66a0,00000010) ret=40388dc8 fs=008f Call kernel32.643: MultiByteToWideChar(00000000,00000000,405e66a0 "3",00000010,00000000,00000000) ret=407c4fe9 fs=008f Ret kernel32.643: MultiByteToWideChar() retval=00000010 ret=407c4fe9 fs=008f Call kernel32.553: HeapAlloc(40390000,00000000,00000020) ret=407c4fff fs=008f Ret kernel32.553: HeapAlloc() retval=403d62fc ret=407c4fff fs=008f Call kernel32.643: MultiByteToWideChar(00000000,00000000,405e66a0 "3",00000010,403d62fc,00000010) ret=407c5023 fs=008f Ret kernel32.643: MultiByteToWideChar() retval=00000010 ret=407c5023 fs=008f Call ntdll.419: RtlInitAnsiString(405e658c,4038cae0 "Xpos") ret=407c5038 fs=008f Ret ntdll.419: RtlInitAnsiString() retval=00000000 ret=407c5038 fs=008f Call ntdll.281: RtlAnsiStringToUnicodeString(40113578,405e658c,00000000) ret=407c504d fs=008f Ret ntdll.281: RtlAnsiStringToUnicodeString() retval=00000000 ret=407c504d fs=008f Call ntdll.230: NtSetValueKey(00000038,40113578,00000000,00000001,403d62fc,00000020) ret=407c5067 fs=008f trace:reg:NtSetValueKey (0x38,L"Xpos",1,0x403d62fc,32) Ret ntdll.230: NtSetValueKey() retval=00000000 ret=407c5067 fs=008f Call kernel32.559: HeapFree(40390000,00000000,403d62fc) ret=407c5083 fs=008f Ret kernel32.559: HeapFree() retval=00000001 ret=407c5083 fs=008f Call ntdll.466: RtlNtStatusToDosError(00000000) ret=407c5089 fs=008f Ret ntdll.466: RtlNtStatusToDosError() retval=00000000 ret=407c5089 fs=008f Ret advapi32.248: RegSetValueExA() retval=00000000 ret=40388dc8 fs=008f So the 16-byte buffer (containing the character "3", a null, and 14 bytes of garbage) has been converted into a 32-byte unicode string and saved. Good. Inside the registry this looks like: "Xpos"="3\0\0\0`\x00ca7@\0\0\0\0\0\0\0@" Now if we read that value back in this is what happens: Call advapi32.236: RegQueryValueExA(00000034,4038cae0 "Xpos",00000000,405e6970,405e697c,405e6974) ret=40388a38 fs=008f trace:reg:RegQueryValueExA (0x34,"Xpos",(nil),0x405e6970,0x405e697c,0x405e6974=16) Call ntdll.419: RtlInitAnsiString(405e6764,4038cae0 "Xpos") ret=407c5565 fs=008f Ret ntdll.419: RtlInitAnsiString() retval=00000000 ret=407c5565 fs=008f Call ntdll.281: RtlAnsiStringToUnicodeString(40113578,405e6764,00000000) ret=407c557a fs=008f Ret ntdll.281: RtlAnsiStringToUnicodeString() retval=00000000 ret=407c557a fs=008f Call ntdll.177: NtQueryValueKey(00000034,40113578,00000002,405e676c,00000100,405e6760) ret=407c55b0 fs=008f trace:reg:NtQueryValueKey (0x34,L"Xpos",2,0x405e676c,256) Ret ntdll.177: NtQueryValueKey() retval=00000000 ret=407c55b0 fs=008f Call kernel32.889: WideCharToMultiByte(00000000,00000000,405e6778 L"3",00000011,00000000,00000000,00000000,00000000) ret=407c56c9 fs=008f Ret kernel32.889: WideCharToMultiByte() retval=00000011 ret=407c56c9 fs=008f Call ntdll.466: RtlNtStatusToDosError(80000005) ret=407c57be fs=008f Ret ntdll.466: RtlNtStatusToDosError() retval=000000ea ret=407c57be fs=008f Ret advapi32.236: RegQueryValueExA() retval=000000ea ret=40388a38 fs=008f RegQueryValueEx maintains that there are 17 characters and since they won't fit in the buffer the function aborts. Incidentally, the "null-terminate if the user forgot" trick is carried out both in RegSetValueEx *and* RegQueryValueEx. Would not once be enough? -- Dave Pickles

1 0

debugger startup
by eric pouech 07 Apr '01

07 Apr '01

someone (IIRC Gérard) had issues when starting the debugger when an exception occured. the setup was that the AeDebug registry key pointed to a shell script, which in turn, launched the real debugger (used to set up different context options, and such) however, what happens is: - the main program (the one generating the exception) tries to launch the debugger using the AeDebug - the process creation forks, and exec:s the debugger program - at the unix level, the debugged program starts, which runs the shell script, which then starts the debugger - at the windows level, since the shell script isn't a Wine process, the call fails (even if an Unix process is created) - the exception handler then reports the error in process creation and stops the main program, whereas the debugger has been started for this program either we decide that shell scripts shouldn't be used (easy solution) or we could do something like : - if the CreateProcess fails, then wait for a certain amount of time. If after that time the current process isn't currently debugged, then report the error. Otherwise assume what did happen is what has been described above comments are welcome A+ -- --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) "The future will be better tomorrow", Vice President Dan Quayle

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