Skip to content

Commit e6a91fd

Browse files
brammoolbrammool
committed
updated for version 7.2b-019
1 parent 7693ec6 commit e6a91fd

7 files changed

Lines changed: 49 additions & 39 deletions

File tree

‎src/GvimExt/gvimext.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,13 @@ null_libintl_gettext(const char *msgid)
205205
}
206206

207207
static char *
208-
null_libintl_bindtextdomain(const char *domainname, const char *dirname)
208+
null_libintl_bindtextdomain(const char * /* domainname */, const char * /* dirname */)
209209
{
210210
return NULL;
211211
}
212212

213213
static char *
214-
null_libintl_textdomain(const char* domainname)
214+
null_libintl_textdomain(const char* /* domainname */)
215215
{
216216
return NULL;
217217
}
@@ -308,7 +308,7 @@ HINSTANCE g_hmodThisDll = NULL; // Handle to this DLL itself.
308308
// DllMain
309309
//---------------------------------------------------------------------------
310310
extern "C" int APIENTRY
311-
DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
311+
DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /* lpReserved */)
312312
{
313313
switch (dwReason)
314314
{
@@ -438,7 +438,7 @@ STDMETHODIMP CShellExtClassFactory::CreateInstance(LPUNKNOWN pUnkOuter,
438438
}
439439

440440

441-
STDMETHODIMP CShellExtClassFactory::LockServer(BOOL fLock)
441+
STDMETHODIMP CShellExtClassFactory::LockServer(BOOL /* fLock */)
442442
{
443443
return NOERROR;
444444
}
@@ -520,9 +520,9 @@ STDMETHODIMP_(ULONG) CShellExt::Release()
520520
// It could be a context menu or a property sheet.
521521
//
522522

523-
STDMETHODIMP CShellExt::Initialize(LPCITEMIDLIST pIDFolder,
523+
STDMETHODIMP CShellExt::Initialize(LPCITEMIDLIST /* pIDFolder */,
524524
LPDATAOBJECT pDataObj,
525-
HKEY hRegKey)
525+
HKEY /* hRegKey */)
526526
{
527527
// Initialize can be called more than once
528528
if (m_pDataObj)
@@ -562,8 +562,8 @@ STDMETHODIMP CShellExt::Initialize(LPCITEMIDLIST pIDFolder,
562562
STDMETHODIMP CShellExt::QueryContextMenu(HMENU hMenu,
563563
UINT indexMenu,
564564
UINT idCmdFirst,
565-
UINT idCmdLast,
566-
UINT uFlags)
565+
UINT /* idCmdLast */,
566+
UINT /* uFlags */)
567567
{
568568
UINT idCmd = idCmdFirst;
569569

@@ -718,11 +718,11 @@ STDMETHODIMP CShellExt::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
718718
return hr;
719719
}
720720

721-
STDMETHODIMP CShellExt::PushToWindow(HWND hParent,
722-
LPCSTR pszWorkingDir,
723-
LPCSTR pszCmd,
724-
LPCSTR pszParam,
725-
int iShowCmd,
721+
STDMETHODIMP CShellExt::PushToWindow(HWND /* hParent */,
722+
LPCSTR /* pszWorkingDir */,
723+
LPCSTR /* pszCmd */,
724+
LPCSTR /* pszParam */,
725+
int /* iShowCmd */,
726726
int idHWnd)
727727
{
728728
HWND hWnd = m_hWnd[idHWnd];
@@ -740,9 +740,9 @@ STDMETHODIMP CShellExt::PushToWindow(HWND hParent,
740740
return NOERROR;
741741
}
742742

743-
STDMETHODIMP CShellExt::GetCommandString(UINT_PTR idCmd,
743+
STDMETHODIMP CShellExt::GetCommandString(UINT_PTR /* idCmd */,
744744
UINT uFlags,
745-
UINT FAR *reserved,
745+
UINT FAR * /* reserved */,
746746
LPSTR pszName,
747747
UINT cchMax)
748748
{
@@ -841,10 +841,10 @@ searchpath(char *name)
841841
#endif
842842

843843
STDMETHODIMP CShellExt::InvokeGvim(HWND hParent,
844-
LPCSTR pszWorkingDir,
845-
LPCSTR pszCmd,
846-
LPCSTR pszParam,
847-
int iShowCmd)
844+
LPCSTR /* pszWorkingDir */,
845+
LPCSTR /* pszCmd */,
846+
LPCSTR /* pszParam */,
847+
int /* iShowCmd */)
848848
{
849849
char m_szFileUserClickedOn[BUFSIZE];
850850
char cmdStr[BUFSIZE];
@@ -911,10 +911,10 @@ STDMETHODIMP CShellExt::InvokeGvim(HWND hParent,
911911

912912

913913
STDMETHODIMP CShellExt::InvokeSingleGvim(HWND hParent,
914-
LPCSTR pszWorkingDir,
915-
LPCSTR pszCmd,
916-
LPCSTR pszParam,
917-
int iShowCmd,
914+
LPCSTR /* pszWorkingDir */,
915+
LPCSTR /* pszCmd */,
916+
LPCSTR /* pszParam */,
917+
int /* iShowCmd */,
918918
int useDiff)
919919
{
920920
char m_szFileUserClickedOn[BUFSIZE];

‎src/Make_mvc.mak‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ MAKEFLAGS_GVIMEXT = DEBUG=yes
207207

208208
!include <Win32.mak>
209209

210-
# Turn on Win64 compatibility warnings for 32-bit compiler in VC8. (/Wp64 is
211-
# deprecated in VC9.)
212-
!if ("$(MSVCVER)" == "8.0")
210+
# Turn on Win64 compatibility warnings for VC7.x and VC8.
211+
# (/Wp64 is deprecated in VC9 and generates an obnoxious warning.)
212+
!if ("$(MSVCVER)" == "7.0") || ("$(MSVCVER)" == "7.1") || ("$(MSVCVER)" == "8.0")
213213
DEFINES=$(DEFINES) /Wp64
214214
!endif
215215

‎src/gui_w48.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3154,12 +3154,12 @@ mch_set_mouse_shape(int shape)
31543154
idc = MAKEINTRESOURCE(IDC_ARROW);
31553155
else
31563156
idc = mshape_idcs[shape];
3157-
#ifdef _WIN64
3158-
SetClassLongPtr(s_textArea, GCLP_HCURSOR, (LONG_PTR)LoadCursor(NULL, idc));
3157+
#ifdef SetClassLongPtr
3158+
SetClassLongPtr(s_textArea, GCLP_HCURSOR, (__int3264)(LONG_PTR)LoadCursor(NULL, idc));
31593159
#else
31603160
# ifdef WIN32
3161-
SetClassLong(s_textArea, GCL_HCURSOR, (LONG)LoadCursor(NULL, idc));
3162-
# else
3161+
SetClassLong(s_textArea, GCL_HCURSOR, (long_u)LoadCursor(NULL, idc));
3162+
# else /* Win16 */
31633163
SetClassWord(s_textArea, GCW_HCURSOR, (WORD)LoadCursor(NULL, idc));
31643164
# endif
31653165
#endif

‎src/os_mswin.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ swap_me(COLORREF colorref)
17291729
}
17301730

17311731
/*ARGSUSED*/
1732-
static BOOL CALLBACK
1732+
static INT_PTR CALLBACK
17331733
PrintDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
17341734
{
17351735
#ifdef FEAT_GETTEXT
@@ -2125,8 +2125,8 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
21252125
char_u *port_name = (char_u *)devname +devname->wOutputOffset;
21262126
char_u *text = _("to %s on %s");
21272127

2128-
prt_name = alloc(STRLEN(printer_name) + STRLEN(port_name)
2129-
+ STRLEN(text));
2128+
prt_name = alloc((unsigned)(STRLEN(printer_name) + STRLEN(port_name)
2129+
+ STRLEN(text)));
21302130
if (prt_name != NULL)
21312131
wsprintf(prt_name, text, printer_name, port_name);
21322132
}

‎src/os_win32.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4663,7 +4663,7 @@ mch_fopen(char *name, char *mode)
46634663
# endif
46644664
)
46654665
{
4666-
# if defined(DEBUG) && _MSC_VER > 1200
4666+
# if defined(DEBUG) && _MSC_VER >= 1400
46674667
/* Work around an annoying assertion in the Microsoft debug CRT
46684668
* when mode's text/binary setting doesn't match _get_fmode(). */
46694669
char newMode = mode[strlen(mode) - 1];
@@ -4682,7 +4682,7 @@ mch_fopen(char *name, char *mode)
46824682
vim_free(wn);
46834683
vim_free(wm);
46844684

4685-
# if defined(DEBUG) && _MSC_VER > 1200
4685+
# if defined(DEBUG) && _MSC_VER >= 1400
46864686
_set_fmode(oldMode);
46874687
# endif
46884688

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,8 @@ static char *(features[]) =
676676

677677
static int included_patches[] =
678678
{ /* Add new patch number below this line */
679+
/**/
680+
19,
679681
/**/
680682
18,
681683
/**/

‎src/vim.h‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,17 +352,25 @@ typedef unsigned char char_u;
352352
typedef unsigned short short_u;
353353
typedef unsigned int int_u;
354354
/* Make sure long_u is big enough to hold a pointer.
355-
* On Win64 longs are 32 bit and pointers 64 bit.
356-
* For printf() and scanf() we need to take care of long_u specifically. */
355+
* On Win64, longs are 32 bits and pointers are 64 bits.
356+
* For printf() and scanf(), we need to take care of long_u specifically. */
357357
#ifdef _WIN64
358358
typedef unsigned __int64 long_u;
359359
typedef __int64 long_i;
360360
# define SCANF_HEX_LONG_U "%Ix"
361361
# define SCANF_DECIMAL_LONG_U "%Iu"
362362
# define PRINTF_HEX_LONG_U "0x%Ix"
363363
#else
364-
typedef unsigned long long_u;
365-
typedef long long_i;
364+
/* Microsoft-specific. The __w64 keyword should be specified on any typedefs
365+
* that change size between 32-bit and 64-bit platforms. For any such type,
366+
* __w64 should appear only on the 32-bit definition of the typedef.
367+
* Define __w64 as an empty token for everything but MSVC 7.x or later.
368+
*/
369+
# if !defined(_MSC_VER) || (_MSC_VER < 1300)
370+
# define __w64
371+
# endif
372+
typedef unsigned long __w64 long_u;
373+
typedef long __w64 long_i;
366374
# define SCANF_HEX_LONG_U "%lx"
367375
# define SCANF_DECIMAL_LONG_U "%lu"
368376
# define PRINTF_HEX_LONG_U "0x%lx"

0 commit comments

Comments
 (0)