wine-devel

wine-devel@winehq.org

84487 discussions

RE: more misc fixes
by Patrik Stridvall 19 Jul '01

19 Jul '01

> Patrik Stridvall <ps(a)leissner.se> writes: > > > Ah. You are right, I orginally meant to add it in a > > different file (wine/obj_base16.h perhaps) but I didn't > > think it would matter since other 16 bit interface like > > IStream16 and IStorage16 is in wine/obj_*.h already. > > Perhaps they should be move out as well? > > > > If so to where? wine/obj_*16.h or perhaps the DLLs > directories if possible? > > The DLL directories definitely; and if possible in the .c file where > they are needed, to make it clear they must not be used from the > outside. Ah, yes. The implementing .c file, thats an idea. Like in dlls/lzexpand/lzexpand_main.c, I guess you mean? > > In addition (as I hinted in 5.) requiring all non-static functions > > to have a .h file declaration is good policy for any application > > including Wine. Hint, if a function isn't static somebody else > > should use it otherwise some else is wrong, ie it really should > > be static after all. > > All 16-bit API functions must be treated as if they were static. Well we could actually make them truely static with a little trickery and a corrensponding change of winebuild. Idea: #define DECLARE_ENTRY_POINT16(module, function) \ void *module##_p##function = (void *) &function /* After the includes */ static void Foo(void *, int); DECLARE_ENTRY_POINT16(BAR, Foo); /* ... */ static void Foo(void *, int) { /* ... */ } It is probably not worth the trouble though. > They > cannot be because of the spec file reference, but ideally no code > should ever call a 16-bit API, it should use the corresponding 32-bit > API. Adding prototypes and a header file is only going to encourage > using these functions which is not what we want. OK. So what you really what is exactly the opposite of what I tried to do? You want all 16-bit exported function prototypes moved from the .h files to the implementing .c file in all cases that is is possible (ie Wine compiles without errors or warnings)? Do you also want the types and structures moved as well? That will often not be possible, but do you want it despite this in the cases where it is possible?

1 0

RE: Lots of #defines OK?
by Patrik Stridvall 19 Jul '01

19 Jul '01

> Patrik Stridvall wrote: > > Not really, but as an alternative solution you could has a structure > > instead of an array like: > > > > typedef struct { > > GLYPHNAME A; > > GLYPHNAME AE; > > GLYPHNAME AEacute; > > GLYPHNAME AEsmall; > > /* ... */ > > } GLYPHNAMES; > > > > Perhaps this is better since it doesn't use the preprocessor. > > I not thought of that -- neat idea. What is the downside of using the > preprocessor, however? Well, the preprocessor "pollutes" the namespace in a way that is sometimes bad and my solution gives IMHO a slightly nicer syntax. Is this case in don't think it matters so much though, your orginal solution is fine, in fact is the standard solution in C to the problem you have AFAIK. My suggestion is really just brainstorming to give you hopefully a different perspective of the issue. Also note that your solution is not possible with languages that don't have pointer aritmetics that C, fortunately or unluckily depending on how you see it, have.

2 1

Re: more misc fixes
by Alexandre Julliard 19 Jul '01

19 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > Ah. You are right, I orginally meant to add it in a > different file (wine/obj_base16.h perhaps) but I didn't > think it would matter since other 16 bit interface like > IStream16 and IStorage16 is in wine/obj_*.h already. > Perhaps they should be move out as well? > > If so to where? wine/obj_*16.h or perhaps the DLLs directories if possible? The DLL directories definitely; and if possible in the .c file where they are needed, to make it clear they must not be used from the outside. > In addition (as I hinted in 5.) requiring all non-static functions > to have a .h file declaration is good policy for any application > including Wine. Hint, if a function isn't static somebody else > should use it otherwise some else is wrong, ie it really should > be static after all. All 16-bit API functions must be treated as if they were static. They cannot be because of the spec file reference, but ideally no code should ever call a 16-bit API, it should use the corresponding 32-bit API. Adding prototypes and a header file is only going to encourage using these functions which is not what we want. -- Alexandre Julliard julliard(a)winehq.com

1 0

RE: more misc fixes
by Patrik Stridvall 19 Jul '01

19 Jul '01

> Patrik Stridvall <ps(a)leissner.se> writes: > > > Index: wine/include/wine/obj_base.h > > =================================================================== > > RCS file: /home/wine/wine/include/wine/obj_base.h,v > > retrieving revision 1.40 > > diff -u -u -r1.40 obj_base.h > > --- wine/include/wine/obj_base.h 2001/05/07 18:15:40 1.40 > > +++ wine/include/wine/obj_base.h 2001/07/19 14:50:28 > > @@ -34,6 +34,8 @@ > > #include "wtypes.h" > > #include "guiddef.h" > > > > +#include "wine/windef16.h" > > This is wrong; Win32 header files must not include 16-bit ones. Ah. You are right, I orginally meant to add it in a different file (wine/obj_base16.h perhaps) but I didn't think it would matter since other 16 bit interface like IStream16 and IStorage16 is in wine/obj_*.h already. Perhaps they should be move out as well? If so to where? wine/obj_*16.h or perhaps the DLLs directories if possible? > Also please avoid adding more 16-bit headers in include/wine, there > are already too many of them. Well that was the idea at first but at least of the new ones are was needed in more that one directory some I ended up adding all of them there. But sure I can move the ones that are not use in more of one directory to that directory, I'm just a little worried that since the wine/*16.h header are 16-bit "mirrors" of the corresponding 32-bit files that functions from other DLLs happends to end up there as well. Microsoft seems have mixed headers and DLLs without much thought especially as far as OLE is concerned. Sure we can have several .h files with the same name in different DLL directories as far as functions are concerned since 16-bit functions shouldn't call across different DLLs anyway, but duplicating types and such are not a very good idea. But sure I can examine the files more carefully and see if it is possible and of course we can add it to a DLL directory first and then move it to include/wine if is because nessary in the future. > These headers (when they are really > necessary) belong in their respective dll directory. And BTW your new > lzexpand16.h is an example of a header file that is *not* necessary. Nessary for compiling Wine no, clearly not since it already compiles. However IMO all exported functions whether they are 16-bit or 32-bit and whether they are actually uses by other files or not should have declarations in some header file. For 32-bit it must obviously be so because of Winelib. The undocumented functions is of course not strictly nessary but I see not reason not to have them as a Wine extension that can be ported to Windows eventually in order to have the same source on both Unix and Windows. For 16-bit is seems that you disagree. Well, the advantages that I can think of for doing it for 16-bit as well is the following. 1. It makes it much easier for developer to add calls across files between 16-bit functions or move functions between files if the infrastructure is alreay in place. 2. It makes it possible to see related 16-bit functions together in a .h file instead of having to search the .c files. 3. It makes it possible go through each 16-bit .h file compare it with Windows and add the missing functions in the .h files and when somebody in the future runs winapi_check (or whatever) it is possible to present a list of what is not yet implemented. Sure the .spec contains that information as well in some meaning but it misses which functions that are actually listed in the 16-bit header files and thus likely to actually be used by real applications. 4. Since some of the 16-bit exported functions must be declared in some .h since it is used in some of file than it was declared, it is be much easier to require all 16-bit export function to be declared since it is difficult to tell which that are (or will be) really needed. 5. There is nothing unreasonable to require every non-static function let alone functions that are exported by either Win16 or Win32 to have a declaration in some .h files. Indeed tools like lint (at least on Solaris) have flags to check for this. In short trying to only add the 16-bit functions that are stricly nessary to .h files is more trouble than it is worth, especially compare to the advantages that having all of them .h files. In addition (as I hinted in 5.) requiring all non-static functions to have a .h file declaration is good policy for any application including Wine. Hint, if a function isn't static somebody else should use it otherwise some else is wrong, ie it really should be static after all. But OK. You think that there are too many 16-bit files in include/wine. No problem. I will try to avoid it if at all possible.

1 0

Re: more misc fixes
by Alexandre Julliard 19 Jul '01

19 Jul '01

Patrik Stridvall <ps(a)leissner.se> writes: > Index: wine/include/wine/obj_base.h > =================================================================== > RCS file: /home/wine/wine/include/wine/obj_base.h,v > retrieving revision 1.40 > diff -u -u -r1.40 obj_base.h > --- wine/include/wine/obj_base.h 2001/05/07 18:15:40 1.40 > +++ wine/include/wine/obj_base.h 2001/07/19 14:50:28 > @@ -34,6 +34,8 @@ > #include "wtypes.h" > #include "guiddef.h" > > +#include "wine/windef16.h" This is wrong; Win32 header files must not include 16-bit ones. Also please avoid adding more 16-bit headers in include/wine, there are already too many of them. These headers (when they are really necessary) belong in their respective dll directory. And BTW your new lzexpand16.h is an example of a header file that is *not* necessary. -- Alexandre Julliard julliard(a)winehq.com

1 0

RE: Lots of #defines OK?
by Patrik Stridvall 19 Jul '01

19 Jul '01

> I would like to get rid of the "hardcoded" offset into the glyph name > array and replace it with a macro ('GN_exclam', for example). > Each font > data file could then simply include a header that gets > regenerated when- > ever the glyphlist is changed -- eliminating the current > requirement to > regenerate all the font data. > > Anyone see any problems with this? (There are currently 1258 built-in > glyph names.) Not really, but as an alternative solution you could has a structure instead of an array like: typedef struct { GLYPHNAME A; GLYPHNAME AE; GLYPHNAME AEacute; GLYPHNAME AEsmall; /* ... */ } GLYPHNAMES; Perhaps this is better since it doesn't use the preprocessor. However I'm not sure if all C compilers supports 1258 structure members. Another possible problem is alignment on some platforms if you must be able for iterate over it and use it as and array. Of course you can simply have a seperate array of pointers like: GLYPHNAMES glyphnames = { /* ... */ }; GLYPHNAME *pGlyphnames[] = { &glyphnames.A; &glyphnames.AE; &glyphnames.AEacute; &glyphnames.AEsmall; /* ... */ };

2 1

Lots of #defines OK?
by Ian Pilcher 19 Jul '01

19 Jul '01

I'm giving some thought to cleaning up the data structures used by the PostScript driver. Any significant change here will require that the glyph list and font data be regenerated. This is not particularly difficult, but it would be easier if I could remove the dependency of the font data on the glyph name array. Each glyph's metrics include a pointer to its name, and all of the built-in glyph names are in a single array named PSDRV_AGLGlyphNames (in dlls/wineps/data/agl.c). So the metrics for a glyph look like this: { 33, 0x0021, 600, PSDRV_AGLGlyphNames + 907, { 236, -15, 364, 572 }, NULL /* exclam */ } I would like to get rid of the "hardcoded" offset into the glyph name array and replace it with a macro ('GN_exclam', for example). Each font data file could then simply include a header that gets regenerated when- ever the glyphlist is changed -- eliminating the current requirement to regenerate all the font data. Anyone see any problems with this? (There are currently 1258 built-in glyph names.) Thanks! -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ========================================================================

1 0

attempting to load mIRC32 5.91 using latest wine cvs
by mdew 19 Jul '01

19 Jul '01

mdew@storm:~$ /usr/local/bin/wine fake_windows/mIRC/mirc32.exe FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock err:module:BUILTIN32_dlopen failed to load .so lib for builtin x11drv.dll: /usr/lib/libwine_tsx11.so: undefined symbol: XF86DGAGetViewPortSize Could not load graphics driver 'x11drv' err:heap:HEAP_GetPtr Invalid heap 00000000! err:heap:HEAP_GetPtr Invalid heap 00000000! err:heap:HEAP_GetPtr Invalid heap 00000000! err:module:BUILTIN32_LoadLibraryExA loaded .so but dll display.dll still not found fixme:console:SetConsoleCtrlHandler (0x546e60,1) - no error checking or testing yet FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock err:module:BUILTIN32_dlopen failed to load .so lib for builtin x11drv.dll: /usr/lib/libwine_tsx11.so: undefined symbol: XF86DGAGetViewPortSize Could not load graphics driver 'x11drv' FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock FIXME:pthread_rwlock_rdlock FIXME:pthread_rwlock_unlock err:module:BUILTIN32_dlopen failed to load .so lib for builtin x11drv.dll: /usr/lib/libwine_tsx11.so: undefined symbol: XF86DGAGetViewPortSize Could not load graphics driver 'x11drv' err:module:BUILTIN32_LoadLibraryExA loaded .so but dll display.dll still not found err:module:BUILTIN32_LoadLibraryExA loaded .so but dll display.dll still not found err:heap:HEAP_GetPtr Invalid heap 00000000! err:heap:HEAP_GetPtr Invalid heap 00000000! err:heap:HEAP_GetPtr Invalid heap 00000000! err:module:BUILTIN32_LoadLibraryExA loaded .so but dll display.dll still not found err:module:BUILTIN32_LoadLibraryExA loaded .so but dll display.dll still not found err:heap:HEAP_GetPtr Invalid heap 00000000! err:heap:HEAP_GetPtr Invalid heap 00000000! spews this message out many times (then quits)..., using the same wine config ..as always.. Using Debian Sid x86 (gcc-2.95.4-XFree86-4.0.3)

2 1

Re: glibc bug mmap/malloc
by Gerard Patel 19 Jul '01

19 Jul '01

At 10:15 PM 18/07/2001 +0200, you wrote: <snip about glibc> >> > This is a BUG. While this glibc question is slightly offtopic here, I think that maybe a few people on this list could be interested in glibc, since the subject comes back on a regular basis... the following web page : http://sources.redhat.com/glibc is definitely the place to go. I feel that maybe this information could help someone, since I have wasted more than one hour searching www.gnu.org for the glibc mailing list archive :-) Also http://www.suse.de/~aj/Projects.html#glibc where it's said that Andrea Jaeger is responsible for glibc bug reports. Reading the archive gives me the impression that the whole glibc is written by no more than half a dozen programmers, btw. What's more, I have also the impression that these few are not even contributing full time to glibc :-/ Gerard

1 0

Problem with 'GetPrivateProfileString'
by Lionel Ulmer 18 Jul '01

18 Jul '01

Hi all, I have an installer crashing in 'GetPrivateProfileString' because of an NULL section pointer : 3 0x40076161 (GetPrivateProfileStringA+0x31(section=0x0, entry=0x40391efc, def_val=0x4039a394, buffer=0x403b0410, len=0x3e7, filename=0x4039a4e8) [profile.c:1232] in libntdll.so) (ebp=40586748) When looking at the code, there is the following comment (and code) : /* * undoc_feature means: * return section names string list if both section and entry are NULL. */ (...) if ((undoc_feature) && (section == NULL) && (entry == NULL)) /* undocumented; both section and entry are NULL */ But if I look at the entry for 'GetPrivateProfileString' in the MSDN, I get this : pAppName [in] Pointer to a null-terminated string that specifies the name of the section containing the key name. If this parameter is NULL, the GetPrivateProfileString function copies all section names in the file to the supplied buffer. lpKeyName [in] Pointer to the null-terminated string specifying the name of the key whose associated string is to be retrieved. If this parameter is NULL, all key names in the section specified by the lpAppName parameter are copied to the buffer specified by the lpReturnedString parameter. This is not in sync. with what Wine does.... It seems that only pAppName needs to be NULL to return a section name list. And there is another behaviour not done by Wine yet : copy all the keys of a section to the output buffer. So who is the author of this 'undocumented' feature in the Wine code ? Do you all agree that I should code it according to the (now) documented feature ? Lionel -- Lionel Ulmer - http://www.bbrox.org/

2 1

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