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

Henri Verbeet : wined3d: Rename IWineD3DDeviceImpl_FindTexUnitMap() to device_update_tex_unit_map().
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 6d3103903454cc9470204d71b081d8ba8abf6bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3103903454cc9470204d71b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:51 2011 +0200 wined3d: Rename IWineD3DDeviceImpl_FindTexUnitMap() to device_update_tex_unit_map(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 20bb6d6..5def575 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2234,7 +2234,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ - IWineD3DDeviceImpl_FindTexUnitMap(device); + device_update_tex_unit_map(device); device_preload_textures(device); if (isStateDirty(context, STATE_VDECL)) device_update_stream_info(device, context->gl_info); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12f1023..ab40d18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2980,7 +2980,7 @@ static void device_map_vsamplers(struct wined3d_device *device, BOOL ps, const s } } -void IWineD3DDeviceImpl_FindTexUnitMap(struct wined3d_device *device) +void device_update_tex_unit_map(struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_state *state = &device->stateBlock->state; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b31239b..43481ae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1790,7 +1790,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void IWineD3DDeviceImpl_FindTexUnitMap(struct wined3d_device *device) DECLSPEC_HIDDEN; +void device_update_tex_unit_map(struct wined3d_device *device) DECLSPEC_HIDDEN; void IWineD3DDeviceImpl_MarkStateDirty(struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state)

1 0

Henri Verbeet : wined3d: Check for unhandled resource usage flags.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: d5ee9a4014de9202bbd06c2a874fac810fa087d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ee9a4014de9202bbd06c2a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:52 2011 +0200 wined3d: Check for unhandled resource usage flags. --- dlls/wined3d/resource.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 5771b5b..4060bc6 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -65,6 +65,19 @@ static DWORD resource_access_from_pool(WINED3DPOOL pool) } } +static void resource_check_usage(DWORD usage) +{ + static const DWORD handled = WINED3DUSAGE_RENDERTARGET + | WINED3DUSAGE_DEPTHSTENCIL + | WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_AUTOGENMIPMAP + | WINED3DUSAGE_STATICDECL + | WINED3DUSAGE_OVERLAY; + + if (usage & ~handled) + FIXME("Unhandled usage flags %#x.\n", usage & ~handled); +} + HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, WINED3DRESOURCETYPE resource_type, const struct wined3d_format *format, WINED3DMULTISAMPLE_TYPE multisample_type, UINT multisample_quality, @@ -93,6 +106,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; list_init(&resource->privateData); + resource_check_usage(usage); + if (size) { resource->heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + RESOURCE_ALIGNMENT);

1 0

Henri Verbeet : wined3d: Mask out writes to unused render targets.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 019f6a8534d49cf92e8c819a4fda33a5ab4c1ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019f6a8534d49cf92e8c819a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 22:24:12 2011 +0200 wined3d: Mask out writes to unused render targets. Outputs not written by the pixel shader are undefined in GL, but in D3D the render target is unmodified. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/context.c | 30 ++++++++++++++++++++++-------- dlls/wined3d/device.c | 3 +++ dlls/wined3d/shader.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 55b31bc..cefb6e5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1118,7 +1118,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction else { if(ctx->cur_ps_args->super.srgb_correction) FIXME("sRGB correction on higher render targets\n"); - if (reg_maps->highest_render_target > 0) + if (reg_maps->rt_mask > 1) { sprintf(register_name, "result.color[%u]", reg->idx); } @@ -3615,7 +3615,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, priv_ctx.target_version = ARB; } - if (reg_maps->highest_render_target > 0) + if (reg_maps->rt_mask > 1) { shader_addline(buffer, "OPTION ARB_draw_buffers;\n"); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5def575..f5d237e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1977,9 +1977,9 @@ static struct wined3d_context *FindContext(struct wined3d_device *device, struct } /* Context activation is done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_count, struct wined3d_surface **rts) +static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask, struct wined3d_surface **rts) { - if (!rt_count) + if (!rt_mask) { ENTER_GL(); glDrawBuffer(GL_NONE); @@ -1999,19 +1999,22 @@ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; + unsigned int i = 0; - for (i = 0; i < rt_count; ++i) + while (rt_mask) { - if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + if ((rt_mask & 1) && rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else context->draw_buffers[i] = GL_NONE; + + rt_mask >>= 1; + ++i; } if (gl_info->supported[ARB_DRAW_BUFFERS]) { - GL_EXTCALL(glDrawBuffersARB(rt_count, context->draw_buffers)); + GL_EXTCALL(glDrawBuffersARB(i, context->draw_buffers)); checkGLcall("glDrawBuffers()"); } else @@ -2153,6 +2156,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d UINT rt_count, struct wined3d_surface **rts, struct wined3d_surface *depth_stencil) { const struct StateEntry *state_table = device->StateTable; + DWORD rt_mask = 0; UINT i; if (!context_validate_rt_config(rt_count, rts, depth_stencil)) @@ -2170,6 +2174,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d for (i = 0; i < rt_count; ++i) { context->blit_targets[i] = rts[i]; + rt_mask |= (1 << i); } while (i < context->gl_info->limits.buffers) { @@ -2183,12 +2188,17 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d else { context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); + rt_mask = 1; } LEAVE_GL(); } + else + { + rt_mask = 1; + } - context_apply_draw_buffers(context, rt_count, rts); + context_apply_draw_buffers(context, rt_mask, rts); context->draw_buffer_dirty = TRUE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2261,7 +2271,11 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (context->draw_buffer_dirty) { - context_apply_draw_buffers(context, context->gl_info->limits.buffers, fb->render_targets); + const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; + DWORD rt_mask = ps ? ps->reg_maps.rt_mask : 1; + + rt_mask &= device->valid_rt_mask; + context_apply_draw_buffers(context, rt_mask, fb->render_targets); context->draw_buffer_dirty = FALSE; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab40d18..8724cdf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1166,6 +1166,9 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->updateStateBlock = device->stateBlock; wined3d_stateblock_incref(device->updateStateBlock); + device->valid_rt_mask = 0; + for (i = 0; i < gl_info->limits.buffers; ++i) + device->valid_rt_mask |= (1 << i); device->fb.render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*device->fb.render_targets) * gl_info->limits.buffers); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f5c45f3..79a2759 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -418,7 +418,7 @@ static void shader_record_register_usage(struct wined3d_shader *shader, struct w break; case WINED3DSPR_COLOROUT: - reg_maps->highest_render_target = max(reg_maps->highest_render_target, reg->idx); + reg_maps->rt_mask |= (1 << reg->idx); break; default: @@ -821,6 +821,11 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } reg_maps->loop_depth = max_loop_depth; + /* PS before 2.0 don't have explicit color outputs. Instead the value of + * R0 is written to the render target. */ + if (shader_version.major < 2 && shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + reg_maps->rt_mask |= (1 << 0); + shader->functionLength = ((const char *)ptr - (const char *)byte_code); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 43481ae..5ac7ee4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,9 +560,10 @@ struct wined3d_shader_reg_maps WORD usespow : 1; WORD padding : 3; + DWORD rt_mask; /* Used render targets, 32 max. */ + /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; - unsigned highest_render_target; UINT min_rel_offset, max_rel_offset; }; @@ -1716,6 +1717,7 @@ struct wined3d_device unsigned int highest_dirty_ps_const, highest_dirty_vs_const; /* Render Target Support */ + DWORD valid_rt_mask; struct wined3d_fb_state fb; struct wined3d_surface *onscreen_depth_stencil; struct wined3d_surface *auto_depth_stencil;

1 0

Henri Verbeet : d3d9/tests: Add a test for unwritten pixel shader outputs.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: ea34d7aaba0512e0812e2cb3c3c4de0ef0ab45f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea34d7aaba0512e0812e2cb3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:54 2011 +0200 d3d9/tests: Add a test for unwritten pixel shader outputs. --- dlls/d3d9/tests/visual.c | 52 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e90bcaf..6b30f3e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8619,7 +8619,14 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ 0x0000ffff /* end */ }; - static const DWORD pshader_code[] = + static const DWORD pshader_code1[] = + { + 0xffff0300, /* ps_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0.0, 1.0, 0.0, 0.0 */ + 0x02000001, 0x800f0800, 0xa0e40000, /* mov oC0, c0 */ + 0x0000ffff /* end */ + }; + static const DWORD pshader_code2[] = { 0xffff0300, /* ps_3_0 */ 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0.0, 1.0, 0.0, 0.0 */ @@ -8631,11 +8638,12 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) HRESULT hr; IDirect3DVertexShader9 *vs; - IDirect3DPixelShader9 *ps; + IDirect3DPixelShader9 *ps1, *ps2; IDirect3DTexture9 *tex1, *tex2; IDirect3DSurface9 *surf1, *surf2, *backbuf, *readback; D3DCAPS9 caps; DWORD color; + UINT i, j; float quad[] = { -1.0, -1.0, 0.1, 1.0, -1.0, 0.1, @@ -8677,8 +8685,10 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vs); ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code, &ps); - ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code1, &ps1); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code2, &ps2); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuf); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget failed, hr=%08x\n", hr); @@ -8689,8 +8699,6 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexShader(device, vs); ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, ps); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surf1); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 1, surf2); @@ -8711,6 +8719,32 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), "Expected color 0x000000ff, got 0x%08x.\n", color); + /* Render targets not written by the pixel shader should be unmodified. */ + hr = IDirect3DDevice9_SetPixelShader(device, ps1); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), + "Expected color 0xff00ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf2, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + for (i = 6; i < 10; ++i) + { + for (j = 6; j < 10; ++j) + { + color = getPixelColorFromSurface(readback, j, i); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), + "Expected color 0xff0000ff, got 0x%08x at %u, %u.\n", color, j, i); + } + } + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Clear failed, hr %#x,\n", hr); hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); @@ -8724,6 +8758,9 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), "Expected color 0x0000ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_SetPixelShader(device, ps2); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr=%08x\n", hr); if(SUCCEEDED(hr)) { @@ -8764,7 +8801,8 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color == 0x000000ff, "Texture 2(output color 2) has color 0x%08x, expected 0x000000ff\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - IDirect3DPixelShader9_Release(ps); + IDirect3DPixelShader9_Release(ps2); + IDirect3DPixelShader9_Release(ps1); IDirect3DVertexShader9_Release(vs); IDirect3DTexture9_Release(tex1); IDirect3DTexture9_Release(tex2);

1 0

Marcus Meissner : winealsa.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 5078d07e6f61394917e3c9b34804f8124cddba6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5078d07e6f61394917e3c9b34… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:26:37 2011 +0200 winealsa.drv: Mark internal symbols with hidden visibility. --- dlls/winealsa.drv/alsa.h | 56 +++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h index ff97861..bc21fbc 100644 --- a/dlls/winealsa.drv/alsa.h +++ b/dlls/winealsa.drv/alsa.h @@ -155,43 +155,43 @@ typedef struct { #define WAVEDEV_ALLOC_EXTENT_SIZE 10 /* wavein.c */ -extern WINE_WAVEDEV *WInDev; -extern DWORD ALSA_WidNumMallocedDevs; -extern DWORD ALSA_WidNumDevs; +extern WINE_WAVEDEV *WInDev DECLSPEC_HIDDEN; +extern DWORD ALSA_WidNumMallocedDevs DECLSPEC_HIDDEN; +extern DWORD ALSA_WidNumDevs DECLSPEC_HIDDEN; /* waveout.c */ -extern WINE_WAVEDEV *WOutDev; -extern DWORD ALSA_WodNumMallocedDevs; -extern DWORD ALSA_WodNumDevs; +extern WINE_WAVEDEV *WOutDev DECLSPEC_HIDDEN; +extern DWORD ALSA_WodNumMallocedDevs DECLSPEC_HIDDEN; +extern DWORD ALSA_WodNumDevs DECLSPEC_HIDDEN; /* alsa.c */ -int ALSA_InitRingMessage(ALSA_MSG_RING* omr); -int ALSA_DestroyRingMessage(ALSA_MSG_RING* omr); -void ALSA_ResetRingMessage(ALSA_MSG_RING* omr); -void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep); -int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR param, BOOL wait); -int ALSA_RetrieveRingMessage(ALSA_MSG_RING* omr, enum win_wm_message *msg, DWORD_PTR *param, HANDLE *hEvent); -int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, int *out_min, int *out_max, int *out_step, int *new_left, int *new_right); - -const char * ALSA_getCmdString(enum win_wm_message msg); -const char * ALSA_getMessage(UINT msg); -const char * ALSA_getFormat(WORD wFormatTag); -BOOL ALSA_NearMatch(int rate1, int rate2); -DWORD ALSA_bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format); -void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * sw, int full); -int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent); -void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2); -BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf); +int ALSA_InitRingMessage(ALSA_MSG_RING* omr) DECLSPEC_HIDDEN; +int ALSA_DestroyRingMessage(ALSA_MSG_RING* omr) DECLSPEC_HIDDEN; +void ALSA_ResetRingMessage(ALSA_MSG_RING* omr) DECLSPEC_HIDDEN; +void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep) DECLSPEC_HIDDEN; +int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR param, BOOL wait) DECLSPEC_HIDDEN; +int ALSA_RetrieveRingMessage(ALSA_MSG_RING* omr, enum win_wm_message *msg, DWORD_PTR *param, HANDLE *hEvent) DECLSPEC_HIDDEN; +int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, int *out_min, int *out_max, int *out_step, int *new_left, int *new_right) DECLSPEC_HIDDEN; + +const char * ALSA_getCmdString(enum win_wm_message msg) DECLSPEC_HIDDEN; +const char * ALSA_getMessage(UINT msg) DECLSPEC_HIDDEN; +const char * ALSA_getFormat(WORD wFormatTag) DECLSPEC_HIDDEN; +BOOL ALSA_NearMatch(int rate1, int rate2) DECLSPEC_HIDDEN; +DWORD ALSA_bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format) DECLSPEC_HIDDEN; +void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * sw, int full) DECLSPEC_HIDDEN; +int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent) DECLSPEC_HIDDEN; +void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) DECLSPEC_HIDDEN; +BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf) DECLSPEC_HIDDEN; /* dscapture.c */ -DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv); -DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc); +DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) DECLSPEC_HIDDEN; +DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN; /* dsoutput.c */ -DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv); -DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc); +DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) DECLSPEC_HIDDEN; +DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN; /* waveinit.c */ -extern void ALSA_WaveInit(void); +extern void ALSA_WaveInit(void) DECLSPEC_HIDDEN; #endif /* __ALSA_H */

1 0

Alexandre Julliard : widl: Don' t call the buffer sizer routine when the size is known already.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: bf9d2904dc2e5d229b34b16cd614b0f2742b593a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9d2904dc2e5d229b34b16cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 22:47:07 2011 +0200 widl: Don't call the buffer sizer routine when the size is known already. --- tools/widl/typegen.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 51f531d..324211e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3537,7 +3537,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { int in_attr, out_attr, pointer_type; const type_t *type = var->type; - unsigned int start_offset = type->typestring_offset; + unsigned int alignment, start_offset = type->typestring_offset; if (is_ptr(type) || is_array(type)) pointer_type = get_pointer_fc(type, var->attrs, pass != PASS_RETURN); @@ -3562,6 +3562,8 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const break; } + if (phase == PHASE_BUFFERSIZE && get_required_buffer_size( var, &alignment, pass )) return; + write_parameter_conf_or_var_exprs(file, indent, local_var_prefix, phase, var); switch (typegen_detect_type(type, var->attrs, TDT_ALL_TYPES))

1 0

Alexandre Julliard : widl: Call marshalling routines directly also for user-marshalled types accessed through a ref pointer .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 2099d9400188b320a6ae7bb1a69a14912fe4456b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2099d9400188b320a6ae7bb1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:10:48 2011 +0200 widl: Call marshalling routines directly also for user-marshalled types accessed through a ref pointer. --- tools/widl/typegen.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 324211e..687bf53 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3536,6 +3536,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const enum pass pass, enum remoting_phase phase, const var_t *var) { int in_attr, out_attr, pointer_type; + const char *type_str = NULL; const type_t *type = var->type; unsigned int alignment, start_offset = type->typestring_offset; @@ -3785,8 +3786,6 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, start_offset); break; case TGT_STRUCT: - { - const char *struct_type = NULL; switch (get_struct_fc(ref)) { case RPC_FC_STRUCT: @@ -3794,7 +3793,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const * pass and don't have any memory to free and so don't * need a freeing pass */ if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) - struct_type = "SimpleStruct"; + type_str = "SimpleStruct"; else if (phase == PHASE_FREE && pass == PASS_RETURN) { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); @@ -3804,57 +3803,62 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const } break; case RPC_FC_PSTRUCT: - struct_type = "SimpleStruct"; + type_str = "SimpleStruct"; break; case RPC_FC_CSTRUCT: case RPC_FC_CPSTRUCT: - struct_type = "ConformantStruct"; + type_str = "ConformantStruct"; break; case RPC_FC_CVSTRUCT: - struct_type = "ConformantVaryingStruct"; + type_str = "ConformantVaryingStruct"; break; case RPC_FC_BOGUS_STRUCT: - struct_type = "ComplexStruct"; + type_str = "ComplexStruct"; break; default: error("write_remoting_arguments: Unsupported type: %s (0x%02x)\n", var->name, get_struct_fc(ref)); } - if (struct_type) + if (type_str) { if (phase == PHASE_FREE) - struct_type = "Pointer"; + type_str = "Pointer"; else start_offset = ref->typestring_offset; - print_phase_function(file, indent, struct_type, local_var_prefix, phase, var, start_offset); + print_phase_function(file, indent, type_str, local_var_prefix, phase, var, start_offset); } break; - } case TGT_UNION: - { - const char *union_type = NULL; if (phase == PHASE_FREE) - union_type = "Pointer"; + type_str = "Pointer"; else { if (type_get_type(ref) == TYPE_UNION) - union_type = "NonEncapsulatedUnion"; + type_str = "NonEncapsulatedUnion"; else if (type_get_type(ref) == TYPE_ENCAPSULATED_UNION) - union_type = "EncapsulatedUnion"; + type_str = "EncapsulatedUnion"; start_offset = ref->typestring_offset; } - print_phase_function(file, indent, union_type, local_var_prefix, + print_phase_function(file, indent, type_str, local_var_prefix, phase, var, start_offset); break; - } + case TGT_USER_TYPE: + if (phase != PHASE_FREE) + { + type_str = "UserMarshal"; + start_offset = ref->typestring_offset; + } + else type_str = "Pointer"; + + print_phase_function(file, indent, type_str, local_var_prefix, phase, var, start_offset); + break; case TGT_STRING: case TGT_POINTER: case TGT_ARRAY: case TGT_RANGE: case TGT_IFACE_POINTER: - case TGT_USER_TYPE: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, start_offset);

1 0

Alexandre Julliard : widl: Return the buffer size of the object pointed by a ref pointer for all types .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 8f156e266ef0ac766fecadc7e82a2b215d4cf89c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f156e266ef0ac766fecadc7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:13:47 2011 +0200 widl: Return the buffer size of the object pointed by a ref pointer for all types. --- tools/widl/typegen.c | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 687bf53..f6bb2f9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3111,7 +3111,7 @@ static unsigned int get_required_buffer_size_type( const type_t *type, const char *name, const attr_list_t *attrs, int toplevel_param, unsigned int *alignment) { *alignment = 0; - switch (typegen_detect_type(type, NULL, TDT_IGNORE_STRINGS|TDT_IGNORE_RANGES)) + switch (typegen_detect_type(type, NULL, TDT_IGNORE_RANGES)) { case TGT_USER_TYPE: { @@ -3188,27 +3188,8 @@ static unsigned int get_required_buffer_size_type( if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP) { const type_t *ref = type_pointer_get_ref(type); - switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) - { - case TGT_BASIC: - case TGT_ENUM: - case TGT_RANGE: - return get_required_buffer_size_type( ref, name, NULL, FALSE, alignment ); - case TGT_STRUCT: - if (get_struct_fc(ref) == RPC_FC_STRUCT) - return get_required_buffer_size_type( ref, name, NULL, FALSE, alignment ); - break; - case TGT_USER_TYPE: - case TGT_CTXT_HANDLE: - case TGT_CTXT_HANDLE_POINTER: - case TGT_STRING: - case TGT_POINTER: - case TGT_ARRAY: - case TGT_IFACE_POINTER: - case TGT_UNION: - case TGT_INVALID: - break; - } + if (is_string_type( attrs, ref )) break; + return get_required_buffer_size_type( ref, name, ref->attrs, FALSE, alignment ); } break;

1 0

Alexandre Julliard : widl: Also compute buffer size for non-ref pointers.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 96a5def6787c543f7fe2050a12aef7219e675bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a5def6787c543f7fe2050a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:53:11 2011 +0200 widl: Also compute buffer size for non-ref pointers. --- tools/widl/typegen.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f6bb2f9..4bdc94c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3185,13 +3185,19 @@ static unsigned int get_required_buffer_size_type( break; case TGT_POINTER: - if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP) { + unsigned int size, align; const type_t *ref = type_pointer_get_ref(type); if (is_string_type( attrs, ref )) break; - return get_required_buffer_size_type( ref, name, ref->attrs, FALSE, alignment ); + if (!(size = get_required_buffer_size_type( ref, name, NULL, FALSE, &align ))) break; + if (get_pointer_fc(type, attrs, toplevel_param) != RPC_FC_RP) + { + size += 4 + align; + align = 4; + } + *alignment = align; + return size; } - break; case TGT_ARRAY: if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP)

1 0

Alexandre Julliard : include: Add compatibility macros for non-widl compilers.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: ea9750d773ded6b86a3e28f38666b8376f984d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9750d773ded6b86a3e28f38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 23:58:55 2011 +0200 include: Add compatibility macros for non-widl compilers. --- include/msxml2.idl | 6 ++++++ include/xmldom.idl | 6 ++++++ include/xmldso.idl | 6 ++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index f9c10ef..6680518 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -25,6 +25,12 @@ import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(f5078f18-c551-11d3-89b9-0000f81fe221), version(3.0), diff --git a/include/xmldom.idl b/include/xmldom.idl index 45e9f13..a388592 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -19,6 +19,12 @@ #include <xmldomdid.h> #include <idispids.h> +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + interface IXMLDOMImplementation; interface IXMLDOMNode; interface IXMLDOMDocumentFragment; diff --git a/include/xmldso.idl b/include/xmldso.idl index cde98dc..86f2a3a 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -19,6 +19,12 @@ #include <idispids.h> #include <xmldsodid.h> +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + interface IXMLDOMDocument; [

1 0