blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

Windows: GetUserNameExA(NameSamCompatible), correct test

Browse Source
This commit is contained in:
nick black 2021-08-28 20:08:42 -04:00
parent 83744f17bb
commit d7d18dcb64
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -87,13 +87,11 @@ pkg_search_module(TERMINFO REQUIRED tinfo>=6.1 ncursesw>=6.1)
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND terminfo) set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND terminfo)
set_package_properties(terminfo PROPERTIES TYPE REQUIRED) set_package_properties(terminfo PROPERTIES TYPE REQUIRED)
set(PKGCONF_REQ_PRIV "${TERMINFO_LIBRARIES}") set(PKGCONF_REQ_PRIV "${TERMINFO_LIBRARIES}")
if(NOT WIN32)
if(${USE_READLINE}) if(${USE_READLINE})
pkg_search_module(READLINE REQUIRED readline>=8.0) pkg_search_module(READLINE REQUIRED readline>=8.0)
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND readline) set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND readline)
set_package_properties(readline PROPERTIES TYPE REQUIRED) set_package_properties(readline PROPERTIES TYPE REQUIRED)
endif() endif()
endif()
if(${USE_FFMPEG}) if(${USE_FFMPEG})
pkg_check_modules(AVCODEC REQUIRED libavcodec>=57.0) pkg_check_modules(AVCODEC REQUIRED libavcodec>=57.0)
pkg_check_modules(AVFORMAT REQUIRED libavformat>=57.0) pkg_check_modules(AVFORMAT REQUIRED libavformat>=57.0)
@ -119,7 +117,7 @@ find_package(ZLIB)
set_package_properties(ZLIB PROPERTIES TYPE REQUIRED) set_package_properties(ZLIB PROPERTIES TYPE REQUIRED)
# platform-specific logics # platform-specific logics
if(WIN32) if(WIN32)
set(LIBRT_LIBRARIES wsock32 ws2_32) set(LIBRT_LIBRARIES wsock32 ws2_32 Secur32)
elseif(NOT APPLE) elseif(NOT APPLE)
find_library(LIBM m REQUIRED) find_library(LIBM m REQUIRED)
find_library(LIBRT rt REQUIRED) find_library(LIBRT rt REQUIRED)

5
src/lib/util.c
View File

@ -3,6 +3,8 @@
#include <unistd.h> #include <unistd.h>
#else #else
#include <winsock2.h> #include <winsock2.h>
#define SECURITY_WIN32
#include <secext.h>
#endif #endif
#include "internal.h" #include "internal.h"
@ -24,7 +26,8 @@ char* notcurses_accountname(void){
if(un == NULL){ if(un == NULL){
return NULL; return NULL;
} }
if(GetUserName(un, &unlen)){ // FIXME probably want GetUserNameEx if(!GetUserNameExA(NameSamCompatible, un, &unlen)){
logerror("couldn't get user name\n");
free(un); free(un);
return NULL; return NULL;
} }