December 2007 - Wine-commits

Kirill K. Smirnov : winhelp: Avoid any keywords comparision during lookup, store pointer to listbox ITEMDATA instead.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 8d6d9fd3adbb2f6afb9fbac81fb1b7dd573c75a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6d9fd3adbb2f6afb9fbac81… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Dec 17 20:49:09 2007 +0300 winhelp: Avoid any keywords comparision during lookup, store pointer to listbox ITEMDATA instead. --- programs/winhelp/winhelp.c | 36 +++++------------------------------- 1 files changed, 5 insertions(+), 31 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index f769153..ab4999b 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1957,28 +1957,16 @@ WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW* win, WPARAM wParam, LPARAM static void cb_KWBTree(void *p, void **next, void *cookie) { HWND hListWnd = (HWND)cookie; + int count; WINE_TRACE("Adding '%s' to search list\n", (char *)p); SendMessage(hListWnd, LB_INSERTSTRING, -1, (LPARAM)p); + count = SendMessage(hListWnd, LB_GETCOUNT, 0, 0); + SendMessage(hListWnd, LB_SETITEMDATA, count-1, (LPARAM)p); *next = (char*)p + strlen((char*)p) + 7; } /************************************************************************** - * comp_KWBTREE - * - * HLPFILE_BPTreeCompare function for '|KWBTREE' internal file. - * - */ -static int comp_KWBTree(void *p, const void *key, - int leaf, void** next) -{ - WINE_TRACE("comparing key '%s' with '%s'\n", (char *)p, (char *)key); - *next = (char*)p+strlen(p)+1+(leaf?6:2); - /* unlike directory, index is case insensitive */ - return lstrcmpi(p, key); -} - -/************************************************************************** * WINHELP_IndexDlgProc * * Index dialog callback function. @@ -2004,25 +1992,11 @@ INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA sel = SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETCURSEL, 0, 0); if (sel != LB_ERR) { - char buf[500]; /* enough */ BYTE *p; int count; - SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETTEXT, - sel, (LPARAM)buf); - p = HLPFILE_BPTreeSearch(file->kwbtree, buf, comp_KWBTree); - if (p == NULL) - { - /* - * TODO: - * This may happen if help file uses other locale than - * system. We should honour charset provided in help file - * and use UNICODE, but for now current implementation is - * acceptable (almost all help files use ANSI). - */ - WINE_FIXME("item '%s' not found, locale mismatch???\n", buf); - return TRUE; - } + p = (BYTE*)SendDlgItemMessage(hWnd, IDC_INDEXLIST, + LB_GETITEMDATA, sel, 0); count = *(short*)((char *)p + strlen((char *)p) + 1); if (count > 1) {

1 0

Rob Shearman : rpcrt4: Don' t copy memory from the buffer in NdrConformantStringUnmarshall if we just pointed the memory pointer into the buffer .
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: b9c92e95642325c99f83b4c2cbb610a5b01a47e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c92e95642325c99f83b4c2c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 17 18:20:34 2007 +0000 rpcrt4: Don't copy memory from the buffer in NdrConformantStringUnmarshall if we just pointed the memory pointer into the buffer. (Reported by Dan Kegel.) --- dlls/rpcrt4/ndr_marshall.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 2de650d..ca40bfa 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -890,7 +890,8 @@ unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg *ppMemory = NdrAllocate(pStubMsg, memsize); } - safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); + if (*ppMemory != pStubMsg->Buffer) + safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); if (*pFormat == RPC_FC_C_CSTRING) { TRACE("string=%s\n", debugstr_a((char*)*ppMemory));

1 0

Rob Shearman : rpcrt4: Add a stub for I_RpcGetCurrentCallHandle.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: bdc5a341964e636fc492fc95479255ff186a6481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc5a341964e636fc492fc954… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 17 18:20:41 2007 +0000 rpcrt4: Add a stub for I_RpcGetCurrentCallHandle. --- dlls/rpcrt4/rpc_server.c | 9 +++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 098669c..a337df2 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1121,3 +1121,12 @@ RPC_STATUS WINAPI RpcMgmtSetServerStackSize(ULONG ThreadStackSize) FIXME("(0x%x): stub\n", ThreadStackSize); return RPC_S_OK; } + +/*********************************************************************** + * I_RpcGetCurrentCallHandle (RPCRT4.@) + */ +RPC_BINDING_HANDLE WINAPI I_RpcGetCurrentCallHandle(void) +{ + FIXME("\n"); + return NULL; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 9005a4f..93f6d31 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -51,7 +51,7 @@ @ stub I_RpcGetAssociationContext @ stdcall I_RpcGetBuffer(ptr) @ stub I_RpcGetBufferWithObject -@ stub I_RpcGetCurrentCallHandle +@ stdcall I_RpcGetCurrentCallHandle() @ stub I_RpcGetExtendedError @ stub I_RpcGetServerContextList @ stub I_RpcGetThreadEvent # win9x

1 0

Rob Shearman : include: Add more NDR types and function declarations to rpcndr.h.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 26a14d8bd3dcd740c3332a27f6260edca0513aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a14d8bd3dcd740c3332a27f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 17 11:51:48 2007 +0000 include: Add more NDR types and function declarations to rpcndr.h. --- include/rpcndr.h | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 8feab23..914f9f1 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -137,6 +137,8 @@ struct _FULL_PTR_XLAT_TABLES; struct NDR_ALLOC_ALL_NODES_CONTEXT; struct NDR_POINTER_QUEUE_STATE; +typedef unsigned char *RPC_BUFPTR; +typedef unsigned long RPC_LENGTH; typedef void (__RPC_USER *EXPR_EVAL)(struct _MIDL_STUB_MESSAGE *); typedef const unsigned char *PFORMAT_STRING; @@ -453,6 +455,25 @@ typedef struct _SCONTEXT_QUEUE { NDR_SCONTEXT *ArrayOfObjects; } SCONTEXT_QUEUE, *PSCONTEXT_QUEUE; +typedef struct _NDR_USER_MARSHAL_INFO_LEVEL1 +{ + void *Buffer; + ULONG BufferSize; + void * (__RPC_API *pfnAllocate)(size_t); + void (__RPC_API *pfnFree)(void *); + struct IRpcChannelBuffer *pRpcChannelBuffer; + ULONG_PTR Reserved[5]; +} NDR_USER_MARSHAL_INFO_LEVEL1; + +typedef struct _NDR_USER_MARSHAL_INFO +{ + ULONG InformationLevel; + union + { + NDR_USER_MARSHAL_INFO_LEVEL1 Level1; + } DUMMYUNIONNAME1; +} NDR_USER_MARSHAL_INFO; + /* Context Handles */ RPCRTAPI RPC_BINDING_HANDLE RPC_ENTRY @@ -564,10 +585,33 @@ SIMPLE_TYPE_MARSHAL(NonConformantString) #undef SIMPLE_TYPE_MARSHAL RPCRTAPI void RPC_ENTRY + NdrCorrelationInitialize( PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG flags ); +RPCRTAPI void RPC_ENTRY + NdrCorrelationPass( PMIDL_STUB_MESSAGE pStubMsg ); +RPCRTAPI void RPC_ENTRY + NdrCorrelationFree( PMIDL_STUB_MESSAGE pStubMsg ); + +RPCRTAPI void RPC_ENTRY NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, LONG NumberParams ); RPCRTAPI void RPC_ENTRY NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); +#define USER_MARSHAL_FC_BYTE 1 +#define USER_MARSHAL_FC_CHAR 2 +#define USER_MARSHAL_FC_SMALL 3 +#define USER_MARSHAL_FC_USMALL 4 +#define USER_MARSHAL_FC_WCHAR 5 +#define USER_MARSHAL_FC_SHORT 6 +#define USER_MARSHAL_FC_USHORT 7 +#define USER_MARSHAL_FC_LONG 8 +#define USER_MARSHAL_FC_ULONG 9 +#define USER_MARSHAL_FC_FLOAT 10 +#define USER_MARSHAL_FC_HYPER 11 +#define USER_MARSHAL_FC_DOUBLE 12 + +RPCRTAPI unsigned char* RPC_ENTRY + NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); + /* Note: this should return a CLIENT_CALL_RETURN, but calling convention for * returning structures/unions is different between Windows and gcc on i386. */ LONG_PTR RPC_VAR_ENTRY @@ -576,11 +620,15 @@ LONG_PTR RPC_VAR_ENTRY NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); LONG_PTR RPC_VAR_ENTRY NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); +LONG_PTR RPC_VAR_ENTRY + NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); RPCRTAPI void RPC_ENTRY NdrServerCall2( PRPC_MESSAGE pRpcMsg ); RPCRTAPI void RPC_ENTRY NdrServerCall( PRPC_MESSAGE pRpcMsg ); +RPCRTAPI void RPC_ENTRY + NdrAsyncServerCall( PRPC_MESSAGE pRpcMsg ); RPCRTAPI LONG RPC_ENTRY NdrStubCall2( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); @@ -588,6 +636,8 @@ RPCRTAPI LONG RPC_ENTRY NdrStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); +RPCRTAPI LONG RPC_ENTRY + NdrDcomAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); RPCRTAPI void* RPC_ENTRY NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, size_t Len ); @@ -605,11 +655,26 @@ RPCRTAPI void RPC_ENTRY NdrOleFree( void* NodeToFree ); RPCRTAPI void RPC_ENTRY + NdrClientInitialize( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, + PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ); +RPCRTAPI void RPC_ENTRY NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ); RPCRTAPI unsigned char* RPC_ENTRY + NdrServerInitialize( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); +RPCRTAPI unsigned char* RPC_ENTRY NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); RPCRTAPI unsigned char* RPC_ENTRY + NdrServerInitializeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, PRPC_MESSAGE pRpcMsg ); +RPCRTAPI void RPC_ENTRY + NdrServerInitializeMarshall( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg ); +RPCRTAPI void RPC_ENTRY + NdrServerMarshall( struct IRpcStubBuffer *pThis, struct IRpcChannelBuffer *pChannel, PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); +RPCRTAPI void RPC_ENTRY + NdrServerUnmarshall( struct IRpcChannelBuffer *pChannel, PRPC_MESSAGE pRpcMsg, + PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, + PFORMAT_STRING pFormat, void *pParamList ); +RPCRTAPI unsigned char* RPC_ENTRY NdrGetBuffer( PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle ); RPCRTAPI void RPC_ENTRY NdrFreeBuffer( PMIDL_STUB_MESSAGE pStubMsg ); @@ -621,6 +686,9 @@ RPCRTAPI unsigned char * RPC_ENTRY RPCRTAPI unsigned char * RPC_ENTRY NdrNsSendReceive( PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pBufferEnd, RPC_BINDING_HANDLE *pAutoHandle ); +RPCRTAPI RPC_STATUS RPC_ENTRY + NdrGetDcomProtocolVersion( PMIDL_STUB_MESSAGE pStubMsg, RPC_VERSION *pVersion ); + RPCRTAPI PFULL_PTR_XLAT_TABLES RPC_ENTRY NdrFullPointerXlatInit( ULONG NumberOfPointers, XLAT_SIDE XlatSide ); RPCRTAPI void RPC_ENTRY @@ -651,6 +719,9 @@ RPCRTAPI void * RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrRpcSsDefaultFree( void *NodeToFree ); +RPCRTAPI RPC_STATUS RPC_ENTRY + NdrGetUserMarshalInfo( ULONG *pFlags, ULONG InformationLevel, NDR_USER_MARSHAL_INFO *pMarshalInfo ); + #ifdef __cplusplus } #endif

1 0

Francois Gouget : rpcrt4: Add an rpcasync. h header stub and fix the RpcErrorStartEnumeration() prototype.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 76d266cbb0d4e2b090152151ba2550f141390442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d266cbb0d4e2b090152151b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 20:51:05 2007 +0100 rpcrt4: Add an rpcasync.h header stub and fix the RpcErrorStartEnumeration() prototype. --- dlls/rpcrt4/rpcrt4_main.c | 2 +- include/Makefile.in | 1 + include/rpc.h | 3 +++ include/rpcasync.h | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 7cd9b03..75d7656 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -871,7 +871,7 @@ LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) /****************************************************************************** * RpcErrorStartEnumeration (rpcrt4.@) */ -RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(void** EnumHandle) +RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(RPC_ERROR_ENUM_HANDLE* EnumHandle) { FIXME("(%p): stub\n", EnumHandle); return RPC_S_ENTRY_NOT_FOUND; diff --git a/include/Makefile.in b/include/Makefile.in index 2104454..4300329 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -334,6 +334,7 @@ SRCDIR_INCLUDES = \ richedit.h \ rmxfguid.h \ rpc.h \ + rpcasync.h \ rpcdce.h \ rpcdcep.h \ rpcndr.h \ diff --git a/include/rpc.h b/include/rpc.h index 60bf4fe..c157c6d 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -60,6 +60,9 @@ typedef void* I_RPC_HANDLE; #include <rpcnterr.h> #include <excpt.h> #include <winerror.h> +#ifndef RPC_NO_WINDOWS_H +#include <rpcasync.h> +#endif /* ignore exception handling for now */ #define RpcTryExcept if (1) { diff --git a/include/rpcasync.h b/include/rpcasync.h new file mode 100644 index 0000000..d90bbe0 --- /dev/null +++ b/include/rpcasync.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * 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 + */ +#ifndef __WINE_RPCASYNC_H +#define __WINE_RPCASYNC_H + + +typedef struct tagRPC_ERROR_ENUM_HANDLE +{ + ULONG Signature; + void* CurrentPos; + void* Head; +} RPC_ERROR_ENUM_HANDLE; + + +#ifdef __cplusplus +extern "C" { +#endif + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(RPC_ERROR_ENUM_HANDLE*); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Alexander Nicolaysen Sørnes : version: Change state when moving from queued to accepted application
by Chris Morgan 18 Dec '07

18 Dec '07

Module: appdb Branch: master Commit: 5a31b9d5c8c301c4d78285f7ef77f045ca80fc16 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5a31b9d5c8c301c4d78285f7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 17 19:34:04 2007 +0100 version: Change state when moving from queued to accepted application --- include/version.php | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/version.php b/include/version.php index ff8f056..025cd92 100644 --- a/include/version.php +++ b/include/version.php @@ -204,11 +204,16 @@ class version { if ($this->iAppId && ($this->iAppId!=$oVersion->iAppId)) { - if (!query_parameters("UPDATE appVersion SET appId = '?' WHERE versionId = '?'", - $this->iAppId, $this->iVersionId)) - return false; $oAppBefore = new Application($oVersion->iAppId); $oAppAfter = new Application($this->iAppId); + + if($oAppAfter->objectGetState() == 'accepted' && $this->sState == 'pending') + $this->sState = 'queued'; + + if (!query_parameters("UPDATE appVersion SET appId = '?', state = '?' WHERE versionId = '?'", + $this->iAppId, $this->sState, $this->iVersionId)) + return false; + $sWhatChanged .= "Version was moved from application ".$oAppBefore->sName." to application ".$oAppAfter->sName.".\n\n"; }

1 0

Alexander Nicolaysen Sørnes : objectManager: Prevent possible problems when moving child objects
by Chris Morgan 18 Dec '07

18 Dec '07

Module: appdb Branch: master Commit: 3ad7c4589079c7222fc6a0aabb386ae55bd31036 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3ad7c4589079c7222fc6a0aa… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 17 19:29:34 2007 +0100 objectManager: Prevent possible problems when moving child objects --- include/objectManager.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 066e561..55d1c75 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -30,6 +30,13 @@ class ObjectManager // queued entries private $aCommonResponses; + /* Remove the cached object of the class we are working with, useful in cases where we + modify the object in such a way that it needs to be reloaded */ + private function flushCachedObject() + { + $this->oObject = null; + } + /* Get an instance of the object of the class we are working with */ private function getObject() { @@ -836,6 +843,9 @@ class ObjectManager $iAffected = $oObject->objectMoveChildren($iNewId); + /* Some classes record the id of their child objects, so we shouldn't keep an old instance around */ + $this->flushCachedObject(); + if($iAffected) { $sPlural = ($iAffected == 1) ? "": "s";

1 0

Dmitry Timoshkov : user32: Always clip the button painting to the client rectangle.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: aec7e91d53f8ab60ba8e810a5cf72afdc1213bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec7e91d53f8ab60ba8e810a5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 13 23:58:45 2007 +0800 user32: Always clip the button painting to the client rectangle. --- dlls/user32/button.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 6e21bbc..d6ee30c 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -217,6 +217,15 @@ static inline WCHAR *get_button_text( HWND hwnd ) return buffer; } +static void setup_clipping( HWND hwnd, HDC hdc ) +{ + RECT rc; + + GetClientRect( hwnd, &rc ); + DPtoLP( hdc, (POINT *)&rc, 2 ); + IntersectClipRect( hdc, rc.left, rc.top, rc.right, rc.bottom ); +} + /*********************************************************************** * ButtonWndProc_common */ @@ -798,6 +807,9 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) parent = GetParent(hwnd); if (!parent) parent = hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); + + setup_clipping( hwnd, hDC ); + hOldPen = (HPEN)SelectObject(hDC, SYSCOLOR_GetPen(COLOR_WINDOWFRAME)); hOldBrush =(HBRUSH)SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); oldBkMode = SetBkMode(hDC, TRANSPARENT); @@ -970,7 +982,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) if (dtFlags == (UINT)-1L) /* Noting to draw */ return; - IntersectClipRect(hDC, client.left, client.top, client.right, client.bottom); + setup_clipping( hwnd, hDC ); if (action == ODA_DRAWENTIRE) BUTTON_DrawLabel(hwnd, hDC, dtFlags, &rtext); @@ -1046,6 +1058,8 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action ) if (dtFlags == (UINT)-1L) return; + setup_clipping( hwnd, hDC ); + /* Because buttons have CS_PARENTDC class style, there is a chance * that label will be drawn out of client rect. * But Windows doesn't clip label's rect, so do I. @@ -1100,8 +1114,6 @@ static void OB_Paint( HWND hwnd, HDC hDC, UINT action ) { LONG state = get_button_state( hwnd ); DRAWITEMSTRUCT dis; - HRGN clipRegion; - RECT clipRect; LONG_PTR id = GetWindowLongPtrW( hwnd, GWLP_ID ); HWND parent; HFONT hFont, hPrevFont = 0; @@ -1118,21 +1130,13 @@ static void OB_Paint( HWND hwnd, HDC hDC, UINT action ) dis.itemData = 0; GetClientRect( hwnd, &dis.rcItem ); - clipRegion = CreateRectRgnIndirect(&dis.rcItem); - if (GetClipRgn(hDC, clipRegion) != 1) - { - DeleteObject(clipRegion); - clipRegion=NULL; - } - clipRect = dis.rcItem; - DPtoLP(hDC, (LPPOINT) &clipRect, 2); - IntersectClipRect(hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); - if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hDC, hFont ); parent = GetParent(hwnd); if (!parent) parent = hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); + + setup_clipping( hwnd, hDC ); + SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (hPrevFont) SelectObject(hDC, hPrevFont); - SelectClipRgn(hDC, clipRegion); }

1 0

Lionel Debroux : winspool: Fix memory leak (found by Smatch).
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: 87b33ccb58f61fcf9b996cc5310cf1a03fbe55bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b33ccb58f61fcf9b996cc53… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Fri Dec 14 14:56:57 2007 +0100 winspool: Fix memory leak (found by Smatch). --- dlls/winspool.drv/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 236d77d..3143429 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -611,7 +611,7 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { PRINTER_INFO_2A pinfo2a; char *e,*s,*name,*prettyname,*devname; BOOL ret = FALSE, set_default = FALSE; - char *port,*devline,*env_default; + char *port = NULL, *devline,*env_default; HKEY hkeyPrinter, hkeyPrinters, hkey; while (isspace(*pent)) pent++; @@ -723,8 +723,8 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { if (isfirst || set_default) WINSPOOL_SetDefaultPrinter(devname,name,TRUE); - HeapFree(GetProcessHeap(), 0, port); end: + HeapFree(GetProcessHeap(), 0, port); HeapFree(GetProcessHeap(), 0, name); return ret; }

1 0

Alexander Dorofeyev : ddraw: Fix incorrect WARN text.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: f4337b4714830023dd67c07c7044b67ea2ed63d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4337b4714830023dd67c07c7… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Dec 16 19:55:58 2007 -0800 ddraw: Fix incorrect WARN text. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 646ea1a..c8b3d5d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -787,7 +787,7 @@ IDirectDrawSurfaceImpl_Blt(IDirectDrawSurface7 *iface, DestRect->right > This->surface_desc.dwWidth || DestRect->bottom > This->surface_desc.dwHeight) { - WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n"); + WARN("Destination rectangle is invalid, returning DDERR_INVALIDRECT\n"); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDRECT; }

1 0