hrev51434 adds 1 changeset to branch 'master'
old head: 6103c9d186cf534bc36e4bffcf402091358759b1
new head: 1a472d01fd4786e7571604b56c4da926733cb735
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=1a472d01fd47+%5E6103c9d186cf
----------------------------------------------------------------------------
1a472d01fd47: servers/app: html5/remote drawing 64-bit fixes
* Still doesn't seem to work anymore.
* Documentation: TARGET_SCREEN="html5:127.0.0.1:80" DeskCalc
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51434
Commit: 1a472d01fd4786e7571604b56c4da926733cb735
URL: http://cgit.haiku-os.org/haiku/commit/?id=1a472d01fd47
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Sep 22 23:54:08 2017 UTC
----------------------------------------------------------------------------
9 files changed, 15 insertions(+), 19 deletions(-)
src/servers/app/Jamfile | 7 +------
src/servers/app/ScreenManager.cpp | 2 +-
.../app/drawing/interface/html5/HTML5DrawingEngine.cpp | 2 +-
src/servers/app/drawing/interface/html5/HTML5DrawingEngine.h | 2 +-
src/servers/app/drawing/interface/html5/HTML5HWInterface.cpp | 5 +++--
src/servers/app/drawing/interface/html5/WebWorker.cpp | 4 ++--
.../app/drawing/interface/remote/RemoteDrawingEngine.cpp | 2 +-
.../app/drawing/interface/remote/RemoteDrawingEngine.h | 2 +-
.../app/drawing/interface/remote/RemoteHWInterface.cpp | 8 ++++----
----------------------------------------------------------------------------
diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 04c4afa..ad0b4bd 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -53,11 +53,6 @@ if [ FIsBuildFeatureEnabled fontconfig ] {
: [ BuildFeatureAttribute freetype : headers ] ;
}
-local BROKEN_64 = ;
-if $(TARGET_ARCH) != x86_64 {
- BROKEN_64 = "" ;
-}
-
Server app_server :
Angle.cpp
AppServer.cpp
@@ -112,7 +107,7 @@ Server app_server :
# libraries
:
libtranslation.so libbe.so libbnetapi.so
- libaslocal.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a
+ libaslocal.a libasremote.a libashtml5.a
libasdrawing.a libpainter.a libagg.a
[ BuildFeatureAttribute freetype : library ]
[ BuildFeatureAttribute fontconfig : library ]
diff --git a/src/servers/app/ScreenManager.cpp
b/src/servers/app/ScreenManager.cpp
index 8851a3f..1bc38c6 100644
--- a/src/servers/app/ScreenManager.cpp
+++ b/src/servers/app/ScreenManager.cpp
@@ -105,7 +105,7 @@ ScreenManager::AcquireScreens(ScreenOwner* owner, int32*
wishList,
}
}
-#if TEST_MODE == 0 && !defined(__x86_64__)
+#if TEST_MODE == 0
if (added == 0 && target != NULL) {
// there's a specific target screen we want to initialize
// TODO: right now we only support remote screens, but we could
diff --git a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
index ce6e4e8..15f2190 100644
--- a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
+++ b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
@@ -23,7 +23,7 @@ HTML5DrawingEngine::HTML5DrawingEngine(HTML5HWInterface*
interface)
:
DrawingEngine(interface),
fHWInterface(interface),
- fToken((uint32)this), // TODO: need to redo that for 64 bit
+ fToken((addr_t)this),
fExtendWidth(0),
fCallbackAdded(false),
fResultNotify(-1),
diff --git a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.h
b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.h
index 5a2c547..5273c60 100644
--- a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.h
+++ b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.h
@@ -162,7 +162,7 @@ private:
UtilityBitmap**& bitmaps);
HTML5HWInterface* fHWInterface;
- uint32 fToken;
+ addr_t fToken;
DrawState fState;
BRegion fClippingRegion;
diff --git a/src/servers/app/drawing/interface/html5/HTML5HWInterface.cpp
b/src/servers/app/drawing/interface/html5/HTML5HWInterface.cpp
index 101f562..f7f2043 100644
--- a/src/servers/app/drawing/interface/html5/HTML5HWInterface.cpp
+++ b/src/servers/app/drawing/interface/html5/HTML5HWInterface.cpp
@@ -78,7 +78,7 @@ HTML5HWInterface::HTML5HWInterface(const char* target)
if (portStart != NULL) {
portStart[0] = 0;
portStart++;
- if (sscanf(portStart, "%lu", &fRemotePort) != 1) {
+ if (sscanf(portStart, "%" B_PRIu32, &fRemotePort) != 1) {
fInitStatus = B_BAD_VALUE;
return;
}
@@ -304,7 +304,8 @@ HTML5HWInterface::_EventThread()
return result;
}
- TRACE("got message code %u with %lu bytes\n", code,
message.DataLeft());
+ TRACE("got message code %" B_PRIu16 " with %" B_PRIu32 "
bytes\n", code,
+ message.DataLeft());
if (code >= RP_MOUSE_MOVED && code <= RP_MODIFIERS_CHANGED) {
// an input event, dispatch to the event stream
diff --git a/src/servers/app/drawing/interface/html5/WebWorker.cpp
b/src/servers/app/drawing/interface/html5/WebWorker.cpp
index bc29e10..7b0977a 100644
--- a/src/servers/app/drawing/interface/html5/WebWorker.cpp
+++ b/src/servers/app/drawing/interface/html5/WebWorker.cpp
@@ -115,7 +115,7 @@ WebWorker::_Work()
readSize = io->Read(buffer, sizeof(buffer));
else if (rb)
readSize = rb->Read(buffer, sizeof(buffer));
- TRACE("readSize %ld\n", readSize);
+ TRACE("readSize %" B_PRId32 "\n", readSize);
if (readSize < 0) {
TRACE_ERROR("read failed, closing connection: %s\n",
@@ -140,7 +140,7 @@ WebWorker::_Work()
errorCount = 0;
result = fEndpoint->Send(buffer, readSize);
-TRACE("writeSize %ld\n", result);
+// TRACE("writeSize %ld\n", result);
if (result < readSize) {
TRACE_ERROR("writing to peer failed: %s\n",
strerror(result));
diff --git a/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp
b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp
index a1cb441..a089179 100644
--- a/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp
+++ b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp
@@ -22,7 +22,7 @@ RemoteDrawingEngine::RemoteDrawingEngine(RemoteHWInterface*
interface)
:
DrawingEngine(interface),
fHWInterface(interface),
- fToken((uint32)this), // TODO: need to redo that for 64 bit
+ fToken((addr_t)this),
fExtendWidth(0),
fCallbackAdded(false),
fResultNotify(-1),
diff --git a/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h
b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h
index 60f3f21..ac7cd76 100644
--- a/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h
+++ b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h
@@ -161,7 +161,7 @@ private:
UtilityBitmap**& bitmaps);
RemoteHWInterface* fHWInterface;
- uint32 fToken;
+ addr_t fToken;
DrawState fState;
BRegion fClippingRegion;
diff --git a/src/servers/app/drawing/interface/remote/RemoteHWInterface.cpp
b/src/servers/app/drawing/interface/remote/RemoteHWInterface.cpp
index 8b0a128..3301765 100644
--- a/src/servers/app/drawing/interface/remote/RemoteHWInterface.cpp
+++ b/src/servers/app/drawing/interface/remote/RemoteHWInterface.cpp
@@ -63,7 +63,7 @@ RemoteHWInterface::RemoteHWInterface(const char* target)
if (portStart != NULL) {
portStart[0] = 0;
portStart++;
- if (sscanf(portStart, "%lu", &fRemotePort) != 1) {
+ if (sscanf(portStart, "%" B_PRIu32, &fRemotePort) != 1) {
fInitStatus = B_BAD_VALUE;
return;
}
@@ -300,11 +300,11 @@ RemoteHWInterface::_EventThread()
status_t
RemoteHWInterface::_Connect()
{
- TRACE("connecting to host \"%s\" port %lu\n", fRemoteHost, fRemotePort);
+ TRACE("connecting to host \"%s\" port %" B_PRIu32 "\n", fRemoteHost,
fRemotePort);
status_t result = fSendEndpoint->Connect(fRemoteHost,
(uint16)fRemotePort);
if (result != B_OK) {
- TRACE_ERROR("failed to connect to host \"%s\" port %lu\n",
fRemoteHost,
- fRemotePort);
+ TRACE_ERROR("failed to connect to host \"%s\" port %" B_PRIu32
"\n",
+ fRemoteHost, fRemotePort);
return result;
}
