January 2006 - Wine-commits

Hans Leidekker : mscms: Silence a potentially noisy fixme.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: 43179c26f4136d54c108c87bd03c9e19069c7982 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43179c26f4136d54c108c87… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 6 21:07:55 2006 +0100 mscms: Silence a potentially noisy fixme. --- dlls/mscms/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index fba677d..59c9996 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -775,7 +775,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROF if (profile->dwType & PROFILE_MEMBUFFER) { - FIXME( "access flags not implemented for memory based profiles\n" ); + /* FIXME: access flags not implemented for memory based profiles */ iccprofile = profile->pProfileData; size = profile->cbDataSize;

1 0

Robert Shearman : rpcrt4: Compute variance for complex arrays
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: c96e102fff2313571ecc9bc303a35fe059e8ac11 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c96e102fff2313571ecc9bc… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 6 21:07:27 2006 +0100 rpcrt4: Compute variance for complex arrays --- dlls/rpcrt4/ndr_marshall.c | 88 +++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 31 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index af90ff3..0df9bed 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -300,6 +300,11 @@ static void WINAPI NdrFree(MIDL_STUB_MES pStubMsg->pfnFree(Pointer); } +static inline BOOL IsConformanceOrVariancePresent(PFORMAT_STRING pFormat) +{ + return (*(const ULONG *)pFormat != -1); +} + PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { pStubMsg->MaxCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); @@ -325,8 +330,7 @@ PFORMAT_STRING ComputeConformanceOrVaria LPVOID ptr = NULL; DWORD data = 0; - /* FIXME: is this correct? */ - if (pFormat[0] == 0xff) { + if (!IsConformanceOrVariancePresent(pFormat)) { /* null descriptor */ *pCount = def; goto finish_conf; @@ -2089,24 +2093,32 @@ unsigned char * WINAPI NdrComplexArrayMa unsigned char *pMemory, PFORMAT_STRING pFormat) { - DWORD size = 0, count, def; + ULONG count, def; + BOOL variance_present; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); def = *(const WORD*)&pFormat[2]; pFormat += 4; pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, def); - size = pStubMsg->MaxCount; - TRACE("conformance=%ld\n", size); + TRACE("conformance = %ld\n", pStubMsg->MaxCount); - if (*(const DWORD*)pFormat != 0xffffffff) - FIXME("compute variance\n"); - pFormat += 4; + variance_present = IsConformanceOrVariancePresent(pFormat); + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); + TRACE("variance = %ld\n", pStubMsg->ActualCount); - NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, size); + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->MaxCount); pStubMsg->Buffer += 4; + if (variance_present) + { + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->Offset); + pStubMsg->Buffer += 4; + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->ActualCount); + pStubMsg->Buffer += 4; + } - for (count=0; count<size; count++) + for (count = 0; count < pStubMsg->ActualCount; count++) pMemory = ComplexMarshall(pStubMsg, pMemory, pFormat, NULL); STD_OVERFLOW_CHECK(pStubMsg); @@ -2122,25 +2134,35 @@ unsigned char * WINAPI NdrComplexArrayUn PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - DWORD size = 0, count, esize; + ULONG offset, count, esize; unsigned char *pMemory; + TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); pFormat += 4; pFormat = ReadConformance(pStubMsg, pFormat); - size = pStubMsg->MaxCount; - TRACE("conformance=%ld\n", size); - - pFormat += 4; + TRACE("conformance = %ld\n", pStubMsg->MaxCount); + if (IsConformanceOrVariancePresent(pFormat)) + { + offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; + pFormat = ReadVariance(pStubMsg, pFormat); + TRACE("variance = %ld\n", pStubMsg->ActualCount); + } + else + { + offset = 0; + pStubMsg->ActualCount = pStubMsg->MaxCount; + } esize = ComplexStructSize(pStubMsg, pFormat); if (fMustAlloc || !*ppMemory) - *ppMemory = NdrAllocate(pStubMsg, size*esize); + *ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize); pMemory = *ppMemory; - for (count=0; count<size; count++) + for (count = 0; count < pStubMsg->ActualCount; count++) pMemory = ComplexUnmarshall(pStubMsg, pMemory, pFormat, NULL, fMustAlloc); return NULL; @@ -2153,21 +2175,26 @@ void WINAPI NdrComplexArrayBufferSize(PM unsigned char *pMemory, PFORMAT_STRING pFormat) { - DWORD size = 0, count, def; + ULONG count, def; + BOOL variance_present; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); def = *(const WORD*)&pFormat[2]; pFormat += 4; pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, def); - size = pStubMsg->MaxCount; - TRACE("conformance=%ld\n", size); + TRACE("conformance = %ld\n", pStubMsg->MaxCount); + pStubMsg->BufferLength += sizeof(ULONG); - if (*(const DWORD*)pFormat != 0xffffffff) - FIXME("compute variance\n"); - pFormat += 4; + variance_present = IsConformanceOrVariancePresent(pFormat); + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); + TRACE("variance = %ld\n", pStubMsg->ActualCount); + + if (variance_present) + pStubMsg->BufferLength += 2*sizeof(ULONG); - for (count=0; count<size; count++) + for (count=0; count < pStubMsg->ActualCount; count++) pMemory = ComplexBufferSize(pStubMsg, pMemory, pFormat, NULL); } @@ -2198,21 +2225,20 @@ void WINAPI NdrComplexArrayFree(PMIDL_ST unsigned char *pMemory, PFORMAT_STRING pFormat) { - DWORD size = 0, count, def; + ULONG count, def; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); def = *(const WORD*)&pFormat[2]; pFormat += 4; pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, def); - size = pStubMsg->MaxCount; - TRACE("conformance=%ld\n", size); + TRACE("conformance = %ld\n", pStubMsg->MaxCount); - if (*(const DWORD*)pFormat != 0xffffffff) - FIXME("compute variance\n"); - pFormat += 4; + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); + TRACE("variance = %ld\n", pStubMsg->ActualCount); - for (count=0; count<size; count++) + for (count=0; count < pStubMsg->ActualCount; count++) pMemory = ComplexFree(pStubMsg, pMemory, pFormat, NULL); }

1 0

Hans Leidekker : kernel: Documentation cleanups.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: 45fe4642e1e9d16ae3fc5d99fdc38ac4e712ed18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45fe4642e1e9d16ae3fc5d9… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 6 21:07:46 2006 +0100 kernel: Documentation cleanups. --- dlls/kernel/time.c | 172 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 105 insertions(+), 67 deletions(-)

1 0

Robert Shearman : rpcrt4: Call NdrStubCall2 when dealing with a pure interpreted stub
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: 3180de6a981339b6e3bf761081b092407cce9c2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3180de6a981339b6e3bf761… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 6 21:07:20 2006 +0100 rpcrt4: Call NdrStubCall2 when dealing with a pure interpreted stub that has no dispatch table. --- dlls/rpcrt4/cstub.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 2633298..a2c62c0 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -144,7 +144,10 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPR DWORD dwPhase = STUB_UNMARSHAL; TRACE("(%p)->Invoke(%p,%p)\n",This,pMsg,pChannel); - STUB_HEADER(This).pDispatchTable[pMsg->iMethod](iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); + if (STUB_HEADER(This).pDispatchTable) + STUB_HEADER(This).pDispatchTable[pMsg->iMethod](iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); + else /* pure interpreted */ + NdrStubCall2(iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); return S_OK; }

1 0

Michael Kaufmann : Static control: Support enhanced metafiles.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: e7322e5109950f157172033b278c02e112c88418 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7322e5109950f157172033… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Fri Jan 6 21:07:07 2006 +0100 Static control: Support enhanced metafiles. --- dlls/user/static.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/user/static.c b/dlls/user/static.c index c40a09d..3e6b520 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -31,7 +31,6 @@ * Styles * - SS_EDITCONTROL * - SS_ENDELLIPSIS - * - SS_ENHMETAFILE * - SS_PATHELLIPSIS * - SS_REALSIZECONTROL * - SS_REALSIZEIMAGE @@ -43,7 +42,7 @@ * - STN_ENABLE * * Messages - * - STM_SETIMAGE: IMAGE_CURSOR, IMAGE_ENHMETAFILE + * - STM_SETIMAGE: IMAGE_CURSOR */ #include <stdarg.h> @@ -63,6 +62,7 @@ static void STATIC_PaintTextfn( HWND hwn static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); @@ -93,7 +93,7 @@ static pfPaint staticPaintFunc[SS_TYPEMA STATIC_PaintTextfn, /* SS_LEFTNOWORDWRAP */ STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintBitmapfn, /* SS_BITMAP */ - NULL, /* SS_ENHMETAFILE */ + STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */ STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ @@ -127,7 +127,7 @@ static HICON STATIC_SetIcon( HWND hwnd, if ((style & SS_TYPEMASK) != SS_ICON) return 0; if (hicon && !info) { - ERR("huh? hicon!=0, but info=0???\n"); + ERR("hicon != 0, but info == 0\n"); return 0; } prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon ); @@ -151,7 +151,7 @@ static HBITMAP STATIC_SetBitmap( HWND hw if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { - ERR("huh? hBitmap!=0, but not bitmap\n"); + ERR("hBitmap != 0, but it's not a bitmap\n"); return 0; } hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap ); @@ -166,6 +166,21 @@ static HBITMAP STATIC_SetBitmap( HWND hw } /*********************************************************************** + * STATIC_SetEnhMetaFile + * + * Set the enhanced metafile for an SS_ENHMETAFILE control. + */ +static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) +{ + if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; + if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { + ERR("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); + return 0; + } + return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile ); +} + +/*********************************************************************** * STATIC_LoadIconA * * Load the icon for an SS_ICON control. @@ -335,6 +350,9 @@ static LRESULT StaticWndProc_common( HWN STATIC_SetBitmap(hwnd, hBitmap, full_style); break; } + /* SS_ENHMETAFILE: Despite what MSDN says, Windows does not load + the enhanced metafile that was specified as the window text. */ + case SS_LEFT: case SS_CENTER: case SS_RIGHT: @@ -399,8 +417,12 @@ static LRESULT StaticWndProc_common( HWN return 0; case STM_GETIMAGE: + /* FIXME: Return NULL if wParam doesn't match the control's style. + wParam is IMAGE_BITMAP, IMAGE_CURSOR, IMAGE_ENHMETAFILE + or IMAGE_ICON */ case STM_GETICON16: case STM_GETICON: + /* FIXME: Return NULL if this control doesn't show an icon */ return GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); case STM_SETIMAGE: @@ -412,7 +434,7 @@ static LRESULT StaticWndProc_common( HWN FIXME("STM_SETIMAGE: Unhandled type IMAGE_CURSOR\n"); break; case IMAGE_ENHMETAFILE: - FIXME("STM_SETIMAGE: Unhandled type IMAGE_ENHMETAFILE\n"); + lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); break; case IMAGE_ICON: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); @@ -641,6 +663,24 @@ static void STATIC_PaintBitmapfn(HWND hw } +static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) +{ + HENHMETAFILE hEnhMetaFile; + + /* message is still sent, even if the returned brush is not used */ + SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)hwnd ); + + if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))) + { + RECT clientRect; + if(GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) return; + GetClientRect(hwnd, &clientRect); + PlayEnhMetaFile(hdc, hEnhMetaFile, &clientRect); + } +} + + static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) { RECT rc;

1 0

Hans Leidekker : documentation: Suggest installing OpenLDAP development libraries to packagers.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: c36d1926c83f8b6ce2192aa8531b694ff6b705e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c36d1926c83f8b6ce2192aa… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 6 21:06:41 2006 +0100 documentation: Suggest installing OpenLDAP development libraries to packagers. --- documentation/PACKAGING | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/documentation/PACKAGING b/documentation/PACKAGING index 4484ea1..9a34630 100644 --- a/documentation/PACKAGING +++ b/documentation/PACKAGING @@ -88,6 +88,9 @@ they should appear as "Suggests" or "Rec Wine with Mesa3D (http://www.mesa3d.org) which requires no hardware support to install. + * OpenLDAP: http://www.openldap.org + Used by WLDAP32 to implement LDAP support. + * LittleCMS: http://www.littlecms.com This library is used to implement MSCMS (Color Management System) which is needed by an increasing number of graphics applications.

1 0

Hans Leidekker : Update copyright info for the new year.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: 67dd000250e6fc0ae6b9f5a3ded0309da7740cc6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67dd000250e6fc0ae6b9f5a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 6 21:06:53 2006 +0100 Update copyright info for the new year. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 3e11139..a271a98 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2005 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2006 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 2f15de5..8fa5cf1 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -84,7 +84,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2005 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2006 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Robert Shearman : widl: Generate static sizing information for fixed size structs.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: ba0f0761f0d7da5615576ec35eafc57e4072d8e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba0f0761f0d7da5615576ec… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 6 21:06:24 2006 +0100 widl: Generate static sizing information for fixed size structs. Don't generate FC_*_BASETYPE proc and type format strings for non-basetype fields/params. --- tools/widl/typegen.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 33eecbc..3688505 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -64,6 +64,33 @@ static inline int type_has_ref(const typ return (type->type == 0 && type->ref); } +static inline int is_base_type(unsigned char type) +{ + switch (type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_HYPER: + case RPC_FC_IGNORE: + case RPC_FC_FLOAT: + case RPC_FC_DOUBLE: + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + case RPC_FC_ERROR_STATUS_T: + return TRUE; + + default: + return FALSE; + } +} + static size_t write_procformatstring_type(FILE *file, int indent, const type_t *type, int ptr_level, const expr_t *array, const char *name, int is_in, int is_out, int is_return, unsigned int *type_offset) @@ -75,7 +102,7 @@ static size_t write_procformatstring_typ array, name, is_in, is_out, is_return, type_offset); - if (ptr_level == 0 && !array) + if (ptr_level == 0 && !array && is_base_type(type->type)) { if (is_return) print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); @@ -198,7 +225,7 @@ static size_t write_typeformatstring_typ type->ref, 0 /* FIXME */, array, name); /* basic types don't need a type format string */ - if (ptr_level == 0 && !array) + if (ptr_level == 0 && !array && is_base_type(type->type)) return 0; if ((ptr_level == 1 && !type_has_ref(type)) || @@ -311,6 +338,20 @@ static unsigned int get_required_buffer_ *alignment = 8; return 8; + case RPC_FC_STRUCT: + { + size_t size = 0; + const var_t *field; + for (field = type->fields; field; field = NEXT_LINK(field)) + { + unsigned int alignment; + size += get_required_buffer_size_type( + field->type, field->ptr_level, field->array, field->name, + &alignment); + } + return size; + } + default: error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); return 0;

1 0

Thomas Weidenmueller : comctl32: Reduce memory usage of the syslink control.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: bb56d907e5d3526fc64440be6ada2516b78d938f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb56d907e5d3526fc64440b… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Fri Jan 6 13:08:09 2006 +0100 comctl32: Reduce memory usage of the syslink control. --- dlls/comctl32/syslink.c | 140 +++++++++++++++++++++++++++-------------------- 1 files changed, 81 insertions(+), 59 deletions(-)

1 0

Thomas Weidenmueller : comctl32: Some painting fixes for the syslink control.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: adc416b756b52c2ee6db6455dc3c112af64716f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=adc416b756b52c2ee6db645… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Fri Jan 6 13:04:14 2006 +0100 comctl32: Some painting fixes for the syslink control. --- dlls/comctl32/syslink.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 7459bc3..1938814 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -877,10 +877,10 @@ static LRESULT SYSLINK_Draw (SYSLINK_INF ExtTextOutW(hdc, bl->rc.left, bl->rc.top, ETO_OPAQUE | ETO_CLIPPED, &bl->rc, tx, bl->nChars, NULL); if((Current->Type == slLink) && (Current->u.Link.state & LIS_FOCUSED) && infoPtr->HasFocus) { - COLORREF PrevColor; - PrevColor = SetBkColor(hdc, OldBkColor); + COLORREF PrevTextColor; + PrevTextColor = SetTextColor(hdc, infoPtr->TextColor); DrawFocusRect(hdc, &bl->rc); - SetBkColor(hdc, PrevColor); + SetTextColor(hdc, PrevTextColor); } tx += bl->nChars; n -= bl->nChars + bl->nSkip; @@ -907,8 +907,11 @@ static LRESULT SYSLINK_Paint (SYSLINK_IN PAINTSTRUCT ps; hdc = hdcParam ? hdcParam : BeginPaint (infoPtr->Self, &ps); - SYSLINK_Draw (infoPtr, hdc); - if (!hdcParam) EndPaint (infoPtr->Self, &ps); + if (hdc) + { + SYSLINK_Draw (infoPtr, hdc); + if (!hdcParam) EndPaint (infoPtr->Self, &ps); + } return 0; } @@ -972,8 +975,7 @@ static LRESULT SYSLINK_SetText (SYSLINK_ /* clear the document */ SYSLINK_ClearDoc(infoPtr); - textlen = lstrlenW(Text); - if(Text == NULL || textlen == 0) + if(Text == NULL || (textlen = lstrlenW(Text)) == 0) { return TRUE; } @@ -983,9 +985,13 @@ static LRESULT SYSLINK_SetText (SYSLINK_ { /* Render text position and word wrapping in memory */ HDC hdc = GetDC(infoPtr->Self); - SYSLINK_Render(infoPtr, hdc); - SYSLINK_Draw(infoPtr, hdc); - ReleaseDC(infoPtr->Self, hdc); + if (hdc != NULL) + { + SYSLINK_Render(infoPtr, hdc); + ReleaseDC(infoPtr->Self, hdc); + + InvalidateRect(infoPtr->Self, NULL, TRUE); + } } return TRUE;

1 0