March 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Set the byte count for WINED3DFMT_UNKNOWN to 0.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: a56a14346109cdb12eebbb96c500b76414a4aa2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56a14346109cdb12eebbb96c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:22 2009 +0100 wined3d: Set the byte count for WINED3DFMT_UNKNOWN to 0. As far as I can tell nothing depends on this being 1, and there's some code that checks for WINED3DFMT_UNKNOWN and uses 0 for the byte count in that case. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7a66432..a2a438e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -50,7 +50,7 @@ struct StaticPixelFormatDesc static const struct StaticPixelFormatDesc formats[] = { /* WINED3DFORMAT alphamask redmask greenmask bluemask bpp depth stencil isFourcc */ - {WINED3DFMT_UNKNOWN, 0x0, 0x0, 0x0, 0x0, 1, 0, 0, FALSE}, + {WINED3DFMT_UNKNOWN, 0x0, 0x0, 0x0, 0x0, 0, 0, 0, FALSE}, /* FourCC formats, kept here to have WINED3DFMT_R8G8B8(=20) at position 20 */ {WINED3DFMT_UYVY, 0x0, 0x0, 0x0, 0x0, 2, 0, 0, TRUE }, {WINED3DFMT_YUY2, 0x0, 0x0, 0x0, 0x0, 2, 0, 0, TRUE },

1 0

Henri Verbeet : wined3d: Remove the bytesPerPixel field from IWineD3DSurfaceImpl and IWineD3DVolumeImpl .
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: b7744f815898a27e53a6c3dafb834be9d517d6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7744f815898a27e53a6c3daf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:23 2009 +0100 wined3d: Remove the bytesPerPixel field from IWineD3DSurfaceImpl and IWineD3DVolumeImpl. We can use the information from format_desc instead. --- dlls/wined3d/device.c | 19 +++++-------------- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/surface_base.c | 27 ++++++++++----------------- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/volume.c | 13 +++++++------ dlls/wined3d/wined3d_private.h | 6 ------ 6 files changed, 28 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7744f815898a27e53a6c…

1 0

Henri Verbeet : wined3d: Pass format_desc to the Check*Capability() function.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: a02d80188823631e2aa413ecf65a337a29f47c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02d80188823631e2aa413ecf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:23 2009 +0100 wined3d: Pass format_desc to the Check*Capability() function. Rather than looking it up all the time. --- dlls/wined3d/directx.c | 220 +++++++++++++++++++++++------------------------- 1 files changed, 104 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a02d80188823631e2aa41…

1 0

Henri Verbeet : wined3d: Pass format_desc to getColorBits() and getDepthStencilBits().
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: dd1f0d9c48203fac7b29da4bb5dfb2c941b9bcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1f0d9c48203fac7b29da4bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:24 2009 +0100 wined3d: Pass format_desc to getColorBits() and getDepthStencilBits(). --- dlls/wined3d/context.c | 64 ++++++++++++++++++++++----------------- dlls/wined3d/directx.c | 12 +++---- dlls/wined3d/utils.c | 38 +++++++---------------- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 55 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd1f0d9c48203fac7b29d…

1 0

Henri Verbeet : wined3d: Pass format_desc to set_shader().
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: afc5744e70a6a16e0285770b5e722d6c9d8095be URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc5744e70a6a16e0285770b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:24 2009 +0100 wined3d: Pass format_desc to set_shader(). This should be the last unnecessary getFormatDescEntry() call. --- dlls/wined3d/arb_program_shader.c | 13 ++++++------- dlls/wined3d/surface.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7b622d4..cf5716a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3666,20 +3666,19 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu return shader; } -static HRESULT arbfp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum textype, UINT width, UINT height) { +static HRESULT arbfp_blit_set(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc, + GLenum textype, UINT width, UINT height) +{ GLenum shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; float size[4] = {width, height, 1, 1}; struct arbfp_blit_priv *priv = device->blit_priv; - const struct GlPixelFormatDesc *glDesc; enum yuv_fixup yuv_fixup; - glDesc = getFormatDescEntry(fmt, &GLINFO_LOCATION); - - if (!is_yuv_fixup(glDesc->color_fixup)) + if (!is_yuv_fixup(format_desc->color_fixup)) { TRACE("Fixup:\n"); - dump_color_fixup_desc(glDesc->color_fixup); + dump_color_fixup_desc(format_desc->color_fixup); /* Don't bother setting up a shader for unconverted formats */ ENTER_GL(); glEnable(textype); @@ -3688,7 +3687,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum t return WINED3D_OK; } - yuv_fixup = get_yuv_fixup(glDesc->color_fixup); + yuv_fixup = get_yuv_fixup(format_desc->color_fixup); switch(yuv_fixup) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc71ecf..ecca666 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3474,8 +3474,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const rect.y1 += This->currentDesc.Height - h; rect.y2 += This->currentDesc.Height - h; } - myDevice->blitter->set_shader((IWineD3DDevice *) myDevice, Src->resource.format_desc->format, - Src->glDescription.target, Src->pow2Width, Src->pow2Height); + myDevice->blitter->set_shader((IWineD3DDevice *) myDevice, Src->resource.format_desc, + Src->glDescription.target, Src->pow2Width, Src->pow2Height); ENTER_GL(); @@ -4812,7 +4812,9 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = static HRESULT ffp_blit_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } static void ffp_blit_free(IWineD3DDevice *iface) { } -static HRESULT ffp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum textype, UINT width, UINT height) { +static HRESULT ffp_blit_set(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc, + GLenum textype, UINT width, UINT height) +{ glEnable(textype); checkGLcall("glEnable(textype)"); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eab085d..2125366 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -782,7 +782,8 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ struct blit_shader { HRESULT (*alloc_private)(IWineD3DDevice *iface); void (*free_private)(IWineD3DDevice *iface); - HRESULT (*set_shader)(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum textype, UINT width, UINT height); + HRESULT (*set_shader)(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc, + GLenum textype, UINT width, UINT height); void (*unset_shader)(IWineD3DDevice *iface); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); };

1 0

Henri Verbeet : shdocvw: Add a stub ITaskbarList implementation.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 8e12ad4faeb9274a6a038638eed261f3cfae63f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e12ad4faeb9274a6a038638e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:25 2009 +0100 shdocvw: Add a stub ITaskbarList implementation. Based on a patch by Louis Lenders. Although MSDN claims this should be in shell32, it really is in shdocvw. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/factory.c | 9 ++- dlls/shdocvw/shdocvw.h | 2 + dlls/shdocvw/shdocvw.inf | 3 + dlls/shdocvw/taskbarlist.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ dlls/uuid/uuid.c | 1 + include/shobjidl.idl | 2 + 7 files changed, 173 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 0fd59c5..d8035ff 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -23,6 +23,7 @@ C_SRCS = \ persist.c \ shdocvw_main.c \ shlinstobj.c \ + taskbarlist.c \ urlhist.c \ view.c \ webbrowser.c diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 9111300..751b5a4 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -135,6 +135,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) static IClassFactoryImpl WB2ClassFactory = {&WBCF_Vtbl, WebBrowserV2_Create}; static IClassFactoryImpl CUHClassFactory = {&WBCF_Vtbl, CUrlHistory_Create}; static IClassFactoryImpl ISCClassFactory = {&WBCF_Vtbl, InternetShortcut_Create}; + static IClassFactoryImpl TBLClassFactory = {&WBCF_Vtbl, TaskbarList_Create}; TRACE("\n"); @@ -150,6 +151,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) if(IsEqualGUID(&CLSID_InternetShortcut, rclsid)) return IClassFactory_QueryInterface(FACTORY(&ISCClassFactory), riid, ppv); + if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) + return IClassFactory_QueryInterface(FACTORY(&TBLClassFactory), riid, ppv); + /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } @@ -213,8 +217,8 @@ static const GUID CLSID_MruLongList = static HRESULT register_server(BOOL doregister) { STRTABLEA strtable; - STRENTRYA pse[14]; - static CLSID const *clsids[14]; + STRENTRYA pse[15]; + static CLSID const *clsids[15]; unsigned int i = 0; HRESULT hres; @@ -230,6 +234,7 @@ static HRESULT register_server(BOOL doregister) INF_SET_CLSID(ShellShellNameSpace); INF_SET_CLSID(ShellUIHelper); INF_SET_CLSID(ShellWindows); + INF_SET_CLSID(TaskbarList); INF_SET_CLSID(WebBrowser); INF_SET_CLSID(WebBrowser_V1); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index fc8c3b5..b148611 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -227,6 +227,8 @@ HRESULT CUrlHistory_Create(IUnknown*,REFIID,void**); HRESULT InternetShortcut_Create(IUnknown*,REFIID,void**); +HRESULT TaskbarList_Create(IUnknown*,REFIID,void**); + #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) /********************************************************************** diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 025c4b1..d67443d 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -126,6 +126,9 @@ HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL % HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1""" HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1"" ""%2"" ""%3"" ""%4""" +HKCR,"CLSID\%CLSID_TaskbarList%",,,"Task Bar Communication" +HKCR,"CLSID\%CLSID_TaskbarList%\InProcServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_TaskbarList%\InProcServer32","ThreadingModel",,"Apartment" [URL.Reg] HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\DefaultPrefix",,,"http://" diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/shdocvw/taskbarlist.c new file mode 100644 index 0000000..e0e063c --- /dev/null +++ b/dlls/shdocvw/taskbarlist.c @@ -0,0 +1,157 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#include "shdocvw.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +struct taskbar_list +{ + const struct ITaskbarListVtbl *lpVtbl; + LONG refcount; +}; + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ITaskbarList) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) +{ + struct taskbar_list *This = (struct taskbar_list *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface) +{ + struct taskbar_list *This = (struct taskbar_list *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ITaskbarList methods */ + +static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList *iface, HWND hwnd) +{ + FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList *iface, HWND hwnd) +{ + FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList *iface, HWND hwnd) +{ + FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE taskbar_list_SetActiveAlt(ITaskbarList *iface, HWND hwnd) +{ + FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + + return E_NOTIMPL; +} + +static const struct ITaskbarListVtbl taskbar_list_vtbl = +{ + /* IUnknown methods */ + taskbar_list_QueryInterface, + taskbar_list_AddRef, + taskbar_list_Release, + /* ITaskbarList methods */ + taskbar_list_HrInit, + taskbar_list_AddTab, + taskbar_list_DeleteTab, + taskbar_list_ActivateTab, + taskbar_list_SetActiveAlt, +}; + +HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) +{ + struct taskbar_list *object; + + TRACE("outer %p, riid %s, taskbar_list %p\n", outer, debugstr_guid(riid), taskbar_list); + + if (outer) + { + WARN("Aggregation not supported\n"); + return CLASS_E_NOAGGREGATION; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate taskbar list object memory\n"); + return E_OUTOFMEMORY; + } + + object->lpVtbl = &taskbar_list_vtbl; + object->refcount = 1; + + *taskbar_list = object; + + TRACE("Created ITaskbarList %p\n", object); + + return S_OK; +} diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 36dd205..35d4ae8 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -113,6 +113,7 @@ DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x0 DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); +DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 324f5e5..5acd302 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1479,6 +1479,8 @@ interface ITaskbarList : IUnknown [in] HWND hwnd); } +cpp_quote("EXTERN_C const CLSID CLSID_TaskbarList;") + /***************************************************************************** * IAutoCompleteDropDown interface */

1 0

Paul Vriens : riched20/tests: Fix and extend EM_FORMATRANGE tests.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: e96fb0fa50170d1aa987e131fdc5bc6e7ee8821a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96fb0fa50170d1aa987e131f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 24 10:17:13 2009 +0100 riched20/tests: Fix and extend EM_FORMATRANGE tests. --- dlls/riched20/tests/editor.c | 103 +++++++++++++++++++++++++++++++----------- 1 files changed, 76 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 40d0045..e5d7e2d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4746,46 +4746,95 @@ static void test_WM_PASTE(void) static void test_EM_FORMATRANGE(void) { - int r; - FORMATRANGE fr; + int i, tpp_x, tpp_y; HDC hdc; HWND hwndRichEdit = new_richedit(NULL); - - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack); + static const struct { + const char *string; /* The string */ + int first; /* First 'pagebreak', 0 for don't care */ + int second; /* Second 'pagebreak', 0 for don't care */ + } fmtstrings[] = { + {"WINE wine", 0, 0}, + {"WINE wineWine", 0, 0}, + {"WINE\r\nwine\r\nwine", 5, 10}, + {"WINE\r\nWINEwine\r\nWINEwine", 5, 14}, + {"WINE\r\n\r\nwine\r\nwine", 5, 6} + }; hdc = GetDC(hwndRichEdit); ok(hdc != NULL, "Could not get HDC\n"); - fr.hdc = fr.hdcTarget = hdc; - fr.rc.top = fr.rcPage.top = fr.rc.left = fr.rcPage.left = 0; - fr.rc.right = fr.rcPage.right = GetDeviceCaps(hdc, HORZRES); - fr.rc.bottom = fr.rcPage.bottom = GetDeviceCaps(hdc, VERTRES); - fr.chrg.cpMin = 0; - fr.chrg.cpMax = 20; + /* Calculate the twips per pixel */ + tpp_x = 1440 / GetDeviceCaps(hdc, LOGPIXELSX); + tpp_y = 1440 / GetDeviceCaps(hdc, LOGPIXELSY); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); - todo_wine { - ok(r == 31, "EM_FORMATRANGE expect %d, got %d\n", 31, r); - } + SendMessage(hwndRichEdit, EM_FORMATRANGE, FALSE, 0); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); - todo_wine { - ok(r == 20 || r == 9, "EM_FORMATRANGE expect 20 or 9, got %d\n", r); - } + for (i = 0; i < sizeof(fmtstrings)/sizeof(fmtstrings[0]); i++) + { + FORMATRANGE fr; + GETTEXTLENGTHEX gtl; + SIZE stringsize; + int r, len; - fr.chrg.cpMin = 0; - fr.chrg.cpMax = 10; + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) fmtstrings[i].string); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); - todo_wine { - ok(r == 10, "EM_FORMATRANGE expect %d, got %d\n", 10, r); - } + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + len = SendMessageA(hwndRichEdit, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); - todo_wine { - ok(r == 31, "EM_FORMATRANGE expect %d, got %d\n", 31, r); + /* Get some size information for the string */ + GetTextExtentPoint32(hdc, fmtstrings[i].string, strlen(fmtstrings[i].string), &stringsize); + + /* Define the box to be half the width needed and a bit larger than the height. + * Changes to the width means we have at least 2 pages. Changes to the height + * is done so we can check the changing of fr.rc.bottom. + */ + fr.hdc = fr.hdcTarget = hdc; + fr.rc.top = fr.rcPage.top = fr.rc.left = fr.rcPage.left = 0; + fr.rc.right = fr.rcPage.right = (stringsize.cx / 2) * tpp_x; + fr.rc.bottom = fr.rcPage.bottom = (stringsize.cy + 10) * tpp_y; + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); + todo_wine { + ok(r == len, "Expected %d, got %d\n", len, r); + } + + /* We know that the page can't hold the full string. See how many characters + * are on the first one + */ + fr.chrg.cpMin = 0; + fr.chrg.cpMax = -1; + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); + todo_wine { + ok(fr.rc.bottom == (stringsize.cy * tpp_y), "Expected bottom to be %d, got %d\n", (stringsize.cy * tpp_y), fr.rc.bottom); + } + if (fmtstrings[i].first) + todo_wine { + ok(r == fmtstrings[i].first, "Expected %d, got %d\n", fmtstrings[i].first, r); + } + else + ok(r < len, "Expected < %d, got %d\n", len, r); + + /* Do another page */ + fr.chrg.cpMin = r; + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); + if (fmtstrings[i].second) + todo_wine { + ok(r == fmtstrings[i].second, "Expected %d, got %d\n", fmtstrings[i].second, r); + } + else + ok (r < len, "Expected < %d, got %d\n", len, r); + + /* There is at least on more page, but we don't care */ + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); + todo_wine { + ok(r == len, "Expected %d, got %d\n", len, r); + } } + ReleaseDC(NULL, hdc); DestroyWindow(hwndRichEdit); }

1 0

Alexandre Julliard : winebuild: Make sure main module is properly initialized.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: e9ef9911d0f348f4af34dd517e3fabc3276ff333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ef9911d0f348f4af34dd517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 11:50:13 2009 +0100 winebuild: Make sure main module is properly initialized. --- tools/winebuild/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 3a29a4b..ffe44ec 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -465,6 +465,7 @@ DLLSPEC *alloc_dll_spec(void) spec->file_name = NULL; spec->dll_name = NULL; spec->init_func = NULL; + spec->main_module = NULL; spec->type = SPEC_WIN32; spec->base = MAX_ORDINALS; spec->limit = 0;

1 0

Nikolay Sivov : comctl32/tab: Implement TCM_REMOVEIMAGE.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 45851485476096c99ee21a43a5eeecfb64abc400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45851485476096c99ee21a43a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 15:45:44 2009 -0400 comctl32/tab: Implement TCM_REMOVEIMAGE. --- dlls/comctl32/tab.c | 35 ++++++++++++++++++++++-- dlls/comctl32/tests/tab.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 3880ceb..ae4f035 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -53,7 +53,6 @@ * TCN_KEYDOWN * * Messages: - * TCM_REMOVEIMAGE * TCM_DESELECTALL * TCM_GETEXTENDEDSTYLE * TCM_SETEXTENDEDSTYLE @@ -3099,6 +3098,37 @@ TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) return TRUE; } +static LRESULT TAB_RemoveImage (TAB_INFO *infoPtr, INT image) +{ + if (!infoPtr) + return 0; + + if (ImageList_Remove (infoPtr->himl, image)) + { + INT i, *idx; + RECT r; + + /* shift indices, repaint items if needed */ + for (i = 0; i < infoPtr->uNumItem; i++) + { + idx = &infoPtr->items[i].iImage; + if (*idx >= image) + { + if (*idx == image) + *idx = -1; + else + (*idx)--; + + /* repaint item */ + if (TAB_InternalGetItemRect (infoPtr, i, &r, NULL)) + InvalidateRect (infoPtr->hwnd, &r, TRUE); + } + } + } + + return 0; +} + static LRESULT WINAPI TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -3159,8 +3189,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_SetItemSize (infoPtr, lParam); case TCM_REMOVEIMAGE: - FIXME("Unimplemented msg TCM_REMOVEIMAGE\n"); - return 0; + return TAB_RemoveImage (infoPtr, wParam); case TCM_SETPADDING: return TAB_SetPadding (infoPtr, lParam); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 4b1c7f4..daef97f 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -984,6 +984,69 @@ static void test_delete_focus(HWND parent_wnd) DestroyWindow(hTab); } +static void test_removeimage(HWND parent_wnd) +{ + static const BYTE bits[32]; + HWND hwTab; + INT i; + TCITEM item; + HICON hicon; + HIMAGELIST himl = ImageList_Create(16, 16, ILC_COLOR, 3, 4); + + hicon = CreateIcon(NULL, 16, 16, 1, 1, bits, bits); + ImageList_AddIcon(himl, hicon); + ImageList_AddIcon(himl, hicon); + ImageList_AddIcon(himl, hicon); + + hwTab = create_tabcontrol(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE); + SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); + + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_IMAGE; + + for(i = 0; i < 3; i++) { + SendMessage(hwTab, TCM_GETITEM, i, (LPARAM)&item); + expect(i, item.iImage); + } + + /* remove image middle image */ + SendMessage(hwTab, TCM_REMOVEIMAGE, 1, 0); + expect(2, ImageList_GetImageCount(himl)); + item.iImage = -1; + SendMessage(hwTab, TCM_GETITEM, 0, (LPARAM)&item); + expect(0, item.iImage); + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, 1, (LPARAM)&item); + expect(-1, item.iImage); + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, 2, (LPARAM)&item); + expect(1, item.iImage); + /* remove first image */ + SendMessage(hwTab, TCM_REMOVEIMAGE, 0, 0); + expect(1, ImageList_GetImageCount(himl)); + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, 0, (LPARAM)&item); + expect(-1, item.iImage); + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, 1, (LPARAM)&item); + expect(-1, item.iImage); + item.iImage = -1; + SendMessage(hwTab, TCM_GETITEM, 2, (LPARAM)&item); + expect(0, item.iImage); + /* remove the last one */ + SendMessage(hwTab, TCM_REMOVEIMAGE, 0, 0); + expect(0, ImageList_GetImageCount(himl)); + for(i = 0; i < 3; i++) { + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, i, (LPARAM)&item); + expect(-1, item.iImage); + } + + DestroyWindow(hwTab); + ImageList_Destroy(himl); + DestroyIcon(hicon); +} + START_TEST(tab) { HWND parent_wnd; @@ -1021,6 +1084,7 @@ START_TEST(tab) test_insert_focus(parent_wnd); test_delete_focus(parent_wnd); + test_removeimage(parent_wnd); DestroyWindow(parent_wnd); }

1 0

Nikolay Sivov : comctl32/tab: Fix button background filling on TCS_BUTTONS.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: b896b92061d1b0f98fe526065e49992e2e9dac60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b896b92061d1b0f98fe526065… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 15:47:16 2009 -0400 comctl32/tab: Fix button background filling on TCS_BUTTONS. --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index ae4f035..b8f638d 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1433,7 +1433,6 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect BOOL deleteBrush = TRUE; RECT rTemp = *drawRect; - InflateRect(&rTemp, -2, -2); if (lStyle & TCS_BUTTONS) { if (iItem == infoPtr->iSelected) @@ -1473,6 +1472,7 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } else /* !TCS_BUTTONS */ { + InflateRect(&rTemp, -2, -2); if (!GetWindowTheme (infoPtr->hwnd)) FillRect(hdc, &rTemp, hbr); }

1 0