Skip to content

Commit

Permalink
Removed NTGhostscriptDLL and NTGhostscriptLoadDLL from the private he…
Browse files Browse the repository at this point in the history 
…ader.
  • Loading branch information
@dlemstra
dlemstra committed Feb 19, 2022
1 parent b36de79 commit 70b7dfa
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 118 deletions.
2 changes: 0 additions & 2 deletions magick/nt-base-private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@ extern MagickPrivate int
NTControlHandler(void),
NTExitLibrary(void),
NTTruncateFile(int,off_t),
NTGhostscriptDLL(char *,int),
NTGhostscriptEXE(char *,int),
NTGhostscriptFonts(char *,int),
NTGhostscriptLoadDLL(void),
NTInitializeLibrary(void),
NTSetSearchPath(const char *),
NTUnmapMemory(void *,size_t),
Expand Down
185 changes: 69 additions & 116 deletions magick/nt-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -930,24 +930,20 @@ MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path)
% %
% %
% %
% N T G h o s t s c r i p t D L L %
% N T G h o s t s c r i p t D L L V e c t o r s %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% NTGhostscriptDLL() returns the path to the most recent Ghostscript version
% DLL. The method returns TRUE on success otherwise FALSE.
%
% The format of the NTGhostscriptDLL method is:
%
% int NTGhostscriptDLL(char *path,int length)
%
% A description of each parameter follows:
% NTGhostscriptDLLVectors() returns a GhostInfo structure that includes
% function vectors to invoke Ghostscript DLL functions. A null pointer is
% returned if there is an error when loading the DLL or retrieving the
% function vectors.
%
% o path: return the Ghostscript DLL path here.
% The format of the NTGhostscriptDLLVectors method is:
%
% o length: the buffer length.
% const GhostInfo *NTGhostscriptDLLVectors(void)
%
*/

Expand Down Expand Up @@ -1198,7 +1194,7 @@ static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit,char *value,
return(TRUE);
}

MagickPrivate int NTGhostscriptDLL(char *path,int length)
static int NTGhostscriptDLL(char *path,int length)
{
static char
dll[MaxTextExtent] = { "" };
Expand All @@ -1220,31 +1216,69 @@ MagickPrivate int NTGhostscriptDLL(char *path,int length)
(void) CopyMagickString(path,dll,length);
return(TRUE);
}

/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% %
% %
% N T G h o s t s c r i p t D L L V e c t o r s %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% NTGhostscriptDLLVectors() returns a GhostInfo structure that includes
% function vectors to invoke Ghostscript DLL functions. A null pointer is
% returned if there is an error when loading the DLL or retrieving the
% function vectors.
%
% The format of the NTGhostscriptDLLVectors method is:
%
% const GhostInfo *NTGhostscriptDLLVectors(void)
%
*/

static inline int NTGhostscriptHasValidHandle()
{
if ((nt_ghost_info.delete_instance == NULL) || (ghost_info.exit == NULL) ||
(ghost_info.init_with_args == NULL) ||
(nt_ghost_info.new_instance == NULL) ||
(ghost_info.run_string == NULL) || (ghost_info.set_stdio == NULL) ||
(ghost_info.revision == NULL))
{
return(FALSE);
}
return(TRUE);
}

MagickPrivate const GhostInfo *NTGhostscriptDLLVectors(void)
{
if (NTGhostscriptLoadDLL() == FALSE)
char
path[MaxTextExtent];

if (ghost_semaphore == (SemaphoreInfo *) NULL)
ActivateSemaphoreInfo(&ghost_semaphore);
LockSemaphoreInfo(ghost_semaphore);
if (ghost_handle != (void *) NULL)
{
UnlockSemaphoreInfo(ghost_semaphore);
if (NTGhostscriptHasValidHandle() == FALSE)
return((GhostInfo *) NULL);
return(&ghost_info);
}
if (NTGhostscriptDLL(path,sizeof(path)) == FALSE)
{
UnlockSemaphoreInfo(ghost_semaphore);
return(FALSE);
}
ghost_handle=lt_dlopen(path);
if (ghost_handle == (void *) NULL)
{
UnlockSemaphoreInfo(ghost_semaphore);
return(FALSE);
}
(void) memset((void *) &nt_ghost_info,0,sizeof(NTGhostInfo));
nt_ghost_info.delete_instance=(void (MagickDLLCall *)(gs_main_instance *)) (
lt_dlsym(ghost_handle,"gsapi_delete_instance"));
nt_ghost_info.new_instance=(int (MagickDLLCall *)(gs_main_instance **,
void *)) (lt_dlsym(ghost_handle,"gsapi_new_instance"));
nt_ghost_info.has_instance=MagickFalse;
(void) memset((void *) &ghost_info,0,sizeof(GhostInfo));
ghost_info.delete_instance=NTGhostscriptDeleteInstance;
ghost_info.exit=(int (MagickDLLCall *)(gs_main_instance*))
lt_dlsym(ghost_handle,"gsapi_exit");
ghost_info.init_with_args=(int (MagickDLLCall *)(gs_main_instance *,int,
char **)) (lt_dlsym(ghost_handle,"gsapi_init_with_args"));
ghost_info.new_instance=NTGhostscriptNewInstance;
ghost_info.run_string=(int (MagickDLLCall *)(gs_main_instance *,const char *,
int,int *)) (lt_dlsym(ghost_handle,"gsapi_run_string"));
ghost_info.set_stdio=(int (MagickDLLCall *)(gs_main_instance *,int(
MagickDLLCall *)(void *,char *,int),int(MagickDLLCall *)(void *,
const char *,int),int(MagickDLLCall *)(void *,const char *,int)))
(lt_dlsym(ghost_handle,"gsapi_set_stdio"));
ghost_info.revision=(int (MagickDLLCall *)(gsapi_revision_t *,int)) (
lt_dlsym(ghost_handle,"gsapi_revision"));
UnlockSemaphoreInfo(ghost_semaphore);
if (NTGhostscriptHasValidHandle() == FALSE)
return((GhostInfo *) NULL);
return(&ghost_info);
}
Expand Down Expand Up @@ -1392,87 +1426,6 @@ MagickPrivate int NTGhostscriptFonts(char *path,int length)
% %
% %
% %
% N T G h o s t s c r i p t L o a d D L L %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% NTGhostscriptLoadDLL() attempts to load the Ghostscript DLL and returns
% TRUE if it succeeds.
%
% The format of the NTGhostscriptLoadDLL method is:
%
% int NTGhostscriptLoadDLL(void)
%
*/
static inline int NTGhostscriptHasValidHandle()
{
if ((nt_ghost_info.delete_instance == NULL) || (ghost_info.exit == NULL) ||
(ghost_info.init_with_args == NULL) ||
(nt_ghost_info.new_instance == NULL) ||
(ghost_info.run_string == NULL) || (ghost_info.set_stdio == NULL) ||
(ghost_info.revision == NULL))
{
return(FALSE);
}
return(TRUE);
}

MagickPrivate int NTGhostscriptLoadDLL(void)
{
char
path[MaxTextExtent];

if (ghost_semaphore == (SemaphoreInfo *) NULL)
ActivateSemaphoreInfo(&ghost_semaphore);
LockSemaphoreInfo(ghost_semaphore);
if (ghost_handle != (void *) NULL)
{
UnlockSemaphoreInfo(ghost_semaphore);
return(NTGhostscriptHasValidHandle());
}
if (NTGhostscriptDLL(path,sizeof(path)) == FALSE)
{
UnlockSemaphoreInfo(ghost_semaphore);
return(FALSE);
}
ghost_handle=lt_dlopen(path);
if (ghost_handle == (void *) NULL)
{
UnlockSemaphoreInfo(ghost_semaphore);
return(FALSE);
}
(void) memset((void *) &nt_ghost_info,0,sizeof(NTGhostInfo));
nt_ghost_info.delete_instance=(void (MagickDLLCall *)(gs_main_instance *)) (
lt_dlsym(ghost_handle,"gsapi_delete_instance"));
nt_ghost_info.new_instance=(int (MagickDLLCall *)(gs_main_instance **,
void *)) (lt_dlsym(ghost_handle,"gsapi_new_instance"));
nt_ghost_info.has_instance=MagickFalse;
(void) memset((void *) &ghost_info,0,sizeof(GhostInfo));
ghost_info.delete_instance=NTGhostscriptDeleteInstance;
ghost_info.exit=(int (MagickDLLCall *)(gs_main_instance*))
lt_dlsym(ghost_handle,"gsapi_exit");
ghost_info.init_with_args=(int (MagickDLLCall *)(gs_main_instance *,int,
char **)) (lt_dlsym(ghost_handle,"gsapi_init_with_args"));
ghost_info.new_instance=NTGhostscriptNewInstance;
ghost_info.run_string=(int (MagickDLLCall *)(gs_main_instance *,const char *,
int,int *)) (lt_dlsym(ghost_handle,"gsapi_run_string"));
ghost_info.set_stdio=(int (MagickDLLCall *)(gs_main_instance *,int(
MagickDLLCall *)(void *,char *,int),int(MagickDLLCall *)(void *,
const char *,int),int(MagickDLLCall *)(void *,const char *,int)))
(lt_dlsym(ghost_handle,"gsapi_set_stdio"));
ghost_info.revision=(int (MagickDLLCall *)(gsapi_revision_t *,int)) (
lt_dlsym(ghost_handle,"gsapi_revision"));
UnlockSemaphoreInfo(ghost_semaphore);
return(NTGhostscriptHasValidHandle());
}

/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% %
% %
% N T G h o s t s c r i p t U n L o a d D L L %
% %
% %
Expand Down

0 comments on commit 70b7dfa

Please sign in to comment.