Projekt

Allgemein

Profil

Herunterladen (19 KB)

Bug #231 » 0001-Consistently-use-GWENHYWFAR_CB-in-callback-decls-and.patch

Patch to fix all GWENHYWFAR_CB build errors on Windows. - jralls@ceridwen.us, 11.02.2021 22:05

Unterschiede anzeigen:

src/gui/gui_be.h
* Please see @ref GWEN_Gui_MessageBox for details.
*
*/
typedef int (*GWEN_GUI_MESSAGEBOX_FN)(GWEN_GUI *gui,
typedef int GWENHYWFAR_CB(*GWEN_GUI_MESSAGEBOX_FN)(GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
......
* Please see @ref GWEN_Gui_InputBox for details.
*
*/
typedef int (*GWEN_GUI_INPUTBOX_FN)(GWEN_GUI *gui,
typedef int GWENHYWFAR_CB(*GWEN_GUI_INPUTBOX_FN)(GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
......
* Please see @ref GWEN_Gui_ShowBox for details.
*
*/
typedef uint32_t (*GWEN_GUI_SHOWBOX_FN)(GWEN_GUI *gui,
typedef uint32_t GWENHYWFAR_CB(*GWEN_GUI_SHOWBOX_FN)(GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
......
* Please see @ref GWEN_Gui_HideBox for details.
*
*/
typedef void (*GWEN_GUI_HIDEBOX_FN)(GWEN_GUI *gui, uint32_t id);
typedef void GWENHYWFAR_CB(*GWEN_GUI_HIDEBOX_FN)(GWEN_GUI *gui, uint32_t id);
/**
* Please see @ref GWEN_Gui_ProgressStart for details.
*
*/
typedef uint32_t (*GWEN_GUI_PROGRESS_START_FN)(GWEN_GUI *gui,
typedef uint32_t GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_START_FN)(GWEN_GUI *gui,
uint32_t progressFlags,
const char *title,
const char *text,
......
* Please see @ref GWEN_Gui_ProgressAdvance for details.
*
*/
typedef int (*GWEN_GUI_PROGRESS_ADVANCE_FN)(GWEN_GUI *gui,
typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_ADVANCE_FN)(GWEN_GUI *gui,
uint32_t id,
uint64_t progress);
......
* Please see @ref GWEN_Gui_ProgressSetTotal for details.
*
*/
typedef int (*GWEN_GUI_PROGRESS_SETTOTAL_FN)(GWEN_GUI *gui,
typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_SETTOTAL_FN)(GWEN_GUI *gui,
uint32_t id,
uint64_t total);
......
* Please see @ref GWEN_Gui_ProgressLog for details.
*
*/
typedef int (*GWEN_GUI_PROGRESS_LOG_FN)(GWEN_GUI *gui,
typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_LOG_FN)(GWEN_GUI *gui,
uint32_t id,
GWEN_LOGGER_LEVEL level,
const char *text);
......
* Please see @ref GWEN_Gui_ProgressEnd for details.
*
*/
typedef int (*GWEN_GUI_PROGRESS_END_FN)(GWEN_GUI *gui, uint32_t id);
typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_END_FN)(GWEN_GUI *gui, uint32_t id);
/*@}*/
src/gui/gui_dialogs.c
int GWEN_Gui_ShowProgress(GWEN_PROGRESS_DATA *pd)
int GWENHYWFAR_CB GWEN_Gui_ShowProgress(GWEN_PROGRESS_DATA *pd)
{
GWEN_PROGRESS_DATA *highest=NULL;
GWEN_PROGRESS_DATA *t;
......
uint32_t GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
uint32_t progressFlags,
const char *title,
const char *text,
......
int GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid)
int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid)
{
GWEN_PROGRESS_DATA *pd;
/*uint32_t parentPid=0;*/
......
int GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress)
int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress)
{
GWEN_PROGRESS_DATA *pd;
int aborted=0;
......
int GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total)
int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total)
{
GWEN_PROGRESS_DATA *pd;
int aborted=0;
......
int GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
uint32_t pid,
GWEN_LOGGER_LEVEL level,
const char *text)
......
int GWEN_Gui_DialogBased_InputBox(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB GWEN_Gui_DialogBased_InputBox(GWEN_UNUSED GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
......
int GWEN_Gui_DialogBased_MessageBox(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB GWEN_Gui_DialogBased_MessageBox(GWEN_UNUSED GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
......
uint32_t GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
......
void GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id)
void GWENHYWFAR_CB GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id)
{
GWEN_DIALOG *dlg;
src/gui/gui_p.h
static void GWEN_Gui_DialogBased_CheckShow(GWEN_GUI *gui, GWEN_PROGRESS_DATA *pd);
static uint32_t GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
static uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
uint32_t progressFlags,
const char *title,
const char *text,
uint64_t total,
uint32_t guiid);
static int GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid);
static int GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress);
static int GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total);
static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid);
static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress);
static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total);
static int GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
uint32_t pid,
GWEN_LOGGER_LEVEL level,
const char *text);
static int GWEN_Gui_DialogBased_InputBox(GWEN_GUI *gui,
static int GWENHYWFAR_CB GWEN_Gui_DialogBased_InputBox(GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
......
int maxLen,
uint32_t guiid);
static int GWEN_Gui_DialogBased_MessageBox(GWEN_GUI *gui,
static int GWENHYWFAR_CB GWEN_Gui_DialogBased_MessageBox(GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
......
const char *b3,
uint32_t guiid);
static uint32_t GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
static uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
uint32_t flags,
const char *title,
const char *text,
uint32_t guiid);
static void GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id);
static void GWENHYWFAR_CB GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id);
static int GWENHYWFAR_CB GWEN_Gui_Internal_GetSyncIo(GWEN_GUI *gui, const char *url,
const char *defaultProto,
src/gui/nogui.c
void _freeData(GWEN_UNUSED void *bp, void *p)
void GWENHYWFAR_CB _freeData(GWEN_UNUSED void *bp, void *p)
{
GWEN_GUI_NOGUI *xgui;
......
int _messageBox(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _messageBox(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t flags,
GWEN_UNUSED const char *title,
GWEN_UNUSED const char *text,
......
int _inputBox(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _inputBox(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t flags,
GWEN_UNUSED const char *title,
GWEN_UNUSED const char *text,
......
uint32_t _showBox(GWEN_UNUSED GWEN_GUI *gui,
uint32_t GWENHYWFAR_CB _showBox(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t flags,
GWEN_UNUSED const char *title,
GWEN_UNUSED const char *text,
......
void _hideBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t id)
void GWENHYWFAR_CB _hideBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t id)
{
}
uint32_t _progressStart(GWEN_UNUSED GWEN_GUI *gui,
uint32_t GWENHYWFAR_CB _progressStart(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t progressFlags,
GWEN_UNUSED const char *title,
GWEN_UNUSED const char *text,
......
int _progressAdvance(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _progressAdvance(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t pid,
GWEN_UNUSED uint64_t progress)
{
......
int _progressSetTotal(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _progressSetTotal(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t pid,
GWEN_UNUSED uint64_t total)
{
......
int _progressLog(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _progressLog(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t pid,
GWEN_UNUSED GWEN_LOGGER_LEVEL level,
GWEN_UNUSED const char *text)
......
int _progressEnd(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _progressEnd(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t pid)
{
return 0;
......
int _print(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _print(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const char *docTitle,
GWEN_UNUSED const char *docType,
GWEN_UNUSED const char *descr,
......
int _getPassword(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _getPassword(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED uint32_t flags,
GWEN_UNUSED const char *token,
GWEN_UNUSED const char *title,
......
int _setPasswordStatus(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _setPasswordStatus(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const char *token,
GWEN_UNUSED const char *pin,
GWEN_UNUSED GWEN_GUI_PASSWORD_STATUS status,
......
int _logHook(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _logHook(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const char *logDomain,
GWEN_UNUSED GWEN_LOGGER_LEVEL priority,
GWEN_UNUSED const char *s)
......
int _waitForSockets(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _waitForSockets(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED GWEN_SOCKET_LIST2 *readSockets,
GWEN_UNUSED GWEN_SOCKET_LIST2 *writeSockets,
GWEN_UNUSED int msecs,
......
int _checkCert(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _checkCert(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const GWEN_SSLCERTDESCR *cert,
GWEN_UNUSED GWEN_SYNCIO *sio,
GWEN_UNUSED uint32_t guiid)
......
int _keyDataFromTextOpenSsl(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _keyDataFromTextOpenSsl(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const char *text,
GWEN_UNUSED unsigned char *buffer,
GWEN_UNUSED unsigned int bufLength)
......
int _execDialog(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _execDialog(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED GWEN_DIALOG *dlg,
GWEN_UNUSED uint32_t guiid)
{
......
int _openDialog(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _openDialog(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED GWEN_DIALOG *dlg,
GWEN_UNUSED uint32_t guiid)
{
......
int _closeDialog(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _closeDialog(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED GWEN_DIALOG *dlg)
{
return 0;
......
int _runDialog(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _runDialog(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED GWEN_DIALOG *dlg,
GWEN_UNUSED int timeout)
{
......
int _readDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _readDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const char *groupName,
GWEN_UNUSED const char *altName,
GWEN_UNUSED GWEN_DB_NODE **pDb)
......
int _writeDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _writeDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const char *groupName,
GWEN_UNUSED GWEN_DB_NODE *db)
{
......
int _getFilename(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _getFilename(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const char *caption,
GWEN_UNUSED GWEN_GUI_FILENAME_TYPE fnt,
GWEN_UNUSED uint32_t flags,
......
int _getSyncio(GWEN_UNUSED GWEN_GUI *gui,
int GWENHYWFAR_CB _getSyncio(GWEN_UNUSED GWEN_GUI *gui,
GWEN_UNUSED const char *url,
GWEN_UNUSED const char *defaultProto,
GWEN_UNUSED int defaultPort,
test/testthread.c
void _freeData(GWEN_UNUSED void *bp, void *p)
void GWENHYWFAR_CB _freeData(GWEN_UNUSED void *bp, void *p)
{
TEST_THREAD *xthr;
......
void _threadRun_cb(GWEN_UNUSED GWEN_THREAD *thr)
void GWENHYWFAR_CB _threadRun_cb(GWEN_UNUSED GWEN_THREAD *thr)
{
GWEN_GUI *gui;
TEST_THREAD *xthr;
    (1-1/1)