January 2011 - Wine-Commits

Hwang YunSong : winedbg: Update Korean resource.
by Alexandre Julliard Jan. 6, 2011

Jan. 6, 2011

Module: wine Branch: master Commit: f6b8689b0453f9edc03e21b53451e98e2be32651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b8689b0453f9edc03e21b53… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jan 6 10:49:59 2011 +0900 winedbg: Update Korean resource. --- programs/winedbg/rsrc_Ko.rc | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/rsrc_Ko.rc b/programs/winedbg/rsrc_Ko.rc index a68deac..3e5352c 100644 --- a/programs/winedbg/rsrc_Ko.rc +++ b/programs/winedbg/rsrc_Ko.rc @@ -2,7 +2,7 @@ * Korean Language Support * * Copyright 2008 Mikolaj Zalewski - * Copyright 2009 YunSong Hwang + * Copyright 2009,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,36 +21,38 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDM_DEBUG_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "��(&D)", ID_DEBUG + MENUITEM "디버그(&D)", ID_DEBUG END END IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��α׷� ��" -FONT 8, "Tahoma" +CAPTION "프로그램 에러" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 - LTEXT "�� α׷� %s �� ɰ�� ؼ� ��Ḧ �ʿ�� մϴ�. \ - �츮�� ĵ帰 �ſ� ��Ͽ� �� ǥ�Դϴ�.", + LTEXT "이 프로그램 %s 은 심각한 문제에 직면해서 종료를 필요로 합니다. \ + 우리는 불편을 끼쳐드린 거에 대하여 유감을 표함니다.", IDC_STATIC_TXT1,27,10,224,30 - LTEXT "��α׷�� Wind�� ߻�� ֽ��ϴ�. \ - �� α׷�� Ͽ� http://appdb.winehq.org �� Ȯ�� ֽ��ϴ�. \ + LTEXT "프로그램의 문제나 Wind의 결함으로 위해 발생할 수 있습니다. \ + 당신은 실행한 프로그램에 대하여 http://appdb.winehq.org 의 팁을 확인 할 수 있습니다. \ .\n\n\ - �� 쿡�� ʰ�, �� ׷� �� ʾ�� \ - , �� http://bugs.winehq.org�� ׷� �� ֽ��ϴ�.",IDC_STATIC_TXT2,27,60,224,100 - DEFPUSHBUTTON "�ݱ�", IDOK, 205, 151, 60, 16, WS_TABSTOP + 만약 이 문제가 윈도우에서는 존재하지 않고, 아직 버그로 보고되지 않았으면 \ + , 당신은 http://bugs.winehq.org에 버그로 보고할 수 있습니다.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "닫기", IDOK, 205, 151, 60, 16, WS_TABSTOP END STRINGTABLE BEGIN - IDS_AUTO_CAPTION "Wine ��α׷� �浹" - IDS_INVALID_PARAMS "�� -�ùٸ�� Ű�� " - IDS_UNIDENTIFIED "(�˼� ��)" + IDS_AUTO_CAPTION "Wine 프로그램 충돌" + IDS_INVALID_PARAMS "내부 에러 -올바르지 않은 매개변수가 들어옴" + IDS_UNIDENTIFIED "(알수 없음)" END

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_cleanup().
by Alexandre Julliard Jan. 6, 2011

Jan. 6, 2011

Module: wine Branch: master Commit: 134137cdb4ee210209da8a8ad38deef62e0bb70e URL: http://source.winehq.org/git/wine.git/?a=commit;h=134137cdb4ee210209da8a8ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 6 09:39:00 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_cleanup(). --- dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/resource.c | 31 ++++++++++++++++--------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d6678b7..6d0f951 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -48,7 +48,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, const struct wined3d_ if (!texture->baseTexture.sub_resources) { ERR("Failed to allocate sub-resource array.\n"); - resource_cleanup((IWineD3DResource *)texture); + resource_cleanup((IWineD3DResourceImpl *)texture); return E_OUTOFMEMORY; } @@ -79,7 +79,7 @@ void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) { basetexture_unload(texture); HeapFree(GetProcessHeap(), 0, texture->baseTexture.sub_resources); - resource_cleanup((IWineD3DResource *)texture); + resource_cleanup((IWineD3DResourceImpl *)texture); } IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bfed37c..b5aeee4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -742,7 +742,7 @@ static ULONG STDMETHODCALLTYPE buffer_Release(IWineD3DBuffer *iface) if (!refcount) { buffer_UnLoad(iface); - resource_cleanup((IWineD3DResource *)iface); + resource_cleanup((IWineD3DResourceImpl *)iface); This->resource.parent_ops->wined3d_object_destroyed(This->resource.parent); HeapFree(GetProcessHeap(), 0, This->maps); HeapFree(GetProcessHeap(), 0, This); @@ -1521,7 +1521,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, { ERR("Failed to map buffer, hr %#x\n", hr); buffer_UnLoad((IWineD3DBuffer *)buffer); - resource_cleanup((IWineD3DResource *)buffer); + resource_cleanup((IWineD3DResourceImpl *)buffer); return hr; } @@ -1535,7 +1535,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, { ERR("Out of memory\n"); buffer_UnLoad((IWineD3DBuffer *)buffer); - resource_cleanup((IWineD3DResource *)buffer); + resource_cleanup((IWineD3DResourceImpl *)buffer); return E_OUTOFMEMORY; } buffer->maps_size = 1; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 0c8aa98..7b8066e 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -93,33 +93,34 @@ HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE return WINED3D_OK; } -void resource_cleanup(IWineD3DResource *iface) +void resource_cleanup(struct IWineD3DResourceImpl *resource) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; struct private_data *data; struct list *e1, *e2; HRESULT hr; - TRACE("(%p) Cleaning up resource\n", This); - if (This->resource.pool == WINED3DPOOL_DEFAULT) { - TRACE("Decrementing device memory pool by %u\n", This->resource.size); - WineD3DAdapterChangeGLRam(This->resource.device, -This->resource.size); + TRACE("Cleaning up resource %p.\n", resource); + + if (resource->resource.pool == WINED3DPOOL_DEFAULT) + { + TRACE("Decrementing device memory pool by %u.\n", resource->resource.size); + WineD3DAdapterChangeGLRam(resource->resource.device, -resource->resource.size); } - LIST_FOR_EACH_SAFE(e1, e2, &This->resource.privateData) + LIST_FOR_EACH_SAFE(e1, e2, &resource->resource.privateData) { data = LIST_ENTRY(e1, struct private_data, entry); - hr = resource_free_private_data(iface, &data->tag); - if(hr != WINED3D_OK) { - ERR("Failed to free private data when destroying resource %p, hr = %08x\n", This, hr); - } + hr = resource_free_private_data((IWineD3DResource *)resource, &data->tag); + if (FAILED(hr)) + ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); } - HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); - This->resource.allocatedMemory = 0; - This->resource.heapMemory = 0; + HeapFree(GetProcessHeap(), 0, resource->resource.heapMemory); + resource->resource.allocatedMemory = 0; + resource->resource.heapMemory = 0; - if (This->resource.device) device_resource_released(This->resource.device, iface); + if (resource->resource.device) + device_resource_released(resource->resource.device, (IWineD3DResource *)resource); } void resource_unload(IWineD3DResourceImpl *resource) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4f37cc..8eedb90 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -89,7 +89,7 @@ static void surface_cleanup(IWineD3DSurfaceImpl *This) HeapFree(GetProcessHeap(), 0, This->palette9); - resource_cleanup((IWineD3DResource *)This); + resource_cleanup((IWineD3DResourceImpl *)This); } void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_type type, IWineD3DBase *container) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index b1c0b32..013ff2c 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -54,7 +54,7 @@ void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) HeapFree(GetProcessHeap(), 0, This->palette9); - resource_cleanup((IWineD3DResource *)This); + resource_cleanup((IWineD3DResourceImpl *)This); } /***************************************************************************** diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 8ccc482..dbc2116 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -133,7 +133,7 @@ static ULONG WINAPI IWineD3DVolumeImpl_Release(IWineD3DVolume *iface) { if (!ref) { - resource_cleanup((IWineD3DResource *)iface); + resource_cleanup((IWineD3DResourceImpl *)iface); This->resource.parent_ops->wined3d_object_destroyed(This->resource.parent); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d4009c..41456f9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1828,7 +1828,7 @@ typedef struct IWineD3DResourceImpl IWineD3DResourceClass resource; } IWineD3DResourceImpl; -void resource_cleanup(IWineD3DResource *iface) DECLSPEC_HIDDEN; +void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID guid) DECLSPEC_HIDDEN; DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID guid,

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_init().
by Alexandre Julliard Jan. 6, 2011

Jan. 6, 2011

Module: wine Branch: master Commit: 7080922e0e6938741d6c84b13728f51c1ea3e234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7080922e0e6938741d6c84b13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 6 09:38:59 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_init(). --- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/resource.c | 38 +++++++++++++++++++------------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 26beb29..d6678b7 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -34,7 +34,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, const struct wined3d_ { HRESULT hr; - hr = resource_init((IWineD3DResource *)texture, resource_type, device, + hr = resource_init((IWineD3DResourceImpl *)texture, resource_type, device, 0, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3048834..bfed37c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1473,7 +1473,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, buffer->vtbl = &wined3d_buffer_vtbl; - hr = resource_init((IWineD3DResource *)buffer, WINED3DRTYPE_BUFFER, + hr = resource_init((IWineD3DResourceImpl *)buffer, WINED3DRTYPE_BUFFER, device, size, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index b8b8594..0c8aa98 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -43,28 +43,28 @@ struct private_data DWORD size; }; -HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type, +HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { - struct IWineD3DResourceClass *resource = &((IWineD3DResourceImpl *)iface)->resource; - - resource->device = device; - resource->resourceType = resource_type; - resource->ref = 1; - resource->pool = pool; - resource->format = format; - resource->usage = usage; - resource->size = size; - resource->priority = 0; - resource->parent = parent; - resource->parent_ops = parent_ops; - list_init(&resource->privateData); + struct IWineD3DResourceClass *r = &resource->resource; + + r->device = device; + r->resourceType = resource_type; + r->ref = 1; + r->pool = pool; + r->format = format; + r->usage = usage; + r->size = size; + r->priority = 0; + r->parent = parent; + r->parent_ops = parent_ops; + list_init(&r->privateData); if (size) { - resource->heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + RESOURCE_ALIGNMENT); - if (!resource->heapMemory) + r->heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + RESOURCE_ALIGNMENT); + if (!r->heapMemory) { ERR("Out of memory!\n"); return WINED3DERR_OUTOFVIDEOMEMORY; @@ -72,9 +72,9 @@ HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type } else { - resource->heapMemory = NULL; + r->heapMemory = NULL; } - resource->allocatedMemory = (BYTE *)(((ULONG_PTR)resource->heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + r->allocatedMemory = (BYTE *)(((ULONG_PTR)r->heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); /* Check that we have enough video ram left */ if (pool == WINED3DPOOL_DEFAULT) @@ -82,13 +82,13 @@ HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type if (size > IWineD3DDevice_GetAvailableTextureMem((IWineD3DDevice *)device)) { ERR("Out of adapter memory\n"); - HeapFree(GetProcessHeap(), 0, resource->heapMemory); + HeapFree(GetProcessHeap(), 0, r->heapMemory); return WINED3DERR_OUTOFVIDEOMEMORY; } WineD3DAdapterChangeGLRam(device, size); } - device_resource_add(device, iface); + device_resource_add(device, (IWineD3DResource *)resource); return WINED3D_OK; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 29d98ee..a4f37cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -373,7 +373,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, return WINED3DERR_INVALIDCALL; } - hr = resource_init((IWineD3DResource *)surface, WINED3DRTYPE_SURFACE, + hr = resource_init((IWineD3DResourceImpl *)surface, WINED3DRTYPE_SURFACE, device, resource_size, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 48e2c7b..8ccc482 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -346,7 +346,7 @@ HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT volume->lpVtbl = &IWineD3DVolume_Vtbl; - hr = resource_init((IWineD3DResource *)volume, WINED3DRTYPE_VOLUME, device, + hr = resource_init((IWineD3DResourceImpl *)volume, WINED3DRTYPE_VOLUME, device, width * height * depth * format->byte_count, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7562101..9d4009c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1833,7 +1833,7 @@ HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID guid) DECLSP DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN; -HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type, +HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : mmdevapi: Be explicit about the units of ACImpl::ofs.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

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 Jan. 5, 2011

Jan. 5, 2011

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

Andrew Eikum : mmdevapi: Be explicit about units of ACImpl::bufsize.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

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

Andrew Eikum : mmdevapi: Store period size in frames.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

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

Huw Davies : wineps.drv: Explicitly report that we do not support blending.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

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 Jan. 5, 2011

Jan. 5, 2011

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

Huw Davies : ole32: Reimplement SendOnDataChange using the connection enumerator.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 6ac2cb3ddcb3021cc737a6c9b4dd16128d187038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac2cb3ddcb3021cc737a6c9b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 10:13:38 2011 +0000 ole32: Reimplement SendOnDataChange using the connection enumerator. --- dlls/ole32/oleobj.c | 62 +++++++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index df2898d..2495f9a 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -24,6 +24,8 @@ #include <string.h> #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" @@ -804,41 +806,43 @@ static HRESULT WINAPI DataAdviseHolder_EnumAdvise(IDataAdviseHolder *iface, * DataAdviseHolder_SendOnDataChange */ static HRESULT WINAPI DataAdviseHolder_SendOnDataChange(IDataAdviseHolder *iface, - IDataObject *pDataObject, + IDataObject *data_obj, DWORD dwReserved, DWORD advf) { - DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface); - DWORD index; - STGMEDIUM stg; - HRESULT res; + IEnumSTATDATA *pEnum; + HRESULT hr; - TRACE("(%p)->(%p,%08x,%08x)\n", This, pDataObject, dwReserved, advf); + TRACE("(%p)->(%p, %08x, %08x)\n", iface, data_obj, dwReserved, advf); - for(index = 0; index < This->maxCons; index++) - { - if(This->connections[index].pAdvSink != NULL) + hr = IDataAdviseHolder_EnumAdvise(iface, &pEnum); + if (SUCCEEDED(hr)) { - memset(&stg, 0, sizeof(stg)); - if(!(This->connections[index].advf & ADVF_NODATA)) - { - TRACE("Calling IDataObject_GetData\n"); - res = IDataObject_GetData(pDataObject, - &(This->connections[index].formatetc), - &stg); - TRACE("returns %08x\n", res); - } - TRACE("Calling IAdviseSink_OnDataChange\n"); - IAdviseSink_OnDataChange(This->connections[index].pAdvSink, - &(This->connections[index].formatetc), - &stg); - TRACE("Done IAdviseSink_OnDataChange\n"); - if(This->connections[index].advf & ADVF_ONLYONCE) { - TRACE("Removing connection\n"); - DataAdviseHolder_Unadvise(iface, This->connections[index].dwConnection); - } + STATDATA statdata; + while (IEnumSTATDATA_Next(pEnum, 1, &statdata, NULL) == S_OK) + { + STGMEDIUM stg; + stg.tymed = TYMED_NULL; + stg.u.pstg = NULL; + stg.pUnkForRelease = NULL; + + if(!(statdata.advf & ADVF_NODATA)) + { + hr = IDataObject_GetData(data_obj, &statdata.formatetc, &stg); + } + + IAdviseSink_OnDataChange(statdata.pAdvSink, &statdata.formatetc, &stg); + + if(statdata.advf & ADVF_ONLYONCE) + { + IDataAdviseHolder_Unadvise(iface, statdata.dwConnection); + } + + release_statdata(&statdata); + } + IEnumSTATDATA_Release(pEnum); } - } - return S_OK; + + return S_OK; } /**************************************************************************

1 0