April 2009 - Wine-Commits - list.winehq.org

Tobias Jakobi : wined3d: Rename some NP2 fixup variables and update comments.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 0c2514bd8fbf59641972755be0f9582d42c59f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2514bd8fbf59641972755be… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Apr 9 19:14:03 2009 +0200 wined3d: Rename some NP2 fixup variables and update comments. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 42 ++++++++++++++++++------------------ dlls/wined3d/pixelshader.c | 4 +- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e2b234..abc30bf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -672,7 +672,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } if(shader_is_pshader_version(ins->reg_maps->shader_version)) { const IWineD3DPixelShaderImpl* const ps = (const IWineD3DPixelShaderImpl*)This; - if(ps->cur_args->texrect_fixup & (1 << sampler_idx)) { + if(ps->cur_args->np2_fixup & (1 << sampler_idx)) { FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5fa9915..44e5e80 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -100,7 +100,7 @@ struct glsl_shader_prog_link { GLint vuniformI_locations[MAX_CONST_I]; GLint puniformI_locations[MAX_CONST_I]; GLint posFixup_location; - GLint rectFixup_location[MAX_FRAGMENT_SAMPLERS]; + GLint np2Fixup_location[MAX_FRAGMENT_SAMPLERS]; GLint bumpenvmat_location[MAX_TEXTURES]; GLint luminancescale_location[MAX_TEXTURES]; GLint luminanceoffset_location[MAX_TEXTURES]; @@ -503,21 +503,21 @@ static void shader_glsl_load_np2fixup_constants( return; } - if (prog->ps_args.texrect_fixup) { + if (prog->ps_args.np2_fixup) { UINT i; - UINT fixup = prog->ps_args.texrect_fixup; + UINT fixup = prog->ps_args.np2_fixup; const WineD3D_GL_Info* gl_info = &deviceImpl->adapter->gl_info; const IWineD3DStateBlockImpl* stateBlock = (const IWineD3DStateBlockImpl*) deviceImpl->stateBlock; for (i = 0; fixup; fixup >>= 1, ++i) { - if (-1 != prog->rectFixup_location[i]) { + if (-1 != prog->np2Fixup_location[i]) { const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; if (!tex) { FIXME("Non-existant texture is flagged for NP2 texcoord fixup\n"); continue; } else { const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]}; - GL_EXTCALL(glUniform2fvARB(prog->rectFixup_location[i], 1, tex_dim)); + GL_EXTCALL(glUniform2fvARB(prog->np2Fixup_location[i], 1, tex_dim)); } } } @@ -825,12 +825,12 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } - if(ps_args->texrect_fixup & (1 << i)) { - /* RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] + if(ps_args->np2_fixup & (1 << i)) { + /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] * while D3D has them in the (normalized) [0,1]x[0,1] range. - * samplerRectFixup stores texture dimensions and is updated through - * shader_glsl_load_constants when the sampler changes. */ - shader_addline(buffer, "uniform vec2 %csamplerRectFixup%u;\n", prefix, i); + * samplerNP2Fixup stores texture dimensions and is updated through + * shader_glsl_load_np2fixup_constants when the sampler changes. */ + shader_addline(buffer, "uniform vec2 %csamplerNP2Fixup%u;\n", prefix, i); } break; case WINED3DSTT_CUBE: @@ -1549,7 +1549,7 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s const char *sampler_base; char dst_swizzle[6]; struct color_fixup_desc fixup; - BOOL rect_fixup = FALSE; + BOOL np2_fixup = FALSE; va_list args; shader_glsl_get_swizzle(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); @@ -1560,11 +1560,11 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s fixup = This->cur_args->color_fixup[sampler]; sampler_base = "Psampler"; - if(This->cur_args->texrect_fixup & (1 << sampler)) { + if(This->cur_args->np2_fixup & (1 << sampler)) { if(bias) { - FIXME("Biased sampling from RECT textures is unsupported\n"); + FIXME("Biased sampling from NP2 textures is unsupported\n"); } else { - rect_fixup = TRUE; + np2_fixup = TRUE; } } } else { @@ -1583,8 +1583,8 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s if(bias) { shader_addline(ins->buffer, ", %s)%s);\n", bias, dst_swizzle); } else { - if (rect_fixup) { - shader_addline(ins->buffer, " * PsamplerRectFixup%u)%s);\n", sampler, dst_swizzle); + if (np2_fixup) { + shader_addline(ins->buffer, " * PsamplerNP2Fixup%u)%s);\n", sampler, dst_swizzle); } else { shader_addline(ins->buffer, ")%s);\n", dst_swizzle); } @@ -3595,14 +3595,14 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use } } - if (use_ps && ps_compile_args.texrect_fixup) { + if (use_ps && ps_compile_args.np2_fixup) { char name[32]; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { - if (ps_compile_args.texrect_fixup & (1 << i)) { - sprintf(name, "PsamplerRectFixup%u", i); - entry->rectFixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + if (ps_compile_args.np2_fixup & (1 << i)) { + sprintf(name, "PsamplerNP2Fixup%u", i); + entry->np2Fixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } else { - entry->rectFixup_location[i] = -1; + entry->np2Fixup_location[i] = -1; } } } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index de609a7..d1701f5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -460,7 +460,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set */ args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; - args->texrect_fixup = 0; + args->np2_fixup = 0; for(i = 0; i < MAX_FRAGMENT_SAMPLERS; i++) { if(shader->baseShader.reg_maps.samplers[i] == 0) continue; @@ -473,7 +473,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp /* Flag samplers that need NP2 texcoord fixup. */ if(!tex->baseTexture.pow2Matrix_identity) { - args->texrect_fixup |= (1 << i); + args->np2_fixup |= (1 << i); } } if (shader->baseShader.reg_maps.shader_version >= WINED3DPS_VERSION(3,0)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5ae466..429e2bd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -538,8 +538,8 @@ struct ps_compile_args { /* Projected textures(ps 1.0-1.3) */ /* Texture types(2D, Cube, 3D) in ps 1.x */ BOOL srgb_correction; - WORD texrect_fixup; - /* Bitmap for texture rect coord fixups (16 samplers max currently). + WORD np2_fixup; + /* Bitmap for NP2 texcoord fixups (16 samplers max currently). D3D9 has a limit of 16 samplers and the fixup is superfluous in D3D10 (unconditional NP2 support mandatory). */ };

1 0

Ken Thomases : winecoreaudio: Avoid potential deadlock in wodOpen.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 1f8d743c764db13e82a1629854c531548d6ee498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8d743c764db13e82a162985… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:18 2009 -0500 winecoreaudio: Avoid potential deadlock in wodOpen. --- dlls/winecoreaudio.drv/audio.c | 82 ++++++++++++++++++++++++++++++--------- 1 files changed, 63 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 2735fb7..e81aa3e 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -32,6 +32,7 @@ # include <unistd.h> #endif #include <fcntl.h> +#include <assert.h> #include "windef.h" #include "winbase.h" @@ -103,6 +104,7 @@ AudioUnitRender( AudioUnit ci, #define WINE_WS_PAUSED 1 #define WINE_WS_STOPPED 2 #define WINE_WS_CLOSED 3 +#define WINE_WS_OPENING 4 typedef struct tagCoreAudio_Device { char dev_name[32]; @@ -771,9 +773,10 @@ static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { WINE_WAVEOUT* wwo; - DWORD retval; DWORD ret; AudioStreamBasicDescription streamFormat; + AudioUnit audioUnit = NULL; + BOOL auInited = FALSE; TRACE("(%u, %p, %08x);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) @@ -808,7 +811,15 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) lpDesc->lpFormat->nSamplesPerSec); return MMSYSERR_NOERROR; } - + + /* We proceed in three phases: + * o Reserve the device for us, marking it as unavailable (not closed) + * o Create, configure, and start the Audio Unit. To avoid deadlock, + * this has to be done without holding wwo->lock. + * o If that was successful, finish setting up our device info and + * mark the device as ready. + * Otherwise, clean up and mark the device as available. + */ wwo = &WOutDev[wDevID]; if (!OSSpinLockTry(&wwo->lock)) return MMSYSERR_ALLOCATED; @@ -819,11 +830,16 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ALLOCATED; } - if (!AudioUnit_CreateDefaultAudioUnit((void *) wwo, &wwo->audioUnit)) + wwo->state = WINE_WS_OPENING; + wwo->audioUnit = NULL; + OSSpinLockUnlock(&wwo->lock); + + + if (!AudioUnit_CreateDefaultAudioUnit((void *) wwo, &audioUnit)) { ERR("CoreAudio_CreateDefaultAudioUnit(%p) failed\n", wwo); - OSSpinLockUnlock(&wwo->lock); - return MMSYSERR_ERROR; + ret = MMSYSERR_ERROR; + goto error; } streamFormat.mFormatID = kAudioFormatLinearPCM; @@ -842,25 +858,35 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) streamFormat.mBytesPerFrame = streamFormat.mBitsPerChannel * streamFormat.mChannelsPerFrame / 8; streamFormat.mBytesPerPacket = streamFormat.mBytesPerFrame * streamFormat.mFramesPerPacket; - ret = AudioUnit_InitializeWithStreamDescription(wwo->audioUnit, &streamFormat); + ret = AudioUnit_InitializeWithStreamDescription(audioUnit, &streamFormat); if (!ret) { - AudioUnit_CloseAudioUnit(wwo->audioUnit); - OSSpinLockUnlock(&wwo->lock); - return WAVERR_BADFORMAT; /* FIXME return an error based on the OSStatus */ + ret = WAVERR_BADFORMAT; /* FIXME return an error based on the OSStatus */ + goto error; } - wwo->streamDescription = streamFormat; + auInited = TRUE; - ret = AudioOutputUnitStart(wwo->audioUnit); + /* Our render callback CoreAudio_woAudioUnitIOProc may be called before + * AudioOutputUnitStart returns. Core Audio will grab its own internal + * lock before calling it and the callback grabs wwo->lock. This would + * deadlock if we were holding wwo->lock. + * Also, the callback has to safely do nothing in that case, because + * wwo hasn't been completely filled out, yet. */ + ret = AudioOutputUnitStart(audioUnit); if (ret) { ERR("AudioOutputUnitStart failed: %08x\n", ret); - AudioUnitUninitialize(wwo->audioUnit); - AudioUnit_CloseAudioUnit(wwo->audioUnit); - OSSpinLockUnlock(&wwo->lock); - return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ + ret = MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ + goto error; } + + OSSpinLockLock(&wwo->lock); + assert(wwo->state == WINE_WS_OPENING); + + wwo->audioUnit = audioUnit; + wwo->streamDescription = streamFormat; + wwo->state = WINE_WS_STOPPED; wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); @@ -885,9 +911,24 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) OSSpinLockUnlock(&wwo->lock); - retval = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + ret = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); - return retval; + return ret; + +error: + if (audioUnit) + { + if (auInited) + AudioUnitUninitialize(audioUnit); + AudioUnit_CloseAudioUnit(audioUnit); + } + + OSSpinLockLock(&wwo->lock); + assert(wwo->state == WINE_WS_OPENING); + wwo->state = WINE_WS_CLOSED; + OSSpinLockUnlock(&wwo->lock); + + return ret; } /************************************************************************** @@ -1291,7 +1332,7 @@ static DWORD wodReset(WORD wDevID) OSSpinLockLock(&wwo->lock); - if (wwo->state == WINE_WS_CLOSED) + if (wwo->state == WINE_WS_CLOSED || wwo->state == WINE_WS_OPENING) { OSSpinLockUnlock(&wwo->lock); WARN("resetting a closed device\n"); @@ -1589,6 +1630,9 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, OSSpinLockLock(&wwo->lock); + /* We might have been called before wwo has been completely filled out by + * wodOpen. We have to do nothing in that case. The check of wwo->state + * below ensures that. */ while (dataNeeded > 0 && wwo->state == WINE_WS_PLAYING && wwo->lpPlayPtr) { unsigned int available = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset;

1 0

Dmitry Timoshkov : oleaut32: Add some additional tests for QueryPathOfRegTypeLib, make them pass under Wine.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 69ec6b4c6d74926a2182c5bf9f1ac9e4562f4f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ec6b4c6d74926a2182c5bf9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 13 15:14:08 2009 +0900 oleaut32: Add some additional tests for QueryPathOfRegTypeLib, make them pass under Wine. --- dlls/oleaut32/tests/typelib.c | 5 +++++ dlls/oleaut32/typelib.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7c0e2c5..93920c5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -638,6 +638,10 @@ static void test_QueryPathOfRegTypeLib(void) { 3, 22, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, { 3, 37, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, { 3, 40, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, + { 0xffff, 0xffff, S_OK, {'f','a','k','e','_','5','_','3','7','.','d','l','l',0 } }, + { 0xffff, 0, TYPE_E_LIBNOTREGISTERED, { 0 } }, + { 3, 0xffff, TYPE_E_LIBNOTREGISTERED, { 0 } }, + { 5, 0xffff, TYPE_E_LIBNOTREGISTERED, { 0 } }, { 4, 0, TYPE_E_LIBNOTREGISTERED, { 0 } } }; static const WCHAR base[] = {'f','a','k','e',0}; @@ -657,6 +661,7 @@ static void test_QueryPathOfRegTypeLib(void) if (!do_typelib_reg_key(&uid, 3, 0, base, 0)) return; if (!do_typelib_reg_key(&uid, 3, 1, base, 0)) return; if (!do_typelib_reg_key(&uid, 3, 37, base, 0)) return; + if (!do_typelib_reg_key(&uid, 5, 37, base, 0)) return; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 75a30d2..a0af847 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -168,13 +168,13 @@ static void FromLEDWords(void *p_Val, int p_iSize) /* * Find a typelib key which matches a requested maj.min version. */ -static BOOL find_typelib_key( REFGUID guid, WORD wMaj, WORD *wMin ) +static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) { static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; WCHAR buffer[60]; char key_name[16]; DWORD len, i; - INT best_min = -1; + INT best_maj = -1, best_min = -1; HKEY hkey; memcpy( buffer, typelibW, sizeof(typelibW) ); @@ -193,20 +193,40 @@ static BOOL find_typelib_key( REFGUID guid, WORD wMaj, WORD *wMin ) { TRACE("found %s: %x.%x\n", debugstr_w(buffer), v_maj, v_min); - if (wMaj == v_maj) + if (*wMaj == 0xffff && *wMin == 0xffff) { + if (v_maj > best_maj) best_maj = v_maj; + if (v_min > best_min) best_min = v_min; + } + else if (*wMaj == v_maj) + { + best_maj = v_maj; + if (*wMin == v_min) { best_min = v_min; break; /* exact match */ } - if (v_min > best_min) best_min = v_min; + if (*wMin != 0xffff && v_min > best_min) best_min = v_min; } } len = sizeof(key_name); } RegCloseKey( hkey ); - if (best_min >= 0) + + TRACE("found best_maj %d, best_min %d\n", best_maj, best_min); + + if (*wMaj == 0xffff && *wMin == 0xffff) + { + if (best_maj >= 0 && best_min >= 0) + { + *wMaj = best_maj; + *wMin = best_min; + return TRUE; + } + } + + if (*wMaj == best_maj && best_min >= 0) { *wMin = best_min; return TRUE; @@ -295,7 +315,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib( TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); - if (!find_typelib_key( guid, wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; + if (!find_typelib_key( guid, &wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; get_typelib_key( guid, wMaj, wMin, buffer ); res = RegOpenKeyExW( HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hkey );

1 0

Ken Thomases : winecoreaudio: Eliminate some unnecessary code.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: ff0ff663c33da632ff6327ec67f5bd31f528981b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0ff663c33da632ff6327ec6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:10 2009 -0500 winecoreaudio: Eliminate some unnecessary code. The WAVE_DIRECTSOUND bit of dwFlags isn't examined, so no point in correcting it. --- dlls/winecoreaudio.drv/audio.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index b6f55b8..2735fb7 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -826,11 +826,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ERROR; } - if ((dwFlags & WAVE_DIRECTSOUND) && - !(wwo->caps.dwSupport & WAVECAPS_DIRECTSOUND)) - /* not supported, ignore it */ - dwFlags &= ~WAVE_DIRECTSOUND; - streamFormat.mFormatID = kAudioFormatLinearPCM; streamFormat.mFormatFlags = kLinearPCMFormatFlagIsPacked; /* FIXME check for 32bits float -> kLinearPCMFormatFlagIsFloat */

1 0

Ken Thomases : winecoreaudio: Avoid a race between closing and opening the waveOut device.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 06d705e7dfc3febfbf3592de942a3100dffde5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d705e7dfc3febfbf3592de9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:23 2009 -0500 winecoreaudio: Avoid a race between closing and opening the waveOut device. --- dlls/winecoreaudio.drv/audio.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index e81aa3e..9b55326 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -105,6 +105,7 @@ AudioUnitRender( AudioUnit ci, #define WINE_WS_STOPPED 2 #define WINE_WS_CLOSED 3 #define WINE_WS_OPENING 4 +#define WINE_WS_CLOSING 5 typedef struct tagCoreAudio_Device { char dev_name[32]; @@ -957,14 +958,17 @@ static DWORD wodClose(WORD wDevID) } else { OSStatus err; + AudioUnit audioUnit = wwo->audioUnit; + /* sanity check: this should not happen since the device must have been reset before */ if (wwo->lpQueuePtr || wwo->lpPlayPtr) ERR("out of sync\n"); - wwo->state = WINE_WS_CLOSED; /* mark the device as closed */ + wwo->state = WINE_WS_CLOSING; /* mark the device as closing */ + wwo->audioUnit = NULL; OSSpinLockUnlock(&wwo->lock); - err = AudioUnitUninitialize(wwo->audioUnit); + err = AudioUnitUninitialize(audioUnit); if (err) { ERR("AudioUnitUninitialize return %c%c%c%c\n", (char) (err >> 24), (char) (err >> 16), @@ -973,12 +977,17 @@ static DWORD wodClose(WORD wDevID) return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } - if ( !AudioUnit_CloseAudioUnit(wwo->audioUnit) ) + if ( !AudioUnit_CloseAudioUnit(audioUnit) ) { ERR("Can't close AudioUnit\n"); return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } + OSSpinLockLock(&wwo->lock); + assert(wwo->state == WINE_WS_CLOSING); + wwo->state = WINE_WS_CLOSED; /* mark the device as closed */ + OSSpinLockUnlock(&wwo->lock); + ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); } @@ -1332,7 +1341,8 @@ static DWORD wodReset(WORD wDevID) OSSpinLockLock(&wwo->lock); - if (wwo->state == WINE_WS_CLOSED || wwo->state == WINE_WS_OPENING) + if (wwo->state == WINE_WS_CLOSED || wwo->state == WINE_WS_CLOSING || + wwo->state == WINE_WS_OPENING) { OSSpinLockUnlock(&wwo->lock); WARN("resetting a closed device\n"); @@ -1631,8 +1641,8 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, OSSpinLockLock(&wwo->lock); /* We might have been called before wwo has been completely filled out by - * wodOpen. We have to do nothing in that case. The check of wwo->state - * below ensures that. */ + * wodOpen, or while it's being closed in wodClose. We have to do nothing + * in that case. The check of wwo->state below ensures that. */ while (dataNeeded > 0 && wwo->state == WINE_WS_PLAYING && wwo->lpPlayPtr) { unsigned int available = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset;

1 0

Paul Vriens : usp10/tests: Skip some tests on WinME.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 69d27865f688e7827c287f17ee6df72ad84ab35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d27865f688e7827c287f17e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Apr 11 14:17:45 2009 +0200 usp10/tests: Skip some tests on WinME. --- dlls/usp10/tests/usp10.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d485fc8..1eefee0 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1183,6 +1183,12 @@ static void test_digit_substitution(void) for (i = 0; i < sizeof(groups)/sizeof(groups[0]); i++) { ret = pEnumLanguageGroupLocalesA(enum_proc, groups[i], 0, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("EnumLanguageGroupLocalesA not implemented on this platform\n"); + break; + } + ok(ret, "EnumLanguageGroupLocalesA failed unexpectedly: %u\n", GetLastError()); } }

1 0

Kai Blin : secur32: Work around ntlm_auth in Samba 3.0. 28a being broken for cached credentials.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 7788c8ed0d84be2537280c188fb07fb7118b3883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7788c8ed0d84be2537280c188… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Apr 13 22:39:39 2009 +0200 secur32: Work around ntlm_auth in Samba 3.0.28a being broken for cached credentials. Samba 3.0.28a (as shipped with Ubuntu 8.04) seems to break when using cached credentials backed by winbindd, returning a BH error in our test if we still need to provide a password. Handle this and report a more correct error. --- dlls/secur32/ntlm.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7e44dd7..5e2450a 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -662,8 +662,20 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_NO_CREDENTIALS; goto isc_end; } - else /* Just do a noop on the next run */ + else + { + /* Some versions of Samba have a broken ntlm_auth that can + * return "BH" here. Catch this and abort. */ + if(!strncmp(buffer, "BH", 2)) + { + ERR("ntlm_auth replied 'BH'. This should not happen. " + "Please fix your ntlm_auth install and try again.\n"); + ret = SEC_E_INTERNAL_ERROR; + goto isc_end; + } + /* Otherwise, just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); + } } else {

1 0

Ken Thomases : winecoreaudio: For waveOut, don't use STOPPED state; it' s redundant.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 5c4ed3bcce380b8ff834654f8dbd72bff5302989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4ed3bcce380b8ff834654f8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:27 2009 -0500 winecoreaudio: For waveOut, don't use STOPPED state; it's redundant. The distinction between PLAYING and STOPPED has always been whether lpPlayPtr is NULL, so just use that instead of two states. --- dlls/winecoreaudio.drv/audio.c | 41 ++++++++++++++------------------------- 1 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 9b55326..f3a63a4 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -87,22 +87,21 @@ AudioUnitRender( AudioUnit ci, * +---------+-------------+---------------+---------------------------------+ * | state | function | event | new state | * +---------+-------------+---------------+---------------------------------+ -* | | open() | | STOPPED | +* | | open() | | PLAYING | * | PAUSED | write() | | PAUSED | -* | STOPPED | write() | <thrd create> | PLAYING | * | PLAYING | write() | HEADER | PLAYING | * | (other) | write() | <error> | | * | (any) | pause() | PAUSING | PAUSED | -* | PAUSED | restart() | RESTARTING | PLAYING (if no thrd => STOPPED) | -* | (any) | reset() | RESETTING | STOPPED | +* | PAUSED | restart() | RESTARTING | PLAYING | +* | (any) | reset() | RESETTING | PLAYING | * | (any) | close() | CLOSING | CLOSED | * +---------+-------------+---------------+---------------------------------+ */ /* states of the playing device */ -#define WINE_WS_PLAYING 0 +#define WINE_WS_PLAYING 0 /* for waveOut: lpPlayPtr == NULL -> stopped */ #define WINE_WS_PAUSED 1 -#define WINE_WS_STOPPED 2 +#define WINE_WS_STOPPED 2 /* Not used for waveOut */ #define WINE_WS_CLOSED 3 #define WINE_WS_OPENING 4 #define WINE_WS_CLOSING 5 @@ -888,7 +887,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->audioUnit = audioUnit; wwo->streamDescription = streamFormat; - wwo->state = WINE_WS_STOPPED; + wwo->state = WINE_WS_PLAYING; wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); @@ -1101,9 +1100,7 @@ static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) /* We didn't loop back. Advance to the next wave header */ wwo->lpPlayPtr = wwo->lpPlayPtr->lpNext; - if (!wwo->lpPlayPtr) - wwo->state = WINE_WS_STOPPED; - else + if (wwo->lpPlayPtr) wodHelper_CheckForLoopBegin(wwo); } } @@ -1228,9 +1225,6 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) { wwo->lpPlayPtr = lpWaveHdr; - if (wwo->state == WINE_WS_STOPPED) - wwo->state = WINE_WS_PLAYING; - wodHelper_CheckForLoopBegin(wwo); wwo->dwPartialOffset = 0; @@ -1259,9 +1253,9 @@ static DWORD wodPause(WORD wDevID) * the mutex while we make an Audio Unit call. Stop the Audio Unit before * setting the PAUSED state. In wodRestart, the order is reversed. This * guarantees that we can't get into a situation where the state is - * PLAYING or STOPPED but the Audio Unit isn't running. Although we can - * be in PAUSED state with the Audio Unit still running, that's harmless - * because the render callback will just produce silence. + * PLAYING but the Audio Unit isn't running. Although we can be in PAUSED + * state with the Audio Unit still running, that's harmless because the + * render callback will just produce silence. */ status = AudioOutputUnitStop(WOutDev[wDevID].audioUnit); if (status) { @@ -1270,7 +1264,7 @@ static DWORD wodPause(WORD wDevID) } OSSpinLockLock(&WOutDev[wDevID].lock); - if (WOutDev[wDevID].state == WINE_WS_PLAYING || WOutDev[wDevID].state == WINE_WS_STOPPED) + if (WOutDev[wDevID].state == WINE_WS_PLAYING) WOutDev[wDevID].state = WINE_WS_PAUSED; OSSpinLockUnlock(&WOutDev[wDevID].lock); @@ -1293,21 +1287,16 @@ static DWORD wodRestart(WORD wDevID) } /* The order of the following operations is important since we can't hold - * the mutex while we make an Audio Unit call. Set the PLAYING/STOPPED + * the mutex while we make an Audio Unit call. Set the PLAYING * state before starting the Audio Unit. In wodPause, the order is * reversed. This guarantees that we can't get into a situation where - * the state is PLAYING or STOPPED but the Audio Unit isn't running. + * the state is PLAYING but the Audio Unit isn't running. * Although we can be in PAUSED state with the Audio Unit still running, * that's harmless because the render callback will just produce silence. */ OSSpinLockLock(&WOutDev[wDevID].lock); if (WOutDev[wDevID].state == WINE_WS_PAUSED) - { - if (WOutDev[wDevID].lpPlayPtr) - WOutDev[wDevID].state = WINE_WS_PLAYING; - else - WOutDev[wDevID].state = WINE_WS_STOPPED; - } + WOutDev[wDevID].state = WINE_WS_PLAYING; OSSpinLockUnlock(&WOutDev[wDevID].lock); status = AudioOutputUnitStart(WOutDev[wDevID].audioUnit); @@ -1351,7 +1340,7 @@ static DWORD wodReset(WORD wDevID) lpSavedQueuePtr = wwo->lpQueuePtr; wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; - wwo->state = WINE_WS_STOPPED; + wwo->state = WINE_WS_PLAYING; wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0; wwo->dwPartialOffset = 0; /* Clear partial wavehdr */

1 0

Tobias Jakobi : wined3d: Add newline to fixme.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 9657e81429bed75c7b09291fc752a88d7d3a3245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9657e81429bed75c7b09291fc… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Fri Apr 10 16:17:55 2009 +0200 wined3d: Add newline to fixme. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5cea411..7e2b234 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -673,7 +673,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if(shader_is_pshader_version(ins->reg_maps->shader_version)) { const IWineD3DPixelShaderImpl* const ps = (const IWineD3DPixelShaderImpl*)This; if(ps->cur_args->texrect_fixup & (1 << sampler_idx)) { - FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead)."); + FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); } } break;

1 0

Alexandre Julliard : c2man: Fix the array reference syntax and the return value regexps.
by Alexandre Julliard April 14, 2009

April 14, 2009

Module: wine Branch: master Commit: 6fb1d752390e359fb2f6b96e7da6e111f4b3ddd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb1d752390e359fb2f6b96e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 19:52:04 2009 +0200 c2man: Fix the array reference syntax and the return value regexps. --- tools/c2man.pl | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 4272b73..b1fd022 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -629,7 +629,7 @@ sub process_comment($) # When the function is exported twice we have the second name below the first # (you see this a lot in ntdll, but also in some other places). - my $first_line = ${@{$comment->{TEXT}}}[1]; + my $first_line = ${$comment->{TEXT}}[1]; if ( $first_line =~ /^(@|[A-Za-z0-9_]+) +($|\[)([A-Za-z0-9_]+)\.(([0-9]+)|@)($|\])$/ ) { @@ -644,14 +644,14 @@ sub process_comment($) my $alt_export = @{$spec_details->{EXPORTS}}[$alt_index]; @$alt_export[4] |= $FLAG_DOCUMENTED; $spec_details->{NUM_DOCS}++; - ${@{$comment->{TEXT}}}[1] = ""; + ${$comment->{TEXT}}[1] = ""; } } if (@{$spec_details->{CURRENT_EXTRA}}) { # We have an extra comment that might be related to this one - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = ${$spec_details->{CURRENT_EXTRA}}[0]; my $current_name = $current_comment->{COMMENT_NAME}; if ($comment->{COMMENT_NAME} =~ /^$current_name/ && $comment->{COMMENT_NAME} ne $current_name) { @@ -822,12 +822,12 @@ sub process_comment($) if ( $prototype =~ /(WINAPIV|WINAPI|__cdecl|PASCAL|CALLBACK|FARPROC16)/ ) { - $prototype =~ s/^(.*?) (WINAPIV|WINAPI|__cdecl|PASCAL|CALLBACK|FARPROC16) (.*?)\( *(.*)/$4/; + $prototype =~ s/^(.*?)\s+(WINAPIV|WINAPI|__cdecl|PASCAL|CALLBACK|FARPROC16)\s+(.*?)\(\s*(.*)/$4/; $comment->{RETURNS} = $1; } else { - $prototype =~ s/^(.*?)([A-Za-z0-9_]+)\( *(.*)/$3/; + $prototype =~ s/^(.*?)([A-Za-z0-9_]+)\s*\(\s*(.*)/$3/; $comment->{RETURNS} = $1; } @@ -988,7 +988,7 @@ sub process_extra_comment($) if (@{$spec_details->{CURRENT_EXTRA}}) { - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = ${$spec_details->{CURRENT_EXTRA}}[0]; if ($opt_verbose > 0) { @@ -1074,7 +1074,7 @@ sub process_index_files() if (@{$spec_details->{CURRENT_EXTRA}}) { # We have an unwritten extra comment, write it - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = ${$spec_details->{CURRENT_EXTRA}}[0]; process_extra_comment($current_comment); @{$spec_details->{CURRENT_EXTRA}} = (); } @@ -1470,7 +1470,7 @@ sub output_api_synopsis($) my $biggest_length = 0; for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = ${$comment->{PROTOTYPE}}[$i]; if ($line =~ /(.+?)([A-Za-z_][A-Za-z_0-9]*)$/) { my $length = length $1; @@ -1484,19 +1484,19 @@ sub output_api_synopsis($) # Now pad the string with blanks for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = ${$comment->{PROTOTYPE}}[$i]; if ($line =~ /(.+?)([A-Za-z_][A-Za-z_0-9]*)$/) { my $pad_len = $biggest_length - length $1; my $padding = " " x ($pad_len); - ${@{$comment->{PROTOTYPE}}}[$i] = $1.$padding.$2; + ${$comment->{PROTOTYPE}}[$i] = $1.$padding.$2; } } for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { # Format the parameter name - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = ${$comment->{PROTOTYPE}}[$i]; my $comma = ($i == @{$comment->{PROTOTYPE}}-1) ? "" : ","; $line =~ s/(.+?)([A-Za-z_][A-Za-z_0-9]*)$/ $fmt[0]$1$fmt[2]$2$fmt[3]$comma$fmt[1]/; print OUTPUT $line;

1 0