May 2012 - Wine-Commits - list.winehq.org

Józef Kucia : d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8:: GetLevelDesc is called with invalid level.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 7b1aa04b00796238c0abd1556d26c295e9ca3105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1aa04b00796238c0abd1556… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:19:33 2012 +0200 d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8::GetLevelDesc is called with invalid level. --- dlls/d3d8/texture.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 14f8207..59bc693 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -628,6 +628,12 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); + if (level >= wined3d_texture_get_level_count(texture->wined3d_texture)) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DVolume8Impl.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 75d166f62c5b5c359650ccaf281923c9b99a5108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d166f62c5b5c359650ccaf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:34 2012 +0200 d3d8: Get rid of IDirect3DVolume8Impl. --- dlls/d3d8/d3d8_private.h | 17 +---- dlls/d3d8/device.c | 2 +- dlls/d3d8/texture.c | 6 +- dlls/d3d8/volume.c | 156 +++++++++++++++++++++++---------------------- 4 files changed, 88 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75d166f62c5b5c359650c…

1 0

Alexandre Julliard : gdi32: Add a helper function to allocate the brush bits.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 574a07e4c96da2541b44f2f2b0a29d0ab5262b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574a07e4c96da2541b44f2f2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 22:03:18 2012 +0200 gdi32: Add a helper function to allocate the brush bits. --- dlls/gdi32/dibdrv/objects.c | 57 ++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ce0b4a2..f5b4c05 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1732,17 +1732,28 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, return TRUE; } -static void free_pattern_brush_bits( dib_brush *brush ) +static BOOL alloc_brush_mask_bits( dib_brush *brush ) +{ + DWORD size = brush->dib.height * abs(brush->dib.stride); + + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); + assert(brush->dib.stride > 0); + + if (!(brush->masks.and = HeapAlloc(GetProcessHeap(), 0, 2 * size))) return FALSE; + brush->masks.xor = (char *)brush->masks.and + size; + return TRUE; +} + +static void free_brush_mask_bits( dib_brush *brush ) { HeapFree(GetProcessHeap(), 0, brush->masks.and); - HeapFree(GetProcessHeap(), 0, brush->masks.xor); - brush->masks.and = NULL; - brush->masks.xor = NULL; + brush->masks.and = brush->masks.xor = NULL; } void free_pattern_brush( dib_brush *brush ) { - free_pattern_brush_bits( brush ); + free_brush_mask_bits( brush ); free_dib_info( &brush->dib ); } @@ -1752,20 +1763,10 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) DWORD *brush_bits = brush->dib.bits.ptr; DWORD *and_bits, *xor_bits; - assert(brush->masks.and == NULL); - assert(brush->masks.xor == NULL); - - assert(brush->dib.stride > 0); - - and_bits = brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); - xor_bits = brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); + if (!alloc_brush_mask_bits( brush )) return FALSE; - if(!and_bits || !xor_bits) - { - ERR("Failed to create pattern brush bits\n"); - free_pattern_brush_bits( brush ); - return FALSE; - } + and_bits = brush->masks.and; + xor_bits = brush->masks.xor; while(size) { @@ -1790,12 +1791,8 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL { dib_info hatch; rop_mask fg_mask, bg_mask; - DWORD size; BOOL ret; - assert(brush->masks.and == NULL); - assert(brush->masks.xor == NULL); - /* Just initialise brush dib with the color / sizing info. We don't need the bits as we'll calculate the rop masks straight from the hatch patterns. */ @@ -1809,17 +1806,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL brush->dib.rect.right = 8; brush->dib.rect.bottom = 8; - size = brush->dib.height * brush->dib.stride; - - brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); - brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); - - if (!brush->masks.and || !brush->masks.xor) - { - ERR("Failed to create pattern brush bits\n"); - free_pattern_brush_bits( brush ); - return FALSE; - } + if (!alloc_brush_mask_bits( brush )) return FALSE; hatch.bit_count = 1; hatch.height = hatch.width = 8; @@ -1841,7 +1828,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL *needs_reselect = TRUE; ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &brush->masks ); - if(!ret) free_pattern_brush_bits( brush ); + if(!ret) free_brush_mask_bits( brush ); return ret; } @@ -1961,7 +1948,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, if (rop != brush->rop) { - free_pattern_brush_bits( brush ); + free_brush_mask_bits( brush ); brush->rop = rop; }

1 0

Alexandre Julliard : gdi32: Pass a rop_mask_bits object to the pattern_rects primitive.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: b708b40105807461cf1d51469979733812792569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b708b40105807461cf1d51469… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 21:52:44 2012 +0200 gdi32: Pass a rop_mask_bits object to the pattern_rects primitive. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 62 ++++++++++++++++++++-------------------- 3 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b708b40105807461cf1d5…

1 0

Alexandre Julliard : gdi32: Use a rop_mask_bits object to store the brush bits.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: 524aef660e3e2edf60fb5c30d5865644948c896a URL: http://source.winehq.org/git/wine.git/?a=commit;h=524aef660e3e2edf60fb5c30d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 21:47:30 2012 +0200 gdi32: Use a rop_mask_bits object to store the brush bits. --- dlls/gdi32/dibdrv/dibdrv.h | 3 +-- dlls/gdi32/dibdrv/objects.c | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f72cbdb..209b237 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -76,8 +76,7 @@ typedef struct dib_brush INT rop; /* rop2 last used to create the brush bits */ COLORREF colorref; dib_info dib; - void *and_bits; - void *xor_bits; + rop_mask_bits masks; struct brush_pattern pattern; BOOL (*rects)(struct dibdrv_physdev *pdev, struct dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 3351875..5fe2f45 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1734,10 +1734,10 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, static void free_pattern_brush_bits( dib_brush *brush ) { - HeapFree(GetProcessHeap(), 0, brush->and_bits); - HeapFree(GetProcessHeap(), 0, brush->xor_bits); - brush->and_bits = NULL; - brush->xor_bits = NULL; + HeapFree(GetProcessHeap(), 0, brush->masks.and); + HeapFree(GetProcessHeap(), 0, brush->masks.xor); + brush->masks.and = NULL; + brush->masks.xor = NULL; } void free_pattern_brush( dib_brush *brush ) @@ -1752,13 +1752,13 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) DWORD *brush_bits = brush->dib.bits.ptr; DWORD *and_bits, *xor_bits; - assert(brush->and_bits == NULL); - assert(brush->xor_bits == NULL); + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); assert(brush->dib.stride > 0); - and_bits = brush->and_bits = HeapAlloc(GetProcessHeap(), 0, size); - xor_bits = brush->xor_bits = HeapAlloc(GetProcessHeap(), 0, size); + and_bits = brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); + xor_bits = brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); if(!and_bits || !xor_bits) { @@ -1790,12 +1790,11 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL { dib_info hatch; rop_mask fg_mask, bg_mask; - rop_mask_bits mask_bits; DWORD size; BOOL ret; - assert(brush->and_bits == NULL); - assert(brush->xor_bits == NULL); + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); /* Just initialise brush dib with the color / sizing info. We don't need the bits as we'll calculate the rop masks straight from @@ -1812,10 +1811,10 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL size = brush->dib.height * brush->dib.stride; - mask_bits.and = brush->and_bits = HeapAlloc(GetProcessHeap(), 0, size); - mask_bits.xor = brush->xor_bits = HeapAlloc(GetProcessHeap(), 0, size); + brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); + brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); - if(!mask_bits.and || !mask_bits.xor) + if (!brush->masks.and || !brush->masks.xor) { ERR("Failed to create pattern brush bits\n"); free_pattern_brush_bits( brush ); @@ -1841,7 +1840,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL if (GetBkMode(pdev->dev.hdc) != TRANSPARENT && (GetBkColor(pdev->dev.hdc) & (1 << 24))) *needs_reselect = TRUE; - ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &mask_bits ); + ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &brush->masks ); if(!ret) free_pattern_brush_bits( brush ); return ret; @@ -1966,7 +1965,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, brush->rop = rop; } - if(brush->and_bits == NULL) + if(brush->masks.and == NULL) { switch(brush->style) { @@ -1990,7 +1989,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, GetBrushOrgEx(pdev->dev.hdc, &origin); - dib->funcs->pattern_rects( dib, num, rects, &origin, &brush->dib, brush->and_bits, brush->xor_bits ); + dib->funcs->pattern_rects( dib, num, rects, &origin, &brush->dib, brush->masks.and, brush->masks.xor ); if (needs_reselect) free_pattern_brush( brush ); return TRUE;

1 0

Alexandre Julliard : gdi32: Simplify creation of hatch masks and avoid endianness issues.
by Alexandre Julliard May 23, 2012

May 23, 2012

Module: wine Branch: master Commit: b8e4cd81abac4b82aff5b648114eaefb605b8b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e4cd81abac4b82aff5b6481… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:24:18 2012 +0200 gdi32: Simplify creation of hatch masks and avoid endianness issues. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 22 +---- dlls/gdi32/dibdrv/primitives.c | 192 ++++++++++++++++++---------------------- 3 files changed, 90 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8e4cd81abac4b82aff5b…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 25bb38347407de4532c4fcd421b9d075fc2a678e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bb38347407de4532c4fcd42… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue May 22 22:12:41 2012 +0900 po: Update Korean translation. --- po/ko.po | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/po/ko.po b/po/ko.po index e5404ac..017a1d8 100644 --- a/po/ko.po +++ b/po/ko.po @@ -156,21 +156,10 @@ msgid "Cancel" msgstr "취소" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko 설치관리자" +msgstr "Wine Mono 설치관리자" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -179,13 +168,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 키" -"지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입니" -"다.\n" +"Wine은 닷넷 응용프로그램을 제대로 실행시키기 위해 필요한 Mono 패키지를 찾을 " +"수없습니다. Wine은 당신을 위해서 자동으로 다운로드하고 설치할 것입니다.\n" "\n" -"주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 <a " -"href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> 보십시" -"오." +"Note: it is recommended to use your distribution's packages instead. See <a " +"주의:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다.자세한 것은<a " +"href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> 을 보십" +"시오." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

Karsten Elfenbein : wined3d: Add Nvidia GTX 670.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 9d7a39656ae7931d7695120e9b33cd9d29c55078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7a39656ae7931d7695120e9… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Mon May 21 20:54:49 2012 +0200 wined3d: Add Nvidia GTX 670. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bd7f7d4..7810d7b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1124,6 +1124,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1516,6 +1517,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 63b7161..051b04e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1405,6 +1405,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, + CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_INTEL_830M = 0x3577, CARD_INTEL_855GM = 0x3582,

1 0

Andrew Eikum : wineoss.drv: Track number of frames reserved by client in capture direction.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 1c37857a1828758b5e8c0dcb5f5fb3ec812c1834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c37857a1828758b5e8c0dcb5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:11:06 2012 -0500 wineoss.drv: Track number of frames reserved by client in capture direction. --- dlls/wineoss.drv/mmdevdrv.c | 49 ++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9b0f5f8..c8b12a3 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -120,7 +120,6 @@ struct ACImpl { UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ BYTE *local_buffer, *tmp_buffer; - int buf_state; LONG32 getbuf_last; /* <0 when using tmp_buffer */ HANDLE timer; @@ -132,12 +131,6 @@ struct ACImpl { struct list entry; }; -enum BufferStates { - NOT_LOCKED = 0, - LOCKED_NORMAL, /* public buffer piece is from local_buffer */ - LOCKED_WRAPPED /* public buffer piece is in tmp_buffer */ -}; - typedef struct _SessionMgr { IAudioSessionManager2 IAudioSessionManager2_iface; @@ -1571,7 +1564,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->buf_state != NOT_LOCKED || This->getbuf_last){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -1928,7 +1921,6 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - HRESULT hr; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1938,19 +1930,21 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, EnterCriticalSection(&This->lock); - if(This->buf_state != NOT_LOCKED){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - hr = IAudioCaptureClient_GetNextPacketSize(iface, frames); - if(FAILED(hr)){ + if(This->held_frames < This->period_frames){ + *frames = 0; LeaveCriticalSection(&This->lock); - return hr; + return AUDCLNT_S_BUFFER_EMPTY; } *flags = 0; + *frames = This->period_frames; + if(This->lcl_offs_frames + *frames > This->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; if(This->tmp_buffer_frames < *frames){ @@ -1976,10 +1970,16 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *data = This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; - This->buf_state = LOCKED_NORMAL; + This->getbuf_last = *frames; - if(devpos || qpcpos) - IAudioClock_GetPosition(&This->IAudioClock_iface, devpos, qpcpos); + if(devpos) + *devpos = This->written_frames; + if(qpcpos){ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } LeaveCriticalSection(&This->lock); @@ -1995,16 +1995,27 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( EnterCriticalSection(&This->lock); - if(This->buf_state == NOT_LOCKED){ + if(!done){ + This->getbuf_last = 0; + LeaveCriticalSection(&This->lock); + return S_OK; + } + + if(!This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } + if(This->getbuf_last != done){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_INVALID_SIZE; + } + + This->written_frames += done; This->held_frames -= done; This->lcl_offs_frames += done; This->lcl_offs_frames %= This->bufsize_frames; - - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock);

1 0

Henri Verbeet : wined3d: Store user clip planes as 4-component float vectors.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: e3ecfa5974da9be707e38bc45445fa4c81438543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ecfa5974da9be707e38bc45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 18:01:06 2012 +0200 wined3d: Store user clip planes as 4-component float vectors. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 14 ++++++-------- dlls/ddraw/device.c | 4 ++-- dlls/wined3d/device.c | 21 +++++++-------------- dlls/wined3d/state.c | 13 ++++++++----- dlls/wined3d/stateblock.c | 12 +++--------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 14 ++++++++++++-- 8 files changed, 41 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3ecfa5974da9be707e38…

1 0