Hi,
I failed when patching vim with 7.1.282
running ..\newpatches\7.1.281
patching file src/if_cscope.c
patching file src/version.c
running ..\newpatches\7.1.282
patching file src/GvimExt/Makefile
patching file src/dosinst.c
patching file src/if_ole.cpp
patching file src/if_ole.h
Hunk #1 FAILED at 79.
Hunk #2 FAILED at 143.
Hunk #3 FAILED at 236.
3 out of 3 hunks FAILED -- saving rejects to file src/if_ole.h.rej
patching file src/if_ole.idl
patching file src/INSTALLpc.txt
patching file src/Make_mvc.mak
Hunk #3 succeeded at 334 (offset 1 line).
Hunk #4 succeeded at 348 (offset 1 line).
Hunk #5 succeeded at 359 (offset 1 line).
Hunk #6 succeeded at 380 (offset 1 line).
Hunk #7 succeeded at 398 (offset 1 line).
Hunk #8 succeeded at 411 (offset 1 line).
Hunk #9 succeeded at 431 (offset 1 line).
Hunk #10 succeeded at 541 (offset 1 line).
Hunk #11 FAILED at 764.
1 out of 11 hunks FAILED -- saving rejects to file src/
Make_mvc.mak.rej
One the the failed patch is
*** ../vim-7.1.281/src/if_ole.h Sun Jun 13 17:46:29 2004
--- src/if_ole.h Tue Jul 10 16:21:18 2007
***************
*** 79,85 ****
virtual HRESULT STDMETHODCALLTYPE SetForeground( void) = 0;
virtual HRESULT STDMETHODCALLTYPE GetHwnd(
! /* [retval][out] */ UINT __RPC_FAR *result) = 0;
};
--- 79,85 ----
virtual HRESULT STDMETHODCALLTYPE SetForeground( void) = 0;
virtual HRESULT STDMETHODCALLTYPE GetHwnd(
! /* [retval][out] */ UINT_PTR __RPC_FAR *result) = 0;
};
The contents of if_ole.h line 79,85
EXTERN_C const IID IID_IVim;
#if defined(__cplusplus) && !defined(CINTERFACE)
MIDL_INTERFACE("0F0BFAE2-4C90-11d1-82D7-0004AC368519")
While the part that I think should be patched are in line 96-100
virtual HRESULT STDMETHODCALLTYPE SetForeground( void) = 0;
virtual HRESULT STDMETHODCALLTYPE GetHwnd(
/* [retval][out] */ UINT *result) = 0;
};
But the part to be replaced is different.
So is there something missing between 7.1.281 and 7.1.282?
By the way, I never changed the contents of if_ole.h myself.
---
Charles
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
