OSDN Git Service

2011/11/14 16:28:20
authorqwerty2501 <riot313@gmail.com>
Mon, 14 Nov 2011 07:28:20 +0000 (16:28 +0900)
committerqwerty2501 <riot313@gmail.com>
Mon, 14 Nov 2011 07:28:20 +0000 (16:28 +0900)
17 files changed:
memorypool/vcmpool.c
memorypool/vcmpool.h
nlib/nlib.h
nlite.sln
nlite/nlite.cpp
nlite/nlite.vcxproj
nlite/nlite_appInfo.cpp
nlite/nlite_commentview.h
nlite/nlite_exception.h
nlite/nlite_include.h
nlite/nlite_listviewex.h
nlite/nlite_mailframe.h
nlite/nlite_mainframe.cpp
nlite/stdafx.h
nlite_stub/ReadMe.txt [new file with mode: 0644]
nlite_stub/nlite_stub.cpp [new file with mode: 0644]
nlite_stub/nlite_stub.vcxproj [new file with mode: 0644]

index 738d3bd..dcd8735 100644 (file)
@@ -72,6 +72,7 @@ void *mpool_alloc(size_t siz, mpool_t *pool) {
  */
 void mpool_destroy (mpool_t *pool) {
        mpool_pool_t *p;
+       if(pool == NULL)return;
     for (p=pool->head;p!=NULL;) {
         mpool_pool_t *current = p;
         mpool_pool_t *next    = p->next;
index 1d3b4de..dac4021 100644 (file)
@@ -54,20 +54,4 @@ extern "C" {
 
 
 
-#ifndef  VCMPOOLMAKELIB
-
-#ifdef _DEBUG
-
-#pragma comment(lib, "vcmpool_debug.lib")
-
-#else
-
-#pragma comment(lib,"vcmpool_relese.lib")
-
-#endif
-
-
-
-#endif/* _VCMPOOLMAKELIB_*/
-
 
index 161630f..57d9b97 100644 (file)
@@ -1,8 +1,13 @@
 #pragma once
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <Windows.h>
 #include <qwerty\qwerty_common.h>
 #include <winhttp.h>
-
+#include <shareCookie\browserType.h>
 #ifdef NLIB_EXPORTS
 
 
index 3882263..56b3ef4 100644 (file)
--- a/nlite.sln
+++ b/nlite.sln
@@ -40,6 +40,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memorypool", "memorypool\me
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlite", "nlite\nlite.vcxproj", "{EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlite_stub", "nlite_stub\nlite_stub.vcxproj", "{5150C843-E70B-4696-8F08-11B900B7F91F}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -92,6 +94,12 @@ Global
                {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}.Debug-window|Win32.Build.0 = Debug-window|Win32
                {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}.Release|Win32.ActiveCfg = Release|Win32
                {EB0B5264-9BB4-4EE3-B196-A0472DCB32A8}.Release|Win32.Build.0 = Release|Win32
+               {5150C843-E70B-4696-8F08-11B900B7F91F}.Debug|Win32.ActiveCfg = Debug|Win32
+               {5150C843-E70B-4696-8F08-11B900B7F91F}.Debug|Win32.Build.0 = Debug|Win32
+               {5150C843-E70B-4696-8F08-11B900B7F91F}.Debug-window|Win32.ActiveCfg = Debug-window|Win32
+               {5150C843-E70B-4696-8F08-11B900B7F91F}.Debug-window|Win32.Build.0 = Debug-window|Win32
+               {5150C843-E70B-4696-8F08-11B900B7F91F}.Release|Win32.ActiveCfg = Release|Win32
+               {5150C843-E70B-4696-8F08-11B900B7F91F}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 9171433..664f180 100644 (file)
@@ -24,7 +24,9 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE,
                        throw AppInitException();
                }
                        
-               InitializeNlite();
+               if(InitializeNlite() != TRUE){
+                       throw AppInitException();
+               }
                
 
                
@@ -37,13 +39,20 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE,
                wnd.ShowWindow(nCmdShow);
                wnd.UpdateWindow();
 
+               _heapmin();
+
                nRet = theLoop.Run();
 
+               vcassert(_heapchk() == -2,TEXT("\83q\81[\83v\83G\83\89\81[\82Å\82·"));
+
                _Module.RemoveMessageLoop();
-       } catch(std::exception e){
+       } catch(Exception e){
+
+               MessageBox(NULL,e.what(),TEXT("\83A\83v\83\8a\83P\81[\83V\83\87\83\93\83G\83\89\81["),MB_OK);
+       }catch(std::exception e){
 
                MessageBoxA(NULL,e.what(),"\83A\83v\83\8a\83P\81[\83V\83\87\83\93\83G\83\89\81[",MB_OK);
-       }
+       } 
 
        FinalizeNlite();
        _Module.Term();
index 623a0e8..32712e7 100644 (file)
@@ -54,6 +54,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(solutiondir)nlib\;$(solutiondir)memorypool\;$(solutiondir)shareCookie\;$(solutiondir);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
index a6373c3..f98b2b6 100644 (file)
@@ -74,7 +74,7 @@ CApplicationInfo::CApplicationInfo(){
 
                }
 
-               throw err;
+               
 
 
        } catch (const AppInitException& e){
index c964812..925fb21 100644 (file)
@@ -1,16 +1,43 @@
 #pragma once
 
 namespace nlite{
+
+       
        class CCommentView : public CListViewEx<CCommentView>{
 
+
+               class CCommentList{
+
+               private:
+                       mpool_t *pool;
+
+               public:
+                       CCommentList()
+                               :pool(NULL)
+                       {}
+                       ~CCommentList(){
+
+                               mpool_destroy(pool);
+                       }
+               };
+       private:
+               const UINT menuOrID;
+               CCommentList commentlist;
+       
+               
+
+
        public:
 
+               CCommentView()
+                       :menuOrID(256){}
+
                HWND Create(HWND hWndParent){
                        static LPTSTR columns[] = {TEXT("\83R\83\81\94Ô"),TEXT("\83\86\81[\83U\81[\96¼"),TEXT("\83R\83\81\83\93\83g"),TEXT("\8e\9e\8aÔ"),TEXT("\8fî\95ñ")};
                        static UINT_PTR holizenSize[] = {0,0,100,0,0};
                        static HEADERSINFO headersinfo = {columns,holizenSize,ARRAY_LENGTH(columns)};
                        
-                       return __super::Create(hWndParent,&headersinfo);
+                       return __super::Create(hWndParent,&headersinfo,menuOrID);
                }
        
        };
index 01fcfd8..7bf0967 100644 (file)
@@ -6,14 +6,19 @@ namespace nlite{
        ///
        class Exception:public std::exception{
                        
-
+               std::wstring  wErrMessage;
 
                //\83R\83\93\83X\83g\83\89\83N\83^
        public:
                Exception(){}
                Exception(const char* const& errMessage):exception(errMessage){}
+               Exception(const wchar_t * const & errMessage):wErrMessage(errMessage){}
+
+               LPCWSTR what(){
 
+                       return wErrMessage.c_str();
 
+               }
 
        };
 
@@ -22,12 +27,23 @@ namespace nlite{
 
        public:
 
-               AppInitException():Exception("\83A\83v\83\8a\83P\81[\83V\83\87\83\93\8f\89\8aú\89»\82É\8e¸\94s\82µ\82Ü\82µ\82½"){}
+               AppInitException():Exception(TEXT("\83A\83v\83\8a\83P\81[\83V\83\87\83\93\8f\89\8aú\89»\82É\8e¸\94s\82µ\82Ü\82µ\82½")){}
 
 
                
        };
 
+       class NLIBException : public Exception{
+
+       private:
+
+               NLIB_RESULT errcode;
+
+       public:
+               NLIBException(NLIB_RESULT rslt):errcode(rslt){}
+       
+
+       };
        
 
 
index e784cdc..80c6c70 100644 (file)
@@ -3,7 +3,9 @@
 
 #include <qwerty\qwerty_common.h>
 #include <qwerty\windebuger.h>
-
+#include <nlib.h>
+#include <nlib_define.h>
+#include <vcmpool.h>
 #include "resource.h"
 #include "nlite_common.h"
 
@@ -13,4 +15,9 @@
 #include "nlite_exception.h"
 #include "nlite_appinfo.h"
 #include "nlite.h"
-#include "nlite_mailframe.h"
\ No newline at end of file
+#include "nlite_mailframe.h"
+
+
+
+#pragma comment(lib, "memorypool.lib")
+#pragma comment(lib,"nlite_stub.lib")
\ No newline at end of file
index 5158915..c246af6 100644 (file)
@@ -17,13 +17,37 @@ namespace nlite{
 
                CHeaderCtrl header;
                CListBox  listBox;
-               CListViewCtrl list;
-               
-               
+               UINT_PTR columnHolSizeSum;
+               const UINT headerID;
+               const UINT listBoxID;
+               HFONT hHeaderFontNew;
                
        public:
 
-               
+               CListViewEx():
+                       columnHolSizeSum(0),
+                       headerID(257),
+                       listBoxID(258){
+
+                       LOGFONT lf = {0};
+
+                       lf.lfHeight = 10;
+                       lf.lfCharSet = SHIFTJIS_CHARSET;
+
+
+                       hHeaderFontNew = CreateFontIndirect(&lf);
+
+
+               }
+
+               ~CListViewEx(){
+
+                       DeleteObject(hHeaderFontNew);
+
+               }
+
+
+
 
                DECLARE_WND_CLASS(LISTVIEW_EX)
 
@@ -89,37 +113,26 @@ namespace nlite{
                                
                                
 
-               vcverify(header.Create(m_hWnd,0,WC_HEADER,WS_CHILD | WS_VISIBLE | WS_BORDER | HDS_BUTTONS),TEXT("\83w\83b\83_\81[\8dì\90¬\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
-               vcverify(listBox.Create(m_hWnd,0,WC_LISTBOX,WS_CHILD | WS_VISIBLE | WS_BORDER),TEXT("\83\8a\83X\83g\83{\83b\83N\83X\8dì\90¬\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
+               vcverify(header.Create(m_hWnd,0,WC_HEADER,WS_CHILD | WS_VISIBLE   | HDS_BUTTONS | HDS_HOTTRACK | HDS_DRAGDROP,0,headerID),TEXT("\83w\83b\83_\81[\8dì\90¬\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
+               vcverify(listBox.Create(m_hWnd,0,WC_LISTBOX,WS_CHILD | WS_VISIBLE   | LBS_DISABLENOSCROLL | LBS_OWNERDRAWVARIABLE | LBS_NOTIFY | LBS_NODATA,0,listBoxID),TEXT("\83\8a\83X\83g\83{\83b\83N\83X\8dì\90¬\82É\8e¸\94s\82µ\82Ü\82µ\82½"));
 
                
-               
                return 0;
        }
 
 
 
        protected:
-               HWND Create(HWND hWndParent,LPHEADERSINFO infos){
+               HWND Create(HWND hWndParent,LPHEADERSINFO infos,ATL::_U_MENUorID menuOrID){
                        
-                       HWND rslt = __super::Create(hWndParent,0,LISTVIEW_EX,WS_VISIBLE | WS_CHILD);
+                       HWND rslt = __super::Create(hWndParent,0,LISTVIEW_EX,WS_VISIBLE | WS_CHILD  | WS_BORDER,0,menuOrID);
 
                        if(rslt == NULL){
                                static AppInitException err;
                                throw err;
                        }
+               
                        
-
-
-                       
-                       
-                       LOGFONT lf = {0};
-
-                       lf.lfHeight = 12;
-                       lf.lfCharSet = SHIFTJIS_CHARSET;
-
-
-                       HFONT hHeaderFontNew = CreateFontIndirect(&lf);
                        header.SetFont(hHeaderFontNew);
                        
                        
@@ -134,15 +147,20 @@ namespace nlite{
                        HDC hdc = header.BeginPaint(&ps);
                        SIZE size;
 
+                       HFONT hOld = (HFONT)SelectObject(hdc,hHeaderFontNew);
+
                        for(UINT_PTR index = 0;index < infos->count ;++index){
 
                                item.pszText = infos->columns[index];
 
                                GetTextExtentPoint32(hdc , item.pszText , _tcslen(item.pszText) , &size);
-                               item.cxy = size.cx + 10 + infos->holizensize[index];
+                               item.cxy = size.cx + 15 + infos->holizensize[index];
+                               columnHolSizeSum += item.cxy;
                                header.InsertItem(index,&item);
                        }
 
+                       SelectObject(hdc,hOld);
+
                        header.EndPaint(&ps);
                        
                        
@@ -152,6 +170,13 @@ namespace nlite{
                }
 
 
+       public:
+               UINT_PTR GetColumnHolSizeSum(){
+
+                       return columnHolSizeSum;
+               }
+
+
        };
        
 
index 31f0268..580f119 100644 (file)
@@ -4,7 +4,101 @@ namespace nlite{
        
 
        
-       const static LPCTSTR NLITE_MAINWINDOW = _T("nlite");
+       const static LPCTSTR NLITE_MAINWINDOW = TEXT("nlite");
+
+       class CLiveUserData {
+
+       public:
+
+               CCommentView &commentView;
+
+       
+               CLiveUserData(CCommentView& cv):commentView(cv){}
+
+       };
+
+       class CNicoVideoAuth{
+
+       private:
+               NicoVideoAuth_P nicoVideoAuth;
+
+
+       public:
+               CNicoVideoAuth()
+                       :nicoVideoAuth(NicoVideoAuth_new()){}
+
+               ~CNicoVideoAuth(){
+
+                       NicoVideoAuth_delete(&nicoVideoAuth);
+               }
+
+               VOID SetBrowserType(BROWSERTYPE bt){
+                       NLIB_RESULT rslt;
+
+                       rslt = NicoVideoAuth_getNicoVideoAuth(nicoVideoAuth,bt);
+                       if(rslt != NLIB_ERR_OK){
+
+                               throw NLIBException(rslt);
+                       }
+
+               }
+
+               NicoVideoAuth_P GetAuth(){
+
+                       return this->nicoVideoAuth;
+               }
+
+       };
+
+       class CNicoLiveStream{
+
+       private:
+               NicoLiveStream_P nicoLiveStream;
+               
+
+       public:
+               CNicoLiveStream()
+                       :nicoLiveStream(NicoLiveStream_new())   
+               {}
+               ~CNicoLiveStream(){
+
+                       NicoLiveStream_delete(&nicoLiveStream);
+                       
+               }
+
+               
+
+               VOID Connect(CNicoVideoAuth &nicoVideoAuth,LPCTSTR url,NicoRecvCallBack callback,LPVOID option){
+
+                       NLIB_RESULT rslt;
+
+                       rslt = NicoLiveStream_connect(nicoLiveStream,nicoVideoAuth.GetAuth(),url,callback,option);
+
+                       if(rslt != NLIB_ERR_OK){
+
+                               throw NLIBException(rslt);
+                       }
+               }
+               
+
+               VOID DisConnect(){
+
+                       NicoLiveStream_disConnect(nicoLiveStream);
+               }
+               
+               VOID SendChat(LPCTSTR chatBuf,std::vector<LPCTSTR> mails,std::vector<LPCTSTR> extends){
+                       NLIB_RESULT rslt;
+                       mails.insert( mails.end(),(LPCTSTR)NULL);
+                       extends.insert(extends.end(),(LPCTSTR)NULL);
+                       rslt = NicoLiveStream_sendChat(nicoLiveStream,chatBuf,&mails[0],&extends[0]);
+
+                       if(rslt != NLIB_ERR_OK){
+                               throw NLIBException(rslt);
+                       }
+               }
+               
+
+       };
 
        class CNliteMainFrame : public CFrameWindowImpl<CNliteMainFrame>,
                /*public CUpdateUI<CNliteMainFrame>,*/public CMessageFilter, public CIdleHandler
@@ -19,8 +113,12 @@ namespace nlite{
                DECLARE_FRAME_WND_CLASS(NULL,IDC_NLITE);
        private:
                CCommentView commentView;
+               CNicoLiveStream nicoLiveStream;
+               CNicoVideoAuth nicoVideoAuth;
                CStatusBarCtrl statusBar;
-
+               CLiveUserData userData;
+               CTabCtrl tabctrl;
+               HFONT hTabFont;
        private:
 
                // \83\81\83b\83Z\81[\83W\83t\83B\83\8b\83^\8f\88\97\9d
@@ -38,6 +136,20 @@ namespace nlite{
 
        public:
 
+               CNliteMainFrame():userData(commentView){
+                       LOGFONT lf = {0};
+
+                       lf.lfHeight = 12;
+                       lf.lfCharSet = SHIFTJIS_CHARSET;
+                       hTabFont = CreateFontIndirect(&lf);
+
+               }
+
+               ~CNliteMainFrame(){
+
+                       DeleteObject(hTabFont);
+               }
+
                /*
                BEGIN_UPDATE_UI_MAP(CNliteMainFrame)
                        // \83G\83\93\83g\83\8a\82È\82µ
@@ -47,7 +159,7 @@ namespace nlite{
                BEGIN_MSG_MAP_EX(CNliteMainFrame)
                        MSG_WM_CREATE(OnCreate)
                        MSG_WM_DESTROY(OnDestroy)
-                       MSG_WM_SIZING(OnSizing)
+                       MESSAGE_HANDLER(WM_SIZING,OnSizing)
                        MESSAGE_HANDLER(WM_SIZE,OnSize);
                        
                        COMMAND_ID_HANDLER_EX(IDM_EXIT, OnMenuExit)
@@ -58,16 +170,19 @@ namespace nlite{
                END_MSG_MAP()
 
                //\83T\83C\83Y\95Ï\8dX\92\86
-               VOID OnSizing(UINT wParam,LPRECT lParam){
+               LRESULT OnSizing(UINT uMsg,WPARAM wParam,LPARAM lParam,BOOL& bHandled){
 
+                       
                        RECT client;
                        GetClientRect(&client);
 
                        ChangeSize( _WTYPES_NS::CSize(client.right - client.left,client.bottom - client.top));
-
                        
                        
-                       return;
+
+                       bHandled = FALSE;
+                       
+                       return 0;
 
                }
                
@@ -91,25 +206,8 @@ namespace nlite{
                VOID ChangeSize(const SIZE& client);
 
 
-               LRESULT OnCreate(LPCREATESTRUCT lpcs){
-                       // \83c\81[\83\8b\83o\81[\82ð\8dì\90¬
-                       //CreateSimpleToolBar();
+               LRESULT 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½"));
-//                     vcverify(UIAddStatusBar(m_hWndStatusBar),TEXT("\83X\83e\81[\83^\83X\83o\81[\93o\98^\82É\82µ\83b\83p\82µ\82Ü\82µ\82½"));
-                       commentView.Create(m_hWnd);
-                       
-
-                       
-                       
-                       
-                       // \83\81\83b\83Z\81[\83W\83\8b\81[\83v\82É\83\81\83b\83Z\81[\83W\83t\83B\83\8b\83^\82Æ\83A\83C\83h\83\8b\83n\83\93\83h\83\89\82ð\92Ç\89Á
-                       CMessageLoop* pLoop = _Module.GetMessageLoop();
-                       pLoop->AddMessageFilter(this);
-                       pLoop->AddIdleHandler(this);
-                       return 0;
-               }
 
 
                
@@ -133,6 +231,9 @@ namespace nlite{
                }
        };
 
+
+
+
        
 
 }
\ No newline at end of file
index 2b30e7e..7378c6d 100644 (file)
@@ -2,7 +2,8 @@
 #include "nlite_include.h"
 
 using namespace nlite;
-static const RECT commentViewSize = {20,20,20,40};
+static const RECT tabSize = {0,20,0,40};
+static const RECT commentViewSize = {tabSize.left + 5,tabSize.top + 25,tabSize.right + 5,tabSize.bottom + 30};
 
 
 //\83T\83C\83Y\95Ï\8dX\8f\88\97\9d
@@ -10,10 +11,58 @@ VOID CNliteMainFrame::ChangeSize(const SIZE& client){
 
 
        
+       tabctrl.MoveWindow(tabSize.left,tabSize.top,client.cx - (tabSize.left + tabSize.right),client.cy - (tabSize.bottom + tabSize.top));
+       
+
+       RECT tabClientRect;
+       tabctrl.GetClientRect(&tabClientRect);
+       tabctrl.AdjustRect(FALSE,&tabClientRect);
+
+       
+       
 
-       commentView.MoveWindow(commentViewSize.left , commentViewSize.top,client.cx - (commentViewSize.left + commentViewSize.right), client.cy - (commentViewSize.top + commentViewSize.bottom));
+       commentView.MoveWindow(tabClientRect.left, tabClientRect.top,tabClientRect.right - tabClientRect.left, tabClientRect.bottom - tabClientRect.top - 5);
 
+       
+       
 
 
        return;
+}
+
+LRESULT CNliteMainFrame::OnCreate(LPCREATESTRUCT lpcs){
+       // \83c\81[\83\8b\83o\81[\82ð\8dì\90¬
+       //CreateSimpleToolBar();
+
+       // \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½"));
+//                     vcverify(UIAddStatusBar(m_hWndStatusBar),TEXT("\83X\83e\81[\83^\83X\83o\81[\93o\98^\82É\82µ\83b\83p\82µ\82Ü\82µ\82½"));
+       tabctrl.Create(m_hWnd,0,NULL,WS_CHILD | WS_DLGFRAME);
+       commentView.Create(tabctrl.m_hWnd);
+       
+
+       
+       tabctrl.SetFont(hTabFont);
+       
+               
+       tabctrl.SetWindowPos(HWND_BOTTOM,0,0,0,0,SWP_SHOWWINDOW);
+       tabctrl.AddItem(TCIF_TEXT | TCIF_PARAM, _T("\83R\83\81\83\93\83g\88ê\97\97"), 0, (DWORD)commentView.m_hWnd);
+               
+       // \83\81\83b\83Z\81[\83W\83\8b\81[\83v\82É\83\81\83b\83Z\81[\83W\83t\83B\83\8b\83^\82Æ\83A\83C\83h\83\8b\83n\83\93\83h\83\89\82ð\92Ç\89Á
+       CMessageLoop* pLoop = _Module.GetMessageLoop();
+       pLoop->AddMessageFilter(this);
+       pLoop->AddIdleHandler(this);
+
+       RECT wndRect;
+       this->GetWindowRect(&wndRect);
+       
+       LONG cyMaxImized = GetSystemMetrics (SM_CYMAXIMIZED);
+       wndRect.bottom = (LONG)cyMaxImized / 2;
+       wndRect.right = commentViewSize.left + commentViewSize.right + 20 + commentView.GetColumnHolSizeSum();
+
+       this->MoveWindow(wndRect.left,wndRect.top,wndRect.right,wndRect.bottom);
+       
+       
+
+       return 0;
 }
\ No newline at end of file
index cec8887..3eef542 100644 (file)
@@ -24,6 +24,7 @@
 // C++\83\89\83C\83u\83\89\83\8a
 #include <string>
 #include <exception>
+#include <vector>
 
 
 // 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
diff --git a/nlite_stub/ReadMe.txt b/nlite_stub/ReadMe.txt
new file mode 100644 (file)
index 0000000..9404a45
--- /dev/null
@@ -0,0 +1,34 @@
+========================================================================
+    スタティック ライブラリ: nlite_stub プロジェクトの概要
+========================================================================
+
+この nlite_stub ライブラリ プロジェクトは、AppWizard 
+により作成されました。
+
+ソース ファイルはプロジェクトの一部として作成されませんでした。
+
+
+nlite_stub.vcxproj
+    これは、アプリケーション ウィザードを使用して生成された VC++ 
+    プロジェクトのメイン プロジェクト ファイルです。
+    ファイルを生成した Visual C++ のバージョンに関する情報と、アプリケーション 
+    ウィザードで選択されたプラットフォーム、
+    構成、およびプロジェクト機能に関する情報が含まれています。
+
+nlite_stub.vcxproj.filters
+    これは、アプリケーション ウィザードで生成された VC++ プロジェクトのフィルター 
+    ファイルです。 
+    このファイルには、プロジェクト内のファイルとフィルターとの間の関連付けに関する
+    情報が含まれています。 この関連付けは、特定のノー
+    ドで同様の拡張子を持つファイルのグループ化を
+    示すために IDE で使用されます (たとえば、".cpp" ファイルは "ソース ファイル" 
+    フィルターに関連付けられています)。
+
+/////////////////////////////////////////////////////////////////////////////
+その他のメモ :
+
+AppWizard では "TODO:" 
+コメントを使用して、ユーザーが追加またはカスタマイズする必要のあるソース 
+コードを示します。
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/nlite_stub/nlite_stub.cpp b/nlite_stub/nlite_stub.cpp
new file mode 100644 (file)
index 0000000..a96fc92
--- /dev/null
@@ -0,0 +1,28 @@
+#include <nlib\nlib.h>
+#include <stdio.h>
+#include <memory.h>
+#include <stdlib.h>
+
+NicoLiveStream_P NicoLiveStream_new(){
+
+
+       return (NicoLiveStream_P)malloc(65536);
+}
+
+VOID NicoLiveStream_delete(NicoLiveStream_P* self){
+
+       free(*self);
+       *self = NULL;
+       return;
+}
+
+NicoVideoAuth_P NicoVideoAuth_new(){
+
+       return (NicoVideoAuth_P)malloc(65536);
+}
+
+VOID NicoVideoAuth_delete(NicoVideoAuth_P *self){
+
+       free(*self);
+       *self= NULL;
+}
\ No newline at end of file
diff --git a/nlite_stub/nlite_stub.vcxproj b/nlite_stub/nlite_stub.vcxproj
new file mode 100644 (file)
index 0000000..bb538bd
--- /dev/null
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug-window|Win32">
+      <Configuration>Debug-window</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5150C843-E70B-4696-8F08-11B900B7F91F}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>nlite_stub</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(solutiondir);$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
+    <IncludePath>$(Solutiondir);$(Solutiondir)include\;$(IncludePath)</IncludePath>
+    <TargetExt>.lib</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="nlite_stub.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file