August 2013 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Fix lookahead buffer usage on pipes.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 089cc7818299c0d8f6a2fa726d205db25aad895f URL: http://source.winehq.org/git/wine.git/?a=commit;h=089cc7818299c0d8f6a2fa726… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 21 13:52:26 2013 +0200 msvcrt: Fix lookahead buffer usage on pipes. --- dlls/msvcrt/file.c | 12 ++++++++++-- dlls/msvcrt/tests/file.c | 9 +++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0df95d9..871027d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2571,8 +2571,16 @@ static int read_i(int fd, void *buf, unsigned int count) if (fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { - fdinfo->lookahead[0] = lookahead[0]; - fdinfo->lookahead[1] = lookahead[1]; + if (lookahead[0]=='\n' && (!utf16 || !lookahead[1])) + { + bufstart[j++] = '\n'; + if (utf16) bufstart[j++] = 0; + } + else + { + fdinfo->lookahead[0] = lookahead[0]; + fdinfo->lookahead[1] = lookahead[1]; + } } else SetFilePointer(fdinfo->handle, -1-utf16, NULL, FILE_CURRENT); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fc92272..7a3253a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2032,8 +2032,8 @@ static void test_pipes(const char* selfname) ok(0, "pipe failed with errno %d\n", errno); return; } - r = write(pipes[1], "\r\n\rab", 5); - ok(r == 5, "write returned %d, errno = %d\n", r, errno); + r = write(pipes[1], "\r\n\rab\r\n", 7); + ok(r == 7, "write returned %d, errno = %d\n", r, errno); setmode(pipes[0], O_TEXT); r = read(pipes[0], buf, 1); ok(r == 1, "read returned %d, expected 1\n", r); @@ -2044,9 +2044,10 @@ static void test_pipes(const char* selfname) r = read(pipes[0], buf, 1); ok(r == 1, "read returned %d, expected 1\n", r); ok(buf[0] == 'a', "buf[0] = %x, expected 'a'\n", buf[0]); - r = read(pipes[0], buf, 1); - ok(r == 1, "read returned %d, expected 1\n", r); + r = read(pipes[0], buf, 2); + ok(r == 2, "read returned %d, expected 1\n", r); ok(buf[0] == 'b', "buf[0] = %x, expected 'b'\n", buf[0]); + ok(buf[1] == '\n', "buf[1] = %x, expected '\\n'\n", buf[1]); if (p_fopen_s) {

1 0

Stefan Dösinger : wined3d: Improve volume size calculation.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 9d75a517c2422706ed73577c0ebbee1764f1b10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d75a517c2422706ed73577c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 21 15:15:47 2013 +0200 wined3d: Improve volume size calculation. --- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/utils.c | 5 ++++- dlls/wined3d/volume.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c5dd301..c8fedd0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2293,7 +2293,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1); + UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1, 1); UINT row_count = (update_h + format->block_height - 1) / format->block_height; const BYTE *addr = data->addr; GLenum internal; @@ -3437,7 +3437,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); - UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height); + UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); @@ -7161,7 +7161,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN /* FIXME: Check that the format is supported by the device. */ - resource_size = wined3d_format_calculate_size(format, alignment, width, height); + resource_size = wined3d_format_calculate_size(format, alignment, width, height, 1); if (!resource_size) return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7cb14d7..9462a3c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1942,7 +1942,8 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl return &gl_info->formats[idx]; } -UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height) +UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, + UINT width, UINT height, UINT depth) { UINT size; @@ -1968,6 +1969,8 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali size /= format->height_scale.denominator; } + size *= depth; + return size; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index b4a8c64..50d9a75 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -265,6 +265,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); HRESULT hr; + UINT size; if (!gl_info->supported[EXT_TEXTURE3D]) { @@ -272,10 +273,11 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device return WINED3DERR_INVALIDCALL; } + size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, depth); + hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, format, WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, - width * height * depth * format->byte_count, parent, parent_ops, - &volume_resource_ops); + size, parent, parent_ops, &volume_resource_ops); if (FAILED(hr)) { WARN("Failed to initialize resource, returning %#x.\n", hr); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1772234..639c344 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2962,7 +2962,7 @@ struct wined3d_format const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, - UINT alignment, UINT width, UINT height) DECLSPEC_HIDDEN; + UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, const struct wined3d_color *color) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Add a function for allocating aligned resource memory.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 4dd4a6913b4750679588163951452d3521bc4b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd4a6913b475067958816395… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 21 15:15:48 2013 +0200 wined3d: Add a function for allocating aligned resource memory. --- dlls/wined3d/buffer.c | 10 ++-- dlls/wined3d/resource.c | 43 ++++++++++++++++---- dlls/wined3d/surface.c | 86 +++++++++++++++++++--------------------- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/wined3d_private.h | 19 +++++---- 5 files changed, 93 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dd4a6913b47506795881…

1 0

Stefan Dösinger : wined3d: Properly allocate heap memory for volumes.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 6e4e1ad392871f9f67fbd69dd9c71eb5d74763ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4e1ad392871f9f67fbd69dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 21 15:15:49 2013 +0200 wined3d: Properly allocate heap memory for volumes. --- dlls/wined3d/volume.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 50d9a75..cdc7125 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -184,7 +184,16 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, volume, map_desc, box, flags); if (!volume->resource.allocatedMemory) - volume->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, volume->resource.size); + { + volume->resource.heap_memory = wined3d_resource_allocate_sysmem(volume->resource.size); + if (!volume->resource.heap_memory) + { + WARN("Out of memory.\n"); + map_desc->data = NULL; + return E_OUTOFMEMORY; + } + volume->resource.allocatedMemory = volume->resource.heap_memory; + } TRACE("allocatedMemory %p.\n", volume->resource.allocatedMemory);

1 0

Stefan Dösinger : wined3d: Move volume booleans into a flags field.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 7e7ee524864c4d24c02148061d1160cba63eda18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7ee524864c4d24c02148061… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 21 15:15:50 2013 +0200 wined3d: Move volume booleans into a flags field. --- dlls/wined3d/volume.c | 10 +++------- dlls/wined3d/wined3d_private.h | 8 +++++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index cdc7125..4c6bd4d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -49,7 +49,6 @@ static void volume_bind_and_dirtify(const struct wined3d_volume *volume, struct void volume_add_dirty_box(struct wined3d_volume *volume, const struct wined3d_box *dirty_box) { - volume->dirty = TRUE; if (dirty_box) { volume->lockedBox.left = min(volume->lockedBox.left, dirty_box->left); @@ -233,7 +232,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, wined3d_texture_set_dirty(volume->container, TRUE); } - volume->locked = TRUE; + volume->flags |= WINED3D_VFLAG_LOCKED; TRACE("Returning memory %p, row pitch %d, slice pitch %d.\n", map_desc->data, map_desc->row_pitch, map_desc->slice_pitch); @@ -250,13 +249,13 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); - if (!volume->locked) + if (!(volume->flags & WINED3D_VFLAG_LOCKED)) { WARN("Trying to unlock unlocked volume %p.\n", volume); return WINED3DERR_INVALIDCALL; } - volume->locked = FALSE; + volume->flags &= ~WINED3D_VFLAG_LOCKED; memset(&volume->lockedBox, 0, sizeof(volume->lockedBox)); return WINED3D_OK; @@ -293,10 +292,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device return hr; } - volume->lockable = TRUE; - volume->locked = FALSE; memset(&volume->lockedBox, 0, sizeof(volume->lockedBox)); - volume->dirty = TRUE; volume_add_dirty_box(volume, NULL); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b96defb..7ed32ae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2050,15 +2050,17 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture, BOOL dirty) DECLSPEC_HIDDEN; +#define WINED3D_VFLAG_LOCKED 0x00000001 + struct wined3d_volume { struct wined3d_resource resource; struct wined3d_texture *container; - BOOL lockable; - BOOL locked; + struct wined3d_box lockedBox; struct wined3d_box dirtyBox; - BOOL dirty; + + DWORD flags; }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource)

1 0

Andrew Eikum : winmm: Increase mmdevapi buffer sizes.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: fdfff7cf6013a030f2b240b13b02831e502d49e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfff7cf6013a030f2b240b13… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 21 10:14:59 2013 -0500 winmm: Increase mmdevapi buffer sizes. The tiny buffer size caused audio capture glitches on OSX, where the OS often returns audio in half-second chunks. --- dlls/winmm/waveform.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 97849ff..23adfc0 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -68,8 +68,8 @@ static const WCHAR muteW[] = {'M','u','t','e',0}; * - We must be able to identify bad devices without crashing. */ -/* buffer size = 10 * 100000 (100 ns) = 0.1 seconds */ -#define AC_BUFLEN (10 * 100000) +/* buffer size = 100 * 100000 (100 ns) = 1 second */ +#define AC_BUFLEN (100 * 100000) #define MAX_DEVICES 256 #define MAPPER_INDEX 0x3F

1 0

Andrew Eikum : winecoreaudio.drv: Rewrite capture mode.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 927324ce8ffcf5acc9ba4c215f5d8ffad61dddcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=927324ce8ffcf5acc9ba4c215… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 21 10:16:05 2013 -0500 winecoreaudio.drv: Rewrite capture mode. --- dlls/winecoreaudio.drv/mmdevdrv.c | 202 +++++++++++++++++++------------------ 1 files changed, 104 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=927324ce8ffcf5acc9ba4…

1 0

Andrew Eikum : dsound: For capture, use MMDevAPI event API instead of timers.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: d5e648dc2f497a424d8cb289a7bbd7025c84d441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e648dc2f497a424d8cb289a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 21 10:16:08 2013 -0500 dsound: For capture, use MMDevAPI event API instead of timers. --- dlls/dsound/capture.c | 98 ++++++++++++++++++++++++++++++------------ dlls/dsound/dsound.c | 24 ---------- dlls/dsound/dsound_private.h | 1 - 3 files changed, 70 insertions(+), 53 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 63bda55..40f1702 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -59,6 +59,8 @@ typedef struct IDirectSoundCaptureBufferImpl /* IDirectSoundNotify fields */ DSBPOSITIONNOTIFY *notifies; int nrofnotifies; + HANDLE thread; + HANDLE sleepev; } IDirectSoundCaptureBufferImpl; /* DirectSoundCaptureDevice implementation structure */ @@ -72,7 +74,6 @@ struct DirectSoundCaptureDevice WAVEFORMATEX *pwfx; IDirectSoundCaptureBufferImpl *capture_buffer; DWORD state; - UINT timerID; CRITICAL_SECTION lock; IMMDevice *mmdevice; IAudioClient *client; @@ -80,12 +81,20 @@ struct DirectSoundCaptureDevice struct list entry; }; +static DWORD WINAPI DSOUND_capture_thread(void *user); static void capturebuffer_destroy(IDirectSoundCaptureBufferImpl *This) { if (This->device->state == STATE_CAPTURING) This->device->state = STATE_STOPPING; + if(This->thread){ + SetEvent(This->sleepev); + WaitForSingleObject(This->thread, INFINITE); + CloseHandle(This->thread); + } + CloseHandle(This->sleepev); + HeapFree(GetProcessHeap(),0, This->pdscbd); if (This->device->client) { @@ -739,8 +748,8 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( } err = IAudioClient_Initialize(device->client, - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, - 200 * 100000, 50000, device->pwfx, NULL); + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, + 200 * 100000, 0, device->pwfx, NULL); if(FAILED(err)){ WARN("Initialize failed: %08x\n", err); IAudioClient_Release(device->client); @@ -753,12 +762,27 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( return err; } + This->sleepev = CreateEventW(NULL, 0, 0, NULL); + + err = IAudioClient_SetEventHandle(device->client, This->sleepev); + if(FAILED(err)){ + WARN("SetEventHandle failed: %08x\n", err); + IAudioClient_Release(device->client); + device->client = NULL; + CloseHandle(This->sleepev); + HeapFree(GetProcessHeap(), 0, This->pdscbd); + This->device->capture_buffer = 0; + HeapFree( GetProcessHeap(), 0, This ); + return err; + } + err = IAudioClient_GetService(device->client, &IID_IAudioCaptureClient, (void**)&device->capture); if(FAILED(err)){ WARN("GetService failed: %08x\n", err); IAudioClient_Release(device->client); device->client = NULL; + CloseHandle(This->sleepev); HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); @@ -776,6 +800,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( device->client = NULL; IAudioCaptureClient_Release(device->capture); device->capture = NULL; + CloseHandle(This->sleepev); HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); @@ -783,6 +808,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( } device->buffer = newbuf; device->buflen = buflen; + This->thread = CreateThread(NULL, 0, DSOUND_capture_thread, This, 0, NULL); } IDirectSoundCaptureBuffer_AddRef(&This->IDirectSoundCaptureBuffer8_iface); @@ -830,9 +856,6 @@ static ULONG DirectSoundCaptureDevice_Release( if (!ref) { TRACE("deleting object\n"); - timeKillEvent(device->timerID); - timeEndPeriod(DS_TIME_RES); - EnterCriticalSection(&DSOUND_capturers_lock); list_remove(&device->entry); LeaveCriticalSection(&DSOUND_capturers_lock); @@ -851,29 +874,19 @@ static ULONG DirectSoundCaptureDevice_Release( return ref; } -static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user, - DWORD_PTR dw1, DWORD_PTR dw2) +static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) { - DirectSoundCaptureDevice *device = (DirectSoundCaptureDevice*)user; + HRESULT hr; UINT32 packet_frames, packet_bytes, avail_bytes, skip_bytes = 0; DWORD flags; BYTE *buf; - HRESULT hr; - - if(!device->ref) - return; - EnterCriticalSection(&device->lock); - - if(!device->capture_buffer || device->state == STATE_STOPPED){ - LeaveCriticalSection(&device->lock); - return; - } + if(!device->capture_buffer || device->state == STATE_STOPPED) + return S_FALSE; if(device->state == STATE_STOPPING){ device->state = STATE_STOPPED; - LeaveCriticalSection(&device->lock); - return; + return S_FALSE; } if(device->state == STATE_STARTING) @@ -882,9 +895,8 @@ static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, &flags, NULL, NULL); if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); WARN("GetBuffer failed: %08x\n", hr); - return; + return hr; } packet_bytes = packet_frames * device->pwfx->nBlockAlign; @@ -917,12 +929,44 @@ static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); WARN("ReleaseBuffer failed: %08x\n", hr); - return; + return hr; } - LeaveCriticalSection(&device->lock); + return S_OK; +} + +static DWORD WINAPI DSOUND_capture_thread(void *user) +{ + IDirectSoundCaptureBufferImpl *buffer = user; + HRESULT hr; + DWORD ret, wait_ms; + REFERENCE_TIME period; + + hr = IAudioClient_GetDevicePeriod(buffer->device->client, &period, NULL); + if(FAILED(hr)){ + WARN("GetDevicePeriod failed: %08x\n", hr); + wait_ms = 5; + }else + wait_ms = MulDiv(5, period, 10000); + + while(buffer->ref){ + ret = WaitForSingleObject(buffer->sleepev, wait_ms); + + if(!buffer->device->ref) + break; + + if(ret == WAIT_OBJECT_0){ + EnterCriticalSection(&buffer->device->lock); + + DSOUND_capture_data(buffer->device); + + LeaveCriticalSection(&buffer->device->lock); + }else if(ret != WAIT_TIMEOUT) + WARN("WaitForSingleObject failed: %u\n", GetLastError()); + } + + return 0; } static struct _TestFormat { @@ -1020,8 +1064,6 @@ static HRESULT DirectSoundCaptureDevice_Initialize( } IAudioClient_Release(client); - device->timerID = DSOUND_create_timer(DSOUND_capture_timer, (DWORD_PTR)device); - list_add_tail(&DSOUND_capturers, &device->entry); *ppDevice = device; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 381d0e1..986168b 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -735,30 +735,6 @@ BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, return hr == S_OK; } -UINT DSOUND_create_timer(LPTIMECALLBACK cb, DWORD_PTR user) -{ - UINT triggertime = DS_TIME_DEL, res = DS_TIME_RES, id; - TIMECAPS time; - - timeGetDevCaps(&time, sizeof(TIMECAPS)); - TRACE("Minimum timer resolution: %u, max timer: %u\n", time.wPeriodMin, time.wPeriodMax); - if (triggertime < time.wPeriodMin) - triggertime = time.wPeriodMin; - if (res < time.wPeriodMin) - res = time.wPeriodMin; - if (timeBeginPeriod(res) == TIMERR_NOCANDO) - WARN("Could not set minimum resolution, don't expect sound\n"); - id = timeSetEvent(triggertime, res, cb, user, TIME_PERIODIC | TIME_KILL_SYNCHRONOUS); - if (!id) - { - WARN("Timer not created! Retrying without TIME_KILL_SYNCHRONOUS\n"); - id = timeSetEvent(triggertime, res, cb, user, TIME_PERIODIC); - if (!id) - ERR("Could not create timer, sound playback will not occur\n"); - } - return id; -} - HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcGUID) { HRESULT hr = DS_OK; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 1a3900c..a8f5f42 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -261,6 +261,5 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) DECLSP BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels) DECLSPEC_HIDDEN; -UINT DSOUND_create_timer(LPTIMECALLBACK cb, DWORD_PTR user) DECLSPEC_HIDDEN; HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, LPDSENUMCALLBACKW cb, void *user) DECLSPEC_HIDDEN;

1 0

Jacek Caban : crypt32: Added a test showing that CertGetCertificateChain should use global store.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 8ef3a142263e6db11f1514f77b3de84c8b08d7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef3a142263e6db11f1514f77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 18:57:29 2013 +0200 crypt32: Added a test showing that CertGetCertificateChain should use global store. --- dlls/crypt32/tests/chain.c | 166 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ef3a142263e6db11f151…

1 0

Fabrice Bauzac : winmm: Fix WOD_Open() WID_Open() WAVE_MAPPER no-device case.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 21e0f739bed023a903866a145ee75bdc96e8bce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e0f739bed023a903866a145… Author: Fabrice Bauzac <libnoon(a)gmail.com> Date: Tue Aug 20 05:37:53 2013 +0200 winmm: Fix WOD_Open() WID_Open() WAVE_MAPPER no-device case. --- dlls/winmm/waveform.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 752e64d..97849ff 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1228,6 +1228,8 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) WINMM_MMDevice *mmdevice; if(WINMM_IsMapper(info->req_device)){ + if (g_outmmdevices_count == 0) + return MMSYSERR_BADDEVICEID; devices = g_out_mapper_devices; mmdevice = read_map(g_out_map, 0); lock = &g_devthread_lock; @@ -1317,6 +1319,8 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) HRESULT hr; if(WINMM_IsMapper(info->req_device)){ + if (g_inmmdevices_count == 0) + return MMSYSERR_BADDEVICEID; devices = g_in_mapper_devices; mmdevice = read_map(g_in_map, 0); lock = &g_devthread_lock;

1 0