July 2012 - Wine-devel - list.winehq.org

Re: [PATCH 1/6] jscript: Properly set Number.prototyp.constructor
by Marvin 16 Jul '12

16 Jul '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=20065 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

mshtml: Always set the URL policy in the error cases?
by Francois Gouget 16 Jul '12

16 Jul '12

gcc 4.7 is complaining that policy may be used uninitialized in InternetHostSecurityManager_QueryCustomPolicy() and indeed there are many error cases in confirm_safety_load() and confirm_safety() where the policy is not set. The patch belowe seems to plug all these holes but I don't know if it really makes sense. diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index ff349ac..3f64a42 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -104,10 +104,9 @@ static HRESULT confirm_safety_load(HTMLDocumentNode *This, struct CONFIRMSAFETY CATID init_catid = CATID_SafeForInitializing; hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &init_catid, 0, NULL); + *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; if(FAILED(hres)) return hres; - - *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; } return S_OK; @@ -157,13 +156,17 @@ static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct C if(!This->catmgr) { hres = CoCreateInstance(&CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, &IID_ICatInformation, (void**)&This->catmgr); - if(FAILED(hres)) + if(FAILED(hres)) { + *ret = URLPOLICY_DISALLOW; return hres; + } } hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &scripting_catid, 0, NULL); - if(FAILED(hres)) + if(FAILED(hres)) { + *ret = URLPOLICY_DISALLOW; return hres; + } if(hres != S_OK) { *ret = URLPOLICY_DISALLOW; -- 1.7.10

2 3

Re: [1/9] gdiplus: Make sure that GdipBitmapLockBits stores valid lockmode.
by Vincent Povirk 16 Jul '12

16 Jul '12

I think this is a correct change, even though it looks wrong. If you use some invalid flag and/or add a comment, that may help explain what you're doing.

1 0

Re: [1/2] gdiplus: Make sure that 1bpp bitmap images get loaded in native format.
by Vincent Povirk 16 Jul '12

16 Jul '12

Uh, this is going to cause regressions if you don't give the image a palette.

2 2

Re: [4/4] gdiplus: GdipMeasureString operates internally in pixels but in/out rectangles are in device units. Resend.
by Vincent Povirk 16 Jul '12

16 Jul '12

Values returned from Measure[String|CharacterRanges] have to match what DrawString will draw. If they don't currently match, you need to explain why that is. If they do, you need to bring DrawString into line as well.

1 0

re: Query MediaType of SD-Cards using IOCTL_GET_DISK_DRIVE_GEOMETRY
by Dan Kegel 15 Jul '12

15 Jul '12

> Is it worth for working on patches for these issues, or is this > completely impossible with the current architecture? Do you know yet why no symlink is made in dosdevices for /media/XXXX-YYYY? I haven't heard any rumblings about the current architecture being hopelessly broken.

2 1

Re: dsound: Add detection of output format and allow a maximum of 8 channels
by Andrew Eikum 14 Jul '12

14 Jul '12

Thanks, Donny. Nice work overall. Some comments below. On Fri, Jul 13, 2012 at 05:57:48PM +1000, Donny Yang wrote: > This patch makes dsound automatically get the output format when a > output device is initialised and also allows up to 8 output channels > to be used for ALSA and PulseAudio. Using ALSA with over 2 channels > outputs the channels in the wrong speakers with my testing but I don't > know why so I can't fix that. You probably already discovered that ALSA's multi-channel support is primitive at best. You have to test each channel and hand-craft an asoundrc to match your hardware. See some more information here: <http://drona.csa.iisc.ernet.in/~uday/alsamch.shtml> > @@ -1492,6 +1493,24 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG > } else > WARN("DSOUND_PrimaryCreate failed: %08x\n", hr); > > + hr = IAudioClient_GetMixFormat(device->client, &pwfx); > + if(FAILED(hr)){ > + WARN("IAudioClient_GetMixFormat failed: %08x; Falling back to default output format\n", hr); > + }else{ > + DWORD oldPriolevel = device->priolevel; > + device->priolevel = DSSCL_WRITEPRIMARY; > + hr = primarybuffer_SetFormat(device, pwfx); > + device->priolevel = oldPriolevel; This looks like a hack. I think it fits better in DirectSoundDevice_Create, where the default values are copied in. Is there a reason it couldn't be done there? > -void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) > +void put_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) > { > - dsb->put_aux(dsb, pos, 0, value); > - dsb->put_aux(dsb, pos, 1, value); > + /* XXX: Is this how Windows does this? */ > + DWORD c; > + for (c = 0; c < dsb->device->pwfx->nChannels; ++c) > + dsb->put_aux(dsb, pos, c, value); > } > I think this is fine. I wonder if we should skip the LOWFREQ channel, though we'd have to be careful not to affect performance too much, as this runs in a really tight loop. > void mixieee32(float *src, float *dst, unsigned samples) > diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c > index 072b25a..538534d 100644 > --- a/dlls/dsound/dsound_main.c > +++ b/dlls/dsound/dsound_main.c > @@ -642,7 +642,7 @@ DirectSoundCaptureEnumerateW( > */ > > typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj); > - > + > typedef struct { > IClassFactory IClassFactory_iface; > REFCLSID rclsid; > @@ -702,7 +702,7 @@ static HRESULT WINAPI DSCF_CreateInstance( > *ppobj = NULL; > return This->pfnCreateInstance(riid, ppobj); > } > - > + > static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) > { > IClassFactoryImpl *This = impl_from_IClassFactory(iface); The only changes to this file are whitespace changes. I'd exclude these changes when you resend. > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 1cf6daa..68f6242 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -202,7 +202,7 @@ struct IDirectSoundBufferImpl > }; > > float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) DECLSPEC_HIDDEN; > -void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; > +void put_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; > > HRESULT IDirectSoundBufferImpl_Create( > DirectSoundDevice *device, > @@ -288,7 +288,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) > LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN; > > /* duplex.c */ > - > + > HRESULT DSOUND_FullDuplexCreate(REFIID riid, LPDIRECTSOUNDFULLDUPLEX* ppDSFD) DECLSPEC_HIDDEN; > > /* mixer.c */ > @@ -305,7 +305,7 @@ DWORD CALLBACK DSOUND_mixthread(void *ptr) DECLSPEC_HIDDEN; > void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; > > /* capture.c */ > - > + > HRESULT DSOUND_CaptureCreate(REFIID riid, LPDIRECTSOUNDCAPTURE *ppDSC) DECLSPEC_HIDDEN; > HRESULT DSOUND_CaptureCreate8(REFIID riid, LPDIRECTSOUNDCAPTURE8 *ppDSC8) DECLSPEC_HIDDEN; > Likewise, more unneeded whitespace changes. > diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c > index 93e2b8d..fa6b05a 100644 > --- a/dlls/winealsa.drv/mmdevdrv.c > +++ b/dlls/winealsa.drv/mmdevdrv.c > @@ -1544,7 +1544,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, > goto exit; > } > if(max > 8) > - max = 2; > + max = 8; > if(fmt->nChannels > max){ > hr = S_FALSE; > closest->nChannels = max; > @@ -1649,8 +1649,8 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, > goto exit; > } > > - if(max_channels > 2) > - fmt->Format.nChannels = 2; > + if(max_channels > 8) > + fmt->Format.nChannels = 8; > else > fmt->Format.nChannels = max_channels; > This needs to be a separate patch. Also, winealsa's multi-channel handling needs a closer examination. My current thinking is GetMixFormat should just return some sane, supported default (2ch, 48kHz, 16bps, or less as supported). It seems impossible to detect what the ALSA device actually supports, so we probably shouldn't even try like we do now. > diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c > index b374b53..e86ed08 100644 > --- a/dlls/winepulse.drv/mmdevdrv.c > +++ b/dlls/winepulse.drv/mmdevdrv.c > @@ -1050,13 +1050,13 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) > This->ss.format = PA_SAMPLE_INVALID; > switch(fmt->wFormatTag) { > case WAVE_FORMAT_IEEE_FLOAT: > - if (!fmt->nChannels || fmt->nChannels > 2 || fmt->wBitsPerSample != 32) > + if (!fmt->nChannels || fmt->nChannels > 8 || fmt->wBitsPerSample != 32) > break; > This->ss.format = PA_SAMPLE_FLOAT32LE; > pa_channel_map_init_auto(&This->map, fmt->nChannels, PA_CHANNEL_MAP_ALSA); > break; > case WAVE_FORMAT_PCM: > - if (!fmt->nChannels || fmt->nChannels > 2) > + if (!fmt->nChannels || fmt->nChannels > 8) > break; > if (fmt->wBitsPerSample == 8) > This->ss.format = PA_SAMPLE_U8; Wine doesn't have a PulseAudio driver yet, so this chunk won't apply. Andrew

2 2

GetDriveType and empty CD/DVD-ROM drives
by GOUJON Alexandre 14 Jul '12

14 Jul '12

Hi, I'm currently working on bug #17037. The root cause is that GetDriveType("D:\") (if D is mapped to /dev/cdrom) returns DRIVE_NO_ROOT_DIR while on Windows it returns DRIVE_CDROM when there is no disc in the D drive. GetDriveType tries to open D:\ which is converted into \\??\\D:\\ then ~/.wine/dosdevices/d:/ The fact is that there is a dosdevices/d:: file (symlinked to /dev/cdrom) but no dosdevices/d: except if a CD or DVD is in and mounted somewhere. The conversion \\??\\D:\\ -> ~/.wine/dosdevices/d:/ is done in wine_nt_to_unix_file_name (ntdll/directory.c, line 2897). I'm asking here because I wonder if modifying wine_nt_to_unix_file_name is the right thing to do and sane: it's called at several locations and I don't want to cause trouble and regressions, well, if possible. Thanks for any advice

1 0

Suppressing My Computer in File Open dialog box?
by Dan Kegel 14 Jul '12

14 Jul '12

I'm creating a page of tips at http://wiki.winehq.org/DisplayingUnixFilenames for vendors shipping Windows apps on Linux with Wine who want their apps to use Windows paths throughout internally, but display Linux paths in the GUI This is something I've been meaning to do ever since I helped port Picasa. Picasa was an easy case, since it didn't use any standard widgets. So now I'm wondering how to coax standard widgets into not leaking Windows paths or naming conventions visually. Does anyone know how to keep the Save File dialog box from listing My Computer in the LookIn pulldown? (I know how to keep it from showing /, but I'd like to do the opposite, and *only* show / and maybe the user's home directory, if possible.)

2 2

Re: dsound: Add support for adjusting volume of more than 2 channels
by Andrew Eikum 13 Jul '12

13 Jul '12

On Fri, Jul 13, 2012 at 05:59:03PM +1000, Donny Yang wrote: > - if (channels != 1 && channels != 2) > - { > - FIXME("There is no support for %u channels\n", channels); > + if (dsb->device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > + channelMask = ((WAVEFORMATEXTENSIBLE*)dsb->device->pwfx)->dwChannelMask; > + else if (channels == 1) > + channelMask = SPEAKER_FRONT_CENTER; > + else if (channels == 2) > + channelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; > + else { > + FIXME("There is no support for %u channels without an extensible wave format\n", channels); > return; > } Before you resend, please consider testing how Windows behaves in this condition. Does it actually refuse to apply any volume at all? Andrew

1 0