dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Math plugin needs tchar.h

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6561 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-10-23 16:02:16 +00:00
parent 9152c24610
commit 6adc39c848
6 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Contrib/Math/Source/Math.h
View file

@ -3,6 +3,7 @@
#pragma once #pragma once
#include <nsis/pluginapi.h> // nsis plugin #include <nsis/pluginapi.h> // nsis plugin
#include <nsis/nsis_tchar.h>
#ifdef _DEBUG #ifdef _DEBUG
//#define _DEBUG_LEAKS //#define _DEBUG_LEAKS

1
Contrib/Math/Source/MyMath.h
View file

@ -4,6 +4,7 @@
#include <math.h> #include <math.h>
#include <float.h> #include <float.h>
#include <nsis/nsis_tchar.h>
#define DEFAULT_ARRAY_SIZE 1024 #define DEFAULT_ARRAY_SIZE 1024

2
Contrib/StartMenu/StartMenu.c
View file

@ -23,7 +23,7 @@ int rtl;
WNDPROC lpWndProcOld; WNDPROC lpWndProcOld;
void (__stdcall *validate_filename)(TCHAR *); void (__stdcall *validate_filename)(LPTSTR);
INT_PTR CALLBACK dlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK dlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
static INT_PTR CALLBACK ParentWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK ParentWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

2
Source/exehead/api.h
View file

@ -64,7 +64,7 @@ typedef struct
typedef struct { typedef struct {
exec_flags_t *exec_flags; exec_flags_t *exec_flags;
int (NSISCALL *ExecuteCodeSegment)(int, HWND); int (NSISCALL *ExecuteCodeSegment)(int, HWND);
void (NSISCALL *validate_filename)(TCHAR *); void (NSISCALL *validate_filename)(LPTSTR);
int (NSISCALL *RegisterPluginCallback)(HMODULE, NSISPLUGINCALLBACK); // returns 0 on success, 1 if already registered and < 0 on errors int (NSISCALL *RegisterPluginCallback)(HMODULE, NSISPLUGINCALLBACK); // returns 0 on success, 1 if already registered and < 0 on errors
} extra_parameters; } extra_parameters;

2
Source/exehead/util.c
View file

@ -855,7 +855,7 @@ TCHAR * NSISCALL GetNSISString(TCHAR *outbuf, int strtab)
return ps_tmpbuf; return ps_tmpbuf;
} }
void NSISCALL validate_filename(TCHAR *in) { void NSISCALL validate_filename(LPTSTR in) {
TCHAR *nono = _T("*?|<>/\":"); TCHAR *nono = _T("*?|<>/\":");
TCHAR *out; TCHAR *out;
TCHAR *out_save; TCHAR *out_save;

2
Source/exehead/util.h
View file

@ -98,7 +98,7 @@ TCHAR * NSISCALL findchar(TCHAR *str, TCHAR c);
TCHAR * NSISCALL trimslashtoend(TCHAR *buf); TCHAR * NSISCALL trimslashtoend(TCHAR *buf);
TCHAR * NSISCALL skip_root(TCHAR *path); TCHAR * NSISCALL skip_root(TCHAR *path);
int NSISCALL is_valid_instpath(TCHAR *s); int NSISCALL is_valid_instpath(TCHAR *s);
void NSISCALL validate_filename(TCHAR *fn); void NSISCALL validate_filename(LPTSTR fn);
/** /**
* MoveFileOnReboot tries to move a file by the name of pszExisting to the * MoveFileOnReboot tries to move a file by the name of pszExisting to the