From 13f6cc1180e976eaa7a4b1c28f87e4ec6e29a986 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 26 Nov 2018 14:44:19 +0100 Subject: [PATCH] Ref T437, Ref D29 fixed Jenkins build warnings Discussed here: https://swift-project.slack.com/archives/G7GD2UP9C/p1543238741010300 The manual changed applied on the original FSUIPC SDK file were reveretd b adding a newer version --- src/plugins/simulator/fsuipc64/IPCuser64.c | 10 +++++----- src/plugins/simulator/fsuipc64/IPCuser64.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/simulator/fsuipc64/IPCuser64.c b/src/plugins/simulator/fsuipc64/IPCuser64.c index fbcd269dc..402661a54 100644 --- a/src/plugins/simulator/fsuipc64/IPCuser64.c +++ b/src/plugins/simulator/fsuipc64/IPCuser64.c @@ -14,7 +14,7 @@ With acknowledgements to Adam Szofran (author of original FS6IPC). #include "IPCuser64.h" #include "FSUIPC_User64.h" -#define FS6IPC_MSGNAME1 "FsasmLib:IPC" +#define FS6IPC_MSGNAME1 L"FsasmLib:IPC" /****************************************************************************** IPC client stuff @@ -63,7 +63,7 @@ void FSUIPC_Close(void) // Start the client // return: TRUE if successful, FALSE otherwise BOOL FSUIPC_Open(DWORD dwFSReq, DWORD *pdwResult) -{ char szName[MAX_PATH]; +{ wchar_t szName[MAX_PATH]; static int nTry = 0; BOOL fWideFS = FALSE; int i = 0; @@ -77,11 +77,11 @@ BOOL FSUIPC_Open(DWORD dwFSReq, DWORD *pdwResult) // Clear version information, so know when connected FSUIPC_Version = FSUIPC_FS_Version = 0; - m_hWnd = FindWindowEx(NULL, NULL, "UIPCMAIN", NULL); + m_hWnd = FindWindowEx(NULL, NULL, L"UIPCMAIN", NULL); if (!m_hWnd) { // If there's no UIPCMAIN, we may be using WideClient // which only simulates FS98 - m_hWnd = FindWindowEx(NULL, NULL, "FS98MAIN", NULL); + m_hWnd = FindWindowEx(NULL, NULL, L"FS98MAIN", NULL); fWideFS = TRUE; if (!m_hWnd) { *pdwResult = FSUIPC_ERR_NOFS; @@ -194,7 +194,7 @@ BOOL FSUIPC_Open(DWORD dwFSReq, DWORD *pdwResult) ******************************************************************************/ BOOL FSUIPC_Process(DWORD *pdwResult) -{ DWORD_PTR dwError; +{ DWORD_PTR dwError = 0; DWORD *pdw; F64IPC_READSTATEDATA_HDR *pHdrR; FS6IPC_WRITESTATEDATA_HDR *pHdrW; diff --git a/src/plugins/simulator/fsuipc64/IPCuser64.h b/src/plugins/simulator/fsuipc64/IPCuser64.h index 5788fd4fb..92b080f05 100644 --- a/src/plugins/simulator/fsuipc64/IPCuser64.h +++ b/src/plugins/simulator/fsuipc64/IPCuser64.h @@ -1,4 +1,4 @@ -#include +#include #include "FSUIPC_User64.h"