Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conversion of PortLink::FlushWithReply calls from deprecated API calls

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4934 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm 2003-10-03 22:21:37 +00:00
parent 7b6beb9bde
commit 55c8a39e56
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/kits/interface/Bitmap.cpp
View File

@ -40,6 +40,7 @@
#include <Application.h>
#include <ServerProtocol.h>
#include <PortLink.h>
#include <PortMessage.h>
enum {
NOT_IMPLEMENTED = B_ERROR,
@ -2157,7 +2158,7 @@ BBitmap::InitObject(BRect bounds, color_space colorSpace, uint32 flags,
{
status_t error = B_OK;
PortLink::ReplyData replydata;
PortMessage pmsg;
PortLink *link=new PortLink(be_app->fServerTo);
// clean up
@ -2176,8 +2177,8 @@ BBitmap::InitObject(BRect bounds, color_space colorSpace, uint32 flags,
// status_t freestat;
link->SetOpCode(AS_DELETE_BITMAP);
link->Attach<int32>(fServerToken);
error=link->FlushWithReply(&replydata);
if(replydata.code==SERVER_FALSE)
error=link->FlushWithReply(&pmsg);
if(pmsg.Code()==SERVER_FALSE)
error=B_NO_MEMORY;
fBasePtr=NULL;
fArea=-1;
@ -2223,26 +2224,28 @@ BBitmap::InitObject(BRect bounds, color_space colorSpace, uint32 flags,
// Reply Code: SERVER_FALSE
// Reply Data:
// None
error=link->FlushWithReply(&replydata);
error=link->FlushWithReply(&pmsg);
// We shouldn't ever have to execute this block, but just in case...
if(error!=B_OK)
fBasePtr=NULL;
if(replydata.code==SERVER_TRUE)
if(pmsg.Code()==SERVER_TRUE)
{
int8 *bufferindex=replydata.buffer;
// Get token
fServerToken=*((int32*)bufferindex); bufferindex+=sizeof(int32);
area_id bmparea;
int32 areaoffset;
pmsg.Read<int32>(&fServerToken);
pmsg.Read<area_id>(&bmparea);
pmsg.Read<int32>(&areaoffset);
// Get the area in which the data resides
fArea=clone_area("shared bitmap area",(void**)&fBasePtr,B_ANY_ADDRESS,
B_READ_AREA | B_WRITE_AREA,*((area_id*)bufferindex));
bufferindex+=sizeof(area_id);
B_READ_AREA | B_WRITE_AREA,bmparea);
// Jump to the location in the area
fBasePtr=(int8*)fBasePtr + *((int32*)bufferindex);
fBasePtr=(int8*)fBasePtr + areaoffset;
fSize = size;
fColorSpace = colorSpace;

13
src/kits/interface/ClientFontList.cpp
View File

@ -32,7 +32,9 @@
#include <stdio.h>
#include <string.h>
#include <String.h>
#include "PortLink.h"
#include <PortLink.h>
#include <PortMessage.h>
#include <ServerProtocol.h>
#include <ServerConfig.h>
@ -110,17 +112,14 @@ printf("ClientFontList::Update(%s) - %s\n", (check_only)?"true":"false",SERVER_F
if(serverport!=B_NAME_NOT_FOUND)
{
status_t stat;
int32 code;
ssize_t buffersize;
PortMessage pmsg;
serverlink->SetOpCode(AS_QUERY_FONTS_CHANGED);
serverlink->FlushWithReply(&code, &stat, &buffersize);
serverlink->FlushWithReply(&pmsg);
// Attached Data: none
// Reply: SERVER_TRUE if fonts have changed, SERVER_FALSE if not
needs_update=(code==SERVER_TRUE)?true:false;
needs_update=(pmsg.Code()==SERVER_TRUE)?true:false;
}
#ifdef DEBUG_CLIENT_FONT_LIST
else