- Wine-Devel - list.winehq.org

Re: Wine release 20020804
by Rein Klazes Aug. 8, 2002

Aug. 8, 2002

On 04 Aug 2002 12:46:48 -0700, you wrote: > If you submitted a patch, please check to make sure it has been > included in the new release. Looking at the problems of the submittor of bug #952, I noticed that this patch wasn't applied: http://www.integrita.com/cgi-local/lwgate.pl/WINE-PATCHES/archives/2002-07/… Are there any objections? I think it is only reproducing Microsofts winsock behaviour more faithfully. Rein. -- Rein Klazes rklazes(a)xs4all.nl

1 0

Re: regarding bug 756
by Dimitrie O. Paun Aug. 7, 2002

Aug. 7, 2002

> From: Daniel Gudbjartsson <dfg(a)decode.is> > static int char2digit(char c, int base) { > - if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0'); > + if ((c>='0') && (c<='9') && (c<='0')+base-1) return (c-'0'); First off, I can't parse the above. It's A && B && C + base -1. What is that?!? If you intend to clean it up, make it more readable: + if (('0' <= c) && (c <= min('0'+base-1, '9')) return c-')'; 'cause that's what you want to say: if c is a valid digit (but no more then '9') in the given base, right? -- Dimi.

1 0

Re: PATCH: Convert HDRVR to a void*
by Michael Stefaniuc Aug. 7, 2002

Aug. 7, 2002

Hello! On Mon, Aug 05, 2002 at 12:41:35AM +0200, Michael Stefaniuc wrote: > License: LGPL, X11 > Changelog: > Michael Stefaniuc <mstefani(a)redhat.com> > - Convert HDRVR to a void* > - Fix declaration of DriverCallback() Alexandre, please don't apply this patch because it's broken and I don't know which is the best/cleanest way to fix that. Problem: the macro HDRVR_16 defined in dlls/winmm/winemm.h is needed in dlls/msvideo/msvideo_main.c . Which of the following solutions is the way to go (the problem will also appear when the rest of the handles are converted to a void* too, so a generic solution would be best): 1.) just include dlls/winmm/winemm.h 2.) put the $HANDLE_{16,32} macros into include/wownt32.h surrounded by #ifdef __WINE__ and include wownt32.h 3.) put the $HANDLE_{16,32} macros into one of the include/wine/*.h header files (in which?) 4.) create include/wine/handleconv.h and put all handle conversions into it I would prefer 4 and 3 but I don't mind to do it in any way. Comments? bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

2 1

Re: DInput patch - Bugzilla rights
by Jeremy Newman Aug. 7, 2002

Aug. 7, 2002

Well... since you said please. ;-) On Mon, 2002-08-05 at 13:23, Tony Lambregts wrote: > Well if Jeremy Newman will give me the access I need to set this up, I > would be glad to "fix up" each developer that has an account in > Bugzilla. (Pretty Please). -- __ _WebGeek/NetAdmin CodeWeavers -= http://www.codeweavers.com | \| |_____ __ ___ __ __ _ _ _ -= http://www.dracowulf.com | .` / -_) | | / ' \/ _` | ' \ -= mailto:jnewman(a)codeweavers.com |_|\_\___|\_/\_/|_|_|_\__,_|_||_| -= ICQ: 1842980 Yahoo: laxdragon

4 3

Re: 20020804 - Sparc / Solaris fixes
by Shachar Shemesh Aug. 6, 2002

Aug. 6, 2002

Hi Gregg, I couldn't get WINE to compile on sparc at all. Is there anything I am missing regarding causing it to compile winelib only? Special command lines for configure? I just used the vanilla "./configure && make depend && make". Shachar Gregg Mattinson wrote: >Here's the patches required to get 20020804 compiled on Sparc / Solaris with cc. > >License: X11 / LGPL, as usual. > >comments.diff: > - Remove C++ style comments > >ddraw.diff: > - Remove non-static structure initializers > - Fix initialization order of full_rect structure. > >msvcrt.diff: > - Fix the IX86_ONLY macro. This has been bugging me for a while. > >shlwapi_tests.diff: > - Fix the SHQueryValueEx test so nUsedBuffer is currect. > >strings.diff: > - Removed multi-line string constant from classes.c > >utils.diff: > - cc doesn't support __attribute__(...). > >widl.diff: > - cc doesn't support typeof() in macros, and since the LINK_LAST macro was >always used with a attr_t type, I replaced it. > >Gregg Mattinson >Co-op Developer >Sun Microsystems of Canada > > >------------------------------------------------------------------------ > >Index: dlls/ole32/compobj.c >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/ole32/compobj.c,v >retrieving revision 1.3 >diff -u -r1.3 compobj.c >--- /tmp/T03RaGiL Tue Aug 6 13:11:13 2002 >+++ compobj.c Tue Aug 6 13:09:03 2002 >@@ -73,7 +73,7 @@ > */ > > typedef struct { >- unsigned char threadingModell; // we use the COINIT flags >+ unsigned char threadingModell; /* we use the COINIT flags */ > unsigned long threadID; > long AppartmentLockCount; > } OleAppartmentData; >Index: dlls/shell32/shlfolder.c >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/shell32/shlfolder.c,v >retrieving revision 1.3 >diff -u -r1.3 shlfolder.c >--- /tmp/T0vHaqLL Tue Aug 6 13:25:08 2002 >+++ shlfolder.c Tue Aug 6 13:22:54 2002 >@@ -381,7 +381,7 @@ > nextpidl2; > IShellFolder *psf; > >- // test for empty pidls >+ /* test for empty pidls */ > BOOL isEmpty1 = _ILIsDesktop (pidl1); > BOOL isEmpty2 = _ILIsDesktop (pidl2); > >@@ -392,26 +392,26 @@ > if (isEmpty2) > return 1; > >- // test for different types. Sort order is the PT_* constant */ >+ /* test for different types. Sort order is the PT_* constant */ > type1 = _ILGetDataPointer (pidl1)->type; > type2 = _ILGetDataPointer (pidl2)->type; > if (type1 != type2) > return (type1 - type2); > >- // test for name of pidl >+ /* test for name of pidl */ > _ILSimpleGetText (pidl1, szTemp1, MAX_PATH); > _ILSimpleGetText (pidl2, szTemp2, MAX_PATH); > nReturn = strcasecmp (szTemp1, szTemp2); > if (nReturn != 0) > return nReturn; > >- // test of complex pidls >+ /* test of complex pidls */ > firstpidl = ILCloneFirst (pidl1); > nextpidl1 = ILGetNext (pidl1); > nextpidl2 = ILGetNext (pidl2); > >- // optimizing: test special cases and bind not deeper >- // the deeper shellfolder would do the same >+ /* optimizing: test special cases and bind not deeper */ >+ /* the deeper shellfolder would do the same */ > isEmpty1 = _ILIsDesktop (nextpidl1); > isEmpty2 = _ILIsDesktop (nextpidl2); > >@@ -421,7 +421,7 @@ > nReturn = -1; > } else if (isEmpty2) { > nReturn = 1; >- // optimizing end >+ /* optimizing end */ > } else if (SUCCEEDED (IShellFolder_BindToObject (iface, firstpidl, NULL, &IID_IShellFolder, (LPVOID *) & psf))) { > nReturn = IShellFolder_CompareIDs (psf, lParam, nextpidl1, nextpidl2); > IShellFolder_Release (psf); > > >------------------------------------------------------------------------ > >Index: dlls/ddraw/dsurface/dib.c >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/ddraw/dsurface/dib.c,v >retrieving revision 1.3 >diff -u -r1.3 dib.c >--- /tmp/T0u_aqgL Tue Aug 6 13:08:39 2002 >+++ dib.c Tue Aug 6 13:02:52 2002 >@@ -413,8 +413,13 @@ > > /* The easy case : the source-less blits.... */ > if (src == NULL) { >- RECT full_rect = { 0, 0, ddesc.dwHeight, ddesc.dwWidth }; >+ RECT full_rect; > RECT temp_rect; /* No idea if intersect rect can be the same as one of the source rect */ >+ >+ full_rect.left = 0; >+ full_rect.top = 0; >+ full_rect.right = ddesc.dwWidth; >+ full_rect.bottom = ddesc.dwHeight; > IntersectRect(&temp_rect, &full_rect, &xdst); > xdst = temp_rect; > } else { > > >------------------------------------------------------------------------ > >Index: dlls/msvcrt/math.c >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/msvcrt/math.c,v >retrieving revision 1.2 >diff -u -r1.2 math.c >--- /tmp/T0wHaaWK Tue Aug 6 11:17:53 2002 >+++ math.c Tue Aug 6 10:33:59 2002 >@@ -292,7 +292,7 @@ > > /* The above cannot be called on non x86 platforms, stub them for linking */ > >-#define IX86_ONLY(func) double MSVCRT_##func(void) { return 0.0; } >+#define IX86_ONLY(func) double func(void) { return 0.0; } > > IX86_ONLY(_CIacos) > IX86_ONLY(_CIasin) > > >------------------------------------------------------------------------ > >Index: dlls/shlwapi/tests/shreg.c >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/shlwapi/tests/shreg.c,v >retrieving revision 1.2 >diff -u -r1.2 shreg.c >--- /tmp/T023aGXK Tue Aug 6 11:18:28 2002 >+++ shreg.c Tue Aug 6 10:30:58 2002 >@@ -108,8 +108,8 @@ > /****** SHQueryValueExA ******/ > > sTestedFunction = "SHQueryValueExA"; >- nUsedBuffer1 = max(strlen(sExpTestpath1)+1, strlen(sTestpath1)); >- nUsedBuffer2 = max(strlen(sExpTestpath2)+1, strlen(sTestpath2)); >+ nUsedBuffer1 = max(strlen(sExpTestpath1)+1, strlen(sTestpath1)+1); >+ nUsedBuffer2 = max(strlen(sExpTestpath2)+1, strlen(sTestpath2)+1); > /* > * Case 1.1 All arguments are NULL > */ > > >------------------------------------------------------------------------ > >Index: dlls/shell32/classes.c >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/shell32/classes.c,v >retrieving revision 1.2 >diff -u -r1.2 classes.c >--- /tmp/T0tfaiIL Tue Aug 6 13:18:33 2002 >+++ classes.c Tue Aug 6 13:16:03 2002 >@@ -65,8 +65,8 @@ > > RegCloseKey(hkey); > >- TRACE("--UE; >-} %s\n", szFileType ); >+ TRACE("--UE;\n" >+"} %s\n", szFileType ); > > return TRUE; > } > > >------------------------------------------------------------------------ > >Index: tools/widl/utils.h >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/tools/widl/utils.h,v >retrieving revision 1.1 >diff -u -r1.1 utils.h >--- /tmp/T0D2a4JL Tue Aug 6 13:22:30 2002 >+++ utils.h Tue Aug 6 11:35:29 2002 >@@ -29,6 +29,10 @@ > void *xrealloc(void *, size_t); > char *xstrdup(const char *str); > >+#ifndef __GNUC__ >+#define __attribute__(X) >+#endif >+ > int yyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); > int yywarning(const char *s, ...) __attribute__((format (printf, 1, 2))); > void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); >Index: tools/wmc/utils.h >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/tools/wmc/utils.h,v >retrieving revision 1.1 >diff -u -r1.1 utils.h >--- /tmp/T0i7aqKL Tue Aug 6 13:22:30 2002 >+++ utils.h Tue Aug 6 13:20:06 2002 >@@ -31,6 +31,10 @@ > void *xrealloc(void *, size_t); > char *xstrdup(const char *str); > >+#ifndef __GNUC__ >+#define __attribute__(X) >+#endif >+ > int yyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); > int xyyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); > int yywarning(const char *s, ...) __attribute__((format (printf, 1, 2))); >Index: tools/wrc/utils.h >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/tools/wrc/utils.h,v >retrieving revision 1.2 >diff -u -r1.2 utils.h >--- /tmp/T0s_aOKL Tue Aug 6 13:22:31 2002 >+++ utils.h Tue Aug 6 11:35:20 2002 >@@ -31,6 +31,10 @@ > void *xrealloc(void *, size_t); > char *xstrdup(const char *str); > >+#ifndef __GNUC__ >+#define __attribute__(X) >+#endif >+ > int yyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); > int yywarning(const char *s, ...) __attribute__((format (printf, 1, 2))); > void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); > > >------------------------------------------------------------------------ > >Index: tools/widl/widltypes.h >=================================================================== >RCS file: /opcom/comp/ws/wine/CVSROOT/wine/tools/widl/widltypes.h,v >retrieving revision 1.1 >diff -u -r1.1 widltypes.h >--- /tmp/T0fwaaiL Tue Aug 6 13:10:19 2002 >+++ widltypes.h Tue Aug 6 11:40:33 2002 >@@ -36,7 +36,7 @@ > type *l_prev; > > #define LINK(x,y) do { x->l_next = y; if (y) y->l_prev = x; } while (0) >-#define LINK_LAST(x,y) do { if (y) { typeof(x) _c = x; while (_c->l_next) _c = _c->l_next; LINK(_c, y); } } while (0) >+#define LINK_LAST(x,y) do { if (y) { attr_t *_c = x; while (_c->l_next) _c = _c->l_next; LINK(_c, y); } } while (0) > #define LINK_SAFE(x,y) do { if (x) LINK_LAST(x,y); else { x = y; } } while (0) > > #define INIT_LINK(x) do { x->l_next = NULL; x->l_prev = NULL; } while (0) > >

1 0

VDD/VXD in Wine?
by Fabian Cenedese Aug. 6, 2002

Aug. 6, 2002

Hi We have an application that communicates with some hardware. For this we have virtual device drivers that map some memory. There is also a PCI-Interface dll. Is this possible to work in wine? I recently read that wine is supposed to run most Windows apps but not drivers. We intended to port our application to Linux with the help of wine but now I'm not sure if we can succeed at all. If it's not possible with the Windows drivers is there a way if we make a native Linux kernel module? I'm still at the very beginning of Wine. The app loads but the toolbar is not painted and it crashes as soon as I try to open a file. Well, long way to go... Thanks for any help. Fabi

4 3

GDI architecture
by Jacek Bator Aug. 6, 2002

Aug. 6, 2002

Hello I'm tring to understand current wine gdi architecture, and as far as I see its strictly based on and mixed with XWindows. Is it inheritance of early development. Does any one tried ever to rewrite this layer not only to separate dll, but to implement real drivers for graphics rendering. I mean not only connected with core gdi in source but during runtime. With that kind of implementation there would be much easier to implement new backends for graphics ... not only X11 but also on other graphics systems (framebuffers, other systems like beos,atheos). I know that this is big stuff but it gives lots of advantages. Such system sould implement all rendering (text, lines, etc.) in software (aka GDI engine or HEL on Windows) which largely done in wine already, and if driver makes avaluable any methods with other capabilites than raw framebuffer use them. When I've look on aplications with well designed plugins systems, I see that this effort was worth of costs for implementiation. I would like to know if it was discusion about that previously. And what you are thinking about this. Jacek Bator jbator(a)man.poznan.pl

4 3

Re: WINE
by admiral coeyman Aug. 6, 2002

Aug. 6, 2002

Dante Aliegri, > > >> > > Just developers or active developers? My last part was the FPU code. > >Something else was broken and my system no longer runs 16-bit dos programs so I > >cannot test what I've written. > > > Yeah, I saw that. kind of irritating. > I just did the int33 functions for hiding/showing the mouse, but I can't > find an app other than IDA which uses that > and I don't have IDA to test it. > I may have IDA somewhere. Thank you for the code. One of the programs I aim to get working under dos, vpa.exe, uses the cursor routines that you mention. My real problem, the reson that I'm sending a copy to the wine list, is that I cannot read the screen when I try to use winedbg to run programs. All of the text is crushed to the top of the screen. It looks like the text has been stretched across the screen, and pushed to the top of the screen. My vision isn't that good. It gives me a headache trying to use it. > > > > > > > >>But really, if you want a way to learn win32 and xlib at the same time, > >>this is it. > >>There are a lot of different things you can do; > >>if you want to learn how to disassemble, there is use for that. > >>If you want to learn opengl, you can work on d3d -> opengl mapping. > >>If you want to learn COM/Bonobo objects, there is that. > >> > > You can learn all of this? I've been with the project a long time, in the dos > >aspect. I wish that I had more brainpower to devote to the project. Are there > >any tutorials on this stuff? > > > Heh, the implication was to pick one that was interesting and learn > that, the idea being that wine needs help with so many different things, you could pick > any and it would be useful to the project. > I have always felt that the strength of OSS is that the developers use the software. We don't all collect a check at the end of the week and wait for the bug reports to come in. The software that we write is stuff that we want to have running. That's how I select what I'm going to work on next. > As for tutorials, different ones exist that cover those topics, but not > in a wine specific manner. > Like you can find tutorials on d3d, and on opengl, but not implementing > d3d using opengl. > Maybe we need some tutorials. My mind is now clear enough to handle such a project. I'm embarassed by what little I have done. New developers are often asking us where to begin. Maybe we're taking the wrong approach. It would be more helpful if developers came in with something that they wanted to run and a clear idea of how to make it work. God Bless, --Robert 'Admiral' Coeyman -- --- May you live as long as you wish and age but a single day. http://www.dotguy.net/ admiral(a)corner.net Webmaster/ Linux Administrator Computer Co-Op/CornerNet

2 1

Dialog's resource from handle
by Paramjit S. Pannu Aug. 6, 2002

Aug. 6, 2002

Hi All, Just a query, may be out of topic. Is there any API which given a dialog's handle returns its resource identifier ? Thankx in Advance, Paramjit

3 2

FF8 and DirectMusic
by Martin Lexa Aug. 6, 2002

Aug. 6, 2002

Hi! I tried Final Fantasy 8 under Wine (no Windows), yesterday. Got it running, but FF8Config refused to start complaining something about MIDI error. Of course no music. Here is what I found after debugging almost 6 hours :( 1. There are some missing registry entries which are needed. [Software\\Classes\\CLSID\\{58C2B4D0-46E7-11D1-89AC-00A0C9054129}] 1028325524 @="DirectMusicSynth" [Software\\Classes\\CLSID\\{58C2B4D0-46E7-11D1-89AC-00A0C9054129}\\InprocServer32] 1028325524 @="dmsynth.dll" "ThreadingModel"="Both" [Software\\Classes\\CLSID\\{636B9F10-0C7D-11D1-95B2-0020AFDC7421}] 1028325524 @="DirectMusic Object" [Software\\Classes\\CLSID\\{636B9F10-0C7D-11D1-95B2-0020AFDC7421}\\InprocServer32] 1028325524 @="dmusic.dll" "ThreadingModel"="Both" [Software\\Microsoft\\DirectMusic] 1028325524 @="" "GMFilePath"="gm.dls" [Software\\Microsoft\\DirectMusic\\Defaults] 1028325524 @="" "DefaultOutputport"="{58C2B4D0-46E7-11D1-89AC-00A0C9054129}" [Software\\Microsoft\\DirectMusic\\SoftwareSynths] 1028325524 @="" [Software\\Microsoft\\DirectMusic\\SoftwareSynths\\{58C2B4D0-46E7-11D1-89AC-00A0C9054129}] 1028325524 @="" "Description"="Microsoft Software Synthesizer" 2. Original (native) DMUSIC.DLL, DMUSIC16.DLL, DMUSIC32.DLL, DMSYNTH.DLL are needed too. After above changes FF8Config wasn't complaining about MIDI problems., but simply hanging after displaying window. I think problem is that I'm using native DirectMusic DLLs or am I wrong? Maybe not, because there is X11DRV error... Here is wine output: $ wine --debugmsg +ole FF8Config.exe trace:ole:OLE32_DllEntryPoint 0x40bda000 0x1 0x1 trace:ole:CoRegisterMallocSpy trace:ole:IMallocSpy_fnQueryInterface ({0000001d-0000-0000-c000-000000000046},0x405c6dec) trace:ole:OLE32_DllEntryPoint 0x40bda000 0x2 (nil) trace:ole:OLE32_DllEntryPoint 0x40bda000 0x2 (nil) fixme:ddraw:MESA_IDirect3D2Impl_EnumDevices (0x403d8f58)->(0x401e45,0x403d8f58),stub! fixme:ddraw:MESA_IDirect3D2Impl_EnumDevices (0x403d8f58)->(0x401e45,0x403d8f58),stub! trace:ole:OLE32_DllEntryPoint 0x40bda000 0x2 (nil) fixme:ddraw:MESA_IDirect3D2Impl_EnumDevices (0x403d8f58)->(0x401e45,0x403d8f58),stub! fixme:ddraw:MESA_IDirect3D2Impl_EnumDevices (0x403d8f58)->(0x401e45,0x403d8f58),stub! trace:ole:CoInitializeEx ((nil), 2) trace:ole:CoInitializeEx () - Initializing the COM libraries trace:ole:RunningObjectTableImpl_Initialize () trace:ole:WINE_StringFromCLSID 0x4155a0->{636B9F10-0C7D-11D1-95B2-0020AFDC7421} trace:ole:CoGetClassObject CLSID: {636b9f10-0c7d-11d1-95b2-0020afdc7421}, IID: {00000001-0000-0000-c000-000000000046} trace:ole:COMPOBJ_DLLList_Add fixme:setupapi:SetupDiGetClassDevsA {6994ad04-93ef-11d0-a3cc-00a0c9223196} (null) 0000 00000012 trace:ole:__CLSIDFromStringA {58C2B4D0-46E7-11D1-89AC-00A0C9054129} -> 0x405c6d4c trace:ole:WINE_StringFromCLSID 0x405c6d4c->{58C2B4D0-46E7-11D1-89AC-00A0C9054129} trace:ole:CoGetClassObject CLSID: {58c2b4d0-46e7-11d1-89ac-00a0c9054129}, IID: {00000001-0000-0000-c000-000000000046} trace:ole:COMPOBJ_DLLList_Add trace:ole:CoUninitialize () err:ntdll:RtlpWaitForCriticalSection section 0x40cd0424 "x11drv_main.c: X11DRV_CritSection" wait timed out, retrying (60 sec) tid=080720a8 If running wine like this 'wine --debugmsg +all FF8Config.exe &>log' the FF8Config not hangs in displaying window and looks like it's running ok! This means wine is running very slowly, because of writing debug messages, so there is some kind of timing error... may be not. Don't know for sure. Could somebody point me where should I look? What above "err:ntdll:..." really means? How should I debug it? And I'd like to ask is somebody who works on DirectMusic implementation under Wine? If no, could somebody tell me how hard should be add this? Is really necessary to implement each DLL or just DMSYNTH.DLL(?) contains needed rutines? I'd like to get FF8 running at any price :) Thank you in advance. Regards, Martin.

2 2