diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 00bb93f2..f207115f 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -18,7 +18,6 @@ #include "../exdll/exdll.h" #undef popstring - static int popstring(char *str) { stack_t *th; @@ -451,7 +450,7 @@ char * WINAPI myGetProfileStringDup(LPCTSTR lpAppName, LPCTSTR lpKeyName) return NULL; } -bool ReadSettings(void) { +int ReadSettings(void) { static char szField[25]; int nIdx, nCtrlIdx; @@ -642,8 +641,7 @@ bool ReadSettings(void) { } } - - return true; + return nNumFields; } @@ -906,7 +904,7 @@ int createCfgDlg() DWORD dwExStyle; } ClassTable[] = { { "STATIC", // FIELD_LABEL - DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_NOPREFIX, + DEFAULT_STYLES /*| WS_TABSTOP*/, WS_EX_TRANSPARENT }, { "STATIC", // FIELD_ICON DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_ICON, @@ -1260,6 +1258,12 @@ extern "C" void __declspec(dllexport) show(HWND hwndParent, int string_size, showCfgDlg(); } +#ifdef _DEBUG +#ifndef DEBUG +#define DEBUG +#endif +#endif + #ifdef DEBUG extern "C" BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) #else diff --git a/Contrib/InstallOptions/io.dsp b/Contrib/InstallOptions/io.dsp index e749e077..4e033e85 100644 --- a/Contrib/InstallOptions/io.dsp +++ b/Contrib/InstallOptions/io.dsp @@ -68,6 +68,7 @@ LINK32=link.exe # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "INSTOPTDLL_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "INSTOPTDLL_EXPORTS" /YX /FD /GZ /c @@ -80,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"" /dll /debug /machine:I386 /out:"..\..\Plugins\InstallOptions.dll" /pdbtype:sept !ENDIF diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 600516f3..b1f51a1a 100644 Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ