Skip to content
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

Jump to bottom

Preliminary Win32 support #6

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

Preliminary Win32 support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c8988ff
Enable 'win32-dll' in libtool
kazssym Jan 28, 2020
cfa1ea6
Merge with master
kazssym Feb 1, 2020
cb9016e
Merge master into feature/win32
kazssym Apr 30, 2020
b5f7aa3
Merge master into feature/win32
kazssym May 3, 2020
370743e
Merge master into feature/win32
kazssym May 4, 2020
9733267
Merge master into feature/win32
kazssym May 9, 2020
4a35514
Merge master into feature/win32
kazssym Jun 28, 2020
8f2110c
Merge master into feature/win32
kazssym Jul 2, 2020
9c77fc1
Merge master into feature/win32
kazssym Jul 5, 2020
163349d
Merge master into feature/win32
kazssym Dec 11, 2020
69e52be
Merge master into feature/win32
kazssym Dec 12, 2020
848d7f3
Include <windows.h>
kazssym Dec 12, 2020
3752862
Add a configuration for the MinGW-w64 cross-compiler
kazssym Dec 12, 2020
29d22b3
Add code to load modules on Windows
kazssym Dec 12, 2020
85ef971
Merge master into feature/win32
kazssym Dec 14, 2020
d7ae13b
Merge master into feature/win32
kazssym Dec 18, 2020
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
19 changes: 19 additions & 0 deletions .vscode/c_cpp_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,25 @@
"limitSymbolsToIncludedHeaders": true
}
},
{
"name": "Win32 (MinGW-w64 cross)",
"compilerPath": "i686-w64-mingw32-gcc",
"includePath": [
"${workspaceFolder}",
"${workspaceFolder}/libcppunitx"
],
"defines": [
"HAVE_CONFIG_H"
],
"cStandard": "c11",
"cppStandard": "c++11",
"browse": {
"path": [
"${workspaceFolder}"
],
"limitSymbolsToIncludedHeaders": true
}
},
{
"name": "Win32 (MSVC)",
"intelliSenseMode": "msvc-x64",
Expand Down
16 changes: 14 additions & 2 deletions libcppunitx/module_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
#include <config.h>
#endif

#if _WIN32
#define WIN32_LEAN_AND_MEAN 1
#include <windows.h>
#endif

#include "module_loader.h"

#if HAVE_DLFCN_H
Expand Down Expand Up @@ -108,24 +113,31 @@ void module::open(const char *const name)
close();
#if HAVE_DLFCN_H
_native_handle = dlopen(name, RTLD_LAZY);
#elif _WIN32
_native_handle = LoadLibraryA(name);
#endif
}

void module::close()
{
#if HAVE_DLFCN_H
native_handle_type handle = nullptr;
std::swap(_native_handle, handle);
if (handle != nullptr) {
#if HAVE_DLFCN_H
dlclose(handle);
}
#elif _WIN32
FreeLibrary(static_cast<HMODULE>(handle));
#endif
}
}

void *module::sym(const char *symbol)
{
#if HAVE_DLFCN_H
return dlsym(_native_handle, symbol);
#elif _WIN32
return reinterpret_cast<void *>(
GetProcAddress(static_cast<HMODULE>(_native_handle), symbol));
#else
return nullptr;
#endif
Expand Down