wine-devel December 2002

wine-devel@winehq.org

132 participants
377 discussions

Re: user32:PrivateExtractIcons{AW} take 2
by Uwe Bonnes 10 Dec '02

10 Dec '02

>>>>> "Rolf" == Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> writes: Rolf> I'm sorry for having sent earlier patches which seemed to be Rolf> garbled with line breaks. I'll try again and hope they come Rolf> through ok this time, otherwise I probably have to find a new Rolf> email client ;-) Hallo Rolf, this patch make a treeview in Xilinx Webpack miss it's icons. If I change back the return value in ICO_ExtractIconExW around line 360 to S_OK ( you changed it to (icon - nIconIndex)) the icons reappear. The sequence with the missing icons is (with a little more debugging instrumentation): trace:icon:PrivateExtractIconsA "G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO" 0 32x32 0x41aac1a0 (nil) 1 0x00000000 trace:icon:PrivateExtractIconsW L"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO" 0 32x32 0x41aac1a0 (nil) 1 0x00000000 trace:icon:ICO_ExtractIconExW L"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO", 0, 1 (nil) 0x00000000 trace:icon:USER32_GetResourceTable 0x41c80000 0x406c27ec trace:icon:ICO_ExtractIconExW -- OS2/icon Signature (0x00000001) trace:icon:ICO_GetIconDirectory 0x41c80000 0x406c27e4 trace:icon:ICO_ExtractIconExW -- icon found 0x41ada380 0x00000014 0x00000001 0x00000001 trace:icon:ICO_LoadIcon 0x41c80000 0x41c80006 size 0x00000128 ret 0x41c80016 trace:icon:PrivateExtractIconsW ret 0x00000001 pIconId 0x00000000 trace:icon:PrivateExtractIconsA ret 0x00000001 and here after changing back the return value to S_OK trace:icon:PrivateExtractIconsA "G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO" 0 32x32 0x41ac3d50 (nil) 1 0x00000000 trace:icon:PrivateExtractIconsW L"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO" 0 32x32 0x41ac3d50 (nil) 1 0x00000000 trace:icon:ICO_ExtractIconExW L"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO", 0, 1 (nil) 0x00000000 trace:icon:USER32_GetResourceTable 0x41c80000 0x406c27ec trace:icon:ICO_ExtractIconExW -- OS2/icon Signature (0x00000001) trace:icon:ICO_GetIconDirectory 0x41c80000 0x406c27e4 trace:icon:ICO_ExtractIconExW -- icon found 0x41ad89e8 0x00000014 0x00000001 0x00000001 trace:icon:ICO_LoadIcon 0x41c80000 0x41c80006 size 0x00000128 ret 0x41c80016 trace:icon:PrivateExtractIconsW ret 0x00000000 pIconId 0x00000000 trace:icon:PrivateExtractIconsA ret 0x00000000 trace:icon:CURSORICON_ExtCopy hIcon 0x606, nType 1, iDesiredCX 16, iDesiredCY 16, nFlags 16384 trace:icon:CURSORICON_ExtCopy LR_COPYFROMRESOURCE: Failed to load from cache trace:icon:DestroyIcon32 (04ee, 0004) Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 1

Re: sound3d stub implementations, part I
by Andreas Mohr 10 Dec '02

10 Dec '02

On Tue, Dec 10, 2002 at 09:14:27PM +0100, Rok Mandeljc wrote: > I've managed to run ultima ix with openglide, but sound doesn't really work (3D sound is silent). So I've decided to try to implement stubs in sound3d.c in dsound. This is first part of it. It's my first real work, so someone please check it if it's ok (it seems logical to me, but it could be wrong). Actually it seems quite illogical to me... Hint, hint: you forgot the patch ;-)) Andreas Mohr

1 0

Re: MSI (MS Installer)
by Scott Cote 10 Dec '02

10 Dec '02

Thanks to all that who responded to my MSI query. It sounds like I need not look into implementing it. I just wanted to address one issue. >> We don't need to implement every MS dll. We only need to implement: >> - core dlls (kernel32, comclt32, ...) which applications expect to be >> available >> - dlls used for compiling/porting (msvcrt) >> I guess this msiexec is not loaded to the system after a clean >> Windowsinstall. In this case the installer must cope with the situation that >> msiexec is not there and must provide it itself. I agree that the installers that are blindly expecting msiexec to be there are flawed. However, since most windows machines have msiexec installed, the end result is that these installers will run on most windows machines but not on wine.

2 1

Unused code in kernel/tests/process.c
by Francois Gouget 10 Dec '02

10 Dec '02

kernel/tests/process.c defines a decodeW function but does not use it. Should we #ifdef it out or remove it completely? Index: dlls/kernel/tests/process.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/process.c,v retrieving revision 1.5 diff -u -r1.5 process.c --- dlls/kernel/tests/process.c 22 Jun 2002 00:08:10 -0000 1.5 +++ dlls/kernel/tests/process.c 10 Dec 2002 20:50:05 -0000 @@ -109,6 +109,7 @@ return ptr; } +#if 0 static WCHAR* decodeW(const char* str) { size_t len; @@ -126,6 +127,7 @@ ptr[len] = '\0'; return ptr; } +#endif /****************************************************************** * init -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ I haven't lost my mind, it's backed up on tape around here somewhere...

1 0

Re: possible memory corruption
by steve.lustbader＠philips.com 10 Dec '02

10 Dec '02

>>>>>>> "steve" == steve lustbader <steve.lustbader(a)philips.com> writes: >> >> steve> When I try to load a window in my app that has a treeview in it, >> steve> it crashes immediately, before the window even gets displayed. >> steve> This is the end of the backtrace: >> >> Try running with native commctrl to see if the corruption comes from our >> commctrl implementation. Then run with --debugmsg +relay,+heap. Wine will >> check on every heap manipulation to see if the heap is still okay. Then >>look what corrupted the heap. > >It works fine with a native (WinXP) comctl32.dll. I'll post the +relay,+heap >output shortly. > Is there a way to turn debug output on/off? I don't get the heap corruption until my app starts and I open a specific window, but it takes forever for my app to start using +relay,+heap. I don't need the output at first, since everything is fine in the beginning, so I'd like to be able to turn the debug output on just before I open the window that causes the problem. -Steve

2 1

lz32 & kernel32
by Francois Gouget 10 Dec '02

10 Dec '02

I have checked the Wine spec files against the list of APIs exported by the various Windows libraries and started on resolving the discrepancies. One of the (smaller) things I found is that in Win2000 and WinXP the LZ API is implemented in kernel32 and lz32 only contains forwards that point to kernel32. In all other Windows version however, the LZ API is not available from kernel32 and is implemented in lz32. What should we do? Should we have kernel32 import lz32 and forward the LZ functions it? Or should we do like Windows, which means moving the LZ APIs to kernel32, and turn all the entry points in lz32 into forwards pointing to kernel32 like on Windows? -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Avoid the Gates of Hell - use Linux.

2 2

Conformance test --MSVC Headers 1 of 2 OverLook last 1 of 2 ...
by Tom 10 Dec '02

10 Dec '02

Crap.. Sorry here is the Real 1 of 2 Tom --- Here is the Build with MSVC Headers ---- --------------------Configuration: advapi32_test - Win32 MSVC Headers-------------------- advapi32_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: dsound_test - Win32 MSVC Headers-------------------- dsound_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: gdi32_test - Win32 MSVC Headers-------------------- gdi32_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: kernel32_test - Win32 MSVC Headers-------------------- kernel32_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: msvcrt_test - Win32 MSVC Headers-------------------- msvcrt_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: netapi32_test - Win32 MSVC Headers-------------------- netapi32_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: ntdll_test - Win32 MSVC Headers-------------------- Compiling... error.c c:\include\wine\dlls\ntdll\tests\error.c(23) : fatal error C1083: Cannot open include file: 'ntstatus.h': No such file or directory rtlbitmap.c c:\include\wine\dlls\ntdll\tests\rtlbitmap.c(26) : fatal error C1083: Cannot open include file: 'winternl.h': No such file or directory rtlstr.c c:\program files\microsoft visual studio\vc98\include\winbase.h(216) : error C2061: syntax error : identifier 'DWORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(217) : error C2061: syntax error : identifier 'InternalHigh' c:\program files\microsoft visual studio\vc98\include\winbase.h(217) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(218) : error C2061: syntax error : identifier 'Offset' c:\program files\microsoft visual studio\vc98\include\winbase.h(218) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(219) : error C2061: syntax error : identifier 'OffsetHigh' c:\program files\microsoft visual studio\vc98\include\winbase.h(219) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(220) : error C2061: syntax error : identifier 'hEvent' c:\program files\microsoft visual studio\vc98\include\winbase.h(220) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(221) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(224) : error C2061: syntax error : identifier 'DWORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(225) : error C2061: syntax error : identifier 'lpSecurityDescriptor' c:\program files\microsoft visual studio\vc98\include\winbase.h(225) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(226) : error C2061: syntax error : identifier 'bInheritHandle' c:\program files\microsoft visual studio\vc98\include\winbase.h(226) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(227) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(230) : error C2061: syntax error : identifier 'HANDLE' c:\program files\microsoft visual studio\vc98\include\winbase.h(231) : error C2061: syntax error : identifier 'hThread' c:\program files\microsoft visual studio\vc98\include\winbase.h(231) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(232) : error C2061: syntax error : identifier 'dwProcessId' c:\program files\microsoft visual studio\vc98\include\winbase.h(232) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(233) : error C2061: syntax error : identifier 'dwThreadId' c:\program files\microsoft visual studio\vc98\include\winbase.h(233) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(234) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(241) : error C2061: syntax error : identifier 'DWORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(242) : error C2061: syntax error : identifier 'dwHighDateTime' c:\program files\microsoft visual studio\vc98\include\winbase.h(242) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(243) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(250) : error C2061: syntax error : identifier 'WORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(251) : error C2061: syntax error : identifier 'wMonth' c:\program files\microsoft visual studio\vc98\include\winbase.h(251) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(252) : error C2061: syntax error : identifier 'wDayOfWeek' c:\program files\microsoft visual studio\vc98\include\winbase.h(252) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(253) : error C2061: syntax error : identifier 'wDay' c:\program files\microsoft visual studio\vc98\include\winbase.h(253) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(254) : error C2061: syntax error : identifier 'wHour' c:\program files\microsoft visual studio\vc98\include\winbase.h(254) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(255) : error C2061: syntax error : identifier 'wMinute' c:\program files\microsoft visual studio\vc98\include\winbase.h(255) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(256) : error C2061: syntax error : identifier 'wSecond' c:\program files\microsoft visual studio\vc98\include\winbase.h(256) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(257) : error C2061: syntax error : identifier 'wMilliseconds' c:\program files\microsoft visual studio\vc98\include\winbase.h(257) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(258) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(260) : error C2143: syntax error : missing ')' before '*' c:\program files\microsoft visual studio\vc98\include\winbase.h(260) : error C2143: syntax error : missing '{' before '*' c:\program files\microsoft visual studio\vc98\include\winbase.h(260) : error C2059: syntax error : ')' c:\program files\microsoft visual studio\vc98\include\winbase.h(261) : error C2146: syntax error : missing ')' before identifier 'lpThreadParameter' c:\program files\microsoft visual studio\vc98\include\winbase.h(261) : error C2061: syntax error : identifier 'lpThreadParameter' c:\program files\microsoft visual studio\vc98\include\winbase.h(261) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(262) : error C2059: syntax error : ')' c:\program files\microsoft visual studio\vc98\include\winbase.h(263) : error C2061: syntax error : identifier 'LPTHREAD_START_ROUTINE' c:\program files\microsoft visual studio\vc98\include\winbase.h(263) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(272) : error C2061: syntax error : identifier 'CRITICAL_SECTION' c:\program files\microsoft visual studio\vc98\include\winbase.h(272) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(273) : error C2061: syntax error : identifier 'PCRITICAL_SECTION' c:\program files\microsoft visual studio\vc98\include\winbase.h(273) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(274) : error C2061: syntax error : identifier 'LPCRITICAL_SECTION' c:\program files\microsoft visual studio\vc98\include\winbase.h(274) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(276) : error C2061: syntax error : identifier 'CRITICAL_SECTION_DEBUG' c:\program files\microsoft visual studio\vc98\include\winbase.h(276) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(277) : error C2061: syntax error : identifier 'PCRITICAL_SECTION_DEBUG' c:\program files\microsoft visual studio\vc98\include\winbase.h(277) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(278) : error C2061: syntax error : identifier 'LPCRITICAL_SECTION_DEBUG' c:\program files\microsoft visual studio\vc98\include\winbase.h(278) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(281) : error C2061: syntax error : identifier 'LPLDT_ENTRY' c:\program files\microsoft visual studio\vc98\include\winbase.h(281) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(391) : error C2061: syntax error : identifier 'WORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(392) : error C2061: syntax error : identifier 'wPacketVersion' c:\program files\microsoft visual studio\vc98\include\winbase.h(392) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(393) : error C2061: syntax error : identifier 'dwServiceMask' c:\program files\microsoft visual studio\vc98\include\winbase.h(393) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(394) : error C2061: syntax error : identifier 'dwReserved1' c:\program files\microsoft visual studio\vc98\include\winbase.h(394) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(395) : error C2061: syntax error : identifier 'dwMaxTxQueue' c:\program files\microsoft visual studio\vc98\include\winbase.h(395) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(396) : error C2061: syntax error : identifier 'dwMaxRxQueue' c:\program files\microsoft visual studio\vc98\include\winbase.h(396) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(397) : error C2061: syntax error : identifier 'dwMaxBaud' c:\program files\microsoft visual studio\vc98\include\winbase.h(397) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(398) : error C2061: syntax error : identifier 'dwProvSubType' c:\program files\microsoft visual studio\vc98\include\winbase.h(398) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(399) : error C2061: syntax error : identifier 'dwProvCapabilities' c:\program files\microsoft visual studio\vc98\include\winbase.h(399) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(400) : error C2061: syntax error : identifier 'dwSettableParams' c:\program files\microsoft visual studio\vc98\include\winbase.h(400) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(401) : error C2061: syntax error : identifier 'dwSettableBaud' c:\program files\microsoft visual studio\vc98\include\winbase.h(401) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(402) : error C2061: syntax error : identifier 'wSettableData' c:\program files\microsoft visual studio\vc98\include\winbase.h(402) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(403) : error C2061: syntax error : identifier 'wSettableStopParity' c:\program files\microsoft visual studio\vc98\include\winbase.h(403) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(404) : error C2061: syntax error : identifier 'dwCurrentTxQueue' c:\program files\microsoft visual studio\vc98\include\winbase.h(404) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(405) : error C2061: syntax error : identifier 'dwCurrentRxQueue' c:\program files\microsoft visual studio\vc98\include\winbase.h(405) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(406) : error C2061: syntax error : identifier 'dwProvSpec1' c:\program files\microsoft visual studio\vc98\include\winbase.h(406) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(407) : error C2061: syntax error : identifier 'dwProvSpec2' c:\program files\microsoft visual studio\vc98\include\winbase.h(407) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(408) : error C2061: syntax error : identifier 'wcProvChar' c:\program files\microsoft visual studio\vc98\include\winbase.h(408) : fatal error C1003: error count exceeds 100; stopping compilation Generating Code... Error executing cl.exe. ntdll_test.exe - 104 error(s), 0 warning(s) --------------------Configuration: oleaut32_test - Win32 MSVC Headers-------------------- Compiling... vartest.c NOTE: WINVER has been defined as 0x0500 or greater which enables Windows NT 5.0 and Windows 98 features. When these headers were released, Windows NT 5.0 beta 1 and Windows 98 beta 2.1 were the current versions. For this release when WINVER is defined as 0x0500 or greater, you can only build beta or test applications. To build a retail application, set WINVER to 0x0400 or visit http://www.microsoft.com/msdn/sdk to see if retail Windows NT 5.0 or Windows 98 headers are available. See the SDK release notes for more information. c:\include\wine\dlls\oleaut32\tests\vartest.c(656) : fatal error C1064: compiler limit : token overflowed internal buffer Error executing cl.exe. oleaut32_test.exe - 1 error(s), 0 warning(s) --------------------Configuration: rpcrt4_test - Win32 MSVC Headers-------------------- rpcrt4_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: shell32_test - Win32 MSVC Headers-------------------- shell32_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: shlwapi_test - Win32 MSVC Headers-------------------- shlwapi_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: urlmon_test - Win32 MSVC Headers-------------------- urlmon_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: user32_test - Win32 MSVC Headers-------------------- user32_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: ntdll_test - Win32 MSVC Headers-------------------- Compiling... error.c c:\include\wine\dlls\ntdll\tests\error.c(23) : fatal error C1083: Cannot open include file: 'ntstatus.h': No such file or directory rtlbitmap.c c:\include\wine\dlls\ntdll\tests\rtlbitmap.c(26) : fatal error C1083: Cannot open include file: 'winternl.h': No such file or directory rtlstr.c c:\program files\microsoft visual studio\vc98\include\winbase.h(216) : error C2061: syntax error : identifier 'DWORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(217) : error C2061: syntax error : identifier 'InternalHigh' c:\program files\microsoft visual studio\vc98\include\winbase.h(217) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(218) : error C2061: syntax error : identifier 'Offset' c:\program files\microsoft visual studio\vc98\include\winbase.h(218) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(219) : error C2061: syntax error : identifier 'OffsetHigh' c:\program files\microsoft visual studio\vc98\include\winbase.h(219) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(220) : error C2061: syntax error : identifier 'hEvent' c:\program files\microsoft visual studio\vc98\include\winbase.h(220) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(221) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(224) : error C2061: syntax error : identifier 'DWORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(225) : error C2061: syntax error : identifier 'lpSecurityDescriptor' c:\program files\microsoft visual studio\vc98\include\winbase.h(225) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(226) : error C2061: syntax error : identifier 'bInheritHandle' c:\program files\microsoft visual studio\vc98\include\winbase.h(226) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(227) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(230) : error C2061: syntax error : identifier 'HANDLE' c:\program files\microsoft visual studio\vc98\include\winbase.h(231) : error C2061: syntax error : identifier 'hThread' c:\program files\microsoft visual studio\vc98\include\winbase.h(231) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(232) : error C2061: syntax error : identifier 'dwProcessId' c:\program files\microsoft visual studio\vc98\include\winbase.h(232) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(233) : error C2061: syntax error : identifier 'dwThreadId' c:\program files\microsoft visual studio\vc98\include\winbase.h(233) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(234) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(241) : error C2061: syntax error : identifier 'DWORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(242) : error C2061: syntax error : identifier 'dwHighDateTime' c:\program files\microsoft visual studio\vc98\include\winbase.h(242) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(243) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(250) : error C2061: syntax error : identifier 'WORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(251) : error C2061: syntax error : identifier 'wMonth' c:\program files\microsoft visual studio\vc98\include\winbase.h(251) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(252) : error C2061: syntax error : identifier 'wDayOfWeek' c:\program files\microsoft visual studio\vc98\include\winbase.h(252) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(253) : error C2061: syntax error : identifier 'wDay' c:\program files\microsoft visual studio\vc98\include\winbase.h(253) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(254) : error C2061: syntax error : identifier 'wHour' c:\program files\microsoft visual studio\vc98\include\winbase.h(254) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(255) : error C2061: syntax error : identifier 'wMinute' c:\program files\microsoft visual studio\vc98\include\winbase.h(255) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(256) : error C2061: syntax error : identifier 'wSecond' c:\program files\microsoft visual studio\vc98\include\winbase.h(256) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(257) : error C2061: syntax error : identifier 'wMilliseconds' c:\program files\microsoft visual studio\vc98\include\winbase.h(257) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(258) : error C2059: syntax error : '}' c:\program files\microsoft visual studio\vc98\include\winbase.h(260) : error C2143: syntax error : missing ')' before '*' c:\program files\microsoft visual studio\vc98\include\winbase.h(260) : error C2143: syntax error : missing '{' before '*' c:\program files\microsoft visual studio\vc98\include\winbase.h(260) : error C2059: syntax error : ')' c:\program files\microsoft visual studio\vc98\include\winbase.h(261) : error C2146: syntax error : missing ')' before identifier 'lpThreadParameter' c:\program files\microsoft visual studio\vc98\include\winbase.h(261) : error C2061: syntax error : identifier 'lpThreadParameter' c:\program files\microsoft visual studio\vc98\include\winbase.h(261) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(262) : error C2059: syntax error : ')' c:\program files\microsoft visual studio\vc98\include\winbase.h(263) : error C2061: syntax error : identifier 'LPTHREAD_START_ROUTINE' c:\program files\microsoft visual studio\vc98\include\winbase.h(263) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(272) : error C2061: syntax error : identifier 'CRITICAL_SECTION' c:\program files\microsoft visual studio\vc98\include\winbase.h(272) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(273) : error C2061: syntax error : identifier 'PCRITICAL_SECTION' c:\program files\microsoft visual studio\vc98\include\winbase.h(273) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(274) : error C2061: syntax error : identifier 'LPCRITICAL_SECTION' c:\program files\microsoft visual studio\vc98\include\winbase.h(274) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(276) : error C2061: syntax error : identifier 'CRITICAL_SECTION_DEBUG' c:\program files\microsoft visual studio\vc98\include\winbase.h(276) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(277) : error C2061: syntax error : identifier 'PCRITICAL_SECTION_DEBUG' c:\program files\microsoft visual studio\vc98\include\winbase.h(277) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(278) : error C2061: syntax error : identifier 'LPCRITICAL_SECTION_DEBUG' c:\program files\microsoft visual studio\vc98\include\winbase.h(278) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(281) : error C2061: syntax error : identifier 'LPLDT_ENTRY' c:\program files\microsoft visual studio\vc98\include\winbase.h(281) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(391) : error C2061: syntax error : identifier 'WORD' c:\program files\microsoft visual studio\vc98\include\winbase.h(392) : error C2061: syntax error : identifier 'wPacketVersion' c:\program files\microsoft visual studio\vc98\include\winbase.h(392) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(393) : error C2061: syntax error : identifier 'dwServiceMask' c:\program files\microsoft visual studio\vc98\include\winbase.h(393) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(394) : error C2061: syntax error : identifier 'dwReserved1' c:\program files\microsoft visual studio\vc98\include\winbase.h(394) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(395) : error C2061: syntax error : identifier 'dwMaxTxQueue' c:\program files\microsoft visual studio\vc98\include\winbase.h(395) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(396) : error C2061: syntax error : identifier 'dwMaxRxQueue' c:\program files\microsoft visual studio\vc98\include\winbase.h(396) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(397) : error C2061: syntax error : identifier 'dwMaxBaud' c:\program files\microsoft visual studio\vc98\include\winbase.h(397) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(398) : error C2061: syntax error : identifier 'dwProvSubType' c:\program files\microsoft visual studio\vc98\include\winbase.h(398) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(399) : error C2061: syntax error : identifier 'dwProvCapabilities' c:\program files\microsoft visual studio\vc98\include\winbase.h(399) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(400) : error C2061: syntax error : identifier 'dwSettableParams' c:\program files\microsoft visual studio\vc98\include\winbase.h(400) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(401) : error C2061: syntax error : identifier 'dwSettableBaud' c:\program files\microsoft visual studio\vc98\include\winbase.h(401) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(402) : error C2061: syntax error : identifier 'wSettableData' c:\program files\microsoft visual studio\vc98\include\winbase.h(402) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(403) : error C2061: syntax error : identifier 'wSettableStopParity' c:\program files\microsoft visual studio\vc98\include\winbase.h(403) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(404) : error C2061: syntax error : identifier 'dwCurrentTxQueue' c:\program files\microsoft visual studio\vc98\include\winbase.h(404) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(405) : error C2061: syntax error : identifier 'dwCurrentRxQueue' c:\program files\microsoft visual studio\vc98\include\winbase.h(405) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(406) : error C2061: syntax error : identifier 'dwProvSpec1' c:\program files\microsoft visual studio\vc98\include\winbase.h(406) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(407) : error C2061: syntax error : identifier 'dwProvSpec2' c:\program files\microsoft visual studio\vc98\include\winbase.h(407) : error C2059: syntax error : ';' c:\program files\microsoft visual studio\vc98\include\winbase.h(408) : error C2061: syntax error : identifier 'wcProvChar' c:\program files\microsoft visual studio\vc98\include\winbase.h(408) : fatal error C1003: error count exceeds 100; stopping compilation Generating Code... Error executing cl.exe. wineruntests.exe - 104 error(s), 0 warning(s) --------------------Configuration: winetest - Win32 MSVC Headers-------------------- winetest.lib - 0 error(s), 0 warning(s) --------------------Configuration: wininet_test - Win32 MSVC Headers-------------------- wininet_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: winmm_test - Win32 MSVC Headers-------------------- winmm_test.exe - 0 error(s), 0 warning(s) --------------------Configuration: ws2_32_test - Win32 MSVC Headers-------------------- ws2_32_test.exe - 0 error(s), 0 warning(s)

2 1

Character conversion warnings in netapi32/tests
by Vincent Béron 10 Dec '02

10 Dec '02

Here's the output of building the netapi32 tests under MSVC with MSVC headers. I don't get those warnings with Wine's headers. Deleting intermediate files and output files for project 'winetest - Win32 MSVC Headers'. Deleting intermediate files and output files for project 'netapi32_test - Win32 MSVC Headers'. --------------------Configuration: winetest - Win32 MSVC Headers-------------------- Performing Custom Build Step on .\include\wine\unicode.h 1 fichier(s) copi‚(s). Performing Custom Build Step on .\include\wine\test.h 1 fichier(s) copi‚(s). Performing Custom Build Step on .\include\wine\exception.h 1 fichier(s) copi‚(s). --------------------Configuration: netapi32_test - Win32 MSVC Headers-------------------- Compiling... access.c apibuf.c wksta.c c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(76) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(79) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(85) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(85) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(89) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(90) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(91) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(92) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(98) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(98) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' c:\tt\wine-20021210-1430\dlls\netapi32\tests\wksta.c(102) : warning C4133: 'function' : incompatible types - from 'char *' to 'const unsigned short *' testlist.c Generating Code... Linking... netapi32_test.exe - 0 error(s), 11 warning(s) Seems the definition of lstr*W is different, but I couldn't find any differences in header files. Both define lstr*W(LPCWSTR[,LPCWSTR]). Also, the arguments are really unsigned short * (at least it's what MSDEV tells me when I hoover over them). Vincent

1 0

Fix for comparisons in netapi32/tests
by Vincent Béron 10 Dec '02

10 Dec '02

Two comparisons were always true due to the types. Not sure about the proper fix though. Changelog: Changed comparisons so they're not always true. Vincent Index: wine/dlls/netapi32/tests/apibuf.c =================================================================== RCS file: /home/wine/wine/dlls/netapi32/tests/apibuf.c,v retrieving revision 1.1 diff -u -r1.1 apibuf.c --- wine/dlls/netapi32/tests/apibuf.c 11 Sep 2002 02:35:18 -0000 1.1 +++ wine/dlls/netapi32/tests/apibuf.c 10 Dec 2002 17:25:20 -0000 @@ -48,14 +48,14 @@ ok(NetApiBufferFree(p) == NERR_Success, "Freed"); ok(NetApiBufferSize(p, &dwSize) == NERR_Success, "Got size"); - ok(dwSize >= 0, "The size"); + ok(dwSize < 0x80000000, "The size"); ok(NetApiBufferSize(NULL, &dwSize) == ERROR_INVALID_PARAMETER, "Error for NULL pointer"); /* 0-length buffer */ ok(NetApiBufferAllocate(0, (LPVOID *)&p) == NERR_Success, "Reserved memory"); ok(NetApiBufferSize(p, &dwSize) == NERR_Success, "Got size"); - ok((dwSize >= 0) && (dwSize < 0xFFFFFFFF),"The size of the 0-length buffer"); + ok(dwSize < 0xFFFFFFFF, "The size of the 0-length buffer"); ok(NetApiBufferFree(p) == NERR_Success, "Freed"); }

2 1

Intel 8x0 and ALSA sound driver
by Nikolay Stefanov 10 Dec '02

10 Dec '02

Hi, I have a SIS SI7012 (Intel 810 chipset) built-in audio card, which turns out to be capable of only 48000Hz sample rate in hardware. The ALSA winmm driver in Wine is hardcoded to use the first hardware pcm device ("hw:0") directly, and therefore fails for any wave format request with a sample rate different than 48000Hz. I have lifted some code from dsound and put together a patch which adds the option to read the device name from the Wine configuration file. As a result I have now got Winamp working (hurray for me!). HOWEVER there are still issues - the "default" ALSA device doesn't like the way Wine accesses it through mmap, and also it seems that it is not possible to set the buffer size and period size the way it is done now. Other programs that use ALSA, like aplay and mplayer, don't have this problem. My knowledge of Wine and ALSA is pretty meagre, so can anyone can provide any insight as to how to fix this issue? My config file now looks like this [alsa] ;"Device" = "hw:0" "Device" = "default" "UseMMAP" = "N" And this is the patch, not really useful for anyone else but me right now: ---- Patch start ----- diff -u -r wine-20021125-orig/dlls/winmm/winealsa/Makefile.in wine-20021125/dlls/winmm/winealsa/Makefile.in --- wine-20021125-orig/dlls/winmm/winealsa/Makefile.in 2002-06-28 19:31:01.000000000 +0100 +++ wine-20021125/dlls/winmm/winealsa/Makefile.in 2002-12-08 14:06:03.000000000 +0000 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winealsa.drv -IMPORTS = winmm user32 kernel32 ntdll +IMPORTS = winmm user32 kernel32 ntdll advapi32 EXTRALIBS = @ALSALIBS@ LDDLLFLAGS = @LDDLLFLAGS@ diff -u -r wine-20021125-orig/dlls/winmm/winealsa/alsa.c wine-20021125/dlls/winmm/winealsa/alsa.c --- wine-20021125-orig/dlls/winmm/winealsa/alsa.c 2002-07-19 01:30:16.000000000 +0100 +++ wine-20021125/dlls/winmm/winealsa/alsa.c 2002-12-08 14:52:38.000000000 +0000 @@ -25,12 +25,93 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "mmddk.h" #include "alsa.h" +#include "wine/debug.h" #ifdef HAVE_ALSA +WINE_DEFAULT_DEBUG_CHANNEL(wave); + static struct WINE_ALSA* alsa = NULL; + +/* configuration variables for the ALSA driver */ +#define ALSA_DEVICE_NAME_DEFAULT "hw:0" +#define ALSA_USE_MMAP_DEFAULT 1 +char alsa_device_name[MAX_PATH+1]; +int alsa_use_mmap = 1; + +/* + * Get a config key from either the app-specific or the default config + */ +inline static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, + char *buffer, DWORD size ) +{ + if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, buffer, &size )) return 0; + return RegQueryValueExA( defkey, name, 0, NULL, buffer, &size ); +} + + +/* + * Setup the alsa options. + */ +inline static void setup_alsa_options(void) +{ + char buffer[MAX_PATH+1]; + HKEY hkey, appkey = 0; + + buffer[MAX_PATH]='\0'; + + if (RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\alsa", 0, NULL, + REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) + { + ERR("Cannot create config registry key\n" ); + ExitProcess(1); + } + + if (GetModuleFileNameA( 0, buffer, MAX_PATH )) + { + HKEY tmpkey; + + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\AppDefaults", &tmpkey )) + { + char appname[MAX_PATH+16]; + char *p = strrchr( buffer, '\\' ); + if (p!=NULL) { + appname[MAX_PATH]='\0'; + strncpy(appname,p+1,MAX_PATH); + strcat(appname,"\\alsa"); + TRACE("appname = [%s] \n",appname); + if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; + RegCloseKey( tmpkey ); + } + } + } + + /* get options */ + strncpy(alsa_device_name, ALSA_DEVICE_NAME_DEFAULT, MAX_PATH); + if (!get_config_key( hkey, appkey, "Device", buffer, MAX_PATH )) { + alsa_device_name[MAX_PATH] = '\0'; + strncpy(alsa_device_name, buffer, MAX_PATH); + if (strncmp(alsa_device_name, ALSA_DEVICE_NAME_DEFAULT, MAX_PATH)) { + WARN("alsa_device_name = %s (default=" ALSA_DEVICE_NAME_DEFAULT ")\n", + alsa_device_name); + } + } + + alsa_use_mmap = ALSA_USE_MMAP_DEFAULT; + if (!get_config_key( hkey, appkey, "UseMMAP", buffer, MAX_PATH )) { + alsa_use_mmap = strcmp(buffer, "N"); + if (alsa_use_mmap != ALSA_USE_MMAP_DEFAULT) { + WARN("alsa_use_mmap = %d (default=%d)\n", alsa_use_mmap, + ALSA_USE_MMAP_DEFAULT); + } + } + + if (appkey) RegCloseKey( appkey ); + RegCloseKey( hkey ); +} /************************************************************************** * ALSA_drvOpen [internal] @@ -39,7 +120,7 @@ { if (alsa) return 0; - + /* I know, this is ugly, but who cares... */ alsa = (struct WINE_ALSA*)1; return 1; @@ -71,7 +152,8 @@ switch(wMsg) { #ifdef HAVE_ALSA - case DRV_LOAD: ALSA_WaveInit(); + case DRV_LOAD: setup_alsa_options(); + ALSA_WaveInit(); return 1; case DRV_FREE: return 1; case DRV_OPEN: return ALSA_drvOpen((LPSTR)dwParam1); diff -u -r wine-20021125-orig/dlls/winmm/winealsa/alsa.h wine-20021125/dlls/winmm/winealsa/alsa.h --- wine-20021125-orig/dlls/winmm/winealsa/alsa.h 2002-08-29 02:51:32.000000000 +0100 +++ wine-20021125/dlls/winmm/winealsa/alsa.h 2002-12-08 14:19:06.000000000 +0000 @@ -29,3 +29,6 @@ #endif extern LONG ALSA_WaveInit(void); +/* config options */ +extern char alsa_device_name[]; +extern int alsa_use_mmap; Only in wine-20021125/dlls/winmm/winealsa: alsa.o diff -u -r wine-20021125-orig/dlls/winmm/winealsa/audio.c wine-20021125/dlls/winmm/winealsa/audio.c --- wine-20021125-orig/dlls/winmm/winealsa/audio.c 2002-10-25 20:09:02.000000000 +0100 +++ wine-20021125/dlls/winmm/winealsa/audio.c 2002-12-08 14:32:16.000000000 +0000 @@ -217,13 +217,13 @@ } \ } while(0) - EXIT_ON_ERROR( snd_ctl_open(&ctl,"hw:0",0) , "ctl open failed" ); + EXIT_ON_ERROR( snd_ctl_open(&ctl,alsa_device_name,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",0), "hctl open failed"); + EXIT_ON_ERROR( snd_hctl_open(&hctl,alsa_device_name,0), "hctl open failed"); EXIT_ON_ERROR( snd_hctl_load(hctl), "hctl load failed" ); elem=snd_hctl_first_elem(hctl); @@ -404,8 +404,9 @@ wwo = &WOutDev[0]; + TRACE("ALSA_WaveInit device name = %s", alsa_device_name); /* FIXME: use better values */ - wwo->device = "hw:0,0"; + wwo->device = alsa_device_name; wwo->caps.wMid = 0x0002; wwo->caps.wPid = 0x0104; strcpy(wwo->caps.szPname, "SB16 Wave Out"); @@ -495,7 +496,7 @@ 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 ) ) + if ( alsa_use_mmap && snd_pcm_access_mask_test( acmask, SND_PCM_ACCESS_MMAP_INTERLEAVED ) ) wwo->caps.dwSupport |= WAVECAPS_DIRECTSOUND; } @@ -1114,7 +1115,7 @@ } while(0) access = SND_PCM_ACCESS_MMAP_INTERLEAVED; - if ( ( err = snd_pcm_hw_params_set_access(pcm, hw_params, access ) ) < 0) { + if (!alsa_use_mmap || ((err = snd_pcm_hw_params_set_access(pcm, hw_params, access)) < 0)) { WARN("mmap not available. switching to standard write.\n"); access = SND_PCM_ACCESS_RW_INTERLEAVED; EXIT_ON_ERROR( snd_pcm_hw_params_set_access(pcm, hw_params, access ), MMSYSERR_INVALPARAM, "unable to set access for playback"); @@ -1128,11 +1129,13 @@ format = (wwo->format.wBitsPerSample == 16) ? SND_PCM_FORMAT_S16_LE : SND_PCM_FORMAT_U8; EXIT_ON_ERROR( snd_pcm_hw_params_set_format(pcm, hw_params, format), MMSYSERR_INVALPARAM, "unable to set required format"); +#if 0 EXIT_ON_ERROR( snd_pcm_hw_params_set_buffer_size_near(pcm, hw_params, buffer_size), MMSYSERR_NOMEM, "unable to get required buffer"); buffer_size = snd_pcm_hw_params_get_buffer_size(hw_params); EXIT_ON_ERROR( snd_pcm_hw_params_set_period_size_near(pcm, hw_params, buffer_size/num_periods, 0), MMSYSERR_ERROR, "unable to set required period size"); period_size = snd_pcm_hw_params_get_period_size(hw_params, 0); +#endif rate = snd_pcm_hw_params_set_rate_near(pcm, hw_params, wwo->format.wf.nSamplesPerSec, 0); if (rate < 0) { @@ -1147,6 +1150,11 @@ } EXIT_ON_ERROR( snd_pcm_hw_params(pcm, hw_params), MMSYSERR_INVALPARAM, "unable to set hw params for playback"); + +#if 1 + buffer_size = snd_pcm_hw_params_get_buffer_size(hw_params); + period_size = snd_pcm_hw_params_get_period_size(hw_params, 0); +#endif snd_pcm_sw_params_current(pcm, sw_params); EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, dwFlags & WAVE_DIRECTSOUND ? INT_MAX : 1 ), MMSYSERR_ERROR, "unable to set start threshold");

3 5

← Newer
1
...
21
22
23
24
25
26
27
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel December 2002