- Wine-Devel - list.winehq.org

Re: winecfg: various drive detection enhancements
by Michael Jung Feb. 16, 2005

Feb. 16, 2005

Hi Richard, On Wednesday 16 February 2005 08:45, you wrote: > Windows permits the user to set the name of the windows directory > to whatever he desires. At one time I had directories called > /Win31 and /Win98. Not a common practice, but you may wish to > make provision for this if there are later revisions to the code. > > So the line above might look something like: > > cp "datadir/wine.inf" "$CROOT_WINDOWS/inf/wine.inf" > > if I understand your code correctly. On the other hand, there may be > benefits in having a standard installation designed with a /windows > directory in mind, and the wine user then handles non-standard > installations with whatever skills he has available. wineprefixcreate is executed only if the user calls wine without having a '.wine' directory in place at all. What this means is that there is no registry and no configuration at all at this time. So there is no way that the user has already configured a "/Win98" as the system directory or somesuch. wineprefixcreate is meant to install a default configuration for users who don't have the knowledge or the desire to do so on their own. The configuration it installs is a good starting point to be tailored to your needs, though. It won't be touched by wineprefixcreate again, once it is generated. That said, the line of code you are refering to is not from me. I've only added the call to winecfg. Ciao, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

Re: [AppDB] edit version and edit notes
by Scott Ritchie Feb. 16, 2005

Feb. 16, 2005

Cool, I can edit application version info again when I'm a maintainer (and a supermaintainer), however I still can't do it if I'm just a supermaintainer (the only button available in an app version is to resign as supermaintainer.) Furthermore, as a related feature request, listing the names of the supermaintainers in the maintainer field when viewing a version would be useful, so that it appears that a supermaintained app is actually maintained. Thanks for the good work! -Scott Ritchie

2 1

Re: x11drv: make minimizing windows work again
by Vitaliy Margolen Feb. 16, 2005

Feb. 16, 2005

BTW one side affect of this patch - application icon is not displayed in the task bar anymore. Now it's back to wine's logo. Vitaliy Margolen Tuesday, February 15, 2005, 5:51:34 AM, Vitaliy Margolen wrote: > changelog: > - make minimized windows stay minimized

1 0

Re: x11drv: make minimizing windows work again
by Vitaliy Margolen Feb. 16, 2005

Feb. 16, 2005

Ok, that semi-helps. Now I don't have an extra window that was showing up after minimize. But programs still don't want to stay minimized. They blink in the task bar and immediately restore themselves. Any suggestions where could it be? People have commented on this before. To reiterate: all programs (that I have) behave in this manner, not staying minimized. Vitaliy Margolen Tuesday, February 15, 2005, 5:51:34 AM, Vitaliy Margolen wrote: > changelog: > - make minimized windows stay minimized

1 0

Re: [NTDLL] Consider SUBLANG_DEFAULT after SUBLANG_NEUTRAL when loading resources
by Dmitry Timoshkov Feb. 16, 2005

Feb. 16, 2005

"Alex Villacis Lasso" <a_villacis(a)palosanto.com> wrote: > Actually, there was a bug in resource loading, which caused Wine to fail > to load the apropriate resources for my locale (es_EC). As far as I can > tell, the resource loader tries several combinations for the resource > LCIDs, and then defaults to English. In my case, the LANGID was supposed > to be 0x300a (Spanish, Ecuador), and the resources in regedit listed a > resource for LANGID 0x040a (Spanish, DEFAULT language). The loader tried > 0x300a (Spanish, Ecuador), and then 0x000a (Spanish, NEUTRAL). However, > since DEFAULT != NEUTRAL, the Spanish resources failed to be loaded for > my setup, and defaulted to English. > > This patch adds code to try SUBLANG_DEFAULT after SUBLANG_NEUTRAL when > loading resources. This fixes the resource loading for my setup. That's a not correct fix. You either need to add language resources for your locale, or (if you believe that all spanish variants around the world are the same) make spanish translations use LANGUAGE LANG_SPANISH, NEUTRAL instead of LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT -- Dmitry.

1 0

errors compiling wine tests with msvc
by James Hawkins Feb. 16, 2005

Feb. 16, 2005

Hi, I've been compiling the wine tests with visual studio 2003, and there are a couple errors popping up. One of the errors is that the align modifier is not allowed on function parameters, so most of the test fail to compile with wine's headers because we align most of our data types (AFAICS, I haven't looked through all of our winnt.h): (from wine/include/winnt.h) typedef unsigned __int64 DECLSPEC_ALIGN(8) ULONGLONG, *PULONGLONG; Whereas ms' ULONGLONG does not have the align modifier: (from ms' winnt.h) typedef unsigned __int64 ULONGLONG; Should we reconcile the difference and remove the align from out types? If not the tests won't compile with vs so I guess the other option would be to #pragma disable that warning. Any ideas? -- James Hawkins

3 4

Re: [DSOUND] block align buffer sizes (revised)
by Robert Reif Feb. 16, 2005

Feb. 16, 2005

Robert Reif wrote: > Make sure buffer sizes are a multiple of the block align size. > Fixed invalid buffer size by rounding up to next multiple of nBlockAlign. Added test to verify buffer rounding behavior. Index: dlls/dsound/buffer.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/buffer.c,v retrieving revision 1.46 diff -u -p -r1.46 buffer.c --- dlls/dsound/buffer.c 11 Feb 2005 11:49:05 -0000 1.46 +++ dlls/dsound/buffer.c 16 Feb 2005 00:55:58 -0000 @@ -1060,9 +1060,14 @@ HRESULT WINAPI IDirectSoundBufferImpl_Cr CopyMemory(dsb->pwfx, wfex, cp_size); - dsb->buflen = dsbd->dwBufferBytes; - dsb->freq = dsbd->lpwfxFormat->nSamplesPerSec; + if (dsbd->dwBufferBytes % dsbd->lpwfxFormat->nBlockAlign) + dsb->buflen = dsbd->dwBufferBytes + + (dsbd->lpwfxFormat->nBlockAlign - + (dsbd->dwBufferBytes % dsbd->lpwfxFormat->nBlockAlign)); + else + dsb->buflen = dsbd->dwBufferBytes; + dsb->freq = dsbd->lpwfxFormat->nSamplesPerSec; dsb->notify = NULL; dsb->notifies = NULL; dsb->nrofnotifies = 0; Index: dlls/dsound/tests/ds3d.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/tests/ds3d.c,v retrieving revision 1.19 diff -u -p -r1.19 ds3d.c --- dlls/dsound/tests/ds3d.c 10 Feb 2005 20:26:20 -0000 1.19 +++ dlls/dsound/tests/ds3d.c 16 Feb 2005 00:56:00 -0000 @@ -713,7 +713,8 @@ static HRESULT test_secondary(LPGUID lpG else bufdesc.dwFlags|= (DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN); - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; if (winetest_interactive) { trace(" Testing a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d " Index: dlls/dsound/tests/ds3d8.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/tests/ds3d8.c,v retrieving revision 1.14 diff -u -p -r1.14 ds3d8.c --- dlls/dsound/tests/ds3d8.c 10 Feb 2005 21:21:13 -0000 1.14 +++ dlls/dsound/tests/ds3d8.c 16 Feb 2005 00:56:00 -0000 @@ -615,7 +615,8 @@ static HRESULT test_secondary8(LPGUID lp else bufdesc.dwFlags|= (DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN); - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; if (has_3d) { /* a stereo 3D buffer should fail */ Index: dlls/dsound/tests/dsound.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/tests/dsound.c,v retrieving revision 1.45 diff -u -p -r1.45 dsound.c --- dlls/dsound/tests/dsound.c 10 Feb 2005 20:26:20 -0000 1.45 +++ dlls/dsound/tests/dsound.c 16 Feb 2005 00:56:01 -0000 @@ -305,7 +305,8 @@ static HRESULT test_dsound(LPGUID lpGuid ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRL3D; - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, @@ -573,7 +574,8 @@ static HRESULT test_primary_secondary(LP ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx2; if (winetest_interactive) { trace(" Testing a primary buffer at %ldx%dx%d with a " @@ -672,7 +674,8 @@ static HRESULT test_secondary(LPGUID lpG ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_CreateSoundBuffer() " "should have returned DSERR_INVALIDPARAM, returned: %s\n", @@ -684,7 +687,8 @@ static HRESULT test_secondary(LPGUID lpG ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; if (winetest_interactive) { trace(" Testing a secondary buffer at %ldx%dx%d " @@ -727,6 +731,53 @@ EXIT: return rc; } +static HRESULT test_block_align(LPGUID lpGuid) +{ + HRESULT rc; + LPDIRECTSOUND dso=NULL; + LPDIRECTSOUNDBUFFER secondary=NULL; + DSBUFFERDESC bufdesc; + DSBCAPS dsbcaps; + WAVEFORMATEX wfx; + int ref; + + /* Create the DirectSound object */ + rc=DirectSoundCreate(lpGuid,&dso,NULL); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %s\n",DXGetErrorString8(rc)); + if (rc!=DS_OK) + return rc; + + init_format(&wfx,WAVE_FORMAT_PCM,11025,16,2); + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; + bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec + 1; + bufdesc.lpwfxFormat=&wfx; + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + ok(rc==DS_OK,"IDirectSound_CreateSoundBuffer() " + "should have returned DS_OK, returned: %s\n", + DXGetErrorString8(rc)); + + if (rc==DS_OK && secondary!=NULL) { + rc=IDirectSoundBuffer_GetCaps(secondary,&dsbcaps); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() should have returned DS_OK, " + "returned: %s\n", DXGetErrorString8(rc)); + ok(dsbcaps.dwBufferBytes==(wfx.nAvgBytesPerSec + 4), + "Buffer size not a multiple of nBlockAlign\n"); + ref=IDirectSoundBuffer_Release(secondary); + ok(ref==0,"IDirectSoundBuffer_Release() secondary has %d references, " + "should have 0\n",ref); + } + + ref=IDirectSound_Release(dso); + ok(ref==0,"IDirectSound_Release() has %d references, should have 0\n",ref); + if (ref!=0) + return DSERR_GENERIC; + + return rc; +} + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { @@ -738,6 +789,7 @@ static BOOL WINAPI dsenum_callback(LPGUI else if (rc == DSERR_ALLOCATED) trace(" Already In Use\n"); else { + test_block_align(lpGuid); test_primary(lpGuid); test_primary_secondary(lpGuid); test_secondary(lpGuid); Index: dlls/dsound/tests/dsound8.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/tests/dsound8.c,v retrieving revision 1.15 diff -u -p -r1.15 dsound8.c --- dlls/dsound/tests/dsound8.c 10 Feb 2005 20:26:20 -0000 1.15 +++ dlls/dsound/tests/dsound8.c 16 Feb 2005 00:56:02 -0000 @@ -38,6 +38,11 @@ static HRESULT (WINAPI *pDirectSoundCreate8)(LPCGUID,LPDIRECTSOUND8*,LPUNKNOWN)=NULL; +int align(int length, int align) +{ + return (length / align) * align; +} + static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, LPCGUID lpGuid) { @@ -315,7 +320,8 @@ static HRESULT test_dsound8(LPGUID lpGui ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRL3D; - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, @@ -594,7 +600,8 @@ static HRESULT test_primary_secondary8(L ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx2; if (winetest_interactive) { trace(" Testing a primary buffer at %ldx%dx%d with a " @@ -693,7 +700,8 @@ static HRESULT test_secondary8(LPGUID lp ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_CreateSoundBuffer() " "should have returned DSERR_INVALIDPARAM, returned: %s\n", @@ -705,7 +713,8 @@ static HRESULT test_secondary8(LPGUID lp ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; - bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec*BUFFER_LEN/1000; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; if (winetest_interactive) { trace(" Testing a secondary buffer at %ldx%dx%d " Index: dlls/dsound/tests/dsound_test.h =================================================================== RCS file: /home/wine/wine/dlls/dsound/tests/dsound_test.h,v retrieving revision 1.6 diff -u -p -r1.6 dsound_test.h --- dlls/dsound/tests/dsound_test.h 13 Dec 2004 21:19:02 -0000 1.6 +++ dlls/dsound/tests/dsound_test.h 16 Feb 2005 00:56:02 -0000 @@ -50,7 +50,6 @@ static const unsigned int formats[][4]={ #define TIME_SLICE 31 #define BUFFER_LEN 400 - extern char* wave_generate_la(WAVEFORMATEX*,double,DWORD*); extern HWND get_hwnd(void); extern void init_format(WAVEFORMATEX*,int,int,int,int); @@ -61,3 +60,4 @@ extern void test_buffer8(LPDIRECTSOUND8, BOOL,BOOL,LONG,BOOL,LONG,BOOL,double,BOOL, LPDIRECTSOUND3DLISTENER,BOOL,BOOL); extern const char * getDSBCAPS(DWORD xmask); +extern int align(int length, int align);

1 0

Re: winmm: fix type-conversions
by Robert Reif Feb. 15, 2005

Feb. 15, 2005

James Hawkins wrote: >Hi, > >msvc picked up a couple type-conversions problems in winmm. > > > >- union { float f; char c[4]; } sample; >+ union { double f; char c[4]; } sample; > sample.f=y; > > A float is 4 bytes and a double is 8. They are not interchangeable. The H/W reads/writes 4 byte floats.

2 1

Re: [winecfg] Change audio detection order
by Michael Stefaniuc Feb. 15, 2005

Feb. 15, 2005

Paul van Schayck wrote: > My previous patch to do something usefull with multiple detected audio > systems was not accepted. > > But right now ARTS was detected first. I've changed the order to OSS - > ALSA - ARTS - JACK. > > Changelog: > Change detection order to: OSS-ALSA-ARTS-JACK Are you sure you want to prefer OSS instead of ALSA? If you have both that means that OSS runs as emulation on ALSA. bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

3 2

Re: winsock: use local includes in tests
by Maxime Bellengé Feb. 15, 2005

Feb. 15, 2005

You seems to have forgotten something :) Max On Tue, 2005-02-15 at 15:40 -0600, James Hawkins wrote: > Hey, > > This patch keeps msvc from pulling in msvc system headers when > compiling with wine's headers. > > Changelog > * Use local includes to keep msvc from mixing the system and wine's headers. >

1 0