openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Merge pull request #34 from calref/editors-x64

Browse Source 
Pull 64-bit editor support
This commit is contained in:
Sylae Corell
2014-08-01 12:02:37 -06:00
parent 5fa67b54f8 b4757eb2eb
commit 70b31bf786
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Win32/charedit/bladpced.cpp
View File

@@ -27,7 +27,7 @@ void cursor_stay();
Boolean verify_restore_quit(short mode); Boolean verify_restore_quit(short mode);
void max_window(HWND window); void max_window(HWND window);
void update_item_menu(short mode); void update_item_menu(short mode);
void check_cd_event(HWND hwnd,UINT message,UINT wparam,LONG lparam); void check_cd_event(HWND hwnd,UINT message,WPARAM wparam,LPARAM lparam);
scen_item_data_type scen_item_list; scen_item_data_type scen_item_list;
short item_menus_lock=1; short item_menus_lock=1;
@@ -137,7 +137,7 @@ char file_path_name[256];
Boolean block_erase = FALSE; Boolean block_erase = FALSE;
long CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM);
Boolean handle_menu (short, HMENU); Boolean handle_menu (short, HMENU);
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR, int nCmdShow) int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR, int nCmdShow)
@@ -239,7 +239,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR, int nCm
return msg.wParam; return msg.wParam;
} }
long CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HDC hdc; HDC hdc;
PAINTSTRUCT ps; PAINTSTRUCT ps;

10
Win32/charedit/dlogtool.cpp
View File

@@ -157,7 +157,7 @@ short button_ul_y[15] = {0,0,132,23,46, 69,46,69,36,36, 36,23,92,92,0};
short button_width[15] = {23,63,102,16,63, 63,63,63,6,14, 14,63,63,63,30}; short button_width[15] = {23,63,102,16,63, 63,63,63,6,14, 14,63,63,63,30};
short button_height[15] = {23,23,23,13,23, 23,23,23,6,10,10,23,40,40,30}; short button_height[15] = {23,23,23,13,23, 23,23,23,6,10,10,23,40,40,30};
BOOL CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
LRESULT CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
DLGPROC d_proc; DLGPROC d_proc;
@@ -185,7 +185,7 @@ void cd_init_dialogs()
edit_proc = fresh_edit_proc; edit_proc = fresh_edit_proc;
} }
long CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) { switch (message) {
@@ -284,7 +284,7 @@ short cd_create_dialog(short dlog_num,HWND parent)
return 0; return 0;
} }
BOOL CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM, LPARAM) INT_PTR CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM, LPARAM)
{ {
short i,j,k,free_slot = -1,free_item = -1; short i,j,k,free_slot = -1,free_item = -1;
int type,flag; int type,flag;
@@ -475,8 +475,8 @@ BOOL CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM, LPARAM)
std::max<short>(22,item_rect[free_item].bottom - item_rect[free_item].top), std::max<short>(22,item_rect[free_item].bottom - item_rect[free_item].top),
dlgs[free_slot],(HMENU) 150,store_hInstance,NULL); dlgs[free_slot],(HMENU) 150,store_hInstance,NULL);
store_edit_parent = dlgs[free_slot]; store_edit_parent = dlgs[free_slot];
old_edit_proc = (WNDPROC) GetWindowLong(edit_box,GWL_WNDPROC); old_edit_proc = (WNDPROC) GetWindowLongPtr(edit_box,GWLP_WNDPROC);
SetWindowLong(edit_box,GWL_WNDPROC,(LONG) edit_proc); SetWindowLongPtr(edit_box,GWLP_WNDPROC,(LRESULT) edit_proc);
break; break;
} }
win_height = std::max<short>(win_height, item_rect[free_item].bottom + 35); win_height = std::max<short>(win_height, item_rect[free_item].bottom + 35);

8
Win32/charedit/dlogtool.h
View File

@@ -10,9 +10,9 @@ void cd_set_edit_focus();
void cd_init_dialogs(); void cd_init_dialogs();
short cd_create_dialog(short dlog_num,HWND parent) ; short cd_create_dialog(short dlog_num,HWND parent) ;
short cd_kill_dialog(short dlog_num,short parent_message); short cd_kill_dialog(short dlog_num,short parent_message);
short cd_process_click(HWND window,POINT the_point, UINT wparam, LONG lparam,short *item); short cd_process_click(HWND window,POINT the_point, WPARAM wparam, LPARAM lparam,short *item);
short cd_process_syskeystroke(HWND window,UINT wparam, LONG lparam,short *item); short cd_process_syskeystroke(HWND window,WPARAM wparam, LPARAM lparam,short *item);
short cd_process_keystroke(HWND window,UINT wparam, LONG lparam,short *item); short cd_process_keystroke(HWND window,WPARAM wparam, LPARAM lparam,short *item);
void cd_init_button(short dlog_num,short item_num, short button_num, short status); void cd_init_button(short dlog_num,short item_num, short button_num, short status);
void cd_attach_key(short dlog_num,short item_num,char key); void cd_attach_key(short dlog_num,short item_num,char key);
void cd_set_pict(short dlog_num, short item_num, short pict_num); void cd_set_pict(short dlog_num, short item_num, short pict_num);
@@ -44,7 +44,7 @@ void showcursor(Boolean a);
void cd_get_text_edit_str(short dlog_num, char *str); void cd_get_text_edit_str(short dlog_num, char *str);
void cd_set_text_edit_str(short dlog_num, char *str); void cd_set_text_edit_str(short dlog_num, char *str);
void cdsin(short dlog_num, short item_num, short num); void cdsin(short dlog_num, short item_num, short num);
void csit(short dlog_num, short item_num, char *str); void csit(short dlog_num, short item_num, char *str);
void csp(short dlog_num, short item_num, short pict_num); void csp(short dlog_num, short item_num, short pict_num);
void ModalDialog(); void ModalDialog();

4
Win32/scenedit/blscened.cpp
View File

@@ -125,7 +125,7 @@ Boolean block_erase = FALSE;
RECT windRect; RECT windRect;
long CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM);
Boolean handle_menu (short, HMENU); Boolean handle_menu (short, HMENU);
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,LPSTR, int nCmdShow) int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,LPSTR, int nCmdShow)
@@ -253,7 +253,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,LPSTR, int nCmd
return msg.wParam; return msg.wParam;
} }
long CALLBACK WndProc (HWND hwnd, UINT message,WPARAM wParam, LPARAM lParam) LRESULT CALLBACK WndProc (HWND hwnd, UINT message,WPARAM wParam, LPARAM lParam)
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
//RECT s_rect = {0,0,30,30},d_rect = {0,0,30,30},d2 = {0,0,420,216},s2 = {0,0,420,216}; //RECT s_rect = {0,0,30,30},d_rect = {0,0,30,30},d2 = {0,0,420,216},s2 = {0,0,420,216};

12
Win32/scenedit/dlogtool.cpp
View File

@@ -148,8 +148,8 @@ short button_ul_y[15] = {0,0,132,23,46, 69,46,69,36,36, 36,23,92,92,0};
short button_width[15] = {23,63,102,16,63, 63,63,63,6,14, 14,63,63,63,30}; short button_width[15] = {23,63,102,16,63, 63,63,63,6,14, 14,63,63,63,30};
short button_height[15] = {23,23,23,13,23, 23,23,23,6,10,10,23,40,40,30}; short button_height[15] = {23,23,23,13,23, 23,23,23,6,10,10,23,40,40,30};
BOOL CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM wparam, LPARAM lparam); LRESULT CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM wparam, LPARAM lparam);
long CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); LRESULT CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
FARPROC d_proc; FARPROC d_proc;
@@ -182,7 +182,7 @@ void cd_init_dialogs()
edit_proc = (FARPROC) fresh_edit_proc; edit_proc = (FARPROC) fresh_edit_proc;
} }
long CALLBACK fresh_edit_proc(HWND hwnd, UINT message, UINT wParam, LONG lParam) LRESULT CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
short i,cur_box = -1,cur_item_num,item_for_focus = -1,first_edit_box = -1; short i,cur_box = -1,cur_item_num,item_for_focus = -1,first_edit_box = -1;
@@ -301,7 +301,7 @@ short cd_create_dialog(short dlog_num,HWND parent)
return 0; return 0;
} }
BOOL CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
short i,j,k,l,free_slot = -1,free_item = -1,type,flag; short i,j,k,l,free_slot = -1,free_item = -1,type,flag;
char item_str[256]; char item_str[256];
@@ -506,8 +506,8 @@ BOOL CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM wParam, LPARAM
store_edit_parent[l] = dlgs[free_slot]; store_edit_parent[l] = dlgs[free_slot];
store_edit_parent_num[l] = store_dlog_num; store_edit_parent_num[l] = store_dlog_num;
store_edit_item[l] = i; store_edit_item[l] = i;
old_edit_proc[l] = (FARPROC) GetWindowLong(edit_box[l],GWL_WNDPROC); old_edit_proc[l] = (FARPROC) GetWindowLongPtr(edit_box[l],GWLP_WNDPROC);
SetWindowLong(edit_box[l],GWL_WNDPROC,(LONG) edit_proc); SetWindowLongPtr(edit_box[l],GWLP_WNDPROC,(LONG_PTR) edit_proc);
if (focus_set == FALSE) if (focus_set == FALSE)
{ {
SetFocus(edit_box[l]); SetFocus(edit_box[l]);

4
Win32/scenedit/dlogtool.h
View File

@@ -19,7 +19,7 @@ short cd_process_syskeystroke(HWND window,WPARAM wparam, LPARAM lparam,short *it
short cd_process_keystroke(HWND window,WPARAM wparam, LPARAM lparam,short *item); short cd_process_keystroke(HWND window,WPARAM wparam, LPARAM lparam,short *item);
void cd_attach_key(short dlog_num,short item_num,char key); void cd_attach_key(short dlog_num,short item_num,char key);
void cd_set_pict(short dlog_num, short item_num, short pict_num, short custom_pic_type); void cd_set_pict(short dlog_num, short item_num, short pict_num, short custom_pic_type);
void cd_activate_item(short dlog_num, short item_num, short status); void cd_activate_item(short dlog_num, short item_num, short status);
void cd_get_item_text(short dlog_num, short item_num, char *str); void cd_get_item_text(short dlog_num, short item_num, char *str);
void cd_set_item_text(short dlog_num, short item_num, char const *str); void cd_set_item_text(short dlog_num, short item_num, char const *str);
@@ -49,7 +49,7 @@ void showcursor(Boolean a);
void cd_get_text_edit_str(short dlog_num, char *str); void cd_get_text_edit_str(short dlog_num, char *str);
void cdsin(short dlog_num, short item_num, short num); void cdsin(short dlog_num, short item_num, short num);
void csit(short dlog_num, short item_num, char const *str); void csit(short dlog_num, short item_num, char const *str);
void csp(short dlog_num, short item_num, short pict_num, short custom_pic_type); void csp(short dlog_num, short item_num, short pict_num, short custom_pic_type);
void ModalDialog(); void ModalDialog();
RECT calc_rect(short i, short j); RECT calc_rect(short i, short j);