- genntdll, shut up

- fixed some forward exports in kernel32
 - fixed a couple of embarassing bugs in my getopt implementation
 - fixed a warning in pipetools

svn path=/trunk/; revision=7094
This commit is contained in:
KJK::Hyperion 2003-12-17 01:46:08 +00:00
parent b536b4fce2
commit c64c44c316
5 changed files with 22 additions and 20 deletions

View file

@ -1,4 +1,4 @@
/* $Id: genntdll.c,v 1.12 2003/01/03 00:28:07 guido Exp $ /* $Id: genntdll.c,v 1.13 2003/12/17 01:46:08 hyperion Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS version of ntdll * PROJECT: ReactOS version of ntdll
@ -22,7 +22,7 @@
#define PARAMETERIZED_LIBS #define PARAMETERIZED_LIBS
#define VERBOSE /* #define VERBOSE */
#define INPUT_BUFFER_SIZE 255 #define INPUT_BUFFER_SIZE 255

View file

@ -1,4 +1,4 @@
; $Id: kernel32.edf,v 1.30 2003/11/08 18:05:05 hyperion Exp $ ; $Id: kernel32.edf,v 1.31 2003/12/17 01:46:08 hyperion Exp $
; ;
; kernel32.edf ; kernel32.edf
; ;
@ -565,15 +565,15 @@ HeapWalk=HeapWalk@8
InitAtomTable=InitAtomTable@4 InitAtomTable=InitAtomTable@4
InitializeCriticalSection=InitializeCriticalSection@4 InitializeCriticalSection=InitializeCriticalSection@4
InitializeCriticalSectionAndSpinCount=InitializeCriticalSectionAndSpinCount@8 InitializeCriticalSectionAndSpinCount=InitializeCriticalSectionAndSpinCount@8
InitializeSListHead=NTDLL.RtlInitializeSListHead@4 InitializeSListHead=NTDLL.RtlInitializeSListHead
InterlockedCompareExchange=InterlockedCompareExchange@12 InterlockedCompareExchange=InterlockedCompareExchange@12
InterlockedDecrement=InterlockedDecrement@4 InterlockedDecrement=InterlockedDecrement@4
InterlockedExchange=InterlockedExchange@8 InterlockedExchange=InterlockedExchange@8
InterlockedExchangeAdd=InterlockedExchangeAdd@8 InterlockedExchangeAdd=InterlockedExchangeAdd@8
InterlockedFlushSList=NTDLL.RtlInterlockedFlushSList@4 InterlockedFlushSList=NTDLL.RtlInterlockedFlushSList
InterlockedIncrement=InterlockedIncrement@4 InterlockedIncrement=InterlockedIncrement@4
InterlockedPopEntrySList=NTDLL.RtlInterlockedPopEntrySList@4 InterlockedPopEntrySList=NTDLL.RtlInterlockedPopEntrySList
InterlockedPushEntrySList=NTDLL.RtlInterlockedPushEntrySList@8 InterlockedPushEntrySList=NTDLL.RtlInterlockedPushEntrySList
InvalidateConsoleDIBits=InvalidateConsoleDIBits@8 InvalidateConsoleDIBits=InvalidateConsoleDIBits@8
IsBadCodePtr=IsBadCodePtr@4 IsBadCodePtr=IsBadCodePtr@4
IsBadHugeReadPtr=IsBadHugeReadPtr@8 IsBadHugeReadPtr=IsBadHugeReadPtr@8
@ -682,7 +682,7 @@ Process32NextW=Process32NextW@8
PulseEvent=PulseEvent@4 PulseEvent=PulseEvent@4
PurgeComm=PurgeComm@8 PurgeComm=PurgeComm@8
QueryActCtxW=QueryActCtxW@28 QueryActCtxW=QueryActCtxW@28
QueryDepthSList=NTDLL.RtlQueryDepthSList@4 QueryDepthSList=NTDLL.RtlQueryDepthSList
QueryDosDeviceA=QueryDosDeviceA@12 QueryDosDeviceA=QueryDosDeviceA@12
QueryDosDeviceW=QueryDosDeviceW@12 QueryDosDeviceW=QueryDosDeviceW@12
QueryInformationJobObject=QueryInformationJobObject@20 QueryInformationJobObject=QueryInformationJobObject@20
@ -724,7 +724,7 @@ RemoveDirectoryA=RemoveDirectoryA@4
RemoveDirectoryW=RemoveDirectoryW@4 RemoveDirectoryW=RemoveDirectoryW@4
;RemoveLocalAlternateComputerNameA ;RemoveLocalAlternateComputerNameA
;RemoveLocalAlternateComputerNameW ;RemoveLocalAlternateComputerNameW
RemoveVectoredExceptionHandler=NTDLL.RtlRemoveVectoredExceptionHandler@4 RemoveVectoredExceptionHandler=NTDLL.RtlRemoveVectoredExceptionHandler
ReplaceFile=ReplaceFileW@24 ReplaceFile=ReplaceFileW@24
ReplaceFileA=ReplaceFileA@24 ReplaceFileA=ReplaceFileA@24
ReplaceFileW=ReplaceFileW@24 ReplaceFileW=ReplaceFileW@24
@ -734,7 +734,7 @@ ResetEvent=ResetEvent@4
ResetWriteWatch=ResetWriteWatch@8 ResetWriteWatch=ResetWriteWatch@8
RestoreLastError=RestoreLastError@4 RestoreLastError=RestoreLastError@4
ResumeThread=ResumeThread@4 ResumeThread=ResumeThread@4
RtlCaptureContext=NTDLL.RtlCaptureContext@4 RtlCaptureContext=NTDLL.RtlCaptureContext
;RtlCaptureStackBackTrace ;RtlCaptureStackBackTrace
RtlFillMemory=NTDLL.RtlFillMemory RtlFillMemory=NTDLL.RtlFillMemory
RtlMoveMemory=NTDLL.RtlMoveMemory RtlMoveMemory=NTDLL.RtlMoveMemory
@ -788,7 +788,7 @@ SetConsoleTextAttribute=SetConsoleTextAttribute@8
SetConsoleTitleA=SetConsoleTitleA@4 SetConsoleTitleA=SetConsoleTitleA@4
SetConsoleTitleW=SetConsoleTitleW@4 SetConsoleTitleW=SetConsoleTitleW@4
SetConsoleWindowInfo=SetConsoleWindowInfo@12 SetConsoleWindowInfo=SetConsoleWindowInfo@12
SetCriticalSectionSpinCount=NTDLL.RtlSetCriticalSectionSpinCount@8 SetCriticalSectionSpinCount=NTDLL.RtlSetCriticalSectionSpinCount
SetCurrentDirectoryA=SetCurrentDirectoryA@4 SetCurrentDirectoryA=SetCurrentDirectoryA@4
SetCurrentDirectoryW=SetCurrentDirectoryW@4 SetCurrentDirectoryW=SetCurrentDirectoryW@4
SetDefaultCommConfigA=SetDefaultCommConfigA@12 SetDefaultCommConfigA=SetDefaultCommConfigA@12
@ -900,7 +900,7 @@ VDMConsoleOperation=VDMConsoleOperation@8
VDMOperationStarted=VDMOperationStarted@4 VDMOperationStarted=VDMOperationStarted@4
VerLanguageNameA=VerLanguageNameA@12 VerLanguageNameA=VerLanguageNameA@12
VerLanguageNameW=VerLanguageNameW@12 VerLanguageNameW=VerLanguageNameW@12
VerSetConditionMask=NTDLL.VerSetConditionMask@16 VerSetConditionMask=NTDLL.VerSetConditionMask
VerifyConsoleIoHandle=VerifyConsoleIoHandle@4 VerifyConsoleIoHandle=VerifyConsoleIoHandle@4
VerifyVersionInfoA=VerifyVersionInfoA@16 VerifyVersionInfoA=VerifyVersionInfoA@16
VerifyVersionInfoW=VerifyVersionInfoW@16 VerifyVersionInfoW=VerifyVersionInfoW@16

View file

@ -1,4 +1,4 @@
/* $Id: getopt.c,v 1.1 2003/04/22 03:20:25 hyperion Exp $ /* $Id: getopt.c,v 1.2 2003/12/17 01:46:08 hyperion Exp $
*/ */
/* /*
tgetopt -- POSIX-compliant implementation of getopt() with string-type-generic tgetopt -- POSIX-compliant implementation of getopt() with string-type-generic
@ -10,7 +10,8 @@
#include <tchar.h> #include <tchar.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <tgetopt.h>
#include "tgetopt.h"
int _topterr = 1; int _topterr = 1;
int _toptind = 1; int _toptind = 1;
@ -85,7 +86,7 @@ int _tgetopt(int argc, _TCHAR * const argv[], const _TCHAR * optstring)
{ {
/* print an error message */ /* print an error message */
if(_topterr && optstring[0] != _T(':')) if(_topterr && optstring[0] != _T(':'))
_ftprintf(stderr, _T("%s: illegal option -- %c\n"), argv[0], _toptopt);; _ftprintf(stderr, _T("%s: illegal option -- %c\n"), argv[0], _toptopt);
/* return an error */ /* return an error */
return _T('?'); return _T('?');
@ -102,7 +103,7 @@ int _tgetopt(int argc, _TCHAR * const argv[], const _TCHAR * optstring)
s_nArgChar = 0; s_nArgChar = 0;
/* this is the last argument */ /* this is the last argument */
if(_toptopt >= argc) if(_toptind >= argc)
{ {
/* print an error message */ /* print an error message */
if(_topterr && optstring[0] != _T(':')) if(_topterr && optstring[0] != _T(':'))
@ -122,6 +123,7 @@ int _tgetopt(int argc, _TCHAR * const argv[], const _TCHAR * optstring)
/* return the argument */ /* return the argument */
_toptarg = argv[_toptind]; _toptarg = argv[_toptind];
++ _toptind;
} }
/* the rest of the argument is the argument of the option */ /* the rest of the argument is the argument of the option */
else else

View file

@ -21,9 +21,9 @@
#endif #endif
static void print_error(LONG win32_error) static void print_error(DWORD win32_error)
{ {
fprintf(stderr, "WIN32 error %d\n", win32_error); fprintf(stderr, "WIN32 error %lu\n", win32_error);
} }

View file

@ -32,9 +32,9 @@
#endif #endif
static void print_error(LONG win32_error) static void print_error(DWORD win32_error)
{ {
fprintf(stderr, "WIN32 error %d\n", win32_error); fprintf(stderr, "WIN32 error %lu\n", win32_error);
} }