80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1388 from ts-korhonen/master

Browse Source 
Fixes to CMake/msvc/clang builds and debug builds
This commit is contained in:
Miran Grča
2021-04-21 21:43:49 +02:00
committed by GitHub
parent b0870d5055 90ccb754fb
commit fbe7893b80
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/win/CMakeLists.txt
View File

@@ -30,6 +30,9 @@ if(MSVC)
target_sources(86Box PRIVATE 86Box.manifest) target_sources(86Box PRIVATE 86Box.manifest)
target_sources(plat PRIVATE win_opendir.c) target_sources(plat PRIVATE win_opendir.c)
# Append null to resource strings (fixes file dialogs)
set_property(SOURCE 86Box.rc PROPERTY COMPILE_FLAGS -n)
endif() endif()
if(DINPUT) if(DINPUT)

5
src/win/win_opendir.c
View File

@@ -17,8 +17,6 @@
* Copyright 1998-2007 MicroWalt Corporation * Copyright 1998-2007 MicroWalt Corporation
* Copyright 2017 Fred N. van Kempen * Copyright 2017 Fred N. van Kempen
*/ */
#define UNICODE
#include <windows.h>
#include <io.h> #include <io.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
@@ -158,10 +156,11 @@ readdir(DIR *p)
default: /* regular entry. */ default: /* regular entry. */
#ifdef UNICODE #ifdef UNICODE
wcsncpy(p->dent.d_name, ffp->name, MAXNAMLEN+1); wcsncpy(p->dent.d_name, ffp->name, MAXNAMLEN+1);
p->dent.d_reclen = (char)wcslen(p->dent.d_name);
#else #else
strncpy(p->dent.d_name, ffp->name, MAXNAMLEN+1); strncpy(p->dent.d_name, ffp->name, MAXNAMLEN+1);
p->dent.d_reclen = (char)strlen(p->dent.d_name);
#endif #endif
p->dent.d_reclen = (char) wcslen(p->dent.d_name);
} }
/* Read next entry. */ /* Read next entry. */

2
src/win/win_settings.c
View File

@@ -5060,7 +5060,7 @@ static BOOL
win_settings_categories_init_columns(HWND hdlg) win_settings_categories_init_columns(HWND hdlg)
{ {
LVCOLUMN lvc; LVCOLUMN lvc;
int iCol; int iCol = 0;
HWND hwndList = GetDlgItem(hdlg, IDC_SETTINGSCATLIST); HWND hwndList = GetDlgItem(hdlg, IDC_SETTINGSCATLIST);
lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;