November 2004 - Wine-Devel - list.winehq.org

How difficult would it be to make the equivalent of Windows Terminal Server with Wine?
by Andrew Quigley Nov. 11, 2004

Nov. 11, 2004

What I would like to be able to deploy would be a system which runs multiple Win32 compatible desktops and multiple logins on a server, with the clients accessing the desktops via RDP or ICA protocols. How many of the pieces required to accomplish that already exist, and what pieces have yet to be built? A quick search on freshmeat shows me a few different rdp clients, so it looks like the protocol spec is known. What would be involved in creating a RDP server that shows up as a video driver as far as the win32 programs are concerned?

7 9

wine notes & /etc/resolv.conf
by Grant Williamson Nov. 11, 2004

Nov. 11, 2004

Hi, is there a patch anywhere, which will allow wine to reread the /etc/resolv.conf file. i.e. application lotus notes a) start notes whilst connected to home network. /etc/resolv.conf gets populated by home dhcp server b) start vpn connection to work /etc/resolv.conf gets populated with extra name servers c) try and connect to work notes, server fails, as it cannot resolve named address If you start notes after the vpn connection is started, then /etc/resolv if correctly populated and the problem does not occur. Same issue happens when u suspend your machine and start in a different location. Does anyone have a patch or know how to get wine to reread /etc/resolv.conf periodically? Grant.

4 3

Re: Fix For Window Caption
by William Poetra Yoga H Nov. 11, 2004

Nov. 11, 2004

--- William Poetra Yoga H <williampoetra(a)yahoo.com> wrote: > This fixes the bounding rectangle of the window caption. > > William > > Same as the one for the caption buttons, what needs to be improved for this patch? I meant to make the caption (text) bounding box smaller a bit so the text doesn't overflow over the caption buttons. And, this patch is somewhat related to the caption buttons patch, though not so closely, so I sent it as a separate patch. __________________________________ Do you Yahoo!? Check out the new Yahoo! Front Page. www.yahoo.com

1 0

Re: Fix For Caption Buttons
by William Poetra Yoga H Nov. 11, 2004

Nov. 11, 2004

--- William Poetra Yoga H <williampoetra(a)yahoo.com> wrote: > This patch fixes the size and position of caption buttons (they were too > big). > > William > This patch wasn't committed. Anyone would like to point out to me something wrong with the patch? __________________________________ Do you Yahoo!? Check out the new Yahoo! Front Page. www.yahoo.com

1 0

Re: Fix For Menu Bar (resend)
by Alexandre Julliard Nov. 11, 2004

Nov. 11, 2004

William Poetra Yoga H <williampoetra(a)yahoo.com> writes: > Index: dlls/user/menu.c > =================================================================== > RCS file: /home/wine/wine/dlls/user/menu.c,v > retrieving revision 1.8 > diff -u -r1.8 menu.c > --- dlls/user/menu.c 8 Nov 2004 22:12:42 -0000 1.8 > +++ dlls/user/menu.c 9 Nov 2004 14:26:09 -0000 > @@ -1441,8 +1441,6 @@ > if (lppop->Height == 0) > MENU_MenuBarCalcSize(hDC, lprect, lppop, hwnd); > > - lprect->bottom = lprect->top + lppop->Height; > - This doesn't look right at all, you cannot simply ignore the computed size of the menu bar, this is going to break owner drawn menus. -- Alexandre Julliard julliard(a)winehq.org

4 4

re: Latent memory corruption bug in widl, with workaround
by Dan Kegel Nov. 11, 2004

Nov. 11, 2004

Here's the exact workaround, in case anyone runs into that crash again. I dare the author of widl to run it under valgrind :-) diff -Naur wine.orig/tools/widl/parser.l wine/tools/widl/parser.l --- wine.orig/tools/widl/parser.l Mon Oct 4 19:14:54 2004 +++ wine/tools/widl/parser.l Wed Nov 10 00:28:37 2004 @@ -123,7 +123,7 @@ yyerror("Malformed '#...' line-directive; missing terminating \""); *cptr = '\0'; line_number = lineno - 1; /* We didn't read the newline */ - free( input_name ); + //free( input_name ); input_name = xstrdup(fname); } \" yy_push_state(QUOTE); cbufidx = 0; -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

1 0

Re: Fix For Menu Bar (resend)
by Ivan Leo Puoti Nov. 10, 2004

Nov. 10, 2004

> I know this sounds a bit unethical (maybe impolite would be a better word), but > for practical reasons I think this is permittable. Or maybe I should > specifically state (at wine-patches) that I "allow anyone else to fix the patch > should it contain errors, and resubmit it"? If you licence the patch for inclusion with wine, you licence it under the LGPL, that does allow this, as it's free software. Ivan. ____________________________________________________________ Libero ADSL: navighi gratis a 1.2 Mega, senza canone e costi di attivazione. Abbonati subito su http://www.libero.it

1 0

Re: Ekush
by Ivan Leo Puoti Nov. 10, 2004

Nov. 10, 2004

> Ekush (http://www.ekush.com) published some binaries. At time of writing the hoster has taken them down. Ivan. ____________________________________________________________ Libero ADSL: navighi gratis a 1.2 Mega, senza canone e costi di attivazione. Abbonati subito su http://www.libero.it

1 0

Re: [AppDB] apidb_fullurl() does not act as expected...
by Jeremy Newman Nov. 10, 2004

Nov. 10, 2004

No this will not work. You need to keep the paths relative. Do not use full URLs as then if you have a development/test server running, it will take you back to the production site. If you look at index.php, there is an include("path.php"), which defines the static BASE. If you always inclide path.php from the cwd, your scripts will get BASE, and you can use that for the relative path. On Tue, 2004-11-09 at 19:33 -0700, Tony Lambregts wrote: > apidb_fullurl() does not give the Full URL go figure.. > > Change log: fix up the notify for add and delete comment so it gives a proper back link > > files changed: addcomment.php > deletecomment.php > include/incl.php > > Index: addcomment.php > =================================================================== > RCS file: /home/wine/appdb/addcomment.php,v > retrieving revision 1.2 > diff -u -r1.2 addcomment.php > --- addcomment.php 9 Nov 2004 22:42:12 -0000 1.2 > +++ addcomment.php 10 Nov 2004 02:15:50 -0000 > @@ -49,7 +49,7 @@ > if($email) > { > $fullAppName = "Application: ".lookupAppName($appId)." Version: ".lookupVersionName($appId, $versionId); > - $ms .= apidb_fullurl("appview.php?appId=$appId&versionId=$versionId")."\n"; > + $ms .= APPDB_ROOT."appview.php?appId=$appId&versionId=$versionId"."\n"; > $ms .= "\n"; > $ms .= ($current->username ? $current->username : "Anonymous")." added comment to ".$fullAppName."\n"; > $ms .= "\n"; > Index: deletecomment.php > =================================================================== > RCS file: /home/wine/appdb/deletecomment.php,v > retrieving revision 1.3 > diff -u -r1.3 deletecomment.php > --- deletecomment.php 9 Nov 2004 22:42:12 -0000 1.3 > +++ deletecomment.php 10 Nov 2004 02:15:50 -0000 > @@ -65,7 +65,7 @@ > if($email) > { > $fullAppName = "Application: ".lookupAppName($appId)." Version: ".lookupVersionName($appId, $versionId); > - $ms .= apidb_fullurl("appview.php?appId=$appId&versionId=$versionId")."\n"; > + $ms .= APPDB_ROOT."appview.php?appId=$appId&versionId=$versionId"."\n"; > $ms .= "\n"; > $ms .= ($current->username ? $current->username : "Anonymous")." deleted comment from ".$fullAppName."\n"; > $ms .= "\n"; > Index: include/incl.php > =================================================================== > RCS file: /home/wine/appdb/include/incl.php,v > retrieving revision 1.3 > diff -u -r1.3 incl.php > --- include/incl.php 9 Nov 2004 22:42:13 -0000 1.3 > +++ include/incl.php 10 Nov 2004 02:15:51 -0000 > @@ -241,6 +241,7 @@ > define("STANDARD_NOTIFY_FOOTER","------- You are receiving this mail because: -------\n". > "You are an maintainer of this app or an appdb administrator\n". > "to change your preverences go to: http://appdb.winehq.org/preferences.php\n"); > +define("APPDB_ROOT", "http://appdb.winehq.org/"); > > > ?> > >

2 1

FW: [dx9-12 next try] SetStreamSource changes
by Ann and Jason Edmeades Nov. 10, 2004

Nov. 10, 2004

Was there a problem with this one - Its really holding me up with progress, so I need to ensure I resolve any issues asap. Thanks Jason -----Original Message----- From: Ann and Jason Edmeades [mailto:us(a)the-edmeades.demon.co.uk] Sent: 06 November 2004 21:52 To: 'wine-patches(a)winehq.org' Subject: [dx9-12 next try] SetStreamSource changes This makes the change as per my previous note - Any better? >When I call addref the wined3dvb interface, I addref on the d3dvb >interface, and similarly on release, I release the d3d interface >from release on the wined3dvb? Let me know if there are any problems Changelog - Implement SetStreamSource - Ensure wined3d objects maintain a reference count of at least that of the d3dx version Jason

1 0

[setupx_main.c] SETUPX_CreateStandardLDDs: question about a FIXME
by Fabrice Ménard Nov. 10, 2004

Nov. 10, 2004

Hi, In setupapi/setupx_main.c, function SETUPX_CreateStandardLDDs: There is a FIXME("LDID_SRCPATH: what exactly do we have to do here ?\n"). It concerns the registry value: SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\SourcePath. AFAIK, this value defines the location where the setup of windows was done. As we don't have a real windows installation, this key is naturally not set. I'm wondering if it will hurt to set it to a fallback string (maybe the most common one: "D:\\") and get rid of this FIXME. I think if a windows application need this value and don't find what it wants, it justs throw a message box asking for the correct CD (in fact it is very common to have this value set to a wrong path when you have more than one CD device). I know it is not so important, but I really enjoy having one less FIXME :-)) If you're ok with that, I'll send a tiny patch Fabrice Ménard menard.fabrice(a)wanadoo.fr

1 0

Ekush
by Ge van Geldorp Nov. 10, 2004

Nov. 10, 2004

> From: Ge van Geldorp > > Ekush (http://www.ekush.com) published some binaries. > Surprise, surprise, it looks like ReactOS very much (Check > e.g. the radio buttons on the "Accept License" screen during > 2nd stage setup). > Some string searching in their binaries reveals: > > $ strings -a ver.dll | grep ReactOS > OS2 Images not supported under ReactOS at this time. Shortly after I sent this email to ros-dev yesterday the Ekush website went down. Today they are back, with a slightly changed set of binaries. The strings I reported yesterday are gone now (well, except for the CcRosInitializeFileCache and CcRosReleaseFileCache exports from NTOSKRNL, maybe changing the name of an exported symbol was too difficult???). There's still plenty of other evidence of the ReactOS heritage though. I guess since I only reported about ReactOS they forgot to remove the references to Wine (except ofcourse the copyright notices, those are gone). This pisses me off bigtime. I can only explain it as a deliberate attempt to use the work of Qemu, FreeType, Wine and ReactOS without giving credit. Gé van Geldorp.

2 1

Latent memory corruption bug in widl, with workaround
by Dan Kegel Nov. 10, 2004

Nov. 10, 2004

I ran into the error Oops, segment violation while running make to build wine from cvs. It failed on the command ../tools/widl/widl -I../../wine/include -I. -I../../wine/include -I../include -h -H ocidl.h ../../wine/include/ocidl.idl Turning on logging showed that it happened while processing an import statement. Running under valgrind yielded output like this: ==10699== Invalid read of size 1 ==10699== at 0x4002273E: strlen (mac_replace_strmem.c:164) ==10699== by 0x805E0D1: pp_xstrdup (../../../wine/libs/wpp/preproc.c:108) ==10699== by 0x805E7B2: pp_add_define (../../../wine/libs/wpp/preproc.c:231) ==10699== by 0x805FB21: add_cmdline_defines (../../../wine/libs/wpp/wpp.c:48) ==10699== Address 0x41233334 is 0 bytes inside a block of size 29 free'd ==10699== at 0x40029961: free (vg_replace_malloc.c:231) ==10699== by 0x805B9B6: yylex (../../../wine/tools/widl/parser.l:126) ==10699== by 0x80548B3: yyparse (/usr/share/bison/bison.simple:573) ==10699== by 0x8054295: main (../../../wine/tools/widl/widl.c:265) Commenting out the free on line 126 of widl/parser.l solved the problem. Uncommenting it and building again, I couldn't reproduce the original crash, but running under valgrind revealed the problem was still there, just hidden. I tried tracing through why the free on line 126 of widl/parser.l was bad, but it was too late, and I was too tired. Can somebody else have a look? It was quite annoying to be dead in the water, unable to build wine... Thanks, Dan -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

1 0

Re: [lostwages] developer cheatsheet
by Jeremy Newman Nov. 9, 2004

Nov. 9, 2004

Added this. The text in the <code> tag on line 78 is long. It needs a line break or something. And I fixed the url in documentation template. Otherwise it looks fine to me. On Fri, 2004-11-05 at 19:00 +0000, Mike Hearn wrote: > Add a developer getting started guide to the website. Hack to your > satisfaction, I probably did it totally wrong ;)

1 0

Thanks
by Frank v Waveren Nov. 9, 2004

Nov. 9, 2004

I felt nostalgic for starcraft today, so for fun and kicks decided to see if wine was up to the task. Not only did it run, it worked perfectly, using RandR and everything. Very impressive, thanks for the wonderful work everyone! -- Frank v Waveren Fingerprint: 9106 FD0D fvw(a)[var.cx|stack.nl] ICQ#10074100 D6D9 3E7D FAF0 92D1 Public key: hkp://wwwkeys.pgp.net/8D54EB90 3931 90D6 8D54 EB90

1 0

Re: dlls/rsaenh/rsaenh.c
by Alexandre Julliard Nov. 9, 2004

Nov. 9, 2004

Michael Jung <mjung(a)iss.tu-darmstadt.de> writes: > Changelog: > CPAcquireContext: Set last error to ERROR_SUCCESS in case of success. There are very few functions that set last error on success, do you have a test demonstrating that Windows does it in this case? -- Alexandre Julliard julliard(a)winehq.org

2 6

Re: drive detection and driveui rewrite
by Alexandre Julliard Nov. 9, 2004

Nov. 9, 2004

Mike Hearn <mike(a)navi.cx> writes: > final part of winecfg work from september > > - Add drive detection and clean up the drive configuration code/UI It doesn't build, you probably forgot some files. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: implement dbghelp's C++ name undecoration on top of msvcrt's
by Eric Pouech Nov. 9, 2004

Nov. 9, 2004

Eric Pouech a écrit : > see Changelog for the details > A+ with the patch this time. A+

2 1

Re: Convert the COLORREF to a real colour for ExtTextOut
by Alexandre Julliard Nov. 9, 2004

Nov. 9, 2004

Glenn Wurster <gwurster(a)scs.carleton.ca> writes: > Index: dlls/x11drv/xrender.c > =================================================================== > RCS file: /home/wine/wine/dlls/x11drv/xrender.c,v > retrieving revision 1.48 > diff -u -r1.48 xrender.c > --- dlls/x11drv/xrender.c 27 Oct 2004 00:43:50 -0000 1.48 > +++ dlls/x11drv/xrender.c 8 Nov 2004 03:54:51 -0000 > @@ -1019,6 +1019,11 @@ > UINT align = GetTextAlign( hdc ); > COLORREF textColor = GetTextColor( hdc ); > > + textColor = X11DRV_PALETTE_ToPhysical( physDev, textColor ); > + textColor = ((textColor & 0xFF0000) >> 16) | > + (textColor & 0xFF00) | > + ((textColor & 0xFF) << 16); > + That color swapping looks very suspicious, you shouldn't need anything like that. And actually it seems to me you should simply be able to use physDev->textPixel instead, but maybe I'm missing something. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: fix delete_key in shlwapi/shreg test
by Bill Medland Nov. 9, 2004

Nov. 9, 2004

On November 9, 2004 12:10 am, James Hawkins wrote: > oops one-letter typo. This is the correct version. > > On Tue, 9 Nov 2004 01:46:50 -0500, James Hawkins <truiken(a)gmail.com> wrote: > > the previous implementation of delete_key only deleted subkeys of a > > requested key to delete. this fixes that and also fixes test failures > > that crop up in advapi32/registry because of extraneous keys in > > Software\Wine\Test. > > > > Changelog > > * fix implementation of delete_key for shreg test Alternatively couldn't we just call SHDeleteKey, now it has been fixed. > > > > -- > > James Hawkins

3 4

[rsaenh] compilation problem
by Fabrice Ménard Nov. 9, 2004

Nov. 9, 2004

Hi, I'd like to know wich version of openssl is used for rsaenh.dll. With openssl 0.9.6g, I can't compile rsaenh because of name clashs. For example where "DES_*" is used I've got "des_*"equivalent. Moreover, I don't have for example RSAPrivateKey_dup. If it's really a version problem, I think we should check that with autoconf. regards, -- Fabrice Ménard menard.fabrice(a)wanadoo.fr

2 1

Miscellaneous UI Fixes
by William Poetra Yoga H Nov. 9, 2004

Nov. 9, 2004

OK, this is the first time I'm sending a patch as plaintext (I figured out I have to use .txt as the extension, otherwise it's sent as a normal attachment). I don't know if this method of sending works correctly so please try it and let me know. This patch fixes a number of things: 1. System menu icon (fix size and position) 2. Caption buttons (fix size and position) 3. Window caption (fix bounding rectangle) 4. Menu bar (fix size) 5. Popup menu (fix distance) By the way, I have this kind of code in my patch (I wrote this code, the original one doesn't look like this): rect.right -= (GetSystemMetrics(SM_CXSIZE) - 2) + 2; Is it OK to write so? What I mean by the code is, the size of the button is (GetSystemMetrics(SM_CXSIZE) - 2), and there's a 2-pixel space to the right of the button. Or should I just write: rect.right -= GetSystemMetrics(SM_CXSIZE); Which doesn't deliver the message clearly but is simpler. I have tested the patch against theForger's tutorial (I compared the screenshots to the actual apps running on my machine) and it doesn't generate new errors, although some things aren't fixed yet: 1. Popup menu items are still a bit (one pixel) taller than those in Windows. For this one I think I really need help. 2. Caption buttons' captions are still the old ones. I'll try to fix these after this patch is committed. 3. Caption bar is still single-color. I'll fix this after this patch, because it will intersect with this patch and possibly make an unclean patch, in the end the two gets messy and never gets committed. I haven't sent this to wine-patches yet. How should I do it? I mean, should I send it all at once (the two files), or one file per message, or one file per item (of the 5 items fixed, above)? I'm not sure (I've read the docs). Reasons for sending the patch: 1. all at once: the patches are a group of related fixes (as said in the website). 2. one file per message: I don't know :-P 3. one file per item: it's one fix per patch (as said in the website) I prefer #1, but is it OK actually? Comments, Alexandre? Guys? Gals? __________________________________ Do you Yahoo!? Check out the new Yahoo! Front Page. www.yahoo.com Index: dlls/user/menu.c =================================================================== RCS file: /home/wine/wine/dlls/user/menu.c,v retrieving revision 1.7 diff -u -r1.7 menu.c --- dlls/user/menu.c 19 Oct 2004 21:10:17 -0000 1.7 +++ dlls/user/menu.c 7 Nov 2004 04:47:47 -0000 @@ -978,7 +978,7 @@ { lpitem = &lppop->items[start]; orgX = maxX; - orgY = 2; + orgY = 3; maxTab = maxTabWidth = 0; @@ -1043,7 +1043,7 @@ lprect->left, lprect->top, lprect->right, lprect->bottom); lppop->Width = lprect->right - lprect->left; lppop->Height = 0; - maxY = lprect->top+1; + maxY = lprect->top; start = 0; helpPos = -1; while (start < lppop->nItems) @@ -1077,7 +1077,7 @@ while (start < i) lppop->items[start++].rect.bottom = maxY; } - lprect->bottom = maxY; + lprect->bottom = maxY + 1; lppop->Height = lprect->bottom - lprect->top; /* Flush right all items between the MF_RIGHTJUSTIFY and */ @@ -1431,7 +1431,7 @@ lppop = MENU_GetMenu( hMenu ); if (lppop == NULL || lprect == NULL) { - return GetSystemMetrics(SM_CYMENU); + return GetSystemMetrics(SM_CYMENU) + 1; } if (suppress_draw) @@ -1441,8 +1441,6 @@ if (lppop->Height == 0) MENU_MenuBarCalcSize(hDC, lprect, lppop, hwnd); - lprect->bottom = lprect->top + lppop->Height; - if (hfontOld) SelectObject( hDC, hfontOld); return lppop->Height; } @@ -3765,7 +3763,7 @@ lppop = MENU_GetMenu( hMenu ); if (lppop == NULL || lprect == NULL) { - retvalue = GetSystemMetrics(SM_CYMENU); + retvalue = GetSystemMetrics(SM_CYMENU) + 1; goto END; } @@ -3776,17 +3774,17 @@ if (lppop->Height == 0) MENU_MenuBarCalcSize(hDC, lprect, lppop, hwnd); - lprect->bottom = lprect->top + lppop->Height; - FillRect(hDC, lprect, GetSysColorBrush(COLOR_MENU) ); +#if 0 SelectObject( hDC, SYSCOLOR_GetPen(COLOR_3DFACE)); MoveToEx( hDC, lprect->left, lprect->bottom, NULL ); LineTo( hDC, lprect->right, lprect->bottom ); +#endif if (lppop->nItems == 0) { - retvalue = GetSystemMetrics(SM_CYMENU); + retvalue = GetSystemMetrics(SM_CYMENU) + 1; goto END; } Index: windows/nonclient.c =================================================================== RCS file: /home/wine/wine/windows/nonclient.c,v retrieving revision 1.126 diff -u -r1.126 nonclient.c --- windows/nonclient.c 19 Oct 2004 22:54:24 -0000 1.126 +++ windows/nonclient.c 7 Nov 2004 04:56:16 -0000 @@ -400,7 +400,7 @@ winRect->top += MENU_GetMenuBarHeight( hwnd, winRect->right - winRect->left, - -tmpRect.left, -tmpRect.top ) + 1; + -tmpRect.left, -tmpRect.top ); } SetRect(&tmpRect, 0, 0, 0, 0); @@ -655,9 +655,9 @@ { RECT rect; NC_GetInsideRect( hwnd, &rect ); - DrawIconEx (hdc, rect.left + 1, rect.top + 1, hIcon, - GetSystemMetrics(SM_CXSIZE) - 1, - GetSystemMetrics(SM_CYSIZE) - 1, 0, 0, DI_NORMAL); + DrawIconEx (hdc, rect.left + 2, rect.top + 1, hIcon, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL); } return (hIcon != 0); } @@ -682,21 +682,21 @@ /* A tool window has a smaller Close button */ if (GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_TOOLWINDOW) { - INT iBmpHeight = 11; /* Windows does not use SM_CXSMSIZE and SM_CYSMSIZE */ - INT iBmpWidth = 11; /* it uses 11x11 for the close button in tool window */ - INT iCaptionHeight = GetSystemMetrics(SM_CYSMCAPTION); + INT iCaptionHeight = GetSystemMetrics(SM_CYSMCAPTION) - 1; + INT iBmpHeight = iCaptionHeight - 4; + INT iBmpWidth = iCaptionHeight - 5; - rect.top = rect.top + (iCaptionHeight - 1 - iBmpHeight) / 2; - rect.left = rect.right - (iCaptionHeight + 1 + iBmpWidth) / 2; + rect.top += 2; + rect.right -= 2; rect.bottom = rect.top + iBmpHeight; - rect.right = rect.left + iBmpWidth; + rect.left = rect.right - iBmpWidth; } else { - rect.left = rect.right - GetSystemMetrics(SM_CXSIZE) - 1; - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; rect.top += 2; rect.right -= 2; + rect.bottom = rect.top + (GetSystemMetrics(SM_CYSIZE) - 4); + rect.left = rect.right - (GetSystemMetrics(SM_CXSIZE) - 2); } DrawFrameControl( hdc, &rect, DFC_CAPTION, (DFCS_CAPTIONCLOSE | @@ -722,12 +722,12 @@ flags = IsZoomed(hwnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX; NC_GetInsideRect( hwnd, &rect ); - if (GetWindowLongA( hwnd, GWL_STYLE) & WS_SYSMENU) - rect.right -= GetSystemMetrics(SM_CXSIZE) + 1; - rect.left = rect.right - GetSystemMetrics(SM_CXSIZE); - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; rect.top += 2; + if (GetWindowLongA( hwnd, GWL_STYLE) & WS_SYSMENU) + rect.right -= (GetSystemMetrics(SM_CXSIZE) - 2) + 2; rect.right -= 2; + rect.bottom = rect.top + (GetSystemMetrics(SM_CYSIZE) - 4); + rect.left = rect.right - (GetSystemMetrics(SM_CXSIZE) - 2); if (down) flags |= DFCS_PUSHED; if (bGrayed) flags |= DFCS_INACTIVE; DrawFrameControl( hdc, &rect, DFC_CAPTION, flags ); @@ -750,14 +750,14 @@ return; NC_GetInsideRect( hwnd, &rect ); + rect.top += 2; if (style & WS_SYSMENU) - rect.right -= GetSystemMetrics(SM_CXSIZE) + 1; + rect.right -= (GetSystemMetrics(SM_CXSIZE) - 2) + 2; + rect.right -= 2; if (style & (WS_MAXIMIZEBOX|WS_MINIMIZEBOX)) rect.right -= GetSystemMetrics(SM_CXSIZE) - 2; - rect.left = rect.right - GetSystemMetrics(SM_CXSIZE); - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 1; - rect.top += 2; - rect.right -= 2; + rect.left = rect.right - (GetSystemMetrics(SM_CXSIZE) - 2); + rect.bottom = rect.top + (GetSystemMetrics(SM_CYSIZE) - 4); if (down) flags |= DFCS_PUSHED; if (bGrayed) flags |= DFCS_INACTIVE; DrawFrameControl( hdc, &rect, DFC_CAPTION, flags ); @@ -871,7 +871,7 @@ if ((style & WS_SYSMENU) && !(exStyle & WS_EX_TOOLWINDOW)) { if (NC_DrawSysButton (hwnd, hdc, FALSE)) - r.left += GetSystemMetrics(SM_CYCAPTION) - 1; + r.left += GetSystemMetrics(SM_CXSMICON) + 2; } if (style & WS_SYSMENU) @@ -885,18 +885,22 @@ /* Draw a grayed close button if disabled and a normal one if SC_CLOSE is not there */ NC_DrawCloseButton (hwnd, hdc, FALSE, ((((state & MF_DISABLED) || (state & MF_GRAYED))) && (state != 0xFFFFFFFF))); - r.right -= GetSystemMetrics(SM_CYCAPTION) - 1; + r.right -= (GetSystemMetrics(SM_CXSIZE) - 2) + 2; if ((style & WS_MAXIMIZEBOX) || (style & WS_MINIMIZEBOX)) { + /* There's a 2-pixel space between Maximize and Close buttons */ + + r.right -= 2; + /* In win95 the two buttons are always there */ /* But if the menu item is not in the menu they're disabled*/ NC_DrawMaxButton( hwnd, hdc, FALSE, (!(style & WS_MAXIMIZEBOX))); - r.right -= GetSystemMetrics(SM_CXSIZE) + 1; + r.right -= GetSystemMetrics(SM_CXSIZE) - 2; NC_DrawMinButton( hwnd, hdc, FALSE, (!(style & WS_MINIMIZEBOX))); - r.right -= GetSystemMetrics(SM_CXSIZE) + 1; + r.right -= GetSystemMetrics(SM_CXSIZE) - 2; } } @@ -915,6 +919,7 @@ else SetTextColor( hdc, GetSysColor( COLOR_INACTIVECAPTIONTEXT ) ); SetBkMode( hdc, TRANSPARENT ); r.left += 2; + r.right -= 2; DrawTextW( hdc, buffer, -1, &r, DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT ); DeleteObject (SelectObject (hdc, hOldFont)); @@ -1010,12 +1015,12 @@ { RECT r = rect; if (dwExStyle & WS_EX_TOOLWINDOW) { - r.bottom = rect.top + GetSystemMetrics(SM_CYSMCAPTION); rect.top += GetSystemMetrics(SM_CYSMCAPTION); + r.bottom = rect.top; } else { - r.bottom = rect.top + GetSystemMetrics(SM_CYCAPTION); rect.top += GetSystemMetrics(SM_CYCAPTION); + r.bottom = rect.top; } if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) ) NC_DrawCaption(hdc, &r, hwnd, dwStyle, dwExStyle, active); @@ -1029,7 +1034,7 @@ TRACE("Calling DrawMenuBar with rect (%ld, %ld)-(%ld, %ld)\n", r.left, r.top, r.right, r.bottom); - rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1; + rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ); } TRACE("After MenuBar, rect is (%ld, %ld)-(%ld, %ld).\n",

5 8

Re: [shellpath.c] Taking into account the profile value set in wine config file
by Juan Lang Nov. 9, 2004

Nov. 9, 2004

You've exposed some softness in my thinking in this patch. Like I mentioned in the comments for it, _SHExpandEnvironmentVariables exists because the environment isn't actually set up during wine install time. I didn't think to look up the values in the registry. I also didn't register some of the "environment" variables that I use, and probably should have. You might rewrite it just to look at the registry. You probably want to look in HKLM\System\Current Control Set\Session Manager\Environment if the value you're looking for isn't in HKCU, and some variables should probably not be overridable in HKCU either (SystemRoot, for example). --Juan __________________________________ Do you Yahoo!? Check out the new Yahoo! Front Page. www.yahoo.com

3 5

Re: [Fwd: Re: dlls/winmm/tests/capture.c - yes, we can open a device in 2MHz...]
by Robert Reif Nov. 9, 2004

Nov. 9, 2004

> > > How about this? > > > > regards, > Jakob > How about starting a blacklist framework. You could have a table with the function that fails and some caps info that identifies the driver. I would suspect that there is more than one buggy driver out there. You could then just add it's info to the table when it is found. You could then do: if (!inBlacklist(WAVE_IN_OPEN, &capsA)) { // do the test ... } else trace("blacklisted ..... \n"); There are modems that do strange things and the Remote Desktop Protocol driver and other third party sound rerouting pseudo drivers also do strange things. These will need to be added someday also. This could become a real maintenance nightmare if not done properly from the start.

2 1

Blocking automatic debugger launch
by Kenneth Porter Nov. 9, 2004

Nov. 9, 2004

I've got an app that seems to be crashing during shutdown. (Tribes Vengeance dedicated server) I'm running it detached inside a screen session, and I don't want the debugger to automatically launch when the app crashes. I just want the thing to die when I send it a "quit" command. Currently I've hacked the registry setting and changed the debugger name to "true". Is there a cleaner way to accomplish this?

4 4