nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

quiet some Windows warnings; fix fatal link error

Browse Source
This commit is contained in:
nhmall
2024-02-15 21:57:36 -05:00
parent 437a403286
commit b6ad791f5f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/windows/Makefile.nmake
+1 -1
View File
@@ -1138,7 +1138,7 @@ guilflags = $(lflags) -subsystem:windows,$(EXEVER)
# basic subsystem specific libraries, less the C Run-Time # basic subsystem specific libraries, less the C Run-Time
baselibs = kernel32.lib $(optlibs) $(winsocklibs) advapi32.lib gdi32.lib \ baselibs = kernel32.lib $(optlibs) $(winsocklibs) advapi32.lib gdi32.lib \
ole32.lib Shell32.lib ole32.lib Shell32.lib dbghelp.lib
winlibs = $(baselibs) user32.lib comdlg32.lib winspool.lib winlibs = $(baselibs) user32.lib comdlg32.lib winspool.lib
# for Windows applications that use the C Run-Time libraries # for Windows applications that use the C Run-Time libraries
sys/windows/windsys.c
+3 -3
View File
@@ -989,7 +989,7 @@ win32_cr_gettrace(int maxframes, char *out, int outsize){
//XXX check for different flags //XXX check for different flags
if(!SymInitialize(me, NULL, TRUE)){ if(!SymInitialize(me, NULL, TRUE)){
snprintf(buf, BSIZE, "no stack trace: SymInitialize: %d\n", snprintf(buf, BSIZE, "no stack trace: SymInitialize: %d\n",
GetLastError()); (int) GetLastError());
return 1; return 1;
} }
int fcount = CaptureStackBackTrace(0, maxframes,frames,NULL); int fcount = CaptureStackBackTrace(0, maxframes,frames,NULL);
@@ -1016,7 +1016,7 @@ win32_cr_gettrace(int maxframes, char *out, int outsize){
IMAGEHLP_LINE ihl; IMAGEHLP_LINE ihl;
ihl.SizeOfStruct = sizeof(IMAGEHLP_LINE); ihl.SizeOfStruct = sizeof(IMAGEHLP_LINE);
if (SymGetLineFromAddr(me, adr, &disp, &ihl)) { if (SymGetLineFromAddr(me, adr, &disp, &ihl)) {
printf("L=%d\n", ihl.LineNumber); printf("L=%d\n", (int) ihl.LineNumber);
} else { } else {
// 7e/1e7 - no info. May need to call SymLoadModule if we need those addrs // 7e/1e7 - no info. May need to call SymLoadModule if we need those addrs
// BUT probably system code, so we don't care - experiment // BUT probably system code, so we don't care - experiment
@@ -1028,7 +1028,7 @@ win32_cr_gettrace(int maxframes, char *out, int outsize){
// Error 487 (invalid address) seems to mean // Error 487 (invalid address) seems to mean
// "I can't find any info for this address". // "I can't find any info for this address".
tmp = snprintf(buf, BSIZE, "%d %p (error %d)\n", tmp = snprintf(buf, BSIZE, "%d %p (error %d)\n",
x, frames[x], GetLastError()); x, frames[x], (int) GetLastError());
if(swr_add_uricoded(buf, &out, &outsize, mark)) if(swr_add_uricoded(buf, &out, &outsize, mark))
goto finish; goto finish;
} }