2012/01/24 2:19:30

diff --git a/nlib/nlib_errorMessage.c b/nlib/nlib_errorMessage.c
index 63b96cc..f930602 100644 (file)
--- a/nlib/nlib_errorMessage.c
+++ b/nlib/nlib_errorMessage.c
@@ -2,165 +2,133 @@
 #include "nlib_include.h"
 
 
+
+
+#define DECLARE_NLIB_ERROR_MESSAGE(c,m)\
+       static const LPCTSTR ERROR_##c##MESSAGE = m
+
+
 //NLIB_ERR_OK
-static const LPCTSTR NLIB_ERR_OK_STRING = 
-       TEXT("\83G\83\89\81[\82Í\94­\90¶\82µ\82Ä\82¢\82Ü\82¹\82ñ");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_OK,TEXT("\83G\83\89\81[\82Í\94­\90¶\82µ\82Ä\82¢\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_COOKIE_FAILED
-static const LPCTSTR NLIB_ERR_COOKIE_FAILED_STRING = 
-       TEXT("\83N\83b\83L\81[\8eæ\93¾\82É\8e¸\94s\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_COOKIE_FAILED,TEXT("\83N\83b\83L\81[\8eæ\93¾\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
 
 //NLIB_INITALIZE_FAILED_NETWORK
-static const LPCTSTR NLIB_INITALIZE_FAILED_NETWORK_STRING= 
-       TEXT("\83l\83b\83g\83\8f\81[\83N\82Ì\8f\89\8aú\89»\82É\8e¸\94s\82µ\82Ü\82µ\82½");             
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_INITALIZE_FAILED_NETWORK,TEXT("\83l\83b\83g\83\8f\81[\83N\82Ì\8f\89\8aú\89»\82É\8e¸\94s\82µ\82Ü\82µ\82½"));          
 
 //NLIB_LIVENO_IS_NULL
-static const LPCTSTR NLIB_LIVENO_IS_NULL_STRING= 
-       TEXT("\93ü\97Í\82³\82ê\82½\95ú\91\97\94Ô\8d\86\82ªNULL\92l\82Å\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_LIVENO_IS_NULL,TEXT("\93ü\97Í\82³\82ê\82½\95ú\91\97\94Ô\8d\86\82ªNULL\92l\82Å\82·"));
 
 //NLIB_LIVENO_FAILED_TOOBIG
-static const LPCTSTR NLIB_LIVENO_FAILED_TOOBIG_STRING= 
-       TEXT("\93ü\97Í\82³\82ê\82½\95ú\91\97\94Ô\8d\86\82ª\92·\82·\82¬\82Ü\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_LIVENO_FAILED_TOOBIG,TEXT("\93ü\97Í\82³\82ê\82½\95ú\91\97\94Ô\8d\86\82ª\92·\82·\82¬\82Ü\82·"));
 
 //NLIB_LIVENO_FAILED_UNDEFEINE
-static const LPCTSTR NLIB_LIVENO_FAILED_UNDEFEINE_STRING= 
-       TEXT("\93ü\97Í\82³\82ê\82½\95ú\91\97\94Ô\8d\86\82ª\90³\82µ\82­\82 \82è\82Ü\82¹\82ñ");   
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_LIVENO_FAILED_UNDEFEINE,TEXT("\93ü\97Í\82³\82ê\82½\95ú\91\97\94Ô\8d\86\82ª\90³\82µ\82­\82 \82è\82Ü\82¹\82ñ")); 
 
 //NLIB_USERSESSION_FAILED_TOOBIG
-static const LPCTSTR NLIB_USERSESSION_FAILED_TOOBIG_STRING= 
-       TEXT("\83\86\81[\83U\81[\83Z\83b\83V\83\87\83\93\82Ì\95¶\8e\9a\97ñ\82ª\92·\82·\82¬\82Ü\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_USERSESSION_FAILED_TOOBIG,TEXT("\83\86\81[\83U\81[\83Z\83b\83V\83\87\83\93\82Ì\95¶\8e\9a\97ñ\82ª\92·\82·\82¬\82Ü\82·"));
 
 //NLIB_GETPLAYERSTATUS_FAILED_CONNECT
-static const LPCTSTR NLIB_GETPLAYERSTATUS_FAILED_CONNECT_STRING= 
-       TEXT("\83v\83\8c\83C\83\84\81[\83X\83e\81[\83^\83X\82Ì\90Ú\91±\82É\8e¸\94s\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_GETPLAYERSTATUS_FAILED_CONNECT,TEXT("\83v\83\8c\83C\83\84\81[\83X\83e\81[\83^\83X\82Ì\90Ú\91±\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
 
 //NLIB_ERR_GETPLAYERSTATUS_INVALID_LV
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_INVALID_LV_STRING= 
-       TEXT("\96³\8cø\82È\95ú\91\97\94Ô\8d\86\82Å\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_INVALID_LV,TEXT("\96³\8cø\82È\95ú\91\97\94Ô\8d\86\82Å\82·"));
 
 //NLIB_ERR_GETPLAYERSTATUS_INVALID_THREAD
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_INVALID_THREAD_STRING= 
-       TEXT("\95ú\91\97\83X\83\8c\83b\83h\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\82Å\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_INVALID_THREAD,TEXT("\95ú\91\97\83X\83\8c\83b\83h\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\82Å\82µ\82½"));
 
 //NLIB_ERR_GETPLAYERSTATUS_CLOSED
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_CLOSED_STRING= 
-       TEXT("\95ú\91\97\82ª\8fI\97¹\82µ\82Ä\82¢\82Ü\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_CLOSED,TEXT("\95ú\91\97\82ª\8fI\97¹\82µ\82Ä\82¢\82Ü\82·"));
 
 //NLIB_ERR_GETPLAYERSTATUS_UNKNOWN_ERROR
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_UNKNOWN_ERROR_STRING= 
-       TEXT("\95ú\91\97\90Ú\91±\92\86\82É\95s\96¾\82È\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½:unknown_error");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_UNKNOWN_ERROR,TEXT("\95ú\91\97\90Ú\91±\92\86\82É\95s\96¾\82È\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½:unknown_error"));
 
 //NLIB_ERR_GETPLAYERSTATUS_SERVER_ERROR
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_SERVER_ERROR_STRING= 
-       TEXT("\95ú\91\97\83T\81[\83o\81[\90Ú\91±\82É\8e¸\94s\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_SERVER_ERROR,TEXT("\95ú\91\97\83T\81[\83o\81[\90Ú\91±\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
 
 //NLIB_ERR_GETPLAYERSTATUS_DELETED
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_DELETED_STRING= 
-       TEXT("\95ú\91\97\82ª\8dí\8f\9c\82³\82ê\82Ä\82¢\82Ü\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_DELETED,TEXT("\95ú\91\97\82ª\8dí\8f\9c\82³\82ê\82Ä\82¢\82Ü\82·"));
 
 //NLIB_ERR_GETPLAYERSTATUS_FULL
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_FULL_STRING= 
-       TEXT("\96\9e\88õ\82Ì\82½\82ß\90Ú\91±\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_FULL,TEXT("\96\9e\88õ\82Ì\82½\82ß\90Ú\91±\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½"));
 
 //NLIB_ERR_GETPLAYERSTATUS_PERMISSION_DENIED
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_PERMISSION_DENIED_STRING =
-       TEXT("\95ú\91\97\82É\90Ú\91±\82·\82é\8c \8cÀ\82ª\82 \82è\82Ü\82¹\82ñ");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_PERMISSION_DENIED,TEXT("\95ú\91\97\82É\90Ú\91±\82·\82é\8c \8cÀ\82ª\82 \82è\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_GETPLAYERSTATUS_ACCESS_LOCKED
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_ACCESS_LOCKED_STRING=
-       TEXT("\95ú\91\97\82ª\83\8d\83b\83N\82³\82ê\82Ä\82¢\82Ä\90Ú\91±\82Å\82«\82Ü\82¹\82ñ");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_ACCESS_LOCKED,TEXT("\95ú\91\97\82ª\83\8d\83b\83N\82³\82ê\82Ä\82¢\82Ä\90Ú\91±\82Å\82«\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_GETPLAYERSTATUS_REQUIRE_COMMUNITY_MEMBER
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_REQUIRE_COMMUNITY_MEMBER_STRING=
-       TEXT("\83R\83~\83\85\83j\83e\83B\8cÀ\92è\95ú\91\97\82Ì\82½\82ß\90Ú\91±\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_REQUIRE_COMMUNITY_MEMBER,TEXT("\83R\83~\83\85\83j\83e\83B\8cÀ\92è\95ú\91\97\82Ì\82½\82ß\90Ú\91±\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½"));
 
 //NLIB_ERR_GETPLAYERSTATUS_COMINGSOON
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_COMINGSOON_STRING=
-       TEXT("\95ú\91\97\82ª\8aJ\8fê\82³\82ê\82Ä\82¢\82È\82¢\82½\82ß\90Ú\91±\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_COMINGSOON,TEXT("\95ú\91\97\82ª\8aJ\8fê\82³\82ê\82Ä\82¢\82È\82¢\82½\82ß\90Ú\91±\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½"));
 
 //NLIB_ERR_GETPLAYERSTATUS_NOTFOUND
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_NOTFOUND_STRING=
-       TEXT("\95ú\91\97\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\82Å\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_NOTFOUND,TEXT("\95ú\91\97\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\82Å\82µ\82½"));
 
 //NLIB_ERR_GETPLAYERSTATUS_NOTLOGIN
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_NOTLOGIN_STRING=
-       TEXT("\83\8d\83O\83C\83\93\82µ\82Ä\82¢\82È\82¢\82½\82ß\95ú\91\97\82É\90Ú\91±\82Å\82«\82Ü\82¹\82ñ");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_NOTLOGIN,TEXT("\83\8d\83O\83C\83\93\82µ\82Ä\82¢\82È\82¢\82½\82ß\95ú\91\97\82É\90Ú\91±\82Å\82«\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_GETPLAYERSTATUS_UNKNOWN
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_UNKNOWN_STRING=
-       TEXT("\95ú\91\97\90Ú\91±\92\86\82É\95s\96¾\82È\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½:unknown");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_UNKNOWN,TEXT("\95ú\91\97\90Ú\91±\92\86\82É\95s\96¾\82È\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½:unknown"));
 
 //NLIB_ERR_GETPLAYERSTATUS_MAINTENANCE
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_MAINTENANCE_STRING=
-       TEXT("\83\81\83\93\83e\83i\83\93\83X\92\86\82Å\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_MAINTENANCE,TEXT("\83\81\83\93\83e\83i\83\93\83X\92\86\82Å\82·"));
 
 //NLIB_ERR_GETPLAYERSTATUS_NOT_PERMITTED
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_NOT_PERMITTED_STRING=
-       TEXT("\8fI\97¹\82µ\82½\95ú\91\97\82©\81A\8cÃ\82¢\95ú\91\97\81A\82 \82é\82¢\82ÍBAN\82³\82ê\82Ä\82¢\82Ü\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_NOT_PERMITTED,TEXT("\8fI\97¹\82µ\82½\95ú\91\97\82©\81A\8cÃ\82¢\95ú\91\97\81A\82 \82é\82¢\82ÍBAN\82³\82ê\82Ä\82¢\82Ü\82·"));
 
 //NLIB_ERR_GETPLAYERSTATUS_REQUIRE_ACCEPT_PRINT_TIMESHIFT_TICKET
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_REQUIRE_ACCEPT_PRINT_TIMESHIFT_TICKET_STRING=
-       TEXT("\83^\83C\83\80\83V\83t\83g\82Ì\8e\8b\92®\8c \97\98\82ª\82 \82è\82Ü\82¹\82ñ");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_REQUIRE_ACCEPT_PRINT_TIMESHIFT_TICKET,TEXT("\83^\83C\83\80\83V\83t\83g\82Ì\8e\8b\92®\8c \97\98\82ª\82 \82è\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_GETPLAYERSTATUS_TSARCHIVE
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_TSARCHIVE_STRING=
-       TEXT("\97L\97¿\95ú\91\97\82Ì\83A\81[\83J\83C\83u\8e\8b\92®\8c \97\98\82ª\82È\82¢\82½\82ß\90Ú\91±\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_TSARCHIVE,TEXT("\97L\97¿\95ú\91\97\82Ì\83A\81[\83J\83C\83u\8e\8b\92®\8c \97\98\82ª\82È\82¢\82½\82ß\90Ú\91±\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½"));
 
 //NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT_STRING=
-       TEXT("\83R\83~\83\85\83j\83e\83B\82É\8eQ\89Á\82µ\82Ä\82¢\82È\82¢\82½\82ß\83^\83C\83\80\83V\83t\83g\82ð\8e\8b\92®\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT,TEXT("\83R\83~\83\85\83j\83e\83B\82É\8eQ\89Á\82µ\82Ä\82¢\82È\82¢\82½\82ß\83^\83C\83\80\83V\83t\83g\82ð\8e\8b\92®\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_GETPLAYERSTATUS_UNDEFINED
-static const LPCTSTR NLIB_ERR_GETPLAYERSTATUS_UNDEFINED_STRING=
-       TEXT("\83A\83v\83\8a\83P\81[\83V\83\87\83\93\93à\82Å\92è\8b`\82³\82ê\82Ä\82È\82¢\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_GETPLAYERSTATUS_UNDEFINED,TEXT("\83A\83v\83\8a\83P\81[\83V\83\87\83\93\93à\82Å\92è\8b`\82³\82ê\82Ä\82È\82¢\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½"));
 
 //NLIB_ERR_WATCHLIVENICOVIDEO_FAILED_CONNECT
-static const LPCTSTR NLIB_ERR_WATCHLIVENICOVIDEO_FAILED_CONNECT_STRING=
-       TEXT("\83j\83R\90¶\82Ì\83T\81[\83o\81[\90Ú\91±\82É\8e¸\94s\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_WATCHLIVENICOVIDEO_FAILED_CONNECT,TEXT("\83j\83R\90¶\82Ì\83T\81[\83o\81[\90Ú\91±\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
 
 //NLIB_ERR_BUFFER_TOOLITTLE
-static const LPCTSTR NLIB_ERR_BUFFER_TOOLITTLE_STRING=
-       TEXT("\93à\95\94\82Å\8am\95Û\82³\82ê\82½\83o\83b\83t\83@\82ª\91«\82è\82Ü\82¹\82ñ");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_BUFFER_TOOLITTLE,TEXT("\93à\95\94\82Å\8am\95Û\82³\82ê\82½\83o\83b\83t\83@\82ª\91«\82è\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_FAILED_NETWORK
-static const LPCTSTR NLIB_ERR_FAILED_NETWORK_STRING=
-       TEXT("\83l\83b\83g\83\8f\81[\83N\82É\89½\82ç\82©\82Ì\88Ù\8fí\82ª\94­\90¶\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_FAILED_NETWORK,TEXT("\83l\83b\83g\83\8f\81[\83N\82É\89½\82ç\82©\82Ì\88Ù\8fí\82ª\94­\90¶\82µ\82Ü\82µ\82½"));
 
 //NLIB_ERR_PLAYERSTATUS_ERROR
-static const LPCTSTR NLIB_ERR_PLAYERSTATUS_ERROR_STRING=
-       TEXT("\8eæ\93¾\82µ\82½\83v\83\8c\83C\83\84\81[\83X\83e\81[\83^\83X\82ª\83G\83\89\81[\82Å\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_PLAYERSTATUS_ERROR,TEXT("\8eæ\93¾\82µ\82½\83v\83\8c\83C\83\84\81[\83X\83e\81[\83^\83X\82ª\83G\83\89\81[\82Å\82·"));
 
 //NLIB_ERR_HEARTBEAT_ERROR
-static const LPCTSTR NLIB_ERR_HEARTBEAT_ERROR_STRING=
-       TEXT("\8eæ\93¾\82µ\82½\83n\81[\83g\83r\81[\83g\82ª\83G\83\89\81[\82Å\82·");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_HEARTBEAT_ERROR,TEXT("\8eæ\93¾\82µ\82½\83n\81[\83g\83r\81[\83g\82ª\83G\83\89\81[\82Å\82·"));
 
 //NLIB_ERR_JSON_PARSE
-static const LPCTSTR NLIB_ERR_JSON_PARSE_STRING=
-       TEXT("json\89ð\90Í\92\86\82É\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_JSON_PARSE,TEXT("json\89ð\90Í\92\86\82É\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½"));
 
 //NLIB_ERR_SHELL_FAILED
-static const LPCTSTR NLIB_ERR_SHELL_FAILED_STRING=
-       TEXT("shell\83R\83}\83\93\83h\8eÀ\8ds\82É\8e¸\94s\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_SHELL_FAILED,TEXT("shell\83R\83}\83\93\83h\8eÀ\8ds\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
 
 //NLIB_ERR_NOT_LIVECONNECT
-static const LPCTSTR NLIB_ERR_NOT_LIVECONNECT_STRING=
-       TEXT("\90¶\95ú\91\97\82É\90Ú\91±\82µ\82Ä\82¢\82Ü\82¹\82ñ");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_NOT_LIVECONNECT,TEXT("\90¶\95ú\91\97\82É\90Ú\91±\82µ\82Ä\82¢\82Ü\82¹\82ñ"));
 
 //NLIB_ERR_LIVE_GETPOSTKEY_FAILED
-static const LPCTSTR NLIB_ERR_LIVE_GETPOSTKEY_FAILED_STRING=
-       TEXT("\83R\83\81\83\93\83g\91\97\90M\97p\82Ì\83|\83X\83g\83L\81[\8eæ\93¾\82É\8e¸\94s\82µ\82Ü\82µ\82½");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_LIVE_GETPOSTKEY_FAILED,TEXT("\83R\83\81\83\93\83g\91\97\90M\97p\82Ì\83|\83X\83g\83L\81[\8eæ\93¾\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
 
 
 //NLIB_ERR_CODE_NOTSET
-static const LPCTSTR NLIB_ERR_CODE_NOTSET_STRING=
-       TEXT("\83G\83\89\81[\83R\81[\83h\82ª\90Ý\92è\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ\81B\83\89\83C\83u\83\89\83\8a\82Ì\8eÀ\91\95\82É\89½\82ç\82©\82Ì\96â\91è\82ª\82 \82é\82Ì\82Å\8aJ\94­\8eÒ\82É\95ñ\8d\90\82µ\82Ä\82­\82¾\82³\82¢");
+DECLARE_NLIB_ERROR_MESSAGE(NLIB_ERR_CODE_NOTSET,TEXT("\83G\83\89\81[\83R\81[\83h\82ª\90Ý\92è\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ\81B\83\89\83C\83u\83\89\83\8a\82Ì\8eÀ\91\95\82É\89½\82ç\82©\82Ì\96â\91è\82ª\82 \82é\82Ì\82Å\8aJ\94­\8eÒ\82É\95ñ\8d\90\82µ\82Ä\82­\82¾\82³\82¢"));
 
 #define NLIB_ERRMESSAGE_TABLE_START(c) switch(c){
 
 
 #define NLIB_ERRMESSAGE_CASE(m,c)\
 case c:{\
-       m = c##_STRING;\
+       m = ERROR_##c##MESSAGE;\
        break;\
 }
 
@@ -168,9 +136,10 @@ case c:{\
 
 LPCTSTR NLIB_GetErrorMessage(NLIB_RESULT rsltCode){
 
-       static const LPCTSTR INI_ERRMES = TEXT("");
+       static LPCTSTR INI_ERRMES = TEXT("");
        LPCTSTR errmes = INI_ERRMES;
 
+       //\83\81\83b\83Z\81[\83W\83e\81[\83u\83\8b
        NLIB_ERRMESSAGE_TABLE_START(rsltCode)
                NLIB_ERRMESSAGE_CASE(errmes,NLIB_ERR_OK)
                NLIB_ERRMESSAGE_CASE(errmes,NLIB_ERR_COOKIE_FAILED)

diff --git a/nlite.suo b/nlite.suo
index 91b8fe2..7b6986d 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/nlite/Resource.h b/nlite/Resource.h
index 35a1855..9672a2d 100644 (file)
--- a/nlite/Resource.h
+++ b/nlite/Resource.h
@@ -12,6 +12,7 @@
 #define IDC_RADIO_IE                            1005
 #define IDM_COOKIE                              30000
 #define IDR_COMMAND1                            40000
+#define IDS_PANE_TIME                           40000
 #define IDR_COMMAND2                            40001
 #define IDR_COMMAND3                            40002
 #define IDR_COMMAND4                            40003

diff --git a/nlite/nlite.rc b/nlite/nlite.rc
index 958a245..91e3914 100644 (file)
--- a/nlite/nlite.rc
+++ b/nlite/nlite.rc
@@ -9,10 +9,6 @@
 
 
 
-//
-//manifest
-//
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "nlite.exe.manifest"
 
 //
 // Toolbar resources
@@ -87,6 +83,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN
 STRINGTABLE
 {
     IDC_NLITE                     "nlite"
+    IDS_PANE_TIME                 "\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@"
 }
 
 
@@ -143,3 +140,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
         VALUE "Translation", 0x0800, 0x0025
     }
 }
+
+
+
+//
+// Manifest resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST    "nlite.exe.manifest"

diff --git a/nlite/nlite_commentWrite.cpp b/nlite/nlite_commentWrite.cpp
index b1021b1..d9c0a82 100644 (file)
--- a/nlite/nlite_commentWrite.cpp
+++ b/nlite/nlite_commentWrite.cpp
@@ -227,6 +227,7 @@ static VOID agreeEnterKeyThread(LPVOID userData){
 }
 
 BOOL CCommentWriteWindow::SendChat(){
+       this->commentEdit.SetReadOnly(TRUE);
        CCommentMaker commentMaker;
        std::vector<TCHAR> chat(commentEdit.GetWindowTextLengthW() + 1);
        commentEdit.GetWindowTextW(&chat[0],chat.size());
@@ -243,7 +244,7 @@ BOOL CCommentWriteWindow::SendChat(){
        case NLIB_ERR_OK:
 
                rslt = TRUE;
-
+               this->commentEdit.SetWindowText(TEXT(""));
                break;
 
        case NLIB_ERR_NOT_LIVECONNECT:
@@ -470,14 +471,14 @@ void CSubChatEdit::OnKeyDown(TCHAR wParam, UINT upLParam,UINT loLParam){
                                        
                if(untilConnectingFlag == FALSE){
                        untilConnectingFlag = TRUE;
-                       ;
+                       
 
                        if(self.SendChat() != TRUE){
 
                                _beginthread(agreeEnterKeyThread,0,this);
 
                        }
-
+                       
                
 
        
@@ -493,6 +494,7 @@ void CSubChatEdit::OnKeyDown(TCHAR wParam, UINT upLParam,UINT loLParam){
 
 VOID CSubChatEdit::AgreeEnter(){
        cs.Lock();
+       self.commentEdit.SetReadOnly(FALSE);
        untilConnectingFlag = FALSE;
        cs.Unlock();
 }

diff --git a/nlite/nlite_commentWrite.h b/nlite/nlite_commentWrite.h
index a7b1467..34acebb 100644 (file)
--- a/nlite/nlite_commentWrite.h
+++ b/nlite/nlite_commentWrite.h
@@ -89,6 +89,7 @@ namespace nlite{
        
        class CCommentWriteWindow:public CWindowImpl<CCommentWriteWindow>{
 
+               friend CSubChatEdit;
        private:
                CComboBox commentPosBox;
                CComAutoCriticalSection commentPosBoxCS;

diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp
index 4da7ab5..4f873e2 100644 (file)
--- a/nlite/nlite_commentview.cpp
+++ b/nlite/nlite_commentview.cpp
@@ -51,10 +51,9 @@ VOID CCommentView::OnConnect(){
        
        SCROLLINFO vScrollInfo = {0};
        vScrollInfo.cbSize = sizeof(vScrollInfo);
-       vScrollInfo.fMask = SIF_RANGE;
+       vScrollInfo.fMask = SIF_ALL;
 
-       
-       this->SetScrollPos(SB_VERT,0,FALSE);
+       this->SetScrollInfo(SB_VERT,&vScrollInfo,FALSE);
 
        m_commentListWindow.SetRedraw(TRUE);
        

diff --git a/nlite/nlite_mailframe.h b/nlite/nlite_mailframe.h
index ee7edba..2b27e21 100644 (file)
--- a/nlite/nlite_mailframe.h
+++ b/nlite/nlite_mailframe.h
@@ -25,14 +25,14 @@ namespace nlite{
                ///\95ú\91\97\94Ô\8d\86\93ü\97Í\97p
                ///
                class CSubLiveNoComboBox:public CWindowImpl<CEdit>{
-
+                       friend CNliteMainFrame;
                        
 
                private:
-                       CNliteMainFrame &self;                          //\83\81\83C\83\93\83t\83\8c\81[\83\80\83E\83B\83\93\83h\83E
-                       CComAutoCriticalSection cs;                     //\83N\83\8a\83e\83B\83J\83\8b\83Z\83N\83V\83\87\83\93\83I\83u\83W\83F\83N\83g
-                       BOOL untilConnectingFlag;                       //\90Ú\91±\8f\88\97\9d\92\86\82©\82Ì\83t\83\89\83O\94»\92è
-
+                       CNliteMainFrame &self;                                          //\83\81\83C\83\93\83t\83\8c\81[\83\80\83E\83B\83\93\83h\83E
+                       CComAutoCriticalSection cs;                                     //\83N\83\8a\83e\83B\83J\83\8b\83Z\83N\83V\83\87\83\93\83I\83u\83W\83F\83N\83g
+                       BOOL untilConnectingFlag;                                       //\90Ú\91±\8f\88\97\9d\92\86\82©\82Ì\83t\83\89\83O\94»\92è
+                       
                public:
                        
                        ///
@@ -112,7 +112,7 @@ namespace nlite{
 
                };
 
-               
+               friend CSubLiveNoComboBox;
        public:
 
                typedef CFrameWindowImpl<CNliteMainFrame> baseWindow;
@@ -134,6 +134,8 @@ namespace nlite{
                CNicoVideoAuth nicoVideoAuth;                           //\83j\83R\83j\83R\93®\89æ\94F\8fØ\97p\83I\83u\83W\83F\83N\83g
                Property nliteProperty;                                         //\83A\83v\83\8a\83P\81[\83V\83\87\83\93\83v\83\8d\83p\83e\83B
                CNicoLiveStream nicoLiveStream;                         //\83j\83R\83j\83R\90¶\95ú\91\97\83I\83u\83W\83F\83N\83g
+               CMultiPaneStatusBarCtrl m_hStatusBar;           //\83}\83\8b\83`\83y\83C\83\93\83X\83e\81[\83^\83X\83o\81[
+               CProgressBarCtrl  m_progresBar;                         //\83v\83\8d\83O\83\8c\83X\83o\81[
        private:
                // \83\81\83b\83Z\81[\83W\83t\83B\83\8b\83^\8f\88\97\9d
                virtual BOOL PreTranslateMessage(MSG* pMsg);
@@ -170,6 +172,7 @@ namespace nlite{
                        MSG_WM_DESTROY(OnDestroy)
                        MESSAGE_HANDLER(WM_SIZE,OnSize)
                        MSG_WM_SIZING(OnSizing)
+                       MESSAGE_HANDLER(WM_SETCURSOR,OnSetCursor)
                        COMMAND_ID_HANDLER_EX(IDM_EXIT, OnMenuExit)
                        COMMAND_ID_HANDLER_EX(IDM_ABOUT,OnMenuAbount)
                        COMMAND_ID_HANDLER_EX(IDM_COOKIE,OnCookie)
@@ -241,8 +244,12 @@ namespace nlite{
                ///
                BOOL ConnectNicoLive(LPCTSTR liveNo);
 
-               
-               
+
+               ///
+               ///\83}\83E\83X\83J\81[\83\\83\8b\95Ï\8dX\8f\88\97\9d
+               ///
+               LRESULT OnSetCursor(LRESULT msg,WPARAM wParam,LPARAM lParam,BOOL &bHandled);
+
 
                //\83\81\83j\83\85\81[\82©\82ç\83t\83@\83C\83\8b\82ð\8fI\97¹\82ð\91I\91ð
                VOID OnMenuExit(UINT uNotifyCode, int nID, HWND hWndCtl);

diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp
index 83ad01e..d0399c6 100644 (file)
--- a/nlite/nlite_mainframe.cpp
+++ b/nlite/nlite_mainframe.cpp
@@ -98,7 +98,13 @@ LRESULT CNliteMainFrame::OnCreate(LPCREATESTRUCT lpcs){
 
        
        // \83X\83e\81[\83^\83X\83o\81[\82ð\8dì\90¬
-       vcverify(CreateSimpleStatusBar(),TEXT("\83X\83e\81[\83^\83X\83o\81[\8dì\90¬\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
+       m_hWndStatusBar = m_hStatusBar.Create(*this);
+       UIAddStatusBar(m_hWndStatusBar);
+       // \83X\83e\81[\83^\83X\83o\81[\82É\83y\83C\83\93\82ð\90Ý\92è
+       //INT_PTR nPanes[] = {ID_DEFAULT_PANE, IDS_PANE_TIME};
+       //m_hStatusBar.SetPanes(nPanes, sizeof(nPanes)/sizeof(nPanes[0]));
+       //progresBar.Create(m_hWnd,0,NULL,);
+       //m_hStatusBar.SetClipboardViewer
        tabctrl.Create(m_hWnd,0,NULL,WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_DLGFRAME );
        commentView.Create(tabctrl.m_hWnd);
        
@@ -113,7 +119,7 @@ LRESULT CNliteMainFrame::OnCreate(LPCREATESTRUCT lpcs){
        
        
 
-       AddSimpleReBarBand(hWndToolBar);
+       //AddSimpleReBarBand(hWndToolBar);
        AddSimpleReBarBand(lvNoCombo,TEXT("\95ú\91\97URL"));
        SizeSimpleReBarBands();
        
@@ -231,7 +237,8 @@ VOID CNliteMainFrame::OnCookie(UINT uNotifyCode,int nID,HWND hWndCtl){
 
 
 BOOL CNliteMainFrame::ConnectNicoLive(LPCTSTR liveNo){
-                       
+       
+       this->lvNoCombo.GetEditCtrl().SetReadOnly(TRUE);
        nicoLiveStream.DisConnect();
        commentView.OnConnect();
        BOOL rslt = FALSE;
@@ -271,6 +278,7 @@ BOOL CNliteMainFrame::ConnectNicoLive(LPCTSTR liveNo){
        case NLIB_ERR_GETPLAYERSTATUS_USERTIMESHIFT:
        case NLIB_ERR_GETPLAYERSTATUS_UNDEFINED:
 
+               this->subLiveNoComboBox.AgreeInputLvNo();
                ::MessageBox(NULL,NLIB_GetErrorMessage(code),TEXT("\95ú\91\97\90Ú\91±\83G\83\89\81["),MB_ICONERROR | MB_OK);
                rslt = FALSE;
                break;
@@ -286,6 +294,8 @@ BOOL CNliteMainFrame::ConnectNicoLive(LPCTSTR liveNo){
                break;
 
        }
+
+
        return rslt;
 
 }
@@ -342,6 +352,8 @@ LRESULT CNliteMainFrame::OnRbnHeightChange(INT_PTR wParam,LPNMHDR lParam,BOOL &b
        return 0;
 }
 
+
+
 NLIB_RESULT CNliteMainFrame::LiveCallBack(NICOLIVE_EVENT eventType,NicoLiveStream_P pNicoLiveStream,LPVOID option,NICOLIVE_PARAM param1,NICOLIVE_PARAM param2){
 
        CLiveUserData &userData = (*(CLiveUserData*)option);
@@ -406,6 +418,25 @@ NLIB_RESULT CNliteMainFrame::LiveCallBack(NICOLIVE_EVENT eventType,NicoLiveStrea
 }
 
 
+LRESULT CNliteMainFrame::OnSetCursor(LRESULT msg,WPARAM wParam,LPARAM lParam,BOOL &bHandled){
+
+       
+       BOOL rslt = FALSE;
+       
+       if(this->subLiveNoComboBox.untilConnectingFlag == TRUE){
+               ::SetCursor(::LoadCursorW(NULL,IDC_WAIT));
+               bHandled = TRUE;
+               rslt = TRUE;
+       } else {
+
+               bHandled = FALSE;
+       }
+       
+
+       return TRUE;
+
+}
+
 
 //
 //CSubLiveNoComboBox
@@ -431,9 +462,9 @@ VOID CNliteMainFrame::CSubLiveNoComboBox::OnKeyDown(TCHAR wParam, UINT upLParam,
                        untilConnectingFlag = TRUE;
                        std::vector<TCHAR> buffer(this->GetWindowTextLengthW() + 1); 
                        ::GetWindowTextW(this->m_hWnd,&buffer[0],buffer.size());
-                       if(self.ConnectNicoLive(&buffer[0]) != TRUE){
-                               _beginthread(AgreeEnterKeyThread,0,this);
-                       }
+                       
+                       
+                       self.ConnectNicoLive(&buffer[0]);
                }
                                        
                cs.Unlock();
@@ -446,7 +477,11 @@ VOID CNliteMainFrame::CSubLiveNoComboBox::OnKeyDown(TCHAR wParam, UINT upLParam,
 
 VOID CNliteMainFrame::CSubLiveNoComboBox::AgreeInputLvNo(){
        cs.Lock();
+       self.lvNoCombo.GetEditCtrl().SetReadOnly(FALSE);
        untilConnectingFlag = FALSE;
+       POINT mousePoint;
+       ::GetCursorPos(&mousePoint);
+       ::SetCursorPos(mousePoint.x,mousePoint.y);
        cs.Unlock();
 }
 
@@ -473,7 +508,7 @@ VOID CNliteMainFrame::CLiveUserData::OnConnect(){
 VOID CNliteMainFrame::CLiveUserData::OnChatReceveStart(StreamStatus_P streamStatus){
                                
        commentView.SetStreamStatus(streamStatus);
-
+       lvnocombo.AgreeInputLvNo();
        return;
 }
 
@@ -486,7 +521,7 @@ VOID CNliteMainFrame::CLiveUserData::OnChatReceve(NicoLiveChat_P chat,UINT_PTR c
 VOID CNliteMainFrame::CLiveUserData::OnChatReceveSettle(UINT_PTR commentCount,UINT_PTR commentCountSum){
 
        commentView.OnChatReceveSettle(commentCount,commentCountSum);
-       lvnocombo.AgreeInputLvNo();
+       
        return;
 }
 

diff --git a/nlite/nlite_property.cpp b/nlite/nlite_property.cpp
index 4510bc5..b9f7faa 100644 (file)
--- a/nlite/nlite_property.cpp
+++ b/nlite/nlite_property.cpp
@@ -45,6 +45,13 @@ WritePrivateProfileInt(
 
 PropertyBase::PropertyBase(LPCTSTR in_sectionName):sectionName(in_sectionName){}
 
+
+LPCTSTR PropertyBase::GetSectionName(){
+
+       return sectionName;
+
+}
+
 BOOL CCookieSettingWindow::OnInitDialog(CWindow wndFocus, LPARAM lInitParam){
        // \83X\83N\83\8a\81[\83\93\82Ì\92\86\89\9b\82É\94z\92u
        CenterWindow();
@@ -153,11 +160,7 @@ CommentViewProperty::CommentViewProperty():
        memset(headerholSize,-1,sizeof(headerholSize));
 }
 
-LPCTSTR CommentViewProperty::GetSectionName(){
-
-       return sectionName;
 
-}
 
 
 CommentReadProperty::CommentReadProperty():
@@ -171,11 +174,7 @@ CommentReadProperty::CommentReadProperty():
        PropertyBase(TEXT("COMMENTREAD"))
 {}
 
-LPCTSTR CommentReadProperty::GetSectionName(){
 
-       return sectionName;
-
-}
 
 
 GeneralProperty::GeneralProperty():
@@ -191,11 +190,7 @@ GeneralProperty::GeneralProperty():
        browserType(BT_NOSETTING)
 {}
 
-LPCTSTR GeneralProperty::GetSectionName(){
-
-       return sectionName;
 
-}
 
 MainFrameProperty::MainFrameProperty():
 windowFrontFlag(TRUE),
@@ -206,10 +201,7 @@ PropertyBase(TEXT("MAINFRAME"))
 
 }
 
-LPCTSTR MainFrameProperty::GetSectionName(){
 
-       return sectionName;
-}
 
 
 Property::Property()

diff --git a/nlite/nlite_property.h b/nlite/nlite_property.h
index bc6278c..66c2abc 100644 (file)
--- a/nlite/nlite_property.h
+++ b/nlite/nlite_property.h
@@ -12,6 +12,8 @@ namespace nlite{
 
        public:
                PropertyBase(LPCTSTR in_sectionName);
+
+               LPCTSTR GetSectionName();
        };
 
        class CCookieSettingWindow:public CDialogImpl<CCookieSettingWindow>{
@@ -71,7 +73,7 @@ namespace nlite{
 
                CommentViewProperty();
 
-               LPCTSTR GetSectionName();
+               
 
                
 
@@ -99,8 +101,6 @@ namespace nlite{
                
                CommentReadProperty();
 
-               LPCTSTR GetSectionName();
-               
 
        };
 
@@ -123,8 +123,6 @@ namespace nlite{
                BROWSERTYPE browserType;                                        //\83u\83\89\83E\83U\83^\83C\83v
 
                GeneralProperty();
-
-               LPCTSTR GetSectionName();
                
        };
        
@@ -145,9 +143,6 @@ namespace nlite{
                ///\83R\83\93\83X\83g\83\89\83N\83^
                ///
                MainFrameProperty();
-
-
-               LPCTSTR GetSectionName();
                
                
 

diff --git a/nlite/stdafx.h b/nlite/stdafx.h
index 4cdb229..dbd1b74 100644 (file)
--- a/nlite/stdafx.h
+++ b/nlite/stdafx.h
@@ -45,9 +45,11 @@
 
 
 // TODO: \83v\83\8d\83O\83\89\83\80\82É\95K\97v\82È\92Ç\89Á\83w\83b\83_\81[\82ð\82±\82±\82Å\8eQ\8fÆ\82µ\82Ä\82­\82¾\82³\82¢\81B
+
 #include <atlbase.h>
 #include <atlstr.h>
 #include <atlapp.h>
+
 #include <atlcom.h>
 extern CAppModule _Module;
 #include <atlwin.h>
@@ -59,7 +61,8 @@ extern CAppModule _Module;
 #include <atlframe.h>
 #include <atlctrls.h>
 #include <atlfile.h>
-
+#include <atlctrlx.h>
+#include <atlsplit.h>
 #include <shellapi.h>
 
 #pragma comment(lib,"ComCtl32.lib")