janitory work

svn path=/trunk/; revision=13060
This commit is contained in:
Thomas Bluemel 2005-01-15 16:42:28 +00:00
parent c0aceb10d9
commit 85ae2d98f2
3 changed files with 19 additions and 37 deletions

View file

@ -19,7 +19,7 @@ TARGET_BASE = $(TARGET_BASE_LIB_PSAPI)
TARGET_PCH = precomp.h
TARGET_OBJECTS = misc/dllmain.o malloc.o win32.o
TARGET_OBJECTS = malloc.o psapi.o
DEP_OBJECTS = $(TARGET_OBJECTS)

View file

@ -1,34 +0,0 @@
/* $Id$
*/
/*
* COPYRIGHT: None
* LICENSE: Public domain
* PROJECT: ReactOS system libraries
* FILE: reactos/lib/psapi/misc/malloc.c
* PURPOSE: PSAPI.DLL main procedure
* PROGRAMMER: KJK::Hyperion <noog@libero.it>
* UPDATE HISTORY:
* 28/11/2001: Created (Emanuele Aliberti <eal@users.sf.net>)
* 30/08/2002: Minimal tweak (KJK::Hyperion <noog@libero.it>)
*/
#include "precomp.h"
#define NDEBUG
#include <debug.h>
BOOLEAN STDCALL DllMain
(
PVOID hinstDll,
ULONG dwReason,
PVOID reserved
)
{
if(dwReason == DLL_PROCESS_ATTACH)
/* don't bother calling the entry point on thread startup - PSAPI.DLL doesn't
store any per-thread data */
LdrDisableThreadCalloutsForDll(hinstDll);
return (TRUE);
}
/* EOF */

View file

@ -17,6 +17,22 @@
#define NDEBUG
#include <debug.h>
BOOLEAN
WINAPI
DllMain(HINSTANCE hDllHandle,
DWORD nReason,
LPVOID Reserved)
{
switch(nReason)
{
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hDllHandle);
break;
}
return TRUE;
}
/* INTERNAL *******************************************************************/
typedef struct _ENUM_DEVICE_DRIVERS_CONTEXT
@ -935,7 +951,7 @@ InitializeProcessForWsWatch(HANDLE hProcess)
0);
if(!NT_SUCCESS(Status))
{
SetLastError(RtlNtStatusToDosError(Status));
SetLastErrorByStatus(Status);
return FALSE;
}
@ -961,7 +977,7 @@ GetWsChanges(HANDLE hProcess,
NULL);
if(!NT_SUCCESS(Status))
{
SetLastError(RtlNtStatusToDosError(Status));
SetLastErrorByStatus(Status);
return FALSE;
}