Ticket #661: 0001-Revert-64-bit-fixes-for-input_server.patch

src/servers/input/MethodMenuItem.cpp

@@ -17 +17 @@
 #include <string.h>
 #include "MethodMenuItem.h"
 
-MethodMenuItem::MethodMenuItem(void* cookie, const char* name, const uchar* icon, BMenu* subMenu, BMessenger& messenger)
+MethodMenuItem::MethodMenuItem(int32 cookie, const char* name, const uchar* icon, BMenu* subMenu, BMessenger& messenger)
     : BMenuItem(subMenu),
     fIcon(BRect(0, 0, MENUITEM_ICON_SIZE - 1, MENUITEM_ICON_SIZE - 1), B_CMAP8),
     fCookie(cookie)
@@ -28 +28 @@
 }
 
 
-MethodMenuItem::MethodMenuItem(void* cookie, const char* name, const uchar* icon)
+MethodMenuItem::MethodMenuItem(int32 cookie, const char* name, const uchar* icon)
     : BMenuItem(name, NULL),
     fIcon(BRect(0, 0, MENUITEM_ICON_SIZE - 1, MENUITEM_ICON_SIZE - 1), B_CMAP8),
     fCookie(cookie)

src/servers/input/MethodMenuItem.h

@@ -24 +24 @@
 
 class MethodMenuItem : public BMenuItem {
     public:
-        MethodMenuItem(void *cookie, const char *label, const uchar *icon, BMenu *subMenu, BMessenger &messenger);
-        MethodMenuItem(void *cookie, const char *label, const uchar *icon);
+        MethodMenuItem(int32 cookie, const char *label, const uchar *icon, BMenu *subMenu, BMessenger &messenger);
+        MethodMenuItem(int32 cookie, const char *label, const uchar *icon);
 
         virtual ~MethodMenuItem();
 
@@ -38 +38 @@
         void SetIcon(const uchar *icon);
         const uchar *Icon() { return(uchar *)fIcon.Bits(); };
 
-        void *Cookie() { return fCookie; };
+        int32 Cookie() { return fCookie; };
     private:
         BBitmap fIcon;
-        void *fCookie;
+        int32 fCookie;
         BMessenger fMessenger;
 };
 

src/servers/input/MethodReplicant.cpp

@@ -198 +198 @@
 
     if (dynamic_cast<MethodMenuItem*>(item) != NULL) {
         BMessage msg(IS_SET_METHOD);
-        msg.AddPointer("cookie", ((MethodMenuItem*)item)->Cookie());
+        msg.AddInt32("cookie", ((MethodMenuItem*)item)->Cookie());
         BMessenger messenger(fSignature);
         messenger.SendMessage(&msg);
     }
@@ -216 +216 @@
 MethodReplicant::UpdateMethod(BMessage* message)
 {
     CALLED();
-    void* cookie;
-    if (message->FindPointer("cookie", &cookie) != B_OK) {
+    int32 cookie;
+    if (message->FindInt32("cookie", &cookie) != B_OK) {
         fprintf(stderr, "can't find cookie in message\n");
         return;
     }
 
     MethodMenuItem* item = FindItemByCookie(cookie);
     if (item == NULL) {
-        fprintf(stderr, "can't find item with cookie %p\n", cookie);
+        fprintf(stderr, "can't find item with cookie %" B_PRIx32 "\n", cookie);
         return;
     }
     item->SetMarked(true);
@@ -239 +239 @@
 MethodReplicant::UpdateMethodIcon(BMessage* message)
 {
     CALLED();
-    void* cookie;
-    if (message->FindPointer("cookie", &cookie) != B_OK) {
+    int32 cookie;
+    if (message->FindInt32("cookie", &cookie) != B_OK) {
         fprintf(stderr, "can't find cookie in message\n");
         return;
     }
@@ -255 +255 @@
 
     MethodMenuItem* item = FindItemByCookie(cookie);
     if (item == NULL) {
-        fprintf(stderr, "can't find item with cookie %p\n", cookie);
+        fprintf(stderr, "can't find item with cookie %" B_PRIx32 "\n", cookie);
         return;
     }
 
@@ -267 +267 @@
 MethodReplicant::UpdateMethodMenu(BMessage* message)
 {
     CALLED();
-    void* cookie;
-    if (message->FindPointer("cookie", &cookie) != B_OK) {
+    int32 cookie;
+    if (message->FindInt32("cookie", &cookie) != B_OK) {
         fprintf(stderr, "can't find cookie in message\n");
         return;
     }
@@ -294 +294 @@
 
     MethodMenuItem* item = FindItemByCookie(cookie);
     if (item == NULL) {
-        fprintf(stderr, "can't find item with cookie %p\n", cookie);
+        fprintf(stderr, "can't find item with cookie %" B_PRIx32 "\n", cookie);
         return;
     }
     int32 index = fMenu.IndexOf(item);
@@ -317 +317 @@
 MethodReplicant::UpdateMethodName(BMessage* message)
 {
     CALLED();
-    void* cookie;
-    if (message->FindPointer("cookie", &cookie) != B_OK) {
+    int32 cookie;
+    if (message->FindInt32("cookie", &cookie) != B_OK) {
         fprintf(stderr, "can't find cookie in message\n");
         return;
     }
@@ -331 +331 @@
 
     MethodMenuItem* item = FindItemByCookie(cookie);
     if (item == NULL) {
-        fprintf(stderr, "can't find item with cookie %p\n", cookie);
+        fprintf(stderr, "can't find item with cookie %" B_PRIx32 "\n", cookie);
         return;
     }
 
@@ -340 +340 @@
 
 
 MethodMenuItem*
-MethodReplicant::FindItemByCookie(void* cookie)
+MethodReplicant::FindItemByCookie(int32 cookie)
 {
     for (int32 i = 0; i < fMenu.CountItems(); i++) {
         MethodMenuItem* item = (MethodMenuItem*)fMenu.ItemAt(i);
-        PRINT(("cookie : %p\n", item->Cookie()));
+        PRINT(("cookie : 0x%" B_PRIx32 "\n", item->Cookie()));
         if (item->Cookie() == cookie)
             return item;
     }
@@ -357 +357 @@
 MethodReplicant::AddMethod(BMessage* message)
 {
     CALLED();
-    void* cookie;
-    if (message->FindPointer("cookie", &cookie) != B_OK) {
+    int32 cookie;
+    if (message->FindInt32("cookie", &cookie) != B_OK) {
         fprintf(stderr, "can't find cookie in message\n");
         return;
     }
@@ -379 +379 @@
 
     MethodMenuItem* item = FindItemByCookie(cookie);
     if (item != NULL) {
-        fprintf(stderr, "item with cookie %p already exists\n", cookie);
+        fprintf(stderr, "item with cookie %" B_PRIx32 " already exists\n", cookie);
         return;
     }
 
@@ -396 +396 @@
 MethodReplicant::RemoveMethod(BMessage* message)
 {
     CALLED();
-    void* cookie;
-    if (message->FindPointer("cookie", &cookie) != B_OK) {
+    int32 cookie;
+    if (message->FindInt32("cookie", &cookie) != B_OK) {
         fprintf(stderr, "can't find cookie in message\n");
         return;
     }
 
     MethodMenuItem* item = FindItemByCookie(cookie);
     if (item == NULL) {
-        fprintf(stderr, "can't find item with cookie %p\n", cookie);
+        fprintf(stderr, "can't find item with cookie %" B_PRIx32 "\n", cookie);
         return;
     }
     fMenu.RemoveItem(item);

src/servers/input/MethodReplicant.h

@@ -57 +57 @@
         void UpdateMethodName(BMessage *);
         void AddMethod(BMessage *message);
         void RemoveMethod(BMessage *message);
-        MethodMenuItem *FindItemByCookie(void *cookie);
+        MethodMenuItem *FindItemByCookie(int32 cookie);
 };
 
 #endif