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

Re: [PATCH 01/10] dsound/tests: Add IDirectSound refcount and COM aggregation tests.
by Marvin July 18, 2012

July 18, 2012

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=20152 Your paranoid android. === WNT4WSSP6 (32 bit dsound) === dsound.c:194: Test failed: DirectMusicPerformance create failed: 80070057, expected CLASS_E_NOAGGREGATION dsound.c:196: Test failed: dso = DEADBEEF

1 0

Re: ole32: Forward BSTR functions to oleaut32
by Alexandre Julliard July 18, 2012

July 18, 2012

Jacek Caban <jacek(a)codeweavers.com> writes: > @@ -1244,6 +1244,9 @@ static void COMPOBJ_InitProcess( void ) > static void COMPOBJ_UninitProcess( void ) > { > UnregisterClassW(wszAptWinClass, hProxyDll); > + > + if(oleaut32_instance) > + FreeLibrary(oleaut32_instance); Since oleaut32 imports ole32 you'll never get here. Using a delayed import would probably be easier. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: mshtml: Set outgoing pass-by-address variable in an error case case within confirm_safety_load.
by Jacek Caban July 18, 2012

July 18, 2012

Hi Gerald, On 03/07/12 23:35, Gerald Pfeifer wrote: > I noticed we return in this case, without initializing this variable. > Visual inspection indicates we do not seem to access the variable in > this error case, but a) better safe than sorry, and b) GCC 4.8 currently > warns about it. > > Not sure URLPOLICY_DISALLOW is the best return value, open for better > alternatives. I generally don't think this patch makes things any better (or worse). If we return an error, the caller should not expect this value to be sane. What's the GCC 4.8 warning? Jacek

2 4

Re: d3dx9_36: Implementation of D3DXSHRotateZ
by Matteo Bruni July 18, 2012

July 18, 2012

2012/7/18 Nozomi Kodama <nozomi.kodama(a)yahoo.com>: > Minor nitpicks, but nevertheless: > -@ stub D3DXSHRotateZ(ptr long long ptr) > +@ stdcall D3DXSHRotateZ(ptr long long ptr) ... > +FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) I guess using "float" in the spec file for the third parameter would be more appropriate (yes, it was already wrong but that's not an excuse ;) + if ( i >= order * order || ( (order > D3DXSH_MAXORDER) && ( i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER ) ) ) + expected = ( i + 1.0f ) * ( i + 1.0f ); Bad indentation. In general the inner for loop in the tests feels awkward, try to rewrite it to avoid the duplicated stuff. + } + } + } You're adding a tab character here, please use only whitespaces for indentation. That said, thanks for your work on d3dx9!

1 0

Re: [PATCH 2/2] vbscript: Added LCase implementation
by Marvin July 18, 2012

July 18, 2012

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=20130 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [2/2] gdiplus: Add 8bpp to the list of supported formats.
by Vincent Povirk July 18, 2012

July 18, 2012

> + &GUID_WICPixelFormat8bppGray, This will give you a halftone palette instead of a grayscale palette, unless you add special handling for that format.

2 2

Re: [PATCH 5/5] d3dcompiler: Implement basic expressions parsing.
by Stefan Dösinger July 17, 2012

July 17, 2012

Am Montag, 16. Juli 2012, 20:39:23 schrieb Matteo Bruni: > + HLSL_IR_BINOP_MUL, > ... > + HLSL_IR_BINOP_DOT, HLSL has 3 somewhat related multiplication operations: "*", "mul" and "dot". Dot is fairly straightforward, but "*" and "mul" have subtle differences. I recommend to write tests to find out the exact details, but as far as I remember "float4 * float4" gives you a float4 with a component-wise multiplication, whereas mul(float, float) returns a scalar like the dot product. "float4x4 * float4" is an error, but mul(float4x4, float4) performs a matrix-vector multiplication and returns a float4. > +static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct > hlsl_type *t2, > + struct source_location *loc) This type inference system might be a bit too limited, you have to take the operation into account. e.g. a dot(float3, float4) returns a scalar and crs(float4, float4) returns a float3.

2 1

Re: riched20: Avoid uninitialized field in STGMEDIUM structure (LLVM/Clang).
by Alexandre Julliard July 17, 2012

July 17, 2012

Nicolas Le Cam <niko.lecam(a)gmail.com> writes: > @@ -1098,6 +1098,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm > BOOL ret = FALSE; > DWORD conn; > > + memset(&stgm, 0, sizeof(stgm)); > + Please fix the bugs (if any) instead of silencing the warnings by memsetting everything to 0. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: msvcp90: handle npos as a len in basic_string<>::replace
by Dan Kegel July 16, 2012

July 16, 2012

Daniel Lehman wrote: @@ -1949,7 +1949,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch - if(off+len > this->size) + if(off+len < off || off+len > this->size) len = this->size-off; Wouldn't this be more elegant: if(num > this->size-pos) num = this->size-pos; ? Also, you may have missed the similar case in basic_string_char_compare_substr_cstr_len (which uses 'pos' and 'num' rather than 'off' and 'len'). See http://bugs.winehq.org/show_bug.cgi?id=31085#c5

2 1

Build failure of "[PATCH 5/5] kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdManufacturerDescriptor) test (try 4)" ?
by GOUJON Alexandre July 16, 2012

July 16, 2012

Hi, My patch (http://source.winehq.org/patches/data/88072) is marked as "Build failure". I tried with the latest (today) HEAD and I successfully applied it. Compilation also works for me at least on my x86 and x86_64 computers. Moreover, the Wine Test Bot tested it without any issue, see https://testbot.winehq.org/JobDetails.pl?Key=19936. I know your machine is a bit "mystic". Can you show me your output to help me diagnosing your build failure ? Thanks

2 2

Re: msi/tests: Mark some test results as broken.
by Marvin July 16, 2012

July 16, 2012

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=20071 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:6053: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

1 0

Re: kernel32: Also report empty drives as available in GetLogicalDrives
by Alexandre Julliard July 16, 2012

July 16, 2012

Alexandre Goujon <ale.goujon(a)gmail.com> writes: > --- > dlls/kernel32/volume.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c > index 8377e41..67e2eb1 100644 > --- a/dlls/kernel32/volume.c > +++ b/dlls/kernel32/volume.c > @@ -1441,19 +1441,26 @@ DWORD WINAPI GetLogicalDrives(void) > DWORD ret = 0; > int i; > > - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a:") ))) > + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a::") ))) > { > SetLastError( ERROR_NOT_ENOUGH_MEMORY ); > return 0; > } > strcpy( buffer, config_dir ); > - strcat( buffer, "/dosdevices/a:" ); > - dev = buffer + strlen(buffer) - 2; > + strcat( buffer, "/dosdevices/a::" ); > + dev = buffer + strlen(buffer) - 3; > > for (i = 0; i < 26; i++) > { > *dev = 'a' + i; > + dev[2] = 0; > if (!stat( buffer, &st )) ret |= (1 << i); > + /* Windows also report empty drives as available */ > + else > + { > + dev[2] = ':'; > + if (!stat( buffer, &st )) ret |= (1 << i); > + } You can't do that, the device symlinks don't reflect the availability of the drive. It would have to go through the mountmgr. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/9] hhctrl.ocx: Centralize merging HH_WINTYPE data (resend).
by Alexandre Julliard July 16, 2012

July 16, 2012

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > @@ -28,6 +28,13 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); > > +#define HHWIN_PARAM_MASK (HHWIN_PARAM_PROPERTIES|HHWIN_PARAM_STYLES|HHWIN_PARAM_EXSTYLES|HHWIN_PARAM_RECT\ > + |HHWIN_PARAM_NAV_WIDTH|HHWIN_PARAM_SHOWSTATE|HHWIN_PARAM_INFOTYPES\ > + |HHWIN_PARAM_TB_FLAGS|HHWIN_PARAM_EXPANSION|HHWIN_PARAM_TABPOS\ > + |HHWIN_PARAM_TABORDER|HHWIN_PARAM_HISTORY_COUNT|HHWIN_PARAM_CUR_TAB) > +#define MERGE_PARAM(s,d,o,p) ((s->fsValidMembers & p) && (!(d->fsValidMembers & p) || o)) > +#define MERGE_PROP(s,d,o,p) (s->p != 0 && (d->p == 0 || o)) These macros are fairly ugly, you should be able to do without that. > @@ -1752,16 +1752,16 @@ void ReleaseHelpViewer(HHInfo *info) > list_remove(&info->entry); > > /* Free allocated strings */ > - heap_free(info->pszType); > - heap_free(info->pszCaption); > - heap_free(info->pszToc); > - heap_free(info->pszIndex); > - heap_free(info->pszFile); > - heap_free(info->pszHome); > - heap_free(info->pszJump1); > - heap_free(info->pszJump2); > - heap_free(info->pszUrlJump1); > - heap_free(info->pszUrlJump2); > + heap_free((LPVOID)info->WinType.pszType); > + heap_free((LPVOID)info->WinType.pszCaption); > + heap_free((LPVOID)info->WinType.pszToc); > + heap_free((LPVOID)info->WinType.pszIndex); > + heap_free((LPVOID)info->WinType.pszFile); > + heap_free((LPVOID)info->WinType.pszHome); > + heap_free((LPVOID)info->WinType.pszJump1); > + heap_free((LPVOID)info->WinType.pszJump2); > + heap_free((LPVOID)info->WinType.pszUrlJump1); > + heap_free((LPVOID)info->WinType.pszUrlJump2); Don't do that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] jscript: Don't set constructor property to each object instance, it belongs to their prototypes
by Marvin July 16, 2012

July 16, 2012

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=20070 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

Re: [PATCH 5/6] jscript: Expose RegExpError constructor in global object
by Marvin July 16, 2012

July 16, 2012

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=20069 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

Re: [PATCH 4/6] jscript: Properly set Error object's constructor property
by Marvin July 16, 2012

July 16, 2012

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=20068 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

Re: [PATCH 3/6] jscript: Properly set Function constructor's constructor property
by Marvin July 16, 2012

July 16, 2012

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=20067 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

Re: [PATCH 2/6] jscript: Properly handle constructor property for most builtin constructors
by Marvin July 16, 2012

July 16, 2012

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=20066 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

Re: [PATCH 1/6] jscript: Properly set Number.prototyp.constructor
by Marvin July 16, 2012

July 16, 2012

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

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

July 16, 2012

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 July 15, 2012

July 15, 2012

> 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 July 14, 2012

July 14, 2012

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 July 14, 2012

July 14, 2012

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 July 14, 2012

July 14, 2012

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 July 13, 2012

July 13, 2012

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