May 2006 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Add IWineD3DSurface:: GetPitch.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 18e95ee969f0bb04865fadca474b60faa3ff9fd5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18e95ee969f0bb04865fadc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 6 17:39:45 2006 +0200 wined3d: Add IWineD3DSurface::GetPitch. --- dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++-------------- include/wine/wined3d_interface.h | 2 ++ 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index da51768..9bb0916 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -312,22 +312,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR TRACE("(%p) : rect@%p flags(%08lx), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); } - /* DXTn formats don't have exact pitches as they are to the new row of blocks, - where each block is 4x4 pixels, 8 bytes (dxt1) and 16 bytes (dxt2/3/4/5) - ie pitch = (width/4) * bytes per block */ - if (This->resource.format == WINED3DFMT_DXT1) /* DXT1 is 8 bytes per block */ - pLockedRect->Pitch = (This->currentDesc.Width >> 2) << 3; - else if (This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || - This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) /* DXT2/3/4/5 is 16 bytes per block */ - pLockedRect->Pitch = (This->currentDesc.Width >> 2) << 4; - else { - if (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET) { - /* Front and back buffers are always lockes/unlocked on currentDesc.Width */ - pLockedRect->Pitch = This->bytesPerPixel * This->currentDesc.Width; /* Bytes / row */ - } else { - pLockedRect->Pitch = This->bytesPerPixel * This->pow2Width; - } - } + pLockedRect->Pitch = IWineD3DSurface_GetPitch(iface); if (NULL == pRect) { pLockedRect->pBits = This->resource.allocatedMemory; @@ -1524,6 +1509,31 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Priva return WINED3D_OK; } +DWORD WINAPI IWineD3DSurfaceImpl_GetPitch(IWineD3DSurface *iface) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + DWORD ret; + TRACE("(%p)\n", This); + + /* DXTn formats don't have exact pitches as they are to the new row of blocks, + where each block is 4x4 pixels, 8 bytes (dxt1) and 16 bytes (dxt2/3/4/5) + ie pitch = (width/4) * bytes per block */ + if (This->resource.format == WINED3DFMT_DXT1) /* DXT1 is 8 bytes per block */ + ret = (This->currentDesc.Width >> 2) << 3; + else if (This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || + This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) /* DXT2/3/4/5 is 16 bytes per block */ + ret = (This->currentDesc.Width >> 2) << 4; + else { + if (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET) { + /* Front and back buffers are always lockes/unlocked on currentDesc.Width */ + ret = This->bytesPerPixel * This->currentDesc.Width; /* Bytes / row */ + } else { + ret = This->bytesPerPixel * This->pow2Width; + } + } + TRACE("(%p) Returning %ld\n", This, ret); + return ret; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -1560,6 +1570,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_SetPalette, IWineD3DSurfaceImpl_RealizePalette, IWineD3DSurfaceImpl_SetColorKey, + IWineD3DSurfaceImpl_GetPitch, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 87ee1c9..745a37b 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1152,6 +1152,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(SetPalette)(THIS_ struct IWineD3DPalette *Palette) PURE; STDMETHOD(RealizePalette)(THIS) PURE; STDMETHOD(SetColorKey)(THIS_ DWORD Flags, DDCOLORKEY *CKey) PURE; + STDMETHOD_(DWORD,GetPitch)(THIS) PURE; /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1203,6 +1204,7 @@ #define IWineD3DSurface_GetPalette(p, a) #define IWineD3DSurface_SetPalette(p, a) (p)->lpVtbl->SetPalette(p, a) #define IWineD3DSurface_RealizePalette(p) (p)->lpVtbl->RealizePalette(p) #define IWineD3DSurface_SetColorKey(p, a, b) (p)->lpVtbl->SetColorKey(p, a, b) +#define IWineD3DSurface_GetPitch(p) (p)->lpVtbl->GetPitch(p) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)

1 0

Stefan Dösinger : wined3d: Add IWineD3DDevice:: DrawPrimitiveStrided.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: a173c8e35a612c8174b02ccfddd26ab551f0d611 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a173c8e35a612c8174b02cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 6 16:58:57 2006 +0200 wined3d: Add IWineD3DDevice::DrawPrimitiveStrided. --- dlls/wined3d/device.c | 14 ++++++-- dlls/wined3d/drawprim.c | 67 +++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 37 +-------------------- include/wine/wined3d_interface.h | 2 + include/wine/wined3d_types.h | 53 ++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a173c8e35a612c8174b…

1 0

Stefan Dösinger : wined3d: Add some surface flags.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 1cfbc903d54713ef0d7df76e266ca9b03c18e175 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1cfbc903d54713ef0d7df76… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 6 16:15:37 2006 +0200 wined3d: Add some surface flags. --- dlls/wined3d/device.c | 15 ++++---- dlls/wined3d/surface.c | 72 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 45 +++++++++++++++++++------ 3 files changed, 84 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1cfbc903d54713ef0d7…

1 0

Huw Davies : oleaut32: Implement GetVarDesc_Proxy and friends.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: c7bb8bd4fe651b9b360bce5ca65c34fc593bf6b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7bb8bd4fe651b9b360bce5… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun May 7 22:00:51 2006 +0100 oleaut32: Implement GetVarDesc_Proxy and friends. --- dlls/oleaut32/usrmarshal.c | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index fd24b4a..562983a 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1448,8 +1448,14 @@ HRESULT CALLBACK ITypeInfo_GetVarDesc_Pr UINT index, VARDESC** ppVarDesc) { - FIXME("not implemented\n"); - return E_FAIL; + CLEANLOCALSTORAGE stg; + TRACE("(%p, %d, %p)\n", This, index, ppVarDesc); + + stg.flags = 0; + stg.pStorage = NULL; + stg.pInterface = NULL; + + return ITypeInfo_RemoteGetVarDesc_Proxy(This, index, ppVarDesc, &stg); } HRESULT __RPC_STUB ITypeInfo_GetVarDesc_Stub( @@ -1458,8 +1464,18 @@ HRESULT __RPC_STUB ITypeInfo_GetVarDesc_ LPVARDESC* ppVarDesc, CLEANLOCALSTORAGE* pDummy) { - FIXME("not implemented\n"); - return E_FAIL; + HRESULT hr; + TRACE("(%p, %d, %p)\n", This, index, ppVarDesc); + + hr = ITypeInfo_GetVarDesc(This, index, ppVarDesc); + if(hr != S_OK) + return hr; + + pDummy->flags = CLS_VARDESC; + ITypeInfo_AddRef(This); + pDummy->pInterface = (IUnknown*)This; + pDummy->pStorage = ppVarDesc; + return hr; } HRESULT CALLBACK ITypeInfo_GetNames_Proxy( @@ -1709,14 +1725,23 @@ void CALLBACK ITypeInfo_ReleaseVarDesc_P ITypeInfo* This, VARDESC* pVarDesc) { - FIXME("not implemented\n"); + TRACE("(%p, %p)\n", This, pVarDesc); + + if(pVarDesc->lpstrSchema) + CoTaskMemFree(pVarDesc->lpstrSchema); + + if(pVarDesc->varkind == VAR_CONST) + CoTaskMemFree(pVarDesc->u.lpvarValue); + + free_embedded_elemdesc(&pVarDesc->elemdescVar); + CoTaskMemFree(pVarDesc); } HRESULT __RPC_STUB ITypeInfo_ReleaseVarDesc_Stub( ITypeInfo* This) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("nothing to do\n"); + return S_OK; }

1 0

Huw Davies : oleaut32: Change CLEANLOCALSTORAGE flag constants to their character
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 9235ae2ecd9da1974ee96c89c24ae7f83d558d44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9235ae2ecd9da1974ee96c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun May 7 21:26:45 2006 +0100 oleaut32: Change CLEANLOCALSTORAGE flag constants to their character constant equivalents. It's now obvious why these were chosen. Should be a NOP. --- dlls/oleaut32/usrmarshal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index a26b93d..fd24b4a 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -85,10 +85,10 @@ static void dump_user_flags(unsigned lon /* CLEANLOCALSTORAGE */ -#define CLS_FUNCDESC 0x66 -#define CLS_LIBATTR 0x6c -#define CLS_TYPEATTR 0x74 -#define CLS_VARDESC 0x76 +#define CLS_FUNCDESC 'f' +#define CLS_LIBATTR 'l' +#define CLS_TYPEATTR 't' +#define CLS_VARDESC 'v' unsigned long WINAPI CLEANLOCALSTORAGE_UserSize(unsigned long *pFlags, unsigned long Start, CLEANLOCALSTORAGE *pstg) {

1 0

James Hawkins : include: Add missing SECURITY_QUALITY_OF_SERVICE defines.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 70b2811e450f8a3ba2ebcd7d611de21baf9a6f39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70b2811e450f8a3ba2ebcd7… Author: James Hawkins <truiken(a)gmail.com> Date: Mon May 8 02:33:17 2006 -0500 include: Add missing SECURITY_QUALITY_OF_SERVICE defines. --- include/winnt.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 321c278..53d9fb5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3517,6 +3517,8 @@ typedef enum _SECURITY_IMPERSONATION_LEV SecurityDelegation } SECURITY_IMPERSONATION_LEVEL, *PSECURITY_IMPERSONATION_LEVEL; +#define SECURITY_DYNAMIC_TRACKING (TRUE) +#define SECURITY_STATIC_TRACKING (FALSE) typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE, * PSECURITY_CONTEXT_TRACKING_MODE;

1 0

Hwang YunSong : user32: Updated Korean resource.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: f6f7eddcfec982f337a1b3272e7d59751a7c78d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6f7eddcfec982f337a1b32… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 8 08:56:34 2006 +0900 user32: Updated Korean resource. --- dlls/user/resources/user32_Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/resources/user32_Ko.rc b/dlls/user/resources/user32_Ko.rc index 4ede974..15581b4 100644 --- a/dlls/user/resources/user32_Ko.rc +++ b/dlls/user/resources/user32_Ko.rc @@ -30,7 +30,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARD MENUITEM SEPARATOR MENUITEM "�۾� ��ȯ(&W) ...\tCtrl-Esc", 61744 MENUITEM SEPARATOR - MENUITEM "��ο� ��Ͽ� ...", 61761 + MENUITEM "Wine�� Ͽ� ...", 61761 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE @@ -64,7 +64,7 @@ END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Select Window" +CAPTION "â ��" FONT 9, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */

1 0

Robert Reif : winecfg: Fix audio crash when no drivers are available.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 6f4e20832116457b77f7972157f9d9e475be9f4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f4e20832116457b77f7972… Author: Robert Reif <reif(a)earthlink.net> Date: Sun May 7 23:28:40 2006 -0400 winecfg: Fix audio crash when no drivers are available. --- programs/winecfg/audio.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 3ad7f24..fa1e5fa 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -519,8 +519,13 @@ static void findAudioDrivers(void) SetCursor(old_cursor); /* terminate list with empty driver */ - loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); - CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER)); + if (numFound) { + loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); + CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER)); + } else { + loadedAudioDrv = HeapAlloc(GetProcessHeap(), 0, sizeof(AUDIO_DRIVER)); + ZeroMemory(&loadedAudioDrv[0], sizeof(AUDIO_DRIVER)); + } } /* check local copy of registry string for unloadable drivers */

1 0

Robert Reif : wineoss: Missing mixer fixes.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: b4a5df1c1907503f886e7684ffa626676a3b2970 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4a5df1c1907503f886e768… Author: Robert Reif <reif(a)earthlink.net> Date: Sun May 7 20:45:44 2006 -0400 wineoss: Missing mixer fixes. Don't list volume in capabilities when mixer is missing. --- dlls/winmm/wineoss/audio.c | 57 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 596190b..82e671a 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -712,6 +712,7 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* { int rc,arg; int f,c,r; + BOOL has_mixer = FALSE; TRACE("(%p) %s\n", ossdev, ossdev->dev_name); if (OSS_OpenDevice(ossdev, O_WRONLY, NULL, 0,-1,-1,-1) != 0) @@ -731,6 +732,7 @@ #ifdef SOUND_MIXER_INFO ossdev->out_caps.szPname, sizeof(ossdev->out_caps.szPname) / sizeof(WCHAR)); TRACE("%s: %s\n", ossdev->mixer_name, ossdev->ds_desc.szDesc); + has_mixer = TRUE; } else { /* FreeBSD up to at least 5.2 provides this ioctl, but does not * implement it properly, and there are probably similar issues @@ -755,7 +757,7 @@ #endif /* SOUND_MIXER_INFO */ ossdev->out_caps.wChannels = 1; ossdev->out_caps.dwFormats = 0x00000000; ossdev->out_caps.wReserved1 = 0; - ossdev->out_caps.dwSupport = WAVECAPS_VOLUME; + ossdev->out_caps.dwSupport = has_mixer ? WAVECAPS_VOLUME : 0; /* direct sound caps */ ossdev->ds_caps.dwFlags = DSCAPS_CERTIFIED; @@ -795,7 +797,8 @@ #endif /* SOUND_MIXER_INFO */ ossdev->ds_caps.dwFlags |= DSCAPS_PRIMARYMONO; } else if (c == 2) { ossdev->out_caps.wChannels = 2; - ossdev->out_caps.dwSupport|=WAVECAPS_LRVOLUME; + if (has_mixer) + ossdev->out_caps.dwSupport|=WAVECAPS_LRVOLUME; ossdev->ds_caps.dwFlags |= DSCAPS_PRIMARYSTEREO; } else ossdev->out_caps.wChannels = c; @@ -974,6 +977,7 @@ static void OSS_WaveFullDuplexInit(OSS_D int rc,arg; int f,c,r; int caps; + BOOL has_mixer = FALSE; TRACE("(%p) %s\n", ossdev, ossdev->dev_name); /* The OSS documentation says we must call SNDCTL_SETDUPLEX @@ -990,6 +994,28 @@ static void OSS_WaveFullDuplexInit(OSS_D return; ioctl(ossdev->fd, SNDCTL_DSP_RESET, 0); + +#ifdef SOUND_MIXER_INFO + { + int mixer; + if ((mixer = open(ossdev->mixer_name, O_RDWR|O_NDELAY)) >= 0) { + mixer_info info; + if (ioctl(mixer, SOUND_MIXER_INFO, &info) >= 0) { + has_mixer = TRUE; + } else { + /* FreeBSD up to at least 5.2 provides this ioctl, but does not + * implement it properly, and there are probably similar issues + * on other platforms, so we warn but try to go ahead. + */ + WARN("%s: cannot read SOUND_MIXER_INFO!\n", ossdev->mixer_name); + } + close(mixer); + } else { + WARN("open(%s) failed (%s)\n", ossdev->mixer_name , strerror(errno)); + } + } +#endif /* SOUND_MIXER_INFO */ + TRACE("%s\n", ossdev->ds_desc.szDesc); if (ioctl(ossdev->fd, SNDCTL_DSP_GETCAPS, &caps) == 0) @@ -999,7 +1025,7 @@ static void OSS_WaveFullDuplexInit(OSS_D ossdev->duplex_out_caps.wChannels = 1; ossdev->duplex_out_caps.dwFormats = 0x00000000; - ossdev->duplex_out_caps.dwSupport = WAVECAPS_VOLUME; + ossdev->duplex_out_caps.dwSupport = has_mixer ? WAVECAPS_VOLUME : 0; if (WINE_TRACE_ON(wave)) OSS_Info(ossdev->fd); @@ -1026,7 +1052,8 @@ static void OSS_WaveFullDuplexInit(OSS_D ossdev->ds_caps.dwFlags |= DSCAPS_PRIMARYMONO; } else if (c == 2) { ossdev->duplex_out_caps.wChannels = 2; - ossdev->duplex_out_caps.dwSupport|=WAVECAPS_LRVOLUME; + if (has_mixer) + ossdev->duplex_out_caps.dwSupport|=WAVECAPS_LRVOLUME; ossdev->ds_caps.dwFlags |= DSCAPS_PRIMARYSTEREO; } else ossdev->duplex_out_caps.wChannels = c; @@ -2244,6 +2271,17 @@ static DWORD wodGetVolume(WORD wDevID, L WARN("invalid parameter\n"); return MMSYSERR_INVALPARAM; } + if (WOutDev[wDevID].ossdev->open_access == O_RDWR) { + if (!(WOutDev[wDevID].ossdev->duplex_out_caps.dwSupport & WAVECAPS_VOLUME)) { + TRACE("Volume not supported\n"); + return MMSYSERR_NOTSUPPORTED; + } + } else { + if (!(WOutDev[wDevID].ossdev->out_caps.dwSupport & WAVECAPS_VOLUME)) { + TRACE("Volume not supported\n"); + return MMSYSERR_NOTSUPPORTED; + } + } if ((mixer = open(WOutDev[wDevID].ossdev->mixer_name, O_RDONLY|O_NDELAY)) < 0) { WARN("mixer device not available !\n"); @@ -2289,6 +2327,17 @@ DWORD wodSetVolume(WORD wDevID, DWORD dw WARN("invalid parameter: wDevID > %d\n", numOutDev); return MMSYSERR_INVALPARAM; } + if (WOutDev[wDevID].ossdev->open_access == O_RDWR) { + if (!(WOutDev[wDevID].ossdev->duplex_out_caps.dwSupport & WAVECAPS_VOLUME)) { + TRACE("Volume not supported\n"); + return MMSYSERR_NOTSUPPORTED; + } + } else { + if (!(WOutDev[wDevID].ossdev->out_caps.dwSupport & WAVECAPS_VOLUME)) { + TRACE("Volume not supported\n"); + return MMSYSERR_NOTSUPPORTED; + } + } if ((mixer = open(WOutDev[wDevID].ossdev->mixer_name, O_WRONLY|O_NDELAY)) < 0) { WARN("open(%s) failed (%s)\n", WOutDev[wDevID].ossdev->mixer_name, strerror(errno)); return MMSYSERR_NOTENABLED;

1 0

Robert Reif : winmm: More wave callback tests.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 319633963defadc33fcd2e416d244a256b5c8480 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=319633963defadc33fcd2e4… Author: Robert Reif <reif(a)earthlink.net> Date: Sun May 7 17:06:04 2006 -0400 winmm: More wave callback tests. Add tests for CALLBACK_FUNCTION and CALLBACK_THREAD. The only callback type not tested now is CALLBACK_WINDOW. --- dlls/winmm/tests/Makefile.in | 2 dlls/winmm/tests/wave.c | 221 +++++++++++++++++++++++++++++++++++------- 2 files changed, 186 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=319633963defadc33fc…

1 0