Changeset 761 in dev for trunk

Timestamp:

Oct 22, 2008, 1:26:09 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

SetFontDialog関数でバッファの扱いがおかしかったのを修正。ついでに、ダイアログプロシージャの戻り値のBOOL→INT_PTR化。

File:

• trunk/ab5.0/abdev/abdev/DialogBoxes.cpp (modified) (15 diffs)

trunk/ab5.0/abdev/abdev/DialogBoxes.cpp

@@ -38 +38 @@
     if(bFixedPitchOnly) cf.Flags|=CF_FIXEDPITCHONLY|CF_NOVERTFONTS;
     cf.nFontType=SCREEN_FONTTYPE;
-    lstrcpy((char *)cf.lpTemplateName,"Font select");
+    cf.lpTemplateName = TEXT("Font select");
 
     if(!ChooseFont(&cf)) return 0;
 
-    memcpy(lf,&lfDummy,sizeof(LOGFONT));
+    *lf = lfDummy;
 
     if(lpiPointSize) *lpiPointSize=cf.iPointSize;
@@ -288 +288 @@
 #endif
 }
-BOOL CALLBACK DlgNewProject_Page3(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgNewProject_Page3(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     char buffer[GENERAL_SIZE];
     LPPSHNOTIFY lpPshNotify;
@@ -315 +315 @@
     return 0;
 }
-BOOL CALLBACK DlgNewProject_Page2(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgNewProject_Page2(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern NEWPROJECTINFO NewProjectInfo;
     LPPSHNOTIFY lpPshNotify;
@@ -378 +378 @@
     ShowWindow(GetDlgItem(hDlg,IDC_IMAGE_DIRECTX),nCmd);
 }
-BOOL CALLBACK DlgNewProject_Page1(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgNewProject_Page1(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern NEWPROJECTINFO NewProjectInfo;
     int i;
@@ -584 +584 @@
 
 #ifndef THETEXT
-BOOL CALLBACK DlgNewFile(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgNewFile(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern char NewFileName[MAX_PATH];
 
@@ -798 +798 @@
     projectInfo.modify=1;
 }
-BOOL CALLBACK DlgProjectOption_Whole(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgProjectOption_Whole(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     NMHDR *nmhdr;
 
@@ -833 +833 @@
     return 0;
 }
-BOOL CALLBACK DlgProjectOption_Win32API(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgProjectOption_Win32API(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     NMHDR *nmhdr;
 
@@ -871 +871 @@
     return 0;
 }
-BOOL CALLBACK DlgProjectOption_Manifest(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgProjectOption_Manifest(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     switch(message){
         case WM_INITDIALOG:
@@ -919 +919 @@
     return 0;
 }
-BOOL CALLBACK DlgProjectOption_Debug(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgProjectOption_Debug(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     NMHDR *nmhdr;
     char temporary[MAX_PATH];
@@ -1117 +1117 @@
     return;
 }
-BOOL CALLBACK Dlg_Option_Whole(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK Dlg_Option_Whole(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     NMHDR *nmhdr;
     switch(message){
@@ -1199 +1199 @@
     return 0;
 }
-BOOL CALLBACK Dlg_Option_Editor(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK Dlg_Option_Editor(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern METHODCHECKINFO MethodCheckInfo;
     char str[255];
@@ -1568 +1568 @@
 }
 #endif
-BOOL CALLBACK Dlg_Option_Color(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK Dlg_Option_Color(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     int iPos;
     CTheme *pobj_Theme;
@@ -1833 +1833 @@
     return 0;
 }
-BOOL CALLBACK Dlg_Option_Toolbar(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK Dlg_Option_Toolbar(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     switch(message){
         case WM_INITDIALOG:
@@ -1890 +1890 @@
     return 0;
 }
-BOOL CALLBACK Dlg_Option_Rad(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK Dlg_Option_Rad(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     NMHDR *nmhdr;
     switch(message){
@@ -2019 +2019 @@
     PropertySheet(&psh);
 }
-BOOL CALLBACK DialogAbout(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DialogAbout(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     if(message==WM_INITDIALOG){
         SetPosCenter(hwnd);