ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed obsolete SHMDATA parameter in GLOBAL_CreateBlock.

This commit is contained in:
Alexandre Julliard 2000-08-09 22:27:11 +00:00
parent 044d251980
commit 4fef2f1917
6 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/kernel/kernel_main.c
View File

@ -53,7 +53,7 @@ static BOOL process_attach(void)
#define SET_ENTRY_POINT( num, addr ) \ #define SET_ENTRY_POINT( num, addr ) \
NE_SetEntryPoint( hModule, (num), GLOBAL_CreateBlock( GMEM_FIXED, \ NE_SetEntryPoint( hModule, (num), GLOBAL_CreateBlock( GMEM_FIXED, \
DOSMEM_MapDosToLinear(addr), 0x10000, hModule, \ DOSMEM_MapDosToLinear(addr), 0x10000, hModule, \
FALSE, FALSE, FALSE, NULL )) FALSE, FALSE, FALSE ))
SET_ENTRY_POINT( 183, 0x00000 ); /* KERNEL.183: __0000H */ SET_ENTRY_POINT( 183, 0x00000 ); /* KERNEL.183: __0000H */
SET_ENTRY_POINT( 174, 0xa0000 ); /* KERNEL.174: __A000H */ SET_ENTRY_POINT( 174, 0xa0000 ); /* KERNEL.174: __A000H */

6
if1632/builtin.c
View File

@ -18,7 +18,6 @@
#include "module.h" #include "module.h"
#include "miscemu.h" #include "miscemu.h"
#include "stackframe.h" #include "stackframe.h"
#include "process.h"
#include "task.h" #include "task.h"
#include "debugtools.h" #include "debugtools.h"
#include "toolhelp.h" #include "toolhelp.h"
@ -58,7 +57,7 @@ static HMODULE16 BUILTIN_DoLoadModule16( const BUILTIN16_DESCRIPTOR *descr )
{ {
hModule = GLOBAL_CreateBlock( GMEM_MOVEABLE, descr->module_start, hModule = GLOBAL_CreateBlock( GMEM_MOVEABLE, descr->module_start,
descr->module_size, 0, descr->module_size, 0,
FALSE, FALSE, FALSE, NULL ); FALSE, FALSE, FALSE );
if (!hModule) return 0; if (!hModule) return 0;
FarSetOwner16( hModule, hModule ); FarSetOwner16( hModule, hModule );
@ -104,8 +103,7 @@ static HMODULE16 BUILTIN_DoLoadModule16( const BUILTIN16_DESCRIPTOR *descr )
pSegTable = NE_SEG_TABLE( pModule ); pSegTable = NE_SEG_TABLE( pModule );
pSegTable->hSeg = GLOBAL_CreateBlock( GMEM_FIXED, descr->code_start, pSegTable->hSeg = GLOBAL_CreateBlock( GMEM_FIXED, descr->code_start,
pSegTable->minsize, hModule, pSegTable->minsize, hModule, TRUE, TRUE, FALSE );
TRUE, TRUE, FALSE, NULL );
if (!pSegTable->hSeg) return 0; if (!pSegTable->hSeg) return 0;
pSegTable++; pSegTable++;

10
include/global.h
View File

@ -9,18 +9,10 @@
#include "windef.h" #include "windef.h"
typedef struct
{
HGLOBAL16 handle;
WORD sel;
int shmid;
} SHMDATA;
/* memory/global.c */ /* memory/global.c */
extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size, extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size,
HGLOBAL16 hOwner, BOOL16 isCode, HGLOBAL16 hOwner, BOOL16 isCode,
BOOL16 is32Bit, BOOL16 isReadOnly, BOOL16 is32Bit, BOOL16 isReadOnly);
SHMDATA *shmdata);
extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle );
extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size ); extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size );
extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner,

10
memory/global.c
View File

@ -96,8 +96,7 @@ void debug_handles(void)
*/ */
HGLOBAL16 GLOBAL_CreateBlock( WORD flags, const void *ptr, DWORD size, HGLOBAL16 GLOBAL_CreateBlock( WORD flags, const void *ptr, DWORD size,
HGLOBAL16 hOwner, BOOL16 isCode, HGLOBAL16 hOwner, BOOL16 isCode,
BOOL16 is32Bit, BOOL16 isReadOnly, BOOL16 is32Bit, BOOL16 isReadOnly )
SHMDATA *shmdata )
{ {
WORD sel, selcount; WORD sel, selcount;
GLOBALARENA *pArena; GLOBALARENA *pArena;
@ -193,14 +192,13 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner,
{ {
void *ptr; void *ptr;
HGLOBAL16 handle; HGLOBAL16 handle;
SHMDATA shmdata;
TRACE("%ld flags=%04x\n", size, flags ); TRACE("%ld flags=%04x\n", size, flags );
/* If size is 0, create a discarded block */ /* If size is 0, create a discarded block */
if (size == 0) return GLOBAL_CreateBlock( flags, NULL, 1, hOwner, isCode, if (size == 0) return GLOBAL_CreateBlock( flags, NULL, 1, hOwner, isCode,
is32Bit, isReadOnly, NULL ); is32Bit, isReadOnly );
/* Fixup the size */ /* Fixup the size */
@ -215,7 +213,7 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner,
/* Allocate the selector(s) */ /* Allocate the selector(s) */
handle = GLOBAL_CreateBlock( flags, ptr, size, hOwner, handle = GLOBAL_CreateBlock( flags, ptr, size, hOwner,
isCode, is32Bit, isReadOnly, &shmdata); isCode, is32Bit, isReadOnly );
if (!handle) if (!handle)
{ {
HeapFree( GetProcessHeap(), 0, ptr ); HeapFree( GetProcessHeap(), 0, ptr );
@ -685,7 +683,7 @@ DWORD WINAPI GlobalDOSAlloc16(
WORD wSelector; WORD wSelector;
wSelector = GLOBAL_CreateBlock(GMEM_FIXED, lpBlock, size, wSelector = GLOBAL_CreateBlock(GMEM_FIXED, lpBlock, size,
hModule, 0, 0, 0, NULL ); hModule, 0, 0, 0 );
return MAKELONG(wSelector,uParagraph); return MAKELONG(wSelector,uParagraph);
} }
return 0; return 0;

7
msdos/dosmem.c
View File

@ -413,9 +413,9 @@ BOOL DOSMEM_Init(BOOL dos_init)
return FALSE; return FALSE;
} }
DOSMEM_BiosDataSeg = GLOBAL_CreateBlock(GMEM_FIXED,DOSMEM_dosmem+0x400, DOSMEM_BiosDataSeg = GLOBAL_CreateBlock(GMEM_FIXED,DOSMEM_dosmem+0x400,
0x100, 0, FALSE, FALSE, FALSE, NULL ); 0x100, 0, FALSE, FALSE, FALSE );
DOSMEM_BiosSysSeg = GLOBAL_CreateBlock(GMEM_FIXED,DOSMEM_dosmem+0xf0000, DOSMEM_BiosSysSeg = GLOBAL_CreateBlock(GMEM_FIXED,DOSMEM_dosmem+0xf0000,
0x10000, 0, FALSE, FALSE, FALSE, NULL ); 0x10000, 0, FALSE, FALSE, FALSE );
base = DOSMEM_dosmem; base = DOSMEM_dosmem;
do_init = TRUE; do_init = TRUE;
} }
@ -734,8 +734,7 @@ WORD DOSMEM_AllocSelector(WORD realsel)
sel=GLOBAL_CreateBlock( sel=GLOBAL_CreateBlock(
GMEM_FIXED,DOSMEM_dosmem+realsel*16,0x10000, GMEM_FIXED,DOSMEM_dosmem+realsel*16,0x10000,
hModule,FALSE,FALSE,FALSE,NULL hModule,FALSE,FALSE,FALSE );
);
TRACE_(selector)("(0x%04x) returns 0x%04x.\n", realsel,sel); TRACE_(selector)("(0x%04x) returns 0x%04x.\n", realsel,sel);
return sel; return sel;
} }

2
objects/metafile.c
View File

@ -98,7 +98,7 @@ HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh)
size = sizeof(METAHEADER) + sizeof(METAHEADERDISK); size = sizeof(METAHEADER) + sizeof(METAHEADERDISK);
hmf = GLOBAL_CreateBlock( GMEM_MOVEABLE, mh, mh->mtSize * sizeof(WORD), hmf = GLOBAL_CreateBlock( GMEM_MOVEABLE, mh, mh->mtSize * sizeof(WORD),
GetCurrentPDB16(), FALSE, FALSE, FALSE, NULL ); GetCurrentPDB16(), FALSE, FALSE, FALSE );
return hmf; return hmf;
} }