aboutsummaryrefslogtreecommitdiff
path: root/Linux_C_12
diff options
context:
space:
mode:
authorCamil Staps2015-07-06 15:31:13 +0200
committerCamil Staps2015-07-06 15:31:13 +0200
commita63390fb65054e3fa272c06e874e8dc1f5984bdf (patch)
tree9dc1ac75a69b6e0ee3c8821e04c4b1f0132dd2df /Linux_C_12
parentLibrary malloc fix (diff)
Casting warnings
Diffstat (limited to 'Linux_C_12')
-rw-r--r--Linux_C_12/cCrossCallClipboard_121.c3
-rw-r--r--Linux_C_12/cCrossCallFileSelectors_121.c14
-rw-r--r--Linux_C_12/cCrossCallMenus_121.c8
-rw-r--r--Linux_C_12/cCrossCallWindows_121.c52
-rw-r--r--Linux_C_12/cCrossCall_121.c13
-rw-r--r--Linux_C_12/cCrossCall_121.h24
-rw-r--r--Linux_C_12/cCrossCallxDI_121.c16
-rw-r--r--Linux_C_12/util_121.h14
8 files changed, 73 insertions, 71 deletions
diff --git a/Linux_C_12/cCrossCallClipboard_121.c b/Linux_C_12/cCrossCallClipboard_121.c
index bc7e2df..014349b 100644
--- a/Linux_C_12/cCrossCallClipboard_121.c
+++ b/Linux_C_12/cCrossCallClipboard_121.c
@@ -8,6 +8,7 @@
About this module:
Routines related to clipboard handling.
********************************************************************************************/
+#include <string.h>
#include "cCrossCallClipboard_121.h"
#include "cCrossCall_121.h"
@@ -42,7 +43,7 @@ void EvalCcRqGETCLIPBOARDTEXT (CrossCallInfo *pcci) /* no params; string resul
result = g_strdup(text);
g_free(text);
- MakeReturn1Cci (pcci, (int) result);
+ MakeReturn1Cci (pcci, (int64_t) result);
}
/* Install the cross call procedures in the gCrossCallProcedureTable of cCrossCall_121.
diff --git a/Linux_C_12/cCrossCallFileSelectors_121.c b/Linux_C_12/cCrossCallFileSelectors_121.c
index c36e6d8..ff06bc0 100644
--- a/Linux_C_12/cCrossCallFileSelectors_121.c
+++ b/Linux_C_12/cCrossCallFileSelectors_121.c
@@ -47,13 +47,13 @@ void EvalCcRqDIRECTORYDIALOG (CrossCallInfo *pcci) /* no params; bool, textptr
file_name = g_strdup(fname);
gtk_widget_destroy(file_selector);
- MakeReturn2Cci(pcci, gtk_true(), (int) file_name);
+ MakeReturn2Cci(pcci, gtk_true(), (int64_t) file_name);
return;
}
else
{
gtk_widget_destroy(file_selector);
- MakeReturn2Cci(pcci, gtk_false(), (int) NULL);
+ MakeReturn2Cci(pcci, gtk_false(), (int64_t) NULL);
return;
}
}
@@ -93,13 +93,13 @@ void EvalCcRqFILEOPENDIALOG (CrossCallInfo *pcci) /* no params; bool, textptr
file_name = g_strdup(fname);
gtk_widget_destroy(file_selector);
- MakeReturn2Cci(pcci, gtk_true(), (int) file_name);
+ MakeReturn2Cci(pcci, gtk_true(), (int64_t) file_name);
return;
}
else
{
gtk_widget_destroy(file_selector);
- MakeReturn2Cci(pcci, gtk_false(), (int) NULL);
+ MakeReturn2Cci(pcci, gtk_false(), (int64_t) NULL);
return;
}
}
@@ -117,7 +117,7 @@ void EvalCcRqFILESAVEDIALOG (CrossCallInfo *pcci) /* promptptr, nameptr; bool,
gtk_window_set_transient_for(GTK_WINDOW(file_selector), GTK_WINDOW(gActiveTopLevelWindow));
}
- gtk_file_selection_set_filename(file_selector, (gchar *) pcci->p2);
+ gtk_file_selection_set_filename((GtkFileSelection*) file_selector, (gchar *) pcci->p2);
for (;;)
{
@@ -143,13 +143,13 @@ void EvalCcRqFILESAVEDIALOG (CrossCallInfo *pcci) /* promptptr, nameptr; bool,
file_name = g_strdup(fname);
gtk_widget_destroy(file_selector);
- MakeReturn2Cci(pcci, gtk_true(), (int) file_name);
+ MakeReturn2Cci(pcci, gtk_true(), (int64_t) file_name);
return;
}
else
{
gtk_widget_destroy(file_selector);
- MakeReturn2Cci(pcci, gtk_false(), (int) NULL);
+ MakeReturn2Cci(pcci, gtk_false(), (int64_t) NULL);
return;
}
}
diff --git a/Linux_C_12/cCrossCallMenus_121.c b/Linux_C_12/cCrossCallMenus_121.c
index c59e9ca..8ca3cda 100644
--- a/Linux_C_12/cCrossCallMenus_121.c
+++ b/Linux_C_12/cCrossCallMenus_121.c
@@ -269,7 +269,7 @@ void EvalCcRqINSERTSEPARATOR (CrossCallInfo *pcci) /* hmenu, pos no result. */
gtk_menu_insert(GTK_MENU(menu), menu_item, (gint) pcci->p2);
gtk_widget_show_all(menu_item);
- MakeReturn1Cci (pcci, (int) menu_item);
+ MakeReturn1Cci (pcci, (int64_t) menu_item);
}
void EvalCcRqMODIFYMENU (CrossCallInfo *pcci) /* hitem, hmenu, textptr; no result. */
@@ -338,7 +338,7 @@ void EvalCcRqINSERTMENU (CrossCallInfo *pcci)
rfree(title);
printf("New menu is called: %s\n", gtk_menu_get_title((GtkMenu*)root_menu));
- MakeReturn1Cci (pcci, (int) sub_menu);
+ MakeReturn1Cci (pcci, (int64_t) sub_menu);
}
static void enable_menu_callback(GtkWidget *menu_item, gpointer data)
@@ -416,7 +416,7 @@ void EvalCcRqTRACKPOPMENU (CrossCallInfo *pcci) /* popupmenu,framePtr; BOOL resu
gdk_event_get_time(event));
}
- MakeReturn1Cci (pcci,(int)gtk_true());
+ MakeReturn1Cci (pcci,(int64_t)gtk_true());
}
void EvalCcRqCREATEPOPMENU (CrossCallInfo *pcci) /* no params; MENU result. */
@@ -428,7 +428,7 @@ void EvalCcRqCREATEPOPMENU (CrossCallInfo *pcci) /* no params; MENU result. */
* This menu should be added to a menu bar.
*/
printf("EvalCcRqCREATEPOPMENU\n");
- MakeReturn1Cci (pcci, (int) gtk_menu_new());
+ MakeReturn1Cci (pcci, (int64_t) gtk_menu_new());
}
void EvalCcRqCHECKMENUITEM (CrossCallInfo *pcci) /* menu, HITEM, on/off; no result. */
diff --git a/Linux_C_12/cCrossCallWindows_121.c b/Linux_C_12/cCrossCallWindows_121.c
index 93509c2..c0b2a22 100644
--- a/Linux_C_12/cCrossCallWindows_121.c
+++ b/Linux_C_12/cCrossCallWindows_121.c
@@ -15,6 +15,7 @@
#include "cCrossCall_121.h"
#include "cCrossCallxDI_121.h"
#include <gdk/gdkkeysyms.h>
+#include <string.h>
/* Global data:
*/
@@ -468,7 +469,7 @@ void EvalCcRqBEGINPAINT (CrossCallInfo *pcci) /* hwnd; HDC result. */
*/
rprintf("EvalCcRqBEGINPAINT -> not implemented\n");
- MakeReturn1Cci (pcci, (int) NULL /*hdc*/);
+ MakeReturn1Cci (pcci, (int64_t) NULL /*hdc*/);
}
void EvalCcRqENDPAINT (CrossCallInfo *pcci) /* hwnd; no result. */
@@ -519,12 +520,12 @@ void EvalCcRqDESTROYMDIDOCWINDOW (CrossCallInfo *pcci) /* hwndFrame, hwndClient,
static gint client_expose_handler(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
{
printf("client_expose_handler\n");
- SendMessage6ToClean(CcWmPAINT, (int)gtk_widget_get_parent(gtk_widget_get_parent(widget)),
+ SendMessage6ToClean(CcWmPAINT, (int64_t)gtk_widget_get_parent(gtk_widget_get_parent(widget)),
event->area.x,
event->area.y,
event->area.x+event->area.width,
event->area.y+event->area.height,
- (int) GDK_DRAWABLE(event->window));
+ (int64_t) GDK_DRAWABLE(event->window));
return GTK_WIDGET_GET_CLASS(widget)->expose_event(widget,event);
}
@@ -715,7 +716,7 @@ void EvalCcRqCREATESDIDOCWINDOW (CrossCallInfo *pcci) /* textptr, frameptr, pack
gdk_window_set_events(GTK_BIN(sw)->child->window,
gdk_window_get_events(GTK_BIN(sw)->child->window) | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
fprintf(stderr,"EvalCcRqCREATESDIDOCWINDOW - window: %d sw: %d\n",window,sw);
- MakeReturn1Cci (pcci, (int) sw);
+ MakeReturn1Cci (pcci, (int64_t) sw);
}
/* Create MDI child window. */
@@ -792,7 +793,7 @@ void EvalCcRqCREATEMDIDOCWINDOW (CrossCallInfo *pcci) /* textptr, clientPtr, be
gdk_window_set_events(GTK_BIN(sw)->child->window,
gdk_window_get_events(GTK_BIN(sw)->child->window) | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
- MakeReturn1Cci (pcci, (int) sw);
+ MakeReturn1Cci (pcci, (int64_t) sw);
}
void EvalCcRqSETWINDOWTITLE (CrossCallInfo *pcci) /* hwnd, textptr no result. */
@@ -903,7 +904,7 @@ void EvalCcRqGETWINDOWTEXT (CrossCallInfo *pcci) /* hwnd; textptr result. */
textptr = g_strdup(title);
}
- MakeReturn1Cci (pcci, (gint) textptr);
+ MakeReturn1Cci (pcci, (int64_t) textptr);
}
/* Update rect part of a window. */
@@ -1224,8 +1225,7 @@ void EvalCcRqSETSCROLLRANGE (CrossCallInfo *pcci) /* hwnd, iBar, min, max, redra
max = pcci->p4;
redraw = pcci->p5;
- parent = GTK_SCROLLED_WINDOW(
- gtk_widget_get_ancestor(widget, GTK_TYPE_SCROLLED_WINDOW));
+ parent = (GtkWidget*) GTK_SCROLLED_WINDOW(gtk_widget_get_ancestor(widget, GTK_TYPE_SCROLLED_WINDOW));
if (GTK_IS_SCROLLED_WINDOW(widget))
{
@@ -1387,7 +1387,7 @@ static void dialog_focus_out_handler(GtkWidget *widget, GdkEventFocus *event, gp
static gboolean dialog_close_handler(GtkWidget *dialog, GdkEvent *event, gpointer user_data)
{
printf("dialog_close_handler\n");
- SendMessage1ToClean(CcWmCLOSE, (int) dialog);
+ SendMessage1ToClean(CcWmCLOSE, (int64_t) dialog);
gtk_signal_emit_stop_by_name(GTK_OBJECT(dialog), "delete-event");
return gtk_true();
}
@@ -1425,7 +1425,7 @@ void EvalCcRqCREATEDIALOG (CrossCallInfo *pcci) // textptr,parentptr,behindPtr;
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), fixed, TRUE, TRUE, 0);
gtk_widget_show(fixed);
- SendMessage1ToClean (CcWmINITDIALOG, (int) dialog);
+ SendMessage1ToClean (CcWmINITDIALOG, (int64_t) dialog);
x = gCci.p1;
y = gCci.p2;
@@ -1458,7 +1458,7 @@ void EvalCcRqCREATEDIALOG (CrossCallInfo *pcci) // textptr,parentptr,behindPtr;
printf("Dialog width: %d\n", w);
- MakeReturn1Cci (pcci, (int) dialog);
+ MakeReturn1Cci (pcci, (int64_t) dialog);
}
// Create modal dialogues.
@@ -1496,7 +1496,7 @@ void EvalCcRqCREATEMODALDIALOG (CrossCallInfo *pcci) /* textptr,parentptr; error
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), fixed, TRUE, TRUE, 0);
gtk_widget_show(fixed);
- SendMessage1ToClean (CcWmINITDIALOG, (int) dialog);
+ SendMessage1ToClean (CcWmINITDIALOG, (int64_t) dialog);
x = gCci.p1;
y = gCci.p2;
@@ -1731,7 +1731,7 @@ void EvalCcRqCREATECOMPOUND (CrossCallInfo *pcci) /* hwnd, packed pos,w,h, scrol
SetWindowPos (compoundhandle, HWND_BOTTOM, 0,0,0,0, SWP_NOMOVE+SWP_NOSIZE); // This should implement control stack
#endif
printf("EvalCcRqCREATECOMPOUND -> not implemented\n");
- MakeReturn1Cci (pcci, (int) NULL /*compoundhandle*/);
+ MakeReturn1Cci (pcci, (int64_t) NULL /*compoundhandle*/);
}
static void scrollbar_value_changed(GtkRange *range, gpointer user_data)
@@ -1786,7 +1786,7 @@ static void scrollbar_value_changed(GtkRange *range, gpointer user_data)
* scrollbar was moved by the user.
*/
if (discr != 0) {
- SendMessage5ToClean(CcWmSCROLLBARACTION, parent, (int)widget,
+ SendMessage5ToClean(CcWmSCROLLBARACTION, parent, (int64_t)widget,
controlKind, scrollCode, position);
}
@@ -1830,7 +1830,7 @@ void EvalCcRqCREATESCROLLBAR (CrossCallInfo *pcci) /* hwnd, x,y,w,h bool; HWND r
g_object_set_data(G_OBJECT(scroll), SCROLL_POS_KEY, (gpointer)val);
printf("EvalCcRqCREATESCROLLBAR - %p,%p\n",parent,scroll);
- MakeReturn1Cci (pcci, (int) scroll);
+ MakeReturn1Cci (pcci, (int64_t) scroll);
}
static void button_clicked (GtkButton *button, gpointer user_data)
@@ -1862,7 +1862,7 @@ static gint button_expose_handler(GtkWidget *widget, GdkEventExpose *event, gpoi
button = gtk_widget_get_parent(widget);
parent = gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(button)));
- SendMessage3ToClean(CcWmDRAWCONTROL, (int) parent, (int) button, (int) GDK_DRAWABLE(event->window));
+ SendMessage3ToClean(CcWmDRAWCONTROL, (int64_t) parent, (int64_t) button, (int64_t) GDK_DRAWABLE(event->window));
return 0;
}
@@ -1903,7 +1903,7 @@ void EvalCcRqCREATEBUTTON (CrossCallInfo *pcci) /* hwnd, x,y,w,h, kind; HWND re
gtk_widget_set_size_request(button, w, h);
gtk_fixed_put (GetFixed(parent), button, x, y);
- MakeReturn1Cci (pcci, (int) button);
+ MakeReturn1Cci (pcci, (int64_t) button);
}
void EvalCcRqCREATEICONBUT (CrossCallInfo *pcci) /* hwnd, x,y,w,h,kind; HWND result. */
@@ -1932,7 +1932,7 @@ void EvalCcRqCREATEICONBUT (CrossCallInfo *pcci) /* hwnd, x,y,w,h,kind; HWND res
gtk_widget_set_size_request(button, w, h);
gtk_fixed_put(GetFixed(parent), button, x, y);
- MakeReturn1Cci(pcci, (int) button);
+ MakeReturn1Cci(pcci, (int64_t) button);
}
static gint custom_expose_handler(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
@@ -1941,7 +1941,7 @@ static gint custom_expose_handler(GtkWidget *widget, GdkEventExpose *event, gpoi
printf("custom_expose_handler\n");
parent = gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget)));
- SendMessage3ToClean(CcWmDRAWCONTROL, (int) parent, (int) widget, (int) GDK_DRAWABLE(event->window));
+ SendMessage3ToClean(CcWmDRAWCONTROL, (int64_t) parent, (int64_t) widget, (int64_t) GDK_DRAWABLE(event->window));
return 0;
}
@@ -1989,7 +1989,7 @@ void EvalCcRqCREATECUSTOM (CrossCallInfo *pcci) /* hwnd, x,y,w,h; HWND result. *
gtk_widget_realize(ctrl);
gtk_widget_add_events(ctrl, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
- MakeReturn1Cci (pcci, (int) ctrl);
+ MakeReturn1Cci (pcci, (int64_t) ctrl);
}
void EvalCcRqCREATESTATICTXT (CrossCallInfo *pcci) /* hwnd, x,y,w,h; HWND result. */
@@ -2010,7 +2010,7 @@ void EvalCcRqCREATESTATICTXT (CrossCallInfo *pcci) /* hwnd, x,y,w,h; HWND resul
gtk_widget_set_size_request(label, w, h);
gtk_fixed_put (GetFixed(parent), label, x, y);
- MakeReturn1Cci (pcci, (int) label);
+ MakeReturn1Cci (pcci, (int64_t) label);
}
void EvalCcRqCREATEEDITTXT (CrossCallInfo *pcci) /* hwnd, x,y,w,h, flags; HWND result. */
@@ -2055,7 +2055,7 @@ void EvalCcRqCREATEEDITTXT (CrossCallInfo *pcci) /* hwnd, x,y,w,h, flags; HWND r
edit);
}
- MakeReturn1Cci (pcci, (int) edit);
+ MakeReturn1Cci (pcci, (int64_t) edit);
}
static void radio_button_clicked (GtkButton *button, gpointer user_data)
@@ -2103,7 +2103,7 @@ void EvalCcRqCREATERADIOBUT (CrossCallInfo *pcci) /* hwnd, x,y,w,h, isfirst; HW
GTK_SIGNAL_FUNC(radio_button_clicked),
NULL);
- MakeReturn1Cci (pcci, (int) radio_btn);
+ MakeReturn1Cci (pcci, (int64_t) radio_btn);
}
void EvalCcRqCREATECHECKBOX (CrossCallInfo *pcci) /* hwnd, x,y,w,h, isfirst; HWND result. */
@@ -2130,7 +2130,7 @@ void EvalCcRqCREATECHECKBOX (CrossCallInfo *pcci) /* hwnd, x,y,w,h, isfirst; HW
GTK_SIGNAL_FUNC(button_clicked),
NULL);
- MakeReturn1Cci (pcci, (int) check_btn);
+ MakeReturn1Cci (pcci, (int64_t) check_btn);
}
void EvalCcRqSETITEMCHECK (CrossCallInfo *pcci) /* hwnd, bool; no result. */
@@ -2219,7 +2219,7 @@ static void combo_changed_handler(GtkWidget *entry, gpointer user_data)
GtkWidget *item = GTK_WIDGET(child->data);
if (item->state == GTK_STATE_SELECTED)
{
- SendMessage3ToClean (CcWmITEMSELECT, (int) GetControlParent(combo), (int) combo, newsel);
+ SendMessage3ToClean (CcWmITEMSELECT, (int64_t) GetControlParent(combo), (int64_t) combo, newsel);
return;
}
@@ -2276,7 +2276,7 @@ void EvalCcRqCREATEPOPUP (CrossCallInfo *pcci) /* hwnd, x,y,w,h,isEditable; HWN
gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(combo)->entry), gtk_false());
}
- MakeReturn2Cci (pcci, (int) combo, (int) GTK_COMBO(combo)->entry);
+ MakeReturn2Cci (pcci, (int64_t) combo, (int64_t) GTK_COMBO(combo)->entry);
}
void EvalCcRqADDTOPOPUP (CrossCallInfo *pcci) /* hwnd, textptr, enabled, selected, index; Pos result. */
diff --git a/Linux_C_12/cCrossCall_121.c b/Linux_C_12/cCrossCall_121.c
index d4477e9..22a0ae7 100644
--- a/Linux_C_12/cCrossCall_121.c
+++ b/Linux_C_12/cCrossCall_121.c
@@ -31,6 +31,7 @@
#include <errno.h>
#include <sys/types.h>
#include <stdlib.h>
+#include <string.h>
char** global_argv;
int global_argc = 0;
@@ -470,14 +471,14 @@ CrossCallInfo *MakeReturn0Cci (CrossCallInfo * pcci)
return pcci;
}
-CrossCallInfo *MakeReturn1Cci (CrossCallInfo * pcci, int v1)
+CrossCallInfo *MakeReturn1Cci (CrossCallInfo * pcci, int64_t v1)
{
pcci->mess = CcRETURN1;
pcci->p1 = v1;
return pcci;
}
-CrossCallInfo *MakeReturn2Cci (CrossCallInfo * pcci, int v1, int v2)
+CrossCallInfo *MakeReturn2Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2)
{
pcci->mess = CcRETURN2;
pcci->p1 = v1;
@@ -485,7 +486,7 @@ CrossCallInfo *MakeReturn2Cci (CrossCallInfo * pcci, int v1, int v2)
return pcci;
}
-CrossCallInfo *MakeReturn3Cci (CrossCallInfo * pcci, int v1, int v2, int v3)
+CrossCallInfo *MakeReturn3Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2, int64_t v3)
{
pcci->mess = CcRETURN3;
pcci->p1 = v1;
@@ -494,7 +495,7 @@ CrossCallInfo *MakeReturn3Cci (CrossCallInfo * pcci, int v1, int v2, int v3)
return pcci;
}
-CrossCallInfo *MakeReturn4Cci (CrossCallInfo * pcci, int v1, int v2, int v3, int v4)
+CrossCallInfo *MakeReturn4Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2, int64_t v3, int64_t v4)
{
pcci->mess = CcRETURN4;
pcci->p1 = v1;
@@ -504,7 +505,7 @@ CrossCallInfo *MakeReturn4Cci (CrossCallInfo * pcci, int v1, int v2, int v3, int
return pcci;
}
-CrossCallInfo *MakeReturn5Cci (CrossCallInfo * pcci, int v1, int v2, int v3, int v4, int v5)
+CrossCallInfo *MakeReturn5Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2, int64_t v3, int64_t v4, int64_t v5)
{
pcci->mess = CcRETURN5;
pcci->p1 = v1;
@@ -515,7 +516,7 @@ CrossCallInfo *MakeReturn5Cci (CrossCallInfo * pcci, int v1, int v2, int v3, int
return pcci;
}
-CrossCallInfo *MakeReturn6Cci (CrossCallInfo * pcci, int v1, int v2, int v3, int v4, int v5, int v6)
+CrossCallInfo *MakeReturn6Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2, int64_t v3, int64_t v4, int64_t v5, int64_t v6)
{
pcci->mess = CcRETURN6;
pcci->p1 = v1;
diff --git a/Linux_C_12/cCrossCall_121.h b/Linux_C_12/cCrossCall_121.h
index 6bd2ed1..2111d22 100644
--- a/Linux_C_12/cCrossCall_121.h
+++ b/Linux_C_12/cCrossCall_121.h
@@ -57,21 +57,21 @@ extern void SendMessageToClean( int mess, int p1,int p2,int p3, int p4,int p5,in
/* Shorthands for SendMessageToClean: */
#define SendMessage0ToClean(mess) SendMessageToClean((mess), 0,0,0,0,0,0)
-#define SendMessage1ToClean(mess, p1) SendMessageToClean((mess), (int)(p1),0,0,0,0,0)
-#define SendMessage2ToClean(mess, p1,p2) SendMessageToClean((mess), (int)(p1),(int)(p2),0,0,0,0)
-#define SendMessage3ToClean(mess, p1,p2,p3) SendMessageToClean((mess), (int)(p1),(int)(p2),(int)(p3),0,0,0)
-#define SendMessage4ToClean(mess, p1,p2,p3,p4) SendMessageToClean((mess), (int)(p1),(int)(p2),(int)(p3),(int)(p4),0,0)
-#define SendMessage5ToClean(mess, p1,p2,p3,p4,p5) SendMessageToClean((mess), (int)(p1),(int)(p2),(int)(p3),(int)(p4),(int)(p5),0)
-#define SendMessage6ToClean(mess, p1,p2,p3,p4,p5,p6) SendMessageToClean((mess), (int)(p1),(int)(p2),(int)(p3),(int)(p4),(int)(p5),(int)(p6))
+#define SendMessage1ToClean(mess, p1) SendMessageToClean((mess), (int64_t)(p1),0,0,0,0,0)
+#define SendMessage2ToClean(mess, p1,p2) SendMessageToClean((mess), (int64_t)(p1),(int64_t)(p2),0,0,0,0)
+#define SendMessage3ToClean(mess, p1,p2,p3) SendMessageToClean((mess), (int64_t)(p1),(int64_t)(p2),(int64_t)(p3),0,0,0)
+#define SendMessage4ToClean(mess, p1,p2,p3,p4) SendMessageToClean((mess), (int64_t)(p1),(int64_t)(p2),(int64_t)(p3),(int64_t)(p4),0,0)
+#define SendMessage5ToClean(mess, p1,p2,p3,p4,p5) SendMessageToClean((mess), (int64_t)(p1),(int64_t)(p2),(int64_t)(p3),(int64_t)(p4),(int64_t)(p5),0)
+#define SendMessage6ToClean(mess, p1,p2,p3,p4,p5,p6) SendMessageToClean((mess), (int64_t)(p1),(int64_t)(p2),(int64_t)(p3),(int64_t)(p4),(int64_t)(p5),(int64_t)(p6))
/* Prototypes of convenience functions that fill CrossCallInfo struct. */
extern CrossCallInfo *MakeReturn0Cci (CrossCallInfo * pcci);
-extern CrossCallInfo *MakeReturn1Cci (CrossCallInfo * pcci, int v);
-extern CrossCallInfo *MakeReturn2Cci (CrossCallInfo * pcci, int v1, int v2);
-extern CrossCallInfo *MakeReturn3Cci (CrossCallInfo * pcci, int v1, int v2, int v3);
-extern CrossCallInfo *MakeReturn4Cci (CrossCallInfo * pcci, int v1, int v2, int v3, int v4);
-extern CrossCallInfo *MakeReturn5Cci (CrossCallInfo * pcci, int v1, int v2, int v3, int v4, int v5);
-extern CrossCallInfo *MakeReturn6Cci (CrossCallInfo * pcci, int v1, int v2, int v3, int v4, int v5, int v6);
+extern CrossCallInfo *MakeReturn1Cci (CrossCallInfo * pcci, int64_t v);
+extern CrossCallInfo *MakeReturn2Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2);
+extern CrossCallInfo *MakeReturn3Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2, int64_t v3);
+extern CrossCallInfo *MakeReturn4Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2, int64_t v3, int64_t v4);
+extern CrossCallInfo *MakeReturn5Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2, int64_t v3, int64_t v4, int64_t v5);
+extern CrossCallInfo *MakeReturn6Cci (CrossCallInfo * pcci, int64_t v1, int64_t v2, int64_t v3, int64_t v4, int64_t v5, int64_t v6);
extern BOOL IsReturnCci( CrossCallInfo *pcci );
diff --git a/Linux_C_12/cCrossCallxDI_121.c b/Linux_C_12/cCrossCallxDI_121.c
index 2426cff..631c33d 100644
--- a/Linux_C_12/cCrossCallxDI_121.c
+++ b/Linux_C_12/cCrossCallxDI_121.c
@@ -169,8 +169,7 @@ static void frame_drag_data_handler
*d = 0;
gtk_drag_finish (context, TRUE, FALSE, time);
- SendMessage2ToClean (CcWmPROCESSDROPFILES, (gint) widget,
- (gint) filenames);
+ SendMessage2ToClean (CcWmPROCESSDROPFILES, (int64_t) widget, (int64_t) filenames);
}
}
else
@@ -295,7 +294,7 @@ void EvalCcRqCREATESDIFRAMEWINDOW (CrossCallInfo *pcci) /* accept file open; fra
gtk_box_pack_start(GTK_BOX(box), menuBar, FALSE, FALSE, 0);
gtk_widget_show(menuBar);
- MakeReturn2Cci (pcci, (int) window, (int) menuBar);
+ MakeReturn2Cci (pcci, (int64_t) window, (int64_t) menuBar);
}
static void frame_close_page_handler(GtkWidget *client)
@@ -462,7 +461,7 @@ void EvalCcRqCREATEMDIFRAMEWINDOW (CrossCallInfo *pcci) /* show, accept file ope
gtk_widget_show(menuBar);
gtk_widget_show_all(pages_menu);
- MakeReturn4Cci (pcci, (int) window, (int) client, (int) menuBar, (int) pages_menu);
+ MakeReturn4Cci (pcci, (int64_t) window, (int64_t) client, (int64_t) menuBar, (int64_t) pages_menu);
}
void EvalCcRqDESTROYWINDOW (CrossCallInfo *pcci)
@@ -505,8 +504,7 @@ static void toolbar_handler(GtkWidget *widget, gpointer data)
printf("toolbar_handler\n");
toolbar = gtk_widget_get_parent(widget);
parent = gtk_widget_get_parent(gtk_widget_get_parent(toolbar));
- SendMessage4ToClean (CcWmBUTTONCLICKED, parent, toolbar, GetModifiers(),
- (int) data);
+ SendMessage4ToClean (CcWmBUTTONCLICKED, parent, toolbar, GetModifiers(), (int64_t) data);
}
/* Create a toolbar in a window. */
@@ -527,7 +525,7 @@ void EvalCcRqCREATEMDITOOLBAR (CrossCallInfo *pcci)
gtk_widget_show(toolbar);
gtk_window_maximize(GTK_WINDOW(parent));
- MakeReturn2Cci (pcci, (int) toolbar, pcci->p3);
+ MakeReturn2Cci (pcci, (int64_t) toolbar, pcci->p3);
}
}
@@ -547,7 +545,7 @@ void EvalCcRqCREATESDITOOLBAR (CrossCallInfo *pcci)
gtk_box_pack_start (GTK_BOX(box), toolbar, FALSE, FALSE, 0);
gtk_widget_show(toolbar);
- MakeReturn2Cci (pcci, (int)toolbar, pcci->p3);
+ MakeReturn2Cci (pcci, (int64_t) toolbar, pcci->p3);
}
}
@@ -606,6 +604,8 @@ OS InstallCrossCallxDI (OS ios)
AddCrossCallEntry (newTable, CcRqCREATETOOLBARSEPARATOR, EvalCcRqCREATETOOLBARSEPARATOR);
AddCrossCallEntries (gCrossCallProcedureTable, newTable);
+ printf("Done\n");
+
return ios;
}
diff --git a/Linux_C_12/util_121.h b/Linux_C_12/util_121.h
index 69e47ca..8bdcf76 100644
--- a/Linux_C_12/util_121.h
+++ b/Linux_C_12/util_121.h
@@ -39,13 +39,13 @@ typedef void* HGLOBAL;
typedef unsigned long DWORD;
typedef struct
-{ int mess;
- int p1;
- int p2;
- int p3;
- int p4;
- int p5;
- int p6;
+{ int64_t mess;
+ int64_t p1;
+ int64_t p2;
+ int64_t p3;
+ int64_t p4;
+ int64_t p5;
+ int64_t p6;
} CrossCallInfo;
typedef struct clean_string