From 4fef2f191744424444d9650c14e9525df9f33734 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 9 Aug 2000 22:27:11 +0000 Subject: [PATCH] Removed obsolete SHMDATA parameter in GLOBAL_CreateBlock. --- dlls/kernel/kernel_main.c | 2 +- if1632/builtin.c | 6 ++---- include/global.h | 10 +--------- memory/global.c | 10 ++++------ msdos/dosmem.c | 7 +++---- objects/metafile.c | 2 +- 6 files changed, 12 insertions(+), 25 deletions(-) diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c index dfc6b8d3b0e..93604a6f091 100644 --- a/dlls/kernel/kernel_main.c +++ b/dlls/kernel/kernel_main.c @@ -53,7 +53,7 @@ static BOOL process_attach(void) #define SET_ENTRY_POINT( num, addr ) \ NE_SetEntryPoint( hModule, (num), GLOBAL_CreateBlock( GMEM_FIXED, \ DOSMEM_MapDosToLinear(addr), 0x10000, hModule, \ - FALSE, FALSE, FALSE, NULL )) + FALSE, FALSE, FALSE )) SET_ENTRY_POINT( 183, 0x00000 ); /* KERNEL.183: __0000H */ SET_ENTRY_POINT( 174, 0xa0000 ); /* KERNEL.174: __A000H */ diff --git a/if1632/builtin.c b/if1632/builtin.c index d01ed8e0269..c0ba5cc4ca5 100644 --- a/if1632/builtin.c +++ b/if1632/builtin.c @@ -18,7 +18,6 @@ #include "module.h" #include "miscemu.h" #include "stackframe.h" -#include "process.h" #include "task.h" #include "debugtools.h" #include "toolhelp.h" @@ -58,7 +57,7 @@ static HMODULE16 BUILTIN_DoLoadModule16( const BUILTIN16_DESCRIPTOR *descr ) { hModule = GLOBAL_CreateBlock( GMEM_MOVEABLE, descr->module_start, descr->module_size, 0, - FALSE, FALSE, FALSE, NULL ); + FALSE, FALSE, FALSE ); if (!hModule) return 0; FarSetOwner16( hModule, hModule ); @@ -104,8 +103,7 @@ static HMODULE16 BUILTIN_DoLoadModule16( const BUILTIN16_DESCRIPTOR *descr ) pSegTable = NE_SEG_TABLE( pModule ); pSegTable->hSeg = GLOBAL_CreateBlock( GMEM_FIXED, descr->code_start, - pSegTable->minsize, hModule, - TRUE, TRUE, FALSE, NULL ); + pSegTable->minsize, hModule, TRUE, TRUE, FALSE ); if (!pSegTable->hSeg) return 0; pSegTable++; diff --git a/include/global.h b/include/global.h index 21d8527eecf..45557b86546 100644 --- a/include/global.h +++ b/include/global.h @@ -9,18 +9,10 @@ #include "windef.h" -typedef struct -{ - HGLOBAL16 handle; - WORD sel; - int shmid; -} SHMDATA; - /* memory/global.c */ extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size, HGLOBAL16 hOwner, BOOL16 isCode, - BOOL16 is32Bit, BOOL16 isReadOnly, - SHMDATA *shmdata); + BOOL16 is32Bit, BOOL16 isReadOnly); extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size ); extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, diff --git a/memory/global.c b/memory/global.c index 75142798003..c127dda7004 100644 --- a/memory/global.c +++ b/memory/global.c @@ -96,8 +96,7 @@ void debug_handles(void) */ HGLOBAL16 GLOBAL_CreateBlock( WORD flags, const void *ptr, DWORD size, HGLOBAL16 hOwner, BOOL16 isCode, - BOOL16 is32Bit, BOOL16 isReadOnly, - SHMDATA *shmdata ) + BOOL16 is32Bit, BOOL16 isReadOnly ) { WORD sel, selcount; GLOBALARENA *pArena; @@ -193,14 +192,13 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, { void *ptr; HGLOBAL16 handle; - SHMDATA shmdata; TRACE("%ld flags=%04x\n", size, flags ); /* If size is 0, create a discarded block */ if (size == 0) return GLOBAL_CreateBlock( flags, NULL, 1, hOwner, isCode, - is32Bit, isReadOnly, NULL ); + is32Bit, isReadOnly ); /* Fixup the size */ @@ -215,7 +213,7 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, /* Allocate the selector(s) */ handle = GLOBAL_CreateBlock( flags, ptr, size, hOwner, - isCode, is32Bit, isReadOnly, &shmdata); + isCode, is32Bit, isReadOnly ); if (!handle) { HeapFree( GetProcessHeap(), 0, ptr ); @@ -685,7 +683,7 @@ DWORD WINAPI GlobalDOSAlloc16( WORD wSelector; wSelector = GLOBAL_CreateBlock(GMEM_FIXED, lpBlock, size, - hModule, 0, 0, 0, NULL ); + hModule, 0, 0, 0 ); return MAKELONG(wSelector,uParagraph); } return 0; diff --git a/msdos/dosmem.c b/msdos/dosmem.c index 4ac884ed51f..ac4134008e6 100644 --- a/msdos/dosmem.c +++ b/msdos/dosmem.c @@ -413,9 +413,9 @@ BOOL DOSMEM_Init(BOOL dos_init) return FALSE; } 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, - 0x10000, 0, FALSE, FALSE, FALSE, NULL ); + 0x10000, 0, FALSE, FALSE, FALSE ); base = DOSMEM_dosmem; do_init = TRUE; } @@ -734,8 +734,7 @@ WORD DOSMEM_AllocSelector(WORD realsel) sel=GLOBAL_CreateBlock( 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); return sel; } diff --git a/objects/metafile.c b/objects/metafile.c index 00bca812c85..036144deccc 100644 --- a/objects/metafile.c +++ b/objects/metafile.c @@ -98,7 +98,7 @@ HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh) size = sizeof(METAHEADER) + sizeof(METAHEADERDISK); hmf = GLOBAL_CreateBlock( GMEM_MOVEABLE, mh, mh->mtSize * sizeof(WORD), - GetCurrentPDB16(), FALSE, FALSE, FALSE, NULL ); + GetCurrentPDB16(), FALSE, FALSE, FALSE ); return hmf; }