July 2011 - Wine-commits - list.winehq.org

Huw Davies : winex11: Sync a dib-section before accessing the image bits.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 56d7e2add9f4cf365097c9e96675feaacff38a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d7e2add9f4cf365097c9e96… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 15 13:05:25 2011 +0100 winex11: Sync a dib-section before accessing the image bits. --- dlls/winex11.drv/bitblt.c | 2 ++ dlls/winex11.drv/dib.c | 6 ++---- dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 95600b0..880d71f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1988,9 +1988,11 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, GetObjectW( hbitmap, sizeof(bm), &bm ); width = min( width, bm.bmWidth - x ); height = min( height, bm.bmHeight - y ); + X11DRV_DIB_Lock( bitmap, DIB_Status_GdiMod ); wine_tsx11_lock(); image = XGetImage( gdi_display, bitmap->pixmap, x, y, width, height, AllPlanes, ZPixmap ); wine_tsx11_unlock(); + X11DRV_DIB_Unlock( bitmap, TRUE ); } else if (GetObjectType( dev->hdc ) == OBJ_MEMDC) { diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index b2e1c5f..a1176d9 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -101,8 +101,6 @@ enum Rle_EscapeCodes static INT X11DRV_DIB_Coerce(X_PHYSBITMAP *,INT); -static INT X11DRV_DIB_Lock(X_PHYSBITMAP *,INT); -static void X11DRV_DIB_Unlock(X_PHYSBITMAP *,BOOL); /* Some of the following helper functions are duplicated in @@ -4576,7 +4574,7 @@ static INT X11DRV_DIB_Coerce(X_PHYSBITMAP *physBitmap, INT req) /*********************************************************************** * X11DRV_DIB_Lock */ -static INT X11DRV_DIB_Lock(X_PHYSBITMAP *physBitmap, INT req) +INT X11DRV_DIB_Lock(X_PHYSBITMAP *physBitmap, INT req) { INT ret = DIB_Status_None; @@ -4592,7 +4590,7 @@ static INT X11DRV_DIB_Lock(X_PHYSBITMAP *physBitmap, INT req) /*********************************************************************** * X11DRV_DIB_Unlock */ -static void X11DRV_DIB_Unlock(X_PHYSBITMAP *physBitmap, BOOL commit) +void X11DRV_DIB_Unlock(X_PHYSBITMAP *physBitmap, BOOL commit) { if (!physBitmap->image) return; /* not a DIB section */ switch (physBitmap->status) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d1fbbf3..5c98d2e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -481,6 +481,8 @@ extern INT X11DRV_DIB_MaskToShift(DWORD mask) DECLSPEC_HIDDEN; extern INT X11DRV_CoerceDIBSection(X11DRV_PDEVICE *physDev,INT) DECLSPEC_HIDDEN; extern INT X11DRV_LockDIBSection(X11DRV_PDEVICE *physDev,INT) DECLSPEC_HIDDEN; extern void X11DRV_UnlockDIBSection(X11DRV_PDEVICE *physDev,BOOL) DECLSPEC_HIDDEN; +extern INT X11DRV_DIB_Lock(X_PHYSBITMAP *,INT) DECLSPEC_HIDDEN; +extern void X11DRV_DIB_Unlock(X_PHYSBITMAP *,BOOL) DECLSPEC_HIDDEN; extern void X11DRV_DIB_DeleteDIBSection(X_PHYSBITMAP *physBitmap, DIBSECTION *dib) DECLSPEC_HIDDEN; extern void X11DRV_DIB_CopyDIBSection(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst,

1 0

Andrew Eikum : winejack.drv: Remove unused WinMM driver.
by Alexandre Julliard 15 Jul '11

15 Jul '11

1 0

Alexandre Julliard : winex11: Set all the bitmap padding to 0 in GetImage.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 678400b88719b5254185c2b5fd46cbb0882e7f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678400b88719b5254185c2b5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 15 13:49:36 2011 +0200 winex11: Set all the bitmap padding to 0 in GetImage. --- dlls/winex11.drv/bitblt.c | 66 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 58 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index f252e42..95600b0 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -480,6 +480,24 @@ static const unsigned char bit_swap[256] = 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff }; +#ifdef WORDS_BIGENDIAN +static const unsigned int zeropad_masks[32] = +{ + 0xffffffff, 0x80000000, 0xc0000000, 0xe0000000, 0xf0000000, 0xf8000000, 0xfc000000, 0xfe000000, + 0xff000000, 0xff800000, 0xffc00000, 0xffe00000, 0xfff00000, 0xfff80000, 0xfffc0000, 0xfffe0000, + 0xffff0000, 0xffff8000, 0xffffc000, 0xffffe000, 0xfffff000, 0xfffff800, 0xfffffc00, 0xfffffe00, + 0xffffff00, 0xffffff80, 0xffffffc0, 0xffffffe0, 0xfffffff0, 0xfffffff8, 0xfffffffc, 0xfffffffe +}; +#else +static const unsigned int zeropad_masks[32] = +{ + 0xffffffff, 0x00000080, 0x000000c0, 0x000000e0, 0x000000f0, 0x000000f8, 0x000000fc, 0x000000fe, + 0x000000ff, 0x000080ff, 0x0000c0ff, 0x0000e0ff, 0x0000f0ff, 0x0000f8ff, 0x0000fcff, 0x0000feff, + 0x0000ffff, 0x0080ffff, 0x00c0ffff, 0x00e0ffff, 0x00f0ffff, 0x00f8ffff, 0x00fcffff, 0x00feffff, + 0x00ffffff, 0x80ffffff, 0xc0ffffff, 0xe0ffffff, 0xf0ffffff, 0xf8ffffff, 0xfcffffff, 0xfeffffff +}; +#endif + #ifdef BITBLT_TEST /* Opcodes test */ static int do_bitop( int s, int d, int rop ) @@ -1637,12 +1655,19 @@ static void set_color_info( const ColorShifts *color_shifts, BITMAPINFO *info ) } /* copy the image bits, fixing up alignment and byte swapping as necessary */ -static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, - const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits ) + DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, + const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, + unsigned int zeropad_mask ) { +#ifdef WORDS_BIGENDIAN + static const int client_byte_order = MSBFirst; +#else + static const int client_byte_order = LSBFirst; +#endif BOOL need_byteswap; int x, y, height = abs(info->bmiHeader.biHeight); int width_bytes = image->bytes_per_line; + int padding_pos; unsigned char *src, *dst; switch (info->bmiHeader.biBitCount) @@ -1655,7 +1680,7 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, break; case 16: case 32: - need_byteswap = (image->byte_order != LSBFirst); + need_byteswap = (image->byte_order != client_byte_order); break; case 24: need_byteswap = ((image->byte_order == LSBFirst && color_shifts->logicalBlue.shift == 16) || @@ -1666,7 +1691,10 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, break; } - if ((need_byteswap && !src_bits->is_copy) || (width_bytes & 3) || (info->bmiHeader.biHeight > 0)) + if ((need_byteswap && !src_bits->is_copy) || /* need to swap bytes */ + (zeropad_mask != ~0u && !src_bits->is_copy) || /* need to clear padding bytes */ + (width_bytes & 3) || /* need to fixup line alignment */ + (info->bmiHeader.biHeight > 0)) /* need to flip vertically */ { width_bytes = (width_bytes + 3) & ~3; info->bmiHeader.biSizeImage = height * width_bytes; @@ -1683,11 +1711,12 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, dst_bits->offset = src_bits->offset; dst_bits->is_copy = src_bits->is_copy; dst_bits->free = NULL; - if (!need_byteswap) return ERROR_SUCCESS; /* nothing to do */ + if (!need_byteswap && zeropad_mask == ~0u) return ERROR_SUCCESS; /* nothing to do */ } src = src_bits->ptr; dst = dst_bits->ptr; + padding_pos = width_bytes/sizeof(unsigned int) - 1; if (info->bmiHeader.biHeight > 0) { @@ -1701,21 +1730,31 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, { case 1: for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) + { for (x = 0; x < image->bytes_per_line; x++) dst[x] = bit_swap[src[x]]; + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 4: for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) + { for (x = 0; x < image->bytes_per_line; x++) dst[x] = (src[x] << 4) | (src[x] >> 4); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 16: for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) + { for (x = 0; x < info->bmiHeader.biWidth; x++) ((USHORT *)dst)[x] = RtlUshortByteSwap( ((const USHORT *)src)[x] ); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 24: for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) + { for (x = 0; x < info->bmiHeader.biWidth; x++) { unsigned char tmp = src[3 * x]; @@ -1723,6 +1762,8 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, dst[3 * x + 1] = src[3 * x + 1]; dst[3 * x + 2] = tmp; } + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 32: for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) @@ -1731,10 +1772,18 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, break; } } - else + else if (src != dst) { for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) + { memcpy( dst, src, image->bytes_per_line ); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } + } + else /* only need to clear the padding */ + { + for (y = 0; y < height; y++, dst += width_bytes) + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; } return ERROR_SUCCESS; } @@ -1813,7 +1862,7 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str wine_tsx11_unlock(); if (!image) return ERROR_OUTOFMEMORY; - ret = copy_image_bits( info, color_shifts, image, bits, &dst_bits ); + ret = copy_image_bits( info, color_shifts, image, bits, &dst_bits, ~0u ); if (!ret) { @@ -1984,7 +2033,8 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, src_bits.ptr = image->data; src_bits.is_copy = TRUE; - ret = copy_image_bits( info, color_shifts, image, &src_bits, bits ); + ret = copy_image_bits( info, color_shifts, image, &src_bits, bits, + zeropad_masks[(width * image->bits_per_pixel) & 31] ); if (!ret && bits->ptr == image->data) {

1 0

Andrew Eikum : wineesd.drv: Remove unused WinMM driver.
by Alexandre Julliard 15 Jul '11

15 Jul '11

1 0

Andrew Eikum : winenas.drv: Remove unused WinMM driver.
by Alexandre Julliard 15 Jul '11

15 Jul '11

1 0

Henri Verbeet : wined3d: Add stream offsets in device_stream_info_from_declaration().
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 7ee4bda63efbc635ec4456feeed4f45c888ca4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee4bda63efbc635ec4456fee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 15 01:14:50 2011 +0200 wined3d: Add stream offsets in device_stream_info_from_declaration(). They're not going to change until the next time the stream info is updated. This would of course mainly be useful if we managed to do more than one or two draws with the same stream info. --- dlls/wined3d/buffer.c | 3 +- dlls/wined3d/device.c | 7 ++++- dlls/wined3d/drawprim.c | 17 ++++++-------- dlls/wined3d/state.c | 53 ++++++++++++++++++---------------------------- 4 files changed, 34 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ee4bda63efbc635ec445…

1 0

Henri Verbeet : wined3d: Get rid of the useext macro.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: dd2f2c40f037b0578daa1bab1c4a96d56345255e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2f2c40f037b0578daa1bab1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 15 01:14:51 2011 +0200 wined3d: Get rid of the useext macro. This does nothing, since we have our own GL header. --- dlls/wined3d/state.c | 112 +++++++++++++++++++++++-------------------------- 1 files changed, 53 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd2f2c40f037b0578daa1…

1 0

Henri Verbeet : wined3d: Make the texture parameter to texture_srgb_mode() const.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 2e14d9ac0eefed485cf9c8f0ac96a8c1c456ba8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e14d9ac0eefed485cf9c8f0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 15 01:14:52 2011 +0200 wined3d: Make the texture parameter to texture_srgb_mode() const. --- dlls/wined3d/texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eb4fa75..31bb5b5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -647,7 +647,7 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, return hr; } -static BOOL texture_srgb_mode(struct wined3d_texture *texture, enum WINED3DSRGB srgb) +static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) { switch (srgb) {

1 0

Henri Verbeet : wined3d: Make the swapchain parameter to swapchain_blit() const.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 2b789778fdc3dade3b07c2f5d1e4752e8e4ae0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b789778fdc3dade3b07c2f5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 15 01:14:53 2011 +0200 wined3d: Make the swapchain parameter to swapchain_blit() const. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4752e39..5b065be 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -277,7 +277,7 @@ HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *s } /* A GL context is provided by the caller */ -static void swapchain_blit(struct wined3d_swapchain *swapchain, +static void swapchain_blit(const struct wined3d_swapchain *swapchain, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) { struct wined3d_surface *backbuffer = swapchain->back_buffers[0];

1 0

Andrew Eikum : winmm: Remove driver implementation of mixer*.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: ccd2a241399c011b2afb183c4ffffec20a68cab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd2a241399c011b2afb183c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:37 2011 -0500 winmm: Remove driver implementation of mixer*. --- dlls/winmm/waveform.c | 191 +++++-------------------------------------------- 1 files changed, 19 insertions(+), 172 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 48faf0f..6894464 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2999,66 +2999,9 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, return MMSYSERR_NOTSUPPORTED; } -/************************************************************************** - * find out the real mixer ID depending on hmix (depends on dwFlags) - */ -static UINT MIXER_GetDev(HMIXEROBJ hmix, DWORD dwFlags, LPWINE_MIXER * lplpwm) -{ - LPWINE_MIXER lpwm = NULL; - UINT uRet = MMSYSERR_NOERROR; - - switch (dwFlags & 0xF0000000ul) { - case MIXER_OBJECTF_MIXER: - lpwm = (LPWINE_MIXER)MMDRV_Get(hmix, MMDRV_MIXER, TRUE); - break; - case MIXER_OBJECTF_HMIXER: - lpwm = (LPWINE_MIXER)MMDRV_Get(hmix, MMDRV_MIXER, FALSE); - break; - case MIXER_OBJECTF_WAVEOUT: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_WAVEOUT, TRUE, MMDRV_MIXER); - break; - case MIXER_OBJECTF_HWAVEOUT: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_WAVEOUT, FALSE, MMDRV_MIXER); - break; - case MIXER_OBJECTF_WAVEIN: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_WAVEIN, TRUE, MMDRV_MIXER); - break; - case MIXER_OBJECTF_HWAVEIN: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_WAVEIN, FALSE, MMDRV_MIXER); - break; - case MIXER_OBJECTF_MIDIOUT: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_MIDIOUT, TRUE, MMDRV_MIXER); - break; - case MIXER_OBJECTF_HMIDIOUT: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_MIDIOUT, FALSE, MMDRV_MIXER); - break; - case MIXER_OBJECTF_MIDIIN: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_MIDIIN, TRUE, MMDRV_MIXER); - break; - case MIXER_OBJECTF_HMIDIIN: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_MIDIIN, FALSE, MMDRV_MIXER); - break; - case MIXER_OBJECTF_AUX: - lpwm = (LPWINE_MIXER)MMDRV_GetRelated(hmix, MMDRV_AUX, TRUE, MMDRV_MIXER); - break; - default: - WARN("Unsupported flag (%08lx)\n", dwFlags & 0xF0000000ul); - lpwm = 0; - uRet = MMSYSERR_INVALFLAG; - break; - } - *lplpwm = lpwm; - if (lpwm == 0 && uRet == MMSYSERR_NOERROR) - uRet = MMSYSERR_INVALPARAM; - return uRet; -} - -/************************************************************************** - * mixerGetNumDevs [WINMM.@] - */ UINT WINAPI mixerGetNumDevs(void) { - return MMDRV_GetNum(MMDRV_MIXER); + return 0; } /************************************************************************** @@ -3092,24 +3035,10 @@ UINT WINAPI mixerGetDevCapsA(UINT_PTR uDeviceID, LPMIXERCAPSA lpCaps, UINT uSize */ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize) { - LPWINE_MLD wmld; - - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIXER, TRUE)) == NULL) - return MMSYSERR_BADDEVICEID; - - return MMDRV_Message(wmld, MXDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize); -} - -static void CALLBACK MIXER_WCallback(HMIXEROBJ hmx, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam, DWORD_PTR param2) -{ - HWND hWnd = (HWND)dwInstance; - - if (!dwInstance) - return; + if(!lpCaps) + return MMSYSERR_INVALPARAM; - PostMessageW(hWnd, uMsg, (WPARAM)hmx, (LPARAM)dwParam); + return MMSYSERR_BADDEVICEID; } /************************************************************************** @@ -3118,10 +3047,7 @@ static void CALLBACK MIXER_WCallback(HMIXEROBJ hmx, UINT uMsg, DWORD_PTR dwInsta UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen) { - HANDLE hMix; - LPWINE_MLD wmld; - DWORD dwRet; - MIXEROPENDESC mod; + DWORD dwRet; TRACE("(%p, %d, %08lx, %08lx, %08x)\n", lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen); @@ -3130,33 +3056,7 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, if (dwRet != MMSYSERR_NOERROR) return dwRet; - mod.dwCallback = (DWORD_PTR)MIXER_WCallback; - if ((fdwOpen & CALLBACK_TYPEMASK) == CALLBACK_WINDOW) - mod.dwInstance = dwCallback; - else - mod.dwInstance = 0; - - /* We're remapping to CALLBACK_FUNCTION because that's what old winmm is - * documented to do when opening the mixer driver. - * FIXME: Native supports CALLBACK_EVENT + CALLBACK_THREAD flags since w2k. - * FIXME: The non ALSA drivers ignore callback requests - bug. - */ - - wmld = MMDRV_Alloc(sizeof(WINE_MIXER), MMDRV_MIXER, &hMix, &fdwOpen, - &dwCallback, &dwInstance); - wmld->uDeviceID = uDeviceID; - mod.hmx = hMix; - - dwRet = MMDRV_Open(wmld, MXDM_OPEN, (DWORD_PTR)&mod, CALLBACK_FUNCTION); - - if (dwRet != MMSYSERR_NOERROR) { - MMDRV_Free(hMix, wmld); - hMix = 0; - } - if (lphMix) *lphMix = hMix; - TRACE("=> %d hMixer=%p\n", dwRet, hMix); - - return dwRet; + return MMSYSERR_BADDEVICEID; } /************************************************************************** @@ -3164,17 +3064,8 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, */ UINT WINAPI mixerClose(HMIXER hMix) { - LPWINE_MLD wmld; - DWORD dwRet; - TRACE("(%p)\n", hMix); - - if ((wmld = MMDRV_Get(hMix, MMDRV_MIXER, FALSE)) == NULL) return MMSYSERR_INVALHANDLE; - - dwRet = MMDRV_Close(wmld, MXDM_CLOSE); - MMDRV_Free(hMix, wmld); - - return dwRet; + return MMSYSERR_INVALHANDLE; } /************************************************************************** @@ -3182,18 +3073,8 @@ UINT WINAPI mixerClose(HMIXER hMix) */ UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) { - LPWINE_MIXER lpwm; - UINT uRet = MMSYSERR_NOERROR; - - TRACE("(%p %p %08x)\n", hmix, lpid, fdwID); - - if ((uRet = MIXER_GetDev(hmix, fdwID, &lpwm)) != MMSYSERR_NOERROR) - return uRet; - - if (lpid) - *lpid = lpwm->mld.uDeviceID; - - return uRet; + TRACE("(%p, %p, %08x)\n", hmix, lpid, fdwID); + return MMSYSERR_INVALHANDLE; } /************************************************************************** @@ -3202,19 +3083,12 @@ UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW, DWORD fdwDetails) { - LPWINE_MIXER lpwm; - UINT uRet = MMSYSERR_NOERROR; - TRACE("(%p, %p, %08x)\n", hmix, lpmcdW, fdwDetails); - if ((uRet = MIXER_GetDev(hmix, fdwDetails, &lpwm)) != MMSYSERR_NOERROR) - return uRet; - - if (lpmcdW == NULL || lpmcdW->cbStruct != sizeof(*lpmcdW)) - return MMSYSERR_INVALPARAM; + if(!lpmcdW || lpmcdW->cbStruct != sizeof(*lpmcdW)) + return MMSYSERR_INVALPARAM; - return MMDRV_Message(&lpwm->mld, MXDM_GETCONTROLDETAILS, (DWORD_PTR)lpmcdW, - fdwDetails); + return MMSYSERR_INVALHANDLE; } /************************************************************************** @@ -3350,19 +3224,12 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, DWORD fdwControls) { - LPWINE_MIXER lpwm; - UINT uRet = MMSYSERR_NOERROR; - TRACE("(%p, %p, %08x)\n", hmix, lpmlcW, fdwControls); - if ((uRet = MIXER_GetDev(hmix, fdwControls, &lpwm)) != MMSYSERR_NOERROR) - return uRet; - - if (lpmlcW == NULL || lpmlcW->cbStruct != sizeof(*lpmlcW)) - return MMSYSERR_INVALPARAM; + if(!lpmlcW || lpmlcW->cbStruct != sizeof(*lpmlcW)) + return MMSYSERR_INVALPARAM; - return MMDRV_Message(&lpwm->mld, MXDM_GETLINECONTROLS, (DWORD_PTR)lpmlcW, - fdwControls); + return MMSYSERR_INVALHANDLE; } /************************************************************************** @@ -3370,16 +3237,9 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, */ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo) { - LPWINE_MIXER lpwm; - UINT uRet = MMSYSERR_NOERROR; - TRACE("(%p, %p, %08x)\n", hmix, lpmliW, fdwInfo); - if ((uRet = MIXER_GetDev(hmix, fdwInfo, &lpwm)) != MMSYSERR_NOERROR) - return uRet; - - return MMDRV_Message(&lpwm->mld, MXDM_GETLINEINFO, (DWORD_PTR)lpmliW, - fdwInfo); + return MMSYSERR_INVALHANDLE; } /************************************************************************** @@ -3457,16 +3317,9 @@ UINT WINAPI mixerGetLineInfoA(HMIXEROBJ hmix, LPMIXERLINEA lpmliA, UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails) { - LPWINE_MIXER lpwm; - UINT uRet = MMSYSERR_NOERROR; - TRACE("(%p, %p, %08x)\n", hmix, lpmcd, fdwDetails); - if ((uRet = MIXER_GetDev(hmix, fdwDetails, &lpwm)) != MMSYSERR_NOERROR) - return uRet; - - return MMDRV_Message(&lpwm->mld, MXDM_SETCONTROLDETAILS, (DWORD_PTR)lpmcd, - fdwDetails); + return MMSYSERR_INVALHANDLE; } /************************************************************************** @@ -3474,13 +3327,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, */ DWORD WINAPI mixerMessage(HMIXER hmix, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - LPWINE_MLD wmld; - - TRACE("(%p, %d, %08lx, %08lx): semi-stub?\n", - hmix, uMsg, dwParam1, dwParam2); - - if ((wmld = MMDRV_Get(hmix, MMDRV_MIXER, FALSE)) == NULL) - return MMSYSERR_INVALHANDLE; + TRACE("(%p, %d, %08lx, %08lx)\n", hmix, uMsg, dwParam1, dwParam2); - return MMDRV_Message(wmld, uMsg, dwParam1, dwParam2); + return MMSYSERR_INVALHANDLE; }

1 0