summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt6
-rw-r--r--eAthena-8.sln6
-rw-r--r--src/common/plugins.c2
-rw-r--r--src/common/socket.c2
-rw-r--r--src/login_sql/login.c2
-rw-r--r--src/plugins/console.c2
-rw-r--r--src/plugins/console.def11
-rw-r--r--src/plugins/plugin.def (renamed from vcproj-8/plugin.def)0
8 files changed, 27 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0137b69e6..ec9bfc496 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,12 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/01/08
+ * Moved the plugin.def file to the plugins dir and added console.def
+ * Found the reason why the console didn't want to run on windows
+ (Microsoft uses !0 and unix uses 0 in pipe_create)
+ * Commented out a login_log call (sql doesn't implement that function!)
+ * Fixed an old debug message displaying %d instead of a number
+ * Silenced the plugin export messages during startup [ultramage]
* Added a precompiler error when the shutdown defines are not found.
* Added parse_console to the plugin API.
* Added plugin for parsing the console. (working with cygwin)
diff --git a/eAthena-8.sln b/eAthena-8.sln
index f1799933e..3db074fe5 100644
--- a/eAthena-8.sln
+++ b/eAthena-8.sln
@@ -12,6 +12,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-8\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-console", "vcproj-8\plugin-console.vcproj", "{97D96B7A-817F-4610-8EF4-966384850E65}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -39,6 +41,10 @@ Global
{D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
{D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
{D356871D-58E1-450B-967A-E6E9646175AF}.Release|Win32.ActiveCfg = Release|Win32
+ {97D96B7A-817F-4610-8EF4-966384850E65}.Debug|Win32.ActiveCfg = Debug|Win32
+ {97D96B7A-817F-4610-8EF4-966384850E65}.Debug|Win32.Build.0 = Debug|Win32
+ {97D96B7A-817F-4610-8EF4-966384850E65}.Release|Win32.ActiveCfg = Release|Win32
+ {97D96B7A-817F-4610-8EF4-966384850E65}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/common/plugins.c b/src/common/plugins.c
index 4d3849330..09ce15da3 100644
--- a/src/common/plugins.c
+++ b/src/common/plugins.c
@@ -123,7 +123,7 @@ int plugin_event_trigger(char* name)
int export_symbol(void* var, size_t offset)
{
- ShowDebug("export_symbol(0x%x,%d)\n", var,offset);
+ //ShowDebug("export_symbol(0x%x,%d)\n", var,offset);
// add to the end of the list
if( offset < 0 )
diff --git a/src/common/socket.c b/src/common/socket.c
index 3d445d286..3c8396961 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -327,7 +327,7 @@ int make_listen_bind(long ip,int port)
fd = (int)socket( AF_INET, SOCK_STREAM, 0 );
if (fd == INVALID_SOCKET) {
- ShowError("socket() creation failed (code %d)!\n", fd, s_errno);
+ ShowError("socket() creation failed (code %d)!\n", s_errno);
exit(1);
}
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index b1e85a4c3..fbe0acc1d 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -1959,7 +1959,7 @@ int parse_console(char* buf)
sscanf(buf, "%[^\n]", command);
- login_log("Console command :%s" RETCODE, command);
+ //login_log("Console command :%s" RETCODE, command);
if( strcmpi("shutdown", command) == 0 ||
strcmpi("exit", command) == 0 ||
diff --git a/src/plugins/console.c b/src/plugins/console.c
index 41ef434e9..fca087618 100644
--- a/src/plugins/console.c
+++ b/src/plugins/console.c
@@ -26,7 +26,7 @@
}while(0)
#define sleep Sleep
-#define pipe_create(p) ( CreatePipe(&p[PIPE_READ], &p[PIPE_WRITE], NULL, 1) != 0 )
+#define pipe_create(p) (CreatePipe(&p[PIPE_READ], &p[PIPE_WRITE], NULL, 1) == 0)
#define pipe_read(p,data,len) do{ DWORD _b_; ReadFile(p[PIPE_READ], data, len, &_b_, NULL); }while(0)
#define pipe_write(p,data,len) do{ DWORD _b_; WriteFile(p[PIPE_WRITE], data, len, &_b_, NULL); }while(0)
#define pipe_close(p,side) CloseHandle(p[side])
diff --git a/src/plugins/console.def b/src/plugins/console.def
new file mode 100644
index 000000000..a47800bef
--- /dev/null
+++ b/src/plugins/console.def
@@ -0,0 +1,11 @@
+EXPORTS
+ ; common exports
+ plugin_info DATA
+ plugin_event_table DATA
+ plugin_call_table DATA
+
+ ; console-specific exports
+ console_init
+ console_final
+ console_start
+ console_stop
diff --git a/vcproj-8/plugin.def b/src/plugins/plugin.def
index 6117bedc6..6117bedc6 100644
--- a/vcproj-8/plugin.def
+++ b/src/plugins/plugin.def