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

Henri Verbeet : wined3d: Split context_apply_state() into separate functions for each usage.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: be43c867a5fd06dc6b9f5b686abb22a1e17a712e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be43c867a5fd06dc6b9f5b686… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 3 22:03:27 2010 +0200 wined3d: Split context_apply_state() into separate functions for each usage. --- dlls/wined3d/context.c | 221 +++++++++++++++++++++++++++--------------------- 1 files changed, 124 insertions(+), 97 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ccb3174..71030ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1977,117 +1977,124 @@ static void context_validate_onscreen_formats(IWineD3DDeviceImpl *device, struct } /* Context activation is done by the caller. */ -static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, enum ContextUsage usage) +static void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) { - const struct StateEntry *state_table = device->StateTable; - unsigned int i; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (context->render_offscreen) + { + FIXME("Applying blit state for an offscreen target with ORM_FBO. This should be avoided.\n"); + surface_internal_preload(context->current_rt, SRGB_RGB); - switch (usage) { - case CTXUSAGE_CLEAR: - case CTXUSAGE_DRAWPRIM: - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context); - ENTER_GL(); - context_apply_fbo_state(context); - LEAVE_GL(); - } - if (context->draw_buffer_dirty) { - context_apply_draw_buffer(context, FALSE); - context->draw_buffer_dirty = FALSE; - } - break; + ENTER_GL(); + context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); + context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, context->current_rt); + context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); + LEAVE_GL(); + } + else + { + context_validate_onscreen_formats(device, context); - case CTXUSAGE_BLIT: - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context); - if (context->render_offscreen) - { - FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); - surface_internal_preload(context->current_rt, SRGB_RGB); - - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, context->current_rt); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); - LEAVE_GL(); - } else { - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - LEAVE_GL(); - } - context->draw_buffer_dirty = TRUE; - } - if (context->draw_buffer_dirty) { - context_apply_draw_buffer(context, TRUE); - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) { - context->draw_buffer_dirty = FALSE; - } - } - break; + ENTER_GL(); + context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + LEAVE_GL(); + } - default: - break; + context->draw_buffer_dirty = TRUE; } - switch(usage) { - case CTXUSAGE_RESOURCELOAD: - /* This does not require any special states to be set up */ - break; + if (context->draw_buffer_dirty) + { + context_apply_draw_buffer(context, TRUE); + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) + context->draw_buffer_dirty = FALSE; + } - case CTXUSAGE_CLEAR: - if(context->last_was_blit) { - device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); - } + SetupForBlit(device, context); +} - /* Blending and clearing should be orthogonal, but tests on the nvidia driver show that disabling - * blending when clearing improves the clearing performance incredibly. - */ - ENTER_GL(); - glDisable(GL_BLEND); - LEAVE_GL(); - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_table); +/* Context activation is done by the caller. */ +static void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) +{ + const struct StateEntry *state_table = device->StateTable; - ENTER_GL(); - glEnable(GL_SCISSOR_TEST); - checkGLcall("glEnable GL_SCISSOR_TEST"); - LEAVE_GL(); - context->last_was_blit = FALSE; - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_table); - Context_MarkStateDirty(context, STATE_SCISSORRECT, state_table); - break; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (!context->render_offscreen) context_validate_onscreen_formats(device, context); + ENTER_GL(); + context_apply_fbo_state(context); + LEAVE_GL(); + } - case CTXUSAGE_DRAWPRIM: - /* This needs all dirty states applied */ - if(context->last_was_blit) { - device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); - } + if (context->draw_buffer_dirty) + { + context_apply_draw_buffer(context, FALSE); + context->draw_buffer_dirty = FALSE; + } - IWineD3DDeviceImpl_FindTexUnitMap(device); - device_preload_textures(device); - if (isStateDirty(context, STATE_VDECL)) - device_update_stream_info(device, context->gl_info); + if (context->last_was_blit) + { + device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); + } - ENTER_GL(); - for (i = 0; i < context->numDirtyEntries; ++i) - { - DWORD rep = context->dirtyArray[i]; - DWORD idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); - BYTE shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); - context->isStateDirty[idx] &= ~(1 << shift); - state_table[rep].apply(rep, device->stateBlock, context); - } - LEAVE_GL(); - context->numDirtyEntries = 0; /* This makes the whole list clean */ - context->last_was_blit = FALSE; - break; + /* Blending and clearing should be orthogonal, but tests on the nvidia + * driver show that disabling blending when clearing improves the clearing + * performance incredibly. */ + ENTER_GL(); + glDisable(GL_BLEND); + glEnable(GL_SCISSOR_TEST); + checkGLcall("glEnable GL_SCISSOR_TEST"); + LEAVE_GL(); - case CTXUSAGE_BLIT: - SetupForBlit(device, context); - break; + context->last_was_blit = FALSE; + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_table); + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_table); + Context_MarkStateDirty(context, STATE_SCISSORRECT, state_table); +} - default: - FIXME("Unexpected context usage requested\n"); +/* Context activation is done by the caller. */ +static void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) +{ + const struct StateEntry *state_table = device->StateTable; + unsigned int i; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (!context->render_offscreen) context_validate_onscreen_formats(device, context); + ENTER_GL(); + context_apply_fbo_state(context); + LEAVE_GL(); + } + + if (context->draw_buffer_dirty) + { + context_apply_draw_buffer(context, FALSE); + context->draw_buffer_dirty = FALSE; } + + if (context->last_was_blit) + { + device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); + } + + IWineD3DDeviceImpl_FindTexUnitMap(device); + device_preload_textures(device); + if (isStateDirty(context, STATE_VDECL)) + device_update_stream_info(device, context->gl_info); + + ENTER_GL(); + for (i = 0; i < context->numDirtyEntries; ++i) + { + DWORD rep = context->dirtyArray[i]; + DWORD idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); + BYTE shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); + context->isStateDirty[idx] &= ~(1 << shift); + state_table[rep].apply(rep, device->stateBlock, context); + } + LEAVE_GL(); + context->numDirtyEntries = 0; /* This makes the whole list clean */ + context->last_was_blit = FALSE; } static void context_setup_target(IWineD3DDeviceImpl *device, @@ -2220,7 +2227,27 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, } } - context_apply_state(context, device, usage); + switch (usage) + { + case CTXUSAGE_BLIT: + context_apply_blit_state(context, device); + break; + + case CTXUSAGE_CLEAR: + context_apply_clear_state(context, device); + break; + + case CTXUSAGE_DRAWPRIM: + context_apply_draw_state(context, device); + break; + + case CTXUSAGE_RESOURCELOAD: + break; + + default: + FIXME("Unexpected context usage requested.\n"); + break; + } return context; }

1 0

Henri Verbeet : wined3d: Separate context acquisition and state application .
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 49e076eabdfca5d27e3ce8448dc0532e314f0e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e076eabdfca5d27e3ce8448… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 3 22:03:28 2010 +0200 wined3d: Separate context acquisition and state application. --- dlls/wined3d/arb_program_shader.c | 7 +++-- dlls/wined3d/basetexture.c | 4 +- dlls/wined3d/buffer.c | 8 +++--- dlls/wined3d/context.c | 33 +++-------------------- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 50 +++++++++++++++++++----------------- dlls/wined3d/drawprim.c | 7 +++- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/query.c | 20 +++++++------- dlls/wined3d/surface.c | 40 +++++++++++++++++------------ dlls/wined3d/swapchain.c | 13 +++++---- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 19 +++++--------- 14 files changed, 98 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49e076eabdfca5d27e3ce…

1 0

Henri Verbeet : wined3d: Remove a redundant check from prepare_ds_clear().
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 312bacec96ef63d3eb47bbaf0be650a0b31da99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=312bacec96ef63d3eb47bbaf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 3 22:03:29 2010 +0200 wined3d: Remove a redundant check from prepare_ds_clear(). The rectangle count doesn't really matter. If the first rectangle doesn't cover the entire draw_rect we need to load the depth/stencil surface. --- dlls/wined3d/device.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a59cf02..585edd5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4404,16 +4404,6 @@ static void prepare_ds_clear(IWineD3DSurfaceImpl *ds, struct wined3d_context *co return; } - if (rect_count > 1) - { - /* Multiple clear rects, full load. Strictly speaking this can - * also be a full draw_rect clear, but it's probably rare enough - * that we don't care. */ - surface_load_ds_location(ds, context, location); - surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); - return; - } - IntersectRect(&r, draw_rect, clear_rect); if (EqualRect(&r, draw_rect)) {

1 0

Alexandre Julliard : ntdll: Add support for saving/ restoring CFA frame state.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: bc3ae58f1d167d20e1c6b9f3ace88a619af9d557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3ae58f1d167d20e1c6b9f3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 3 22:01:05 2010 +0200 ntdll: Add support for saving/restoring CFA frame state. --- dlls/ntdll/signal_x86_64.c | 100 ++++++++++++++++++++++++++------------------ 1 files changed, 59 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc3ae58f1d167d20e1c6b…

1 0

Jim Cameron : winedbg: Make disassembler properly print EMX and EXMM type operands.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 66d84158ead3a3652f71567547e90c391a0901e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d84158ead3a3652f7156754… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Sun May 2 13:34:16 2010 +0100 winedbg: Make disassembler properly print EMX and EXMM type operands. --- programs/winedbg/db_disasm.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index dc1cc3d..f5d6041 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -85,11 +85,12 @@ static BOOL db_display = FALSE; #define WORD 1 #define LONG 2 #define QUAD 3 -#define SNGL 4 -#define DBLR 5 -#define EXTR 6 -#define SDEP 7 -#define NONE 8 +#define DQUA 4 +#define SNGL 5 +#define DBLR 6 +#define EXTR 7 +#define SDEP 8 +#define NONE 9 /* * Addressing modes @@ -336,7 +337,7 @@ static const struct inst db_inst_0f6x[] = { /*6c*/ { "(bad)", TRUE, NONE, 0, 0 }, /*6d*/ { "(bad)", TRUE, NONE, 0, 0 }, /*6e*/ { "movd", TRUE, NONE, op2(E, MX), 0 }, -/*6f*/ { "movq", TRUE, NONE, op2(E, MX), 0 }, +/*6f*/ { "movq", TRUE, NONE, op2(EMX, MX), 0 }, }; static const struct inst db_inst_0f7x[] = { @@ -356,7 +357,7 @@ static const struct inst db_inst_0f7x[] = { /*7c*/ { "(bad)", TRUE, NONE, 0, 0 }, /*7d*/ { "(bad)", TRUE, NONE, 0, 0 }, /*7e*/ { "movd", TRUE, NONE, op2(E, MX), 0 }, -/*7f*/ { "movq", TRUE, NONE, op2(EMX, MX), 0 }, +/*7f*/ { "movq", TRUE, NONE, op2(MX, EMX), 0 }, }; static const struct inst db_inst_0f8x[] = { @@ -1040,10 +1041,12 @@ static const char * const db_index_reg_16[8] = { "%bx" }; -static const char * const db_reg[3][8] = { - { "%al", "%cl", "%dl", "%bl", "%ah", "%ch", "%dh", "%bh" }, - { "%ax", "%cx", "%dx", "%bx", "%sp", "%bp", "%si", "%di" }, - { "%eax", "%ecx", "%edx", "%ebx", "%esp", "%ebp", "%esi", "%edi" } +static const char * const db_reg[5][8] = { +/*BYTE*/{ "%al", "%cl", "%dl", "%bl", "%ah", "%ch", "%dh", "%bh" }, +/*WORD*/{ "%ax", "%cx", "%dx", "%bx", "%sp", "%bp", "%si", "%di" }, +/*LONG*/{ "%eax", "%ecx", "%edx", "%ebx", "%esp", "%ebp", "%esi", "%edi" }, +/*QUAD*/{ "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7" }, +/*DQUA*/{ "%xmm0","%xmm1","%xmm2","%xmm3","%xmm4","%xmm5","%xmm6","%xmm7" } }; static const char * const db_seg_reg[8] = { @@ -1058,6 +1061,7 @@ static const int db_lengths[] = { 2, /* WORD */ 4, /* LONG */ 8, /* QUAD */ + 16, /* DQUA */ 4, /* SNGL */ 8, /* DBLR */ 10, /* EXTR */ @@ -1561,7 +1565,7 @@ void be_i386_disasm_one_insn(ADDRESS64 *addr, int display) case EMX: if( db_display ) { - dbg_printf("%%mm%d", f_rm(regmodrm)); + db_print_address(seg, QUAD, &address, 0); } break; case XMM: @@ -1573,7 +1577,7 @@ void be_i386_disasm_one_insn(ADDRESS64 *addr, int display) case EXMM: if( db_display ) { - dbg_printf("%%xmm%d", f_rm(regmodrm)); + db_print_address(seg, DQUA, &address, 0); } break;

1 0

Ričardas Barkauskas : ddraw: Fix missing D3D misc caps .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: f97c9950549fedf10b6a747baa27842792588826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97c9950549fedf10b6a747ba… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Sun May 2 23:05:31 2010 +0300 ddraw: Fix missing D3D misc caps. --- dlls/ddraw/direct3d.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 80052ad..3f2410f 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1273,6 +1273,7 @@ IDirect3DImpl_GetCaps(IWineD3D *WineD3D, /* Copy the results into the d3d7 and d3d3 structures */ Desc7->dwDevCaps = WCaps.DevCaps; + Desc7->dpcLineCaps.dwMiscCaps = WCaps.PrimitiveMiscCaps; Desc7->dpcLineCaps.dwRasterCaps = WCaps.RasterCaps; Desc7->dpcLineCaps.dwZCmpCaps = WCaps.ZCmpCaps; Desc7->dpcLineCaps.dwSrcBlendCaps = WCaps.SrcBlendCaps;

1 0

Jerome Leclanche : quartz: Properly return E_POINTER when ppFilters is null .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 1db85c132e7013dddda4200e06a675e91c6530a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db85c132e7013dddda4200e0… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon May 3 01:14:49 2010 +0300 quartz: Properly return E_POINTER when ppFilters is null. --- dlls/quartz/enumfilters.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index ca6a989..ab1f6ec 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -126,6 +126,9 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters TRACE("(%p)->(%u, %p, %p)\n", iface, cFilters, ppFilters, pcFetched); + if (!ppFilters) + return E_POINTER; + for (i = 0; i < cFetched; i++) { ppFilters[i] = This->ppFilters[This->uIndex + i];

1 0

Maarten Lankhorst : winealsa.drv: Remove dlopen call.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 3beb1b6a11282506a98fe32612a082087b607804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beb1b6a11282506a98fe3261… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 22:56:28 2010 +0200 winealsa.drv: Remove dlopen call. --- dlls/winealsa.drv/waveinit.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index f6c406f..f2eaece 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -972,12 +972,6 @@ LONG ALSA_WaveInit(void) HKEY key = 0; int i; - if (!wine_dlopen("libasound.so.2", RTLD_LAZY|RTLD_GLOBAL, NULL, 0)) - { - ERR("Error: ALSA lib needs to be loaded with flags RTLD_LAZY and RTLD_GLOBAL.\n"); - return -1; - } - /* @@ Wine registry key: HKCU\Software\Wine\Alsa Driver */ rc = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Wine\\Alsa Driver", 0, KEY_QUERY_VALUE, &key); if (rc == ERROR_SUCCESS)

1 0

Maarten Lankhorst : winealsa.drv: Clean up initialisation.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 755c25d84eff23abee532652b4e0ff7c548da317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755c25d84eff23abee532652b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 22 22:52:19 2010 +0200 winealsa.drv: Clean up initialisation. --- dlls/winealsa.drv/alsa.c | 3 +-- dlls/winealsa.drv/alsa.h | 5 +---- dlls/winealsa.drv/midi.c | 10 +++++----- dlls/winealsa.drv/wavein.c | 1 + dlls/winealsa.drv/waveinit.c | 10 ++++++---- dlls/winealsa.drv/waveout.c | 1 + 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 5ed7109..9eb50cd 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -725,8 +725,7 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, switch(wMsg) { #ifdef HAVE_ALSA - case DRV_LOAD: ALSA_WaveInit(); - ALSA_MidiInit(); + case DRV_LOAD: case DRV_FREE: case DRV_OPEN: case DRV_CLOSE: diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h index 88529fb..7c2f0f4 100644 --- a/dlls/winealsa.drv/alsa.h +++ b/dlls/winealsa.drv/alsa.h @@ -199,10 +199,7 @@ DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc); DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv); DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc); -/* midi.c */ -extern LONG ALSA_MidiInit(void); - /* waveinit.c */ -extern LONG ALSA_WaveInit(void); +extern void ALSA_WaveInit(void); #endif /* __ALSA_H */ diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 00a54bf..0eee1c8 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1222,8 +1222,6 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* } } -#endif /* HAVE_ALSA */ - /*======================================================================* * MIDI entry points * @@ -1234,9 +1232,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* * * Initializes the MIDI devices information variables */ -LONG ALSA_MidiInit(void) +static LONG ALSA_MidiInit(void) { -#ifdef HAVE_ALSA static BOOL bInitDone = FALSE; snd_seq_client_info_t *cinfo; snd_seq_port_info_t *pinfo; @@ -1290,10 +1287,11 @@ LONG ALSA_MidiInit(void) HeapFree( GetProcessHeap(), 0, pinfo ); TRACE("End\n"); -#endif return TRUE; } +#endif + /************************************************************************** * midMessage (WINEALSA.@) */ @@ -1305,6 +1303,7 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { #ifdef HAVE_ALSA case DRVM_INIT: + ALSA_MidiInit(); case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: @@ -1349,6 +1348,7 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { #ifdef HAVE_ALSA case DRVM_INIT: + ALSA_MidiInit(); case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 625e36e..8985ec3 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -750,6 +750,7 @@ DWORD WINAPI ALSA_widMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: + ALSA_WaveInit(); case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index f2eaece..4da53c9 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -962,7 +962,7 @@ static int ALSA_AddUserSpecifiedDevice(const char *ctlname, const char *pcmname) ** is a way to exactly specify the devices used by Wine. ** */ -LONG ALSA_WaveInit(void) +void ALSA_WaveInit(void) { DWORD rc; BOOL AutoScanCards = TRUE; @@ -971,6 +971,10 @@ LONG ALSA_WaveInit(void) DWORD DeviceCount = 0; HKEY key = 0; int i; + static int loaded; + + if (loaded++) + return; /* @@ Wine registry key: HKCU\Software\Wine\Alsa Driver */ rc = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Wine\\Alsa Driver", 0, KEY_QUERY_VALUE, &key); @@ -983,7 +987,7 @@ LONG ALSA_WaveInit(void) } if (AutoScanCards) - rc = ALSA_PerformDefaultScan(UseDirectHW, AutoScanDevices); + ALSA_PerformDefaultScan(UseDirectHW, AutoScanDevices); for (i = 0; i < DeviceCount; i++) { @@ -1005,8 +1009,6 @@ LONG ALSA_WaveInit(void) if (key) RegCloseKey(key); - - return (rc); } #endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index df0027f..4001f26 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -1169,6 +1169,7 @@ DWORD WINAPI ALSA_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: + ALSA_WaveInit(); case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE:

1 0

André Hentschel : version: Fix typo in comment.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 89f3afb012c5296a096a45b6974e822183f7d880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f3afb012c5296a096a45b69… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 3 17:01:34 2010 +0200 version: Fix typo in comment. --- dlls/version/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/install.c b/dlls/version/install.c index 2ecfeb9..d5c12eb 100644 --- a/dlls/version/install.c +++ b/dlls/version/install.c @@ -182,7 +182,7 @@ DWORD WINAPI VerFindFileA( } } - /* Check to see if the file exists and is inuse by another application */ + /* Check to see if the file exists and is in use by another application */ if (lpszFilename && testFileExistenceA(curDir, lpszFilename, FALSE)) { if (lpszFilename && !testFileExistenceA(curDir, lpszFilename, TRUE)) retval |= VFF_FILEINUSE;

1 0