wine-commits December 2007

wine-commits@winehq.org

3 participants
824 discussions

Kirill K. Smirnov : winhelp: Remember last added page.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 6af0e45d794df870b803afd902e438be838d4bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af0e45d794df870b803afd90… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Dec 17 20:46:50 2007 +0300 winhelp: Remember last added page. --- programs/winhelp/hlpfile.c | 14 ++++++-------- programs/winhelp/hlpfile.h | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 3a9717a..49e652c 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -443,15 +443,14 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off if (hlpfile->first_page) { - HLPFILE_PAGE *p; - - for (p = hlpfile->first_page; p->next; p = p->next); - page->prev = p; - p->next = page; + hlpfile->last_page->next = page; + page->prev = hlpfile->last_page; + hlpfile->last_page = page; } else { hlpfile->first_page = page; + hlpfile->last_page = page; page->prev = NULL; } @@ -889,9 +888,8 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne unsigned short bits; unsigned nc, ncol = 1; - if (!hlpfile->first_page) {WINE_WARN("no page\n"); return FALSE;}; - - for (page = hlpfile->first_page; page->next; page = page->next) /* Nothing */; + if (!hlpfile->last_page) {WINE_WARN("no page\n"); return FALSE;}; + page = hlpfile->last_page; for (paragraphptr = &page->first_paragraph; *paragraphptr; paragraphptr = &(*paragraphptr)->next) /* Nothing */; diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 7e6e6e5..3632902 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -122,6 +122,7 @@ typedef struct tagHlpFileFile LPSTR lpszTitle; LPSTR lpszCopyright; HLPFILE_PAGE* first_page; + HLPFILE_PAGE* last_page; HLPFILE_MACRO* first_macro; BYTE* Context; BYTE* kwbtree;

1 0

Maarten Lankhorst : riched20: Fix bugs in EM_SETOPTIONS.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 8e639ec392b1652edd4a0f121e534f036b4ceac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e639ec392b1652edd4a0f121… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Dec 17 17:56:32 2007 +0100 riched20: Fix bugs in EM_SETOPTIONS. Add SELECTIONBAR to mask, and use settings rather then lParam. 2 subtle bugs that prevent selectionbar from working. --- dlls/riched20/editor.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 343da8b..01d60c5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1569,7 +1569,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, * setting the bit to work */ DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | - ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN; + ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD raw = GetWindowLongW(hWnd, GWL_STYLE); DWORD settings = mask & raw; @@ -1589,22 +1589,23 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } SetWindowLongW(hWnd, GWL_STYLE, (raw & ~mask) | (settings & mask)); - if (lParam & ECO_AUTOWORDSELECTION) + if (settings & ECO_AUTOWORDSELECTION) FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); - if (lParam & ECO_SELECTIONBAR) + if (settings & ECO_SELECTIONBAR) editor->selofs = 16; else editor->selofs = 0; + ME_WrapMarkedParagraphs(editor); - if (lParam & ECO_VERTICAL) + if (settings & ECO_VERTICAL) FIXME("ECO_VERTICAL not implemented yet!\n"); - if (lParam & ECO_AUTOHSCROLL) + if (settings & ECO_AUTOHSCROLL) FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); - if (lParam & ECO_AUTOVSCROLL) + if (settings & ECO_AUTOVSCROLL) FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); - if (lParam & ECO_NOHIDESEL) + if (settings & ECO_NOHIDESEL) FIXME("ECO_NOHIDESEL not implemented yet!\n"); - if (lParam & ECO_WANTRETURN) + if (settings & ECO_WANTRETURN) FIXME("ECO_WANTRETURN not implemented yet!\n"); return settings;

1 0

Rob Shearman : include: Add more types and function declarations to the rpcasync.h header file.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 486326ed4842e5dc989fed71157dd1473a573bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=486326ed4842e5dc989fed711… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 17 15:24:08 2007 +0000 include: Add more types and function declarations to the rpcasync.h header file. Fix up a couple of conflicts with the Status field in the RPC_EXTENDED_ERROR_INFO and the X Status define. --- dlls/winex11.drv/desktop.c | 5 +- dlls/winex11.drv/event.c | 6 ++- include/rpcasync.h | 150 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 1e189c8..19643d1 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -23,8 +23,11 @@ #include <X11/Xlib.h> #include "win.h" -#include "ddrawi.h" #include "x11drv.h" + +/* avoid conflict with field names in included win32 headers */ +#undef Status +#include "ddrawi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d06ade8..5eaebe9 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -37,11 +37,15 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" -#include "shlobj.h" /* DROPFILES */ #include "win.h" #include "x11drv.h" + +/* avoid conflict with field names in included win32 headers */ +#undef Status +#include "shlobj.h" /* DROPFILES */ #include "shellapi.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(event); diff --git a/include/rpcasync.h b/include/rpcasync.h index d90bbe0..d4bf4f8 100644 --- a/include/rpcasync.h +++ b/include/rpcasync.h @@ -26,12 +26,162 @@ typedef struct tagRPC_ERROR_ENUM_HANDLE void* Head; } RPC_ERROR_ENUM_HANDLE; +typedef enum tagExtendedErrorParamTypes +{ + eeptAnsiString = 1, + eeptUnicodeString, + eeptLongVal, + eeptShortVal, + eeptPointerVal, + eeptNone, + eeptBinary +} ExtendedErrorParamTypes; + +#define MaxNumberOfEEInfoParams 4 +#define RPC_EEINFO_VERSION 1 + +typedef struct tagBinaryParam +{ + void *Buffer; + short Size; +} BinaryParam; + +typedef struct tagRPC_EE_INFO_PARAM +{ + ExtendedErrorParamTypes ParameterType; + union + { + LPSTR AnsiString; + LPWSTR UnicodeString; + LONG LVal; + short SVal; + ULONGLONG PVal; + BinaryParam BVal; + } u; +} RPC_EE_INFO_PARAM; + +#define EEInfoPreviousRecordsMissing 0x1 +#define EEInfoNextRecordsMissing 0x2 +#define EEInfoUseFileTime 0x4 + +#define EEInfoGCCOM 11 +#define EEInfoGCFRS 12 + +typedef struct tagRPC_EXTENDED_ERROR_INFO +{ + ULONG Version; + LPWSTR ComputerName; + ULONG ProcessID; + union + { + SYSTEMTIME SystemTime; + FILETIME FileTime; + } u; + ULONG GeneratingComponent; + ULONG Status; + USHORT DetectionLocation; + USHORT Flags; + int NumberOfParameters; + RPC_EE_INFO_PARAM Parameters[MaxNumberOfEEInfoParams]; +} RPC_EXTENDED_ERROR_INFO; + +#define RPC_ASYNC_VERSION_1_0 sizeof(RPC_ASYNC_STATE) + +typedef enum _RPC_NOTIFICATION_TYPES +{ + RpcNotificationTypeNone, + RpcNotificationTypeEvent, + RpcNotificationTypeApc, + RpcNotificationTypeIoc, + RpcNotificationTypeHwnd, + RpcNotificationTypeCallback, +} RPC_NOTIFICATION_TYPES; + +typedef enum _RPC_ASYNC_EVENT +{ + RpcCallComplete, + RpcSendComplete, + RpcReceiveComplete, + RpcClientDisconnect, + RpcClientCancel, +} RPC_ASYNC_EVENT; + +struct _RPC_ASYNC_STATE; + +typedef void RPC_ENTRY RPCNOTIFICATION_ROUTINE(struct _RPC_ASYNC_STATE *,void *,RPC_ASYNC_EVENT); +typedef RPCNOTIFICATION_ROUTINE *PFN_RPCNOTIFICATION_ROUTINE; + +typedef union _RPC_ASYNC_NOTIFICATION_INFO +{ + struct + { + PFN_RPCNOTIFICATION_ROUTINE NotificationRoutine; + HANDLE hThread; + } APC; + struct + { + HANDLE hIOPort; + DWORD dwNumberOfBytesTransferred; + DWORD_PTR dwCompletionKey; + LPOVERLAPPED lpOverlapped; + } IOC; + struct + { + HWND hWnd; + UINT Msg; + } HWND; + HANDLE hEvent; + PFN_RPCNOTIFICATION_ROUTINE NotificationRoutine; +} RPC_ASYNC_NOTIFICATION_INFO, *PRPC_ASYNC_NOTIFICATION_INFO; + +#define RPC_C_NOTIFY_ON_SEND_COMPLETE 0x1 +#define RPC_C_INFINITE_TIMEOUT INFINITE + +typedef struct _RPC_ASYNC_STATE +{ + unsigned int Size; + ULONG Signature; + LONG Lock; + ULONG Flags; + void *StubInfo; + void *UserInfo; + void *RuntimeInfo; + RPC_ASYNC_EVENT Event; + RPC_NOTIFICATION_TYPES NotificationType; + RPC_ASYNC_NOTIFICATION_INFO u; + LONG_PTR Reserved[4]; +} RPC_ASYNC_STATE, *PRPC_ASYNC_STATE; + +#define RpcAsyncGetCallHandle(async) (((PRPC_ASYNC_STATE)async)->RuntimeInfo) #ifdef __cplusplus extern "C" { #endif +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncInitializeHandle(PRPC_ASYNC_STATE,unsigned int); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncRegisterInfo(PRPC_ASYNC_STATE); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncGetCallStatus(PRPC_ASYNC_STATE); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncCompleteCall(PRPC_ASYNC_STATE,void *); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncAbortCall(PRPC_ASYNC_STATE,ULONG); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncCancelCall(PRPC_ASYNC_STATE,BOOL); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcAsyncCleanupThread(DWORD); RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(RPC_ERROR_ENUM_HANDLE*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorGetNextRecord(RPC_ERROR_ENUM_HANDLE*,BOOL,RPC_EXTENDED_ERROR_INFO*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorEndEnumeration(RPC_ERROR_ENUM_HANDLE*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorResetEnumeration(RPC_ERROR_ENUM_HANDLE*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorGetNumberOfRecords(RPC_ERROR_ENUM_HANDLE*,int*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorSaveErrorInfo(RPC_ERROR_ENUM_HANDLE*,PVOID*,SIZE_T*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorLoadErrorInfo(PVOID,SIZE_T,RPC_ERROR_ENUM_HANDLE*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorAddRecord(RPC_EXTENDED_ERROR_INFO*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorClearInformation(void); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE,BOOL,LPVOID,PLARGE_INTEGER,LUID,DWORD,PVOID,PVOID*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcFreeAuthorizationContext(PVOID*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockExclusive(RPC_BINDING_HANDLE,PVOID); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockShared(RPC_BINDING_HANDLE,PVOID); + +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncSetHandle(PRPC_MESSAGE,PRPC_ASYNC_STATE); +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncAbortCall(PRPC_ASYNC_STATE,ULONG); +RPCRTAPI int RPC_ENTRY I_RpcExceptionFilter(ULONG); #ifdef __cplusplus }

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

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

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

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

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

← Newer
1
...
30
31
32
33
34
35
36
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2007