wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Dmitry Timoshkov : gdiplus: Derive GpFont from GpFontFamily.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 54b69043eb43f99b8c5dd85a3e6df2434a99ace1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b69043eb43f99b8c5dd85a3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 8 19:29:41 2012 +0900 gdiplus: Derive GpFont from GpFontFamily. --- dlls/gdiplus/font.c | 25 +++++++++++++++++++++++-- dlls/gdiplus/gdiplus_private.h | 1 + 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 7cc5910..a07333a 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Google (Evan Stade) + * Copyright (C) 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -158,6 +159,13 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->height = otm->otmEMSquare; (*font)->line_spacing = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent + otm->otmTextMetrics.tmExternalLeading; + stat = GdipCloneFontFamily((GpFontFamily *)fontFamily, &(*font)->family); + if (stat != Ok) + { + GdipFree(*font); + return stat; + } + TRACE("<-- %p\n", *font); return Ok; @@ -171,6 +179,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, { HFONT hfont, oldfont; TEXTMETRICW textmet; + GpStatus stat; TRACE("(%p, %p, %p)\n", hdc, logfont, font); @@ -206,6 +215,13 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, SelectObject(hdc, oldfont); DeleteObject(hfont); + stat = GdipCreateFontFamilyFromName(logfont->lfFaceName, NULL, &(*font)->family); + if (stat != Ok) + { + GdipFree(*font); + return NotTrueTypeFont; + } + TRACE("<-- %p\n", *font); return Ok; @@ -242,6 +258,7 @@ GpStatus WINGDIPAPI GdipDeleteFont(GpFont* font) if(!font) return InvalidParameter; + GdipDeleteFontFamily(font->family); GdipFree(font); return Ok; @@ -290,7 +307,7 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) if (!(font && family)) return InvalidParameter; - return GdipCreateFontFamilyFromName(font->lfw.lfFaceName, NULL, family); + return GdipCloneFontFamily(font->family, family); } /****************************************************************************** @@ -424,6 +441,8 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, */ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) { + GpStatus stat; + TRACE("(%p, %p)\n", font, cloneFont); if(!font || !cloneFont) @@ -433,8 +452,10 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) if(!*cloneFont) return OutOfMemory; **cloneFont = *font; + stat = GdipCloneFontFamily(font->family, &(*cloneFont)->family); + if (stat != Ok) GdipFree(*cloneFont); - return Ok; + return stat; } /******************************************************************************* diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 72de9cb..3676358 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -346,6 +346,7 @@ struct GpImageAttributes{ }; struct GpFont{ + GpFontFamily *family; LOGFONTW lfw; REAL emSize; REAL pixel_size;

1 0

Alexandre Julliard : ieframe/tests: Mark a failing test as broken.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 5b5ecf2193ec3f39211e3f8b96e580049b9b38d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5ecf2193ec3f39211e3f8b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 12:02:28 2012 +0200 ieframe/tests: Mark a failing test as broken. --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 41fe00a..4b2404a 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3315,7 +3315,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) IWebBrowser2_Release(wb); ref = IUnknown_Release(unk); - ok(ref == 0, "ref=%d, expected 0\n", ref); + ok(ref == 0 || broken(do_download && !do_close && ref == 1), "ref=%d, expected 0\n", ref); } static void test_WebBrowserV1(void)

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: ca8d1d7b5ef6030c49f94729d7fbaaf029b40b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8d1d7b5ef6030c49f94729d… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed May 9 00:30:18 2012 +0300 po: Update Swedish translation. --- po/sv.po | 37 +++---------------------------------- 1 files changed, 3 insertions(+), 34 deletions(-) diff --git a/po/sv.po b/po/sv.po index c413f12..647a870 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6631,37 +6631,6 @@ msgid "insert disk %s" msgstr "mata in %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6712,12 +6681,12 @@ msgstr "" "Applicera en patch:\n" "\t/p patchpaket [egenskap]\n" "\t/p patchpaket /a paket [egenskap]\n" -"Logg och UI-modifierare för ovanstående kommandon:\n" +"Logg- och användargränssnittsmodifierare för ovanstående kommandon:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] loggfil\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"Registrera MSI-tjänst:\n" +"Registrera MSI-tjänsten:\n" "\t/y\n" -"Avregistrera MSI-tjänst:\n" +"Avregistrera MSI-tjänsten:\n" "\t/z\n" "Visa denna hjälp:\n" "\t/help\n"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: d01d08ed6064c95e3585a9f15a356ce7dd31d0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01d08ed6064c95e3585a9f15… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed May 9 00:30:17 2012 +0300 po: Update Finnish translation. --- po/fi.po | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/po/fi.po b/po/fi.po index 43cd2cd..ecc39fc 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6635,37 +6635,6 @@ msgid "insert disk %s" msgstr "anna levy %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n"

1 0

Dylan Smith : richedit: Avoid scanning all text for paragraphs to invalidate.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 1f8cbe164576ecab9d786903f64f76198e3e77f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8cbe164576ecab9d786903f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed May 9 03:13:31 2012 -0400 richedit: Avoid scanning all text for paragraphs to invalidate. --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 38 ++++++++++++++++++++------------------ dlls/riched20/wrap.c | 41 ++++++++++++++++++++++++++--------------- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7a56b1a..82d86a2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -187,7 +187,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; /* wrap.c */ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *end_para) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; /* para.c */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 18b2da4..0a2e1a9 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -73,13 +73,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) /* Draw the paragraph if any of the paragraph is in the update region. */ if (ys < rcUpdate->bottom && ye > rcUpdate->top) - { ME_DrawParagraph(&c, item); - /* Clear the repaint flag if the whole paragraph is in the - * update region. */ - if (rcUpdate->top <= ys && rcUpdate->bottom >= ye) - item->member.para.nFlags &= ~MEPF_REPAINT; - } item = item->member.para.next_para; } if (c.pt.y + editor->nTotalLength < c.rcView.bottom) @@ -1263,7 +1257,8 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) void ME_InvalidateSelection(ME_TextEditor *editor) { - ME_DisplayItem *para1, *para2; + ME_DisplayItem *sel_start, *sel_end; + ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; int nStart, nEnd; int len = ME_GetTextLength(editor); @@ -1273,32 +1268,39 @@ ME_InvalidateSelection(ME_TextEditor *editor) if (nStart == nEnd && editor->nLastSelStart == editor->nLastSelEnd) return; ME_WrapMarkedParagraphs(editor); - ME_GetSelectionParas(editor, &para1, &para2); - assert(para1->type == diParagraph); - assert(para2->type == diParagraph); + ME_GetSelectionParas(editor, &sel_start, &sel_end); + assert(sel_start->type == diParagraph); + assert(sel_end->type == diParagraph); /* last selection markers aren't always updated, which means * they can point past the end of the document */ if (editor->nLastSelStart > len || editor->nLastSelEnd > len) { - ME_MarkForPainting(editor, - ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph), - editor->pBuffer->pLast); + repaint_start = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); + repaint_end = editor->pBuffer->pLast; + ME_MarkForPainting(editor, repaint_start, repaint_end); } else { /* if the start part of selection is being expanded or contracted... */ if (nStart < editor->nLastSelStart) { - ME_MarkForPainting(editor, para1, editor->pLastSelStartPara->member.para.next_para); + repaint_start = sel_start; + repaint_end = editor->pLastSelStartPara->member.para.next_para; } else if (nStart > editor->nLastSelStart) { - ME_MarkForPainting(editor, editor->pLastSelStartPara, para1->member.para.next_para); + repaint_start = editor->pLastSelStartPara; + repaint_end = sel_start->member.para.next_para; } + ME_MarkForPainting(editor, repaint_start, repaint_end); /* if the end part of selection is being contracted or expanded... */ if (nEnd < editor->nLastSelEnd) { - ME_MarkForPainting(editor, para2, editor->pLastSelEndPara->member.para.next_para); + if (!repaint_start) repaint_start = sel_end; + repaint_end = editor->pLastSelEndPara->member.para.next_para; + ME_MarkForPainting(editor, sel_end, repaint_end); } else if (nEnd > editor->nLastSelEnd) { - ME_MarkForPainting(editor, editor->pLastSelEndPara, para2->member.para.next_para); + if (!repaint_start) repaint_start = editor->pLastSelEndPara; + repaint_end = sel_end->member.para.next_para; + ME_MarkForPainting(editor, editor->pLastSelEndPara, repaint_end); } } - ME_InvalidateMarkedParagraphs(editor); + ME_InvalidateMarkedParagraphs(editor, repaint_start, repaint_end); /* remember the last invalidated position */ ME_GetSelectionOfs(editor, &editor->nLastSelStart, &editor->nLastSelEnd); ME_GetSelectionParas(editor, &editor->pLastSelStartPara, &editor->pLastSelEndPara); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 2d19119..ceb87ad 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -583,12 +583,22 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { tp->member.para.nRows = wc.nRow; } +static void ME_MarkRepaintEnd(ME_DisplayItem *para, + ME_DisplayItem **repaint_start, + ME_DisplayItem **repaint_end) +{ + if (!*repaint_start) + *repaint_start = para; + *repaint_end = para->member.para.next_para; + para->member.para.nFlags |= MEPF_REPAINT; +} + BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *item; ME_Context c; - BOOL bModified = FALSE; int totalWidth = 0; + ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); c.pt.x = 0; @@ -605,9 +615,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_WrapTextParagraph(&c, item); if (bRedraw) - item->member.para.nFlags |= MEPF_REPAINT; - - bModified = bModified | bRedraw; + ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); if (item->member.para.nFlags & MEPF_ROWSTART) { @@ -678,10 +686,10 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - item->member.para.nFlags |= MEPF_REPAINT; + ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); cell = ME_FindItemBack(item, diCell); while (cell) { - ME_FindItemBack(cell, diParagraph)->member.para.nFlags |= MEPF_REPAINT; + ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); cell = cell->member.cell.prev_cell; } } @@ -729,12 +737,17 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); - if (bModified || editor->nTotalLength < editor->nLastTotalLength) - ME_InvalidateMarkedParagraphs(editor); - return bModified; + if (repaint_start || editor->nTotalLength < editor->nLastTotalLength) + { + if (!repaint_start) repaint_start = editor->pBuffer->pFirst; + ME_InvalidateMarkedParagraphs(editor, repaint_start, repaint_end); + } + return !!repaint_start; } -void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) +void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor, + ME_DisplayItem *start_para, + ME_DisplayItem *end_para) { ME_Context c; RECT rc; @@ -745,13 +758,11 @@ void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) rc = c.rcView; ofs = editor->vert_si.nPos; - item = editor->pBuffer->pFirst; - while(item != editor->pBuffer->pLast) { + item = start_para; + while(item && item != end_para) { if (item->member.para.nFlags & MEPF_REPAINT) { rc.top = c.rcView.top + item->member.para.pt.y - ofs; - rc.bottom = max(c.rcView.top + item->member.para.pt.y - + item->member.para.nHeight - ofs, - c.rcView.bottom); + rc.bottom = max(rc.top + item->member.para.nHeight, c.rcView.bottom); ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); item->member.para.nFlags &= ~MEPF_REPAINT; }

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameX_GetTransform.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 43c4c4b1c5661519c424e66964d9fe78b0151e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c4c4b1c5661519c424e6696… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 8 22:31:16 2012 +0200 d3drm: Implement IDirect3DRMFrameX_GetTransform. --- dlls/d3drm/frame.c | 25 +++++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 536932e..b3d2f60 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -30,6 +30,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +static D3DRMMATRIX4D identity = { + { 1.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 1.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 1.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f, 1.0f } +}; + typedef struct IDirect3DRMFrameImpl IDirect3DRMFrameImpl; struct IDirect3DRMFrameImpl { @@ -46,6 +53,7 @@ struct IDirect3DRMFrameImpl { ULONG nb_lights; ULONG lights_capacity; IDirect3DRMLight** lights; + D3DRMMATRIX4D transform; }; typedef struct { @@ -420,9 +428,11 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetTransform(IDirect3DRMFrame2* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, return_matrix); + TRACE("(%p/%p)->(%p)\n", iface, This, return_matrix); - return E_NOTIMPL; + memcpy(&return_matrix[0][0], &This->transform[0][0], sizeof(D3DRMMATRIX4D)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVelocity(IDirect3DRMFrame2* iface, @@ -1430,9 +1440,14 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetTransform(IDirect3DRMFrame3* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, reference, return_matrix); + TRACE("(%p/%p)->(%p,%p)\n", iface, This, reference, return_matrix); - return E_NOTIMPL; + if (reference) + FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n"); + + memcpy(&return_matrix[0][0], &This->transform[0][0], sizeof(D3DRMMATRIX4D)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_GetVelocity(IDirect3DRMFrame3* iface, @@ -2220,6 +2235,8 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; object->ref = 1; + memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D)); + if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) *ppObj = (IUnknown*)&object->IDirect3DRMFrame3_iface; else diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 6fdc2f7..c48cc2c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 Christian Costa + * Copyright 2010, 2012 Christian Costa * Copyright 2012 André Hentschel * * This library is free software; you can redistribute it and/or @@ -63,6 +63,13 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static D3DRMMATRIX4D identity = { + { 1.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 1.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 1.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f, 1.0f } +}; + static char data_bad_version[] = "xof 0302txt 0064\n" "Header Object\n" @@ -741,6 +748,26 @@ static void test_Light(void) IDirect3DRM_Release(pD3DRM); } +static void test_frame_transform(void) +{ + HRESULT hr; + LPDIRECT3DRM d3drm; + LPDIRECT3DRMFRAME frame; + D3DRMMATRIX4D matrix; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); + ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + + IDirect3DRM_Release(d3drm); +} + static int nb_objects = 0; static const GUID* refiids[] = { @@ -785,6 +812,7 @@ START_TEST(d3drm) test_MeshBuilder3(); test_Frame(); test_Light(); + test_frame_transform(); test_d3drm_load(); FreeLibrary(d3drm_handle);

1 0

Christian Costa : dmusic: Simplify ParseDescriptor by checking DLS header first and exit if it is wrong .
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 447c97cfbdf0643150f91f43e8b64e058db9f917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447c97cfbdf0643150f91f43e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 8 22:29:02 2012 +0200 dmusic: Simplify ParseDescriptor by checking DLS header first and exit if it is wrong. --- dlls/dmusic/collection.c | 371 +++++++++++++++++++++++++--------------------- 1 files changed, 202 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=447c97cfbdf0643150f91…

1 0

Christian Costa : dmsynth: Add stubbed IKsControl interface to DirectMusicSynthSink object.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: f9ba99996e69d040def0b5e11031d9a7fc14d92f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ba99996e69d040def0b5e11… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 8 22:27:44 2012 +0200 dmsynth: Add stubbed IKsControl interface to DirectMusicSynthSink object. --- dlls/dmsynth/dmsynth_private.h | 1 + dlls/dmsynth/synthsink.c | 67 ++++++++++++++++++++++++++++++++++++++++ dlls/dmsynth/tests/dmsynth.c | 2 +- 3 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 86606bb..3635aed 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -75,6 +75,7 @@ struct IDirectMusicSynth8Impl { struct IDirectMusicSynthSinkImpl { /* IUnknown fields */ IDirectMusicSynthSink IDirectMusicSynthSink_iface; + IKsControl IKsControl_iface; LONG ref; /* IDirectMusicSynthSinkImpl fields */ diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 268f6e8..e5e164f 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -41,6 +41,12 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNT *ppobj = This; return S_OK; } + else if (IsEqualIID(riid, &IID_IKsControl)) { + IUnknown_AddRef(iface); + *ppobj = &This->IKsControl_iface; + return S_OK; + } + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); return E_NOINTERFACE; } @@ -168,6 +174,66 @@ static const IDirectMusicSynthSinkVtbl DirectMusicSynthSink_Vtbl = { IDirectMusicSynthSinkImpl_GetDesiredBufferSize }; +static inline IDirectMusicSynthSinkImpl *impl_from_IKsControl(IKsControl *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSynthSinkImpl, IKsControl_iface); +} + +static HRESULT WINAPI DMSynthSinkImpl_IKsControl_QueryInterface(IKsControl* iface, REFIID riid, LPVOID *ppobj) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynthSinkImpl_QueryInterface(&This->IDirectMusicSynthSink_iface, riid, ppobj); +} + +static ULONG WINAPI DMSynthSinkImpl_IKsControl_AddRef(IKsControl* iface) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynthSinkImpl_AddRef(&This->IDirectMusicSynthSink_iface); +} + +static ULONG WINAPI DMSynthSinkImpl_IKsControl_Release(IKsControl* iface) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynthSinkImpl_Release(&This->IDirectMusicSynthSink_iface); +} + +static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + + +static const IKsControlVtbl DMSynthSinkImpl_IKsControl_Vtbl = { + DMSynthSinkImpl_IKsControl_QueryInterface, + DMSynthSinkImpl_IKsControl_AddRef, + DMSynthSinkImpl_IKsControl_Release, + DMSynthSinkImpl_IKsControl_KsProperty, + DMSynthSinkImpl_IKsControl_KsMethod, + DMSynthSinkImpl_IKsControl_KsEvent +}; + /* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) { @@ -183,6 +249,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_i return E_OUTOFMEMORY; obj->IDirectMusicSynthSink_iface.lpVtbl = &DirectMusicSynthSink_Vtbl; + obj->IKsControl_iface.lpVtbl = &DMSynthSinkImpl_IKsControl_Vtbl; obj->ref = 0; hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&obj->latency_clock); diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 3a53900..4ffc90c 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -53,7 +53,7 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); - todo_wine ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr); + ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr); /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth);

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmapSource methods.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 3c353607b1c6d12f5a89929237948fb0494a65da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c353607b1c6d12f5a8992923… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:29:27 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmapSource methods. --- dlls/windowscodecs/proxy.c | 30 ++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 10 +++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index c3209cc..f6d9649 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICBitmapSource_GetSize_Proxy_W(IWICBitmapSource *iface, + UINT *puiWidth, UINT *puiHeight) +{ + return IWICBitmapSource_GetSize(iface, puiWidth, puiHeight); +} + +HRESULT WINAPI IWICBitmapSource_GetPixelFormat_Proxy_W(IWICBitmapSource *iface, + WICPixelFormatGUID *pPixelFormat) +{ + return IWICBitmapSource_GetPixelFormat(iface, pPixelFormat); +} + +HRESULT WINAPI IWICBitmapSource_GetResolution_Proxy_W(IWICBitmapSource *iface, + double *pDpiX, double *pDpiY) +{ + return IWICBitmapSource_GetResolution(iface, pDpiX, pDpiY); +} + +HRESULT WINAPI IWICBitmapSource_CopyPalette_Proxy_W(IWICBitmapSource *iface, + IWICPalette *pIPalette) +{ + return IWICBitmapSource_CopyPalette(iface, pIPalette); +} + +HRESULT WINAPI IWICBitmapSource_CopyPixels_Proxy_W(IWICBitmapSource *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + return IWICBitmapSource_CopyPixels(iface, prc, cbStride, cbBufferSize, pbBuffer); +} + HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *iface, const BYTE *pbBuffer, UINT cbBufferSize) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 269fda5..c4b8873 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -44,11 +44,11 @@ @ stub IWICBitmapLock_GetDataPointer_STA_Proxy @ stub IWICBitmapLock_GetStride_Proxy @ stub IWICBitmapScaler_Initialize_Proxy -@ stub IWICBitmapSource_CopyPalette_Proxy -@ stub IWICBitmapSource_CopyPixels_Proxy -@ stub IWICBitmapSource_GetPixelFormat_Proxy -@ stub IWICBitmapSource_GetResolution_Proxy -@ stub IWICBitmapSource_GetSize_Proxy +@ stdcall IWICBitmapSource_CopyPalette_Proxy(ptr ptr) IWICBitmapSource_CopyPalette_Proxy_W +@ stdcall IWICBitmapSource_CopyPixels_Proxy(ptr ptr long long ptr) IWICBitmapSource_CopyPixels_Proxy_W +@ stdcall IWICBitmapSource_GetPixelFormat_Proxy(ptr ptr) IWICBitmapSource_GetPixelFormat_Proxy_W +@ stdcall IWICBitmapSource_GetResolution_Proxy(ptr ptr ptr) IWICBitmapSource_GetResolution_Proxy_W +@ stdcall IWICBitmapSource_GetSize_Proxy(ptr ptr ptr) IWICBitmapSource_GetSize_Proxy_W @ stub IWICBitmap_Lock_Proxy @ stub IWICBitmap_SetPalette_Proxy @ stub IWICBitmap_SetResolution_Proxy

1 0

Vincent Povirk : windowscodecs: Add wrapper for IWICColorContext_InitializeFromMemory.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 99eac8e3a11eddf0ec808f0486d3ec59b2621c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99eac8e3a11eddf0ec808f048… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:23:45 2012 -0500 windowscodecs: Add wrapper for IWICColorContext_InitializeFromMemory. --- dlls/windowscodecs/proxy.c | 6 ++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 4df14c7..c3209cc 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *iface, + const BYTE *pbBuffer, UINT cbBufferSize) +{ + return IWICColorContext_InitializeFromMemory(iface, pbBuffer, cbBufferSize); +} + HRESULT WINAPI IWICFastMetadataEncoder_Commit_Proxy_W(IWICFastMetadataEncoder *iface) { return IWICFastMetadataEncoder_Commit(iface); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 31b41d2..269fda5 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -52,7 +52,7 @@ @ stub IWICBitmap_Lock_Proxy @ stub IWICBitmap_SetPalette_Proxy @ stub IWICBitmap_SetResolution_Proxy -@ stub IWICColorContext_InitializeFromMemory_Proxy +@ stdcall IWICColorContext_InitializeFromMemory_Proxy(ptr ptr long) IWICColorContext_InitializeFromMemory_Proxy_W @ stub IWICComponentFactory_CreateMetadataWriterFromReader_Proxy @ stub IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy @ stub IWICComponentInfo_GetAuthor_Proxy

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012