--- Daodan/src/bink-proxy.c 2014/04/02 00:48:54 990 +++ Daodan/src/bink-proxy.c 2014/04/07 10:33:27 994 @@ -1,7 +1,7 @@ #include "bink-proxy.h" #include -#include "Daodan_Utility.h" +#include "Patches/Utility.h" static HMODULE realbink = 0; @@ -53,7 +53,7 @@ void __stdcall BinkProxyInit() { DWORD err; - DDrStartupMessage("Daodan: Loading real Bink DLL"); + STARTUPMESSAGE("Loading real Bink DLL", 0); realbink = LoadLibrary("realbink.dll"); err = GetLastError(); if(realbink) @@ -62,122 +62,122 @@ void __stdcall BinkProxyInit() BinkBufferBlit = (BINKBUFFERBLIT)GetProcAddress(realbink, "_BinkBufferBlit@12"); if(!BinkBufferBlit) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkBufferBlit"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkBufferBlit", 0); goto exit_err; } BinkBufferClose = (BINKBUFFERCLOSE)GetProcAddress(realbink, "_BinkBufferClose@4"); if(!BinkBufferClose) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkBufferClose"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkBufferClose", 0); goto exit_err; } BinkBufferLock = (BINKBUFFERLOCK)GetProcAddress(realbink, "_BinkBufferLock@4"); if(!BinkBufferLock) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkBufferLock"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkBufferLock", 0); goto exit_err; } BinkBufferOpen = (BINKBUFFEROPEN)GetProcAddress(realbink, "_BinkBufferOpen@16"); if(!BinkBufferOpen) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkBufferOpen"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkBufferOpen", 0); goto exit_err; } BinkBufferSetOffset = (BINKBUFFERSETOFFSET)GetProcAddress(realbink, "_BinkBufferSetOffset@12"); if(!BinkBufferSetOffset) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkBufferSetOffset"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkBufferSetOffset", 0); goto exit_err; } BinkBufferUnlock = (BINKBUFFERUNLOCK)GetProcAddress(realbink, "_BinkBufferUnlock@4"); if(!BinkBufferUnlock) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkBufferUnlock"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkBufferUnlock", 0); goto exit_err; } BinkClose = (BINKCLOSE)GetProcAddress(realbink, "_BinkClose@4"); if(!BinkClose) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkClose"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkClose", 0); goto exit_err; } BinkCopyToBuffer = (BINKCOPYTOBUFFER)GetProcAddress(realbink, "_BinkCopyToBuffer@28"); if(!BinkCopyToBuffer) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkCopyToBuffer"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkCopyToBuffer", 0); goto exit_err; } BinkDoFrame = (BINKDOFRAME)GetProcAddress(realbink, "_BinkDoFrame@4"); if(!BinkDoFrame) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkDoFrame"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkDoFrame", 0); goto exit_err; } BinkGetRects = (BINKGETRECTS)GetProcAddress(realbink, "_BinkGetRects@8"); if(!BinkGetRects) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkGetRects"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkGetRects", 0); goto exit_err; } BinkNextFrame = (BINKNEXTFRAME)GetProcAddress(realbink, "_BinkNextFrame@4"); if(!BinkNextFrame) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkNextFrame"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkNextFrame", 0); goto exit_err; } BinkOpen = (BINKOPEN)GetProcAddress(realbink, "_BinkOpen@8"); if(!BinkOpen) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkOpen"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkOpen", 0); goto exit_err; } BinkOpenDirectSound = (BINKOPENDIRECTSOUND)GetProcAddress(realbink, "_BinkOpenDirectSound@4"); if(!BinkOpenDirectSound) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkOpenDirectSound"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkOpenDirectSound", 0); goto exit_err; } BinkService = (BINKSERVICE)GetProcAddress(realbink, "_BinkService@4"); if(!BinkService) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkService"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkService", 0); goto exit_err; } BinkSetIOSize = (BINKSETIOSIZE)GetProcAddress(realbink, "_BinkSetIOSize@4"); if(!BinkSetIOSize) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkSetIOSize"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkSetIOSize", 0); goto exit_err; } BinkSetSoundOnOff = (BINKSETSOUNDONOFF)GetProcAddress(realbink, "_BinkSetSoundOnOff@8"); if(!BinkSetSoundOnOff) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkSetSoundOnOff"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkSetSoundOnOff", 0); goto exit_err; } BinkSetSoundSystem = (BINKSETSOUNDSYSTEM)GetProcAddress(realbink, "_BinkSetSoundSystem@8"); if(!BinkSetSoundSystem) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkSetSoundSystem"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkSetSoundSystem", 0); goto exit_err; } BinkSetVolume = (BINKSETVOLUME)GetProcAddress(realbink, "_BinkSetVolume@8"); if(!BinkSetVolume) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkSetVolume"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkSetVolume", 0); goto exit_err; } BinkWait = (BINKWAIT)GetProcAddress(realbink, "_BinkWait@4"); if(!BinkWait) { - DDrStartupMessage("Daodan: Retrieving function address from real Bink DLL failed for: BinkWait"); + STARTUPMESSAGE("Retrieving function address from real Bink DLL failed for: BinkWait", 0); goto exit_err; } } else { char msg[100]; FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, msg, 100, NULL); - DDrStartupMessage("Daodan: Loading real Bink DLL failed with error %i: %s", err, msg); + STARTUPMESSAGE("Loading real Bink DLL failed with error %i: %s", err, msg); } }