- Wine-Devel - list.winehq.org

Isn't 'make depend' optional?
by Bang Jun-Young Aug. 6, 2002

Aug. 6, 2002

Hi, I got the following error with wine-20020804 when I skipped 'make depend' before doing 'make': gmake[2]: Entering directory `/u0/work/wine-20020804/tools/widl' gcc -c -I. -I. -I../../include -I../../include -O2 -Wall -mpreferred-stack-boundary=2 -D__WINE__ -D_REENTRANT -I/usr/X11R6/include -o header.o header.c header.c:36: y.tab.h: No such file or directory gmake[2]: *** [header.o] Error 1 gmake[2]: Leaving directory `/u0/work/wine-20020804/tools/widl' gmake[1]: *** [widl] Error 2 gmake[1]: Leaving directory `/u0/work/wine-20020804/tools' gmake: *** [tools] Error 2 This was due to dependency that widl/*.c require y.tab.h in common but y.tab.h is not generated before compilation is being done. I have worked around it as follows: --- Make.rules.in.orig Sat Aug 3 04:34:21 2002 +++ Make.rules.in Mon Aug 5 14:57:17 2002 @@ -112,7 +112,7 @@ CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT(a).c core -OBJS = $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o) $(EXTRA_OBJS) +OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o) RCOBJS = $(RC_SRCS:.rc=.res.o) LINTS = $(C_SRCS:.c=.ln) Obviously the patch doesn't look good. Is there any better solution for this? What about introducing PREEXTRA_OBJS and POSTEXTRA_OBJS? Jun-Young -- Bang Jun-Young <junyoung(a)mogua.com>

7 15

ASM_FUNC isn't autodetect correctly
by Luc Saillard Aug. 5, 2002

Aug. 5, 2002

Hi, On my computer, ASM_FUNC doesn't have the good value. configure choose this macro: >#define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" but when i use this macro, i've a lot assembler error that .scl and .endef isn't a valid command. The good value is (at least it compile cleanly): >#define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",@function" I'm using a debian sid box with: ii gcc-2.95 2.95.4-10 ii gcc-3.1 3.1.1-2 ii binutils 2.12.90.0.15-1 (freshly installed) ii autoconf 2.53-4 I've test gcc 2.95 and gcc 3.1 with the same error. Perhaps it's my binutils package ? If i revert aclocal.m4 from 2002-07-25 with this command >cvs diff -c -D 2002-07-22 aclocal.m4 | patch -R It will detect the good macros. >checking how to define a function in assembly code... .type @function But, it will failed later when testing dlopen, because conftest_asm.s doesn't exist. So i need to set this macro at hand. Luc

1 0

RE: DInput patch - Bugzilla rights
by Patrik Stridvall Aug. 5, 2002

Aug. 5, 2002

> Lionel Ulmer wrote: > > > > >This fixes bug 941. By the way, could I have more 'bugzilla' > power, I hate > >not being able to move bugs out of Unconfirmed state or to > not being able to > >close them (/me thinks that all Wine developpers should have > these rights). > > > > > Yes I aggree all Wine developers should have full rights in bugzilla. Yes, please. I remember once trying to reclassfied a wrongly classified bug and failed. I wasn't that important so I didn't bother asking for more rights... I haven't used Bugzilla that much but I certainly won't not use it less if I get more rights rather more... > Right now Andriy Palamarchuk and Jeremy Newman are the ones > that can do > this. The only catch is the developers need to set up a > bugzilla account > first. I have one already. Same as my email adress: ps(a)leissner.se

1 0

Re: DInput patch - Bugzilla rights
by Tony Lambregts Aug. 5, 2002

Aug. 5, 2002

Lionel Ulmer wrote: > >This fixes bug 941. By the way, could I have more 'bugzilla' power, I hate >not being able to move bugs out of Unconfirmed state or to not being able to >close them (/me thinks that all Wine developpers should have these rights). > > Yes I aggree all Wine developers should have full rights in bugzilla. Right now Andriy Palamarchuk and Jeremy Newman are the ones that can do this. The only catch is the developers need to set up a bugzilla account first. Tony Lambregts

1 0

OpenGL 'hack' patch
by Lionel Ulmer Aug. 5, 2002

Aug. 5, 2002

Hi all, To make NWN's model viewer work in Wine, I did the attached patch... Warning, it's not for the faint of heart so ugly it is :-) Basically, the plan is to have two drawable per DC in the X11 driver, one for 'normal' drawings, the other for OpenGL drawings, the latter being the one associated with the window when goind a CLIPSIBLINGS GetDCEx. Now to do this 'nicely', the 'use ExtEscape to store data' method is not the right one (but it works :-) ). So my current plan is to really separate all the X11 stuff into the X11DRV and to have a 'portable' opengl32.dll library. Now my question is 'how to do this properly' ? Is extending the 'dc' function pointer array with all the needed OpenGL functions a way (even if these functions are NOT GDI functions but pure OpenGL) ? The problem with this solution is that I would need to use the 'DC_GetDCPtr' function outside of GDI (and that may break DLL separation). Another solution could be to add all the OpenGL functions as GDI functions, do the DC function pointer thing and then put a forward from all the wgl functions to the GDI32.* functions. What do you all think of it ? Lionel -- Lionel Ulmer - http://www.bbrox.org/

1 0

cvs [update aborted]: request `update_template' not supported by server
by Shachar Shemesh Aug. 5, 2002

Aug. 5, 2002

When trying to perform CVS operations on the WINE build from Solaris, I get the above mentioned error: cvs [update aborted]: request `update_template' not supported by server I am using cvs version 1.10.1 Anyone here knows what the problem is? Shachar

1 0

Small 'quibble' about GetDCEx
by Lionel Ulmer Aug. 5, 2002

Aug. 5, 2002

Hi, While hunting down a function to get the HWND associated to a DC (I found it 'WindowFromDC'), I looked at the GetDCEx code, and found this : dce->DCXflags |= DCX_DCEBUSY; (...) if (!USER_Driver.pGetDC( hwnd, hdc, hrgnClip, flags )) hdc = 0; In that case, shouldn't the DCEBUSY flag be 'unset' or something ? I did not submit a patch because I did not know if unsetting would have been enough or if DCE_ReleaseDC should have been called (and, yes, I know, the pGetDC cannot ever return FALSE in the X11 driver, but well, if the error code exists, we should write it properly :-) ). Lionel -- Lionel Ulmer - http://www.bbrox.org/

1 0

Recent patches introduced a regression error
by Paul Millar Aug. 4, 2002

Aug. 4, 2002

Hi, According to WRT [1], one of todays patches caused a regression error, picked up by one of the wininet DLL tests. Only, none of the patches seem to have touched wininet. The problem is with the tests at dlls/wininet/tests/http.c lines 117 and 157. The test freezes for up to 4 minutes, then returns the failures. As an act in desperation, I've tried reversing some of the patches (1-4, 6, and 7 from the WRT list) without success. I'm also a little suspicious that this might be something to do with Glasgow (or me :) I've been able to reproduce the problem on two other (local) machines, but I've not tried on any remote machines. I've also tried using earlier cvs versions (from a few days ago), but that build fails the wininet tests too. It would be good if someone could confirm the problem. Sorry if this turns out to be a red herring ... Paul. PS It's quite late here, so I might not be able to reply until tomorrow. [1] http://www.astro.gla.ac.uk/users/paulm/WRT/wrt.php ---- Paul Millar

3 8

PATCH: formatting fixes in files/smb.c
by Gerald Pfeifer Aug. 4, 2002

Aug. 4, 2002

I am also Cc:ing this patch to wine-devel because I think it shows that there is an issue that deserves a bit of thought: Code formatting. We certainly should not get anal rentative on this, but something like int trn = 1234,i=0; from files/smb.c where even a single line is inconsistent really makes me wonder. Also I am not aware of any coding style that asks for blanks around the assignment but does not use a blank after the comma. The patch below fixes at least the worst problems, by consistently using a blank after a comma in variable declarations. Gerald ChangeLog: Fix formatting of variable declarations. Index: smb.c =================================================================== RCS file: /home/wine/wine/files/smb.c,v retrieving revision 1.8 diff -u -3 -p -r1.8 smb.c --- smb.c 19 Jul 2002 03:17:19 -0000 1.8 +++ smb.c 4 Aug 2002 17:35:54 -0000 @@ -123,7 +123,7 @@ struct NB_Buffer static int netbios_name(const char *p, unsigned char *buffer) { char ch; - int i,len=0; + int i, len=0; buffer[len++]=' '; for(i=0; i<=MAX_HOST_NAME; i++) @@ -146,7 +146,7 @@ static int netbios_name(const char *p, u static DWORD NB_NameReq(LPCSTR host, unsigned char *buffer, int len) { - int trn = 1234,i=0; + int trn = 1234, i=0; NBR_ADDWORD(&buffer[i],trn); i+=2; NBR_ADDWORD(&buffer[i],0x0110); i+=2; @@ -203,9 +203,9 @@ static BOOL UNC_SplitName(LPSTR unc, LPS static BOOL NB_Lookup(LPCSTR host, struct sockaddr_in *addr) { - int fd,on=1,r,len,i,fromsize; + int fd, on=1, r, len, i, fromsize; struct pollfd fds; - struct sockaddr_in sin,fromaddr; + struct sockaddr_in sin, fromaddr; unsigned char buffer[256]; fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); @@ -288,7 +288,7 @@ err: static BOOL NB_SessionReq(int fd, char *called, char *calling) { unsigned char buffer[0x100]; - int len = 0,r; + int len = 0, r; struct pollfd fds; TRACE("called %s, calling %s\n",called,calling); @@ -571,7 +571,7 @@ static BOOL SMB_NegotiateProtocol(int fd static BOOL SMB_SessionSetup(int fd, USHORT *userid) { unsigned char buf[0x100]; - int pcount,bcount; + int pcount, bcount; struct NB_Buffer rx, tx; memset(buf,0,sizeof buf); @@ -667,7 +667,7 @@ static BOOL SMB_TreeConnect(int fd, USHO { unsigned char buf[0x100]; int slen; - struct NB_Buffer rx,tx; + struct NB_Buffer rx, tx; TRACE("%s\n",share_name); @@ -731,7 +731,7 @@ static BOOL SMB_NtCreateOpen(int fd, USH DWORD attributes, HANDLE template, USHORT *file_id ) { unsigned char buffer[0x100]; - int len = 0,slen; + int len = 0, slen; TRACE("%s\n",filename); @@ -886,9 +886,9 @@ static BOOL SMB_Open(int fd, USHORT tree DWORD creation, DWORD attributes, USHORT *file_id ) { unsigned char buf[0x100]; - int slen,pcount,i; + int slen, pcount, i; USHORT mode = SMB_GetMode(access,sharing); - struct NB_Buffer rx,tx; + struct NB_Buffer rx, tx; TRACE("%s\n",filename); @@ -944,8 +944,8 @@ static BOOL SMB_Open(int fd, USHORT tree static BOOL SMB_Read(int fd, USHORT tree_id, USHORT user_id, USHORT dialect, USHORT file_id, DWORD offset, LPVOID out, USHORT count, LPUSHORT read) { - int buf_size,n,i; - struct NB_Buffer rx,tx; + int buf_size, n, i; + struct NB_Buffer rx, tx; TRACE("user %04x tree %04x file %04x count %04x offset %08lx\n", user_id, tree_id, file_id, count, offset); @@ -1285,7 +1285,7 @@ done: static int SMB_GetSocket(LPCSTR host) { - int fd=-1,r; + int fd=-1, r; struct sockaddr_in sin; struct hostent *he; @@ -1390,7 +1390,7 @@ HANDLE WINAPI SMB_CreateFileA( LPCSTR un { int fd; USHORT tree_id=0, user_id=0, dialect=0, file_id=0; - LPSTR name,host,share,file; + LPSTR name, host, share, file; HANDLE handle = INVALID_HANDLE_VALUE; name = HeapAlloc(GetProcessHeap(),0,lstrlenA(uncname)); @@ -1540,7 +1540,7 @@ BOOL WINAPI SMB_ReadFile(HANDLE hFile, L SMB_DIR* WINAPI SMB_FindFirst(LPCSTR name) { int fd = -1; - LPSTR host,share,file; + LPSTR host, share, file; USHORT tree_id=0, user_id=0, dialect=0; SMB_DIR *ret = NULL; LPSTR filename;

1 0

Re: DDraw Clipper fix
by Ove Kaaven Aug. 3, 2002

Aug. 3, 2002

On Sat, 3 Aug 2002, Lionel Ulmer wrote: > This should hopefully fix bug : > Bug 936 - Incorrect placement of DirectDraw output (offset outside the Windows 'window') > > Basically, the logic to compute the clipping window was wrong (or at least I > did not understand all the subtilities of the code :-) ). At least with this > fix, this particular application now runs fine. I'm 99% sure I fixed this in my last patch submission to winehq a while ago. Seems Alexandre applied it after 20020710, though. So I don't think your patch applies on top of CVS.

2 1