amy/upiwin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tied resource initialization into the main control flow

Browse Source
This commit is contained in:
Amy G. Bowersox 2021-08-29 18:21:51 -06:00
parent 751c0674d1
commit 9348673adb
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.c
View File

@ -25,6 +25,7 @@
#include "config.h" #include "config.h"
#include "gpio.h" #include "gpio.h"
#include "fbinit.h" #include "fbinit.h"
#include "resources.h"
#include "fontengine.h" #include "fontengine.h"
#include "time_func.h" #include "time_func.h"
#include "ep_init.h" #include "ep_init.h"
@ -41,6 +42,8 @@ int main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
else if (hr != S_OK) else if (hr != S_OK)
return EXIT_SUCCESS; return EXIT_SUCCESS;
if (FAILED(Rsrc_setup()))
return EXIT_FAILURE;
if (FAILED(Fb_setup())) if (FAILED(Fb_setup()))
return EXIT_FAILURE; return EXIT_FAILURE;
if (FAILED(FontEng_setup())) if (FAILED(FontEng_setup()))

2
src/resources.c
View File

@ -61,7 +61,7 @@ static void rsrc_cleanup(void)
sysresource = NULL; sysresource = NULL;
} }
HRESULT Rsrc_init(void) HRESULT Rsrc_setup(void)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
zip_source_t *syssource; zip_source_t *syssource;

2
src/resources.h
View File

@ -27,6 +27,6 @@ typedef HANDLE HRSRC; /* handle to resource */
extern HRESULT Rsrc_init(void); extern HRESULT Rsrc_setup(void);
#endif /* __RESOURCES_H_INCLUDED */ #endif /* __RESOURCES_H_INCLUDED */