From 1402054259182402376cac4d8b6ad25aab8593fe Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Fri, 3 Aug 2018 03:37:23 +0200 Subject: [PATCH] fix function names --- Makefile | 4 ++++ src/main.c | 3 ++- src/render_soft.c | 2 +- src/screenshot.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5236281..87476a0 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,9 @@ WINDRES=windres CFLAGS=-DHAVE_LIBPNG -Iinc -Wall -Wl,--enable-stdcall-fixup -O3 -s LIBS=lib/libpng14.a lib/libz.a -lgdi32 -lopengl32 -lwinmm +#CFLAGS=-Iinc -Wall -Wl,--enable-stdcall-fixup -O3 -s +#LIBS=-lgdi32 -lopengl32 -lwinmm + FILES = src/debug.c \ src/main.c \ src/mouse.c \ @@ -18,6 +21,7 @@ FILES = src/debug.c \ all: $(WINDRES) -J rc ddraw.rc ddraw.rc.o $(CC) $(CFLAGS) -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) +# $(CC) $(CFLAGS) -nostdlib -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) -lkernel32 -luser32 -lmsvcrt clean: rm -f ddraw.dll diff --git a/src/main.c b/src/main.c index ff12519..a295832 100644 --- a/src/main.c +++ b/src/main.c @@ -48,6 +48,7 @@ int WindowPosX; int WindowPosY; char SettingsIniPath[MAX_PATH]; +//BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) { switch (dwReason) @@ -983,7 +984,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk char cwd[MAX_PATH]; char tmp[256]; GetCurrentDirectoryA(sizeof(cwd), cwd); - snprintf(SettingsIniPath, sizeof(SettingsIniPath), "%s\\ddraw.ini", cwd); + _snprintf(SettingsIniPath, sizeof(SettingsIniPath), "%s\\ddraw.ini", cwd); if(GetFileAttributes(SettingsIniPath) == 0xFFFFFFFF) { diff --git a/src/render_soft.c b/src/render_soft.c index 9706a95..758840f 100644 --- a/src/render_soft.c +++ b/src/render_soft.c @@ -63,7 +63,7 @@ DWORD WINAPI render_soft_main(void) if (!ddraw->windowed) PostMessage(ddraw->hWnd, WM_AUTORENDERER, 0, 0); - snprintf( + _snprintf( warningText, sizeof(warningText), "-WARNING- Using slow software rendering, please update your graphics card driver (%s)", strlen(OpenglVersion) > 10 ? "" : OpenglVersion); diff --git a/src/screenshot.c b/src/screenshot.c index a21b92f..774ee1c 100644 --- a/src/screenshot.c +++ b/src/screenshot.c @@ -55,7 +55,7 @@ BOOL screenshot(struct IDirectDrawSurfaceImpl *src) } strftime(str_time, 64, "%Y-%m-%d-%H_%M_%S", localtime(&t)); - snprintf(filename, 128, "%s-%s.png", title, str_time); + _snprintf(filename, 128, "%s-%s.png", title, str_time); if(!src || !src->palette) {