- Wine-Devel - list.winehq.org

[PATCH?] Finally found a solution to serial port writes
by Geoffrey Hausheer April 17, 2004

April 17, 2004

The following patch is probably wrong, but it fixes my problem with WriteFile failing when writing to a COM port. The problem appears to be that NtWaitForSingleObject sends a count of '1' which results in the wine_server_call in NTDLL_wait_for_multiple_objects returning 'STATUS_USER_APC' which aborts the execution before 'call_apcs' gets called (which actually does the write). calling 'NTDLL_wait_for_multiple_objects' with count = 0 allows the 'call_apcs' function to get called, and TzMax50 actually works perfectly (along with my nasty hack to allow the menus to work) as a reminder, the COM port is opened in non-overlapped mode, and all timeouts are set to 0. (I didn't submit this to wine-patches, since i'm not at all sure it is generally correct) I can also try to write a test-case that shows this works (sort of...I can test that WriteFile returns the right result, but not that data was actually written on the serial port. I know of no way to do that without external hardware). I don't know how to make it general enough though (what to do when there is no COM port attached to the machine?) .Geoff --- orig/dlls/ntdll/file.c +++ mod/dlls/ntdll/file.c @@ -585,7 +585,7 @@ ret = register_new_async(&ovp->async); if (ret != STATUS_SUCCESS) return ret; - if (flags & FD_FLAG_TIMEOUT) + if (hEvent != NULL && flags & FD_FLAG_TIMEOUT) { NtWaitForSingleObject(hEvent, TRUE, NULL); NtClose(hEvent);

1 0

WININET: make WCHAR strings const where possible
by Mike McCormack April 17, 2004

April 17, 2004

"Dmitry Timoshkov" <dmitry(a)baikal.ru> wrote: > It would be much better if you could mark all string constants > as such using 'const' key word in all your patches (including > already committed, submitted and future ones). Perhaps we should make a janitorial task to CONST-ify strings where possible? Mike ChangeLog: * make WCHAR strings const where possible Index: dlls/wininet/http.c =================================================================== RCS file: /home/wine/wine/dlls/wininet/http.c,v retrieving revision 1.56 diff -u -r1.56 http.c --- dlls/wininet/http.c 31 Mar 2004 20:09:54 -0000 1.56 +++ dlls/wininet/http.c 12 Apr 2004 14:12:48 -0000 @@ -470,8 +470,8 @@ { UINT len; LPWSTR in, out; - WCHAR szBasic[] = {'B','a','s','i','c',' ',0}; - WCHAR szColon[] = {':',0}; + const WCHAR szBasic[] = {'B','a','s','i','c',' ',0}; + const WCHAR szColon[] = {':',0}; len = lstrlenW( username ) + 1 + lstrlenW ( password ) + 1; in = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); @@ -504,7 +504,7 @@ { HTTPHEADERW hdr; INT index; - WCHAR szProxyAuthorization[] = { + const WCHAR szProxyAuthorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; hdr.lpszValue = HTTP_EncodeBasicAuth( username, password ); @@ -538,10 +538,9 @@ WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ WCHAR* url, szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; - WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }, szSlash[] = { '/',0 } ; - /*WCHAR szColon[] = { ':',0 }; */ - WCHAR szFormat1[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; - WCHAR szFormat2[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; + const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }, szSlash[] = { '/',0 } ; + const WCHAR szFormat1[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; + const WCHAR szFormat2[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; int len; memset( &UrlComponents, 0, sizeof UrlComponents ); @@ -607,7 +606,7 @@ LPWSTR lpszUrl = NULL; DWORD nCookieSize; HINTERNET handle; - WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; + const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; DWORD len; TRACE("--> \n"); @@ -670,7 +669,7 @@ if (NULL == lpszVerb) { - WCHAR szGet[] = {'G','E','T',0}; + const WCHAR szGet[] = {'G','E','T',0}; lpwhr->lpszVerb = WININET_strdupW(szGet); } else if (strlenW(lpszVerb)) @@ -698,7 +697,7 @@ if (hIC->lpszAgent) { WCHAR *agent_header; - WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0 }; + const WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0 }; len = strlenW(hIC->lpszAgent) + strlenW(user_agent); agent_header = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); @@ -716,8 +715,8 @@ if (InternetGetCookieW(lpszUrl, NULL, NULL, &nCookieSize)) { int cnt = 0; - WCHAR szCookie[] = {'C','o','o','k','i','e',':',' ',0}; - WCHAR szcrlf[] = {'\r','\n',0}; + const WCHAR szCookie[] = {'C','o','o','k','i','e',':',' ',0}; + const WCHAR szcrlf[] = {'\r','\n',0}; lpszCookies = HeapAlloc(GetProcessHeap(), 0, (nCookieSize + 1 + 8)*sizeof(WCHAR)); @@ -789,9 +788,9 @@ LPHTTPHEADERW lphttpHdr = NULL; BOOL bSuccess = FALSE; LPWININETHTTPREQW lpwhr; - WCHAR szFmt[] = { '%','s',':',' ','%','s','%','s',0 }; - WCHAR szcrlf[] = { '\r','\n',0 }; - WCHAR sznul[] = { 0 }; + const WCHAR szFmt[] = { '%','s',':',' ','%','s','%','s',0 }; + const WCHAR szcrlf[] = { '\r','\n',0 }; + const WCHAR sznul[] = { 0 }; if (TRACE_ON(wininet)) { #define FE(x) { x, #x } @@ -1419,12 +1418,12 @@ do { - WCHAR szSlash[] = { '/',0 }; - WCHAR szSpace[] = { ' ',0 }; - WCHAR szHttp[] = { 'h','t','t','p',':','/','/', 0 }; - WCHAR szcrlf[] = {'\r','\n', 0}; - WCHAR sztwocrlf[] = {'\r','\n','\r','\n', 0}; - WCHAR szSetCookie[] = {'S','e','t','-','C','o','o','k','i','e',0 }; + const WCHAR szSlash[] = { '/',0 }; + const WCHAR szSpace[] = { ' ',0 }; + const WCHAR szHttp[] = { 'h','t','t','p',':','/','/', 0 }; + const WCHAR szcrlf[] = {'\r','\n', 0}; + const WCHAR sztwocrlf[] = {'\r','\n','\r','\n', 0}; + const WCHAR szSetCookie[] = {'S','e','t','-','C','o','o','k','i','e',0 }; TRACE("Going to url %s %s\n", debugstr_w(lpwhr->lpszHostName), debugstr_w(lpwhr->lpszPath)); loop_next = FALSE; @@ -1540,7 +1539,7 @@ { if (lpwhr->StdHeaders[i].wFlags & HDR_ISREQUEST) { - WCHAR szFmt[] = { '\r','\n','%','s',':',' ','%','s', 0}; + const WCHAR szFmt[] = { '\r','\n','%','s',':',' ','%','s', 0}; cnt += sprintfW(requestString + cnt, szFmt, lpwhr->StdHeaders[i].lpszField, lpwhr->StdHeaders[i].lpszValue); TRACE("Adding header %s (%s)\n", @@ -1554,7 +1553,7 @@ { if (lpwhr->pCustHeaders[i].wFlags & HDR_ISREQUEST) { - WCHAR szFmt[] = { '\r','\n','%','s',':',' ','%','s', 0}; + const WCHAR szFmt[] = { '\r','\n','%','s',':',' ','%','s', 0}; cnt += sprintfW(requestString + cnt, szFmt, lpwhr->pCustHeaders[i].lpszField, lpwhr->pCustHeaders[i].lpszValue); TRACE("Adding custom header %s (%s)\n", @@ -1565,7 +1564,7 @@ if (lpwhr->lpszHostName) { - WCHAR szFmt[] = { '%','s','%','s',0 }; + const WCHAR szFmt[] = { '%','s','%','s',0 }; cnt += sprintfW(requestString + cnt, szFmt, HTTPHOSTHEADER, lpwhr->lpszHostName); } @@ -1658,7 +1657,7 @@ { LPHTTPHEADERW setCookieHeader; int nPosStart = 0, nPosEnd = 0, len; - WCHAR szFmt[] = { 'h','t','t','p',':','/','/','%','s','/',0}; + const WCHAR szFmt[] = { 'h','t','t','p',':','/','/','%','s','/',0}; setCookieHeader = &lpwhr->pCustHeaders[CustHeaderIndex]; @@ -1678,7 +1677,7 @@ /* fixme: not case sensitive, strcasestr is gnu only */ int nDomainPosEnd = 0; int nDomainPosStart = 0, nDomainLength = 0; - WCHAR szDomain[] = {'d','o','m','a','i','n','=',0}; + const WCHAR szDomain[] = {'d','o','m','a','i','n','=',0}; LPWSTR lpszDomain = strstrW(&setCookieHeader->lpszValue[nPosEnd], szDomain); if (lpszDomain) { /* they have specified their own domain, lets use it */ @@ -1952,8 +1951,8 @@ BOOL bSuccess = FALSE; INT rc = 0; WCHAR value[MAX_FIELD_VALUE_LEN], field[MAX_FIELD_LEN]; - WCHAR szStatus[] = {'S','t','a','t','u','s',0}; - WCHAR szHttp[] = { 'H','T','T','P',0 }; + const WCHAR szStatus[] = {'S','t','a','t','u','s',0}; + const WCHAR szHttp[] = { 'H','T','T','P',0 }; char bufferA[MAX_REPLY_LEN]; TRACE("-->\n"); @@ -2087,32 +2086,32 @@ INT HTTP_GetStdHeaderIndex(LPCWSTR lpszField) { INT index = -1; - WCHAR szContentLength[] = { + const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0}; - WCHAR szStatus[] = {'S','t','a','t','u','s',0}; - WCHAR szContentType[] = { + const WCHAR szStatus[] = {'S','t','a','t','u','s',0}; + const WCHAR szContentType[] = { 'C','o','n','t','e','n','t','-','T','y','p','e',0}; - WCHAR szLastModified[] = { + const WCHAR szLastModified[] = { 'L','a','s','t','-','M','o','d','i','f','i','e','d',0}; - WCHAR szLocation[] = {'L','o','c','a','t','i','o','n',0}; - WCHAR szAccept[] = {'A','c','c','e','p','t',0}; - WCHAR szReferer[] = { 'R','e','f','e','r','e','r',0}; - WCHAR szContentTrans[] = { 'C','o','n','t','e','n','t','-', + const WCHAR szLocation[] = {'L','o','c','a','t','i','o','n',0}; + const WCHAR szAccept[] = {'A','c','c','e','p','t',0}; + const WCHAR szReferer[] = { 'R','e','f','e','r','e','r',0}; + const WCHAR szContentTrans[] = { 'C','o','n','t','e','n','t','-', 'T','r','a','n','s','f','e','r','-','E','n','c','o','d','i','n','g',0}; - WCHAR szDate[] = { 'D','a','t','e',0}; - WCHAR szServer[] = { 'S','e','r','v','e','r',0}; - WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0}; - WCHAR szETag[] = { 'E','T','a','g',0}; - WCHAR szAcceptRanges[] = { + const WCHAR szDate[] = { 'D','a','t','e',0}; + const WCHAR szServer[] = { 'S','e','r','v','e','r',0}; + const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0}; + const WCHAR szETag[] = { 'E','T','a','g',0}; + const WCHAR szAcceptRanges[] = { 'A','c','c','e','p','t','-','R','a','n','g','e','s',0 }; - WCHAR szExpires[] = { 'E','x','p','i','r','e','s',0 }; - WCHAR szMimeVersion[] = { + const WCHAR szExpires[] = { 'E','x','p','i','r','e','s',0 }; + const WCHAR szMimeVersion[] = { 'M','i','m','e','-','V','e','r','s','i','o','n', 0}; - WCHAR szPragma[] = { 'P','r','a','g','m','a', 0}; - WCHAR szCacheControl[] = { + const WCHAR szPragma[] = { 'P','r','a','g','m','a', 0}; + const WCHAR szCacheControl[] = { 'C','a','c','h','e','-','C','o','n','t','r','o','l',0}; - WCHAR szUserAgent[] = { 'U','s','e','r','-','A','g','e','n','t',0}; - WCHAR szProxyAuth[] = { + const WCHAR szUserAgent[] = { 'U','s','e','r','-','A','g','e','n','t',0}; + const WCHAR szProxyAuth[] = { 'P','r','o','x','y','-', 'A','u','t','h','e','n','t','i','c','a','t','e', 0};

4 7

Re: some more dbghelp fixes & enhancements
by Dimitrie O. Paun April 17, 2004

April 17, 2004

On April 17, 2004 3:02 pm, Eric Pouech wrote: > change log says it all > A+ > @@ -29,22 +29,21 @@ > > /* TODO The patch is b0rken. -- Dimi.

2 1

Visual FoxPro
by Cecil Champenois April 17, 2004

April 17, 2004

I have heard that there is a lot of interest in moving the WINE for Visual FoxPro forward. About a year ago, a major FoxPro developer by the name of Whil Hentzen was telling our User Group www.ocfox.org about the Visual FoxPro work you are doing with WINE. He also demonstrated Visual FoxPro working on a Linux laptop. We were all very impressed by this and anted to jump right into development but were told that the conversion or whatever you want to call it was at least 1 to 1.5 years away. This discouraged us a bit, so what we'd like to know is this: Where does the WINE work in relation to VFP 6, 76 and 8 stand now? We would like to begin some development in Linux, but need to know where the WINE work stands at this time and what the future looks like. Cecil

3 2

RE: Proposed solution for COMCTL32 subclassing problems
by Robert Shearman April 17, 2004

April 17, 2004

Filip Navara wrote: > > Hi, > > here is my proposed solution for crashes in COMCTL32 observed in > specific situations while calling the window procedure subclassing > functions. If there were removed all subclassed window procedures during > the execution of SubclassWndProc there happened a crash, because the > structure that holds the subclassing stack was freed in DefSubclassProc. Yes, that was my fault. Sorry. > Also if there were some window procedure subclassings removed during the > execution of SubclassWndProc, the stack position counting could have > gone wrong. My solution is to let the subclassing stack grow the > opposite way, so that item 0 is the most nested one. I also removed the > stacknew handling which I strongly believe is redundant now. It looks much simpler now, but I don't understand why reversing the direction of the stack should make any difference. I don't think you submitted the required patch to comctl32.h. Rob

2 4

Re: [DXDIAG2] First Implementation
by Alexandre Julliard April 17, 2004

April 17, 2004

Raphael <fenix(a)club-internet.fr> writes: > + * @TODO: fix wine headers dependencies > + */ > +#if !defined( _MSC_VER ) || defined( __WINE__ ) > +# include "windef.h" > +# include "winbase.h" > +# include "wingdi.h" > +# include "winuser.h" > +/** GetProp is a define by user.h */ > +# undef GetProp > +/* VARIANT */ > +# include <oleauto.h> > +#endif > +/** > + * End Hack > + */ This is because on Windows many headers include windows.h and we don't want to do that in Wine. There's no reason to add #ifdefs though, it should build just fine on Windows even with the extra includes. > +#undef EXPORT_STDAPI > +#if defined( _MSC_VER ) > +# define EXPORT_STDAPI __declspec(dllexport) extern HRESULT > +#else > +# define EXPORT_STDAPI extern HRESULT > +#endif We don't need that sort of thing in Wine dlls, and it confuses winapi_check, so please don't do it. Also you forgot to include the spec file in your patch... -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [dx104] better hardware vertex shader activation
by Alexandre Julliard April 17, 2004

April 17, 2004

Raphael <fenix(a)club-internet.fr> writes: > Changelog: > - Use a config entry (instead of the registrry) to control the HW vertex > shader activation Actually the registry is probably a better idea, this way we don't need to move it again once we get rid of the config file. I'd suggest Sofware\Wine\d3d instead of Sofware\Wine\Wine\d3d though, this is more likely to be the correct place once the config reorganization is done. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: abnt2 keyboard patch
by Rafael Ávila de Espíndola April 17, 2004

April 17, 2004

> That's why I said that it's an X11 bug and we can do nothing about it. > > Please resubmit the patch without that part. Attached. I will contact xfree and try to fix the rest of the problem. Thanks. > Dmitry. Rafael

2 1

Re: Visual FoxPro
by Dan Kegel April 17, 2004

April 17, 2004

Cecil Champenois wrote: > I have heard that there is a lot of interest in moving the WINE for > Visual FoxPro forward. About a year ago, a major FoxPro developer by the > name of Whil Hentzen was telling our User Group www.ocfox.org about the > Visual FoxPro work you are doing with WINE. He also demonstrated Visual > FoxPro working on a Linux laptop. We were all very impressed by this and > anted to jump right into development but were told that the conversion > or whatever you want to call it was at least 1 to 1.5 years away. This > discouraged us a bit, so what we'd like to know is this: Where does the > WINE work in relation to VFP 6, 76 and 8 stand now? > > We would like to begin some development in Linux, but need to know where > the WINE work stands at this time and what the future looks like. Hi Cecil! I went to the VFP UG in Los Angeles that week just to meet Whil, he's a nice guy. I think what he was probably talking about when he said "1 to 1.5 years away" was that Wine had some rough edges. It still does, but they're steadily being cleaned up, and Wine is getting smoother and smoother every month. You should probably give it a try. Build it from fresh sources (it's not too hard), set up a small test app in VFP, and give it a try on Wine. If you run into problems, let us know. - Dan -- My technical stuff: http://kegel.com My politics: see http://www.misleader.org for examples of why I'm for regime change

1 0

Compilation problems in glu32/glu.c
by Luke Stras April 17, 2004

April 17, 2004

I've recently downloaded a fresh copy out of CVS, and get the following errors while compiling: make[2]: Entering directory `/home/stras/src/wine/wine/dlls/glu32' ../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./glu32.spec glu.o glu32.dll.dbg.o -o glu32.dll.so -L../../dlls -lkernel32 -lntdll -L../../libs/wine -lwine -L/usr/X11R6/lib -lSM -lICE -lXxf86dga -lXxf86vm -lXv -lXext -lX11 -lGL -lGLU -L../../libs/port -lwine_port glu.o(.text+0x765): In function `wine_gluTessBeginPolygon': /home/stras/src/wine/wine/dlls/glu32/glu.c:437: undefined reference to `gluTessBeginPolygon' glu.o(.text+0x786): In function `wine_gluTessEndPolygon': /home/stras/src/wine/wine/dlls/glu32/glu.c:447: undefined reference to `gluTessEndPolygon' glu.o(.text+0x9b2): In function `wine_gluTessBeginContour': /home/stras/src/wine/wine/dlls/glu32/glu.c:577: undefined reference to `gluTessBeginContour' glu.o(.text+0x9d6): In function `wine_gluTessEndContour': /home/stras/src/wine/wine/dlls/glu32/glu.c:587: undefined reference to `gluTessEndContour' glu.o(.text+0xa2b): In function `wine_gluTessProperty': /home/stras/src/wine/wine/dlls/glu32/glu.c:608: undefined reference to `gluTessProperty' glu.o(.text+0xa60): In function `wine_gluTessNormal': /home/stras/src/wine/wine/dlls/glu32/glu.c:618: undefined reference to `gluTessNormal' collect2: ld returned 1 exit status winegcc: gcc failed. Any ideas? Thanks. -- Luke Stras <stras(a)utias.toronto.edu> "The meek can have the Earth; the rest of us have other plans" --Henry Spencer -- Scanned by ClamAv - http://www.clamav.net

1 0