- Wine-Devel - list.winehq.org

Re: comctl32: doc update
by Dimi Paun Nov. 12, 2005

Nov. 12, 2005

On Sat, 2005-11-12 at 07:39 +0100, Markus Amsler wrote: > Documented Total count is now 100%! > > Changelog: > Markus Amsler <markus.amsler(a)oribi.org> > Reformate "see" section, to match c2man requirements. Patch missing. -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

1 0

Re: dlls/include/list.h: remove_list() failed when removing first or last element
by Robert Shearman Nov. 12, 2005

Nov. 12, 2005

Markus Gömmel wrote: >Sometimes resulted in an exception when AllocHeap() was called... > >Regards > >Markus Goemmel >m.goemmel(a)compulab.de > > Sorry, but the patch is wrong. The Wine list implementation makes sure that next and prev are always valid pointers, such that the list is circular. The only way to detect the end of the list is if entry->next == start. If one of the entries is NULL then this generally indicates either a use after free or some other kind of corruption of the memory used by the list. If the memory is in the heap then HeapValidate may help find the corruption. >Index: ChangeLog >=================================================================== >RCS file: /home/wine/wine/ChangeLog,v >retrieving revision 1.101 >diff -u -u -p -r1.101 ChangeLog >--- ChangeLog 9 Nov 2005 13:41:27 -0000 1.101 >+++ ChangeLog 9 Nov 2005 16:17:58 -0000 >@@ -1,3 +1,8 @@ >+2005-11-09 Markus Goemmel <m.goemmel(a)compulab.de> >+ >+ * include/wine/list.h >+ list_remove() failed when removing first or last element >+ > 2005-11-09 Huw Davies <huw(a)codeweavers.com> > > * dlls/wineps/ps.c: > > One further note: on projects as big as Wine patching the ChangeLog is not practical as it would result in a lot of conflicts. Therefore, Alexandre Julliard automatically generates ChangeLog entries from CVS just before each release. -- Rob Shearman

4 3

New eject command issue
by Christian Costa Nov. 12, 2005

Nov. 12, 2005

Hi, I tried to use the new eject command and this does not seem to work. For that, I run a exe on the cdrom and try to eject the cdrom with : WINEDEBUG=+eject wine eject and I get : trace:eject:eject_cd ejecting h: warn:eject:eject_cd IOCTL_STORAGE_MEDIA_REMOVAL failed with err 170 warn:eject:eject_cd IOCTL_STORAGE_EJECT_MEDIA failed with err 170 and nothing happen and files are still open on the cdrom as shown below : bash 1243 titan cwd DIR 0,8 0 219136 /mnt/cdrom wine-prel 14747 titan cwd DIR 0,8 0 219136 /mnt/cdrom wine-prel 14747 titan mem REG 0,8 2691072 219306 /mnt/cdrom/DINO.exe wine-prel 14747 titan 6r DIR 0,8 0 219136 /mnt/cdrom wineserve 14751 titan 22r DIR 0,8 0 219136 /mnt/cdrom wineserve 14751 titan 23r REG 0,8 2691072 219306 /mnt/cdrom/DINO.exe wine-prel 14752 titan cwd DIR 0,8 0 219136 /mnt/cdrom wine-prel 14752 titan mem REG 0,8 2691072 219306 /mnt/cdrom/DINO.exe wine-prel 14752 titan 6r DIR 0,8 0 219136 /mnt/cdrom wine-prel 14753 titan cwd DIR 0,8 0 219136 /mnt/cdrom wine-prel 14753 titan mem REG 0,8 2691072 219306 /mnt/cdrom/DINO.exe wine-prel 14753 titan 6r DIR 0,8 0 219136 /mnt/cdrom Is there anything particular to do ? Morover, it seems eject is not installed so I have to run from the programs directory. I have also found that there is already a eject command in my distro (Mandrake). So this conflict may require renaming the eject command. Any idea ? Bye, Christian

4 14

[RFC] winecfg audio driver test
by Robert Reif Nov. 12, 2005

Nov. 12, 2005

This is a proof of concept patch that adds a simple audio test to winecfg. All it does is use PlaySound to play a wave file. I am using LoadLibrary("winmm.dll") and FreeLibrary to change drivers. You must press the apply button for the driver change to take effect. There is no error recovery for a missing winmm.dll. The wave file name is in the rc file so a different file can be played for each language. This is probably overkill. I'm not sure where to put the wave file so the program will only work when the wave file is in the current directory. Sorry about the binary wave file. Comments please? Index: programs/winecfg/En.rc =================================================================== RCS file: /home/wine/wine/programs/winecfg/En.rc,v retrieving revision 1.54 diff -p -u -r1.54 En.rc --- programs/winecfg/En.rc 27 Oct 2005 11:24:02 -0000 1.54 +++ programs/winecfg/En.rc 12 Nov 2005 04:21:54 -0000 @@ -157,13 +157,14 @@ BEGIN COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Autodetect",IDC_AUDIO_AUTODETECT,170,20,49,14 PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,49,14 - PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,49,14 + PUSHBUTTON "Test",IDC_AUDIO_TEST,170,60,49,14 + PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,80,49,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 + GROUPBOX " DirectSound ",IDC_STATIC,8,95,244,120 - LTEXT "Hardware Acceleration: ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + LTEXT "Hardware Acceleration: ",IDC_STATIC,15,105,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,103,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,120,230,10 END @@ -197,6 +198,9 @@ BEGIN IDS_WINECFG_TITLE "Wine configuration" IDS_THEMEFILE "Theme files" IDS_THEMEFILE_SELECT "Select a theme file" + IDS_AUDIO_FILE "winecfg.en.wav" + IDS_AUDIO_DONE "Done playing: " + IDS_AUDIO_ERROR "Couldn't play: " END Index: programs/winecfg/Makefile.in =================================================================== RCS file: /home/wine/wine/programs/winecfg/Makefile.in,v retrieving revision 1.15 diff -p -u -r1.15 Makefile.in --- programs/winecfg/Makefile.in 24 Aug 2005 10:59:40 -0000 1.15 +++ programs/winecfg/Makefile.in 12 Nov 2005 04:21:54 -0000 @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winecfg.exe APPMODE = -mwindows -IMPORTS = comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 advapi32 kernel32 +IMPORTS = comdlg32 comctl32 shell32 ole32 shlwapi uxtheme user32 advapi32 kernel32 C_SRCS = \ appdefaults.c \ Index: programs/winecfg/audio.c =================================================================== RCS file: /home/wine/wine/programs/winecfg/audio.c,v retrieving revision 1.15 diff -p -u -r1.15 audio.c --- programs/winecfg/audio.c 3 Nov 2005 19:31:45 -0000 1.15 +++ programs/winecfg/audio.c 12 Nov 2005 04:21:54 -0000 @@ -52,6 +52,13 @@ static const char* DSound_HW_Accels[] = NULL }; +static HINSTANCE hWINMM = 0; + +HDRVR (WINAPI * pOpenDriverA)(LPCSTR lpDriverName, LPCSTR lpSectionName, LONG lParam); +LRESULT (WINAPI *pSendDriverMessage)(HDRVR hdrvr, UINT msg, LONG lParam1, LONG lParam2); +LRESULT (WINAPI *pCloseDriver)(HDRVR hdrvr, LONG lParam1, LONG lParam2); +BOOL (WINAPI *pPlaySoundW)(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound); + /* Select the correct entry in the combobox based on drivername */ static void selectAudioDriver(HWND hDlg, const char *drivername) { @@ -89,19 +96,19 @@ static void configureAudioDriver(HWND hD HDRVR hdrvr; char wine_driver[MAX_NAME_LENGTH + 8]; sprintf(wine_driver, "wine%s.drv", pAudioDrv->szDriver); - hdrvr = OpenDriverA(wine_driver, 0, 0); + hdrvr = pOpenDriverA(wine_driver, 0, 0); if (hdrvr != 0) { - if (SendDriverMessage(hdrvr, DRV_QUERYCONFIGURE, 0, 0) != 0) + if (pSendDriverMessage(hdrvr, DRV_QUERYCONFIGURE, 0, 0) != 0) { DRVCONFIGINFO dci; LONG lRes; dci.dwDCISize = sizeof (dci); dci.lpszDCISectionName = NULL; dci.lpszDCIAliasName = NULL; - lRes = SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG)&dci); + lRes = pSendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG)&dci); } - CloseDriver(hdrvr, 0, 0); + pCloseDriver(hdrvr, 0, 0); } else { @@ -116,6 +123,26 @@ static void configureAudioDriver(HWND hD } } +static void loadWinmm() +{ + hWINMM = LoadLibrary("winmm.dll"); + if (!hWINMM) { + WINE_ERR("winmm.dll not found\n"); + /* FIXME do something */ + } + + pOpenDriverA = (void*)GetProcAddress(hWINMM, "OpenDriverA"); + pSendDriverMessage = (void*)GetProcAddress(hWINMM, "SendDriverMessage"); + pCloseDriver = (void*)GetProcAddress(hWINMM, "CloseDriver"); + pPlaySoundW = (void*)GetProcAddress(hWINMM, "PlaySoundW"); + + if (!pOpenDriverA || !pSendDriverMessage || !pCloseDriver || !pPlaySoundW) + { + WINE_ERR("winmm.dll not all entries found\n"); + /* FIXME do something */ + } +} + static void initAudioDlg (HWND hDlg) { char *curAudioDriver = get_reg_key(config_key, "Drivers", "Audio", "alsa"); @@ -125,6 +152,8 @@ static void initAudioDlg (HWND hDlg) WINE_TRACE("\n"); + loadWinmm(); + pAudioDrv = getAudioDrivers (); for (i = 0; *pAudioDrv->szName; i++, pAudioDrv++) { SendDlgItemMessage (hDlg, IDC_AUDIO_DRIVER, CB_ADDSTRING, @@ -272,6 +301,33 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR configureAudioDriver(hDlg, (char*)pAudioDrv[selected_driver].szDriver); } break; + case IDC_AUDIO_TEST: + { + WCHAR wave_file[MAX_PATH]; + WCHAR format[] = { '%','s','%','s',0 }; + WCHAR title[64]; + + LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_FILE, wave_file, sizeof(wave_file)/sizeof(wave_file[0])); + LoadStringW(GetModuleHandle(NULL), IDS_WINECFG_TITLE, title, sizeof(title)/sizeof(title[0])); + + if (pPlaySoundW(wave_file, NULL, SND_FILENAME)) { + WCHAR done_msg[MAX_PATH + 64]; + WCHAR wave_done[64]; + + LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_DONE, wave_done, sizeof(wave_done)/sizeof(wave_done[0])); + wsprintfW(done_msg, format, wave_done, wave_file); + MessageBoxW(NULL, done_msg, title, MB_OK); + pPlaySoundW(NULL, NULL, SND_FILENAME | SND_LOOP); + } else { + WCHAR error_msg[MAX_PATH + 64]; + WCHAR wave_error[64]; + + LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_ERROR, wave_error, sizeof(wave_error)/sizeof(wave_error[0])); + wsprintfW(error_msg, format, wave_error, wave_file); + MessageBoxW(NULL, error_msg, title, MB_OK); + } + } + break; case IDC_AUDIO_CONTROL_PANEL: MessageBox(NULL, "Launching audio control panel not implemented yet!", "Fixme", MB_OK | MB_ICONERROR); break; @@ -305,6 +361,10 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); break; case PSN_APPLY: + /* unload the current sound driver */ + while (FreeLibrary(hWINMM)); + /* load the new driver */ + loadWinmm(); apply(); SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); break; Index: programs/winecfg/resource.h =================================================================== RCS file: /home/wine/wine/programs/winecfg/resource.h,v retrieving revision 1.33 diff -p -u -r1.33 resource.h --- programs/winecfg/resource.h 27 Oct 2005 11:24:02 -0000 1.33 +++ programs/winecfg/resource.h 12 Nov 2005 04:21:54 -0000 @@ -39,6 +39,9 @@ #define IDS_WINECFG_TITLE 13 #define IDS_THEMEFILE 14 #define IDS_THEMEFILE_SELECT 15 +#define IDS_AUDIO_FILE 16 +#define IDS_AUDIO_DONE 17 +#define IDS_AUDIO_ERROR 18 #define IDD_MAINDLG 101 #define IDB_WINE 104 #define IDD_ABOUTCFG 107 @@ -136,9 +139,10 @@ #define IDC_AUDIO_AUTODETECT 1300 #define IDC_AUDIO_DRIVER 1301 #define IDC_AUDIO_CONFIGURE 1302 -#define IDC_AUDIO_CONTROL_PANEL 1303 -#define IDC_DSOUND_HW_ACCEL 1304 -#define IDC_DSOUND_DRV_EMUL 1305 +#define IDC_AUDIO_TEST 1303 +#define IDC_AUDIO_CONTROL_PANEL 1304 +#define IDC_DSOUND_HW_ACCEL 1305 +#define IDC_DSOUND_DRV_EMUL 1306 /* appearance tab */ #define IDC_THEME_COLORCOMBO 1401

1 0

Re: wineprefixcreate: Call winecfg -c to setup default config.
by Vitaliy Margolen Nov. 11, 2005

Nov. 11, 2005

Anything wrong with this patch? Vitaliy Margolen Monday, October 31, 2005, 11:34:57 PM, Vitaliy Margolen wrote: > Vitaliy Margolen > changelog: > wineprefixcreate > - Call winecfg -c to setup default config.

1 0

Re: Add WINEPREFIX to the command in wineshelllink
by Vitaliy Margolen Nov. 11, 2005

Nov. 11, 2005

Anything wrong with this patch? Vitaliy Margolen Monday, October 31, 2005, 9:29:55 PM, Vitaliy Margolen wrote: > Vitaliy Margolen > changelog: > - Add WINEPREFIX to the command in wineshelllink

1 0

Ok to call CoInitialize in the file dialogs?
by Michael Jung Nov. 11, 2005

Nov. 11, 2005

Hi all, Some shell namespace extensions only work if COM is initialized (For instance the brand-new shell instance objects ;) Go download the free (as in beer) Shell Object Editor from www.tropictech.de if you want to try them.). On WinXP those work without the application calling CoInitialize in SHBrowseForFolder and in the file dialogs. I assume this means there is a CoInitialize/CoUninitialize pair guarding SHBrowseForFolder. For the attached browse.c test program (meant to be compiled with borland's free compiler - sorry) on can browse into shell instance objects on winxp, but the call to GetDisplayNameOf fails with CO_E_NOTINITIALIZED. This means COM is initialized inside SHBrowseForFolder, but un-initialized after the call returns. If you remove the '//' in front of the CoInitialize call and compile again, GetDisplayNameOf succeeds. On wine, you can't currently browse into shell instance objects, if COM is not initialized. If you add CoInitialize/CoUninitialize to SHBrowseForFolder (see attached patch), it exhibits the same behaviour as winxp. How expensive is COM un-/initialization? Any objections against adding CoInitialize/CoUnitialize to SHBrowseForFolder and the file dialogs? Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

3 7

privileged instruction in 32-bit code
by Tyler Nielsen Nov. 11, 2005

Nov. 11, 2005

Hello, I'm looking for a little help to find the next step in getting a program (Everquest 2) working under wine. It currently runs the patcher, and will go through the load screen, and when the game comes up I get: WineDbg starting on pid 0x8 Unhandled exception: privileged instruction in 32-bit code (0x00872230). In 32 bit mode. fixme:dbghelp:sffip_cb NIY on 'D:\test\eq2\output\User_Optimized\Client\EverQuest2.pdb' Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:00872230 ESP:7fbfee40 EBP:7fbfef64 EFLAGS:00210202( - 00 - -RI1) EAX:75065bec EBX:00f77bc0 ECX:00f78080 EDX:00f78080 ESI:60890008 EDI:75003280 Stack dump: 0x7fbfee40: fffffffe 7449f020 7cb55a30 60890008 0x7fbfee50: 00000008 00f78090 60888370 00000a5c 0x7fbfee60: 75468130 00000000 60897ca0 75065bb0 0x7fbfee70: 00f78740 60a917f0 00f78090 00f780a0 0x7fbfee80: 7449f020 00000a5f 75468100 00000297 0x7fbfee90: beb29113 3fa5ebd8 be2674d8 00aba38f Backtrace: =>1 0x00872230 in everquest2 (+0x472230) (0x7fbfef64) 2 0x00876a6e in everquest2 (+0x476a6e) (0x7449ed70) 3 0x00000010 (0x00d1eb84) 4 0x00874f28 in everquest2 (+0x474f28) (0x008755a4) 0x00872230: Modules: I then started up winedbg and got this: WineDbg starting on pid 0xa In 32 bit mode. start_process () at /home/tcnielsen/Programming/wine/dlls/kernel/../../include/winternl.h:1692 0x7fc7523c start_process+0xfc [/home/tcnielsen/Programming/wine/dlls/kernel/../../include/winternl.h:1692] in kernel32: jmp 0x7fc7522b start_process+0xeb [/home/tcnielsen/Programming/wine/dlls/kernel/process.c:992] in kernel32 1692 static inline void WINAPI DbgBreakPoint(void) { __asm__ __volatile__("int3"); } Wine-dbg>disas 0x00872230 fixme:dbghelp:sffip_cb NIY on 'D:\test\eq2\output\User_Optimized\Client\EverQuest2.pdb' 0x00872230: 0x00872232: push %es 0x00872233: 0x00872235: incl %edi 0x00872236: loopne 0x00872247 0x00872238: subl %ecx,0x10(%esi) 0x0087223b: 0x0087223d: decl %edi 0x0087223e: lock 0x00872241: inl %dx,%eax I've tried googling and the closest thing I found was an old wine traffic from 2003. http://www.kerneltraffic.org/wine/wn20031017_192.html#4. So is there anything else I can look at or do to try and get past this? Thanks for the help, Tyler

7 10

Get/SetThreadContext problems ?
by Paul Vriens Nov. 11, 2005

Nov. 11, 2005

Hi, apart from the fact that the kernel32/thread tests are failing for Wine and most of the Windows platforms (test.winehq.org) I seem to have a problem with threads as well. The app I'm working on experiences a crash: Backtrace: =>1 0x7155ddf3 in aclui (+0xddf3) (0x5bc62acc) 2 0x7155e806 in aclui (+0xe806) (0x5bc62b04) 3 0x7155e900 in aclui (+0xe900) (0x5bc62b24) 4 0x715585ac in aclui (+0x85ac) (0x5bc62b48) 5 0x25576815 THREAD_Start+0xe5(ptr=0x7ff85e10) [/wine-src/wine-cvs/dlls/kernel /thread.c:104] in kernel32 (0x5bc62c14) 6 0x44e2d516 start_thread+0x136(info=0x7ff85e28) [/wine-src/wine-cvs/dlls/ntdl l/thread.c:232] in ntdll (0x5bc63458) 7 0x2001eb80 (0x5bc634c8) 8 0x75a2c9ce (0x00000000) 0x7155ddf3: movl 0xc(%edi),%eax I have a full +relay,+all trace but the only thing I see is that the crash happens in the middle of some NtWaitForMultipleObjects and get_thread_context calls. Any idea's? Cheers, Paul.

1 0

Re: 100% CPU usage in Wine-0.9
by Mark Knecht Nov. 11, 2005

Nov. 11, 2005

On 11/10/05, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Hello, > > Hi Stefan, > > I switched to a vanilla 2.6.14.1 kernel and tried both radeon and > > fglrx. Identical results: > > > > Wine-0.9 + 2.6.14.1 + radeon driver runing Crystal: > > Cpu(s): 16.3% us, 83.7% sy, 0.0% ni, 0.0% id, 0.0% wa, 0.0% hi, 0.0% > > si > > Wine-0.9 + 2.6.14.1 + fglrx driver running Crystal > > Cpu(s): 16.3% us, 83.7% sy, 0.0% ni, 0.0% id, 0.0% wa, 0.0% hi, 0.0% > > si > So it's not graphics related - I also get the same results with fglrx and > radeon > > > One thing I noticed about Crystal is that the default sound > > actually requires that you press a key hold it for a bit before the > > sound gets started. Maybe that's why you didn't hear anything? > Yes, that was it :) > > > LATE BREAKING NEWS: It appears that when I switch to the Alsa > > driver the CPU usage does down to normal. Were you using Alsa or OSS? > I tried both alsa and oss(with oss emulation in alsa), both are working fine. > I don't use any hw acceleration. So is this program useable for you now with > alsa? > Crystal seems to be usable for me on one machine, but another user reported back that he was already using the Alsa driver and he still has the problem so I'm not sure this is a complete solution. There is a small but growing list of VSTs that fail this way. I am going to test a few more and see how it goes. Also, I have opened a bug report at WineHQ to better track this. Please join in if you have somethigng to add. http://bugs.winehq.org/show_bug.cgi?id=3809 Cheers, Mark

1 0