March 2017 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Handle structured thread group shared memory declarations.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 7590a94dab25d1aeddbb053f46918efaf0ec4b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7590a94dab25d1aeddbb053f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:38 2017 +0100 wined3d: Handle structured thread group shared memory declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a034ba2..3f73201 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9462,7 +9462,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ shader_glsl_nop, - /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_STRUCTURED */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1b245d4..f79a922 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1065,6 +1065,33 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->tgsm_count = reg_idx + 1; tgsm = &reg_maps->tgsm[reg_idx]; tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; + tgsm->stride = 0; + } + else + { + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) + { + unsigned int reg_idx = ins.declaration.tgsm_structured.reg.reg.idx[0].offset; + if (reg_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", reg_idx); + break; + } + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) + { + struct wined3d_shader_tgsm *tgsm; + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + reg_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + reg_maps->tgsm_count = reg_idx + 1; + tgsm = &reg_maps->tgsm[reg_idx]; + tgsm->stride = ins.declaration.tgsm_structured.byte_stride / 4; + tgsm->size = tgsm->stride * ins.declaration.tgsm_structured.structure_count; } else { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5cc0136..a934cdb 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -774,6 +774,8 @@ static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instructio shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_structured.reg); ins->declaration.tgsm_structured.byte_stride = *tokens++; ins->declaration.tgsm_structured.structure_count = *tokens; + if (ins->declaration.tgsm_structured.byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.tgsm_structured.byte_stride); } static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d06962..675dd50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1006,6 +1006,7 @@ struct wined3d_shader_structured_resource struct wined3d_shader_tgsm { unsigned int size; + unsigned int stride; }; struct wined3d_shader_tgsm_raw

1 0

Józef Kucia : wined3d: Add shader_reg_maps_add_tgsm() helper function.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: fdca95efae785f7d07b156cdd7a76c5f145be108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdca95efae785f7d07b156cdd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:39 2017 +0100 wined3d: Add shader_reg_maps_add_tgsm() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 82 ++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f79a922..a97dfb1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -863,6 +863,33 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN } } +static HRESULT shader_reg_maps_add_tgsm(struct wined3d_shader_reg_maps *reg_maps, + unsigned int register_idx, unsigned int size, unsigned int stride) +{ + struct wined3d_shader_tgsm *tgsm; + + if (register_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", register_idx); + return S_OK; + } + if (reg_maps->shader_version.type != WINED3D_SHADER_TYPE_COMPUTE) + { + FIXME("TGSM declarations are allowed only in compute shaders.\n"); + return S_OK; + } + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + register_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + + reg_maps->tgsm_count = register_idx + 1; + tgsm = &reg_maps->tgsm[register_idx]; + tgsm->size = size; + tgsm->stride = stride; + return S_OK; +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -875,6 +902,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st struct wined3d_shader_version shader_version; const DWORD *ptr; unsigned int i; + HRESULT hr; memset(reg_maps, 0, sizeof(*reg_maps)); memset(input_signature_elements, 0, sizeof(input_signature_elements)); @@ -1049,55 +1077,17 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) { - unsigned int reg_idx = ins.declaration.tgsm_raw.reg.reg.idx[0].offset; - if (reg_idx >= MAX_TGSM_REGISTERS) - { - ERR("Invalid TGSM register index %u.\n", reg_idx); - break; - } - if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) - { - struct wined3d_shader_tgsm *tgsm; - - if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, - reg_idx + 1, sizeof(*reg_maps->tgsm))) - return E_OUTOFMEMORY; - reg_maps->tgsm_count = reg_idx + 1; - tgsm = &reg_maps->tgsm[reg_idx]; - tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; - tgsm->stride = 0; - } - else - { - FIXME("Invalid instruction %#x for shader type %#x.\n", - ins.handler_idx, shader_version.type); - } + if (FAILED(hr = shader_reg_maps_add_tgsm(reg_maps, ins.declaration.tgsm_raw.reg.reg.idx[0].offset, + ins.declaration.tgsm_raw.byte_count / 4, 0))) + return hr; } else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) { - unsigned int reg_idx = ins.declaration.tgsm_structured.reg.reg.idx[0].offset; - if (reg_idx >= MAX_TGSM_REGISTERS) - { - ERR("Invalid TGSM register index %u.\n", reg_idx); - break; - } - if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) - { - struct wined3d_shader_tgsm *tgsm; - - if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, - reg_idx + 1, sizeof(*reg_maps->tgsm))) - return E_OUTOFMEMORY; - reg_maps->tgsm_count = reg_idx + 1; - tgsm = &reg_maps->tgsm[reg_idx]; - tgsm->stride = ins.declaration.tgsm_structured.byte_stride / 4; - tgsm->size = tgsm->stride * ins.declaration.tgsm_structured.structure_count; - } - else - { - FIXME("Invalid instruction %#x for shader type %#x.\n", - ins.handler_idx, shader_version.type); - } + unsigned int stride = ins.declaration.tgsm_structured.byte_stride / 4; + unsigned int size = stride * ins.declaration.tgsm_structured.structure_count; + if (FAILED(hr = shader_reg_maps_add_tgsm(reg_maps, + ins.declaration.tgsm_structured.reg.reg.idx[0].offset, size, stride))) + return hr; } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) {

1 0

Józef Kucia : wined3d: Add support for ld_raw on thread group shared memory.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 3ab2482e0bfee233bd14da72671ebba7c07a8eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab2482e0bfee233bd14da726… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:40 2017 +0100 wined3d: Add support for ld_raw on thread group shared memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3f73201..c65bc69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5148,7 +5148,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) function = "texelFetch"; resource = "sampler"; } - else + else if (src->reg.type == WINED3DSPR_UAV) { if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) { @@ -5160,6 +5160,18 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) function = "imageLoad"; resource = "image"; } + else + { + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + stride = reg_maps->tgsm[resource_idx].stride; + bind_idx = resource_idx; + function = NULL; + resource = "g"; + } address = string_buffer_get(priv->string_buffers); if (ins->handler_idx == WINED3DSIH_LD_STRUCTURED) @@ -5178,8 +5190,12 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) continue; swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); - shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", - function, prefix, resource, bind_idx, address->buffer, swizzle); + if (function) + shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", + function, prefix, resource, bind_idx, address->buffer, swizzle); + else + shader_addline(buffer, "%s_%s%u[%s + %u]);\n", + prefix, resource, bind_idx, address->buffer, swizzle); } string_buffer_release(priv->string_buffers, address);

1 0

Huw Davies : dsound: Don' t propagate writepos in the non-WRITEPRIMARY case - it's unused.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 7a27cc89aae052ebac3a88f590610791b15c03bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a27cc89aae052ebac3a88f59… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:00:58 2017 +0000 dsound: Don't propagate writepos in the non-WRITEPRIMARY case - it's unused. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 2550753..174d56c 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -487,10 +487,9 @@ static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames) * (and it is not looping). * * dsb = the secondary buffer to mix from - * writepos = position (offset) in device buffer to write at * fraglen = number of bytes to mix */ -static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD writepos, DWORD fraglen) +static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD fraglen) { INT len = fraglen; float *ibuf; @@ -498,7 +497,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, UINT frames = fraglen / dsb->device->pwfx->nBlockAlign; TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); - TRACE("(%p,%d,%d)\n",dsb,writepos,fraglen); + TRACE("(%p,%d)\n",dsb,fraglen); if (len % dsb->device->pwfx->nBlockAlign) { INT nBlockAlign = dsb->device->pwfx->nBlockAlign; @@ -532,18 +531,16 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, * * dsb = the secondary buffer * playpos = the current play position in the device buffer (primary buffer) - * writepos = the current safe-to-write position in the device buffer * mixlen = the maximum number of bytes in the primary buffer to mix, from the * current writepos. * * Returns: the number of bytes beyond the writepos that were mixed. */ -static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD writepos, DWORD mixlen) +static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD mixlen) { DWORD primary_done = 0; - TRACE("(%p,%d,%d)\n",dsb,writepos,mixlen); - TRACE("writepos=%d, mixlen=%d\n", writepos, mixlen); + TRACE("(%p,%d)\n",dsb,mixlen); TRACE("looping=%d, leadin=%d\n", dsb->playflags, dsb->leadin); /* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */ @@ -552,7 +549,6 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD if (mixlen > 2 * dsb->device->fraglen) { primary_done = mixlen - 2 * dsb->device->fraglen; mixlen = 2 * dsb->device->fraglen; - writepos += primary_done; dsb->sec_mixpos += (primary_done / dsb->device->pwfx->nBlockAlign) * dsb->pwfx->nBlockAlign * dsb->freqAdjustNum / dsb->freqAdjustDen; } @@ -565,7 +561,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD /* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization */ - primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, writepos, mixlen); + primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, mixlen); TRACE("total mixed data=%d\n", primary_done); @@ -577,7 +573,6 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD * For a DirectSoundDevice, go through all the currently playing buffers and * mix them in to the device buffer. * - * writepos = the current safe-to-write position in the primary buffer * mixlen = the maximum amount to mix into the primary buffer * (beyond the current writepos) * all_stopped = reports back if all buffers have stopped @@ -585,7 +580,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD * Returns: the length beyond the writepos that was mixed to. */ -static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buffer, DWORD writepos, DWORD mixlen, BOOL *all_stopped) +static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buffer, DWORD mixlen, BOOL *all_stopped) { INT i; IDirectSoundBufferImpl *dsb; @@ -593,7 +588,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff /* unless we find a running buffer, all have stopped */ *all_stopped = TRUE; - TRACE("(%d,%d)\n", writepos, mixlen); + TRACE("(%d)\n", mixlen); for (i = 0; i < device->nrofbuffers; i++) { dsb = device->buffers[i]; @@ -613,7 +608,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff dsb->state = STATE_PLAYING; /* mix next buffer into the main buffer */ - DSOUND_MixOne(dsb, mix_buffer, writepos, mixlen); + DSOUND_MixOne(dsb, mix_buffer, mixlen); *all_stopped = FALSE; } @@ -671,7 +666,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - UINT32 pad, maxq, writepos; + UINT32 pad, maxq; DWORD block; HRESULT hr; @@ -701,8 +696,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (maxq > device->fraglen * 3) maxq = device->fraglen * 3; - writepos = (device->playpos + pad) % device->buflen; - if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL all_stopped = FALSE; int nfiller; @@ -726,12 +719,12 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) memset(buffer, nfiller, maxq); if (!device->normfunction) - DSOUND_MixToPrimary(device, buffer, writepos, maxq, &all_stopped); + DSOUND_MixToPrimary(device, buffer, maxq, &all_stopped); else { memset(device->buffer, nfiller, device->buflen); /* do the mixing */ - DSOUND_MixToPrimary(device, (float*)device->buffer, writepos, maxq, &all_stopped); + DSOUND_MixToPrimary(device, (float*)device->buffer, maxq, &all_stopped); device->normfunction(device->buffer, buffer, maxq); } @@ -742,6 +735,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) device->pad += maxq; } else if (!device->stopped) { + DWORD writepos = (device->playpos + pad) % device->buflen; + if (maxq > device->buflen) maxq = device->buflen; if (writepos + maxq > device->buflen) {

1 0

Huw Davies : dsound: Use frame rather than byte counts to clarify the mixing.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 134b684fd90423490e7eb2395db88df683d8fdc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134b684fd90423490e7eb2395… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:00:59 2017 +0000 dsound: Use frame rather than byte counts to clarify the mixing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 93 ++++++++++++++++++++------------------------ dlls/dsound/primary.c | 8 ++-- 3 files changed, 47 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=134b684fd90423490e7eb…

1 0

Huw Davies : dsound: Pass sample count to the normfunction.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: e6f8f136fa557d282f44654be509573cb45a831f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f8f136fa557d282f44654be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:01:00 2017 +0000 dsound: Pass sample count to the normfunction. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 27 ++++++++++++--------------- dlls/dsound/mixer.c | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 0c9a34b..6887bae 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -286,10 +286,10 @@ void mixieee32(float *src, float *dst, unsigned samples) *(dst++) += *(src++); } -static void norm8(float *src, unsigned char *dst, unsigned len) +static void norm8(float *src, unsigned char *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_8(*src); ++dst; @@ -297,11 +297,10 @@ static void norm8(float *src, unsigned char *dst, unsigned len) } } -static void norm16(float *src, SHORT *dst, unsigned len) +static void norm16(float *src, SHORT *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 2; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_16(*src); ++dst; @@ -309,11 +308,10 @@ static void norm16(float *src, SHORT *dst, unsigned len) } } -static void norm24(float *src, BYTE *dst, unsigned len) +static void norm24(float *src, BYTE *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 3; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { LONG t = f_to_24(*src); dst[0] = (t >> 8) & 0xFF; @@ -324,11 +322,10 @@ static void norm24(float *src, BYTE *dst, unsigned len) } } -static void norm32(float *src, INT *dst, unsigned len) +static void norm32(float *src, INT *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 4; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_32(*src); ++dst; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 049a345..1180594 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -716,7 +716,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* do the mixing */ DSOUND_MixToPrimary(device, (float*)device->buffer, frames, &all_stopped); - device->normfunction(device->buffer, buffer, frames * block); + device->normfunction(device->buffer, buffer, frames * device->pwfx->nChannels); } hr = IAudioRenderClient_ReleaseBuffer(device->render, frames, 0);

1 0

Alistair Leslie-Hughes : dpwsockx: Implementation of GetCaps callback.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 8952040a0e46bc531bbc18a0c045584ca2bbedd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8952040a0e46bc531bbc18a0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 28 23:17:17 2017 +0000 dpwsockx: Implementation of GetCaps callback. Based on patch by Ismael Barros. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 6 +++++ dlls/dplayx/tests/dplayx.c | 56 ++++++++++++++++++++----------------------- dlls/dpwsockx/dpwsockx_dll.h | 9 +++++++ dlls/dpwsockx/dpwsockx_main.c | 27 +++++++++++++++++++-- 4 files changed, 66 insertions(+), 32 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index f4d934f..4a80f1c 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2891,9 +2891,15 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerCaps( IDirectPlay4 *iface, DPID TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags); + if ( !caps ) + return DPERR_INVALIDPARAMS; + if ( This->dp2->connectionInitialized == NO_PROVIDER ) return DPERR_UNINITIALIZED; + if( caps->dwSize != sizeof(DPCAPS) ) + return DPERR_INVALIDPARAMS; + /* Query the service provider */ data.idPlayer = player; data.dwFlags = flags; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index de392aa..4c68873 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1088,7 +1088,7 @@ static void test_GetCaps(void) /* dpcaps not ininitialized */ hr = IDirectPlayX_GetCaps( pDP, &dpcaps, 0 ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpcaps.dwSize = sizeof(DPCAPS); @@ -1098,35 +1098,30 @@ static void test_GetCaps(void) { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - todo_wine checkHR( DP_OK, hr ); - - - if ( hr == DP_OK ) + checkHR( DP_OK, hr ); + check( sizeof(DPCAPS), dpcaps.dwSize ); + check( DPCAPS_ASYNCSUPPORTED | + DPCAPS_GUARANTEEDOPTIMIZED | + DPCAPS_GUARANTEEDSUPPORTED, + dpcaps.dwFlags ); + check( 0, dpcaps.dwMaxQueueSize ); + check( 0, dpcaps.dwHundredBaud ); + check( 500, dpcaps.dwLatency ); + check( 65536, dpcaps.dwMaxLocalPlayers ); + check( 20, dpcaps.dwHeaderLength ); + check( 5000, dpcaps.dwTimeout ); + + switch (dwFlags) { - check( sizeof(DPCAPS), dpcaps.dwSize ); - check( DPCAPS_ASYNCSUPPORTED | - DPCAPS_GUARANTEEDOPTIMIZED | - DPCAPS_GUARANTEEDSUPPORTED, - dpcaps.dwFlags ); - check( 0, dpcaps.dwMaxQueueSize ); - check( 0, dpcaps.dwHundredBaud ); - check( 500, dpcaps.dwLatency ); - check( 65536, dpcaps.dwMaxLocalPlayers ); - check( 20, dpcaps.dwHeaderLength ); - check( 5000, dpcaps.dwTimeout ); - - switch (dwFlags) - { - case 0: - check( 65479, dpcaps.dwMaxBufferSize ); - check( 65536, dpcaps.dwMaxPlayers ); - break; - case DPGETCAPS_GUARANTEED: - check( 1048547, dpcaps.dwMaxBufferSize ); - check( 64, dpcaps.dwMaxPlayers ); - break; - default: break; - } + case 0: + check( 65479, dpcaps.dwMaxBufferSize ); + check( 65536, dpcaps.dwMaxPlayers ); + break; + case DPGETCAPS_GUARANTEED: + check( 1048547, dpcaps.dwMaxBufferSize ); + check( 64, dpcaps.dwMaxPlayers ); + break; + default: break; } } @@ -2189,7 +2184,6 @@ static void test_GetPlayerCaps(void) hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], &playerCaps, 0 ); checkHR( DPERR_INVALIDPARAMS, hr ); - /* Invalid player */ playerCaps.dwSize = sizeof(DPCAPS); @@ -2202,6 +2196,8 @@ static void test_GetPlayerCaps(void) hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], &playerCaps, 0 ); checkHR( DP_OK, hr ); + hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], NULL, 0 ); + checkHR( DPERR_INVALIDPARAMS, hr ); /* Regular parameters */ for (i=0; i<2; i++) diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h index 1a6ad6c..ea3780f 100644 --- a/dlls/dpwsockx/dpwsockx_dll.h +++ b/dlls/dpwsockx/dpwsockx_dll.h @@ -25,6 +25,15 @@ #include "winnt.h" #include "wine/dplaysp.h" +#define DPWS_MAXQUEUESIZE 0 +#define DPWS_HUNDREDBAUD 0 +#define DPWS_LATENCY 500 +#define DPWS_MAXLOCALPLAYERS 65536 +#define DPWS_TIMEOUT 5000 +#define DPWS_MAXBUFFERSIZE 65479 +#define DPWS_MAXPLAYERS 65536 +#define DPWS_GUARANTEED_MAXBUFFERSIZE 1048547 +#define DPWS_GUARANTEED_MAXPLAYERS 64 typedef struct tagDPWS_THREADDATA { diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index 548f37e..9606d73 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -100,9 +100,32 @@ static HRESULT WINAPI DPWSCB_GetAddress( LPDPSP_GETADDRESSDATA data ) static HRESULT WINAPI DPWSCB_GetCaps( LPDPSP_GETCAPSDATA data ) { - FIXME( "(%d,%p,0x%08x,%p)\n", + TRACE( "(%d,%p,0x%08x,%p)\n", data->idPlayer, data->lpCaps, data->dwFlags, data->lpISP ); - return DPERR_UNSUPPORTED; + + data->lpCaps->dwFlags = ( DPCAPS_ASYNCSUPPORTED | + DPCAPS_GUARANTEEDOPTIMIZED | + DPCAPS_GUARANTEEDSUPPORTED ); + + data->lpCaps->dwMaxQueueSize = DPWS_MAXQUEUESIZE; + data->lpCaps->dwHundredBaud = DPWS_HUNDREDBAUD; + data->lpCaps->dwLatency = DPWS_LATENCY; + data->lpCaps->dwMaxLocalPlayers = DPWS_MAXLOCALPLAYERS; + data->lpCaps->dwHeaderLength = sizeof(DPSP_MSG_HEADER); + data->lpCaps->dwTimeout = DPWS_TIMEOUT; + + if ( data->dwFlags & DPGETCAPS_GUARANTEED ) + { + data->lpCaps->dwMaxBufferSize = DPWS_GUARANTEED_MAXBUFFERSIZE; + data->lpCaps->dwMaxPlayers = DPWS_GUARANTEED_MAXPLAYERS; + } + else + { + data->lpCaps->dwMaxBufferSize = DPWS_MAXBUFFERSIZE; + data->lpCaps->dwMaxPlayers = DPWS_MAXPLAYERS; + } + + return DP_OK; } static HRESULT WINAPI DPWSCB_Open( LPDPSP_OPENDATA data )

1 0

Henri Verbeet : wined3d: Send swapchain context creation through the command stream.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 3b0e37a0f49e4d0c94da18188dd150c601071855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b0e37a0f49e4d0c94da18188… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:52 2017 +0100 wined3d: Send swapchain context creation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 86 +++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1f31352..dff1354 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -782,6 +782,50 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } +static void wined3d_swapchain_cs_init(void *object) +{ + struct wined3d_swapchain *swapchain = object; + const struct wined3d_gl_info *gl_info; + unsigned int i; + + static const enum wined3d_format_id formats[] = + { + WINED3DFMT_D24_UNORM_S8_UINT, + WINED3DFMT_D32_UNORM, + WINED3DFMT_R24_UNORM_X8_TYPELESS, + WINED3DFMT_D16_UNORM, + WINED3DFMT_S1_UINT_D15_UNORM, + }; + + gl_info = &swapchain->device->adapter->gl_info; + + /* Without ORM_FBO, switching the depth/stencil format is hard. Always + * request a depth/stencil buffer in the likely case it's needed later. */ + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + swapchain->ds_format = wined3d_get_format(gl_info, formats[i], WINED3DUSAGE_DEPTHSTENCIL); + if ((swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) + break; + TRACE("Depth stencil format %s is not supported, trying next format.\n", debug_d3dformat(formats[i])); + } + + if (!swapchain->context[0]) + { + WARN("Failed to create context.\n"); + return; + } + swapchain->num_contexts = 1; + + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && (!swapchain->desc.enable_auto_depth_stencil + || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) + FIXME("Add OpenGL context recreation support.\n"); + + context_release(swapchain->context[0]); + + swapchain_update_swap_interval(swapchain); +} + static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -908,17 +952,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (!(device->wined3d->flags & WINED3D_NO3D)) { - static const enum wined3d_format_id formats[] = - { - WINED3DFMT_D24_UNORM_S8_UINT, - WINED3DFMT_D32_UNORM, - WINED3DFMT_R24_UNORM_X8_TYPELESS, - WINED3DFMT_D16_UNORM, - WINED3DFMT_S1_UINT_D15_UNORM - }; - - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); if (!swapchain->context) { @@ -927,42 +960,13 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 goto err; } - /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. - * You are able to add a depth + stencil surface at a later stage when you need it. - * In order to support this properly in WineD3D we need the ability to recreate the opengl context and - * drawable when this is required. This is very tricky as we need to reapply ALL opengl states for the new - * context, need torecreate shaders, textures and other resources. - * - * The context manager already takes care of the state problem and for the other tasks code from Reset - * can be used. These changes are way to risky during the 1.0 code freeze which is taking place right now. - * Likely a lot of other new bugs will be exposed. For that reason request a depth stencil surface all the - * time. It can cause a slight performance hit but fixes a lot of regressions. A fixme reminds of that this - * issue needs to be fixed. */ - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); i++) - { - swapchain->ds_format = wined3d_get_format(gl_info, formats[i], WINED3DUSAGE_DEPTHSTENCIL); - swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format); - if (swapchain->context[0]) break; - TRACE("Depth stencil format %s is not supported, trying next format\n", - debug_d3dformat(formats[i])); - } + wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); if (!swapchain->context[0]) { - WARN("Failed to create context.\n"); hr = WINED3DERR_NOTAVAILABLE; goto err; } - swapchain->num_contexts = 1; - - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (!desc->enable_auto_depth_stencil - || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) - { - FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); - } - context_release(swapchain->context[0]); - swapchain_update_swap_interval(swapchain); } if (swapchain->desc.backbuffer_count > 0)

1 0

Henri Verbeet : ddraw: Avoid destroying ddraw objects from DllMain().
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 1a14a6efd574922b46ed410623e3bfd0c03918f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a14a6efd574922b46ed41062… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:53 2017 +0100 ddraw: Avoid destroying ddraw objects from DllMain(). It's not clear we're supposed to clean up after the application like this, and it seems questionable whether it makes things better in general. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/main.c | 114 +++++++----------------------------------------------- 1 file changed, 14 insertions(+), 100 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4caa923..863dc31 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -792,52 +792,6 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( instance ); } -/******************************************************************************* - * DestroyCallback - * - * Callback function for the EnumSurfaces call in DllMain. - * Dumps some surface info and releases the surface - * - * Params: - * surf: The enumerated surface - * desc: its description - * context: Pointer to the ddraw impl - * - * Returns: - * DDENUMRET_OK; - *******************************************************************************/ -static HRESULT WINAPI -DestroyCallback(IDirectDrawSurface7 *surf, - DDSURFACEDESC2 *desc, - void *context) -{ - struct ddraw_surface *Impl = impl_from_IDirectDrawSurface7(surf); - ULONG ref7, ref4, ref3, ref2, ref1, gamma_count, iface_count; - - ref7 = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ - ref4 = Impl->ref4; - ref3 = Impl->ref3; - ref2 = Impl->ref2; - ref1 = Impl->ref1; - gamma_count = Impl->gamma_count; - - WARN("Surface %p has an reference counts of 7: %u 4: %u 3: %u 2: %u 1: %u gamma: %u\n", - Impl, ref7, ref4, ref3, ref2, ref1, gamma_count); - - /* Skip surfaces which are attached somewhere or which are - * part of a complex compound. They will get released when destroying - * the root - */ - if( (!Impl->is_complex_root) || (Impl->first_attached != Impl) ) - return DDENUMRET_OK; - - /* Destroy the surface */ - iface_count = ddraw_surface_release_iface(Impl); - while (iface_count) iface_count = ddraw_surface_release_iface(Impl); - - return DDENUMRET_OK; -} - /*********************************************************************** * DllMain (DDRAW.0) * @@ -923,66 +877,26 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) } case DLL_PROCESS_DETACH: - if(!list_empty(&global_ddraw_list)) + if (WARN_ON(ddraw)) { - struct list *entry, *entry2; - WARN("There are still existing DirectDraw interfaces. Wine bug or buggy application?\n"); + struct ddraw *ddraw; - /* We remove elements from this loop */ - LIST_FOR_EACH_SAFE(entry, entry2, &global_ddraw_list) + LIST_FOR_EACH_ENTRY(ddraw, &global_ddraw_list, struct ddraw, ddraw_list_entry) { - struct ddraw *ddraw = LIST_ENTRY(entry, struct ddraw, ddraw_list_entry); - HRESULT hr; - DDSURFACEDESC2 desc; - int i; - - WARN("DDraw %p has a refcount of %d\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref3 + ddraw->ref2 + ddraw->ref1); - - /* Add references to each interface to avoid freeing them unexpectedly */ - IDirectDraw_AddRef(&ddraw->IDirectDraw_iface); - IDirectDraw2_AddRef(&ddraw->IDirectDraw2_iface); - IDirectDraw4_AddRef(&ddraw->IDirectDraw4_iface); - IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); - - /* Does a D3D device exist? Destroy it - * TODO: Destroy all Vertex buffers, Lights, Materials - * and execute buffers too - */ - if(ddraw->d3ddevice) - { - WARN("DDraw %p has d3ddevice %p attached\n", ddraw, ddraw->d3ddevice); - while(IDirect3DDevice7_Release(&ddraw->d3ddevice->IDirect3DDevice7_iface)); - } + struct ddraw_surface *surface; - /* Destroy the swapchain after any 3D device. The 3D device - * cleanup code needs a swapchain. Specifically, it tries to - * set the current render target to the front buffer. */ - if (ddraw->wined3d_swapchain) - ddraw_destroy_swapchain(ddraw); - - /* Try to release the objects - * Do an EnumSurfaces to find any hanging surfaces - */ - memset(&desc, 0, sizeof(desc)); - desc.dwSize = sizeof(desc); - for(i = 0; i <= 1; i++) - { - hr = IDirectDraw7_EnumSurfaces(&ddraw->IDirectDraw7_iface, DDENUMSURFACES_ALL, - &desc, ddraw, DestroyCallback); - if(hr != D3D_OK) - ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw); - } + WARN("DirectDraw object %p has reference counts {%u, %u, %u, %u, %u}.\n", + ddraw, ddraw->ref7, ddraw->ref4, ddraw->ref3, ddraw->ref2, ddraw->ref1); - if (!list_empty(&ddraw->surface_list)) - ERR("DDraw %p still has surfaces attached.\n", ddraw); + if (ddraw->d3ddevice) + WARN("DirectDraw object %p has Direct3D device %p attached.\n", ddraw, ddraw->d3ddevice); - /* Release all hanging references to destroy the objects. This - * restores the screen mode too - */ - while(IDirectDraw_Release(&ddraw->IDirectDraw_iface)); - while(IDirectDraw2_Release(&ddraw->IDirectDraw2_iface)); - while(IDirectDraw4_Release(&ddraw->IDirectDraw4_iface)); - while(IDirectDraw7_Release(&ddraw->IDirectDraw7_iface)); + LIST_FOR_EACH_ENTRY(surface, &ddraw->surface_list, struct ddraw_surface, surface_list_entry) + { + WARN("Surface %p has reference counts {%u, %u, %u, %u, %u, %u}.\n", + surface, surface->ref7, surface->ref4, surface->ref3, + surface->ref2, surface->ref1, surface->gamma_count); + } } }

1 0

Francois Gouget : wbemprox: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 34f77a656a69caaa0e2cfa2eaae426c223311c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f77a656a69caaa0e2cfa2ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 28 18:52:45 2017 +0100 wbemprox: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wbemprox_private.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index ba25a02..15ea9c6 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -227,27 +227,24 @@ HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassO HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; -static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc( void *mem, size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero( size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *heap_strdupW( const WCHAR *src )

1 0