March 2005 - Wine-Devel - list.winehq.org

visual regression in IE
by Joris Huizer March 26, 2005

March 26, 2005

Hello, I tried to search for information on regressions on the winehq site but I couldn't find it (maybe it should be made visible on the documentation page?) Anyway, in internet explorer a visual regression happened: with my previous cvs build from 15 march, things were displayed correctly, but now (cvs build from 23 march) the 'address' and the 'links' fields are displayed incorrectly: they are bigger than they should be, and they are 'striked through' which should not happen; See also the attached screenshots - I'm sure it's clear what I mean; Could someone point me to the correct pages to find out what caused this? I'm sure someone will be fix this a lot faster than I could do but I want to learn how to solve such a problem :) regards, Joris

5 6

World of Warcraft: fixed?
by cyrix12＠cox.net March 26, 2005

March 26, 2005

I applied the two patches from bugzilla (http://bugs.winehq.org/show_bug.cgi?id=2814#c8) which includes Raphael's opengl32 fbconf patch and another one from Tim Savannah which looks like this: --- wine2/dlls/x11drv/opengl.c 2005-03-24 20:51:16.000000000 -0500 +++ wine/dlls/x11drv/opengl.c 2005-03-24 20:50:14.000000000 -0500 @@ -268,9 +268,8 @@ if ((iPixelFormat > MAX_PIXELFORMATS) || (iPixelFormat > physDev->used_visuals + 1) || (iPixelFormat <= 0)) { - ERR("Wrong pixel format !\n"); - /* Should set error */ - return 0; + ERR("Wrong pixel format, trying default. !\n"); + iPixelFormat = physDev->used_visuals + 1; } if (iPixelFormat == physDev->used_visuals + 1) { I note two things when using these patches: 1) WoW works. Game loads and runs again. 2) The login/character select screen will occasionally be extremely choppy/slow. Sometimes it happens, sometimes it doesn't, and there seems to be no direct cause from what I can tell since the traces are identical. Once in the game it performs nicely from what I've seen, so it's really just a minor irritation. Some, however, have reported that these two patches don't solve the problem. As I am not one of those, I am unable to provide traces/details on this. If I find any issues occurring regularly on my end, I'll send in the appropriate info so that you guys can take a look at it. Thanks for the swift fixes! Darckness

2 2

"Black" Text
by Ian Bartelds! March 26, 2005

March 26, 2005

Hey guy's my first time asking for support on wine so I will try and make it a quick one. Now I am having troubles with colours in text and behind text. I am trying to get a game to run correctly it's a MMORPG called legend of mir, now everything runs fine but the text box where you send and recieve messages all the "colors" behind the text is black all of the text is black is this a bug in wine? Thanks Kozuka P.S. Here's a screenshot so you can see what I am talking about wine doesn't return any errors.. http://img222.exs.cx/my.php?loc=img222&image=images049iv.jpg

9 13

Not Wine but
by Wesley Parish March 26, 2005

March 26, 2005

has anyone seen the other Windows "emulator-cross-platform" library Twin around lately? I'm getting into Windows programming with theForger's Win32 Tutorial - got a personal project I want to fool around with - and while Winelib is a very satisfactory Win32 API library on Linux, I was wanting to have Yet Another Cross-Platform Implementation Thereof to test it against. I've just been hunting for it and www.willows.com seems to have vainshed off the face of the 'Net. Any ideas? Thanks Wesley Parish -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

2 1

BitTorrent
by Andrew Neil Ramage March 25, 2005

March 25, 2005

Following up from the last message, when I tried to move beyond the stage described, I get the following: next Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:1e04e00f ESP:406ee804 EBP:406ee860 EFLAGS:00210246( - 00 -RIZP1) EAX:00000000 EBX:00000002 ECX:ffffffff EDX:a93c6858 ESI:406ee860 EDI:a93c6858 Stack dump: 0x406ee804: 4131a118 00000000 00000002 1e04dd4c 0x406ee814: 406ee860 406ee868 1e09ca68 406ee860 0x406ee824: 41300a64 00000000 1e04de36 406ee860 0x406ee834: 406ee868 00000029 00000002 1e0bcd75 0x406ee844: 00000029 1e09ca68 412b35e8 00000000 0x406ee854: 1e04dbec 406ee860 406ee868 1e0bcd76 Backtrace: =>1 0x1e04e00f PyCFunction_Call in python22 (0x406ee860) 2 0x1e04db8f PyCFunction_Call in python22 (0x1e0bcd76) 3 0x61640000 (0x0000297a) 4 0x00000000 (0x00000000) 0x1e04e00f PyCFunction_Call+0xc2f in python22: repne scasb %es:(%edi) Wine-dbg>First chance exception: page fault on read access to 0xa93c6858 in 32-bit code (0x1e04e00f). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:1e04e00f ESP:406ee804 EBP:406ee860 EFLAGS:00210246( - 00 -RIZP1) EAX:00000000 EBX:00000002 ECX:ffffffff EDX:a93c6858 ESI:406ee860 EDI:a93c6858 Stack dump: 0x406ee804: 4131a118 00000000 00000002 1e04dd4c 0x406ee814: 406ee860 406ee868 1e09ca68 406ee860 0x406ee824: 41300a64 00000000 1e04de36 406ee860 0x406ee834: 406ee868 00000029 00000002 1e0bcd75 0x406ee844: 00000029 1e09ca68 412b35e8 00000000 0x406ee854: 1e04dbec 406ee860 406ee868 1e0bcd76 Backtrace: =>1 0x1e04e00f PyCFunction_Call in python22 (0x406ee860) 2 0x1e04db8f PyCFunction_Call in python22 (0x1e0bcd76) 3 0x61640000 (0x0000297a) 4 0x00000000 (0x00000000) 0x1e04e00f PyCFunction_Call+0xc2f in python22: repne scasb %es:(%edi) Wine-dbg> Andrew "Someone set a bad example makes surrender seem alright; The act of a noble warrior who's lost the will to fight And now you're trembling on a rocky ledge Staring out into a heartless sea Facing life on a razor's edge Nothing's what you thought it would be." ----------- Rush, The Pass (Presto, 1989)

2 1

BitTorrent
by Andrew Neil Ramage March 25, 2005

March 25, 2005

I tried downloading the BitTorrent client from [url] and executin -- Andrew "Someone set a bad example makes surrender seem alright; The act of a noble warrior who's lost the will to fight And now you're trembling on a rocky ledge Staring out into a heartless sea Facing life on a razor's edge Nothing's what you thought it would be." ----------- Rush, The Pass (Presto, 1989) [andrew(a)zeus andrew]$ wine $C/"Program Files"/BitTorrent/btdownloadgui.exe fixme:msvcrt:MSVCRT_signal (1 0x1):stub fixme:msvcrt:MSVCRT_signal (1 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (2 0x1):stub fixme:msvcrt:MSVCRT_signal (2 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (3 0x1):stub fixme:msvcrt:MSVCRT_signal (3 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (4 0x1):stub fixme:msvcrt:MSVCRT_signal (4 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (5 0x1):stub fixme:msvcrt:MSVCRT_signal (5 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (6 0x1):stub fixme:msvcrt:MSVCRT_signal (6 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (7 0x1):stub fixme:msvcrt:MSVCRT_signal (7 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (8 0x1):stub fixme:msvcrt:MSVCRT_signal (8 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (9 0x1):stub fixme:msvcrt:MSVCRT_signal (9 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (10 0x1):stub fixme:msvcrt:MSVCRT_signal (10 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (11 0x1):stub fixme:msvcrt:MSVCRT_signal (11 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (12 0x1):stub fixme:msvcrt:MSVCRT_signal (12 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (13 0x1):stub fixme:msvcrt:MSVCRT_signal (13 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (14 0x1):stub fixme:msvcrt:MSVCRT_signal (14 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (15 0x1):stub fixme:msvcrt:MSVCRT_signal (15 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (16 0x1):stub fixme:msvcrt:MSVCRT_signal (16 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (17 0x1):stub fixme:msvcrt:MSVCRT_signal (17 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (18 0x1):stub fixme:msvcrt:MSVCRT_signal (18 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (19 0x1):stub fixme:msvcrt:MSVCRT_signal (19 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (20 0x1):stub fixme:msvcrt:MSVCRT_signal (20 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (21 0x1):stub fixme:msvcrt:MSVCRT_signal (21 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (22 0x1):stub fixme:msvcrt:MSVCRT_signal (22 0xffffffff):stub fixme:msvcrt:_XcptFilter (-1073741819,0x406de3c4)semi-stub wine: Unhandled exception (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on read access to 0xa93c6858 in 32-bit code (0x1e04e00f). In 32 bit mode. Second try [andrew(a)zeus andrew]$ WINEDEBUG=all [andrew(a)zeus andrew]$ winedbg $C/"Program Files"/BitTorrent/btdownloadgui.exe WineDbg starting on pid 0xa In 32 bit mode. 0x405045d2 start_process+0x102 in kernel32: jmp 0x405045c1 start_process+0xf1 in kernel32 Wine-dbg>next fixme:msvcrt:MSVCRT_signal (1 0x1):stub fixme:msvcrt:MSVCRT_signal (1 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (2 0x1):stub fixme:msvcrt:MSVCRT_signal (2 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (3 0x1):stub fixme:msvcrt:MSVCRT_signal (3 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (4 0x1):stub fixme:msvcrt:MSVCRT_signal (4 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (5 0x1):stub fixme:msvcrt:MSVCRT_signal (5 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (6 0x1):stub fixme:msvcrt:MSVCRT_signal (6 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (7 0x1):stub fixme:msvcrt:MSVCRT_signal (7 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (8 0x1):stub fixme:msvcrt:MSVCRT_signal (8 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (9 0x1):stub fixme:msvcrt:MSVCRT_signal (9 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (10 0x1):stub fixme:msvcrt:MSVCRT_signal (10 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (11 0x1):stub fixme:msvcrt:MSVCRT_signal (11 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (12 0x1):stub fixme:msvcrt:MSVCRT_signal (12 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (13 0x1):stub fixme:msvcrt:MSVCRT_signal (13 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (14 0x1):stub fixme:msvcrt:MSVCRT_signal (14 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (15 0x1):stub fixme:msvcrt:MSVCRT_signal (15 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (16 0x1):stub fixme:msvcrt:MSVCRT_signal (16 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (17 0x1):stub fixme:msvcrt:MSVCRT_signal (17 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (18 0x1):stub fixme:msvcrt:MSVCRT_signal (18 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (19 0x1):stub fixme:msvcrt:MSVCRT_signal (19 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (20 0x1):stub fixme:msvcrt:MSVCRT_signal (20 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (21 0x1):stub fixme:msvcrt:MSVCRT_signal (21 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (22 0x1):stub fixme:msvcrt:MSVCRT_signal (22 0xffffffff):stub First chance exception: page fault on read access to 0xa93c6858 in 32-bit code (0x1e04e00f).

1 0

Hotel full again?
by Andrew Bartlett March 25, 2005

March 25, 2005

I tried to book a double room 28th April -> 1st May (sharing with tridge), and it seems the hotel is all full again :-( There seems to be quite a contingent of Samba folk intending to come along (from a poll on the samba team list), and given the number of 'maybe' and 'probably' replies, I suspect I'm not the only one without a room... Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Student Network Administrator, Hawker College http://hawkerc.net

1 0

DirectDraw YUV overlays
by Matthew Mastracci March 25, 2005

March 25, 2005

I've been investigating the YUV overlays used by Picasa and it seems like it would be a huge problem to tackle this sort of support without some sort of external YUV conversion library and/or hardware support. SDL has great support for transparent hardware/software YUV support; it might be possible to adopt some of the YUV hw/sw implementation code from SDL into Wine. Both projects are LGPL. Whatever the implementation, getting support into the DirectDraw layer for scaling YUV surfaces is a fairly large job. Matt.

4 3

Re: updown: proper handling for GWL_STYLE
by Robert Shearman March 25, 2005

March 25, 2005

Dimitrie O. Paun wrote: >ChangeLog > Proper handling for GWL_STYLE. > Minor cleanups. > case WM_ENABLE: >- if (dwStyle & WS_DISABLED) UPDOWN_CancelMode (infoPtr); >+ if (infoPtr->dwStyle & WS_DISABLED) UPDOWN_CancelMode (infoPtr); > InvalidateRect (infoPtr->Self, NULL, FALSE); > break; > > You need to update infoPtr->dwStyle here. EnableWindow(FALSE) does not generate a WM_STYLECHANGED message. > >+ case WM_STYLECHANGED: >+ if (wParam == GWL_STYLE) { >+ infoPtr->dwStyle = ((LPSTYLESTRUCT)lParam)->styleNew; >+ InvalidateRect (infoPtr->Self, NULL, FALSE); >+ } >+ break; >+ > > Rob

1 0

Re: winetest: code reorder
by Dmitry Timoshkov March 25, 2005

March 25, 2005

"Ferenc Wagner" <wferi(a)tba.elte.hu> wrote: > ChangeLog: Check desktop visibility after processing command > line arguments. Why do you need it? There is no point to proceed if the tests can not run in an appropriate environment. -- Dmitry.

2 4

Re: ipaddress: uniform naming
by Alexandre Julliard March 25, 2005

March 25, 2005

"Dimitrie O. Paun" <dpaun(a)rogers.com> writes: > I figured I might as well be consistent. The problem with LowerLimit > is the capital at the beginning, I don't remember where I got the (bad) > idea to name it like that. We don't use such naming anywhere, and I really > think I did a mistake when I went for it. Maybe lowerLimit is a more > acceptable solution? But do you really think it's worth having an exception > to the rule for a little 'n'? I don't think there's any point in trying to impose such silly rules on ourselves, and I really don't see what's wrong with starting with a capital letter. That's also the way Windows does it in most places where it doesn't have the Hungarian crap. Of course I think using all lowercase would be a lot more readable, but if you are going to use uppercase "LowerLimit" is much better than "lowerLimit". -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: LOSTWAGES: updates
by Dimitrie O. Paun March 25, 2005

March 25, 2005

On Fri, Mar 25, 2005 at 09:48:48PM +0900, Mike McCormack wrote: > + <h2>Remove HeapAlloc casts</h2> Please make this a <h3>, all entries there are at that level. -- Dimi.

1 0

Re: ipaddress: uniform naming (take 2)
by Dimitrie O. Paun March 25, 2005

March 25, 2005

On Fri, Mar 25, 2005 at 12:05:20PM +0000, Mike Hearn wrote: > Blah, consistency with past mistakes rather than fixing them is how Win32 > ended up being such a steaming pile in the first place. If you want to do > a mass search/replace why not un-hungarianize the whole file? Because out of 24 controls, only a few (maybe 2 or 3) don't use a consistent notation. And honestly, while I don't much care for the hungarian notation, I don't think it's that bad anymore to warrant such a huge renaming. And besides, the stuff that I'm renaming is code that I wrote, and so I'm sure I'm not upsetting anyone :). -- Dimi.

1 0

Re: advapi32: Implement NtLoadKey
by Mike McCormack March 25, 2005

March 25, 2005

James Hawkins wrote: > +/* mount a key directly under HKLM or HKU */ > +static void mount_key(struct key *key, const WCHAR *subkey, obj_handle_t handle) > +{ > + if (!(f = fdopen(fd, "r"))) > + return; > + > + /* create the key */ > + newkey = create_key(key, subkey, NULL, KEY_DIRTY, 0, &created); > + if (!newkey) > + return; > + > + /* load the key */ > + load_keys(newkey, f, -1); > +} I think you leak the FILE * returned from fdopen here. Additionally, if dup() or fdopen() fails, no error code will be set, so the code will fail silently. In NtLoadKey(), you should close the file handle "hive" that you open. Can't you achieve the same effect using the original load_registry request, rather than creating a new request? If not, you can also remove the load_registry request from protocol.def as I think it's no longer used. Mike

2 1

Support for IDvdInfo2::GetDiscID
by James Courtier-Dutton March 25, 2005

March 25, 2005

The Windows api method uses the function call IDvdInfo2::GetDiscID http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c… This returns a unique 64bit ID for a DVD. Has anyone found out what exactly it does to create this 64bit ID. It would be nice to get linux DVD players to be able to use the same method. Cheers James

2 2

[WINEALSA] multiple sound card support patch review needed
by Robert Reif March 25, 2005

March 25, 2005

This patch adds multiple sound card support to the ALSA driver. My system shows 3 sound devices: a builtin sound card, a builtin modem and a usb sound card. The wave regression tests have problems with the modem. I'm not sure it is an ALSA problem or a problem with this patch. Could someone familiar with ALSA look this patch over. I would also like feedback from any brave testers that have multiple sound cards. Thanks. Index: dlls/winmm/winealsa/audio.c =================================================================== RCS file: /home/wine/wine/dlls/winmm/winealsa/audio.c,v retrieving revision 1.65 diff -u -p -r1.65 audio.c --- dlls/winmm/winealsa/audio.c 17 Mar 2005 18:54:20 -0000 1.65 +++ dlls/winmm/winealsa/audio.c 17 Mar 2005 20:51:58 -0000 @@ -74,8 +74,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); snd_pcm_uframes_t _snd_pcm_mmap_hw_ptr(snd_pcm_t *pcm); -#define MAX_WAVEOUTDRV (1) -#define MAX_WAVEINDRV (1) +#define MAX_WAVEOUTDRV (6) +#define MAX_WAVEINDRV (6) /* state diagram for waveOut writing: * @@ -389,6 +389,7 @@ static int ALSA_InitializeVolumeCtl(WINE snd_hctl_elem_t * elem; int nCtrls; int i; + char device[8]; snd_ctl_card_info_alloca(&cardinfo); memset(cardinfo,0,snd_ctl_card_info_sizeof()); @@ -416,13 +417,15 @@ static int ALSA_InitializeVolumeCtl(WINE } \ } while(0) - EXIT_ON_ERROR( snd_ctl_open(&ctl,"hw",0) , "ctl open failed" ); + sprintf(device, "hw:%ld", ALSA_WodNumDevs); + + EXIT_ON_ERROR( snd_ctl_open(&ctl,device,0) , "ctl open failed" ); EXIT_ON_ERROR( snd_ctl_card_info(ctl, cardinfo), "card info failed"); EXIT_ON_ERROR( snd_ctl_elem_list(ctl, elemlist), "elem list failed"); nCtrls = snd_ctl_elem_list_get_count(elemlist); - EXIT_ON_ERROR( snd_hctl_open(&hctl,"hw",0), "hctl open failed"); + EXIT_ON_ERROR( snd_hctl_open(&hctl,device,0), "hctl open failed"); EXIT_ON_ERROR( snd_hctl_load(hctl), "hctl load failed" ); elem=snd_hctl_first_elem(hctl); @@ -636,21 +639,21 @@ static char* ALSA_strdup(char *s) { /****************************************************************** * ALSA_GetDeviceFromReg * - * Returns either "default" or reads the registry so the user can + * Returns either "plug:hw" or reads the registry so the user can * override the playback/record device used. */ static char *ALSA_GetDeviceFromReg(const char *value) { DWORD res; DWORD type; - HKEY playbackKey = 0; + HKEY key = 0; char *result = NULL; DWORD resultSize; - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\ALSA", 0, KEY_QUERY_VALUE, &playbackKey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\ALSA", 0, KEY_QUERY_VALUE, &key); if (res != ERROR_SUCCESS) goto end; - res = RegQueryValueExA(playbackKey, value, NULL, &type, NULL, &resultSize); + res = RegQueryValueExA(key, value, NULL, &type, NULL, &resultSize); if (res != ERROR_SUCCESS) goto end; if (type != REG_SZ) { @@ -659,11 +662,15 @@ static char *ALSA_GetDeviceFromReg(const } result = HeapAlloc(GetProcessHeap(), 0, resultSize); - res = RegQueryValueExA(playbackKey, value, NULL, NULL, result, &resultSize); + res = RegQueryValueExA(key, value, NULL, NULL, result, &resultSize); end: - if (!result) result = ALSA_strdup("default"); - if (playbackKey) RegCloseKey(playbackKey); + if (!result) + result = ALSA_strdup("plug:hw"); + + if (key) + RegCloseKey(key); + return result; } @@ -685,24 +692,7 @@ LONG ALSA_WaveInit(void) int err=0; WINE_WAVEOUT* wwo; WINE_WAVEIN* wwi; - static const WCHAR init_out[] = {'S','B','1','6',' ','W','a','v','e',' ','O','u','t',0}; - static const WCHAR init_in [] = {'S','B','1','6',' ','W','a','v','e',' ','I','n',0}; - - wwo = &WOutDev[0]; - - /* FIXME: use better values */ - wwo->device = ALSA_GetDeviceFromReg("PlaybackDevice"); - TRACE("using waveout device \"%s\"\n", wwo->device); - - snprintf(wwo->interface_name, sizeof(wwo->interface_name), "winealsa: %s", wwo->device); - - wwo->caps.wMid = 0x0002; - wwo->caps.wPid = 0x0104; - strcpyW(wwo->caps.szPname, init_out); - wwo->caps.vDriverVersion = 0x0100; - wwo->caps.dwFormats = 0x00000000; - wwo->caps.dwSupport = WAVECAPS_VOLUME; - strcpy(wwo->ds_desc.szDrvname, "winealsa.drv"); + int i; if (!wine_dlopen("libasound.so.2", RTLD_LAZY|RTLD_GLOBAL, NULL, 0)) { @@ -710,191 +700,226 @@ LONG ALSA_WaveInit(void) return -1; } - snd_pcm_info_alloca(&info); - snd_pcm_hw_params_alloca(&hw_params); + ALSA_WodNumDevs = 0; -#define EXIT_ON_ERROR(f,txt) do { int err; if ( (err = (f) ) < 0) { ERR(txt ": %s\n", snd_strerror(err)); if (h) snd_pcm_close(h); return -1; } } while(0) + for (i = 0; i < MAX_WAVEOUTDRV; i++) + { + char device[64]; + char * regdev; + WCHAR nameW[64]; + snd_pcm_format_mask_t * fmask; + snd_pcm_access_mask_t * acmask; - h = NULL; - ALSA_WodNumDevs = 0; - EXIT_ON_ERROR( snd_pcm_open(&h, wwo->device, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK) , "open pcm" ); - if (!h) return -1; - ALSA_WodNumDevs++; - - EXIT_ON_ERROR( snd_pcm_info(h, info) , "pcm info" ); - - TRACE("dev=%d id=%s name=%s subdev=%d subdev_name=%s subdev_avail=%d subdev_num=%d stream=%s subclass=%s \n", - snd_pcm_info_get_device(info), - snd_pcm_info_get_id(info), - snd_pcm_info_get_name(info), - snd_pcm_info_get_subdevice(info), - snd_pcm_info_get_subdevice_name(info), - snd_pcm_info_get_subdevices_avail(info), - snd_pcm_info_get_subdevices_count(info), - snd_pcm_stream_name(snd_pcm_info_get_stream(info)), - (snd_pcm_info_get_subclass(info) == SND_PCM_SUBCLASS_GENERIC_MIX ? "GENERIC MIX": "MULTI MIX")); + wwo = &WOutDev[ALSA_WodNumDevs]; - strcpy(wwo->ds_desc.szDesc, snd_pcm_info_get_name(info)); - EXIT_ON_ERROR( snd_pcm_hw_params_any(h, hw_params) , "pcm hw params" ); -#undef EXIT_ON_ERROR + regdev = ALSA_GetDeviceFromReg("PlaybackDevice"); + sprintf(device, "%s:%d", regdev, i); + HeapFree(GetProcessHeap(), 0, regdev); + wwo->device = HeapAlloc(GetProcessHeap(), 0, strlen(device)); + strcpy(wwo->device, device); + TRACE("using waveout device \"%s\"\n", wwo->device); + + snprintf(wwo->interface_name, sizeof(wwo->interface_name), "winealsa: %s", wwo->device); + + wwo->caps.wMid = 0x0002; + wwo->caps.wPid = 0x0104; + wwo->caps.vDriverVersion = 0x0100; + wwo->caps.dwFormats = 0x00000000; + wwo->caps.dwSupport = WAVECAPS_VOLUME; + strcpy(wwo->ds_desc.szDrvname, "winealsa.drv"); - err = snd_pcm_hw_params_get_rate_min(hw_params, &ratemin, &dir); - err = snd_pcm_hw_params_get_rate_max(hw_params, &ratemax, &dir); - err = snd_pcm_hw_params_get_channels_min(hw_params, &chmin); - err = snd_pcm_hw_params_get_channels_max(hw_params, &chmax); - if (TRACE_ON(wave)) - ALSA_TraceParameters(hw_params, NULL, TRUE); + snd_pcm_info_alloca(&info); + snd_pcm_hw_params_alloca(&hw_params); - { - snd_pcm_format_mask_t * fmask; +#define EXIT_ON_ERROR(f,txt) do { int err; if ( (err = (f) ) < 0) { ERR(txt ": %s\n", snd_strerror(err)); if (h) snd_pcm_close(h); return -1; } } while(0) + + h = NULL; + snd_pcm_open(&h, wwo->device, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); + if (!h) + break; + + EXIT_ON_ERROR( snd_pcm_info(h, info) , "pcm info" ); + + TRACE("dev=%d id=%s name=%s subdev=%d subdev_name=%s subdev_avail=%d subdev_num=%d stream=%s subclass=%s \n", + snd_pcm_info_get_device(info), + snd_pcm_info_get_id(info), + snd_pcm_info_get_name(info), + snd_pcm_info_get_subdevice(info), + snd_pcm_info_get_subdevice_name(info), + snd_pcm_info_get_subdevices_avail(info), + snd_pcm_info_get_subdevices_count(info), + snd_pcm_stream_name(snd_pcm_info_get_stream(info)), + (snd_pcm_info_get_subclass(info) == SND_PCM_SUBCLASS_GENERIC_MIX ? "GENERIC MIX": "MULTI MIX")); + + strcpy(wwo->ds_desc.szDesc, snd_pcm_info_get_name(info)); + MultiByteToWideChar(CP_ACP, 0, wwo->ds_desc.szDesc, -1, nameW, sizeof(nameW)/sizeof(WCHAR)); + strcpyW(wwo->caps.szPname, nameW); + EXIT_ON_ERROR( snd_pcm_hw_params_any(h, hw_params) , "pcm hw params" ); +#undef EXIT_ON_ERROR + + err = snd_pcm_hw_params_get_rate_min(hw_params, &ratemin, &dir); + err = snd_pcm_hw_params_get_rate_max(hw_params, &ratemax, &dir); + err = snd_pcm_hw_params_get_channels_min(hw_params, &chmin); + err = snd_pcm_hw_params_get_channels_max(hw_params, &chmax); + if (TRACE_ON(wave)) + ALSA_TraceParameters(hw_params, NULL, TRUE); snd_pcm_format_mask_alloca(&fmask); snd_pcm_hw_params_get_format_mask(hw_params, fmask); #define X(r,v) \ - if ( (r) >= ratemin && ( (r) <= ratemax || ratemax == -1) ) \ - { \ - if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_U8)) \ - { \ + if ( (r) >= ratemin && ( (r) <= ratemax || ratemax == -1) ) \ + { \ + if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_U8)) \ + { \ if (chmin <= 1 && 1 <= chmax) \ wwo->caps.dwFormats |= WAVE_FORMAT_##v##M08; \ if (chmin <= 2 && 2 <= chmax) \ wwo->caps.dwFormats |= WAVE_FORMAT_##v##S08; \ - } \ - if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_S16_LE)) \ - { \ + } \ + if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_S16_LE)) \ + { \ if (chmin <= 1 && 1 <= chmax) \ wwo->caps.dwFormats |= WAVE_FORMAT_##v##M16; \ if (chmin <= 2 && 2 <= chmax) \ wwo->caps.dwFormats |= WAVE_FORMAT_##v##S16; \ - } \ - } - X(11025,1); - X(22050,2); - X(44100,4); - X(48000,48); - X(96000,96); + } \ + } + X(11025,1); + X(22050,2); + X(44100,4); + X(48000,48); + X(96000,96); #undef X - } - if ( chmin > 1) FIXME("-\n"); - wwo->caps.wChannels = chmax; - if (chmin <= 2 && 2 <= chmax) - wwo->caps.dwSupport |= WAVECAPS_LRVOLUME; + if (chmin > 1) + FIXME("-\n"); + wwo->caps.wChannels = chmax; + if (chmin <= 2 && 2 <= chmax) + wwo->caps.dwSupport |= WAVECAPS_LRVOLUME; - /* FIXME: always true ? */ - wwo->caps.dwSupport |= WAVECAPS_SAMPLEACCURATE; + /* FIXME: always true ? */ + wwo->caps.dwSupport |= WAVECAPS_SAMPLEACCURATE; - { - snd_pcm_access_mask_t * acmask; snd_pcm_access_mask_alloca(&acmask); snd_pcm_hw_params_get_access_mask(hw_params, acmask); /* FIXME: NONITERLEAVED and COMPLEX are not supported right now */ if ( snd_pcm_access_mask_test( acmask, SND_PCM_ACCESS_MMAP_INTERLEAVED ) ) wwo->caps.dwSupport |= WAVECAPS_DIRECTSOUND; - } - TRACE("Configured with dwFmts=%08lx dwSupport=%08lx\n", - wwo->caps.dwFormats, wwo->caps.dwSupport); + TRACE("Configured with dwFmts=%08lx dwSupport=%08lx\n", + wwo->caps.dwFormats, wwo->caps.dwSupport); - snd_pcm_close(h); + snd_pcm_close(h); - ALSA_InitializeVolumeCtl(wwo); + ALSA_InitializeVolumeCtl(wwo); - wwi = &WInDev[0]; + ALSA_WodNumDevs++; + } - /* FIXME: use better values */ - wwi->device = ALSA_GetDeviceFromReg("RecordDevice"); - TRACE("using wavein device \"%s\"\n", wwi->device); + ALSA_WidNumDevs = 0; - snprintf(wwi->interface_name, sizeof(wwi->interface_name), "winealsa: %s", wwi->device); + for (i = 0; i < MAX_WAVEINDRV; i++) + { + char device[64]; + char * regdev; + WCHAR nameW[64]; + snd_pcm_format_mask_t * fmask; + snd_pcm_access_mask_t * acmask; - wwi->caps.wMid = 0x0002; - wwi->caps.wPid = 0x0104; - strcpyW(wwi->caps.szPname, init_in); - wwi->caps.vDriverVersion = 0x0100; - wwi->caps.dwFormats = 0x00000000; - wwi->caps.dwSupport = WAVECAPS_VOLUME; - strcpy(wwi->ds_desc.szDrvname, "winealsa.drv"); + wwi = &WInDev[ALSA_WidNumDevs]; - snd_pcm_info_alloca(&info); - snd_pcm_hw_params_alloca(&hw_params); + regdev = ALSA_GetDeviceFromReg("CaptureDevice"); + sprintf(device, "%s:%d", regdev, i); + HeapFree(GetProcessHeap(), 0, regdev); + wwi->device = HeapAlloc(GetProcessHeap(), 0, strlen(device)); + strcpy(wwi->device, device); + + TRACE("using wavein device \"%s\"\n", wwi->device); + + snprintf(wwi->interface_name, sizeof(wwi->interface_name), "winealsa: %s", wwi->device); + + wwi->caps.wMid = 0x0002; + wwi->caps.wPid = 0x0104; + wwi->caps.vDriverVersion = 0x0100; + wwi->caps.dwFormats = 0x00000000; + wwi->caps.dwSupport = WAVECAPS_VOLUME; + strcpy(wwi->ds_desc.szDrvname, "winealsa.drv"); -#define EXIT_ON_ERROR(f,txt) do { int err; if ( (err = (f) ) < 0) { ERR(txt ": %s\n", snd_strerror(err)); if (h) snd_pcm_close(h); return -1; } } while(0) + snd_pcm_info_alloca(&info); + snd_pcm_hw_params_alloca(&hw_params); - h = NULL; - ALSA_WidNumDevs = 0; - EXIT_ON_ERROR( snd_pcm_open(&h, wwi->device, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK) , "open pcm" ); - if (!h) return -1; - ALSA_WidNumDevs++; - - EXIT_ON_ERROR( snd_pcm_info(h, info) , "pcm info" ); - - TRACE("dev=%d id=%s name=%s subdev=%d subdev_name=%s subdev_avail=%d subdev_num=%d stream=%s subclass=%s \n", - snd_pcm_info_get_device(info), - snd_pcm_info_get_id(info), - snd_pcm_info_get_name(info), - snd_pcm_info_get_subdevice(info), - snd_pcm_info_get_subdevice_name(info), - snd_pcm_info_get_subdevices_avail(info), - snd_pcm_info_get_subdevices_count(info), - snd_pcm_stream_name(snd_pcm_info_get_stream(info)), - (snd_pcm_info_get_subclass(info) == SND_PCM_SUBCLASS_GENERIC_MIX ? "GENERIC MIX": "MULTI MIX")); +#define EXIT_ON_ERROR(f,txt) do { int err; if ( (err = (f) ) < 0) { ERR(txt ": %s\n", snd_strerror(err)); if (h) snd_pcm_close(h); return -1; } } while(0) - strcpy(wwi->ds_desc.szDesc, snd_pcm_info_get_name(info)); - EXIT_ON_ERROR( snd_pcm_hw_params_any(h, hw_params) , "pcm hw params" ); + h = NULL; + snd_pcm_open(&h, wwi->device, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK); + if (!h) + break; + + EXIT_ON_ERROR( snd_pcm_info(h, info) , "pcm info" ); + + TRACE("dev=%d id=%s name=%s subdev=%d subdev_name=%s subdev_avail=%d subdev_num=%d stream=%s subclass=%s \n", + snd_pcm_info_get_device(info), + snd_pcm_info_get_id(info), + snd_pcm_info_get_name(info), + snd_pcm_info_get_subdevice(info), + snd_pcm_info_get_subdevice_name(info), + snd_pcm_info_get_subdevices_avail(info), + snd_pcm_info_get_subdevices_count(info), + snd_pcm_stream_name(snd_pcm_info_get_stream(info)), + (snd_pcm_info_get_subclass(info) == SND_PCM_SUBCLASS_GENERIC_MIX ? "GENERIC MIX": "MULTI MIX")); + + strcpy(wwi->ds_desc.szDesc, snd_pcm_info_get_name(info)); + MultiByteToWideChar(CP_ACP, 0, wwi->ds_desc.szDesc, -1, nameW, sizeof(nameW)/sizeof(WCHAR)); + strcpyW(wwi->caps.szPname, nameW); + EXIT_ON_ERROR( snd_pcm_hw_params_any(h, hw_params) , "pcm hw params" ); #undef EXIT_ON_ERROR - err = snd_pcm_hw_params_get_rate_min(hw_params, &ratemin, &dir); - err = snd_pcm_hw_params_get_rate_max(hw_params, &ratemax, &dir); - err = snd_pcm_hw_params_get_channels_min(hw_params, &chmin); - err = snd_pcm_hw_params_get_channels_max(hw_params, &chmax); + err = snd_pcm_hw_params_get_rate_min(hw_params, &ratemin, &dir); + err = snd_pcm_hw_params_get_rate_max(hw_params, &ratemax, &dir); + err = snd_pcm_hw_params_get_channels_min(hw_params, &chmin); + err = snd_pcm_hw_params_get_channels_max(hw_params, &chmax); - if (TRACE_ON(wave)) - ALSA_TraceParameters(hw_params, NULL, TRUE); - - { - snd_pcm_format_mask_t * fmask; + if (TRACE_ON(wave)) + ALSA_TraceParameters(hw_params, NULL, TRUE); snd_pcm_format_mask_alloca(&fmask); snd_pcm_hw_params_get_format_mask(hw_params, fmask); #define X(r,v) \ - if ( (r) >= ratemin && ( (r) <= ratemax || ratemax == -1) ) \ - { \ - if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_U8)) \ - { \ + if ( (r) >= ratemin && ( (r) <= ratemax || ratemax == -1) ) \ + { \ + if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_U8)) \ + { \ if (chmin <= 1 && 1 <= chmax) \ wwi->caps.dwFormats |= WAVE_FORMAT_##v##M08; \ if (chmin <= 2 && 2 <= chmax) \ wwi->caps.dwFormats |= WAVE_FORMAT_##v##S08; \ - } \ - if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_S16_LE)) \ - { \ + } \ + if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_S16_LE)) \ + { \ if (chmin <= 1 && 1 <= chmax) \ wwi->caps.dwFormats |= WAVE_FORMAT_##v##M16; \ if (chmin <= 2 && 2 <= chmax) \ wwi->caps.dwFormats |= WAVE_FORMAT_##v##S16; \ - } \ - } - X(11025,1); - X(22050,2); - X(44100,4); - X(48000,48); - X(96000,96); + } \ + } + X(11025,1); + X(22050,2); + X(44100,4); + X(48000,48); + X(96000,96); #undef X - } - if ( chmin > 1) FIXME("-\n"); - wwi->caps.wChannels = chmax; - if (chmin <= 2 && 2 <= chmax) - wwi->caps.dwSupport |= WAVECAPS_LRVOLUME; + if (chmin > 1) + FIXME("-\n"); + wwi->caps.wChannels = chmax; + if (chmin <= 2 && 2 <= chmax) + wwi->caps.dwSupport |= WAVECAPS_LRVOLUME; - /* FIXME: always true ? */ - wwi->caps.dwSupport |= WAVECAPS_SAMPLEACCURATE; + /* FIXME: always true ? */ + wwi->caps.dwSupport |= WAVECAPS_SAMPLEACCURATE; - { - snd_pcm_access_mask_t * acmask; snd_pcm_access_mask_alloca(&acmask); snd_pcm_hw_params_get_access_mask(hw_params, acmask); @@ -904,12 +929,14 @@ LONG ALSA_WaveInit(void) wwi->caps.dwSupport |= WAVECAPS_DIRECTSOUND; #endif } - } - TRACE("Configured with dwFmts=%08lx dwSupport=%08lx\n", - wwi->caps.dwFormats, wwi->caps.dwSupport); + TRACE("Configured with dwFmts=%08lx dwSupport=%08lx\n", + wwi->caps.dwFormats, wwi->caps.dwSupport); - snd_pcm_close(h); + snd_pcm_close(h); + + ALSA_WidNumDevs++; + } return 0; }

4 7

Attempt to make buttons themed
by Frank Richter March 25, 2005

March 25, 2005

Hi, to see how easy (or not) it would be to make the controls use themes, I tried to get themed buttons; the result is the attached patch (to try it out, you need an .msstyles file and appropriate registry setup). It's probably not perfect as it is, comments/questions are welcome. Screenshot: http://img87.exs.cx/my.php?loc=img87&image=winewiththemedbuttons3xh.png Some funny side effect when theming is enabled: applications show up in standard colors, but as soon as the first button is created, the colors switch to the theme's colors. I guess opening the theme data in the button code triggers some uxtheme initialization that in turn changes the system colors. Also, all applications get themed buttons, which diverges from WinXPs behaviour and may or may not be desired for some apps. -f.r. Index: dlls/user/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/user/Makefile.in,v retrieving revision 1.88 diff -u -r1.88 Makefile.in --- dlls/user/Makefile.in 10 Mar 2005 15:47:53 -0000 1.88 +++ dlls/user/Makefile.in 21 Mar 2005 18:46:31 -0000 @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = user32.dll -IMPORTS = gdi32 advapi32 kernel32 ntdll +IMPORTS = gdi32 advapi32 kernel32 uxtheme ntdll EXTRALIBS = $(LIBUNICODE) SPEC_SRCS16 = \ Index: dlls/user/button.c =================================================================== RCS file: /home/wine/wine/dlls/user/button.c,v retrieving revision 1.6 diff -u -r1.6 button.c --- dlls/user/button.c 23 Dec 2004 17:21:05 -0000 1.6 +++ dlls/user/button.c 21 Mar 2005 18:46:32 -0000 @@ -71,6 +71,9 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" /* Indirectly required by uxtheme.h */ +#include "uxtheme.h" +#include "tmschema.h" #include "wine/winuser16.h" #include "controls.h" #include "user_private.h" @@ -79,7 +82,8 @@ #define STATE_GWL_OFFSET 0 #define HFONT_GWL_OFFSET (sizeof(LONG)) #define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET+sizeof(HFONT)) -#define NB_EXTRA_BYTES (HIMAGE_GWL_OFFSET+sizeof(HANDLE)) +#define HTHEME_GWL_OFFSET (HIMAGE_GWL_OFFSET+sizeof(HANDLE)) +#define NB_EXTRA_BYTES (HTHEME_GWL_OFFSET+sizeof(HTHEME)) /* Button state values */ #define BUTTON_UNCHECKED 0x00 @@ -95,6 +99,7 @@ static UINT BUTTON_CalcLabelRect( HWND hwnd, HDC hdc, RECT *rc ); static void PB_Paint( HWND hwnd, HDC hDC, UINT action ); +static void PB_PaintThemed( HWND hwnd, HDC hDC, UINT action ); static void CB_Paint( HWND hwnd, HDC hDC, UINT action ); static void GB_Paint( HWND hwnd, HDC hDC, UINT action ); static void UB_Paint( HWND hwnd, HDC hDC, UINT action ); @@ -123,7 +128,7 @@ typedef void (*pfPaint)( HWND hwnd, HDC hdc, UINT action ); -static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = +static const pfPaint btnUnthemedPaintFunc[MAX_BTN_TYPE] = { PB_Paint, /* BS_PUSHBUTTON */ PB_Paint, /* BS_DEFPUSHBUTTON */ @@ -139,6 +144,22 @@ OB_Paint /* BS_OWNERDRAW */ }; +static const pfPaint btnThemedPaintFunc[MAX_BTN_TYPE] = +{ + PB_PaintThemed, /* BS_PUSHBUTTON */ + PB_PaintThemed, /* BS_DEFPUSHBUTTON */ + CB_Paint, /* BS_CHECKBOX */ + CB_Paint, /* BS_AUTOCHECKBOX */ + CB_Paint, /* BS_RADIOBUTTON */ + CB_Paint, /* BS_3STATE */ + CB_Paint, /* BS_AUTO3STATE */ + GB_Paint, /* BS_GROUPBOX */ + UB_Paint, /* BS_USERBUTTON */ + CB_Paint, /* BS_AUTORADIOBUTTON */ + NULL, /* Not defined */ + OB_Paint /* BS_OWNERDRAW */ +}; + static HBITMAP hbitmapCheckBoxes = 0; static WORD checkBoxWidth = 0, checkBoxHeight = 0; @@ -183,9 +204,26 @@ return (window_style & 0x0f); } +inline static HTHEME get_button_theme( HWND hwnd ) +{ + return (HTHEME)GetWindowLongPtrW( hwnd, HTHEME_GWL_OFFSET ); +} + +inline static void set_button_theme( HWND hwnd, HTHEME theme ) +{ + SetWindowLongPtrW( hwnd, HTHEME_GWL_OFFSET, (ULONG_PTR)theme ); +} + +inline static const pfPaint* get_paint_funcs ( HWND hwnd ) +{ + HTHEME theme = get_button_theme( hwnd ); + return ( theme != NULL ) ? btnThemedPaintFunc : btnUnthemedPaintFunc; +} + /* paint a button of any type */ inline static void paint_button( HWND hwnd, LONG style, UINT action ) { + const pfPaint* btnPaintFunc = get_paint_funcs( hwnd ); if (btnPaintFunc[style] && IsWindowVisible(hwnd)) { HDC hdc = GetDC( hwnd ); @@ -215,6 +253,9 @@ UINT btn_type = get_button_type( style ); LONG state; HANDLE oldHbitmap; + static const WCHAR themeClass[] = { 'B','u','t','t','o','n',0 }; + HTHEME theme; + const pfPaint* btnPaintFunc = get_paint_funcs( hWnd ); pt.x = LOWORD(lParam); pt.y = HIWORD(lParam); @@ -249,8 +290,24 @@ if (btn_type >= MAX_BTN_TYPE) return -1; /* abort */ set_button_state( hWnd, BUTTON_UNCHECKED ); + theme = OpenThemeData( hWnd, themeClass ); + set_button_theme( hWnd, theme ); return 0; + + case WM_DESTROY: + theme = get_button_theme( hWnd ); + if ( theme != NULL ) + CloseThemeData ( theme ); + break; + case WM_THEMECHANGED: + theme = get_button_theme( hWnd ); + if ( theme != NULL ) + CloseThemeData ( theme ); + theme = OpenThemeData( hWnd, themeClass ); + set_button_theme( hWnd, theme ); + break; + case WM_ERASEBKGND: if (btn_type == BS_OWNERDRAW) { @@ -842,6 +899,39 @@ SetBkMode(hDC, oldBkMode); } +static void PB_PaintThemed( HWND hwnd, HDC hDC, UINT action ) +{ + LONG state = get_button_state( hwnd ); + LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + BOOL pushedState = (state & BUTTON_HIGHLIGHTED); + HTHEME theme = get_button_theme( hwnd ); + int partID = BP_PUSHBUTTON; + int stateID; + RECT rc; + WCHAR *text = NULL; + BOOL disabledState = !IsWindowEnabled( hwnd ); + + GetClientRect( hwnd, &rc ); + if (disabledState) + stateID = PBS_DISABLED; + else if (pushedState) + stateID = PBS_PRESSED; + else if (( get_button_type(style) == BS_DEFPUSHBUTTON ) + || ( state & BUTTON_HASFOCUS )) + stateID = PBS_DEFAULTED; + else + stateID = PBS_NORMAL; + + DrawThemeBackground( theme, hDC, partID, stateID, &rc, NULL); + + if (( text = get_button_text( hwnd ) ) != NULL ) + { + if ((style & (BS_ICON|BS_BITMAP)) == BS_TEXT) + DrawThemeText( theme, hDC, partID, stateID, text, -1, + BUTTON_BStoDT(style), 0, &rc ); + } +} + /********************************************************************** * Check Box & Radio Button Functions */

12 27

Re: ipaddress: uniform naming
by Alexandre Julliard March 25, 2005

March 25, 2005

"Dimitrie O. Paun" <dpaun(a)rogers.com> writes: > I don't much like hungarian notation. I used to hate it. > Not so much anymore, but that's besides the point. > > Back in the day when I introduced these names they seemed > like a good idea. I was wrong, mea culpa. They are not > particulary good (why capitalize structure members?), > and they don't mix well with the rest of the naming > convention in the other controls. > > They irk me every time I see them, so I'd like to change > them to something saner. I can live with hwndSelf since that's pretty much used everywhere, but do you really need to add Hungarian line noise to the other variables? Exactly how is "nLowerLimit" saner than "LowerLimit"? -- Alexandre Julliard julliard(a)winehq.org

1 0

3DMark Bench Results
by Tom Wickline March 25, 2005

March 25, 2005

Hello, Anyone here interested in seeing some 3DMark Bench Results? If so let me know and ill send yout the .3dp file or a shot. Tom

1 0

Re: Handle wParam in WM_PAINT properly
by Filip Navara March 25, 2005

March 25, 2005

Dimitrie O. Paun wrote: >ChangeLog > Handle wParam in WM_PAINT properly: if non-null, > it is the hdc we are supposed to use to draw into. > > Hmm, MSDN says that the wParam of WM_PAINT is not used and I always believed it. Are you sure that you're not confusing it with WM_PRINTCLIENT? - Filip

2 1

extra copies of Windows DDK
by Brian Vincent March 24, 2005

March 24, 2005

Ivan asked me if I could order the Windows DDK and bring it to Wineconf since it's cheaper to ship it here. Well, it seems it was the same price to order 5 copies instead of just one. That leaves 4 extra DDK's available. If you want one, and will be at WineConf, let me know and I'll bring one. -Brian

1 0

Re: saving winrash
by Steven Edwards March 24, 2005

March 24, 2005

--- Chris Morgan <cmorgan(a)alum.wpi.edu> wrote: > I'm certainly open to having it imported into the wine tree if there is some > desire. Yes. I have enough CVS and SVN trees on my desk without having to manage another and manage dealing with keeping them in sync when they share code. If ReactOS is going to use Winetest and Winrash I really need the winrash sources to be in Winehq CVS or the ReactOS people with either A) fork it or B) write there own service. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

1 0

Dos pgm loading question (Bug#440 ish)
by Ann and Jason Edmeades March 24, 2005

March 24, 2005

Hiya, I was trying to confirm an old bug still existed and the bug #440 has a tar file with an exe in it which apparently used to run under wine and fails with some problems later on. Nowdays, it fails dismally when you try to launch it. Disclaimer#1 - I haven't tried a regression test but I have looked through the code at the point of the failure all the way back to before winedos existed (pre this problem report) and cant see how it ever worked. If anyone has a working 2002 version of wine and could try it, I'd appreciate it! Basically we look at the header, and see a # pages of 1, and a count of bytes in the last page of 107, and end up loading something like 38 bytes of the exe. The DOS exe starts with JMP 0x88, so a trap occurs Looking under windows, ntvdm does a load for the header, then a load for 464 bytes from the position where the code starts - For the life of me I cant see how that calculation occurs and where our code is wrong. I know its an extremely trivial problem for an ancient thing that no one will probably ever want running under wine, but it really bugs me - Does anyone have any idea why our calculation is wrong? Jason

2 2

Re: ntdll: Implement NtLoadKey
by Alexandre Julliard March 24, 2005

March 24, 2005

James Hawkins <truiken(a)gmail.com> writes: > This implementation passes the registry tests. A new server function > is added, mount_key. mount_key is similar to load_registry except > that mount_key can only load a key under HKLM or HKU and the key is > created inside mount_key. To use load_registry, the subkey has to be > created and then passed in as a parameter. load_registry is no longer > used by anything, so if it should be remove, let me know. What you should have done is modify load_registry, there's no reason to create a new request that does the same thing. -- Alexandre Julliard julliard(a)winehq.org

2 3

About
by Giovanni Delvecchio March 24, 2005

March 24, 2005

hello list, i noted that the patch provided ( http://www.winehq.org/hypermail/wine-devel/2005/03/0624.html ) to fix that problem isn't secure yet, because a symlink attack could be possible if /tmp is a mounted NFS file system. Indeed: 1)The name of the file in /tmp is easly predictable , it uses getpid(); 2)O_EXCL when used with O_CREAT, if the file already exists it is an error and the open will fail. O_EXCL is broken on NFS file systems, programs which rely on it for performing locking tasks will contain a race condition. Possible fix using tempnam() function to generate a psued-random string for tmp file name: _______________________________________________________________ --- misc/registry.c Thu Mar 24 13:36:43 2005 +++ misc/registry.c Thu Mar 24 13:46:46 2005 @@ -1222,12 +1222,11 @@ static LPSTR _get_tmp_fn(FILE **f) { LPSTR ret; - int tmp_fd,count; + int tmp_fd; - ret = _xmalloc(50); - for (count = 0;;) { - sprintf(ret,"/tmp/reg%lx%04x.tmp",(long)getpid(),count++); - if ((tmp_fd = open(ret,O_CREAT | O_EXCL | O_WRONLY,0666)) != -1) break; + for (;;) { + ret = tempnam("/tmp", "reg"); + if ((tmp_fd = open(ret,O_CREAT | O_EXCL | O_WRONLY,0600)) != -1) break; if (errno != EEXIST) { ERR("Unexpected error while open() call: %s\n",strerror(errno)); free(ret); _______________________________________________________________ Best regard, Giovanni Delvecchio -- ______________________________________________ Check out the latest SMS services @ http://www.linuxmail.org This allows you to send and receive SMS through your mailbox. Powered by Outblaze

2 1