2201b920c8
added frag message filter, and dedicated frag tracker. added 'windowed consoles' for social-type stuff without depending upon csqc mods for it. added in_deviceids command which allows listing/renumbering device ids. slider widgets now support inverted ranges, so gamma selection isn't so weird. fix top/bottom colour selection bug. software banding feature is now part of the 'software' preset (now that it supports mipmaps). support for loading .maps, and editing their brushes etc (with appropriate qc mod). 'map mymap.map' to use. expect problems with missing wads and replacement textures overriding them and messing up texture scales. snd_inactive is now default. fix threading issue with wavs, no more error from 0-sample-but-otherwise-valid wavs. added -makeinstaller option to embed a manifest inside the exe (and icon). the resulting program will insist on installing the game if its run from outside a valid basedir. framegroup support for q1mdl. textures are now loaded on multiple worker threads, for reduced load times. moo har har. netgraph shows packet+byte rates too. added r_lightstylescale, pretty similar to contrast, but doesn't impose any framerate cost, but may have overbrighting issues. r_softwarebanding now works on q2bsp too. fixed crepuscular lights. gzip transfer encoding is performed while downloading, instead of inducing stalls. FINALLY fix ezquake download compat issue (dimman found the issue). git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4851 fc73d0e0-1445-4013-8a0c-d673dee63da5
519 lines
No EOL
14 KiB
C
519 lines
No EOL
14 KiB
C
#include "quakedef.h"
|
|
#include "fs.h"
|
|
#include "winquake.h"
|
|
|
|
//outlen is the size of out in _BYTES_.
|
|
wchar_t *widen(wchar_t *out, size_t outbytes, const char *utf8)
|
|
{
|
|
size_t outlen;
|
|
wchar_t *ret = out;
|
|
//utf-8 to utf-16, not ucs-2.
|
|
unsigned int codepoint;
|
|
int error;
|
|
outlen = outbytes/sizeof(wchar_t);
|
|
if (!outlen)
|
|
return L"";
|
|
outlen--;
|
|
while (*utf8)
|
|
{
|
|
codepoint = utf8_decode(&error, utf8, (void*)&utf8);
|
|
if (error || codepoint > 0x10FFFFu)
|
|
codepoint = 0xFFFDu;
|
|
if (codepoint > 0xffff)
|
|
{
|
|
if (outlen < 2)
|
|
break;
|
|
outlen -= 2;
|
|
codepoint -= 0x10000u;
|
|
*out++ = 0xD800 | (codepoint>>10);
|
|
*out++ = 0xDC00 | (codepoint&0x3ff);
|
|
}
|
|
else
|
|
{
|
|
if (outlen < 1)
|
|
break;
|
|
outlen -= 1;
|
|
*out++ = codepoint;
|
|
}
|
|
}
|
|
*out = 0;
|
|
return ret;
|
|
}
|
|
|
|
char *narrowen(char *out, size_t outlen, wchar_t *wide)
|
|
{
|
|
char *ret = out;
|
|
int bytes;
|
|
unsigned int codepoint;
|
|
if (!outlen)
|
|
return "";
|
|
outlen--;
|
|
//utf-8 to utf-16, not ucs-2.
|
|
while (*wide)
|
|
{
|
|
codepoint = *wide++;
|
|
if (codepoint >= 0xD800u && codepoint <= 0xDBFFu)
|
|
{ //handle utf-16 surrogates
|
|
if (*wide >= 0xDC00u && *wide <= 0xDFFFu)
|
|
{
|
|
codepoint = (codepoint&0x3ff)<<10;
|
|
codepoint |= *wide++ & 0x3ff;
|
|
}
|
|
else
|
|
codepoint = 0xFFFDu;
|
|
}
|
|
bytes = utf8_encode(out, codepoint, outlen);
|
|
if (bytes <= 0)
|
|
break;
|
|
out += bytes;
|
|
outlen -= bytes;
|
|
}
|
|
*out = 0;
|
|
return ret;
|
|
}
|
|
|
|
|
|
#ifndef WINRT //winrt is too annoying. lets just use stdio.
|
|
|
|
#ifndef INVALID_SET_FILE_POINTER
|
|
#define INVALID_SET_FILE_POINTER ~0
|
|
#endif
|
|
|
|
//read-only memory mapped files.
|
|
//for write access, we use the stdio module as a fallback.
|
|
//do you think anyone will ever notice that utf8 filenames work even in windows? probably not. oh well, worth a try.
|
|
|
|
#define VFSW32_Open VFSOS_Open
|
|
#define VFSW32_OpenPath VFSOS_OpenPath
|
|
|
|
typedef struct {
|
|
searchpathfuncs_t pub;
|
|
HANDLE changenotification;
|
|
void (QDECL *AddFileHash)(int depth, const char *fname, fsbucket_t *filehandle, void *pathhandle);
|
|
int hashdepth;
|
|
char rootpath[1];
|
|
} vfsw32path_t;
|
|
typedef struct {
|
|
vfsfile_t funcs;
|
|
HANDLE hand;
|
|
HANDLE mmh;
|
|
void *mmap;
|
|
unsigned int length;
|
|
unsigned int offset;
|
|
} vfsw32file_t;
|
|
|
|
static int QDECL VFSW32_ReadBytes (struct vfsfile_s *file, void *buffer, int bytestoread)
|
|
{
|
|
DWORD read;
|
|
vfsw32file_t *intfile = (vfsw32file_t*)file;
|
|
if (intfile->mmap)
|
|
{
|
|
if (intfile->offset+bytestoread > intfile->length)
|
|
bytestoread = intfile->length-intfile->offset;
|
|
|
|
memcpy(buffer, (char*)intfile->mmap + intfile->offset, bytestoread);
|
|
intfile->offset += bytestoread;
|
|
return bytestoread;
|
|
}
|
|
if (!ReadFile(intfile->hand, buffer, bytestoread, &read, NULL))
|
|
return 0;
|
|
return read;
|
|
}
|
|
static int QDECL VFSW32_WriteBytes (struct vfsfile_s *file, const void *buffer, int bytestoread)
|
|
{
|
|
DWORD written;
|
|
vfsw32file_t *intfile = (vfsw32file_t*)file;
|
|
if (intfile->mmap)
|
|
{
|
|
if (intfile->offset+bytestoread > intfile->length)
|
|
bytestoread = intfile->length-intfile->offset;
|
|
|
|
memcpy((char*)intfile->mmap + intfile->offset, buffer, bytestoread);
|
|
intfile->offset += bytestoread;
|
|
return bytestoread;
|
|
}
|
|
|
|
if (!WriteFile(intfile->hand, buffer, bytestoread, &written, NULL))
|
|
return 0;
|
|
return written;
|
|
}
|
|
static qboolean QDECL VFSW32_Seek (struct vfsfile_s *file, qofs_t pos)
|
|
{
|
|
DWORD hi, lo;
|
|
vfsw32file_t *intfile = (vfsw32file_t*)file;
|
|
if (intfile->mmap)
|
|
{
|
|
intfile->offset = pos;
|
|
return true;
|
|
}
|
|
|
|
lo = qofs_Low(pos);
|
|
hi = qofs_High(pos);
|
|
return SetFilePointer(intfile->hand, lo, &hi, FILE_BEGIN) != INVALID_SET_FILE_POINTER;
|
|
}
|
|
static qofs_t QDECL VFSW32_Tell (struct vfsfile_s *file)
|
|
{
|
|
DWORD hi = 0, lo;
|
|
vfsw32file_t *intfile = (vfsw32file_t*)file;
|
|
if (intfile->mmap)
|
|
return intfile->offset;
|
|
lo = SetFilePointer(intfile->hand, 0, &hi, FILE_CURRENT);
|
|
return qofs_Make(lo,hi);
|
|
}
|
|
static void QDECL VFSW32_Flush(struct vfsfile_s *file)
|
|
{
|
|
vfsw32file_t *intfile = (vfsw32file_t*)file;
|
|
if (intfile->mmap)
|
|
FlushViewOfFile(intfile->mmap, intfile->length);
|
|
FlushFileBuffers(intfile->hand);
|
|
}
|
|
static qofs_t QDECL VFSW32_GetSize (struct vfsfile_s *file)
|
|
{
|
|
DWORD lo, hi = 0;
|
|
vfsw32file_t *intfile = (vfsw32file_t*)file;
|
|
|
|
if (intfile->mmap)
|
|
return intfile->length;
|
|
lo = GetFileSize(intfile->hand, &hi);
|
|
return qofs_Make(lo,hi);
|
|
}
|
|
static qboolean QDECL VFSW32_Close(vfsfile_t *file)
|
|
{
|
|
vfsw32file_t *intfile = (vfsw32file_t*)file;
|
|
if (intfile->mmap)
|
|
{
|
|
UnmapViewOfFile(intfile->mmap);
|
|
CloseHandle(intfile->mmh);
|
|
}
|
|
CloseHandle(intfile->hand);
|
|
Z_Free(file);
|
|
return true;
|
|
}
|
|
|
|
//WARNING: handle can be null
|
|
static vfsfile_t *QDECL VFSW32_OpenInternal(vfsw32path_t *handle, const char *quakename, const char *osname, const char *mode)
|
|
{
|
|
HANDLE h, mh;
|
|
unsigned int fsize;
|
|
void *mmap;
|
|
qboolean didexist = true;
|
|
|
|
vfsw32file_t *file;
|
|
qboolean read = !!strchr(mode, 'r');
|
|
qboolean write = !!strchr(mode, 'w');
|
|
qboolean append = !!strchr(mode, 'a');
|
|
qboolean text = !!strchr(mode, 't');
|
|
write |= append;
|
|
if (strchr(mode, '+'))
|
|
read = write = true;
|
|
|
|
if (fs_readonly && (write || append))
|
|
return NULL;
|
|
|
|
if (!WinNT)
|
|
{
|
|
if ((write && read) || append)
|
|
h = CreateFileA(osname, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
else if (write)
|
|
h = CreateFileA(osname, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
else if (read)
|
|
h = CreateFileA(osname, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
else
|
|
h = INVALID_HANDLE_VALUE;
|
|
}
|
|
else
|
|
{
|
|
wchar_t wide[MAX_OSPATH];
|
|
widen(wide, sizeof(wide), osname);
|
|
|
|
h = INVALID_HANDLE_VALUE;
|
|
if (write || append)
|
|
{
|
|
//this extra block is to avoid flushing fs caches needlessly
|
|
h = CreateFileW(wide, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, (!read&&!append)?CREATE_ALWAYS:OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
if (h == INVALID_HANDLE_VALUE)
|
|
didexist = false;
|
|
}
|
|
|
|
if (h != INVALID_HANDLE_VALUE)
|
|
;
|
|
else if ((write && read) || append)
|
|
h = CreateFileW(wide, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
else if (write)
|
|
h = CreateFileW(wide, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
else if (read)
|
|
h = CreateFileW(wide, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
else
|
|
h = INVALID_HANDLE_VALUE;
|
|
}
|
|
if (h == INVALID_HANDLE_VALUE)
|
|
{
|
|
DWORD e = GetLastError();
|
|
return NULL;
|
|
}
|
|
|
|
if (!didexist)
|
|
{
|
|
if (handle && handle->AddFileHash)
|
|
handle->AddFileHash(handle->hashdepth, quakename, NULL, handle);
|
|
else
|
|
COM_RefreshFSCache_f(); //no idea where this path is. if its inside a quake path, make sure it gets flushed properly. FIXME: his shouldn't be needed if we have change notifications working properly.
|
|
}
|
|
|
|
|
|
fsize = GetFileSize(h, NULL);
|
|
if (write || append || text || fsize > 1024*1024*5)
|
|
{
|
|
fsize = 0;
|
|
mh = INVALID_HANDLE_VALUE;
|
|
mmap = NULL;
|
|
|
|
/*if appending, set the access position to the end of the file*/
|
|
if (append)
|
|
SetFilePointer(h, 0, NULL, FILE_END);
|
|
}
|
|
else
|
|
{
|
|
mh = CreateFileMapping(h, NULL, PAGE_READONLY, 0, 0, NULL);
|
|
if (mh == INVALID_HANDLE_VALUE)
|
|
mmap = NULL;
|
|
else
|
|
{
|
|
mmap = MapViewOfFile(mh, FILE_MAP_READ, 0, 0, fsize);
|
|
if (mmap == NULL)
|
|
{
|
|
CloseHandle(mh);
|
|
mh = INVALID_HANDLE_VALUE;
|
|
}
|
|
}
|
|
}
|
|
|
|
file = Z_Malloc(sizeof(vfsw32file_t));
|
|
#ifdef _DEBUG
|
|
Q_strncpyz(file->funcs.dbgname, osname, sizeof(file->funcs.dbgname));
|
|
#endif
|
|
file->funcs.ReadBytes = read?VFSW32_ReadBytes:NULL;
|
|
file->funcs.WriteBytes = (write||append)?VFSW32_WriteBytes:NULL;
|
|
file->funcs.Seek = VFSW32_Seek;
|
|
file->funcs.Tell = VFSW32_Tell;
|
|
file->funcs.GetLen = VFSW32_GetSize;
|
|
file->funcs.Close = VFSW32_Close;
|
|
file->funcs.Flush = VFSW32_Flush;
|
|
file->hand = h;
|
|
file->mmh = mh;
|
|
file->mmap = mmap;
|
|
file->offset = 0;
|
|
file->length = fsize;
|
|
|
|
return &file->funcs;
|
|
}
|
|
|
|
vfsfile_t *QDECL VFSW32_Open(const char *osname, const char *mode)
|
|
{
|
|
//called without regard to a search path
|
|
return VFSW32_OpenInternal(NULL, NULL, osname, mode);
|
|
}
|
|
|
|
static vfsfile_t *QDECL VFSW32_OpenVFS(searchpathfuncs_t *handle, flocation_t *loc, const char *mode)
|
|
{
|
|
//path is already cleaned, as anything that gets a valid loc needs cleaning up first.
|
|
vfsw32path_t *wp = (void*)handle;
|
|
return VFSW32_OpenInternal(wp, loc->rawname+strlen(wp->rootpath)+1, loc->rawname, mode);
|
|
}
|
|
static void QDECL VFSW32_ClosePath(searchpathfuncs_t *handle)
|
|
{
|
|
vfsw32path_t *wp = (void*)handle;
|
|
if (wp->changenotification != INVALID_HANDLE_VALUE)
|
|
FindCloseChangeNotification(wp->changenotification);
|
|
Z_Free(wp);
|
|
}
|
|
static qboolean QDECL VFSW32_PollChanges(searchpathfuncs_t *handle)
|
|
{
|
|
qboolean result = false;
|
|
vfsw32path_t *wp = (void*)handle;
|
|
|
|
if (wp->changenotification == INVALID_HANDLE_VALUE)
|
|
return true;
|
|
for(;;)
|
|
{
|
|
switch(WaitForSingleObject(wp->changenotification, 0))
|
|
{
|
|
case WAIT_OBJECT_0:
|
|
result = true;
|
|
break;
|
|
case WAIT_TIMEOUT:
|
|
return result;
|
|
default:
|
|
FindCloseChangeNotification(wp->changenotification);
|
|
wp->changenotification = INVALID_HANDLE_VALUE;
|
|
return true;
|
|
}
|
|
FindNextChangeNotification(wp->changenotification);
|
|
}
|
|
return result;
|
|
}
|
|
static int QDECL VFSW32_RebuildFSHash(const char *filename, qofs_t filesize, time_t mtime, void *handle, searchpathfuncs_t *spath)
|
|
{
|
|
vfsw32path_t *wp = (void*)spath;
|
|
if (filename[strlen(filename)-1] == '/')
|
|
{ //this is actually a directory
|
|
|
|
char childpath[256];
|
|
Q_snprintfz(childpath, sizeof(childpath), "%s*", filename);
|
|
Sys_EnumerateFiles(wp->rootpath, childpath, VFSW32_RebuildFSHash, handle, spath);
|
|
return true;
|
|
}
|
|
|
|
wp->AddFileHash(wp->hashdepth, filename, NULL, wp);
|
|
return true;
|
|
}
|
|
static void QDECL VFSW32_BuildHash(searchpathfuncs_t *handle, int hashdepth, void (QDECL *AddFileHash)(int depth, const char *fname, fsbucket_t *filehandle, void *pathhandle))
|
|
{
|
|
vfsw32path_t *wp = (void*)handle;
|
|
wp->AddFileHash = AddFileHash;
|
|
wp->hashdepth = hashdepth;
|
|
Sys_EnumerateFiles(wp->rootpath, "*", VFSW32_RebuildFSHash, AddFileHash, handle);
|
|
}
|
|
#include <errno.h>
|
|
static unsigned int QDECL VFSW32_FLocate(searchpathfuncs_t *handle, flocation_t *loc, const char *filename, void *hashedresult)
|
|
{
|
|
vfsw32path_t *wp = (void*)handle;
|
|
char netpath[MAX_OSPATH];
|
|
wchar_t wide[MAX_OSPATH];
|
|
qofs_t len;
|
|
HANDLE h;
|
|
DWORD attr;
|
|
|
|
|
|
if (hashedresult && (void *)hashedresult != wp)
|
|
return FF_NOTFOUND;
|
|
|
|
/*
|
|
if (!static_registered)
|
|
{ // if not a registered version, don't ever go beyond base
|
|
if ( strchr (filename, '/') || strchr (filename,'\\'))
|
|
continue;
|
|
}
|
|
*/
|
|
|
|
// check a file in the directory tree
|
|
snprintf (netpath, sizeof(netpath)-1, "%s/%s", wp->rootpath, filename);
|
|
|
|
if (!WinNT)
|
|
{
|
|
WIN32_FIND_DATAA fda;
|
|
h = FindFirstFileA(netpath, &fda);
|
|
attr = fda.dwFileAttributes;
|
|
len = (h == INVALID_HANDLE_VALUE)?0:qofs_Make(fda.nFileSizeLow, fda.nFileSizeHigh);
|
|
}
|
|
else
|
|
{
|
|
WIN32_FIND_DATAW fdw;
|
|
h = FindFirstFileW(widen(wide, sizeof(wide), netpath), &fdw);
|
|
attr = fdw.dwFileAttributes;
|
|
len = (h == INVALID_HANDLE_VALUE)?0:qofs_Make(fdw.nFileSizeLow, fdw.nFileSizeHigh);
|
|
}
|
|
if (h == INVALID_HANDLE_VALUE)
|
|
{
|
|
// int e = GetLastError();
|
|
// if (e == ERROR_PATH_NOT_FOUND) //then look inside a zip
|
|
return FF_NOTFOUND;
|
|
}
|
|
FindClose(h);
|
|
if (loc)
|
|
{
|
|
loc->len = len;
|
|
loc->offset = 0;
|
|
loc->index = 0;
|
|
Q_strncpyz(loc->rawname, netpath, sizeof(loc->rawname));
|
|
}
|
|
if (attr & FILE_ATTRIBUTE_DIRECTORY)
|
|
return FF_DIRECTORY; //not actually openable.
|
|
return FF_FOUND;
|
|
}
|
|
static void QDECL VFSW32_ReadFile(searchpathfuncs_t *handle, flocation_t *loc, char *buffer)
|
|
{
|
|
// vfsw32path_t *wp = handle;
|
|
|
|
FILE *f;
|
|
wchar_t wide[MAX_OSPATH];
|
|
if (!WinNT)
|
|
f = fopen(loc->rawname, "rb");
|
|
else
|
|
f = _wfopen(widen(wide, sizeof(wide), loc->rawname), L"rb");
|
|
if (!f) //err...
|
|
return;
|
|
fseek(f, loc->offset, SEEK_SET);
|
|
fread(buffer, 1, loc->len, f);
|
|
fclose(f);
|
|
}
|
|
static int QDECL VFSW32_EnumerateFiles (searchpathfuncs_t *handle, const char *match, int (QDECL *func)(const char *, qofs_t, time_t mtime, void *, searchpathfuncs_t *spath), void *parm)
|
|
{
|
|
vfsw32path_t *wp = (vfsw32path_t*)handle;
|
|
return Sys_EnumerateFiles(wp->rootpath, match, func, parm, handle);
|
|
}
|
|
|
|
static qboolean QDECL VFSW32_RenameFile(searchpathfuncs_t *handle, const char *oldfname, const char *newfname)
|
|
{
|
|
vfsw32path_t *wp = (vfsw32path_t*)handle;
|
|
char oldsyspath[MAX_OSPATH];
|
|
char newsyspath[MAX_OSPATH];
|
|
if (fs_readonly)
|
|
return false;
|
|
snprintf (oldsyspath, sizeof(oldsyspath)-1, "%s/%s", wp->rootpath, oldfname);
|
|
snprintf (newsyspath, sizeof(newsyspath)-1, "%s/%s", wp->rootpath, newfname);
|
|
return Sys_Rename(oldsyspath, newsyspath);
|
|
}
|
|
static qboolean QDECL VFSW32_RemoveFile(searchpathfuncs_t *handle, const char *filename)
|
|
{
|
|
vfsw32path_t *wp = (vfsw32path_t*)handle;
|
|
char syspath[MAX_OSPATH];
|
|
if (fs_readonly)
|
|
return false;
|
|
snprintf (syspath, sizeof(syspath)-1, "%s/%s", wp->rootpath, filename);
|
|
return Sys_remove(syspath);
|
|
}
|
|
static qboolean QDECL VFSW32_MkDir(searchpathfuncs_t *handle, const char *filename)
|
|
{
|
|
vfsw32path_t *wp = (vfsw32path_t*)handle;
|
|
char syspath[MAX_OSPATH];
|
|
if (fs_readonly)
|
|
return false;
|
|
snprintf (syspath, sizeof(syspath)-1, "%s/%s", wp->rootpath, filename);
|
|
Sys_mkdir(syspath);
|
|
return true;
|
|
}
|
|
|
|
searchpathfuncs_t *QDECL VFSW32_OpenPath(vfsfile_t *mustbenull, const char *desc)
|
|
{
|
|
vfsw32path_t *np;
|
|
int dlen = strlen(desc);
|
|
if (mustbenull)
|
|
return NULL;
|
|
np = Z_Malloc(sizeof(*np) + dlen);
|
|
if (np)
|
|
{
|
|
wchar_t wide[MAX_OSPATH];
|
|
memcpy(np->rootpath, desc, dlen+1);
|
|
if (!WinNT)
|
|
np->changenotification = FindFirstChangeNotificationA(np->rootpath, true, FILE_NOTIFY_CHANGE_FILE_NAME);
|
|
else
|
|
np->changenotification = FindFirstChangeNotificationW(widen(wide, sizeof(wide), np->rootpath), true, FILE_NOTIFY_CHANGE_FILE_NAME);
|
|
}
|
|
|
|
np->pub.fsver = FSVER;
|
|
np->pub.ClosePath = VFSW32_ClosePath;
|
|
np->pub.BuildHash = VFSW32_BuildHash;
|
|
np->pub.FindFile = VFSW32_FLocate;
|
|
np->pub.ReadFile = VFSW32_ReadFile;
|
|
np->pub.EnumerateFiles = VFSW32_EnumerateFiles;
|
|
np->pub.OpenVFS = VFSW32_OpenVFS;
|
|
np->pub.PollChanges = VFSW32_PollChanges;
|
|
|
|
np->pub.RenameFile = VFSW32_RenameFile;
|
|
np->pub.RemoveFile = VFSW32_RemoveFile;
|
|
np->pub.MkDir = VFSW32_MkDir;
|
|
|
|
return &np->pub;
|
|
}
|
|
#endif |