Skip to content

Adding UTF-8 support for WideCharToMultiByte method - Windows Platform #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xeronix wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adding UTF-8 support for WideCharToMultiByte method - Windows Platform #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc6b844
Adding UTF-8 support for WideCharToMultiByte method - Windows Platform
xeronix Oct 6, 2016
38d44f3
Adding sigar build instructions.
xeronix Feb 22, 2018
4454b43
Update sigar_build.txt
xeronix Feb 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions sigar_build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Make sure to build in a new cmd environment if previously different architecture build was executed in the current cmd to reset the environment variable to default.

Use 64 bit machine with 64 bit Java (JAVA_HOME) for win64

1) Initialize Visual Studio Environment in command prompt:
Win32 : "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
Uncomment the commented statements in sigar_get_pointer() and sigar_set_pointer() @ sigar-1.6.4\bindings\java\src\jni\javasigar.c for Win32 build.

Win64 : "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat"

2) Install cmake and Perl5 and add it's executables to PATH. Make sure you use Strawberry perl and not the perl present in unix scripts we use.

3) Set ANT build environment : ANT_HOME and add ANT_HOME/bin to PATH.

4)To build dll files directly :
Go to sigar-1.6\bindings\java and run :
a) ant clean
b) ant
OR
4) For Visual Studio Solution file creation (note: do not use this as it creates sigar dll without java bindings):
(To build Visual Studio Configuration files for 32 bit remove 'Win64' from @SET GENERATOR="Visual Studio 12 2013 Win64" in winbuild.bat)
Run winbuild.bat
Open sigar.sln file from same command prompt. Make sure Linker-Command Line does not has X86 set as architecture in additional options of any project.

Add wmi.cpp to sigar project
In sigar project : C/C++ -> Advanced -> compile As -> Default

Run Clean - Build
4 changes: 2 additions & 2 deletions src/os/win32/sigar_os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@
/* XXX: support CP_UTF8 ? */

#define SIGAR_A2W(lpa, lpw, bytes) \
(lpw[0] = 0, MultiByteToWideChar(CP_ACP, 0, \
(lpw[0] = 0, MultiByteToWideChar(CP_UTF8, 0, \
lpa, -1, lpw, (bytes/sizeof(WCHAR))))

#define SIGAR_W2A(lpw, lpa, chars) \
(lpa[0] = '\0', WideCharToMultiByte(CP_ACP, 0, \
(lpa[0] = '\0', WideCharToMultiByte(CP_UTF8, 0, \
lpw, -1, (LPSTR)lpa, chars, \
NULL, NULL))

Expand Down