August 2010 - Wine-commits - list.winehq.org

Aric Stewart : usp10: Add beginning support for GSUB Alternate Substitution Subtable.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: d4befda3c7c3a7664e7093db534f282356034ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4befda3c7c3a7664e7093db5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 3 11:16:49 2010 -0500 usp10: Add beginning support for GSUB Alternate Substitution Subtable. --- dlls/usp10/shape.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0018ae5..210022d 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -219,6 +219,18 @@ typedef struct{ GSUB_SubstLookupRecord SubstLookupRecord[1]; }GSUB_ChainContextSubstFormat3_4; +typedef struct { + WORD SubstFormat; /* = 1 */ + WORD Coverage; + WORD AlternateSetCount; + WORD AlternateSet[1]; +} GSUB_AlternateSubstFormat1; + +typedef struct{ + WORD GlyphCount; + WORD Alternate[1]; +} GSUB_AlternateSet; + static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); /* the orders of joined_forms and contextual_features need to line up */ @@ -400,6 +412,38 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN return GSUB_E_NOGLYPH; } +static INT GSUB_apply_AlternateSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + TRACE("Alternate Substitution Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GSUB_AlternateSubstFormat1 *asf1; + INT index; + + offset = GET_BE_WORD(look->SubTable[j]); + asf1 = (const GSUB_AlternateSubstFormat1*)((const BYTE*)look+offset); + offset = GET_BE_WORD(asf1->Coverage); + + index = GSUB_is_glyph_covered((const BYTE*)asf1+offset, glyphs[glyph_index]); + if (index != -1) + { + const GSUB_AlternateSet *as; + offset = GET_BE_WORD(asf1->AlternateSet[index]); + as = (const GSUB_AlternateSet*)((const BYTE*)asf1+offset); + FIXME("%i alternates, picking index 0\n",GET_BE_WORD(as->GlyphCount)); + + TRACE(" Glyph 0x%x ->",glyphs[glyph_index]); + glyphs[glyph_index] = GET_BE_WORD(as->Alternate[0]); + TRACE(" 0x%x\n",glyphs[glyph_index]); + return glyph_index + 1; + } + } + return GSUB_E_NOGLYPH; +} + static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -572,6 +616,8 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO { case 1: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 3: + return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 6:

1 0

Vincent Povirk : gdiplus: Stub GdipSetPenTransform.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 09de12b2a382f492b9d9a365da6fbada0cc4a04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09de12b2a382f492b9d9a365d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:56:42 2010 -0500 gdiplus: Stub GdipSetPenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3201d32..13bcc36 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -577,7 +577,7 @@ @ stdcall GdipSetPenMiterLimit(ptr long) @ stdcall GdipSetPenMode(ptr long) @ stdcall GdipSetPenStartCap(ptr long) -@ stub GdipSetPenTransform +@ stdcall GdipSetPenTransform(ptr ptr) @ stub GdipSetPenUnit @ stdcall GdipSetPenWidth(ptr long) @ stdcall GdipSetPixelOffsetMode(ptr long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 53e47f0..238eef1 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -404,6 +404,21 @@ GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) return NotImplemented; } +GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p,%p)\n", pen, matrix); + + if(!pen || !matrix) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { static int calls;

1 0

Vincent Povirk : gdiplus: Stub GdipRotatePenTransform.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: c1582f957ae0b358c5d9b2364883532a5f3a6000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1582f957ae0b358c5d9b2364… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:58:54 2010 -0500 gdiplus: Stub GdipRotatePenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 13bcc36..4b9444e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -488,7 +488,7 @@ @ stdcall GdipRotateLineTransform(ptr long long) @ stdcall GdipRotateMatrix(ptr long long) @ stub GdipRotatePathGradientTransform -@ stub GdipRotatePenTransform +@ stdcall GdipRotatePenTransform(ptr long long) @ stdcall GdipRotateTextureTransform(ptr long long) @ stdcall GdipRotateWorldTransform(ptr long long) @ stub GdipSaveAdd diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 238eef1..c2b3399 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -434,6 +434,21 @@ GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrix return NotImplemented; } +GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%0.2f,%u)\n", pen, angle, order); + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, GpMatrixOrder order) {

1 0

Vincent Povirk : gdiplus: Stub GdipGetPenTransform.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 2da2c9fd6b3628216444a6f2deaf748370877dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da2c9fd6b3628216444a6f2d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 18:00:49 2010 -0500 gdiplus: Stub GdipGetPenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4b9444e..495bc14 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -365,7 +365,7 @@ @ stdcall GdipGetPenMiterLimit(ptr ptr) @ stdcall GdipGetPenMode(ptr ptr) @ stdcall GdipGetPenStartCap(ptr ptr) -@ stub GdipGetPenTransform +@ stdcall GdipGetPenTransform(ptr ptr) @ stdcall GdipGetPenUnit(ptr ptr) @ stdcall GdipGetPenWidth(ptr ptr) @ stdcall GdipGetPixelOffsetMode(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index c2b3399..4fed4d2 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -419,6 +419,21 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p,%p)\n", pen, matrix); + + if(!pen || !matrix) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { static int calls;

1 0

Vincent Povirk : gdiplus: Stub GdipGetPathGradientPresetBlendCount.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 358d382782a7ab871e2136b93ef7dae78a5add91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=358d382782a7ab871e2136b93… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:12:19 2010 -0500 gdiplus: Stub GdipGetPathGradientPresetBlendCount. --- dlls/gdiplus/brush.c | 7 +++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0abf623..529b9a2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1474,6 +1474,13 @@ GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient *brush, + INT *count) +{ + FIXME("(%p,%p): stub\n", brush, count); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, ARGB argb) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 495bc14..0e64185 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -335,7 +335,7 @@ @ stub GdipGetPathGradientPath @ stdcall GdipGetPathGradientPointCount(ptr ptr) @ stub GdipGetPathGradientPresetBlend -@ stub GdipGetPathGradientPresetBlendCount +@ stdcall GdipGetPathGradientPresetBlendCount(ptr ptr) @ stdcall GdipGetPathGradientRect(ptr ptr) @ stdcall GdipGetPathGradientRectI(ptr ptr) @ stdcall GdipGetPathGradientSurroundColorCount(ptr ptr)

1 0

David Hedberg : explorerframe: Create the treeview on initialization.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 0ea424e7ebc895d95bfec7d8150cbd01bfb5db52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea424e7ebc895d95bfec7d81… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 12:59:05 2010 +0200 explorerframe: Create the treeview on initialization. --- dlls/explorerframe/Makefile.in | 2 +- dlls/explorerframe/explorerframe_main.h | 3 + dlls/explorerframe/nstc.c | 112 +++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 68cca8d..8dd4542 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -4,7 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = explorerframe.dll -IMPORTS = uuid user32 +IMPORTS = uuid shell32 user32 C_SRCS = \ explorerframe_main.c \ diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index 26d0f7f..09a50de 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -23,6 +23,9 @@ #include "shlobj.h" +/* Not declared in commctrl.h ("for internal use (msdn)") */ +#define TVS_EX_NOSINGLECOLLAPSE 0x0001 + extern HINSTANCE explorerframe_hinstance; extern LONG EFRAME_refCount; diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index c3a1563..2f2c3dc 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -39,26 +39,133 @@ typedef struct { LONG ref; HWND hwnd_main; + HWND hwnd_tv; NSTCSTYLE style; } NSTC2Impl; +static const DWORD unsupported_styles = + NSTCS_SINGLECLICKEXPAND | NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | + NSTCS_EMPTYTEXT | NSTCS_ALLOWJUNCTIONS | NSTCS_SHOWTABSBUTTON | NSTCS_SHOWDELETEBUTTON | + NSTCS_SHOWREFRESHBUTTON | NSTCS_SPRINGEXPAND | NSTCS_RICHTOOLTIP | NSTCS_NOINDENTCHECKS; + +/************************************************************************* + * NamespaceTree helper functions + */ +static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, + NSTCSTYLE nstcs_mask, DWORD *new_style) +{ + DWORD old_style, tv_mask = 0; + TRACE("%p, %x, %x, %p\n", This, nstcs, nstcs_mask, new_style); + + if(This->hwnd_tv) + old_style = GetWindowLongPtrW(This->hwnd_tv, GWL_STYLE); + else + old_style = /* The default */ + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | + WS_TABSTOP | TVS_NOHSCROLL | TVS_NONEVENHEIGHT | TVS_INFOTIP | + TVS_EDITLABELS | TVS_TRACKSELECT; + + if(nstcs_mask & NSTCS_HASEXPANDOS) tv_mask |= TVS_HASBUTTONS; + if(nstcs_mask & NSTCS_HASLINES) tv_mask |= TVS_HASLINES; + if(nstcs_mask & NSTCS_FULLROWSELECT) tv_mask |= TVS_FULLROWSELECT; + if(nstcs_mask & NSTCS_HORIZONTALSCROLL) tv_mask |= TVS_NOHSCROLL; + if(nstcs_mask & NSTCS_ROOTHASEXPANDO) tv_mask |= TVS_LINESATROOT; + if(nstcs_mask & NSTCS_SHOWSELECTIONALWAYS) tv_mask |= TVS_SHOWSELALWAYS; + if(nstcs_mask & NSTCS_NOINFOTIP) tv_mask |= TVS_INFOTIP; + if(nstcs_mask & NSTCS_EVENHEIGHT) tv_mask |= TVS_NONEVENHEIGHT; + if(nstcs_mask & NSTCS_DISABLEDRAGDROP) tv_mask |= TVS_DISABLEDRAGDROP; + if(nstcs_mask & NSTCS_NOEDITLABELS) tv_mask |= TVS_EDITLABELS; + if(nstcs_mask & NSTCS_CHECKBOXES) tv_mask |= TVS_CHECKBOXES; + + *new_style = 0; + + if(nstcs & NSTCS_HASEXPANDOS) *new_style |= TVS_HASBUTTONS; + if(nstcs & NSTCS_HASLINES) *new_style |= TVS_HASLINES; + if(nstcs & NSTCS_FULLROWSELECT) *new_style |= TVS_FULLROWSELECT; + if(!(nstcs & NSTCS_HORIZONTALSCROLL)) *new_style |= TVS_NOHSCROLL; + if(nstcs & NSTCS_ROOTHASEXPANDO) *new_style |= TVS_LINESATROOT; + if(nstcs & NSTCS_SHOWSELECTIONALWAYS) *new_style |= TVS_SHOWSELALWAYS; + if(!(nstcs & NSTCS_NOINFOTIP)) *new_style |= TVS_INFOTIP; + if(!(nstcs & NSTCS_EVENHEIGHT)) *new_style |= TVS_NONEVENHEIGHT; + if(nstcs & NSTCS_DISABLEDRAGDROP) *new_style |= TVS_DISABLEDRAGDROP; + if(!(nstcs & NSTCS_NOEDITLABELS)) *new_style |= TVS_EDITLABELS; + if(nstcs & NSTCS_CHECKBOXES) *new_style |= TVS_CHECKBOXES; + + *new_style = (old_style & ~tv_mask) | (*new_style & tv_mask); + + TRACE("old: %08x, new: %08x\n", old_style, *new_style); + + return old_style^*new_style; +} + /************************************************************************* * NamespaceTree window functions */ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) { NSTC2Impl *This = crs->lpCreateParams; + HIMAGELIST ShellSmallIconList; + DWORD treeview_style, treeview_ex_style; TRACE("%p (%p)\n", This, crs); SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LPARAM)This); This->hwnd_main = hWnd; + treeview_style_from_nstcs(This, This->style, 0xFFFFFFFF, &treeview_style); + + This->hwnd_tv = CreateWindowExW(0, WC_TREEVIEWW, NULL, treeview_style, + 0, 0, crs->cx, crs->cy, + hWnd, NULL, explorerframe_hinstance, NULL); + + if(!This->hwnd_tv) + { + ERR("Failed to create treeview!\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + + treeview_ex_style = TVS_EX_DRAWIMAGEASYNC | TVS_EX_RICHTOOLTIP | + TVS_EX_DOUBLEBUFFER | TVS_EX_NOSINGLECOLLAPSE; + + if(This->style & NSTCS_AUTOHSCROLL) + treeview_ex_style |= TVS_EX_AUTOHSCROLL; + if(This->style & NSTCS_FADEINOUTEXPANDOS) + treeview_ex_style |= TVS_EX_FADEINOUTEXPANDOS; + if(This->style & NSTCS_PARTIALCHECKBOXES) + treeview_ex_style |= TVS_EX_PARTIALCHECKBOXES; + if(This->style & NSTCS_EXCLUSIONCHECKBOXES) + treeview_ex_style |= TVS_EX_EXCLUSIONCHECKBOXES; + if(This->style & NSTCS_DIMMEDCHECKBOXES) + treeview_ex_style |= TVS_EX_DIMMEDCHECKBOXES; + + SendMessageW(This->hwnd_tv, TVM_SETEXTENDEDSTYLE, treeview_ex_style, 0xffff); + + if(Shell_GetImageLists(NULL, &ShellSmallIconList)) + { + SendMessageW(This->hwnd_tv, TVM_SETIMAGELIST, + (WPARAM)TVSIL_NORMAL, (LPARAM)ShellSmallIconList); + } + else + { + ERR("Failed to get the System Image List.\n"); + } + INameSpaceTreeControl_AddRef((INameSpaceTreeControl*)This); return TRUE; } +static LRESULT resize_namespacetree(NSTC2Impl *This) +{ + RECT rc; + TRACE("%p\n", This); + + GetClientRect(This->hwnd_main, &rc); + MoveWindow(This->hwnd_tv, 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE); + + return TRUE; +} + static LRESULT destroy_namespacetree(NSTC2Impl *This) { TRACE("%p\n", This); @@ -76,6 +183,7 @@ static LRESULT CALLBACK NSTC2_WndProc(HWND hWnd, UINT uMessage, switch(uMessage) { case WM_NCCREATE: return create_namespacetree(hWnd, (CREATESTRUCTW*)lParam); + case WM_SIZE: return resize_namespacetree(This); case WM_DESTROY: return destroy_namespacetree(This); default: return DefWindowProcW(hWnd, uMessage, wParam, lParam); } @@ -152,6 +260,10 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, TRACE("%p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); + if(nstcsFlags & unsupported_styles) + FIXME("0x%08x contains the unsupported style(s) 0x%08x\n", + nstcsFlags, nstcsFlags & unsupported_styles); + This->style = nstcsFlags; if(!GetClassInfoW(explorerframe_hinstance, NSTC2_CLASS_NAME, &wc))

1 0

David Hedberg : explorerframe: Add IOleWindow implementation.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: c32fa3485bb1c38fbd23fd39feea9f3d98aaef80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32fa3485bb1c38fbd23fd39f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 03:43:08 2010 +0200 explorerframe: Add IOleWindow implementation. --- dlls/explorerframe/nstc.c | 62 +++++++++++++++++++++++++++ dlls/explorerframe/tests/nstc.c | 90 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 2f2c3dc..e9c8346 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nstc); typedef struct { const INameSpaceTreeControl2Vtbl *lpVtbl; + const IOleWindowVtbl *lpowVtbl; LONG ref; HWND hwnd_main; @@ -207,6 +208,10 @@ static HRESULT WINAPI NSTC2_fnQueryInterface(INameSpaceTreeControl2* iface, { *ppvObject = This; } + else if(IsEqualIID(riid, &IID_IOleWindow)) + { + *ppvObject = &This->lpowVtbl; + } if(*ppvObject) { @@ -531,6 +536,62 @@ static const INameSpaceTreeControl2Vtbl vt_INameSpaceTreeControl2 = { NSTC2_fnGetControlStyle2 }; +/************************************************************************** + * IOleWindow Implementation + */ + +static inline NSTC2Impl *impl_from_IOleWindow(IOleWindow *iface) +{ + return (NSTC2Impl *)((char*)iface - FIELD_OFFSET(NSTC2Impl, lpowVtbl)); +} + +static HRESULT WINAPI IOW_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObject) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p\n", This); + return NSTC2_fnQueryInterface((INameSpaceTreeControl2*)This, riid, ppvObject); +} + +static ULONG WINAPI IOW_fnAddRef(IOleWindow *iface) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p\n", This); + return NSTC2_fnAddRef((INameSpaceTreeControl2*)This); +} + +static ULONG WINAPI IOW_fnRelease(IOleWindow *iface) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p\n", This); + return NSTC2_fnRelease((INameSpaceTreeControl2*)This); +} + +static HRESULT WINAPI IOW_fnGetWindow(IOleWindow *iface, HWND *phwnd) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p (%p)\n", This, phwnd); + + *phwnd = This->hwnd_main; + return S_OK; +} + +static HRESULT WINAPI IOW_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p (%d)\n", This, fEnterMode); + + /* Not implemented */ + return E_NOTIMPL; +} + +static const IOleWindowVtbl vt_IOleWindow = { + IOW_fnQueryInterface, + IOW_fnAddRef, + IOW_fnRelease, + IOW_fnGetWindow, + IOW_fnContextSensitiveHelp +}; + HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { NSTC2Impl *nstc; @@ -548,6 +609,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); nstc->ref = 1; nstc->lpVtbl = &vt_INameSpaceTreeControl2; + nstc->lpowVtbl = &vt_IOleWindow; ret = INameSpaceTreeControl_QueryInterface((INameSpaceTreeControl*)nstc, riid, ppv); INameSpaceTreeControl_Release((INameSpaceTreeControl*)nstc); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 122cb8d..6a72eb3 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -34,7 +34,9 @@ static HWND hwnd; static BOOL test_initialization(void) { INameSpaceTreeControl *pnstc; + IOleWindow *pow; IUnknown *punk; + HWND hwnd_host1; LONG lres; HRESULT hr; RECT rc; @@ -60,8 +62,89 @@ static BOOL test_initialization(void) hr = INameSpaceTreeControl_Initialize(pnstc, (HWND)0xDEADBEEF, &rc, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) + { + hr = IOleWindow_GetWindow(pow, &hwnd_host1); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok(hwnd_host1 == NULL, "hwnd is not null.\n"); + + hr = IOleWindow_ContextSensitiveHelp(pow, TRUE); + ok(hr == E_NOTIMPL, "Got (0x%08x)\n", hr); + hr = IOleWindow_ContextSensitiveHelp(pow, FALSE); + ok(hr == E_NOTIMPL, "Got (0x%08x)\n", hr); + IOleWindow_Release(pow); + } + hr = INameSpaceTreeControl_Initialize(pnstc, hwnd, NULL, 0); ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + static const CHAR namespacetree[] = "NamespaceTreeControl"; + char buf[1024]; + LONG style, expected_style; + HWND hwnd_tv; + hr = IOleWindow_GetWindow(pow, &hwnd_host1); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok(hwnd_host1 != NULL, "hwnd_host1 is null.\n"); + buf[0] = '\0'; + GetClassNameA(hwnd_host1, buf, 1024); + ok(!lstrcmpA(namespacetree, buf), "Class name was %s\n", buf); + + expected_style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + style = GetWindowLongPtrW(hwnd_host1, GWL_STYLE); + ok(style == expected_style, "Got style %08x\n", style); + + expected_style = 0; + style = GetWindowLongPtrW(hwnd_host1, GWL_EXSTYLE); + ok(style == expected_style, "Got style %08x\n", style); + + expected_style = 0; + style = SendMessageW(hwnd_host1, TVM_GETEXTENDEDSTYLE, 0, 0); + ok(style == expected_style, "Got 0x%08x\n", style); + + hwnd_tv = FindWindowExW(hwnd_host1, NULL, WC_TREEVIEWW, NULL); + ok(hwnd_tv != NULL, "Failed to get treeview hwnd.\n"); + if(hwnd_tv) + { + expected_style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN | WS_TABSTOP | TVS_NOHSCROLL | + TVS_NONEVENHEIGHT | TVS_INFOTIP | TVS_TRACKSELECT | TVS_EDITLABELS; + style = GetWindowLongPtrW(hwnd_tv, GWL_STYLE); + ok(style == expected_style, "Got style %08x\n", style); + + expected_style = 0; + style = GetWindowLongPtrW(hwnd_tv, GWL_EXSTYLE); + ok(style == expected_style, "Got style %08x\n", style); + + expected_style = TVS_EX_NOSINGLECOLLAPSE | TVS_EX_DOUBLEBUFFER | + TVS_EX_RICHTOOLTIP | TVS_EX_DRAWIMAGEASYNC; + style = SendMessageW(hwnd_tv, TVM_GETEXTENDEDSTYLE, 0, 0); + todo_wine ok(style == expected_style, "Got 0x%08x\n", style); + } + + IOleWindow_Release(pow); + } + + if(0) + { + /* The control can be initialized again without crashing, but + * the reference counting will break. */ + hr = INameSpaceTreeControl_Initialize(pnstc, hwnd, &rc, 0); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleWindow, (void**)&pow); + if(SUCCEEDED(hr)) + { + HWND hwnd_host2; + hr = IOleWindow_GetWindow(pow, &hwnd_host2); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok(hwnd_host1 != hwnd_host2, "Same hwnd.\n"); + IOleWindow_Release(pow); + } + } /* Some "random" interfaces */ hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObject, (void**)&punk); @@ -87,8 +170,13 @@ static BOOL test_initialization(void) /* On windows, the reference count won't go to zero until the * window is destroyed. */ + INameSpaceTreeControl_AddRef(pnstc); + lres = INameSpaceTreeControl_Release(pnstc); + ok(lres > 1, "Reference count was (%d).\n", lres); + + DestroyWindow(hwnd_host1); lres = INameSpaceTreeControl_Release(pnstc); - ok(lres, "lres was %d\n", lres); + ok(!lres, "lres was %d\n", lres); return TRUE; }

1 0

David Hedberg : explorerframe: Implement Set/GetControlStyle(2).
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: a5cb7652defc20959d446659a2a2eaa1ad8c5d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5cb7652defc20959d446659a… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 03:43:09 2010 +0200 explorerframe: Implement Set/GetControlStyle(2). --- dlls/explorerframe/nstc.c | 81 +++++++++++-- dlls/explorerframe/tests/nstc.c | 255 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 327 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5cb7652defc20959d446…

1 0

David Hedberg : explorerframe: Implement TreeAdvise/TreeUnadvise.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 1186e3cacaf7797e5f3e1435cf2da053c08a9028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1186e3cacaf7797e5f3e1435c… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 03:43:10 2010 +0200 explorerframe: Implement TreeAdvise/TreeUnadvise. --- dlls/explorerframe/nstc.c | 34 +++- dlls/explorerframe/tests/Makefile.in | 2 +- dlls/explorerframe/tests/nstc.c | 426 ++++++++++++++++++++++++++++++++++ 3 files changed, 457 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1186e3cacaf7797e5f3e1…

1 0

Andrew Nguyen : gdi32: Improve AddFontMemResourceEx parameter validation.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: ca96aed384709aca388c7a4f76a1d6422087d583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca96aed384709aca388c7a4f7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Aug 3 07:07:59 2010 -0500 gdi32: Improve AddFontMemResourceEx parameter validation. --- dlls/gdi32/font.c | 6 +++ dlls/gdi32/tests/font.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9ebf7b3..133681c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3188,6 +3188,12 @@ HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD HANDLE ret; DWORD num_fonts; + if (!pbFont || !cbFont || !pcFonts) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + ret = WineEngAddFontMemResourceEx(pbFont, cbFont, pdv, &num_fonts); if (ret) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bbb54cd..fa48360 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3185,6 +3185,8 @@ static void test_AddFontMemResource(void) void *font; DWORD font_size, num_fonts; HANDLE ret; + DEVMODEA dmA; + BOOL is_winxp; if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx) { @@ -3199,6 +3201,74 @@ static void test_AddFontMemResource(void) return; } + is_winxp = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA) && + (dmA.dmFields & DM_DISPLAYORIENTATION); + + if (is_winxp) + { + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 10, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected GetLastError() to return 0xdeadbeef, got %u\n", + GetLastError()); + ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + } + else + win_skip("AddFontMemResourceEx invalid parameter tests are problematic on Win2k\n"); + num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); @@ -3215,11 +3285,19 @@ static void test_AddFontMemResource(void) font = load_font("sserife.fon", &font_size); ok(font != NULL, "Unable to locate and load font sserife.fon\n"); + SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, font_size, NULL, (void *)0xdeadbeef); ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected GetLastError() to return 0xdeadbeef, got %u\n", + GetLastError()); + SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, font_size, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); free_font(font); }

1 0