summaryrefslogtreecommitdiffstats
path: root/docs/release/src/osd/winui/winui.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release/src/osd/winui/winui.cpp')
-rw-r--r--docs/release/src/osd/winui/winui.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/docs/release/src/osd/winui/winui.cpp b/docs/release/src/osd/winui/winui.cpp
index 7285c53666f..4947b50524b 100644
--- a/docs/release/src/osd/winui/winui.cpp
+++ b/docs/release/src/osd/winui/winui.cpp
@@ -1178,14 +1178,14 @@ HICON LoadIconFromFile(const char *iconname)
sprintf(tmpStr, "%s/icons.zip", s1);
sprintf(tmpIcoName, "%s.ico", iconname);
- if (util::archive_file::open_zip(tmpStr, zip) == util::archive_file::error::NONE)
+ if (!util::archive_file::open_zip(tmpStr, zip))
{
if (zip->search(tmpIcoName, false) >= 0)
{
bufferPtr = (PBYTE)malloc(zip->current_uncompressed_length());
if (bufferPtr)
{
- if (zip->decompress(bufferPtr, zip->current_uncompressed_length()) == util::archive_file::error::NONE)
+ if (!zip->decompress(bufferPtr, zip->current_uncompressed_length()))
hIcon = FormatICOInMemoryToHICON(bufferPtr, zip->current_uncompressed_length());
free(bufferPtr);
@@ -1198,14 +1198,14 @@ HICON LoadIconFromFile(const char *iconname)
sprintf(tmpStr, "%s/icons.7z", s1);
sprintf(tmpIcoName, "%s.ico", iconname);
- if (util::archive_file::open_7z(tmpStr, zip) == util::archive_file::error::NONE)
+ if (!util::archive_file::open_7z(tmpStr, zip))
{
if (zip->search(tmpIcoName, false) >= 0)
{
bufferPtr = (PBYTE)malloc(zip->current_uncompressed_length());
if (bufferPtr)
{
- if (zip->decompress(bufferPtr, zip->current_uncompressed_length()) == util::archive_file::error::NONE)
+ if (!zip->decompress(bufferPtr, zip->current_uncompressed_length()))
hIcon = FormatICOInMemoryToHICON(bufferPtr, zip->current_uncompressed_length());
free(bufferPtr);
@@ -5293,7 +5293,6 @@ static void MamePlayBackGame()
if (CommonFileDialog(GetOpenFileName, filename, FILETYPE_INPUT_FILES))
{
- osd_file::error fileerr;
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
char bare_fname[_MAX_FNAME];
@@ -5310,8 +5309,8 @@ static void MamePlayBackGame()
path[strlen(path)-1] = 0; // take off trailing back slash
emu_file pPlayBack(MameUIGlobal().input_directory(), OPEN_FLAG_READ);
- fileerr = pPlayBack.open(string(fname));
- if (fileerr != osd_file::error::NONE)
+ std::error_condition fileerr = pPlayBack.open(string(fname));
+ if (fileerr)
{
MameMessageBox("Could not open '%s' as a valid input file.", filename);
return;
@@ -5413,8 +5412,8 @@ static void MameLoadState()
}
#endif // MESS
emu_file pSaveState(MameUIGlobal().state_directory(), OPEN_FLAG_READ);
- osd_file::error fileerr = pSaveState.open(string(state_fname));
- if (fileerr != osd_file::error::NONE)
+ std::error_condition fileerr = pSaveState.open(string(state_fname));
+ if (fileerr)
{
MameMessageBox("Could not open '%s' as a valid savestate file.", filename);
return;