January 2011 - Wine-commits

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_private_data().
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 92e439b0f0853c7554862e963a74f2075f0417ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e439b0f0853c7554862e963… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 6 09:39:02 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_private_data(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 6 ++++-- dlls/wined3d/resource.c | 39 +++++++++++++++++++++------------------ dlls/wined3d/surface_base.c | 6 ++++-- dlls/wined3d/texture.c | 6 ++++-- dlls/wined3d/volume.c | 6 ++++-- dlls/wined3d/volumetexture.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 43 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e3f71a0..43fe20e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -770,7 +770,7 @@ static HRESULT STDMETHODCALLTYPE buffer_SetPrivateData(IWineD3DBuffer *iface, static HRESULT STDMETHODCALLTYPE buffer_GetPrivateData(IWineD3DBuffer *iface, REFGUID guid, void *data, DWORD *data_size) { - return resource_get_private_data((IWineD3DResource *)iface, guid, data, data_size); + return resource_get_private_data((IWineD3DResourceImpl *)iface, guid, data, data_size); } static HRESULT STDMETHODCALLTYPE buffer_FreePrivateData(IWineD3DBuffer *iface, REFGUID guid) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 2449b79..89afcbf 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -218,8 +218,10 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_SetPrivateData(IWineD3DCubeTexture return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); } -static HRESULT WINAPI IWineD3DCubeTextureImpl_GetPrivateData(IWineD3DCubeTexture *iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); +static HRESULT WINAPI IWineD3DCubeTextureImpl_GetPrivateData(IWineD3DCubeTexture *iface, + REFGUID guid, void *data, DWORD *data_size) +{ + return resource_get_private_data((IWineD3DResourceImpl *)iface, guid, data, data_size); } static HRESULT WINAPI IWineD3DCubeTextureImpl_FreePrivateData(IWineD3DCubeTexture *iface, REFGUID refguid) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 76267d5..173fa58 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -192,33 +192,36 @@ HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID refguid, return WINED3D_OK; } -HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) +HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - struct private_data *data; + const struct private_data *d; - TRACE("(%p) : %p %p %p\n", This, refguid, pData, pSizeOfData); - data = resource_find_private_data(This, refguid); - if (!data) return WINED3DERR_NOTFOUND; + TRACE("resource %p, guid %s, data %p, data_size %p.\n", + resource, debugstr_guid(guid), data, data_size); + + d = resource_find_private_data(resource, guid); + if (!d) return WINED3DERR_NOTFOUND; - if (*pSizeOfData < data->size) { - *pSizeOfData = data->size; + if (*data_size < d->size) + { + *data_size = d->size; return WINED3DERR_MOREDATA; } - if (data->flags & WINED3DSPD_IUNKNOWN) { - *(LPUNKNOWN *)pData = data->ptr.object; - if (((IWineD3DImpl *)This->resource.device->wined3d)->dxVersion != 7) + if (d->flags & WINED3DSPD_IUNKNOWN) + { + *(IUnknown **)data = d->ptr.object; + if (((IWineD3DImpl *)resource->resource.device->wined3d)->dxVersion != 7) { - /* D3D8 and D3D9 addref the private data, DDraw does not. This can't be handled in - * ddraw because it doesn't know if the pointer returned is an IUnknown * or just a - * Blob - */ - IUnknown_AddRef(data->ptr.object); + /* D3D8 and D3D9 addref the private data, DDraw does not. This + * can't be handled in ddraw because it doesn't know if the + * pointer returned is an IUnknown * or just a blob. */ + IUnknown_AddRef(d->ptr.object); } } - else { - memcpy(pData, data->ptr.data, data->size); + else + { + memcpy(data, d->ptr.data, d->size); } return WINED3D_OK; diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 14268b8..c499d71 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -117,8 +117,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPrivateData(IWineD3DSurface *iface, return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPrivateData(IWineD3DSurface *iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); +HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPrivateData(IWineD3DSurface *iface, + REFGUID guid, void *data, DWORD *data_size) +{ + return resource_get_private_data((IWineD3DResourceImpl *)iface, guid, data, data_size); } HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, REFGUID refguid) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bb00fc4..7759435 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -243,8 +243,10 @@ static HRESULT WINAPI IWineD3DTextureImpl_SetPrivateData(IWineD3DTexture *iface, return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); } -static HRESULT WINAPI IWineD3DTextureImpl_GetPrivateData(IWineD3DTexture *iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); +static HRESULT WINAPI IWineD3DTextureImpl_GetPrivateData(IWineD3DTexture *iface, + REFGUID guid, void *data, DWORD *data_size) +{ + return resource_get_private_data((IWineD3DResourceImpl *)iface, guid, data, data_size); } static HRESULT WINAPI IWineD3DTextureImpl_FreePrivateData(IWineD3DTexture *iface, REFGUID refguid) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 4c55170..6334966 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -156,8 +156,10 @@ static HRESULT WINAPI IWineD3DVolumeImpl_SetPrivateData(IWineD3DVolume *iface, return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); } -static HRESULT WINAPI IWineD3DVolumeImpl_GetPrivateData(IWineD3DVolume *iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); +static HRESULT WINAPI IWineD3DVolumeImpl_GetPrivateData(IWineD3DVolume *iface, + REFGUID guid, void *data, DWORD *data_size) +{ + return resource_get_private_data((IWineD3DResourceImpl *)iface, guid, data, data_size); } static HRESULT WINAPI IWineD3DVolumeImpl_FreePrivateData(IWineD3DVolume *iface, REFGUID refguid) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index e3e16d3..ed837a7 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -163,8 +163,10 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetPrivateData(IWineD3DVolumeTex return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DVolumeTexture *iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); +static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DVolumeTexture *iface, + REFGUID guid, void *data, DWORD *data_size) +{ + return resource_get_private_data((IWineD3DResourceImpl *)iface, guid, data, data_size); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DVolumeTexture *iface, REFGUID refguid) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a0d068..d6de00e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1831,7 +1831,7 @@ typedef struct IWineD3DResourceImpl void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) DECLSPEC_HIDDEN; DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; -HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID guid, +HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN; HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format,

1 0

Ken Thomases : winemenubuilder: On Mac OS X, keep multiple icon sizes.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 53ba89c9673faead03a938166be7e05f98b4ef36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ba89c9673faead03a938166… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 5 04:57:18 2011 -0600 winemenubuilder: On Mac OS X, keep multiple icon sizes. ICNS files can store multiple sizes, like ICOs. --- programs/winemenubuilder/winemenubuilder.c | 120 +++++++++++++++++++++------- 1 files changed, 91 insertions(+), 29 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d88dac1..dfb2441 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -815,10 +815,35 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt } #ifdef __APPLE__ -static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, - int bestIndex, LPCWSTR icoPathW, +#define ICNS_SLOTS 6 + +static inline int size_to_slot(int size) +{ + switch (size) + { + case 16: return 0; + case 32: return 1; + case 48: return 2; + case 128: return 3; + case 256: return 4; + case 512: return 5; + } + + return -1; +} + +static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { + ICONDIRENTRY *iconDirEntries = NULL; + int numEntries; + struct { + int index; + int maxPixels; + int maxBits; + } best[ICNS_SLOTS]; + int indexes[ICNS_SLOTS]; + int i; GUID guid; WCHAR *guidStrW = NULL; char *guidStrA = NULL; @@ -826,6 +851,42 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LARGE_INTEGER zero; HRESULT hr; + hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); + if (FAILED(hr)) + goto end; + for (i = 0; i < ICNS_SLOTS; i++) + { + best[i].index = -1; + best[i].maxPixels = 0; + best[i].maxBits = 0; + } + for (i = 0; i < numEntries; i++) + { + int slot; + + WINE_TRACE("[%d]: %d x %d @ %d\n", i, iconDirEntries[i].bWidth, + iconDirEntries[i].bHeight, iconDirEntries[i].wBitCount); + slot = size_to_slot(iconDirEntries[i].bWidth); + if (slot < 0) + continue; + if (iconDirEntries[i].wBitCount >= best[slot].maxBits && + (iconDirEntries[i].bHeight * iconDirEntries[i].bWidth) >= best[slot].maxPixels) + { + best[slot].index = i; + best[slot].maxPixels = iconDirEntries[i].bHeight * iconDirEntries[i].bWidth; + best[slot].maxBits = iconDirEntries[i].wBitCount; + } + } + numEntries = 0; + for (i = 0; i < ICNS_SLOTS; i++) + { + if (best[i].index >= 0) + { + indexes[numEntries] = best[i].index; + numEntries++; + } + } + hr = CoCreateGuid(&guid); if (FAILED(hr)) { @@ -859,7 +920,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, WINE_WARN("seeking icon stream failed, error 0x%08X\n", hr); goto end; } - hr = convert_to_native_icon(icoStream, &bestIndex, 1, &CLSID_WICIcnsEncoder, + hr = convert_to_native_icon(icoStream, indexes, numEntries, &CLSID_WICIcnsEncoder, icnsPath, icoPathW); if (FAILED(hr)) { @@ -869,6 +930,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, } end: + HeapFree(GetProcessHeap(), 0, iconDirEntries); CoTaskMemFree(guidStrW); HeapFree(GetProcessHeap(), 0, guidStrA); if (SUCCEEDED(hr)) @@ -878,10 +940,15 @@ end: return hr; } #else -static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, - int bestIndex, LPCWSTR icoPathW, +static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { + ICONDIRENTRY *iconDirEntries = NULL; + int numEntries; + int bestIndex = -1; + int maxPixels = 0; + int maxBits = 0; + int i; char *icoPathA = NULL; char *iconsDir = NULL; char *pngPath = NULL; @@ -890,6 +957,23 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, HRESULT hr = S_OK; LARGE_INTEGER zero; + hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); + if (FAILED(hr)) + goto end; + for (i = 0; i < numEntries; i++) + { + WINE_TRACE("[%d]: %d x %d @ %d\n", i, iconDirEntries[i].bWidth, + iconDirEntries[i].bHeight, iconDirEntries[i].wBitCount); + if (iconDirEntries[i].wBitCount >= maxBits && + (iconDirEntries[i].bHeight * iconDirEntries[i].bWidth) >= maxPixels) + { + bestIndex = i; + maxPixels = iconDirEntries[i].bHeight * iconDirEntries[i].bWidth; + maxBits = iconDirEntries[i].wBitCount; + } + } + WINE_TRACE("Selected: %d\n", bestIndex); + icoPathA = wchars_to_utf8_chars(icoPathW); if (icoPathA == NULL) { @@ -938,6 +1022,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, pngPath, icoPathW); end: + HeapFree(GetProcessHeap(), 0, iconDirEntries); HeapFree(GetProcessHeap(), 0, icoPathA); HeapFree(GetProcessHeap(), 0, iconsDir); HeapFree(GetProcessHeap(), 0, pngPath); @@ -951,12 +1036,6 @@ static char *extract_icon(LPCWSTR icoPathW, int index, const char *destFilename, IStream *stream = NULL; HRESULT hr; char *nativeIdentifier = NULL; - ICONDIRENTRY *iconDirEntries = NULL; - int numEntries; - int bestIndex = -1; - int maxPixels = 0; - int maxBits = 0; - int i; WINE_TRACE("path=[%s] index=%d destFilename=[%s]\n", wine_dbgstr_w(icoPathW), index, wine_dbgstr_a(destFilename)); @@ -966,30 +1045,13 @@ static char *extract_icon(LPCWSTR icoPathW, int index, const char *destFilename, WINE_WARN("opening icon %s index %d failed, hr=0x%08X\n", wine_dbgstr_w(icoPathW), index, hr); goto end; } - hr = read_ico_direntries(stream, &iconDirEntries, &numEntries); - if (FAILED(hr)) - goto end; - for (i = 0; i < numEntries; i++) - { - WINE_TRACE("[%d]: %d x %d @ %d\n", i, iconDirEntries[i].bWidth, - iconDirEntries[i].bHeight, iconDirEntries[i].wBitCount); - if (iconDirEntries[i].wBitCount >= maxBits && - (iconDirEntries[i].bHeight * iconDirEntries[i].bWidth) >= maxPixels) - { - bestIndex = i; - maxPixels = iconDirEntries[i].bHeight * iconDirEntries[i].bWidth; - maxBits = iconDirEntries[i].wBitCount; - } - } - WINE_TRACE("Selected: %d\n", bestIndex); - hr = platform_write_icon(stream, index, bestIndex, icoPathW, destFilename, &nativeIdentifier); + hr = platform_write_icon(stream, index, icoPathW, destFilename, &nativeIdentifier); if (FAILED(hr)) WINE_WARN("writing icon failed, error 0x%08X\n", hr); end: if (stream) IStream_Release(stream); - HeapFree(GetProcessHeap(), 0, iconDirEntries); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, nativeIdentifier);

1 0

Ken Thomases : windowscodecs: Use Mac OS X native ICNS support, not libicns .
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 21137cd3c3570e14e4231d6f6cc1dc6a047fb3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21137cd3c3570e14e4231d6f6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 5 07:25:23 2011 -0600 windowscodecs: Use Mac OS X native ICNS support, not libicns. The ICNS support is only used on Mac OS X and is not anticipated to be used on any other platform. So, we can rely on the native frameworks rather than a third-party dependency. --- configure | 78 +----------- configure.ac | 16 +-- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/icnsformat.c | 270 ++++++++++++++++----------------------- include/config.h.in | 10 +- 5 files changed, 123 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21137cd3c3570e14e4231…

1 0

Andrew Eikum : mmdevapi: Be explicit about the units of ACImpl::ofs.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 0b608d0f7fa7ee0a4e7f6b6d1de5976b04807bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b608d0f7fa7ee0a4e7f6b6d1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 4 15:30:32 2011 -0600 mmdevapi: Be explicit about the units of ACImpl::ofs. --- dlls/mmdevapi/audio.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 7413fa3..631af35 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -64,7 +64,8 @@ typedef struct ACImpl { BOOL init, running; CRITICAL_SECTION *crst; HANDLE handle; - DWORD locked, flags, bufsize_frames, pad, padpartial, ofs, periodsize_frames, candisconnect; + DWORD locked, flags, candisconnect; + DWORD bufsize_frames, ofs_frames, periodsize_frames, pad, padpartial; BYTE *buffer; WAVEFORMATEX *pwfx; ALuint source; @@ -665,7 +666,7 @@ static int disconnected(ACImpl *This) return 1; WARN("Emptying buffer after newly reconnected!\n"); - This->pad = This->ofs = 0; + This->pad = This->ofs_frames = 0; if (This->running) palcCaptureStart(This->dev); } @@ -742,18 +743,18 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) DWORD block = This->pwfx->nBlockAlign; palcGetIntegerv(This->dev, ALC_CAPTURE_SAMPLES, 1, &avail); if (avail) { - DWORD ofs = This->ofs + This->pad; + DWORD ofs_frames = This->ofs_frames + This->pad; BYTE *buf1; - ofs %= This->bufsize_frames; - buf1 = This->buffer + (ofs * block); + ofs_frames %= This->bufsize_frames; + buf1 = This->buffer + (ofs_frames * block); This->laststamp = gettime(); if (This->handle) SetEvent(This->handle); - if (ofs + avail <= This->bufsize_frames) + if (ofs_frames + avail <= This->bufsize_frames) palcCaptureSamples(This->dev, buf1, avail); else { - DWORD part1 = This->bufsize_frames - ofs; + DWORD part1 = This->bufsize_frames - ofs_frames; palcCaptureSamples(This->dev, buf1, part1); palcCaptureSamples(This->dev, This->buffer, avail - part1); } @@ -763,11 +764,11 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) if (This->pad > This->bufsize_frames) { DWORD rest; WARN("Overflowed! %u frames\n", This->pad - This->bufsize_frames); - This->ofs += This->pad - This->bufsize_frames; - rest = This->ofs % This->periodsize_frames; + This->ofs_frames += This->pad - This->bufsize_frames; + rest = This->ofs_frames % This->periodsize_frames; if (rest) - This->ofs += This->periodsize_frames - rest; - This->ofs %= This->bufsize_frames; + This->ofs_frames += This->periodsize_frames - rest; + This->ofs_frames %= This->bufsize_frames; This->pad = This->bufsize_frames; } } @@ -1015,7 +1016,7 @@ static HRESULT WINAPI AC_Reset(IAudioClient *iface) palcCaptureSamples(This->dev, This->buffer, avail); } This->pad = This->padpartial = 0; - This->ofs = 0; + This->ofs_frames = 0; This->frameswritten = 0; out: LeaveCriticalSection(This->crst); @@ -1187,9 +1188,9 @@ static HRESULT WINAPI ACR_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BY /* Exact offset doesn't matter, offset could be 0 forever * but increasing it is easier to debug */ - if (This->parent->ofs + frames > This->parent->bufsize_frames) - This->parent->ofs = 0; - *data = This->parent->buffer + This->parent->ofs * framesize; + if (This->parent->ofs_frames + frames > This->parent->bufsize_frames) + This->parent->ofs_frames = 0; + *data = This->parent->buffer + This->parent->ofs_frames * framesize; LeaveCriticalSection(This->parent->crst); return S_OK; @@ -1200,7 +1201,7 @@ static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 writte ACRender *This = (ACRender*)iface; BYTE *buf = This->parent->buffer; DWORD framesize = This->parent->pwfx->nBlockAlign; - DWORD ofs = This->parent->ofs; + DWORD ofs = This->parent->ofs_frames; DWORD bufsize = This->parent->bufsize_frames; DWORD freq = This->parent->pwfx->nSamplesPerSec; DWORD bpp = This->parent->pwfx->wBitsPerSample; @@ -1226,8 +1227,8 @@ static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 writte EnterCriticalSection(This->parent->crst); - This->parent->ofs += written; - This->parent->ofs %= bufsize; + This->parent->ofs_frames += written; + This->parent->ofs_frames %= bufsize; This->parent->pad += written; This->parent->frameswritten += written; This->parent->locked = 0; @@ -1384,7 +1385,7 @@ static HRESULT WINAPI ACC_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UIN if (This->parent->locked) goto out; IAudioCaptureClient_GetNextPacketSize(iface, frames); - ofs = This->parent->ofs; + ofs = This->parent->ofs_frames; if ( ofs % This->parent->periodsize_frames) ERR("Unaligned offset %u with %u\n", ofs, This->parent->periodsize_frames); *data = This->parent->buffer + ofs * block; @@ -1410,8 +1411,8 @@ static HRESULT WINAPI ACC_ReleaseBuffer(IAudioCaptureClient *iface, UINT32 writt EnterCriticalSection(This->parent->crst); if (!written || written == This->parent->locked) { This->parent->locked = 0; - This->parent->ofs += written; - This->parent->ofs %= This->parent->bufsize_frames; + This->parent->ofs_frames += written; + This->parent->ofs_frames %= This->parent->bufsize_frames; This->parent->pad -= written; } else if (!This->parent->locked) hr = AUDCLNT_E_OUT_OF_ORDER;

1 0

Andrew Eikum : mmdevapi: Be explicit about units in IAudioRenderClient:: ReleaseBuffer.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 2e7ee8d9d67e65c05a1026baaa9daa1c1bdc554b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e7ee8d9d67e65c05a1026baa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 4 15:30:34 2011 -0600 mmdevapi: Be explicit about units in IAudioRenderClient::ReleaseBuffer. --- dlls/mmdevapi/audio.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 631af35..b97dccb 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -1196,26 +1196,26 @@ static HRESULT WINAPI ACR_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BY return S_OK; } -static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 written, DWORD flags) +static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACRender *This = (ACRender*)iface; BYTE *buf = This->parent->buffer; DWORD framesize = This->parent->pwfx->nBlockAlign; - DWORD ofs = This->parent->ofs_frames; - DWORD bufsize = This->parent->bufsize_frames; + DWORD ofs_bytes = This->parent->ofs_frames * framesize; + DWORD written_bytes = written_frames * framesize; DWORD freq = This->parent->pwfx->nSamplesPerSec; DWORD bpp = This->parent->pwfx->wBitsPerSample; ALuint albuf; - TRACE("(%p)->(%u,%x)\n", This, written, flags); + TRACE("(%p)->(%u,%x)\n", This, written_frames, flags); - if (This->parent->locked < written) + if (This->parent->locked < written_frames) return AUDCLNT_E_INVALID_SIZE; if (flags & ~AUDCLNT_BUFFERFLAGS_SILENT) return E_INVALIDARG; - if (!written) { + if (!written_frames) { if (This->parent->locked) FIXME("Handled right?\n"); This->parent->locked = 0; @@ -1227,25 +1227,21 @@ static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 writte EnterCriticalSection(This->parent->crst); - This->parent->ofs_frames += written; - This->parent->ofs_frames %= bufsize; - This->parent->pad += written; - This->parent->frameswritten += written; + This->parent->ofs_frames += written_frames; + This->parent->ofs_frames %= This->parent->bufsize_frames; + This->parent->pad += written_frames; + This->parent->frameswritten += written_frames; This->parent->locked = 0; - ofs *= framesize; - written *= framesize; - bufsize *= framesize; - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) - memset(buf+ofs, bpp != 8 ? 0 : 128, written); - TRACE("buf: %p, ofs: %x, written %u, freq %u\n", buf, ofs, written, freq); + memset(buf + ofs_bytes, bpp != 8 ? 0 : 128, written_bytes); + TRACE("buf: %p, ofs: %x, written %u, freq %u\n", buf, ofs_bytes, written_bytes, freq); if (!valid_dev(This->parent)) goto out; setALContext(This->parent->parent->ctx); palGenBuffers(1, &albuf); - palBufferData(albuf, This->parent->format, buf+ofs, written, freq); + palBufferData(albuf, This->parent->format, buf + ofs_bytes, written_bytes, freq); palSourceQueueBuffers(This->parent->source, 1, &albuf); TRACE("Queued %u\n", albuf);

1 0

Huw Davies : wineps.drv: Explicitly report that we do not support blending.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 40ba10ed7ae8f17e8bb0ea89ae86437f7d0f3a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ba10ed7ae8f17e8bb0ea89a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 11:40:28 2011 +0000 wineps.drv: Explicitly report that we do not support blending. --- dlls/wineps.drv/init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index f0c4e18..e67ffe1 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -511,6 +511,8 @@ INT CDECL PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) case VREFRESH: case BLTALIGNMENT: return 0; + case SHADEBLENDCAPS: + return SB_NONE; default: FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap ); return 0;

1 0

André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 1bf86127188ff1de883735e1ac9df6174ad7b86d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf86127188ff1de883735e1a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 4 22:58:35 2011 +0100 user32/tests: Don't test function directly when reporting GetLastError(). --- dlls/user32/tests/clipboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index a0d0fe9..5b0f17e 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -68,8 +68,8 @@ static void test_ClipboardOwner(void) ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); SetLastError(0xdeadbeef); - ok(!OpenClipboard(hWnd2) && - (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED), + ret = OpenClipboard(hWnd2); + ok(!ret && (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED), "OpenClipboard should fail without setting last error value, or with ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -79,8 +79,8 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); SetLastError(0xdeadbeef); - ok(!OpenClipboard(hWnd2) && - (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED), + ret = OpenClipboard(hWnd2); + ok(!ret && (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED), "OpenClipboard should fail without setting last error valuei, or with ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); ret = CloseClipboard();

1 0

Andrew Eikum : mmdevapi: Store period size in frames.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: bbbf72ddcb12022a1cc229068690302a147b5456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbf72ddcb12022a1cc229068… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 4 15:30:27 2011 -0600 mmdevapi: Store period size in frames. There are three different units to represent durations of audio: time, bytes, and frames. Since all three are in use in this module, we should be more explicit about the unit of each variable. --- dlls/mmdevapi/audio.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 0433b84..6659681 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -64,7 +64,7 @@ typedef struct ACImpl { BOOL init, running; CRITICAL_SECTION *crst; HANDLE handle; - DWORD locked, flags, bufsize, pad, padpartial, ofs, psize, candisconnect; + DWORD locked, flags, bufsize, pad, padpartial, ofs, periodsize_frames, candisconnect; BYTE *buffer; WAVEFORMATEX *pwfx; ALuint source; @@ -515,15 +515,14 @@ static HRESULT WINAPI AC_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, if (FAILED(hr)) goto out; - This->psize = (DWORD64)This->pwfx->nSamplesPerSec * time / (DWORD64)10000000; + This->periodsize_frames = (DWORD64)This->pwfx->nSamplesPerSec * time / (DWORD64)10000000; if (duration > 20000000) duration = 20000000; - bufsize = duration / time * This->psize; + bufsize = duration / time * This->periodsize_frames; if (duration % time) - bufsize += This->psize; + bufsize += This->periodsize_frames; This->bufsize = bufsize; - This->psize *= This->pwfx->nBlockAlign; bufsize *= pwfx->nBlockAlign; This->format = get_format(This->pwfx); @@ -694,20 +693,20 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) This->laststamp += period; if (This->parent->flow == eCapture) { - This->pad += This->psize; + This->pad += This->periodsize_frames; if (This->pad > This->bufsize) This->pad = This->bufsize; } else { - if (This->pad <= This->psize) { + if (This->pad <= This->periodsize_frames) { This->pad = 0; break; } else - This->pad -= This->psize; + This->pad -= This->periodsize_frames; } } if (This->parent->flow == eCapture) - *numpad = This->pad >= This->psize ? This->psize : 0; + *numpad = This->pad >= This->periodsize_frames ? This->periodsize_frames: 0; else *numpad = This->pad; } else if (This->parent->flow == eRender) { @@ -726,8 +725,8 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) #if 0 /* Manipulative lie */ } else if (This->running) { ALint size = This->pad - padpart; - if (size > This->psize) - size = This->psize; + if (size > This->periodsize_frames) + size = This->periodsize_frames; played = (gettime() - This->laststamp)*8; played = played * This->pwfx->nSamplesPerSec / 10000000; if (played > size) @@ -735,13 +734,12 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) #endif } *numpad = This->pad - This->padpartial - played; - if (This->handle && *numpad + This->psize <= This->bufsize) + if (This->handle && (*numpad + This->periodsize_frames) <= This->bufsize) SetEvent(This->handle); getALError(); popALContext(); } else { DWORD block = This->pwfx->nBlockAlign; - DWORD psize = This->psize / block; palcGetIntegerv(This->dev, ALC_CAPTURE_SAMPLES, 1, &avail); if (avail) { DWORD ofs = This->ofs + This->pad; @@ -766,15 +764,15 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) DWORD rest; WARN("Overflowed! %u bytes\n", This->pad - This->bufsize); This->ofs += This->pad - This->bufsize; - rest = This->ofs % psize; + rest = This->ofs % This->periodsize_frames; if (rest) - This->ofs += psize - rest; + This->ofs += This->periodsize_frames - rest; This->ofs %= This->bufsize; This->pad = This->bufsize; } } - if (This->pad >= psize) - *numpad = psize; + if (This->pad >= This->periodsize_frames) + *numpad = This->periodsize_frames; else *numpad = 0; } @@ -1387,8 +1385,8 @@ static HRESULT WINAPI ACC_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UIN goto out; IAudioCaptureClient_GetNextPacketSize(iface, frames); ofs = This->parent->ofs; - if ( (ofs*block) % This->parent->psize) - ERR("Unaligned offset %u with %u\n", ofs*block, This->parent->psize); + if ( ofs % This->parent->periodsize_frames) + ERR("Unaligned offset %u with %u\n", ofs, This->parent->periodsize_frames); *data = This->parent->buffer + ofs * block; This->parent->locked = *frames; if (devpos)

1 0

Andrew Eikum : mmdevapi: Be explicit about units of ACImpl::bufsize.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 045cf8c0afbb5e0665802e4cd54b16ceb19639b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045cf8c0afbb5e0665802e4cd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 4 15:30:30 2011 -0600 mmdevapi: Be explicit about units of ACImpl::bufsize. --- dlls/mmdevapi/audio.c | 56 ++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 6659681..7413fa3 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -64,7 +64,7 @@ typedef struct ACImpl { BOOL init, running; CRITICAL_SECTION *crst; HANDLE handle; - DWORD locked, flags, bufsize, pad, padpartial, ofs, periodsize_frames, candisconnect; + DWORD locked, flags, bufsize_frames, pad, padpartial, ofs, periodsize_frames, candisconnect; BYTE *buffer; WAVEFORMATEX *pwfx; ALuint source; @@ -387,10 +387,10 @@ static HRESULT AC_OpenRenderAL(ACImpl *This) static HRESULT AC_OpenCaptureAL(ACImpl *This) { char alname[MAX_PATH]; - ALint freq, size; + ALint freq, size_frames; freq = This->pwfx->nSamplesPerSec; - size = This->bufsize; + size_frames = This->bufsize_frames; alname[sizeof(alname)-1] = 0; if (This->dev) { @@ -399,11 +399,11 @@ static HRESULT AC_OpenCaptureAL(ACImpl *This) } WideCharToMultiByte(CP_UNIXCP, 0, This->parent->alname, -1, alname, sizeof(alname)/sizeof(*alname)-1, NULL, NULL); - This->dev = palcCaptureOpenDevice(alname, freq, This->format, size); + This->dev = palcCaptureOpenDevice(alname, freq, This->format, size_frames); if (!This->dev) { ALCenum err = palcGetError(NULL); FIXME("Could not open device %s with buf size %u: 0x%04x\n", - alname, This->bufsize, err); + alname, This->bufsize_frames, err); return AUDCLNT_E_DEVICE_IN_USE; } return S_OK; @@ -452,7 +452,8 @@ static HRESULT WINAPI AC_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, ACImpl *This = (ACImpl*)iface; HRESULT hr = S_OK; WAVEFORMATEX *pwfx2; - REFERENCE_TIME time, bufsize; + REFERENCE_TIME time; + DWORD bufsize_bytes; TRACE("(%p)->(%x,%x,%u,%u,%p,%s)\n", This, mode, flags, (int)duration, (int)period, pwfx, debugstr_guid(sessionguid)); if (This->init) @@ -519,11 +520,10 @@ static HRESULT WINAPI AC_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, if (duration > 20000000) duration = 20000000; - bufsize = duration / time * This->periodsize_frames; + This->bufsize_frames = duration / time * This->periodsize_frames; if (duration % time) - bufsize += This->periodsize_frames; - This->bufsize = bufsize; - bufsize *= pwfx->nBlockAlign; + This->bufsize_frames += This->periodsize_frames; + bufsize_bytes = This->bufsize_frames * pwfx->nBlockAlign; This->format = get_format(This->pwfx); if (This->parent->flow == eRender) { @@ -563,7 +563,7 @@ static HRESULT WINAPI AC_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, goto out; This->candisconnect = palcIsExtensionPresent(This->dev, "ALC_EXT_disconnect"); - This->buffer = HeapAlloc(GetProcessHeap(), 0, bufsize); + This->buffer = HeapAlloc(GetProcessHeap(), 0, bufsize_bytes); if (!This->buffer) { hr = E_OUTOFMEMORY; goto out; @@ -585,7 +585,7 @@ static HRESULT WINAPI AC_GetBufferSize(IAudioClient *iface, UINT32 *frames) return AUDCLNT_E_NOT_INITIALIZED; if (!frames) return E_POINTER; - *frames = This->bufsize; + *frames = This->bufsize_frames; return S_OK; } @@ -694,8 +694,8 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) if (This->parent->flow == eCapture) { This->pad += This->periodsize_frames; - if (This->pad > This->bufsize) - This->pad = This->bufsize; + if (This->pad > This->bufsize_frames) + This->pad = This->bufsize_frames; } else { if (This->pad <= This->periodsize_frames) { This->pad = 0; @@ -734,7 +734,7 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) #endif } *numpad = This->pad - This->padpartial - played; - if (This->handle && (*numpad + This->periodsize_frames) <= This->bufsize) + if (This->handle && (*numpad + This->periodsize_frames) <= This->bufsize_frames) SetEvent(This->handle); getALError(); popALContext(); @@ -744,31 +744,31 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) if (avail) { DWORD ofs = This->ofs + This->pad; BYTE *buf1; - ofs %= This->bufsize; + ofs %= This->bufsize_frames; buf1 = This->buffer + (ofs * block); This->laststamp = gettime(); if (This->handle) SetEvent(This->handle); - if (ofs + avail <= This->bufsize) + if (ofs + avail <= This->bufsize_frames) palcCaptureSamples(This->dev, buf1, avail); else { - DWORD part1 = This->bufsize - ofs; + DWORD part1 = This->bufsize_frames - ofs; palcCaptureSamples(This->dev, buf1, part1); palcCaptureSamples(This->dev, This->buffer, avail - part1); } This->pad += avail; This->frameswritten += avail; /* Increase ofs if the app forgets to read */ - if (This->pad > This->bufsize) { + if (This->pad > This->bufsize_frames) { DWORD rest; - WARN("Overflowed! %u bytes\n", This->pad - This->bufsize); - This->ofs += This->pad - This->bufsize; + WARN("Overflowed! %u frames\n", This->pad - This->bufsize_frames); + This->ofs += This->pad - This->bufsize_frames; rest = This->ofs % This->periodsize_frames; if (rest) This->ofs += This->periodsize_frames - rest; - This->ofs %= This->bufsize; - This->pad = This->bufsize; + This->ofs %= This->bufsize_frames; + This->pad = This->bufsize_frames; } } if (This->pad >= This->periodsize_frames) @@ -1177,8 +1177,8 @@ static HRESULT WINAPI ACR_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BY return AUDCLNT_E_OUT_OF_ORDER; } AC_GetCurrentPadding((IAudioClient*)This->parent, &free); - if (This->parent->bufsize-free < frames) { - ERR("Too large: %u %u %u\n", This->parent->bufsize, free, frames); + if (This->parent->bufsize_frames - free < frames) { + ERR("Too large: %u %u %u\n", This->parent->bufsize_frames, free, frames); return AUDCLNT_E_BUFFER_TOO_LARGE; } EnterCriticalSection(This->parent->crst); @@ -1187,7 +1187,7 @@ static HRESULT WINAPI ACR_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BY /* Exact offset doesn't matter, offset could be 0 forever * but increasing it is easier to debug */ - if (This->parent->ofs + frames > This->parent->bufsize) + if (This->parent->ofs + frames > This->parent->bufsize_frames) This->parent->ofs = 0; *data = This->parent->buffer + This->parent->ofs * framesize; @@ -1201,7 +1201,7 @@ static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 writte BYTE *buf = This->parent->buffer; DWORD framesize = This->parent->pwfx->nBlockAlign; DWORD ofs = This->parent->ofs; - DWORD bufsize = This->parent->bufsize; + DWORD bufsize = This->parent->bufsize_frames; DWORD freq = This->parent->pwfx->nSamplesPerSec; DWORD bpp = This->parent->pwfx->wBitsPerSample; ALuint albuf; @@ -1411,7 +1411,7 @@ static HRESULT WINAPI ACC_ReleaseBuffer(IAudioCaptureClient *iface, UINT32 writt if (!written || written == This->parent->locked) { This->parent->locked = 0; This->parent->ofs += written; - This->parent->ofs %= This->parent->bufsize; + This->parent->ofs %= This->parent->bufsize_frames; This->parent->pad -= written; } else if (!This->parent->locked) hr = AUDCLNT_E_OUT_OF_ORDER;

1 0

Huw Davies : wrc: Initialise variable.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: d5c66bc23d8bd9c4750fa5f20ed442dc05e8408c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c66bc23d8bd9c4750fa5f20… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 14:55:02 2011 +0000 wrc: Initialise variable. --- tools/wrc/po.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 2b7ed6d..6cfb5b4 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -469,7 +469,7 @@ static char *get_po_file_name( const language_t *lang ) static unsigned int flush_po_files( const char *output_name ) { struct po_file_lang *po_file, *next; - unsigned int count; + unsigned int count = 0; LIST_FOR_EACH_ENTRY_SAFE( po_file, next, &po_file_langs, struct po_file_lang, entry ) {

1 0