Merging revisions 1-HEAD of http://192.168.11.7/svn/saccubus/branches/20091208_vhook_...

git-svn-id: http://192.168.11.7/svn/saccubus/trunk@419 c066991c-cf13-ec4a-a49a-846e61667af5

diff --git a/vhook/chat/chat_slot.c b/vhook/chat/chat_slot.c
index a04d902..6e3dd7b 100644 (file)
--- a/vhook/chat/chat_slot.c
+++ b/vhook/chat/chat_slot.c
@@ -53,7 +53,7 @@ void deleteChatSlotFromIndex(CHAT_SLOT* slot,int index){
 /*\r
  * \83X\83\8d\83b\83g\82É\92Ç\89Á\82·\82é\81B\r
  */\r
-void addChatSlot(DATA* data,CHAT_SLOT* slot,CHAT_ITEM* item,int video_width,int video_height){\r
+void addChatSlot(COMMDATA* data,CHAT_SLOT* slot,CHAT_ITEM* item,int video_width,int video_height){\r
        //\82à\82¤\8c©\82¹\82ç\82ê\82½\81B\r
        item->showed = TRUE;\r
        if(slot->max_item <= 0){\r

diff --git a/vhook/chat/chat_slot.h b/vhook/chat/chat_slot.h
index 6693bdd..120c6e5 100644 (file)
--- a/vhook/chat/chat_slot.h
+++ b/vhook/chat/chat_slot.h
@@ -26,7 +26,7 @@ struct CHAT_SLOT{
 int initChatSlot(FILE* log,CHAT_SLOT* slot,int max_slot,CHAT* chat);\r
 void closeChatSlot(CHAT_SLOT* slot);\r
 //\92Ç\89Á\81A\8dí\8f\9c\r
-void addChatSlot(DATA* data,CHAT_SLOT* slot,CHAT_ITEM* item,int video_width,int video_height);\r
+void addChatSlot(COMMDATA* data,CHAT_SLOT* slot,CHAT_ITEM* item,int video_width,int video_height);\r
 void deleteChatSlot(CHAT_SLOT* slot,CHAT_SLOT_ITEM* item);\r
 void deleteChatSlotFromIndex(CHAT_SLOT* slot,int index);\r
 \r

diff --git a/vhook/chat/process_chat.c b/vhook/chat/process_chat.c
index 32fbfe2..db2759c 100644 (file)
--- a/vhook/chat/process_chat.c
+++ b/vhook/chat/process_chat.c
@@ -11,10 +11,10 @@ void drawComment(SDL_Surface* surf,CHAT_SLOT* slot,int now_vpos);
 /**\r
  * \83R\83\81\83\93\83g\82ð\95`\89æ\82·\82é\81B\r
  */\r
-int chat_process(DATA* data,SDL_Surface* surf,const int now_vpos){\r
+int chat_process(COMMDATA* data,SDL_Surface* surf,const int now_vpos){\r
        CHAT* chat = &data->chat;\r
        CHAT_SLOT* slot = &data->slot;\r
-       FILE* log = data->log;\r
+       FILE* log = data->common->log;\r
        /*\8c©\82¹\82È\82¢\82à\82Ì\82ð\8dí\8f\9c*/\r
        CHAT_SLOT_ITEM* slot_item;\r
        CHAT_ITEM* chat_item;\r

diff --git a/vhook/chat/process_chat.h b/vhook/chat/process_chat.h
index dd48e27..469b881 100644 (file)
--- a/vhook/chat/process_chat.h
+++ b/vhook/chat/process_chat.h
@@ -4,7 +4,7 @@
 #include "chat.h"\r
 #include "chat_slot.h"\r
 #include "../main.h"\r
-int chat_process(DATA* data,SDL_Surface* surf,const int now_vpos);\r
+int chat_process(COMMDATA* data,SDL_Surface* surf,const int now_vpos);\r
 int getX(int now_vpos,const CHAT_SLOT_ITEM* item,int video_width);\r
 \r
 #endif /*PROCESS_CHAT_H_*/\r

diff --git a/vhook/comment/com_surface.c b/vhook/comment/com_surface.c
index 8841821..98a8910 100644 (file)
--- a/vhook/comment/com_surface.c
+++ b/vhook/comment/com_surface.c
@@ -11,9 +11,9 @@
 #include "shadow.h"\r
 \r
 \r
-SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str);\r
+SDL_Surface* drawText(COMMDATA* data,int size,int color,Uint16* str);\r
 \r
-SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width,int video_height){\r
+SDL_Surface* makeCommentSurface(COMMDATA* data,const CHAT_ITEM* item,int video_width,int video_height){\r
        Uint16* index = item->str;\r
        Uint16* last = item->str;\r
        SDL_Surface* ret = NULL;\r
@@ -43,26 +43,26 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width
        }\r
        \r
        if(ret->w == 0 || ret->h == 0){\r
-               fprintf(data->log,"[comsurface/make]comment %04d has no char.\n",item->no);\r
-               fflush(data->log);\r
+               fprintf(data->common->log,"[comsurface/make]comment %04d has no char.\n",item->no);\r
+               fflush(data->common->log);\r
                return ret;\r
        }\r
        \r
         /*\r
          * \89e\8f\88\97\9d\r
          */\r
-         int shadow = data->shadow_kind;\r
+         int shadow = data->common->shadow_kind;\r
          if(shadow >= SHADOW_MAX){\r
                shadow = SHADOW_DEFAULT;\r
          }\r
-         ret = (*ShadowFunc[shadow])(ret,item->color == CMD_COLOR_BLACK,data->fontsize_fix);\r
+         ret = (*ShadowFunc[shadow])(ret,item->color == CMD_COLOR_BLACK,data->common->fontsize_fix);\r
 \r
        /*\r
         * \83A\83\8b\83t\83@\92l\82Ì\90Ý\92è\r
         */\r
         if(!data->opaque_comment){\r
                float alpha_t = (((float)(item->no)/(item->chat->max_no)) * 0.4) + 0.6;\r
-               fprintf(data->log,"[comsurface/make]comment %04d set alpha:%5.2f%%.\n",item->no,alpha_t*100);\r
+               fprintf(data->common->log,"[comsurface/make]comment %04d set alpha:%5.2f%%.\n",item->no,alpha_t*100);\r
                setAlpha(ret,alpha_t);\r
         }\r
 \r
@@ -74,7 +74,7 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width
        //double zoomy = 1.0f;\r
        //\8fk\8f¬\r
        \r
-       if(data->fontsize_fix){\r
+       if(data->common->fontsize_fix){\r
                zoomx = (0.5f * (double)video_width) / (double)NICO_WIDTH;\r
                //zoomy = (0.5f * (double)video_height) / (double)NICO_HEIGHT;\r
        }\r
@@ -94,8 +94,8 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width
        //if(zoomx != 1.0f || zoomy != 1.0f){\r
        if(zoomx != 1.0f){\r
                //fprintf(data->log,"[comsurface/make]comment %04d resized.(%5.2f%%,%5.2f%%)\n",item->no,zoomx*100,zoomy*100);\r
-               fprintf(data->log,"[comsurface/make]comment %04d resized.(%5.2f%%)\n",item->no,zoomx*100);\r
-               fflush(data->log);\r
+               fprintf(data->common->log,"[comsurface/make]comment %04d resized.(%5.2f%%)\n",item->no,zoomx*100);\r
+               fflush(data->common->log);\r
                SDL_Surface* tmp = ret;\r
                ret = zoomSurface(tmp,zoomx,zoomx,SMOOTHING_ON);\r
                SDL_FreeSurface(tmp);\r
@@ -107,7 +107,7 @@ SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width
  * \95¶\8e\9a\82ð\95`\89æ\r
  */\r
 \r
-SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str){\r
+SDL_Surface* drawText(COMMDATA* data,int size,int color,Uint16* str){\r
        if(str[0] == '\0'){\r
                return SDL_CreateRGBSurface(    SDL_SRCALPHA | SDL_HWSURFACE | SDL_HWACCEL,\r
                                                                                0,COMMENT_FONT_SIZE[size],32,\r
@@ -148,6 +148,6 @@ SDL_Surface* drawText(DATA* data,int size,int color,Uint16* str){
        SDL_FreeSurface(tmp);\r
        SDL_FreeSurface(fmt);\r
        */\r
-       SDL_Surface* surf = TTF_RenderUNICODE_Blended(data->font[size],str,COMMENT_COLOR[color]);\r
+       SDL_Surface* surf = TTF_RenderUNICODE_Blended(data->common->font[size],str,COMMENT_COLOR[color]);\r
        return surf;\r
 }\r

diff --git a/vhook/comment/com_surface.h b/vhook/comment/com_surface.h
index 52c2759..f5965da 100644 (file)
--- a/vhook/comment/com_surface.h
+++ b/vhook/comment/com_surface.h
@@ -5,7 +5,7 @@
 #include "../chat/chat_slot.h"\r
 #include "../main.h"\r
 \r
-SDL_Surface* makeCommentSurface(DATA* data,const CHAT_ITEM* item,int video_width,int video_height);\r
+SDL_Surface* makeCommentSurface(COMMDATA* data,const CHAT_ITEM* item,int video_width,int video_height);\r
 \r
 \r
 #endif /*COM_SURFACE_H_*/\r

diff --git a/vhook/main.c b/vhook/main.c
index e5b60ea..22fa905 100644 (file)
--- a/vhook/main.c
+++ b/vhook/main.c
@@ -33,12 +33,15 @@ int init(FILE* log){
  */\r
 int initData(DATA* data,FILE* log,const SETTING* setting){\r
        int i;\r
-       data->enable_user_comment = setting->enable_user_comment;\r
-       data->enable_owner_comment = setting->enable_owner_comment;\r
+    data->user_comment.common = data;\r
+    data->owner_comment.common = data;\r
+       data->user_comment.enable = setting->enable_user_comment;\r
+       data->owner_comment.enable = setting->enable_owner_comment;\r
+       data->user_comment.opaque_comment = setting->opaque_comment;\r
+    data->owner_comment.opaque_comment = 1; // \83I\81[\83i\83R\83\81\83\93\83g\82Í\8fí\82É\95s\93§\96¾\r
        data->log = log;\r
        data->fontsize_fix = setting->fontsize_fix;\r
        data->show_video = setting->show_video;\r
-       data->opaque_comment = setting->opaque_comment;\r
        data->shadow_kind = setting->shadow_kind;\r
        data->process_first_called=FALSE;\r
        data->video_length = setting->video_length;\r
@@ -71,17 +74,17 @@ int initData(DATA* data,FILE* log,const SETTING* setting){
        /*\r
         * \83\86\81[\83U\83R\83\81\83\93\83g\r
         */\r
-       if(data->enable_user_comment){\r
+       if(data->user_comment.enable){\r
                fputs("[main/init]User Comment is enabled.\n",log);\r
                //\83R\83\81\83\93\83g\83f\81[\83^\r
-               if(initChat(log,&data->chat,setting->data_user_path,&data->slot,data->video_length)){\r
+               if(initChat(log,&data->user_comment.chat,setting->data_user_path,&data->user_comment.slot,data->video_length)){\r
                        fputs("[main/init]initialized comment.\n",log);\r
                }else{\r
                        fputs("[main/init]failed to initialize comment.",log);\r
                        return FALSE;\r
                }\r
                //\83R\83\81\83\93\83g\83X\83\8d\83b\83g\r
-               if(initChatSlot(log,&data->slot,setting->user_slot_max,&data->chat)){\r
+               if(initChatSlot(log,&data->user_comment.slot,setting->user_slot_max,&data->user_comment.chat)){\r
                        fputs("[main/init]initialized comment slot.\n",log);\r
                }else{\r
                        fputs("[main/init]failed to initialize comment slot.",log);\r
@@ -91,8 +94,23 @@ int initData(DATA* data,FILE* log,const SETTING* setting){
        /*\r
         * \83I\81[\83i\83R\83\81\83\93\83g\r
         */\r
-       if(data->enable_owner_comment){\r
+       if(data->owner_comment.enable){\r
                fputs("[main/init]Owner Comment is enabled.\n",log);\r
+               //\83R\83\81\83\93\83g\83f\81[\83^\r
+               if(initChat(log,&data->owner_comment.chat,setting->data_owner_path,&data->owner_comment.slot,data->video_length)){\r
+                       fputs("[main/init]initialized comment.\n",log);\r
+               }else{\r
+                       fputs("[main/init]failed to initialize comment.",log);\r
+                       return FALSE;\r
+               }\r
+               //\83R\83\81\83\93\83g\83X\83\8d\83b\83g\r
+        // TODO \82Æ\82è\82 \82¦\82¸\8dÅ\91å\90\94\82Í1024\82É\82µ\82Ä\82¨\82­\82ª...\r
+               if(initChatSlot(log,&data->owner_comment.slot,1024,&data->owner_comment.chat)){\r
+                       fputs("[main/init]initialized comment slot.\n",log);\r
+               }else{\r
+                       fputs("[main/init]failed to initialize comment slot.",log);\r
+                       return FALSE;\r
+               }\r
        }\r
        \r
        //\8fI\82í\82è\81B\r
@@ -138,12 +156,14 @@ int main_process(DATA* data,SDL_Surface* surf,const int now_vpos){
 int closeData(DATA* data){\r
        int i;\r
        //\83\86\81[\83U\83R\83\81\83\93\83g\82ª\97L\8cø\82È\82ç\8aJ\95ú\r
-       if(data->enable_user_comment){\r
-               closeChat(&data->chat);\r
-               closeChatSlot(&data->slot);\r
+       if(data->user_comment.enable){\r
+               closeChat(&data->user_comment.chat);\r
+               closeChatSlot(&data->user_comment.slot);\r
        }\r
        //\83I\81[\83i\83R\83\81\83\93\83g\82ª\97L\8cø\82È\82ç\8aJ\95ú\r
-       if(data->enable_owner_comment){\r
+       if(data->owner_comment.enable){\r
+               closeChat(&data->owner_comment.chat);\r
+               closeChatSlot(&data->owner_comment.slot);\r
        }\r
     //\83t\83H\83\93\83g\8aJ\95ú\r
        for(i=0;i<CMD_FONT_MAX;i++){\r

diff --git a/vhook/main.h b/vhook/main.h
index edd0efc..9c200a3 100644 (file)
--- a/vhook/main.h
+++ b/vhook/main.h
@@ -7,23 +7,32 @@
 #include "chat/chat.h"\r
 #include "chat/chat_slot.h"\r
 \r
+struct COMMDATA {\r
+    int enable;\r
+    CHAT chat;\r
+    CHAT_SLOT slot;\r
+    int opaque_comment;\r
+    DATA* common;\r
+};\r
+\r
 struct DATA{\r
        FILE* log;\r
        TTF_Font* font[CMD_FONT_MAX];\r
        SDL_Surface* screen;\r
-       /*\82»\82ê\82¼\82ê\82Ì\83R\83\81\83\93\83g\82É\89\9e\82¶\82½\83f\81[\83^*/\r
-       //\83\86\81[\83U\83R\83\81\83\93\83g\r
-       int enable_user_comment;\r
-       CHAT chat;\r
-       CHAT_SLOT slot;\r
-       //\93\8a\8de\8eÒ\83R\83\81\83\93\83g\r
-       int enable_owner_comment;\r
+//     /*\82»\82ê\82¼\82ê\82Ì\83R\83\81\83\93\83g\82É\89\9e\82¶\82½\83f\81[\83^*/\r
+//     //\83\86\81[\83U\83R\83\81\83\93\83g\r
+//     int enable_user_comment;\r
+//     CHAT chat;\r
+//     CHAT_SLOT slot;\r
+//     //\93\8a\8de\8eÒ\83R\83\81\83\93\83g\r
+//     int enable_owner_comment;\r
+        COMMDATA user_comment;\r
+        COMMDATA owner_comment;\r
        \r
        //\88ê\94Ê\93I\82È\83f\81[\83^\r
        int shadow_kind;\r
        int show_video;\r
        int fontsize_fix;\r
-       int opaque_comment;\r
        int process_first_called;\r
        int video_length;\r
 };\r

diff --git a/vhook/nbproject/Makefile-Debug.mk b/vhook/nbproject/Makefile-Debug.mk
index ad0a0aa..51defea 100644 (file)
--- a/vhook/nbproject/Makefile-Debug.mk
+++ b/vhook/nbproject/Makefile-Debug.mk
@@ -16,15 +16,18 @@ CC=gcc-sjlj.exe
 CCC=g++.exe
 CXX=g++.exe
 FC=
+AS=as.exe
 
 # Macros
-PLATFORM=MinGW-Windows
+CND_PLATFORM=MinGW_sjlj-Windows
+CND_CONF=Debug
+CND_DISTDIR=dist
 
 # Include project Makefile
 include Makefile
 
 # Object Directory
-OBJECTDIR=build/Debug/${PLATFORM}
+OBJECTDIR=build/${CND_CONF}/${CND_PLATFORM}
 
 # Object Files
 OBJECTFILES= \
@@ -49,74 +52,77 @@ CXXFLAGS=
 # Fortran Compiler Flags
 FFLAGS=
 
+# Assembler Flags
+ASFLAGS=
+
 # Link Libraries and Options
 LDLIBSOPTIONS=-lSDL_gfx -lSDLmain -lSDL.dll -lSDL_ttf
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-       ${MAKE}  -f nbproject/Makefile-Debug.mk dist/Debug/${PLATFORM}/nicovideodbg.dll
+       ${MAKE}  -f nbproject/Makefile-Debug.mk dist/Debug/MinGW_sjlj-Windows/nicovideodbg.dll
 
-dist/Debug/${PLATFORM}/nicovideodbg.dll: ${OBJECTFILES}
-       ${MKDIR} -p dist/Debug/${PLATFORM}
-       ${LINK.c} -shared -o dist/Debug/${PLATFORM}/nicovideodbg.dll -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS} 
+dist/Debug/MinGW_sjlj-Windows/nicovideodbg.dll: ${OBJECTFILES}
+       ${MKDIR} -p dist/Debug/MinGW_sjlj-Windows
+       ${LINK.c} -shared -o dist/Debug/${CND_PLATFORM}/nicovideodbg.dll ${OBJECTFILES} ${LDLIBSOPTIONS} 
 
-${OBJECTDIR}/comment/com_surface.o: comment/com_surface.c 
+${OBJECTDIR}/comment/com_surface.o: nbproject/Makefile-${CND_CONF}.mk comment/com_surface.c 
        ${MKDIR} -p ${OBJECTDIR}/comment
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/com_surface.o comment/com_surface.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/com_surface.o comment/com_surface.c
 
-${OBJECTDIR}/chat/process_chat.o: chat/process_chat.c 
+${OBJECTDIR}/chat/process_chat.o: nbproject/Makefile-${CND_CONF}.mk chat/process_chat.c 
        ${MKDIR} -p ${OBJECTDIR}/chat
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/process_chat.o chat/process_chat.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/process_chat.o chat/process_chat.c
 
-${OBJECTDIR}/main.o: main.c 
+${OBJECTDIR}/main.o: nbproject/Makefile-${CND_CONF}.mk main.c 
        ${MKDIR} -p ${OBJECTDIR}
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/main.o main.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/main.o main.c
 
-${OBJECTDIR}/framehook.o: framehook.c 
+${OBJECTDIR}/framehook.o: nbproject/Makefile-${CND_CONF}.mk framehook.c 
        ${MKDIR} -p ${OBJECTDIR}
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/framehook.o framehook.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/framehook.o framehook.c
 
-${OBJECTDIR}/comment/surf_util.o: comment/surf_util.c 
+${OBJECTDIR}/comment/surf_util.o: nbproject/Makefile-${CND_CONF}.mk comment/surf_util.c 
        ${MKDIR} -p ${OBJECTDIR}/comment
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/surf_util.o comment/surf_util.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/surf_util.o comment/surf_util.c
 
-${OBJECTDIR}/chat/chat.o: chat/chat.c 
+${OBJECTDIR}/chat/chat.o: nbproject/Makefile-${CND_CONF}.mk chat/chat.c 
        ${MKDIR} -p ${OBJECTDIR}/chat
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat.o chat/chat.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat.o chat/chat.c
 
-${OBJECTDIR}/comment/shadow.o: comment/shadow.c 
+${OBJECTDIR}/comment/shadow.o: nbproject/Makefile-${CND_CONF}.mk comment/shadow.c 
        ${MKDIR} -p ${OBJECTDIR}/comment
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/shadow.o comment/shadow.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/shadow.o comment/shadow.c
 
-${OBJECTDIR}/chat/chat_slot.o: chat/chat_slot.c 
+${OBJECTDIR}/chat/chat_slot.o: nbproject/Makefile-${CND_CONF}.mk chat/chat_slot.c 
        ${MKDIR} -p ${OBJECTDIR}/chat
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat_slot.o chat/chat_slot.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat_slot.o chat/chat_slot.c
 
-${OBJECTDIR}/process.o: process.c 
+${OBJECTDIR}/process.o: nbproject/Makefile-${CND_CONF}.mk process.c 
        ${MKDIR} -p ${OBJECTDIR}
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/process.o process.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/process.o process.c
 
-${OBJECTDIR}/util.o: util.c 
+${OBJECTDIR}/util.o: nbproject/Makefile-${CND_CONF}.mk util.c 
        ${MKDIR} -p ${OBJECTDIR}
        ${RM} $@.d
-       $(COMPILE.c) -g -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/util.o util.c
+       $(COMPILE.c) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/util.o util.c
 
 # Subprojects
 .build-subprojects:
 
 # Clean Targets
-.clean-conf:
+.clean-conf: ${CLEAN_SUBPROJECTS}
        ${RM} -r build/Debug
-       ${RM} dist/Debug/${PLATFORM}/nicovideodbg.dll
+       ${RM} dist/Debug/MinGW_sjlj-Windows/nicovideodbg.dll
 
 # Subprojects
 .clean-subprojects:

diff --git a/vhook/nbproject/Makefile-Release.mk b/vhook/nbproject/Makefile-Release.mk
index e226430..e9ec5e7 100644 (file)
--- a/vhook/nbproject/Makefile-Release.mk
+++ b/vhook/nbproject/Makefile-Release.mk
@@ -16,15 +16,18 @@ CC=gcc-sjlj.exe
 CCC=g++.exe
 CXX=g++.exe
 FC=
+AS=as.exe
 
 # Macros
-PLATFORM=MinGW-Windows
+CND_PLATFORM=MinGW_sjlj-Windows
+CND_CONF=Release
+CND_DISTDIR=dist
 
 # Include project Makefile
 include Makefile
 
 # Object Directory
-OBJECTDIR=build/Release/${PLATFORM}
+OBJECTDIR=build/${CND_CONF}/${CND_PLATFORM}
 
 # Object Files
 OBJECTFILES= \
@@ -49,74 +52,77 @@ CXXFLAGS=
 # Fortran Compiler Flags
 FFLAGS=
 
+# Assembler Flags
+ASFLAGS=
+
 # Link Libraries and Options
 LDLIBSOPTIONS=-lSDL_gfx -lSDLmain -lSDL.dll -lSDL_ttf
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-       ${MAKE}  -f nbproject/Makefile-Release.mk dist/Release/${PLATFORM}/nicovideo.dll
+       ${MAKE}  -f nbproject/Makefile-Release.mk dist/Release/MinGW_sjlj-Windows/nicovideo.dll
 
-dist/Release/${PLATFORM}/nicovideo.dll: ${OBJECTFILES}
-       ${MKDIR} -p dist/Release/${PLATFORM}
-       ${LINK.c} -shared -o dist/Release/${PLATFORM}/nicovideo.dll -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS} 
+dist/Release/MinGW_sjlj-Windows/nicovideo.dll: ${OBJECTFILES}
+       ${MKDIR} -p dist/Release/MinGW_sjlj-Windows
+       ${LINK.c} -shared -o dist/Release/${CND_PLATFORM}/nicovideo.dll ${OBJECTFILES} ${LDLIBSOPTIONS} 
 
-${OBJECTDIR}/comment/com_surface.o: comment/com_surface.c 
+${OBJECTDIR}/comment/com_surface.o: nbproject/Makefile-${CND_CONF}.mk comment/com_surface.c 
        ${MKDIR} -p ${OBJECTDIR}/comment
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/com_surface.o comment/com_surface.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/com_surface.o comment/com_surface.c
 
-${OBJECTDIR}/chat/process_chat.o: chat/process_chat.c 
+${OBJECTDIR}/chat/process_chat.o: nbproject/Makefile-${CND_CONF}.mk chat/process_chat.c 
        ${MKDIR} -p ${OBJECTDIR}/chat
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/process_chat.o chat/process_chat.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/process_chat.o chat/process_chat.c
 
-${OBJECTDIR}/main.o: main.c 
+${OBJECTDIR}/main.o: nbproject/Makefile-${CND_CONF}.mk main.c 
        ${MKDIR} -p ${OBJECTDIR}
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/main.o main.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/main.o main.c
 
-${OBJECTDIR}/framehook.o: framehook.c 
+${OBJECTDIR}/framehook.o: nbproject/Makefile-${CND_CONF}.mk framehook.c 
        ${MKDIR} -p ${OBJECTDIR}
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/framehook.o framehook.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/framehook.o framehook.c
 
-${OBJECTDIR}/comment/surf_util.o: comment/surf_util.c 
+${OBJECTDIR}/comment/surf_util.o: nbproject/Makefile-${CND_CONF}.mk comment/surf_util.c 
        ${MKDIR} -p ${OBJECTDIR}/comment
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/surf_util.o comment/surf_util.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/surf_util.o comment/surf_util.c
 
-${OBJECTDIR}/chat/chat.o: chat/chat.c 
+${OBJECTDIR}/chat/chat.o: nbproject/Makefile-${CND_CONF}.mk chat/chat.c 
        ${MKDIR} -p ${OBJECTDIR}/chat
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat.o chat/chat.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat.o chat/chat.c
 
-${OBJECTDIR}/comment/shadow.o: comment/shadow.c 
+${OBJECTDIR}/comment/shadow.o: nbproject/Makefile-${CND_CONF}.mk comment/shadow.c 
        ${MKDIR} -p ${OBJECTDIR}/comment
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/shadow.o comment/shadow.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/shadow.o comment/shadow.c
 
-${OBJECTDIR}/chat/chat_slot.o: chat/chat_slot.c 
+${OBJECTDIR}/chat/chat_slot.o: nbproject/Makefile-${CND_CONF}.mk chat/chat_slot.c 
        ${MKDIR} -p ${OBJECTDIR}/chat
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat_slot.o chat/chat_slot.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat_slot.o chat/chat_slot.c
 
-${OBJECTDIR}/process.o: process.c 
+${OBJECTDIR}/process.o: nbproject/Makefile-${CND_CONF}.mk process.c 
        ${MKDIR} -p ${OBJECTDIR}
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/process.o process.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/process.o process.c
 
-${OBJECTDIR}/util.o: util.c 
+${OBJECTDIR}/util.o: nbproject/Makefile-${CND_CONF}.mk util.c 
        ${MKDIR} -p ${OBJECTDIR}
        ${RM} $@.d
-       $(COMPILE.c) -O3 -I/f/mingw/include -fPIC  -MMD -MP -MF $@.d -o ${OBJECTDIR}/util.o util.c
+       $(COMPILE.c) -O3 -MMD -MP -MF $@.d -o ${OBJECTDIR}/util.o util.c
 
 # Subprojects
 .build-subprojects:
 
 # Clean Targets
-.clean-conf:
+.clean-conf: ${CLEAN_SUBPROJECTS}
        ${RM} -r build/Release
-       ${RM} dist/Release/${PLATFORM}/nicovideo.dll
+       ${RM} dist/Release/MinGW_sjlj-Windows/nicovideo.dll
 
 # Subprojects
 .clean-subprojects:

diff --git a/vhook/nbproject/Makefile-impl.mk b/vhook/nbproject/Makefile-impl.mk
index 6ff28b1..0399bf4 100644 (file)
--- a/vhook/nbproject/Makefile-impl.mk
+++ b/vhook/nbproject/Makefile-impl.mk
@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
 
 
 # Project Name
-PROJECTNAME=vhook
+PROJECTNAME=saccubus_vhook
 
 # Active Configuration
 DEFAULTCONF=Debug

diff --git a/vhook/nbproject/Makefile-variables.mk b/vhook/nbproject/Makefile-variables.mk
new file mode 100644 (file)
index 0000000..a5635c1
--- /dev/null
+++ b/vhook/nbproject/Makefile-variables.mk
@@ -0,0 +1,24 @@
+#
+# Generated - do not edit!
+#
+# NOCDDL
+#
+CND_BASEDIR=`pwd`
+CND_BUILDDIR=build
+CND_DISTDIR=dist
+# Debug configuration
+CND_PLATFORM_Debug=MinGW_sjlj-Windows
+CND_ARTIFACT_DIR_Debug=dist/Debug/MinGW_sjlj-Windows
+CND_ARTIFACT_NAME_Debug=nicovideodbg.dll
+CND_ARTIFACT_PATH_Debug=dist/Debug/MinGW_sjlj-Windows/nicovideodbg.dll
+CND_PACKAGE_DIR_Debug=dist/Debug/MinGW_sjlj-Windows/package
+CND_PACKAGE_NAME_Debug=libsaccubusvhook.dll.tar
+CND_PACKAGE_PATH_Debug=dist/Debug/MinGW_sjlj-Windows/package/libsaccubusvhook.dll.tar
+# Release configuration
+CND_PLATFORM_Release=MinGW_sjlj-Windows
+CND_ARTIFACT_DIR_Release=dist/Release/MinGW_sjlj-Windows
+CND_ARTIFACT_NAME_Release=nicovideo.dll
+CND_ARTIFACT_PATH_Release=dist/Release/MinGW_sjlj-Windows/nicovideo.dll
+CND_PACKAGE_DIR_Release=dist/Release/MinGW_sjlj-Windows/package
+CND_PACKAGE_NAME_Release=libsaccubusvhook.dll.tar
+CND_PACKAGE_PATH_Release=dist/Release/MinGW_sjlj-Windows/package/libsaccubusvhook.dll.tar

diff --git a/vhook/nbproject/Package-Debug.bash b/vhook/nbproject/Package-Debug.bash
index 4b200b8..58da24f 100644 (file)
--- a/vhook/nbproject/Package-Debug.bash
+++ b/vhook/nbproject/Package-Debug.bash
@@ -6,12 +6,14 @@
 
 # Macros
 TOP=`pwd`
-PLATFORM=MinGW-Windows
-TMPDIR=build/Debug/${PLATFORM}/tmp-packaging
+CND_PLATFORM=MinGW_sjlj-Windows
+CND_CONF=Debug
+CND_DISTDIR=dist
+TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=dist/Debug/${PLATFORM}/nicovideodbg.dll
+OUTPUT_PATH=dist/Debug/${CND_PLATFORM}/nicovideodbg.dll
 OUTPUT_BASENAME=nicovideodbg.dll
-PACKAGE_TOP_DIR=libvhook.dll/
+PACKAGE_TOP_DIR=libsaccubusvhook.dll/
 
 # Functions
 function checkReturnCode
@@ -50,21 +52,21 @@ function copyFileToTmpDir
 
 # Setup
 cd "${TOP}"
-mkdir -p dist/Debug/${PLATFORM}/package
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
 rm -rf ${TMPDIR}
 mkdir -p ${TMPDIR}
 
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory ${TMPDIR}/libvhook.dll/lib
+makeDirectory ${TMPDIR}/libsaccubusvhook.dll/lib
 copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
 
 
 # Generate tar file
 cd "${TOP}"
-rm -f dist/Debug/${PLATFORM}/package/libvhook.dll.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libsaccubusvhook.dll.tar
 cd ${TMPDIR}
-tar -vcf ../../../../dist/Debug/${PLATFORM}/package/libvhook.dll.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libsaccubusvhook.dll.tar *
 checkReturnCode
 
 # Cleanup

diff --git a/vhook/nbproject/Package-Release.bash b/vhook/nbproject/Package-Release.bash
index f37e301..a0b08d3 100644 (file)
--- a/vhook/nbproject/Package-Release.bash
+++ b/vhook/nbproject/Package-Release.bash
@@ -6,12 +6,14 @@
 
 # Macros
 TOP=`pwd`
-PLATFORM=MinGW-Windows
-TMPDIR=build/Release/${PLATFORM}/tmp-packaging
+CND_PLATFORM=MinGW_sjlj-Windows
+CND_CONF=Release
+CND_DISTDIR=dist
+TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=dist/Release/${PLATFORM}/nicovideo.dll
+OUTPUT_PATH=dist/Release/${CND_PLATFORM}/nicovideo.dll
 OUTPUT_BASENAME=nicovideo.dll
-PACKAGE_TOP_DIR=libvhook.dll/
+PACKAGE_TOP_DIR=libsaccubusvhook.dll/
 
 # Functions
 function checkReturnCode
@@ -50,21 +52,21 @@ function copyFileToTmpDir
 
 # Setup
 cd "${TOP}"
-mkdir -p dist/Release/${PLATFORM}/package
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
 rm -rf ${TMPDIR}
 mkdir -p ${TMPDIR}
 
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory ${TMPDIR}/libvhook.dll/lib
+makeDirectory ${TMPDIR}/libsaccubusvhook.dll/lib
 copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
 
 
 # Generate tar file
 cd "${TOP}"
-rm -f dist/Release/${PLATFORM}/package/libvhook.dll.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libsaccubusvhook.dll.tar
 cd ${TMPDIR}
-tar -vcf ../../../../dist/Release/${PLATFORM}/package/libvhook.dll.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libsaccubusvhook.dll.tar *
 checkReturnCode
 
 # Cleanup

diff --git a/vhook/nbproject/configurations.xml b/vhook/nbproject/configurations.xml
index 1776037..84d046c 100644 (file)
--- a/vhook/nbproject/configurations.xml
+++ b/vhook/nbproject/configurations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="EUC-JP"?>\r
-<configurationDescriptor version="51">\r
+<configurationDescriptor version="62">\r
   <logicalFolder name="root" displayName="root" projectFiles="true">\r
     <logicalFolder name="SourceFiles" displayName="¥½¡¼¥¹¥Õ¥¡¥¤¥ë" projectFiles="true">\r
       <logicalFolder name="chat" displayName="chat" projectFiles="true">\r
@@ -53,17 +53,13 @@
     <conf name="Debug" type="2">\r
       <toolsSet>\r
         <developmentServer>localhost</developmentServer>\r
-        <compilerSet>MinGW|MinGW</compilerSet>\r
+        <compilerSet>MinGW_sjlj|MinGW</compilerSet>\r
         <platform>3</platform>\r
       </toolsSet>\r
       <compileType>\r
-        <cCompilerTool>\r
-          <includeDirectories>\r
-            <directoryPath>f:/mingw/include</directoryPath>\r
-          </includeDirectories>\r
-        </cCompilerTool>\r
         <linkerTool>\r
-          <output>dist/Debug/${PLATFORM}/nicovideodbg.dll</output>\r
+          <output>dist/Debug/${CND_PLATFORM}/nicovideodbg.dll</output>\r
+          <linkerKpic>false</linkerKpic>\r
           <linkerLibItems>\r
             <linkerLibLibItem>SDL_gfx</linkerLibLibItem>\r
             <linkerLibLibItem>SDLmain</linkerLibLibItem>\r
@@ -72,103 +68,26 @@
           </linkerLibItems>\r
         </linkerTool>\r
       </compileType>\r
-      <item path="chat/chat.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="chat/chat.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="chat/chat_slot.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="chat/chat_slot.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="chat/process_chat.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="chat/process_chat.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="comment/com_surface.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="comment/com_surface.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="comment/shadow.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="comment/shadow.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="comment/surf_util.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="comment/surf_util.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="common/framehook_ext.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="framehook.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="framehook.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="header.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="main.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="main.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="mydef.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="nicodef.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="process.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="process.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="struct_define.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="util.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="util.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
     </conf>\r
     <conf name="Release" type="2">\r
       <toolsSet>\r
         <developmentServer>localhost</developmentServer>\r
-        <compilerSet>MinGW|MinGW</compilerSet>\r
+        <compilerSet>MinGW_sjlj|MinGW</compilerSet>\r
         <platform>3</platform>\r
       </toolsSet>\r
       <compileType>\r
-        <cCompilerTool>\r
+        <cTool>\r
           <developmentMode>6</developmentMode>\r
-          <includeDirectories>\r
-            <directoryPath>f:/mingw/include</directoryPath>\r
-          </includeDirectories>\r
-        </cCompilerTool>\r
-        <ccCompilerTool>\r
+        </cTool>\r
+        <ccTool>\r
           <developmentMode>5</developmentMode>\r
-        </ccCompilerTool>\r
+        </ccTool>\r
         <fortranCompilerTool>\r
           <developmentMode>5</developmentMode>\r
         </fortranCompilerTool>\r
         <linkerTool>\r
-          <output>dist/Release/${PLATFORM}/nicovideo.dll</output>\r
+          <output>dist/Release/${CND_PLATFORM}/nicovideo.dll</output>\r
+          <linkerKpic>false</linkerKpic>\r
           <linkerLibItems>\r
             <linkerLibLibItem>SDL_gfx</linkerLibLibItem>\r
             <linkerLibLibItem>SDLmain</linkerLibLibItem>\r
@@ -177,81 +96,6 @@
           </linkerLibItems>\r
         </linkerTool>\r
       </compileType>\r
-      <item path="chat/chat.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="chat/chat.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="chat/chat_slot.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="chat/chat_slot.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="chat/process_chat.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="chat/process_chat.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="comment/com_surface.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="comment/com_surface.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="comment/shadow.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="comment/shadow.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="comment/surf_util.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="comment/surf_util.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="common/framehook_ext.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="framehook.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="framehook.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="header.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="main.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="main.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="mydef.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="nicodef.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="process.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="process.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="struct_define.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
-      <item path="util.c">\r
-        <itemTool>0</itemTool>\r
-      </item>\r
-      <item path="util.h">\r
-        <itemTool>3</itemTool>\r
-      </item>\r
     </conf>\r
   </confs>\r
 </configurationDescriptor>\r

diff --git a/vhook/process.c b/vhook/process.c
index 008c774..cb9498c 100644 (file)
--- a/vhook/process.c
+++ b/vhook/process.c
@@ -7,14 +7,18 @@
 //\83v\83\8d\83Z\83X\r
 int process(DATA* data,SDL_Surface* surf,const int now_vpos){\r
        //\83\86\81[\83U\83R\83\81\83\93\83g\r
-       if(data->enable_user_comment){\r
-               if(!chat_process(data,surf,now_vpos)){\r
+       if(data->user_comment.enable){\r
+               if(!chat_process(&data->user_comment,surf,now_vpos)){\r
                        fputs("[process/process]failed to process comment.\n",data->log);\r
                        return FALSE;\r
                }\r
        }\r
        //\83I\81[\83i\83R\83\81\83\93\83g\r
-       if(data->enable_owner_comment){\r
+       if(data->owner_comment.enable){\r
+               if(!chat_process(&data->owner_comment,surf,now_vpos)){\r
+                       fputs("[process/process]failed to process comment.\n",data->log);\r
+                       return FALSE;\r
+               }\r
        }\r
        return TRUE;\r
 }\r

diff --git a/vhook/struct_define.h b/vhook/struct_define.h
index 65b2715..e084e5a 100644 (file)
--- a/vhook/struct_define.h
+++ b/vhook/struct_define.h
@@ -2,6 +2,7 @@
 #define STRUCT_DEFINE_H_\r
 \r
 typedef struct DATA DATA;\r
+typedef struct COMMDATA COMMDATA;\r
 typedef struct CHAT CHAT;\r
 typedef struct CHAT_ITEM CHAT_ITEM;\r
 typedef struct CHAT_SLOT CHAT_SLOT;\r