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

Added ShConstants.h to makenssi project

Browse source 
Size optimization on ui.c
Some fixes in Shell Folders code


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3297 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
ramon18 2003-12-22 14:02:15 +00:00
parent 2589a5fc85
commit 660bbf5e2d
6 changed files with 104 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/exehead/Ui.c
View file

@ -353,7 +353,7 @@ static int CALLBACK WINAPI BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lPara
hwnd,
BFFM_ENABLEOK,
0,
my_PIDL2Path((char*)lpData, (LPITEMIDLIST)lParam, 0)
SHGetPathFromIDList((LPITEMIDLIST)lParam,(char*)lpData)
#ifdef NSIS_SUPPORT_CODECALLBACKS
&& !ExecuteCodeSegment(g_header->code_onVerifyInstDir,NULL)
#endif

13
Source/exehead/util.c
View file

@ -31,7 +31,7 @@ NSIS_STRING g_usrvars[TOTAL_COMPATIBLE_STATIC_VARS_COUNT];
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
int my_PIDL2Path(char *out, LPITEMIDLIST idl, int bFree)
int NSISCALL my_PIDL2Path(char *out, LPITEMIDLIST idl, int bFree)
{
int Res;
IMalloc *m;
@ -39,7 +39,6 @@ int my_PIDL2Path(char *out, LPITEMIDLIST idl, int bFree)
Res = SHGetPathFromIDList(idl, out);
if (m && bFree)
{
m->lpVtbl->Free(m,idl);
m->lpVtbl->Release(m);
}
return Res;
@ -491,12 +490,12 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
// NOTE 3: the code CSIDL_CONTROLS is used for PROGRAMFILES
LPITEMIDLIST idl;
int qLaunch=0;
int nCreateFlag = CSIDL_FLAG_CREATE;
nVarIdx = (*(WORD*)in & 0x0FFF)-1; in+=sizeof(WORD); // Read code for current user
if ( g_exec_flags.all_user_var )
nVarIdx = (*(WORD*)in & 0x0FFF)-1; in+=sizeof(WORD); // Use code for All users instead
nVarIdx |= CSIDL_FLAG_CREATE;
*out=0;
while (TRUE)
@ -512,12 +511,12 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
mystrcpy(out, "C:\\Program Files");
break;
case CSIDL_DESKTOP: // QUICKLAUNCH
nVarIdx = CSIDL_APPDATA;
nVarIdx |= CSIDL_APPDATA;
qLaunch = 1;
// dont break
default:
// Get and force path creation
if ( !SHGetSpecialFolderLocation(g_hwnd, nVarIdx, &idl) )
if ( !SHGetSpecialFolderLocation(g_hwnd, nVarIdx | nCreateFlag, &idl) )
{
if (my_PIDL2Path(out, idl, 1))
{
@ -530,10 +529,10 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
break;
}
if ( *out || ((nVarIdx & CSIDL_FLAG_CREATE) != CSIDL_FLAG_CREATE) )
if ( *out || nCreateFlag == 0 )
break;
else
nVarIdx &= ~CSIDL_FLAG_CREATE;
nCreateFlag = 0; // remove create flag if it fails
}
validate_filename(out);

2
Source/exehead/util.h
View file

@ -14,7 +14,7 @@ int NSISCALL mystrlen(const char *in);
char * NSISCALL mystrstr(char *a, char *b);
WIN32_FIND_DATA * NSISCALL file_exists(char *buf);
char * NSISCALL my_GetTempFileName(char *buf, const char *dir);
int my_PIDL2Path(char *out, LPITEMIDLIST idl, int bFree);
int NSISCALL my_PIDL2Path(char *out, LPITEMIDLIST idl, int bFree);
//BOOL NSISCALL my_SetWindowText(HWND hWnd, const char *val);
#define my_SetWindowText SetWindowText