diff --git a/Source/exehead/util.c b/Source/exehead/util.c index 55e2572e..afaacc7d 100644 --- a/Source/exehead/util.c +++ b/Source/exehead/util.c @@ -630,34 +630,35 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab) int x = 2; DWORD ver = GetVersion(); - /* + /* - SHGetFolderPath as provided by shfolder.dll is used to get special folders - unless the installer is running on Windows 95/98. For 95/98 shfolder.dll is - only used for the Application Data and Documents folder (if the DLL exists). + SHGetFolderPath as provided by shfolder.dll is used to get special folders + unless the installer is running on Windows 95/98. For 95/98 shfolder.dll is + only used for the Application Data and Documents folder (if the DLL exists). Oherwise, the old SHGetSpecialFolderLocation API is called. - There reason for not using shfolder.dll for all folders on 95/98 is that - some unsupported folders (such as the Start Menu folder for all users) are - simulated instead of returning an error so whe can fall back on the folder - for the current user. + There reason for not using shfolder.dll for all folders on 95/98 is that + some unsupported folders (such as the Start Menu folder for all users) are + simulated instead of returning an error so whe can fall back on the folder + for the current user. - SHGetFolderPath in shell32.dll could be called directly for Windows versions - later than 95/98 but there is no need to do so, because shfolder.dll is still - provided and calls shell32.dll. + SHGetFolderPath in shell32.dll could be called directly for Windows versions + later than 95/98 but there is no need to do so, because shfolder.dll is still + provided and calls shell32.dll. - */ + */ - BOOL use_shfolder = ( - - // Use shfolder if not on 95/98 + BOOL use_shfolder = + // Use shfolder if not on 95/98 !((ver & 0x80000000) && (LOWORD(ver) != 0x5A04)) || - // Unless the Application Data or Documents folder is requested - ((fldrs[2] == CSIDL_COMMON_APPDATA) || - (fldrs[2] == CSIDL_COMMON_DOCUMENTS)) + // Unless the Application Data or Documents folder is requested + ( + (fldrs[2] == CSIDL_COMMON_APPDATA) || + (fldrs[2] == CSIDL_COMMON_DOCUMENTS) + ); - ); + /* Carry on... shfolder stuff is over. */ if (g_exec_flags.all_user_var) {