JasonFriday13
10th October 2013 19:44 UTC

I noticed that WCHAR is typedef'ed unsigned short in Platform.h. Apparently these two can be directly type-cast with no problems, though I don't know the truth.

#if !defined(_NATIVE_WCHAR_T_DEFINED)
typedef unsigned short WCHAR;
#else
typedef wchar_t WCHAR;
#endif

Anders
10th October 2013 21:40 UTC

Originally posted by JasonFriday13
I noticed that WCHAR is typedef'ed unsigned short in Platform.h. Apparently these two can be directly type-cast with no problems, though I don't know the truth.

JasonFriday13
11th October 2013 05:14 UTC

I've had enough for now. I don't know if windows is smart and knows about the implied cast-typing, but gcc sure doesn't and it catches every type problem, which makes it very hard to troubleshoot. I might start on the non unicode version first as that seems easier to get change it around between ansi and unicode versions.

Anders
11th October 2013 15:21 UTC

The ANSI version is going to have even more issues so I don't think that is a good idea. What about the diff I sent you?

JasonFriday13
12th October 2013 05:36 UTC

I applied that patch to a fresh 3.0a1 source (compiling with unicode on) and it's getting better, DialogTemplate.cpp compiles with no errors now. Also I have to remove 'ExDLL' from the lib_plugins list in Sconstruct, because it tries compiling pluginapi.c, which of course includes windows.h and throws an error about not finding it.

I am now getting another error in ResourceEditor.cpp, in:
return UpdateResourceW(szType, MAKEINTRESOURCEW(szName), wLanguage, lpData, dwSize);
saying "no type conversion found for argument 1". So I added this function to convert it:

return UpdateResourceW(WinWStrDupFromTChar(szType), MAKEINTRESOURCEW(szName), wLanguage, lpData, dwSize);

return WinWStrLen(m_szName); // wcslen(m_szName);

Source/ResourceEditor.cpp: In member function 'int CResourceDirectory::Find(const WCHAR*)':
Source/ResourceEditor.cpp:865:40: error: '_wtoi' was not declared in this scope

Anders
12th October 2013 06:08 UTC

Calling WinWStrDupFromTChar like that is a memory leak but its fine for testing.

There is probably something like myatoi in util.c or one of the plugin files, use it to create a WinWStrToInt in winchar.cpp/h if you cannot come up with anything else. I'll try to take a look at the code tonight...

JasonFriday13
12th October 2013 08:50 UTC

There is, it's in "source/exehead/util.c", so I copied it over into "winchar.c" and renamed it like this:

#ifndef _WIN32 // existing #ifdef
int WinWStrToInt(const WINWCHAR *s)
{
unsigned int v=0;
int sign=1; // sign of positive
TCHAR m=10; // base of 10
TCHAR t=_T('9'); // cap top of numbers at 9

if (*s == _T('-'))
{
s++; //skip over -
sign=-1; // sign flip
}

if (*s == _T('0'))
{
s++; // skip over 0
if (s[0] >= _T('0') && s[0] <= _T('7'))
{
m=8; // base of 8
t=_T('7'); // cap top at 7
}
if ((s[0] & ~0x20) == _T('X'))
{
m=16; // base of 16
s++; // advance over 'x'
}
}

for (;; )
{
int c=*s++;
if (c >= _T('0') && c <= t) c-=_T('0');
// clever little trick to do both upper and lowercase A-F.
else if (m==16 && (c & ~0x20) >= _T('A') && (c & ~0x20) <= _T('F')) c = (c & 7) + 9;
else break;
v*=m;
v+=c;
}
return ((int)v)*sign;
}

In file included from Source/ResourceVersionInfo.h:30:0,
from Source/ResourceVersionInfo.cpp:19:
Source/strlist.h: In member function 'int SortedStringListND<T>::find(const TCHAR*, int, int, int, int*)':
Source/strlist.h:402:38: error: there are no arguments to '_wcsicmp' that depend on a template parameter, so a declaration of '_wcsicmp' must be available [-fpermissive]
Source/strlist.h:402:38: note: (if you use '-fpermissive', G++ will accept your code, but allowing the use of an undeclared name is deprecated)

if (case_sensitive)
res = _tcscmp(str, pCurr);
else
res = _tcsicmp(str, pCurr);

JasonFriday13
12th October 2013 09:17 UTC

What about adding "|| !defined _WIN32" to line 53 in tchar.h? Because swprintf is recongnised under linux.

JasonFriday13
12th October 2013 14:07 UTC

I also noticed on linux, swprintf also requires a max length argument:

int swprintf(wchar_t *wcs, size_t maxlen, const wchar_t *format, ...);

Anders
12th October 2013 20:23 UTC

The *icmp stuff is not really part of the standard, the string support sucks.

Here is another diff, should probably apply it to svn trunk and not alpha 1 if you can.

Not sure what to do about swprintf, I'll have to think about it some more...

Anders
13th October 2013 05:11 UTC

you could try this

#ifndef _WIN32
int swprintf(wchar_t*buf, const wchar_t*fmt, ...) // non-standard overloaded version for MSVC compatibility
{
va_list val;
va_start(val, fmt);
int res = vswprintf(buf, -1, fmt, val);
va_end(val);
return res;
}
#endif

JasonFriday13
13th October 2013 09:53 UTC

So went and downloaded the trunk source-tree, and added both of those diff's you gave me to a fresh copy.

I put that function into "Source/util.cpp" and it's prototype in "Source/util.h", it still gave a compile error saying it's undeclared, so I changed line 53 in "tchar.h" to

#if (defined(_MSC_VER) && (_MSC_VER<=1310)) || defined(__MINGW32__) || !defined _WIN32

scons: Cleaning targets ...
Removed build/urelease/halibut/biblio.o
Removed build/urelease/halibut/bk_xhtml.o
Removed build/urelease/halibut/contents.o
Removed build/urelease/halibut/error.o
Removed build/urelease/halibut/help.o
Removed build/urelease/halibut/index.o
Removed build/urelease/halibut/input.o
Removed build/urelease/halibut/keywords.o
Removed build/urelease/halibut/licence.o
Removed build/urelease/halibut/main.o
Removed build/urelease/halibut/malloc.o
Removed build/urelease/halibut/misc.o
Removed build/urelease/halibut/style.o
Removed build/urelease/halibut/tree234.o
Removed build/urelease/halibut/ustring.o
Removed build/urelease/halibut/version.o
Removed build/urelease/halibut/halibut
Removed build/urelease/Docs/html/IndexPage.html
Removed build/urelease/Docs/html/Contents.html
Removed build/urelease/Docs/html/Chapter1.html
Removed build/urelease/Docs/html/Chapter2.html
Removed build/urelease/Docs/html/Chapter3.html
Removed build/urelease/Docs/html/Chapter4.html
Removed build/urelease/Docs/html/Chapter5.html
Removed build/urelease/Docs/html/AppendixA.html
Removed build/urelease/Docs/html/AppendixB.html
Removed build/urelease/Docs/html/AppendixC.html
Removed build/urelease/Docs/html/AppendixD.html
Removed build/urelease/Docs/html/AppendixE.html
Removed build/urelease/Docs/html/AppendixF.html
Removed build/urelease/Docs/html/AppendixG.html
Removed build/urelease/Docs/html/AppendixH.html
Removed build/urelease/Docs/html/AppendixI.html
Removed build/urelease/makensis/7zip/7zGuids.o
Removed build/urelease/makensis/7zip/7zip/Common/OutBuffer.o
Removed build/urelease/makensis/7zip/7zip/Common/StreamUtils.o
Removed build/urelease/makensis/7zip/7zip/Compress/LZ/LZInWindow.o
Removed build/urelease/makensis/7zip/7zip/Compress/LZMA/LZMAEncoder.o
Removed build/urelease/makensis/7zip/7zip/Compress/RangeCoder/RangeCoderBit.o
Removed build/urelease/makensis/7zip/Common/Alloc.o
Removed build/urelease/makensis/7zip/Common/CRC.o
Removed build/urelease/makensis/DialogTemplate.o
Removed build/urelease/makensis/Plugins.o
Removed build/urelease/makensis/ResourceEditor.o
Removed build/urelease/makensis/ResourceVersionInfo.o
Removed build/urelease/makensis/ShConstants.o
scons: done cleaning targets.

g++ -o build/urelease/makensis/build.o -c -Wno-non-virtual-dtor -Wall -O2 -DNSISCALL="__attribute__((__stdcall__))" -D_UNICODE -DUNICODE -DMAKENSIS -D_WIN32_IE=0x0500 -Ibuild/urelease/config Source/build.cpp
Source/build.cpp: In member function 'void CEXEBuild::initialize(const TCHAR*)':
Source/build.cpp:388:44: error: '_wgetenv' was not declared in this scope
Source/build.cpp:394:16: error: invalid conversion from 'const char*' to 'wchar_t' [-fpermissive]
/usr/include/c++/4.6/bits/basic_string.h:560:7: error: initializing argument 1 of 'std::basic_string<_CharT, _Traits, _Alloc>& std::basic_string<_CharT, _Traits, _Alloc>::operator=(_CharT) [with _CharT = wchar_t, _Traits = std::char_traits<wchar_t>, _Alloc = std::allocator<wchar_t>, std::basic_string<_CharT, _Traits, _Alloc> = std::basic_string<wchar_t>]' [-fpermissive]
Source/build.cpp: In member function 'int CEXEBuild::add_string(const TCHAR*, int, UINT)':
Source/build.cpp:487:33: error: '_wcsdup' was not declared in this scope
Source/build.cpp: In function 'char* convert_processed_string_to_ansi(char*, const TCHAR*, WORD)':
Source/build.cpp:533:90: error: cannot convert 'const TCHAR* {aka const wchar_t*}' to 'LPCWSTR {aka const short unsigned int*}' for argument '3' to 'int WideCharToMultiByte(UINT, DWORD, LPCWSTR, int, LPSTR, int, LPCSTR, LPBOOL)'
Source/build.cpp:543:34: error: 'LOBYTE' was not declared in this scope
Source/build.cpp:544:34: error: 'HIBYTE' was not declared in this scope
Source/build.cpp: In member function 'int CEXEBuild::preprocess_string(TCHAR*, const TCHAR*, WORD)':
Source/build.cpp:655:69: error: 'MAKEWORD' was not declared in this scope
Source/build.cpp: In member function 'int CEXEBuild::add_label(const TCHAR*)':
Source/build.cpp: In member function 'int CEXEBuild::resolve_jump_int(const TCHAR*, int*, int, int, int)':
Source/build.cpp:1364:29: error: '_wtoi' was not declared in this scope
Source/build.cpp: In member function 'int CEXEBuild::AddVersionInfo()':
Source/build.cpp:1816:112: error: no matching function for call to 'CResourceEditor::UpdateResource(LPSTR, int, LANGID&, BYTE*, int)'
Source/build.cpp:1816:112: note: candidate is:
Source/ResourceEditor.h:117:9: note: bool CResourceEditor::UpdateResource(const TCHAR*, WORD, LANGID, BYTE*, DWORD)
Source/ResourceEditor.h:117:9: note: no known conversion for argument 1 from 'LPSTR {aka char*}' to 'const TCHAR* {aka const wchar_t*}'
Source/build.cpp: In member function 'int CEXEBuild::ProcessPages()':
Source/build.cpp:2186:10: error: no matching function for call to 'CResourceEditor::GetResource(LPSTR, int, int)'
Source/build.cpp:2186:10: note: candidate is:
Source/ResourceEditor.h:118:9: note: BYTE* CResourceEditor::GetResource(const TCHAR*, WORD, LANGID)
Source/ResourceEditor.h:118:9: note: no known conversion for argument 1 from 'LPSTR {aka char*}' to 'const TCHAR* {aka const wchar_t*}'
Source/build.cpp: In member function 'int CEXEBuild::pack_exe_header()':
Source/build.cpp:2505:28: error: '_wremove' was not declared in this scope
Source/build.cpp:2511:26: error: '_wremove' was not declared in this scope
Source/build.cpp: In member function 'int CEXEBuild::write_output()':
Source/build.cpp:2947:7: error: 'LPTSTR' was not declared in this scope
Source/build.cpp:2947:14: error: expected ';' before 'cmdstr'
Source/build.cpp:2948:14: error: expected ';' before 'arg'
Source/build.cpp:2949:11: error: 'arg' was not declared in this scope
Source/build.cpp:2952:9: error: 'cmdstrbuf' was not declared in this scope
Source/build.cpp:2952:30: error: expected ';' before 'malloc'
Source/build.cpp:2958:47: error: 'cmdstr' was not declared in this scope
Source/build.cpp:2965:49: error: 'cmdstr' was not declared in this scope
Source/build.cpp:2974:12: error: 'cmdstrbuf' was not declared in this scope
scons: *** [build/urelease/makensis/build.o] Error 1
scons: building terminated because of errors.

Anders
13th October 2013 23:27 UTC

This should contain all fixes so far except swprintf.

because "tchar.h" doesn't exist in the build directory.

JasonFriday13
14th October 2013 02:19 UTC

Yeah, Sconstruct writes "#include "tchar.h"" into "nsis-version.h", but tchar.h is in the source directory, not the current directory ("build/urelease/config").

I'll add that patch now and get back to you.

JasonFriday13
14th October 2013 05:54 UTC

So I added that patch you gave me, and I had to add #include "tchar.h" and #include "utf.h" to "ResourceVersionInfo.cpp" for it to compile with no errors.

That Sconstruct patch has caused a problem, these two lines:

defenv.Append(NSIS_CPPDEFINES = [('PREFIX_CONF', 'L"%s"' % defenv.subst('$PREFIX_CONF'))])
defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DATA', 'L"%s"' % defenv.subst('$PREFIX_DATA'))])

definedlist.add(_T("PREFIX_CONF"), _T("L"/usr/local/etc""));
definedlist.add(_T("PREFIX_DATA"), _T("L"/usr/local/share/nsis""));

Source/build.cpp:1816:112: error: no matching function for call to 'CResourceEditor::UpdateResource(LPSTR, int, LANGID&, BYTE*, int)'
Source/build.cpp:1816:112: note: candidate is:
Source/ResourceEditor.h:117:9: note: bool CResourceEditor::UpdateResource(const TCHAR*, WORD, LANGID, BYTE*, DWORD)
Source/ResourceEditor.h:117:9: note: no known conversion for argument 1 from 'LPSTR {aka char*}' to 'const TCHAR* {aka const wchar_t*}'
Source/build.cpp:2186:10: error: no matching function for call to 'CResourceEditor::GetResource(LPSTR, int, int)'
Source/build.cpp:2186:10: note: candidate is:
Source/ResourceEditor.h:118:9: note: BYTE* CResourceEditor::GetResource(const TCHAR*, WORD, LANGID)
Source/ResourceEditor.h:118:9: note: no known conversion for argument 1 from 'LPSTR {aka char*}' to 'const TCHAR* {aka const wchar_t*}'

#ifndef _UNICODE
# define MAKEINTRESOURCED MAKEINTRESOURCEA
#else
# define MAKEINTRESOURCED(i) ((wchar_t*)((ULONG_PTR)((WORD)(i))))
#endif

#ifndef RT_BITMAP
# define RT_BITMAP MAKEINTRESOURCED(2)
#endif
#ifndef RT_ICON
# define RT_ICON MAKEINTRESOURCED(3)
#endif
#ifndef RT_DIALOG
# define RT_DIALOG MAKEINTRESOURCED(5)
#endif
#ifndef RT_GROUP_ICON
# define RT_GROUP_ICON MAKEINTRESOURCED(14)
#endif
#ifndef RT_VERSION
# define RT_VERSION MAKEINTRESOURCED(16)
#endif

JasonFriday13
14th October 2013 10:22 UTC

Oh and I managed to fix "pluginapi.c" from trying to compile on linux. I changed line 691 in Scontruct from this:

for plugin in plugin_libs + plugins:

for plugin in plugin_libs and plugins:

Anders
14th October 2013 21:11 UTC

New Diff, I believe I fixed the tchar.h path issue and maybe messed up something else ;)

JasonFriday13
15th October 2013 05:52 UTC

Yeah something else did mess up:

In file included from Source/util.h:25:0,
from Source/DialogTemplate.cpp:21:
Source/ResourceEditor.h: In member function 'bool CResourceEditor::UpdateResource(const WCHAR*, WORD, LANGID, BYTE*, DWORD)':
Source/ResourceEditor.h:129:28: error: cast from 'const WCHAR* {aka const short unsigned int*}' to 'WORD {aka short unsigned int}' loses precision [-fpermissive]
Source/ResourceEditor.h: In member function 'BYTE* CResourceEditor::GetResource(const WCHAR*, WORD, LANGID)':
Source/ResourceEditor.h:134:25: error: cast from 'const WCHAR* {aka const short unsigned int*}' to 'WORD {aka short unsigned int}' loses precision [-fpermissive]

JasonFriday13
15th October 2013 07:15 UTC

Also, the compile system stops on the first error encountered, so several files still need to be compiled. For one, I know "dirreader.cpp" will need it's function prototypes changed, and "script.cpp" isn't being compiled yet either, along with a few others like "lineparse.cpp" and "lang.cpp".

JasonFriday13
16th October 2013 09:37 UTC

I have also been working on some stuff and I have made a .txt file that should describe everything that's wrong (though I might have missed something) and a few minor fixes that I've done. It's over 1600 lines but 3/4 of it includes one of the patches you gave me.

TrifonovS
13th November 2013 08:39 UTC

When I compile my existing projects with the new NSIS version 3.0a1, it prints only several lines in the output window of the editor. With the older version 2.46 this is different. I see a lot of prints during the whole compilation. Of course I don't read all of them, but this can give me information what the compiler is doing currently. My script is huge and it needs probably 7-8 minutes for compilation and without prints with V3.0a1, it looks that it hangs and I don't know when it will finish. So is this behavior expected? Can I enable the prints similar to V2.46?

Anders
14th November 2013 02:45 UTC

Originally posted by TrifonovS
When I compile my existing projects with the new NSIS version 3.0a1, it prints only several lines in the output window of the editor. With the older version 2.46 this is different.

TrifonovS
21st November 2013 08:06 UTC

I think that there is a problem with some existing plug-ins when the unicode support is enabled (Unicode true). For example Aero plug-in can not show correct some German letters. The problem is not in my code, because when I don't enable Aero plug-in the branding text is shown correct. I also had a problem with the caption-text of the inetc plug-in. When I disable unicode support all works fine. But when I enable it, the installer stops with a strange message.

Anders
21st November 2013 09:49 UTC

Originally posted by TrifonovS
I think that there is a problem with some existing plug-ins when the unicode support is enabled (Unicode true). For example Aero plug-in can not show correct some German letters. The problem is not in my code, because when I don't enable Aero plug-in the branding text is shown correct. I also had a problem with the caption-text of the inetc plug-in. When I disable unicode support all works fine. But when I enable it, the installer stops with a strange message.

TrifonovS
21st November 2013 11:56 UTC

I thought Afrow UK already said this was a bug in his plugin?

For anything else, post some example code or something, we are not mind readers...

TrifonovS
21st November 2013 14:42 UTC

So here is simple script that shows a strange behavior of the inetc plug-in. It just tries to download SP3 for Windows XP from a predefined location. When Unicode is true, after execution, it doesn't download anything, but just exits and the returned value is shown in a message box. The return value is unreadable. But when Unicode is set to false, the downloading is started. At the end (or if it is interrupted) the returned value is readable as it is expected.

Anders
21st November 2013 15:16 UTC

Originally posted by TrifonovS
So here is simple script that shows a strange behavior of the inetc plug-in. It just tries to download SP3 for Windows XP from a predefined location. When Unicode is true, after execution, it doesn't download anything, but just exits and the returned value is shown in a message box. The return value is unreadable. But when Unicode is set to false, the downloading is started. At the end (or if it is interrupted) the returned value is readable as it is expected.

Anders
21st November 2013 15:41 UTC

When strings are wrong/corrupted/1 character long you should always make sure that you are using the correct plugin that matches your target.

*Unicode true
*!addplugindir to inetc unicode folder
*change $TEMP\ServicePack3 to $TEMP\Download in inetc::get call

TrifonovS
21st November 2013 18:28 UTC

That's right! I really forgot that I have to use an Unicode version of the plug-in. Thanks a lot and sorry for my mistake.