August 2011 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/treeview: Set edit box text before notification and keep it after.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: c13bf5a58c69a005195013efa7b6a19b3103dbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13bf5a58c69a005195013efa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 12:55:33 2011 +0400 comctl32/treeview: Set edit box text before notification and keep it after. --- dlls/comctl32/tests/treeview.c | 70 +++++++++++++++++++++++++++++++++------ dlls/comctl32/treeview.c | 5 +-- 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a55ae45..588a5ca 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -40,6 +40,7 @@ static BOOL g_get_from_expand; static BOOL g_get_rect_in_expand; static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; +static BOOL g_beginedit_alter_text; #define NUM_MSG_SEQUENCES 2 #define TREEVIEW_SEQ_INDEX 0 @@ -99,7 +100,7 @@ static const struct message focus_seq[] = { { WM_PAINT, sent|defwinproc }, { WM_NCPAINT, sent|wparam|defwinproc, 1 }, { WM_ERASEBKGND, sent|defwinproc }, - { TVM_EDITLABEL, sent }, + { TVM_EDITLABELA, sent }, { WM_COMMAND, sent|wparam|defwinproc, MAKEWPARAM(0, EN_UPDATE) }, { WM_COMMAND, sent|wparam|defwinproc, MAKEWPARAM(0, EN_CHANGE) }, { WM_PARENTNOTIFY, sent|wparam|defwinproc, MAKEWPARAM(WM_CREATE, 0) }, @@ -1025,6 +1026,21 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } + case TVN_BEGINLABELEDIT: + { + if (g_beginedit_alter_text) + { + static const char* textA = "<edittextaltered>"; + HWND edit; + + edit = (HWND)SendMessageA(pHdr->hwndFrom, TVM_GETEDITCONTROL, 0, 0); + ok(IsWindow(edit), "failed to get edit handle\n"); + SetWindowTextA(edit, textA); + } + + break; + } + case TVN_ENDLABELEDIT: return TRUE; case TVN_ITEMEXPANDINGA: ok(pTreeView->itemNew.mask == @@ -1181,18 +1197,18 @@ static void test_itemedit(void) DWORD r; HWND edit; TVITEMA item; - CHAR buff[2]; + CHAR buffA[20]; HWND hTree; hTree = create_treeview_control(0); fill_tree(hTree); /* try with null item */ - edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, 0); + edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, 0); ok(!IsWindow(edit), "Expected valid handle\n"); /* trigger edit */ - edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); /* item shouldn't be selected automatically after TVM_EDITLABEL */ r = SendMessage(hTree, TVM_GETITEMSTATE, (WPARAM)hRoot, TVIS_SELECTED); @@ -1209,7 +1225,7 @@ static void test_itemedit(void) expect(0, r); /* try to cancel with wrong (not null) handle */ - edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hTree); expect(0, r); @@ -1220,13 +1236,13 @@ static void test_itemedit(void) /* remove selection after starting edit */ r = TreeView_SelectItem(hTree, hRoot); expect(TRUE, r); - edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); r = TreeView_SelectItem(hTree, NULL); expect(TRUE, r); /* alter text */ - strcpy(buff, "x"); - r = SendMessage(edit, WM_SETTEXT, 0, (LPARAM)buff); + strcpy(buffA, "x"); + r = SendMessage(edit, WM_SETTEXT, 0, (LPARAM)buffA); expect(TRUE, r); r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); @@ -1234,11 +1250,43 @@ static void test_itemedit(void) /* check that text is saved */ item.mask = TVIF_TEXT; item.hItem = hRoot; - item.pszText = buff; - item.cchTextMax = sizeof(buff)/sizeof(CHAR); + item.pszText = buffA; + item.cchTextMax = sizeof(buffA)/sizeof(CHAR); r = SendMessage(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - ok(!strcmp("x", buff), "Expected item text to change\n"); + ok(!strcmp("x", buffA), "Expected item text to change\n"); + + /* try A/W messages */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + ok(IsWindowUnicode(edit), "got ansi window\n"); + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + ok(!IsWindow(edit), "expected invalid handle\n"); + + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELW, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + ok(IsWindowUnicode(edit), "got ansi window\n"); + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + + /* alter text during TVM_BEGINLABELEDIT, check that it's preserved */ + strcpy(buffA, "<root>"); + + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = 0; + r = SendMessage(hTree, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + + g_beginedit_alter_text = TRUE; + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + g_beginedit_alter_text = FALSE; + + GetWindowTextA(edit, buffA, sizeof(buffA)/sizeof(CHAR)); + ok(!strcmp(buffA, "<edittextaltered>"), "got string %s\n", buffA); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c14bcab..02b5a7f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3871,6 +3871,8 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) infoPtr->wpEditOrig = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (DWORD_PTR) TREEVIEW_Edit_SubclassProc); + if (hItem->pszText) + SetWindowTextW(hwndEdit, hItem->pszText); if (TREEVIEW_BeginLabelEditNotify(infoPtr, hItem)) { @@ -3880,9 +3882,6 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) return NULL; } - if (hItem->pszText) - SetWindowTextW(hwndEdit, hItem->pszText); - SetFocus(hwndEdit); SendMessageW(hwndEdit, EM_SETSEL, 0, -1); ShowWindow(hwndEdit, SW_SHOW);

1 0

Huw Davies : winex11: Simplify rectangle operations.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 6d0f81336ab27e1df13f0903428c49b22b7cda16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0f81336ab27e1df13f09034… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:23:57 2011 +0100 winex11: Simplify rectangle operations. --- dlls/winex11.drv/bitblt.c | 35 +++++++---------------------------- 1 files changed, 7 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 7f314c2..2e851c0 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -916,34 +916,13 @@ static int BITBLT_GetSrcAreaStretch( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE RECT rectDst = dst->visrect; int fg, bg; - rectSrc.left -= src->x; - rectSrc.right -= src->x; - rectSrc.top -= src->y; - rectSrc.bottom -= src->y; - rectDst.left -= dst->x; - rectDst.right -= dst->x; - rectDst.top -= dst->y; - rectDst.bottom -= dst->y; - if (src->width < 0) - { - rectSrc.left -= src->width; - rectSrc.right -= src->width; - } - if (dst->width < 0) - { - rectDst.left -= dst->width; - rectDst.right -= dst->width; - } - if (src->height < 0) - { - rectSrc.top -= src->height; - rectSrc.bottom -= src->height; - } - if (dst->height < 0) - { - rectDst.top -= dst->height; - rectDst.bottom -= dst->height; - } + OffsetRect( &rectSrc, -src->x, -src->y ); + OffsetRect( &rectDst, -dst->x, -dst->y ); + + if (src->width < 0) OffsetRect( &rectSrc, -src->width, 0 ); + if (dst->width < 0) OffsetRect( &rectDst, -dst->width, 0 ); + if (src->height < 0) OffsetRect( &rectSrc, 0, -src->height ); + if (dst->height < 0) OffsetRect( &rectDst, 0, -dst->height ); get_colors(physDevDst, physDevSrc, &fg, &bg); wine_tsx11_lock();

1 0

Henri Verbeet : wined3d: Add compressed surface support to surface_cpu_blt( ).
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 156d24c63466479e72811ce0bddef1d5ec754998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156d24c63466479e72811ce0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:51 2011 +0200 wined3d: Add compressed surface support to surface_cpu_blt(). --- dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4afcf66..8e720dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6569,15 +6569,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * wined3d_surface_map(dst_surface, &dlock, NULL, 0); } - if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_FOURCC) - { - if (!dst_rect || src_surface == dst_surface) - { - memcpy(dlock.pBits, slock.pBits, dst_surface->resource.size); - goto release; - } - } - bpp = dst_surface->resource.format->byte_count; srcheight = xsrc.bottom - xsrc.top; srcwidth = xsrc.right - xsrc.left; @@ -6585,6 +6576,40 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dstwidth = xdst.right - xdst.left; width = (xdst.right - xdst.left) * bpp; + if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_COMPRESSED) + { + UINT row_block_count; + + if (flags || src_surface == dst_surface) + { + FIXME("Only plain blits supported on compressed surfaces.\n"); + hr = E_NOTIMPL; + goto release; + } + + TRACE("%s -> %s copy.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); + + if (srcheight != dstheight || srcwidth != dstwidth) + { + WARN("Stretching not supported on compressed surfaces.\n"); + hr = WINED3DERR_INVALIDCALL; + goto release; + } + + dbuf = dlock.pBits; + sbuf = slock.pBits; + + row_block_count = (dstwidth + dst_format->block_width - 1) / dst_format->block_width; + for (y = 0; y < dstheight; y += dst_format->block_height) + { + memcpy(dbuf, sbuf, row_block_count * dst_format->block_byte_count); + dbuf += dlock.Pitch; + sbuf += slock.Pitch; + } + + goto release; + } + if (dst_rect && src_surface != dst_surface) dbuf = dlock.pBits; else

1 0

Henri Verbeet : wined3d: Reuse convert_a8r8g8b8_x8r8g8b8() for B8G8R8X8 -> B8G8R8A8 conversions.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 56428c638650b39fc37b100af1d67acc0f96a559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56428c638650b39fc37b100af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:52 2011 +0200 wined3d: Reuse convert_a8r8g8b8_x8r8g8b8() for B8G8R8X8 -> B8G8R8A8 conversions. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8e720dd..88e8a1d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3199,6 +3199,8 @@ static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, } } +/* We use this for both B8G8R8A8 -> B8G8R8X8 and B8G8R8X8 -> B8G8R8A8, since + * in both cases we're just setting the X / Alpha channel to 0xff. */ static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) { @@ -3317,6 +3319,7 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_R32_FLOAT, WINED3DFMT_R16_FLOAT, convert_r32_float_r16_float}, {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_a8r8g8b8_x8r8g8b8}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8A8_UNORM, convert_a8r8g8b8_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, };

1 0

Henri Verbeet : wined3d: Don' t allow blits with an invalid destination rectangle when a clipper is set either .
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: e1ab5f6e6bf251566289ccf3177ebaf8102cb72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ab5f6e6bf251566289ccf31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:55 2011 +0200 wined3d: Don't allow blits with an invalid destination rectangle when a clipper is set either. Clippers don't really work. Previously we mostly didn't run into this because the rectangle was already rejected by ddraw_surface7_Blt(), although ddraw_surface7_BltFast() might have been affected in a couple of cases. We should of course implement clippers, but until that happens, completely rejecting the blit is better than introducing memory corruption. This fixes a regression introduced by commit 92e616f355ded5f3634625dba245e9b437e3ad6a. --- dlls/wined3d/surface.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 88e8a1d..8412aa5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1307,15 +1307,18 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC surface_get_rect(dst_surface, dst_rect_in, &dst_rect); - /* The destination rect can be out of bounds on the condition - * that a clipper is set for the surface. */ - if (!dst_surface->clipper && (dst_rect.left >= dst_rect.right || dst_rect.top >= dst_rect.bottom + if (dst_rect.left >= dst_rect.right || dst_rect.top >= dst_rect.bottom || dst_rect.left > dst_surface->resource.width || dst_rect.left < 0 || dst_rect.top > dst_surface->resource.height || dst_rect.top < 0 || dst_rect.right > dst_surface->resource.width || dst_rect.right < 0 - || dst_rect.bottom > dst_surface->resource.height || dst_rect.bottom < 0)) + || dst_rect.bottom > dst_surface->resource.height || dst_rect.bottom < 0) { - WARN("Application gave us bad destination rectangle for blit without a clipper set.\n"); + /* The destination rect can be out of bounds on the condition + * that a clipper is set for the surface. */ + if (dst_surface->clipper) + FIXME("Blit clipping not implemented.\n"); + else + WARN("The application gave us a bad destination rectangle without a clipper set.\n"); return WINEDDERR_INVALIDRECT; }

1 0

Jörg Höhle : wineoss.drv: Fix AudioRenderClient write pointer calculation.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: ea47c12ebe105823d6810dac99e26bd7fcd68e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea47c12ebe105823d6810dac9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 9 23:34:11 2011 +0200 wineoss.drv: Fix AudioRenderClient write pointer calculation. --- dlls/wineoss.drv/mmdevdrv.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1e69a22..f962f8a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1611,8 +1611,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, *data = This->tmp_buffer; This->buf_state = LOCKED_WRAPPED; }else{ - *data = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; This->buf_state = LOCKED_NORMAL; } @@ -1656,8 +1655,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( } if(This->buf_state == LOCKED_NORMAL) - buffer = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + buffer = This->local_buffer + This->fmt->nBlockAlign * + ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); else buffer = This->tmp_buffer;

1 0

Huw Davies : wineps: Don't write a PostScript trailer if we haven' t written a header.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 39f14b68bf1d70c5d1424f06fd3e19994d3e08fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f14b68bf1d70c5d1424f06f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:22:10 2011 +0100 wineps: Don't write a PostScript trailer if we haven't written a header. --- dlls/wineps.drv/escape.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 0f76973..d869164 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -528,7 +528,9 @@ INT PSDRV_EndDoc( PHYSDEV dev ) WARN("Somebody forgot an EndPage\n"); PSDRV_EndPage( dev ); } - PSDRV_WriteFooter( dev ); + + if (physDev->job.PageNo) + PSDRV_WriteFooter( dev ); ret = EndDocPrinter(physDev->job.hprinter); ClosePrinter(physDev->job.hprinter);

1 0

Michael Stefaniuc : mscoree: COM cleanup for the ICLRRuntimeInfo iface.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: c8fcf420c2dbe50d3555fe904935935e448bb5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8fcf420c2dbe50d3555fe904… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 19 00:43:17 2011 +0200 mscoree: COM cleanup for the ICLRRuntimeInfo iface. --- dlls/mscoree/metahost.c | 28 +++++++++++++++++----------- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 8fb846c..895d7f3 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -51,9 +51,9 @@ static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; #define NUM_RUNTIMES 3 static struct CLRRuntimeInfo runtimes[NUM_RUNTIMES] = { - {&CLRRuntimeInfoVtbl, net_11_subdir, 1, 1, 4322, 0}, - {&CLRRuntimeInfoVtbl, net_20_subdir, 2, 0, 50727, 0}, - {&CLRRuntimeInfoVtbl, net_40_subdir, 4, 0, 30319, 0} + {{&CLRRuntimeInfoVtbl}, net_11_subdir, 1, 1, 4322, 0}, + {{&CLRRuntimeInfoVtbl}, net_20_subdir, 2, 0, 50727, 0}, + {{&CLRRuntimeInfoVtbl}, net_40_subdir, 4, 0, 30319, 0} }; static int runtimes_initialized; @@ -311,6 +311,11 @@ void expect_no_runtimes(void) } } +static inline CLRRuntimeInfo *impl_from_ICLRRuntimeInfo(ICLRRuntimeInfo *iface) +{ + return CONTAINING_RECORD(iface, CLRRuntimeInfo, ICLRRuntimeInfo_iface); +} + static HRESULT WINAPI CLRRuntimeInfo_QueryInterface(ICLRRuntimeInfo* iface, REFIID riid, void **ppvObject) @@ -346,7 +351,7 @@ static ULONG WINAPI CLRRuntimeInfo_Release(ICLRRuntimeInfo* iface) static HRESULT WINAPI CLRRuntimeInfo_GetVersionString(ICLRRuntimeInfo* iface, LPWSTR pwzBuffer, DWORD *pcchBuffer) { - struct CLRRuntimeInfo *This = (struct CLRRuntimeInfo*)iface; + struct CLRRuntimeInfo *This = impl_from_ICLRRuntimeInfo(iface); DWORD buffer_size = *pcchBuffer; HRESULT hr = S_OK; char version[11]; @@ -475,7 +480,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetProcAddress(ICLRRuntimeInfo* iface, static HRESULT WINAPI CLRRuntimeInfo_GetInterface(ICLRRuntimeInfo* iface, REFCLSID rclsid, REFIID riid, LPVOID *ppUnk) { - struct CLRRuntimeInfo *This = (struct CLRRuntimeInfo*)iface; + struct CLRRuntimeInfo *This = impl_from_ICLRRuntimeInfo(iface); RuntimeHost *host; HRESULT hr; @@ -548,9 +553,9 @@ static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl = { HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) { - struct CLRRuntimeInfo *This = (struct CLRRuntimeInfo*)iface; + struct CLRRuntimeInfo *This = impl_from_ICLRRuntimeInfo(iface); - assert(This->ICLRRuntimeInfo_vtbl == &CLRRuntimeInfoVtbl); + assert(This->ICLRRuntimeInfo_iface.lpVtbl == &CLRRuntimeInfoVtbl); return CLRRuntimeInfo_GetRuntimeHost(This, result); } @@ -839,7 +844,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, } if (runtimes[This->pos].mono_abi_version) { - item = (IUnknown*)&runtimes[This->pos]; + item = (IUnknown*)&runtimes[This->pos].ICLRRuntimeInfo_iface; IUnknown_AddRef(item); rgelt[num_fetched] = item; num_fetched++; @@ -1022,7 +1027,8 @@ static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, runtimes[i].build == build) { if (runtimes[i].mono_abi_version) - return IUnknown_QueryInterface((IUnknown*)&runtimes[i], iid, ppRuntime); + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, iid, + ppRuntime); else { missing_runtime_message(&runtimes[i]); @@ -1315,8 +1321,8 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, while (i--) { if (runtimes[i].mono_abi_version) - return IUnknown_QueryInterface((IUnknown*)&runtimes[i], - &IID_ICLRRuntimeInfo, (void**)result); + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, + &IID_ICLRRuntimeInfo, (void **)result); } if (legacy) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 1b583c6..5cbf8df 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -37,7 +37,7 @@ typedef struct RuntimeHost RuntimeHost; typedef struct CLRRuntimeInfo { - const struct ICLRRuntimeInfoVtbl *ICLRRuntimeInfo_vtbl; + ICLRRuntimeInfo ICLRRuntimeInfo_iface; LPCWSTR mono_libdir; DWORD major; DWORD minor;

1 0

Michael Stefaniuc : amstream: Use CoTaskMemRealloc instead of alloc+copy.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 52dd315666e3151341652e2739c379541923a2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=52dd315666e3151341652e273… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 10:32:27 2011 +0200 amstream: Use CoTaskMemRealloc instead of alloc+copy. --- dlls/amstream/amstream.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 979c58e..d22a268 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -279,15 +279,12 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream hr = mediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { - pNewStreams = CoTaskMemAlloc((This->nbStreams+1)*sizeof(IMediaStream*)); + pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IMediaStream*)); if (!pNewStreams) { IMediaStream_Release(pStream); return E_OUTOFMEMORY; } - if (This->nbStreams) - CopyMemory(pNewStreams, This->pStreams, This->nbStreams*sizeof(IMediaStream*)); - CoTaskMemFree(This->pStreams); This->pStreams = pNewStreams; This->pStreams[This->nbStreams] = pStream; This->nbStreams++;

1 0

Michael Stefaniuc : amstream: Get rid of the explicit implementation of IMediaStream.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: f49d6df1984e4057a853134176d2e791417c3097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49d6df1984e4057a85313417… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 10:24:15 2011 +0200 amstream: Get rid of the explicit implementation of IMediaStream. --- dlls/amstream/amstream.c | 6 +- dlls/amstream/amstream_private.h | 4 +- dlls/amstream/mediastream.c | 156 +++++++++++--------------------------- 3 files changed, 46 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f49d6df1984e4057a8531…

1 0