Jim Park's Unicode NSIS merging - Step 1 : switch to TCHARs where relevant.
Compiler output is identical before & after this step git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/branches/wizou@6036 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou
parent
4e48722b63
commit
752d7d239a
209 changed files with 9698 additions and 7658 deletions
|
|
@ -12,6 +12,8 @@
|
|||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty.
|
||||
*
|
||||
* Unicode support by Jim Park -- 07/23/2007
|
||||
*/
|
||||
|
||||
#ifndef ___NSIS_UTIL_H___
|
||||
|
|
@ -21,36 +23,40 @@
|
|||
#include "config.h"
|
||||
#include <shlobj.h>
|
||||
|
||||
extern char ps_tmpbuf[NSIS_MAX_STRLEN*2];
|
||||
char * NSISCALL GetNSISString(char *outbuf, int strtab);
|
||||
extern TCHAR ps_tmpbuf[NSIS_MAX_STRLEN*2];
|
||||
TCHAR * NSISCALL GetNSISString(TCHAR *outbuf, int strtab);
|
||||
#define GetNSISStringTT(strtab) GetNSISString(0, (strtab))
|
||||
#define GetNSISStringNP(strtab) ((const char *)g_blocks[NB_STRINGS].offset+(strtab))
|
||||
#define GetNSISTab(strtab) (strtab < 0 ? LANG_STR_TAB(strtab) : strtab)
|
||||
void NSISCALL myRegGetStr(HKEY root, const char *sub, const char *name, char *out, int x64);
|
||||
int NSISCALL myatoi(char *s);
|
||||
void NSISCALL myitoa(char *s, int d);
|
||||
char * NSISCALL mystrcpy(char *out, const char *in);
|
||||
int NSISCALL mystrlen(const char *in);
|
||||
char * NSISCALL mystrcat(char *out, const char *concat);
|
||||
char * NSISCALL mystrstr(char *a, char *b);
|
||||
WIN32_FIND_DATA * NSISCALL file_exists(char *buf);
|
||||
char * NSISCALL my_GetTempFileName(char *buf, const char *dir);
|
||||
#define GetNSISStringNP(strtab) ((const TCHAR *)g_blocks[NB_STRINGS].offset+(strtab))
|
||||
|
||||
//BOOL NSISCALL my_SetWindowText(HWND hWnd, const char *val);
|
||||
// A negative string table index means it's a language string table, so we
|
||||
// use the LANG_STR_TAB() macro to decode it.
|
||||
#define GetNSISTab(strtab) (strtab < 0 ? LANG_STR_TAB(strtab) : strtab)
|
||||
|
||||
void NSISCALL myRegGetStr(HKEY root, const TCHAR *sub, const TCHAR *name, TCHAR *out, int x64);
|
||||
int NSISCALL myatoi(TCHAR *s);
|
||||
void NSISCALL myitoa(TCHAR *s, int d);
|
||||
TCHAR * NSISCALL mystrcpy(TCHAR *out, const TCHAR *in);
|
||||
int NSISCALL mystrlen(const TCHAR *in);
|
||||
TCHAR * NSISCALL mystrcat(TCHAR *out, const TCHAR *concat);
|
||||
TCHAR * NSISCALL mystrstr(TCHAR *a, TCHAR *b);
|
||||
WIN32_FIND_DATA * NSISCALL file_exists(TCHAR *buf);
|
||||
TCHAR * NSISCALL my_GetTempFileName(TCHAR *buf, const TCHAR *dir);
|
||||
|
||||
//BOOL NSISCALL my_SetWindowText(HWND hWnd, const TCHAR *val);
|
||||
#define my_SetWindowText SetWindowText
|
||||
BOOL NSISCALL my_SetDialogItemText(HWND dlg, UINT idx, const char *val);
|
||||
BOOL NSISCALL my_SetDialogItemText(HWND dlg, UINT idx, const TCHAR *val);
|
||||
//#define my_SetDialogItemText SetDlgItemText
|
||||
//int NSISCALL my_GetWindowText(HWND hWnd, char *val, int size);
|
||||
//int NSISCALL my_GetWindowText(HWND hWnd, TCHAR *val, int size);
|
||||
#define my_GetWindowText GetWindowText
|
||||
int NSISCALL my_GetDialogItemText(UINT idx, char *val);
|
||||
int NSISCALL my_GetDialogItemText(UINT idx, TCHAR *val);
|
||||
//#define my_GetDialogItemText GetDlgItemText
|
||||
|
||||
#ifdef NSIS_CONFIG_LOG
|
||||
extern char log_text[2048];
|
||||
extern TCHAR log_text[2048];
|
||||
void NSISCALL log_write(int close);
|
||||
const char * _RegKeyHandleToName(HKEY hKey);
|
||||
void _LogData2Hex(char *buf, size_t buflen, unsigned char *data, size_t datalen);
|
||||
void log_printf(char *format, ...);
|
||||
const TCHAR * _RegKeyHandleToName(HKEY hKey);
|
||||
void _LogData2Hex(TCHAR *buf, size_t buflen, BYTE *data, size_t datalen);
|
||||
void log_printf(TCHAR *format, ...);
|
||||
#define log_printf2(x1,x2) log_printf(x1,x2);
|
||||
#define log_printf3(x1,x2,x3) log_printf(x1,x2,x3);
|
||||
#define log_printf4(x1,x2,x3,x4) log_printf(x1,x2,x3,x4);
|
||||
|
|
@ -61,7 +67,7 @@ void log_printf(char *format, ...);
|
|||
#define RegKeyHandleToName(x1) _RegKeyHandleToName(x1);
|
||||
#define LogData2Hex(x1,x2,x3,x4) _LogData2Hex(x1,x2,x3,x4);
|
||||
extern int log_dolog;
|
||||
extern char g_log_file[1024];
|
||||
extern TCHAR g_log_file[1024];
|
||||
#else
|
||||
#define log_printf(x1)
|
||||
#define log_printf2(x1,x2)
|
||||
|
|
@ -75,35 +81,44 @@ extern char g_log_file[1024];
|
|||
#define LogData2Hex(x1,x2,x3,x4)
|
||||
#endif
|
||||
|
||||
HANDLE NSISCALL myCreateProcess(char *cmd);
|
||||
int NSISCALL my_MessageBox(const char *text, UINT type);
|
||||
HANDLE NSISCALL myCreateProcess(TCHAR *cmd);
|
||||
int NSISCALL my_MessageBox(const TCHAR *text, UINT type);
|
||||
|
||||
void NSISCALL myDelete(char *buf, int flags);
|
||||
void NSISCALL myDelete(TCHAR *buf, int flags);
|
||||
|
||||
HANDLE NSISCALL myOpenFile(const char *fn, DWORD da, DWORD cd);
|
||||
int NSISCALL validpathspec(char *ubuf);
|
||||
char * NSISCALL addtrailingslash(char *str);
|
||||
//char NSISCALL lastchar(const char *str);
|
||||
HANDLE NSISCALL myOpenFile(const TCHAR *fn, DWORD da, DWORD cd);
|
||||
int NSISCALL validpathspec(TCHAR *ubuf);
|
||||
TCHAR * NSISCALL addtrailingslash(TCHAR *str);
|
||||
//TCHAR NSISCALL lastchar(const TCHAR *str);
|
||||
#define lastchar(str) *CharPrev(str,str+mystrlen(str))
|
||||
char * NSISCALL findchar(char *str, char c);
|
||||
char * NSISCALL trimslashtoend(char *buf);
|
||||
char * NSISCALL skip_root(char *path);
|
||||
int NSISCALL is_valid_instpath(char *s);
|
||||
void NSISCALL validate_filename(char *fn);
|
||||
TCHAR * NSISCALL findchar(TCHAR *str, TCHAR c);
|
||||
TCHAR * NSISCALL trimslashtoend(TCHAR *buf);
|
||||
TCHAR * NSISCALL skip_root(TCHAR *path);
|
||||
int NSISCALL is_valid_instpath(TCHAR *s);
|
||||
void NSISCALL validate_filename(TCHAR *fn);
|
||||
|
||||
/**
|
||||
* MoveFileOnReboot tries to move a file by the name of pszExisting to the
|
||||
* name pszNew.
|
||||
*
|
||||
* @param pszExisting The old name of the file.
|
||||
* @param pszNew The new name of the file.
|
||||
*/
|
||||
void NSISCALL MoveFileOnReboot(LPCTSTR pszExisting, LPCTSTR pszNew);
|
||||
|
||||
void NSISCALL mini_memcpy(void *out, const void *in, int len);
|
||||
void NSISCALL remove_ro_attr(char *file);
|
||||
void NSISCALL remove_ro_attr(TCHAR *file);
|
||||
|
||||
enum myGetProcAddressFunctions {
|
||||
MGA_GetDiskFreeSpaceExA,
|
||||
MGA_MoveFileExA,
|
||||
MGA_RegDeleteKeyExA,
|
||||
MGA_GetDiskFreeSpaceEx,
|
||||
MGA_MoveFileEx,
|
||||
MGA_RegDeleteKeyEx,
|
||||
MGA_OpenProcessToken,
|
||||
MGA_LookupPrivilegeValueA,
|
||||
MGA_LookupPrivilegeValue,
|
||||
MGA_AdjustTokenPrivileges,
|
||||
MGA_GetUserDefaultUILanguage,
|
||||
MGA_SHAutoComplete,
|
||||
MGA_SHGetFolderPathA
|
||||
MGA_SHGetFolderPath
|
||||
};
|
||||
|
||||
void * NSISCALL myGetProcAddress(const enum myGetProcAddressFunctions func);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue