December 2011 - Wine-commits

Nikolay Sivov : comctl32: Fix parameter validation for CreateMRUListLazyA() .
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 73354ef9d2480e5fd47967c2e0e74cfb75484ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73354ef9d2480e5fd47967c2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 19 23:48:43 2011 +0300 comctl32: Fix parameter validation for CreateMRUListLazyA(). --- dlls/comctl32/comctl32undoc.c | 3 +- dlls/comctl32/tests/mru.c | 67 +++++++++++++++++++++++++--------------- 2 files changed, 43 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index cc59747..5892d76 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -777,8 +777,7 @@ HANDLE WINAPI CreateMRUListLazyA (const MRUINFOA *lpcml, DWORD dwParam2, /* Native does not check for a NULL lpcml */ - if (lpcml->cbSize != sizeof(MRUINFOA) || !lpcml->hKey || - IsBadStringPtrA(lpcml->lpszSubKey, -1)) + if (!lpcml->hKey || IsBadStringPtrA(lpcml->lpszSubKey, -1)) return 0; mp = Alloc(sizeof(WINEMRULIST)); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 7d239d7..86eddc0 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -447,12 +447,37 @@ static void test_MRUListA(void) /* FreeMRUList(NULL) crashes on Win98 OSR0 */ } +/* +typedef struct tagMRUINFOA +{ + DWORD cbSize; + UINT uMax; + UINT fFlags; + HKEY hKey; + LPCSTR lpszSubKey; + PROC lpfnCompare; +} MRUINFOA; +*/ +typedef struct { + MRUINFOA mruA; + BOOL ret; +} create_lazya_t; + +static const create_lazya_t create_lazyA[] = { + {{ sizeof(MRUINFOA) + 1, 0, 0, HKEY_CURRENT_USER, NULL, NULL }, FALSE }, + {{ sizeof(MRUINFOA) - 1, 0, 0, HKEY_CURRENT_USER, NULL, NULL }, FALSE }, + {{ sizeof(MRUINFOA) + 1, 0, 0, HKEY_CURRENT_USER, "WineTest", NULL }, TRUE }, + {{ sizeof(MRUINFOA) - 1, 0, 0, HKEY_CURRENT_USER, "WineTest", NULL }, TRUE }, + {{ sizeof(MRUINFOA), 0, 0, HKEY_CURRENT_USER, "WineTest", NULL }, TRUE }, + {{ sizeof(MRUINFOA), 0, 0, HKEY_CURRENT_USER, NULL, NULL }, FALSE }, + {{ sizeof(MRUINFOA), 0, 0, NULL, "WineTest", NULL }, FALSE }, + {{ 0, 0, 0, NULL, "WineTest", NULL }, FALSE }, + {{ 0, 0, 0, HKEY_CURRENT_USER, "WineTest", NULL }, TRUE } +}; static void test_CreateMRUListLazyA(void) { - HANDLE hMRU; - HKEY hKey; - MRUINFOA listA = { 0 }; + int i; if (!pCreateMRUListLazyA || !pFreeMRUList) { @@ -460,28 +485,20 @@ static void test_CreateMRUListLazyA(void) return; } - /* wrong size */ - listA.cbSize = sizeof(listA) + 1; - hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); - ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); - listA.cbSize = 4; - hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); - ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); - /* NULL hKey */ - listA.cbSize = sizeof(listA); - listA.hKey = NULL; - hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); - ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); - /* NULL subkey */ - ok(!RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEYA, &hKey), - "Couldn't create test key \"%s\"\n", REG_TEST_KEYA); - listA.cbSize = sizeof(listA); - listA.hKey = hKey; - listA.lpszSubKey = NULL; - hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); - ok(hMRU == NULL || broken(hMRU != NULL), /* Win9x */ - "Expected NULL handle, got %p\n", hMRU); - if (hMRU) pFreeMRUList(hMRU); + for (i = 0; i < sizeof(create_lazyA)/sizeof(create_lazya_t); i++) + { + const create_lazya_t *ptr = &create_lazyA[i]; + HANDLE hMRU; + + hMRU = pCreateMRUListLazyA((MRUINFOA*)&ptr->mruA, 0, 0, 0); + if (ptr->ret) + { + ok(hMRU != NULL, "%d: got %p\n", i, hMRU); + pFreeMRUList(hMRU); + } + else + ok(hMRU == NULL, "%d: got %p\n", i, hMRU); + } } static void test_EnumMRUList(void)

1 0

Henri Verbeet : ddraw/tests: Remove some error checking from ProcessVerticesTest().
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: cb8f26be02a9d6f7aed5e73a1d6b102747479a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8f26be02a9d6f7aed5e73a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 21:00:05 2011 +0100 ddraw/tests: Remove some error checking from ProcessVerticesTest(). --- dlls/ddraw/tests/d3d.c | 167 ++++++++++++++++++------------------------------ 1 files changed, 63 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb8f26be02a9d6f7aed5e…

1 0

Henri Verbeet : ddraw/tests: Add a ProcessVertices() test for Direct3D3.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 7cdfa40156dee8bf8e3268f5b86b4fe0c15008c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdfa40156dee8bf8e3268f5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 21:00:06 2011 +0100 ddraw/tests: Add a ProcessVertices() test for Direct3D3. --- dlls/ddraw/tests/Makefile.in | 1 + dlls/ddraw/tests/ddraw4.c | 327 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 328 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cdfa40156dee8bf8e326…

1 0

Henri Verbeet : ddraw/tests: Move the Direct3D7 ProcessVertices() test to ddraw7.c.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 5c3ba123decb38a5980cfd10d8ec1f722462ec96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3ba123decb38a5980cfd10d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 21:00:07 2011 +0100 ddraw/tests: Move the Direct3D7 ProcessVertices() test to ddraw7.c. --- dlls/ddraw/tests/Makefile.in | 1 + dlls/ddraw/tests/d3d.c | 224 ---------------------------- dlls/ddraw/tests/ddraw7.c | 329 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+), 224 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c3ba123decb38a5980cf…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DDEGREETYPE typedef.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 5bddd4427d37256355ba0e74b5321f3de391aec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bddd4427d37256355ba0e74b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 21:00:08 2011 +0100 wined3d: Get rid of the WINED3DDEGREETYPE typedef. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/utils.c | 14 ++++++++------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 17 ++++++++--------- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3b18c63..716119e 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -837,7 +837,7 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch } if (info->basis != WINED3DBASIS_BEZIER) FIXME("Basis is %s, how to handle this?\n", debug_d3dbasis(info->basis)); - if (info->degree != WINED3DDEGREE_CUBIC) + if (info->degree != WINED3D_DEGREE_CUBIC) FIXME("Degree is %s, how to handle this?\n", debug_d3ddegree(info->degree)); /* First, get the boundary cube of the input data */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 390519f..7820048 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1798,14 +1798,14 @@ static void state_patchsegments(struct wined3d_context *context, const struct wi static void state_positiondegree(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (state->render_states[WINED3DRS_POSITIONDEGREE] != WINED3DDEGREE_CUBIC) + if (state->render_states[WINED3DRS_POSITIONDEGREE] != WINED3D_DEGREE_CUBIC) FIXME("WINED3DRS_POSITIONDEGREE %#x not yet implemented.\n", state->render_states[WINED3DRS_POSITIONDEGREE]); } static void state_normaldegree(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (state->render_states[WINED3DRS_NORMALDEGREE] != WINED3DDEGREE_LINEAR) + if (state->render_states[WINED3DRS_NORMALDEGREE] != WINED3D_DEGREE_LINEAR) FIXME("WINED3DRS_NORMALDEGREE %#x not yet implemented.\n", state->render_states[WINED3DRS_NORMALDEGREE]); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e4acd54..e29bbdc 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1208,8 +1208,8 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) tmpfloat.f = 0.0f; state->render_states[WINED3DRS_TWEENFACTOR] = tmpfloat.d; state->render_states[WINED3DRS_BLENDOP] = WINED3D_BLEND_OP_ADD; - state->render_states[WINED3DRS_POSITIONDEGREE] = WINED3DDEGREE_CUBIC; - state->render_states[WINED3DRS_NORMALDEGREE] = WINED3DDEGREE_LINEAR; + state->render_states[WINED3DRS_POSITIONDEGREE] = WINED3D_DEGREE_CUBIC; + state->render_states[WINED3DRS_NORMALDEGREE] = WINED3D_DEGREE_LINEAR; /* states new in d3d9 */ state->render_states[WINED3DRS_SCISSORTESTENABLE] = FALSE; state->render_states[WINED3DRS_SLOPESCALEDEPTHBIAS] = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e16aa70..b4f4ff8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2402,12 +2402,14 @@ const char *debug_d3dbasis(WINED3DBASISTYPE basis) { } } -const char *debug_d3ddegree(WINED3DDEGREETYPE degree) { - switch(degree) { - case WINED3DDEGREE_LINEAR: return "WINED3DDEGREE_LINEAR"; - case WINED3DDEGREE_QUADRATIC: return "WINED3DDEGREE_QUADRATIC"; - case WINED3DDEGREE_CUBIC: return "WINED3DDEGREE_CUBIC"; - case WINED3DDEGREE_QUINTIC: return "WINED3DDEGREE_QUINTIC"; +const char *debug_d3ddegree(enum wined3d_degree_type degree) +{ + switch (degree) + { + case WINED3D_DEGREE_LINEAR: return "WINED3D_DEGREE_LINEAR"; + case WINED3D_DEGREE_QUADRATIC: return "WINED3D_DEGREE_QUADRATIC"; + case WINED3D_DEGREE_CUBIC: return "WINED3D_DEGREE_CUBIC"; + case WINED3D_DEGREE_QUINTIC: return "WINED3D_DEGREE_QUINTIC"; default: return "unrecognized"; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d83eeb..c8c7070 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2485,7 +2485,7 @@ const char *debug_d3dpool(WINED3DPOOL pool) DECLSPEC_HIDDEN; const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; const char *debug_d3dbasis(WINED3DBASISTYPE basis) DECLSPEC_HIDDEN; -const char *debug_d3ddegree(WINED3DDEGREETYPE order) DECLSPEC_HIDDEN; +const char *debug_d3ddegree(enum wined3d_degree_type order) DECLSPEC_HIDDEN; const char *debug_d3dtop(WINED3DTEXTUREOP d3dtop) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a3e9971..ecb63a0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -97,14 +97,13 @@ enum wined3d_device_type WINED3D_DEVICE_TYPE_NULLREF = 4, }; -typedef enum _WINED3DDEGREETYPE +enum wined3d_degree_type { - WINED3DDEGREE_LINEAR = 1, - WINED3DDEGREE_QUADRATIC = 2, - WINED3DDEGREE_CUBIC = 3, - WINED3DDEGREE_QUINTIC = 5, - WINED3DDEGREE_FORCE_DWORD = 0x7fffffff -} WINED3DDEGREETYPE; + WINED3D_DEGREE_LINEAR = 1, + WINED3D_DEGREE_QUADRATIC = 2, + WINED3D_DEGREE_CUBIC = 3, + WINED3D_DEGREE_QUINTIC = 5, +}; #define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ @@ -1603,7 +1602,7 @@ struct wined3d_rect_patch_info UINT height; UINT stride; WINED3DBASISTYPE basis; - WINED3DDEGREETYPE degree; + enum wined3d_degree_type degree; }; struct wined3d_tri_patch_info @@ -1611,7 +1610,7 @@ struct wined3d_tri_patch_info UINT start_vertex_offset; UINT vertex_count; WINED3DBASISTYPE basis; - WINED3DDEGREETYPE degree; + enum wined3d_degree_type degree; }; struct wined3d_adapter_identifier

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DRENDERSTATETYPE typedef.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 3082c1a9de14e9c21c4f93331b6d595bbca00e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3082c1a9de14e9c21c4f93331… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 19 21:00:09 2011 +0100 wined3d: Get rid of the WINED3DRENDERSTATETYPE typedef. --- dlls/d3d8/device.c | 8 +- dlls/ddraw/device.c | 6 +- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/vertexbuffer.c | 6 +- dlls/wined3d/arb_program_shader.c | 53 ++-- dlls/wined3d/ati_fragment_shader.c | 22 +- dlls/wined3d/context.c | 40 +- dlls/wined3d/device.c | 34 +- dlls/wined3d/drawprim.c | 24 +- dlls/wined3d/nvidia_texture_shader.c | 21 +- dlls/wined3d/shader.c | 14 +- dlls/wined3d/state.c | 754 +++++++++++++++++----------------- dlls/wined3d/stateblock.c | 430 ++++++++++---------- dlls/wined3d/surface.c | 18 +- dlls/wined3d/swapchain.c | 10 +- dlls/wined3d/utils.c | 276 +++++++------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 265 ++++++------ 18 files changed, 993 insertions(+), 992 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3082c1a9de14e9c21c4f9…

1 0

Andrew Eikum : winealsa.drv: Limit the data written to ALSA's buffer.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 54b24f39260a3780bdf97d810a69647d7357cb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b24f39260a3780bdf97d810… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 19 15:24:13 2011 -0600 winealsa.drv: Limit the data written to ALSA's buffer. Based on an algorithm by Alexey Loukianov. --- dlls/winealsa.drv/mmdevdrv.c | 64 +++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 34 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 994628e..dcf7d32 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -94,7 +94,7 @@ struct ACImpl { LONG ref; snd_pcm_t *pcm_handle; - snd_pcm_uframes_t alsa_bufsize_frames; + snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames; snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ snd_pcm_format_t alsa_format; @@ -110,7 +110,7 @@ struct ACImpl { BOOL initted, started; REFERENCE_TIME mmdev_period_rt; UINT64 written_frames, last_pos_frames; - UINT32 bufsize_frames, held_frames, tmp_buffer_frames; + UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ HANDLE timer; @@ -808,9 +808,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, ACImpl *This = impl_from_IAudioClient(iface); snd_pcm_sw_params_t *sw_params = NULL; snd_pcm_format_t format; - snd_pcm_uframes_t alsa_period_frames; const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; - unsigned int rate, mmdev_period_frames, alsa_period_us; + unsigned int rate, alsa_period_us; int err, i; HRESULT hr = S_OK; @@ -955,19 +954,13 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } - if((err = snd_pcm_hw_params_current(This->pcm_handle, This->hw_params)) < 0){ - WARN("Unable to get current hw params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; - goto exit; - } - if((err = snd_pcm_hw_params_get_period_size(This->hw_params, - &alsa_period_frames, NULL)) < 0){ + &This->alsa_period_frames, NULL)) < 0){ WARN("Unable to get period size: %d (%s)\n", err, snd_strerror(err)); hr = E_FAIL; goto exit; } - TRACE("alsa_period_frames: %lu\n", alsa_period_frames); + TRACE("alsa_period_frames: %lu\n", This->alsa_period_frames); if((err = snd_pcm_hw_params_get_buffer_size(This->hw_params, &This->alsa_bufsize_frames)) < 0){ @@ -1020,10 +1013,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, /* Check if the ALSA buffer is so small that it will run out before * the next MMDevAPI period tick occurs. Allow a little wiggle room * with 120% of the period time. */ - mmdev_period_frames = fmt->nSamplesPerSec * (This->mmdev_period_rt / 10000000.); - if(This->alsa_bufsize_frames < 1.2 * mmdev_period_frames) + This->mmdev_period_frames = (fmt->nSamplesPerSec * This->mmdev_period_rt) / 10000000.; + if(This->alsa_bufsize_frames < 1.2 * This->mmdev_period_frames) FIXME("ALSA buffer time is smaller than our period time. Expect underruns. (%lu < %u)\n", - This->alsa_bufsize_frames, mmdev_period_frames); + This->alsa_bufsize_frames, This->mmdev_period_frames); This->bufsize_frames = ceil((duration / 10000000.) * fmt->nSamplesPerSec); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -1151,23 +1144,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, return AUDCLNT_E_NOT_INITIALIZED; } - if(This->dataflow == eRender){ - snd_pcm_sframes_t avail_frames; + *out = This->held_frames; - avail_frames = snd_pcm_avail_update(This->pcm_handle); - if(This->alsa_bufsize_frames < avail_frames || - snd_pcm_state(This->pcm_handle) == SND_PCM_STATE_XRUN) - *out = This->held_frames; - else - *out = This->alsa_bufsize_frames - avail_frames + This->held_frames; - TRACE("PCM state: %u, avail: %ld, pad: %u\n", - snd_pcm_state(This->pcm_handle), avail_frames, *out); - }else if(This->dataflow == eCapture){ - *out = This->held_frames; - }else{ - LeaveCriticalSection(&This->lock); - return E_UNEXPECTED; - } + /* call required to get accurate snd_pcm_state() */ + snd_pcm_avail_update(This->pcm_handle); + TRACE("pad: %u, state: %u\n", *out, snd_pcm_state(This->pcm_handle)); LeaveCriticalSection(&This->lock); @@ -1554,7 +1535,7 @@ static snd_pcm_sframes_t alsa_write_best_effort(snd_pcm_t *handle, BYTE *buf, static void alsa_write_data(ACImpl *This) { snd_pcm_sframes_t written; - snd_pcm_uframes_t to_write, avail; + snd_pcm_uframes_t to_write, avail, write_limit, max_period, in_alsa; int err; BYTE *buf = This->local_buffer + (This->lcl_offs_frames * This->fmt->nBlockAlign); @@ -1566,6 +1547,8 @@ static void alsa_write_data(ACImpl *This) avail > This->alsa_bufsize_frames){ TRACE("XRun state, recovering\n"); + avail = This->alsa_bufsize_frames; + if((err = snd_pcm_recover(This->pcm_handle, -EPIPE, 1)) < 0) WARN("snd_pcm_recover failed: %d (%s)\n", err, snd_strerror(err)); @@ -1584,6 +1567,19 @@ static void alsa_write_data(ACImpl *This) else to_write = This->held_frames; + max_period = max(This->mmdev_period_frames, This->alsa_period_frames); + + /* try to keep 3 ALSA periods or 3 MMDevAPI periods in the ALSA buffer and + * no more */ + write_limit = 0; + in_alsa = This->alsa_bufsize_frames - avail; + while(in_alsa + write_limit < max_period * 3) + write_limit += max_period; + if(write_limit == 0) + return; + + to_write = min(to_write, write_limit); + written = alsa_write_best_effort(This->pcm_handle, buf, to_write, This); if(written < 0){ WARN("Couldn't write: %ld (%s)\n", written, snd_strerror(written)); @@ -1599,10 +1595,10 @@ static void alsa_write_data(ACImpl *This) return; } - if(This->held_frames){ + if(This->held_frames && (written < write_limit)){ /* wrapped and have some data back at the start to write */ written = alsa_write_best_effort(This->pcm_handle, This->local_buffer, - This->held_frames, This); + min(This->held_frames, write_limit - written), This); if(written < 0){ WARN("Couldn't write: %ld (%s)\n", written, snd_strerror(written)); return;

1 0

Alistair Leslie-Hughes : jscript: Don' t double free IObjectWithSite interface.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 1a9d9e0f76007867a5df1eedea7dc6b8dcdf1353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a9d9e0f76007867a5df1eede… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 20 14:49:57 2011 +1100 jscript: Don't double free IObjectWithSite interface. --- dlls/jscript/activex.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index c1f556b..41e2065 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -130,7 +130,6 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) } IObjectWithSite_Release(obj_site); if(!ax_site || FAILED(hres)) { - IObjectWithSite_Release(obj_site); IUnknown_Release(obj); return NULL; }

1 0

Ken Thomases : comdlg32: Fix a leak.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: c2f3c1114f9e597ba6c5385a0449d1d9778add3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f3c1114f9e597ba6c5385a0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 19 21:59:39 2011 -0600 comdlg32: Fix a leak. --- dlls/comdlg32/filedlg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 9b725ba..43df312 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1529,8 +1529,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) lstrcpyW(fodInfos->filename,nameBit); *nameBit = 0x00; - if (fodInfos->initdir == NULL) - MemFree(fodInfos->initdir); + MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf); handledPath = TRUE;

1 0

Ken Thomases : winex11: Have ToUnicodeEx null-terminate the output buffer, if there's room.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 3fa4da76ea2b3f2e91a42c0345e5764202a1e992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa4da76ea2b3f2e91a42c034… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 19 21:59:56 2011 -0600 winex11: Have ToUnicodeEx null-terminate the output buffer, if there's room. --- dlls/winex11.drv/keyboard.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index e985694..c561102 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2680,6 +2680,12 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState found: if (buf != lpChar) HeapFree(GetProcessHeap(), 0, lpChar); + + /* Null-terminate the buffer, if there's room. MSDN clearly states that the + caller must not assume this is done, but some programs (e.g. Audiosurf) do. */ + if (1 <= ret && ret < bufW_size) + bufW[ret] = 0; + TRACE_(key)("returning %d with %s\n", ret, debugstr_wn(bufW, ret)); return ret; }

1 0