Changeset 1118

Timestamp:

Oct 4, 1999, 11:56:04 AM (26 years ago)

Author:

sandervl

Message:

Lots of changes by several people (see changelog for 4 October

Location:

trunk

Files:

• changelog (modified) (1 diff)
• include/win/ddeml.h (modified) (2 diffs)
• include/win/mmsystem.h (modified) (3 diffs)
• include/win/shlobj.h (modified) (2 diffs)
• include/win/winbase.h (modified) (2 diffs)
• include/win/windef.h (modified) (2 diffs)
• include/win/windows.h (modified) (2 diffs)
• include/win/windowsx.h (modified) (5 diffs)
• include/win/wingdi.h (modified) (4 diffs)
• include/win/winuser.h (modified) (4 diffs)
• src/crtdll/crtdll.cpp (modified) (38 diffs)
• src/crtdll/crtdll.def (modified) (15 diffs)
• src/crtdll/crtinc.h (modified) (2 diffs)
• src/dplay/dplay.cpp (modified) (2 diffs)
• src/kernel32/os2heap.cpp (modified) (9 diffs)
• src/kernel32/os2heap.h (modified) (2 diffs)
• src/kernel32/winimgres.cpp (modified) (9 diffs)
• src/kernel32/wprocess.cpp (modified) (3 diffs)
• src/makefile (modified) (2 diffs)
• src/msacm32/msacm32.cpp (modified) (2 diffs)
• src/msvcrt/msvcrt.cpp (modified) (6 diffs)
• src/msvcrt/msvcrt.def (modified) (29 diffs)
• src/shell32/makefile (modified) (3 diffs)
• src/shell32/new/makefile (modified) (3 diffs)
• src/user32/oslibwin.cpp (modified) (3 diffs)
• src/user32/oslibwin.h (modified) (2 diffs)
• src/user32/win32dlg.cpp (modified) (3 diffs)
• src/user32/win32wbase.cpp (modified) (2 diffs)
• src/user32/windlg.cpp (modified) (7 diffs)
• src/win32k/Makefile (modified) (7 diffs)
• src/win32k/include/pe2lx.h (modified) (2 diffs)

trunk/changelog ¶

@@ -1 @@
- /* $Id: changelog,v 1.264 1999-10-03 20:40:54 sandervl Exp $ */
+ /* $Id: changelog,v 1.265 1999-10-04 09:55:47 sandervl Exp $ */
+
+ 99-10-04: Edgar Buerkle <Edgar.Buerkle@gmx.net>
+        - USER32: Fixes for window style update, mouse button messages,
+                  WS_CAPTION style and apps with a dialog as their main window.
+                  (set owner to desktop)
+        - KERNEL32: Extra checks for valid heap pointers
+
+ 99-10-04: Sander van Leeuwen <sandervl@xs4all.nl>
+        - USER32: Deleted dialog.cpp
+        - DPLAY, MSACM32: Compilation fix (indirectly included win32type.h)
+        - KERNEL32: Fixed getVersionStruct for PE & LX images (didn't copy
+                    version data before)
+                    Fixed module name lookup for win32 images executed by the PE
+                    loader. (can't use OSLibQueryModuleHandle for those)
+
+ 99-10-04: Jens Wiessner <wiessnej@rfi.de>
+        - CRTDLL: Implemented functions + added stubs
+        - MSVCRT: More stubs + crtdll forwarders
+
+ 99-10-04: Yuri Dario <mc6530@mclink.it>
+        - ddeml.h: new macros
+        - mmsystem.h: changed sndPlaySound and mciCommand prototypes (as in MS sdk)
+        - shlobh.h: added ifdef for direct inclusion
+        - winbase.h: added UnlockResource macro
+        - windef.h: changed return type (maybe also other functions are wrong)
+        - windows.h: included ddeml.h
+        - windowsx.h: added macros
+        - wingdi.h: added win95 bitmap structures
+        - winuser.h: few macros and changed DLGTEMPLATE prototypes as in MS sdk
+        - crtdll.cpp: now includes libc/locale.h, so toolkit headers are included also for VA36
+        - shell32/makefile: added code for library export.
+        - shell32/new/makefile: added code for library export.
+        - dialog.cpp: DLGTEMPLATE changes
+        - windlg.cpp: DLGTEMPLATE changes.
+        - win32k/makefile: corrected paths
+        - win32k/include/pe2lx.h: this section should be included for VA36
 
  99-10-03: Daniela Engert <dani@ngrt.de>

trunk/include/win/ddeml.h ¶

@@ -1 @@
-/* $Id: ddeml.h,v 1.1 1999-05-24 20:19:10 ktk Exp $ */
+/* $Id: ddeml.h,v 1.2 1999-10-04 09:55:49 sandervl Exp $ */
 
 /*
@@ -119 +119 @@
 #define XCLASS_NOTIFICATION     0x8000
 
-#define XTYP_ADVDATA            (0x0010 | XCLASS_FLAGS)
 #define XTYP_XACT_COMPLETE      (0x0080 | XCLASS_NOTIFICATION )
-#define XTYP_REGISTER           (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
 #define XTYP_REQUEST            (0x00B0 | XCLASS_DATA )
-#define XTYP_DISCONNECT         (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
-#define XTYP_UNREGISTER         (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
+
+//Odin addition
+#define XTYP_ERROR              (0x0000 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
+#define XTYP_ADVDATA            (0x0010 | XCLASS_FLAGS         )
+#define XTYP_ADVREQ             (0x0020 | XCLASS_DATA | XTYPF_NOBLOCK )
+#define XTYP_ADVSTART           (0x0030 | XCLASS_BOOL          )
+#define XTYP_ADVSTOP            (0x0040 | XCLASS_NOTIFICATION)
+#define XTYP_EXECUTE            (0x0050 | XCLASS_FLAGS         )
+#define XTYP_CONNECT            (0x0060 | XCLASS_BOOL | XTYPF_NOBLOCK)
+#define XTYP_CONNECT_CONFIRM    (0x0070 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
+#define XTYP_XACT_COMPLETE      (0x0080 | XCLASS_NOTIFICATION  )
+#define XTYP_POKE               (0x0090 | XCLASS_FLAGS         )
+#define XTYP_REGISTER           (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
+#define XTYP_REQUEST            (0x00B0 | XCLASS_DATA          )
+#define XTYP_DISCONNECT         (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
+#define XTYP_UNREGISTER         (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
+#define XTYP_WILDCONNECT        (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK)
 
 /**************************************************

trunk/include/win/mmsystem.h ¶

@@ -1 @@
-/* $Id: mmsystem.h,v 1.1 1999-05-24 20:19:14 ktk Exp $ */
+/* $Id: mmsystem.h,v 1.2 1999-10-04 09:55:49 sandervl Exp $ */
 
 /* 
@@ -190 +190 @@
 UINT16          WINAPI  mmsystemGetVersion16(void);
 UINT            WINAPI  mmsystemGetVersion(void);
-BOOL16          WINAPI  sndPlaySound(LPCSTR lpszSoundName, UINT16 uFlags);
+BOOL            WINAPI  sndPlaySoundA(LPCSTR pszSound, UINT fuSound);
+BOOL            WINAPI  sndPlaySoundW(LPCWSTR pszSound, UINT fuSound);
+#define                 sndPlaySound WINELIB_NAME_AW(sndPlaySound)
 BOOL            WINAPI  PlaySoundA(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound);
 BOOL            WINAPI  PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound);
@@ -1650 +1652 @@
 
 DWORD           WINAPI  mciSendCommand16(UINT16,UINT16,DWORD,DWORD);
-DWORD           WINAPI  mciSendCommandA(UINT,UINT,DWORD,DWORD);
-DWORD           WINAPI  mciSendCommandW(UINT,UINT,DWORD,DWORD);
+MCIERROR        WINAPI  mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD);
+MCIERROR        WINAPI  mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD);
 #define                 mciSendCommand WINELIB_NAME_AW(mciSendCommand)
 

trunk/include/win/shlobj.h ¶

@@ -1 @@
-/* $Id: shlobj.h,v 1.2 1999-09-02 10:51:14 phaller Exp $ */
+/* $Id: shlobj.h,v 1.3 1999-10-04 09:55:50 sandervl Exp $ */
 
 #ifndef __WINE_SHLOBJ_H
 #define __WINE_SHLOBJ_H
+
+#ifndef DECLSPEC_IMPORT
+#define DECLSPEC_IMPORT
+#endif
 
 #include "wine/obj_base.h"
@@ -251 +255 @@
 #define BFFM_SETSELECTIONA      (WM_USER+102)
 #define BFFM_SETSELECTIONW      (WM_USER+103)
+#define BFFM_SETSELECTION       WINELIB_NAME_AW(BFFM_SETSELECTION)
+
 #define BFFM_SETSTATUSTEXTW     (WM_USER+104)
 

trunk/include/win/winbase.h ¶

@@ -1 @@
-/* $Id: winbase.h,v 1.5 1999-09-02 17:39:36 phaller Exp $ */
+/* $Id: winbase.h,v 1.6 1999-10-04 09:55:50 sandervl Exp $ */
 
 #ifndef __WINE_WINBASE_H
@@ -1798 +1798 @@
 BOOL      WINAPI LocalUnlock(HLOCAL);
 LPVOID      WINAPI LockResource(HGLOBAL);
+#define UnlockResource(hResData) ((hResData), 0)
+
 #define     LockSegment(handle) GlobalFix((HANDLE)(handle))
 #define     MakeProcInstance(proc,inst) (proc)

trunk/include/win/windef.h ¶

@@ -1 @@
-/* $Id: windef.h,v 1.13 1999-09-22 09:46:19 sandervl Exp $ */
+/* $Id: windef.h,v 1.14 1999-10-04 09:55:51 sandervl Exp $ */
 
 /*
@@ -398 +398 @@
 typedef VOID    (* CALLBACK TIMERPROC)(HWND,UINT,UINT,DWORD);
 typedef LRESULT (* CALLBACK WNDENUMPROC16)(HWND16,LPARAM);
-typedef LRESULT (* CALLBACK WNDENUMPROC)(HWND,LPARAM);
+//typedef LRESULT (* CALLBACK WNDENUMPROC)(HWND,LPARAM);
+typedef BOOL    (* CALLBACK WNDENUMPROC)(HWND,LPARAM);
 typedef LRESULT (* CALLBACK WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
 typedef LRESULT (* CALLBACK WNDPROC)(HWND,UINT,WPARAM,LPARAM);

trunk/include/win/windows.h ¶

@@ -1 @@
-/* $Id: windows.h,v 1.3 1999-09-18 15:55:45 sandervl Exp $ */
+/* $Id: windows.h,v 1.4 1999-10-04 09:55:51 sandervl Exp $ */
 
 #ifndef __WINE_WINDOWS_H
@@ -19 +19 @@
 #include "shell.h"
 #include "winreg.h"
+#include "ddeml.h"
 #include "winnetwk.h"
 #include "winver.h"

trunk/include/win/windowsx.h ¶

@@ -1 @@
-/* $Id: windowsx.h,v 1.5 1999-09-08 12:12:28 sandervl Exp $ */
+/* $Id: windowsx.h,v 1.6 1999-10-04 09:55:51 sandervl Exp $ */
 
 /* Copyright (C) 1999 Corel Corporation (Paul Quinn) */
@@ -30 +30 @@
 #define GET_WM_CTLCOLOR_MSG(type)               (WORD)(WM_CTLCOLORMSGBOX+(type))
 #define GET_WM_CTLCOLOR_MPS(hdc, hwnd, type)    (WPARAM)(hdc), (LONG)(hwnd)
+#define GET_WM_MENUSELECT_CMD(wp, lp)            LOWORD(wp)
+#define GET_WM_MENUSELECT_FLAGS(wp, lp)         (UINT)(int)(short)HIWORD(wp)
+#define GET_WM_MENUSELECT_HMENU(wp, lp)         (HMENU)(lp)
+#define GET_WM_MENUSELECT_MPS(cmd, f, hmenu)    (WPARAM)MAKELONG(cmd, f), (LONG)(hmenu)
 
 #define GET_WM_VKEYTOITEM_CODE(wp, lp)          (int)(short)LOWORD(wp)
@@ -944 +948 @@
                 ((int)(DWORD)SendMessage((hwndCtl), CB_GETLBTEXTLEN, (WPARAM)(int)(index), 0L))
 
+#define ComboBox_GetLBText(hwndCtl, index, lpszBuffer)  ((int)(DWORD)SendMessage((hwndCtl), CB_GETLBTEXT, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpszBuffer)))
+#define ComboBox_GetItemData(hwndCtl, index)        ((LRESULT)(DWORD)SendMessage((hwndCtl), CB_GETITEMDATA, (WPARAM)(int)(index), 0L))
+#define ComboBox_SetItemData(hwndCtl, index, data)  ((int)(DWORD)SendMessage((hwndCtl), CB_SETITEMDATA, (WPARAM)(int)(index), (LPARAM)(data)))
+
 #define ComboBox_DeleteString(hwndCtl, index) \
                 ((int)(DWORD)SendMessage((hwndCtl), CB_DELETESTRING, (WPARAM)(int)(index), 0L))
@@ -960 +968 @@
                 ((int)(DWORD)SendMessage((hwndCtl), CB_GETLBTEXT, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpszBuffer)))
 
+#define ComboBox_ShowDropdown(hwndCtl, fShow)       ((BOOL)(DWORD)SendMessage((hwndCtl), CB_SHOWDROPDOWN, (WPARAM)(BOOL)(fShow), 0L))
+#define ComboBox_GetEditSel(hwndCtl)            ((DWORD)SendMessage((hwndCtl), CB_GETEDITSEL, 0L, 0L))
+#define ComboBox_SetEditSel(hwndCtl, ichStart, ichEnd) ((int)(DWORD)SendMessage((hwndCtl), CB_SETEDITSEL, 0L, MAKELPARAM((ichStart), (ichEnd))))
+
 #define ComboBox_GetDroppedState(hwndCtl)             \
            ((BOOL)(DWORD)SendMessage((hwndCtl), CB_GETDROPPEDSTATE, 0L, 0L))
@@ -1038 +1050 @@
 #define Edit_GetTextLength(hwndCtl)             GetWindowTextLength(hwndCtl)
 #define Edit_SetText(hwndCtl, lpsz)             SetWindowText((hwndCtl), (lpsz))
+
+#define Edit_Enable(hwndCtl, fEnable)           EnableWindow((hwndCtl), (fEnable))
+#define Edit_SetReadOnly(hwndCtl, fReadOnly)    ((BOOL)(DWORD)SendMessage((hwndCtl), EM_SETREADONLY, (WPARAM)(BOOL)(fReadOnly), 0L))
         
 #define Edit_GetModify(hwndCtl)            \

trunk/include/win/wingdi.h ¶

@@ -1 @@
-/* $Id: wingdi.h,v 1.6 1999-09-22 09:46:19 sandervl Exp $ */
+/* $Id: wingdi.h,v 1.7 1999-10-04 09:55:51 sandervl Exp $ */
 
 #ifndef __WINE_WINGDI_H
@@ -1513 +1513 @@
 } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
 
+typedef struct {
+        DWORD        bV4Size;
+        LONG         bV4Width;
+        LONG         bV4Height;
+        WORD         bV4Planes;
+        WORD         bV4BitCount;
+        DWORD        bV4V4Compression;
+        DWORD        bV4SizeImage;
+        LONG         bV4XPelsPerMeter;
+        LONG         bV4YPelsPerMeter;
+        DWORD        bV4ClrUsed;
+        DWORD        bV4ClrImportant;
+        DWORD        bV4RedMask;
+        DWORD        bV4GreenMask;
+        DWORD        bV4BlueMask;
+        DWORD        bV4AlphaMask;
+        DWORD        bV4CSType;
+        CIEXYZTRIPLE bV4Endpoints;
+        DWORD        bV4GammaRed;
+        DWORD        bV4GammaGreen;
+        DWORD        bV4GammaBlue;
+} BITMAPV4HEADER, *LPBITMAPV4HEADER, *PBITMAPV4HEADER;
+
   /* biCompression */
 #define BI_RGB           0
 #define BI_RLE8          1
 #define BI_RLE4          2
+#define BI_BITFIELDS     3
 
 typedef struct {
@@ -2696 +2720 @@
 HDC       WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
 HDC       WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
+#define   CreateDC WINELIB_NAME_AW(CreateDC)
 HBITMAP   WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,LPCVOID,const BITMAPINFO*,UINT);
 HBRUSH    WINAPI CreateDIBPatternBrush(HGLOBAL,UINT);
@@ -2936 +2961 @@
 INT       WINAPI StartDocA(HDC,const DOCINFOA*);
 INT       WINAPI StartDocW(HDC,const DOCINFOW*);
+#define StartDoc WINELIB_NAME_AW(StartDoc)
 INT       WINAPI StartPage(HDC);
 INT       WINAPI EndPage(HDC);

trunk/include/win/winuser.h ¶

@@ -1 @@
-/* $Id: winuser.h,v 1.9 1999-10-02 13:55:46 cbratschi Exp $ */
+/* $Id: winuser.h,v 1.10 1999-10-04 09:55:52 sandervl Exp $ */
 
 #ifndef __INCLUDE_WINUSER_H
@@ -684 +684 @@
 #define WM_PRINT             0x0317
 #define WM_PRINTCLIENT       0x0318
+
+#define WM_HANDHELDFIRST     0x0358
+#define WM_HANDHELDLAST      0x035F
+ 
+#define WM_AFXFIRST          0x0360
+#define WM_AFXLAST           0x037F
+ 
+#define WM_PENWINFIRST       0x0380
+#define WM_PENWINLAST        0x038F
+
+#define WM_APP               0x8000
 
   /* FIXME: This does not belong to any libwine interface header */
@@ -3053 +3064 @@
            CreateDialogIndirectParamW(inst,ptr,hwnd,dlg,0)
 #define     CreateDialogIndirect WINELIB_NAME_AW(CreateDialogIndirect)
-HWND      WINAPI CreateDialogIndirectParamA(HINSTANCE,DLGTEMPLATE *,HWND,
+HWND      WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,
                                             DLGPROC,LPARAM);
-HWND      WINAPI CreateDialogIndirectParamW(HINSTANCE,DLGTEMPLATE *,HWND,
+HWND      WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,
                                             DLGPROC,LPARAM);
 #define     CreateDialogIndirectParam WINELIB_NAME_AW(CreateDialogIndirectParam)
@@ -3116 +3127 @@
             DialogBoxIndirectParamW(inst,template,owner,func,0)
 #define     DialogBoxIndirect WINELIB_NAME_AW(DialogBoxIndirect)
-INT       WINAPI DialogBoxIndirectParamA(HINSTANCE,DLGTEMPLATE *,HWND,DLGPROC,LPARAM);
-INT       WINAPI DialogBoxIndirectParamW(HINSTANCE,DLGTEMPLATE *,HWND,DLGPROC,LPARAM);
+INT       WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATEA,HWND,DLGPROC,LPARAM);
+INT       WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC,LPARAM);
 #define     DialogBoxIndirectParam WINELIB_NAME_AW(DialogBoxIndirectParam)
 INT       WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);

trunk/src/crtdll/crtdll.cpp ¶

@@ -1 @@
-/* $Id: crtdll.cpp,v 1.6 1999-09-28 13:26:34 sandervl Exp $ */
+/* $Id: crtdll.cpp,v 1.7 1999-10-04 09:55:54 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 #include <wctype.h>
 #include <math.h>
-#include <locale.h>
+#include <libc\locale.h>
 #include <signal.h>
 #include <io.h>
@@ -40 +40 @@
 #include <drive.h>
 #include <fcntl.h>
+#include <search.h>
 #include <sys\utime.h>
 #include <sys\stat.h>
@@ -100 +101 @@
 
 /*********************************************************************
+ *                  _CIacos    (CRTDLL.004)
+ */
+double CDECL CRTDLL__CIacos( double x )
+{
+  dprintf(("NTDLL: _CIacos\n"));
+  dprintf(("should be register function\n"));
+  return acos(x);
+}
+
+
+/*********************************************************************
+ *                  _CIasin    (CRTDLL.005)
+ */
+double CDECL CRTDLL__CIasin( double x )
+{
+  dprintf(("NTDLL: _CIasin\n"));
+  dprintf(("should be register function\n"));
+  return asin(x);
+}
+
+
+/*********************************************************************
+ *                  _CIatan    (CRTDLL.006)
+ */
+double CDECL CRTDLL__CIatan( double x )
+{
+  dprintf(("NTDLL: _CIatan\n"));
+  dprintf(("should be register function\n"));
+  return atan(x);
+}
+
+
+/*********************************************************************
+ *                  _CIatan2    (CRTDLL.007)
+ */
+double CDECL CRTDLL__CIatan2( double x, double y )
+{
+  dprintf(("NTDLL: _CIatan2\n"));
+  dprintf(("should be register function\n"));
+  return atan2(x,y);
+}
+
+
+/*********************************************************************
+ *                  _CIcos    (CRTDLL.008)
+ */
+double CDECL CRTDLL__CIcos( double x )
+{
+  dprintf(("NTDLL: _CIcos\n"));
+  dprintf(("should be register function\n"));
+  return cos(x);
+}
+
+
+/*********************************************************************
+ *                  _CIcosh    (CRTDLL.009)
+ */
+double CDECL CRTDLL__CIcosh( double x )
+{
+  dprintf(("NTDLL: _CIcosh\n"));
+  dprintf(("should be register function\n"));
+  return cosh(x);
+}
+
+
+/*********************************************************************
+ *                  _CIexp    (CRTDLL.010)
+ */
+double CDECL CRTDLL__CIexp( double x )
+{
+  dprintf(("NTDLL: _CIexp\n"));
+  dprintf(("should be register function\n"));
+  return exp(x);
+}
+
+
+/*********************************************************************
+ *                  _CIfmod     (CRTDLL.011)
+ */
+double CDECL CRTDLL__CIfmod( double x, double y )
+{
+  dprintf(("NTDLL: _CIfmod\n"));
+  dprintf(("should be register function\n"));
+  return fmod(x,y);
+}
+
+
+/*********************************************************************
+ *                  _CIlog    (CRTDLL.012)
+ */
+double CDECL CRTDLL__CIlog( double x )
+{
+  dprintf(("NTDLL: _CIlog\n"));
+  dprintf(("should be register function\n"));
+  return log(x);
+}
+
+
+/*********************************************************************
+ *                  _CIlog10    (CRTDLL.013)
+ */
+double CDECL CRTDLL__CIlog10( double x )
+{
+  dprintf(("NTDLL: _CIlog10\n"));
+  dprintf(("should be register function\n"));
+  return log10(x);
+}
+
+
+/*********************************************************************
+ *                  _CIsin     (CRTDLL.015)
+ */
+double CDECL CRTDLL__CIsin( double x )
+{
+  dprintf(("NTDLL: _CIsin\n"));
+  dprintf(("should be register function\n"));
+  return sin(x);
+}
+
+
+/*********************************************************************
+ *                  _CIsinh    (CRTDLL.016)
+ */
+double CDECL CRTDLL__CIsinh( double x )
+{
+  dprintf(("NTDLL: _CIsinh\n"));
+  dprintf(("should be register function\n"));
+  return sinh(x);
+}
+
+
+/*********************************************************************
+ *                  _CIsqrt    (CRTDLL.017)
+ */
+double CDECL CRTDLL__CIsqrt( double x )
+{
+  dprintf(("NTDLL: _CIsqrt\n"));
+  dprintf(("should be register function\n"));
+  return acos(x);
+}
+
+
+/*********************************************************************
+ *                  _CItan    (CRTDLL.018)
+ */
+double CDECL CRTDLL__CItan( double x )
+{
+  dprintf(("NTDLL: _CItan\n"));
+  dprintf(("should be register function\n"));
+  return tan(x);
+}
+
+
+/*********************************************************************
+ *                  _CItanh    (CRTDLL.019)
+ */
+double CDECL CRTDLL__CItanh( double x )
+{
+  dprintf(("NTDLL: _CItanh\n"));
+  dprintf(("should be register function\n"));
+  return tanh(x);
+}
+
+
+/*********************************************************************
  *                  _XcptFilter    (CRTDLL.21)
  *      FIXME - Could not find anything about it
@@ -109 +275 @@
   return FALSE;
 }
+
 
 /*********************************************************************
@@ -139 +306 @@
 
         /* missing threading init */
+
+        i=0;xargv=NULL;xargc=0;afterlastspace=0;
 /*
-        i=0;xargv=NULL;xargc=0;afterlastspace=0;
         dprintf(("CRTDLL: GetMainArgs i loop\n"));
         while (cmdline[i]) {
@@ -157 +325 @@
                                 afterlastspace=i;
         dprintf(("CRTDLL: GetMainArgs *3\n"));
+
                 } else
                         i++;
 
         }
+
         xargv=(char**)HeapReAlloc( GetProcessHeap(), 0, xargv,
                                    sizeof(char*)*(++xargc));
@@ -168 +338 @@
         xargv[xargc-1] = HEAP_strdupA( GetProcessHeap(), 0,
                                        cmdline+afterlastspace);
-        dprintf(("CRTDLL: GetMainArgs *6\n"));
-        dprintf(("CRTDLL: GetMainArgs *7\n"));
+*/
         CRTDLL_argc_dll = xargc;
-        dprintf(("CRTDLL: GetMainArgs *8\n"));
         *argc           = xargc;
-        dprintf(("CRTDLL: GetMainArgs *9\n"));
         CRTDLL_argv_dll = xargv;
-        dprintf(("CRTDLL: GetMainArgs *11\n"));
         *argv           = xargv;
-*/
         dprintf(("CRTDLL: GetMainArgs end\n"));
         CRTDLL_environ_dll = *environ = GetEnvironmentStringsA();
@@ -194 +359 @@
 
 /*********************************************************************
+ *                  __doserrno            (CRTDLL.26)
+ */
+long * CDECL CRTDLL___doserrno()
+{       
+        dprintf(("__doserrno not implemented.\n"));
+        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+        return FALSE;
+//      return _doserrno();
+}
+
+
+/*********************************************************************
  *           CRTDLL___isascii   (CRTDLL.28)
  */
@@ -315 +492 @@
 
 /*********************************************************************
+ *                  CRTDLL__beep                    (CRTDLL.45)
+ */
+void CDECL CRTDLL__beep(unsigned i1, unsigned i2)
+{       
+        dprintf(("_beep not implemented.\n"));
+}
+
+
+/*********************************************************************
  *           CRTDLL__beginthread   (CRTDLL.46)
  */
@@ -338 +524 @@
 
 /*********************************************************************
+ *           CRTDLL__cabs   (CRTDLL.48)
+ */
+double CDECL CRTDLL__cabs(struct complex * c)
+{
+  dprintf(("CRTDLL: _cabs not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+//  return (_cabs(c));
+}
+
+
+/*********************************************************************
  *                  _cexit          (CRTDLL.49)
  *
@@ -345 +543 @@
         dprintf(("_cexit(%d)\n",ret));
         ExitProcess(ret);
+}
+
+
+/*********************************************************************
+ *           CRTDLL__cgets  (CRTDLL.50)
+ */
+char * CDECL CRTDLL__cgets( char *s )
+{
+  dprintf(("CRTDLL: _cgets\n"));
+  return (_cgets(s));
 }
 
@@ -375 +583 @@
 
 /*********************************************************************
+ *           CRTDLL__chgsign     (CRTDLL.53)
+ */
+double CDECL CRTDLL__chgsign(double x)
+{
+  dprintf(("CRTDLL: _chgsign not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__chmod   (CRTDLL.54)
+ */
+int CDECL CRTDLL__chmod( const char *s, int i)
+{
+  dprintf(("CRTDLL: _chmod\n"));
+  return (_chmod(s, i));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__chsize   (CRTDLL.55)
+ */
+int CDECL CRTDLL__chsize( int i, long l )
+{
+  dprintf(("CRTDLL: _chsize\n"));
+  return (_chsize(i, l));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__clearfp  (CRTDLL.56)
+ */
+unsigned int CDECL CRTDLL__clearfp( void )
+{
+  dprintf(("CRTDLL: _clearfp\n"));
+  return (_clear87());
+}
+
+
+/*********************************************************************
  *           CRTDLL__close   (CRTDLL.57)
  */
@@ -396 +645 @@
 /*********************************************************************
  *                  CRTDLL__controlfp    (CRTDLL.61)
- *      FIXME - Could not find anything about it
- */
-INT CDECL CRTDLL__controlfp(DWORD ret)
-{
-  dprintf(("CRTDLL: _controlfp not implemented.\n"));
+ */
+unsigned CDECL CRTDLL__controlfp(unsigned i1,unsigned i2)
+{
+  dprintf(("CRTDLL: _controlfp\n"));
+  return (_control87(i1, i2));
+}
+
+
+/*********************************************************************
+ *                  CRTDLL__copysign    (CRTDLL.62)
+ */
+double CDECL CRTDLL__copysign( double x, double y )
+{
+  dprintf(("CRTDLL: _copysign not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  CRTDLL__cprintf    (CRTDLL.63)
+ */
+INT CDECL CRTDLL__cprintf( char *s, ... )
+{
+  dprintf(("CRTDLL: _cprintf not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  CRTDLL__cputs      (CRTDLL.65)
+ */
+INT CDECL CRTDLL__cputs( char * s )
+{
+  dprintf(("CRTDLL: _cputs\n"));
+  return (_cputs(s));
+}
+
+
+/*********************************************************************
+ *                  CRTDLL__creat      (CRTDLL.66)
+ */
+INT CDECL CRTDLL__creat( const char *s, int i )
+{
+  dprintf(("CRTDLL: _creat\n"));
+  return (_creat(s, i));
+}
+
+
+/*********************************************************************
+ *                  CRTDLL__cscanf    (CRTDLL.67)
+ */
+INT CDECL CRTDLL__cscanf( char *s, ... )
+{
+  dprintf(("CRTDLL: _cscanf not implemented.\n"));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
@@ -479 +779 @@
 
 /*********************************************************************
+ *           CRTDLL__execl   (CRTDLL.79)
+ */
+int CDECL CRTDLL__execl( char *s1, char *s2, ...)
+{
+  dprintf(("CRTDLL: _execl not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__execle   (CRTDLL.80)
+ */
+int CDECL CRTDLL__execle( char *s1, char *s2, ...)
+{
+  dprintf(("CRTDLL: _execle not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__execlp   (CRTDLL.81)
+ */
+int CDECL CRTDLL__execlp( char *s1, char *s2, ...)
+{
+  dprintf(("CRTDLL: _execlp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__execlpe   (CRTDLL.82)
+ */
+int CDECL CRTDLL__execlpe( char *s1, char *s2, ...)
+{
+  dprintf(("CRTDLL: _execlpe not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__execv   (CRTDLL.83)
+ */
+int CDECL CRTDLL__execv( char *s1, char **s2)
+{
+  dprintf(("CRTDLL: _execv\n"));
+  return (_execv(s1, s2));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__execve   (CRTDLL.84)
+ */
+int CDECL CRTDLL__execve( char *s1, char **s2, char **s3)
+{
+  dprintf(("CRTDLL: _execve\n"));
+  return (_execve(s1, s2, s3));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__execvp   (CRTDLL.85)
+ */
+int CDECL CRTDLL__execvp( char *s1, char **s2)
+{
+  dprintf(("CRTDLL: _execvp\n"));
+  return (_execvp(s1, s2));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__execvpe   (CRTDLL.86)
+ */
+int CDECL CRTDLL__execvpe( char *s1, char **s2, char **s3)
+{
+  dprintf(("CRTDLL: _execvpe\n"));
+  return (_execvpe(s1, s2, s3));
+}
+
+
+/*********************************************************************
  *                  _exit          (CRTDLL.87)
  */
@@ -496 +880 @@
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__fcloseall   (CRTDLL.89)
+ */
+int CDECL CRTDLL__fcloseall( void )
+{
+  dprintf(("CRTDLL: _fcloseall\n"));
+  return (_fcloseall());
 }
 
@@ -561 +955 @@
 
 
- /*********************************************************************
- *                  _findclose    (CRTDLL.098)
- */
+/*********************************************************************
+ *           CRTDLL__filbuf     (CRTDLL.94)
+ */
+int CDECL CRTDLL__filbuf(FILE * f)
+{
+  dprintf(("CRTDLL: _filbuf not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__filelength     (CRTDLL.96)
+ */
+long CDECL CRTDLL__filelength( int i )
+{
+  dprintf(("CRTDLL: _filelength\n"));
+  return (_filelength(i));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__fileno     (CRTDLL.97)
+ */
+int CDECL CRTDLL__fileno(FILE * f)
+{
+  dprintf(("CRTDLL: _fileno\n"));
+  return (_fileno(f));
+}
+
+
+/*********************************************************************
+*                  _findclose    (CRTDLL.098)
+*/
 int CDECL CRTDLL__findclose( long handle )
 {
@@ -606 +1031 @@
 
 /*********************************************************************
+ *                  _flsbuf     (CRTDLL.102)
+ */
+INT CDECL CRTDLL__flsbuf(int i, FILE * f)
+{
+  dprintf(("CRTDLL: _flsbuf not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _flushall     (CRTDLL.103)
+ */
+INT CDECL CRTDLL__flushall(void)
+{
+  dprintf(("CRTDLL: _flushall\n"));
+  return (_flushall());
+}
+
+
+/*********************************************************************
+ *                  _fpclass     (CRTDLL.105)
+ */
+INT CDECL CRTDLL__fpclass( double x )
+{
+  dprintf(("CRTDLL: _fpclass not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _fpieee_flt     (CRTDLL.106)
+ */
+INT CDECL CRTDLL__fpieee_flt( unsigned long exc_code, struct _EXCEPTION_POINTERS *exc_info, int handler)
+{
+  dprintf(("CRTDLL: _fpieee_flt not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+
+/*********************************************************************
  *                  _fpreset     (CRTDLL.107)
  */
@@ -681 +1150 @@
 
 /*********************************************************************
+ *                  _futime        (CRTDLL.115)
+ */
+int CDECL CRTDLL__futime( int handle, struct _utimbuf *filetime )
+{
+  dprintf(("CRTDLL: _futime not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
  *                  _gcvt     (CRTDLL.116)
  */
@@ -763 +1243 @@
 
 /*********************************************************************
+ *                  _getdrives    (CRTDLL.125)
+ */
+unsigned long CDECL CRTDLL__getdrives(void)
+{
+  dprintf(("CRTDLL: _getdrives not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _getpid    (CRTDLL.126)
+ */
+int CDECL CRTDLL__getpid( void )
+{
+  dprintf(("CRTDLL: _getpid\n"));
+  return (_getpid());
+}
+
+
+/*********************************************************************
  *                  _getw     (CRTDLL.128)
  */
@@ -821 +1322 @@
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _hypot     (CRTDLL.134)
+ */
+double CDECL CRTDLL__hypot(double x1, double x2)
+{
+  dprintf(("CRTDLL: _hypot not implemented.\n"));
+  return (_hypot(x1, x2));
 }
 
@@ -1128 +1639 @@
 
 
+/*********************************************************************
+ *                  _ismbslead     (CRTDLL.162)
+ */
+int CDECL CRTDLL__ismbslead(const unsigned char *s1, const unsigned char *s2)
+{
+  dprintf(("CRTDLL: _ismbslead not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _ismbstrail     (CRTDLL.163)
+ */
+int CDECL CRTDLL__ismbstrail(const unsigned char *s1, const unsigned char *s2)
+{
+  dprintf(("CRTDLL: _ismbstrail not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _isnan     (CRTDLL.164)
+ */
+int CDECL CRTDLL__isnan( double x )
+{
+  dprintf(("CRTDLL: _isnan not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _j0     (CRTDLL.166)
+ */
+double CDECL CRTDLL__j0(double x)
+{
+  dprintf(("CRTDLL: _j0\n"));
+  return (_j0(x));
+}
+
+
+/*********************************************************************
+ *                  _j1     (CRTDLL.167)
+ */
+double CDECL CRTDLL__j1(double x)
+{
+  dprintf(("CRTDLL: _j1\n"));
+  return (_j1(x));}
+
+
+/*********************************************************************
+ *                  _jn     (CRTDLL.168)
+ */
+double CDECL CRTDLL__jn(int i, double x)
+{
+  dprintf(("CRTDLL: _jn\n"));
+  return (_jn(i, x));
+}
+
+
+/*********************************************************************
+ *                  _kbhit     (CRTDLL.169)
+ */
+int CDECL CRTDLL__kbhit( void )
+{
+  dprintf(("CRTDLL: _kbhit\n"));
+  return (_kbhit());
+}
+
+
+/*********************************************************************
+ *                  _lfind     (CRTDLL.170)
+ */
+void * CDECL CRTDLL__lfind(const void *v1, const void *v2, unsigned int *i1, unsigned int i2,
+        int (CDECL *i3)(const void *v3, const void *v4))
+{
+  dprintf(("CRTDLL: _lfind not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+//  return (_lfind(v1,v2,i1,i2,i3(v3,v4)));
+}
+
+
 /*******************************************************************
  *         _local_unwind2  (CRTDLL.172)
@@ -1149 +1745 @@
 
 /*********************************************************************
+ *                  _logb     (CRTDLL.174)
+ */
+double CDECL CRTDLL__logb( double x )
+{
+  dprintf(("CRTDLL: _logb not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
  *                  _lrotl      (CRTDLL.175)
  */
@@ -1165 +1772 @@
   dprintf(("CRTDLL: _lrotr\n"));
   return (_lrotr(value, shift));
+}
+
+
+/*********************************************************************
+ *                  _lsearch   (CRTDLL.177)
+ */
+void * CDECL CRTDLL__lsearch(const void *v1, void  *v2, unsigned int *i1, unsigned int i2,
+        int (CDECL *i3)(const void *v3, const void *v4))
+{
+  dprintf(("CRTDLL: _lsearch not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+//  return (_lsearch(v1,v2,i1,i2,i3(v3,v4)));
 }
 
@@ -1713 +2333 @@
 
 /*********************************************************************
+ *           CRTDLL__mbstrlen   (CRTDLL.228)
+ */
+size_t CDECL CRTDLL__mbstrlen(const char *s)
+{
+  dprintf(("CRTDLL: _mbstrlen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
  *           CRTDLL__mbsupr    (CRTDLL.229)
  */
@@ -1718 +2349 @@
 {
   dprintf(("CRTDLL: _mbsupr not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__memccpy   (CRTDLL.230)
+ */
+void * CDECL CRTDLL__memccpy(void *v1, const void *v2, int i, size_t s)
+{
+  dprintf(("CRTDLL: _memccpy not implemented.\n"));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
@@ -1753 +2395 @@
   dprintf(("CRTDLL: _msize\n"));
   return (_msize(ptr));
+}
+
+
+/*********************************************************************
+ *                  _nextafter        (CRTDLL.235)
+ */
+double CDECL CRTDLL__nextafter( double x, double y )
+{
+  dprintf(("CRTDLL: _nextafter not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _onexit        (CRTDLL.236)
+ */
+onexit_t CDECL CRTDLL__onexit(onexit_t t)
+{
+  dprintf(("CRTDLL: _onexit\n"));
+  return (_onexit(t));
 }
 
@@ -1874 +2537 @@
 }
 
+
+/*********************************************************************
+ *                  _putch     (CRTDLL.250)
+ */
+INT CDECL CRTDLL__putch( int i )
+{
+  dprintf(("CRTDLL: _putch\n"));
+  return (_putch(i));
+}
+
+
+/*********************************************************************
+ *                  _putenv     (CRTDLL.251)
+ */
+INT CDECL CRTDLL__putenv(const char *s)
+{
+  dprintf(("CRTDLL: _putenv\n"));
+  return (_putenv(s));
+}
+
+
+/*********************************************************************
+ *                  _putw     (CRTDLL.252)
+ */
+INT CDECL CRTDLL__putw( int binint, FILE *fp )
+{
+  dprintf(("CRTDLL: _putw not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
 /*********************************************************************
  *                  _read     (CRTDLL.254)
@@ -1886 +2581 @@
 
 /*********************************************************************
- *                  _putw     (CRTDLL.252)
- */
-INT CDECL CRTDLL__putw( int binint, FILE *fp )
-{
-  dprintf(("CRTDLL: _putw not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+ *                  _rmdir     (CRTDLL.255)
+ */
+INT CDECL CRTDLL__rmdir(const char *s1)
+{
+  dprintf(("CRTDLL: _rmdir\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+//  return (_rmdir(s1));
+}
+
+
+/*********************************************************************
+ *                  _rmtmp     (CRTDLL.256)
+ */
+INT CDECL CRTDLL__rmtmp(void)
+{
+  dprintf(("CRTDLL: _rmtmp\n"));
+  return(_rmtmp());
 }
 
@@ -1914 +2620 @@
   return (_rotr(value, shift));
 }
- 
+
+
+/*********************************************************************
+ *           CRTDLL__scalb       (CRTDLL.259)
+ */
+double CDECL CRTDLL__scalb( double x, long exp )
+{
+  dprintf(("CRTDLL: _scalb not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
 
 /*********************************************************************
@@ -1922 +2639 @@
 {
   dprintf(("CRTDLL: _searchenv not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+}
+
+
+/*********************************************************************
+ *           CRTDLL__seterrormode        (CRTDLL.261)
+ */
+void CDECL CRTDLL__seterrormode(int i)
+{
+  dprintf(("CRTDLL: _seterrormode not implemented.\n"));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
@@ -1938 +2665 @@
 /*********************************************************************
  *                  _setmode           (CRTDLL.263)
- * FIXME: At present we ignore the request to translate CR/LF to LF.
- *
- * We allways translate when we read with fgets, we never do with fread
- *
  */
 INT CDECL CRTDLL__setmode( INT fh,INT mode)
 {
-        /* FIXME */
-        dprintf(("on fhandle %d mode %s, STUB.\n",
-                      fh,(mode=O_TEXT)?"O_TEXT":
-                      (mode=O_BINARY)?"O_BINARY":"UNKNOWN"));
-        return -1;
+        dprintf(("CRTDLL: _setmode\n"));
+        return (_setmode(fh, mode));
 }
 
@@ -1964 +2684 @@
 
 /*********************************************************************
+ *           CRTDLL__sopen       (CRTDLL.268)
+ */
+int CDECL CRTDLL__sopen( const char *s, int i1, int i2, ... )
+{
+  dprintf(("CRTDLL: _sopen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__spawnl      (CRTDLL.269)
+ */
+int CDECL CRTDLL__spawnl( int i, char *s1, char *s2, ... )
+{
+  dprintf(("CRTDLL: _spawnl not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__spawnle     (CRTDLL.270)
+ */
+int CDECL CRTDLL__spawnle( int i, char *s1, char *s2, ... )
+{
+  dprintf(("CRTDLL: _spawnle not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__spawnlp     (CRTDLL.271)
+ */
+int CDECL CRTDLL__spawnlp( int i, char *s1, char *s2, ... )
+{
+  dprintf(("CRTDLL: _spawnlp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__spawnlpe    (CRTDLL.272)
+ */
+int CDECL CRTDLL__spawnlpe( int i, char *s1, char *s2, ... )
+{
+  dprintf(("CRTDLL: _spawnlpe not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *           CRTDLL__spawnv      (CRTDLL.273)
+ */
+int CDECL CRTDLL__spawnv( int i, char *s1, char ** s2 )
+{
+  dprintf(("CRTDLL: _spawnv\n"));
+  return (_spawnv(i, s1, s2));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__spawnve     (CRTDLL.274)
+ */
+int CDECL CRTDLL__spawnve( int i, char *s1, char ** s2, char ** s3 )
+{
+  dprintf(("CRTDLL: _spawnve\n"));
+  return (_spawnve(i, s1, s2, s3));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__spawnvp     (CRTDLL.275)
+ */
+int CDECL CRTDLL__spawnvp( int i, char *s1, char ** s2 )
+{
+  dprintf(("CRTDLL: _spawnvp\n"));
+  return (_spawnvp(i, s1, s2));
+}
+
+/*********************************************************************
+ *           CRTDLL__spawnv      (CRTDLL.276)
+ */
+int CDECL CRTDLL__spawnvpe( int i, char *s1, char ** s2, char ** s3 )
+{
+  dprintf(("CRTDLL: _spawnvpe\n"));
+  return (_spawnvpe(i, s1, s2, s3));
+}
+
+
+/*********************************************************************
  *           CRTDLL__stat        (CRTDLL.278)
  */
@@ -1974 +2788 @@
 
 /*********************************************************************
+ *           CRTDLL__statusfp    (CRTDLL.279)
+ */
+unsigned int CDECL CRTDLL__statusfp( void )
+{
+  dprintf(("CRTDLL: _statusfp\n"));
+  return (_status87());
+}
+
+
+/*********************************************************************
  *           CRTDLL__strdate     (CRTDLL.281)
  */
@@ -2000 +2824 @@
   dprintf(("CRTDLL: _strdup\n"));
   return HEAP_strdupA(GetProcessHeap(),0,ptr);
+}
+
+
+/*********************************************************************
+ *           CRTDLL__strerror    (CRTDLL.284)
+ */
+char * CDECL CRTDLL__strerror(const char *s)
+{
+  dprintf(("CRTDLL: _strerror not implemented\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+//  return (_strerror(s));
 }
 
@@ -2109 +2945 @@
 
 /*********************************************************************
+ *           CRTDLL__swab        (CRTDLL.299)
+ */
+void CDECL CRTDLL__swab(char *s1, char *s2, int i)
+{
+  dprintf(("CRTDLL: _swab\n"));
+  _swab(s1, s2, i);
+}
+
+
+/*********************************************************************
+ *           CRTDLL__tell        (CRTDLL.302)
+ */
+long CDECL CRTDLL__tell( int i )
+{
+  dprintf(("CRTDLL: _tell\n"));
+  return (_tell(i));
+}
+
+
+/*********************************************************************
  *           CRTDLL__tempnam     (CRTDLL.303)
  */
@@ -2135 +2991 @@
   dprintf(("CRTDLL: _toupper\n"));
   return (_toupper(n));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__tzset       (CRTDLL.308)
+ */
+void CDECL CRTDLL__tzset( void )
+{
+  dprintf(("CRTDLL: _tzset not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+}
+
+
+/*********************************************************************
+ *           CRTDLL__umask       (CRTDLL.310)
+ */
+int CDECL CRTDLL__umask( int i )
+{
+  dprintf(("CRTDLL: _umask\n"));
+  return (_umask(i));
+}
+
+
+/*********************************************************************
+ *           CRTDLL__ungetch     (CRTDLL.311)
+ */
+int CDECL CRTDLL__ungetch( int i )
+{
+  dprintf(("CRTDLL: _ungetch\n"));
+  return (_ungetch(i));
 }
 
@@ -2273 +3159 @@
 
 /*********************************************************************
+ *                  _y0     (CRTDLL.332)
+ */
+double CDECL CRTDLL__y0(double x)
+{
+  dprintf(("CRTDLL: _y0\n"));
+  return (_y0(x));
+}
+
+
+/*********************************************************************
+ *                  _y1     (CRTDLL.333)
+ */
+double CDECL CRTDLL__y1(double x)
+{
+  dprintf(("CRTDLL: _y1\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return (_y1(x));
+}
+
+
+/*********************************************************************
+ *                  _yn     (CRTDLL.334)
+ */
+double CDECL CRTDLL__yn(int i, double x)
+{
+  dprintf(("CRTDLL: _yn\n"));
+  return (_yn(i, x));
+}
+
+
+/*********************************************************************
  *                  isleadbyte  (CRTDLL.335)
  */

trunk/src/crtdll/crtdll.def ¶

@@ -1 @@
-; $Id: crtdll.def,v 1.6 1999-09-28 13:26:35 sandervl Exp $
+; $Id: crtdll.def,v 1.7 1999-10-04 09:55:55 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -104 +104 @@
     ??3@YAXPAX@Z                = _CRTDLL_delete                @2
     ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z = _CRTDLL_set_new_handler @3
-;   _CIacos                                                     @4
-;   _CIasin                                                     @5
-;   _CIatan                                                     @6
-;   _CIatan2                                                    @7
-;   _CIcos                                                      @8
-;   _CIcosh                                                     @9
-;   _CIexp                                                      @10
-;   _CIfmod                                                     @11
-;   _CIlog                                                      @12
-;   _CIlog10                                                    @13
+    _CIacos                     = _CRTDLL__CIacos               @4
+    _CIasin                     = _CRTDLL__CIasin               @5
+    _CIatan                     = _CRTDLL__CIatan               @6
+    _CIatan2                    = _CRTDLL__CIatan2              @7
+    _CIcos                      = _CRTDLL__CIcos                @8
+    _CIcosh                     = _CRTDLL__CIcosh               @9
+    _CIexp                      = _CRTDLL__CIexp                @10
+    _CIfmod                     = _CRTDLL__CIfmod               @11
+    _CIlog                      = _CRTDLL__CIlog                @12
+    _CIlog10                    = _CRTDLL__CIlog10              @13
     _CIpow                      = NTDLL__CIpow                  @14
-;   _CIsin                                                      @15
-;   _CIsinh                                                     @16
-;   _CIsqrt                                                     @17
-;   _CItan                                                      @18
-;   _CItanh                                                     @19
+    _CIsin                      = _CRTDLL__CIsin                @15
+    _CIsinh                     = _CRTDLL__CIsinh               @16
+    _CIsqrt                     = _CRTDLL__CIsqrt               @17
+    _CItan                      = _CRTDLL__CItan                @18
+    _CItanh                     = _CRTDLL__CItanh               @19
 ;   _HUGE_dll                                                   @20
     _XcptFilter                 = _CRTDLL__XcptFilter           @21
@@ -126 +126 @@
     __argv_dll                  = CRTDLL_argv_dll               @24
     __dllonexit                 = _CRTDLL___dllonexit           @25
-;   __doserrno                                                  @26
+    __doserrno                  = _CRTDLL___doserrno            @26
 ;   __fpecode                                                   @27
     __isascii                   = _CRTDLL___isascii             @28
@@ -145 +145 @@
     _baseminor_dll              = CRTDLL_baseminor_dll          @43
     _baseversion_dll            = CRTDLL_baseversion_dll        @44
-;   _beep                                                       @45
+    _beep                       = _CRTDLL__beep                 @45
     _beginthread                = _CRTDLL__beginthread          @46
     _c_exit                     = _CRTDLL__c_exit               @47
-;   _cabs                                                       @48
+    _cabs                       = _CRTDLL__cabs                 @48
     _cexit                      = _CRTDLL__cexit                @49
-;   _cgets                                                      @50
+    _cgets                      = _CRTDLL__cgets                @50
     _chdir                      = _CRTDLL__chdir                @51
     _chdrive                    = _CRTDLL__chdrive              @52
-;   _chgsign                                                    @53
-;   _chmod                                                      @54
-;   _chsize                                                     @55
-;   _clearfp                                                    @56
+    _chgsign                    = _CRTDLL__chgsign              @53
+    _chmod                      = _CRTDLL__chmod                @54
+    _chsize                     = _CRTDLL__chsize               @55
+    _clearfp                    = _CRTDLL__clearfp              @56
     _close                      = _CRTDLL__close                @57
 ;   _commit                                                     @58
@@ -162 +162 @@
     _control87                  = _CRTDLL__control87            @60
     _controlfp                  = _CRTDLL__controlfp            @61
-;   _copysign                                                   @62
-;   _cprintf                                                    @63
+    _copysign                   = _CRTDLL__copysign             @62
+    _cprintf                    = _CRTDLL__cprintf              @63
 ;   _cpumode_dll                                                @64
-;   _cputs                                                      @65
-;   _creat                                                      @66
-;   _cscanf                                                     @67
+    _cputs                      = _CRTDLL__cputs                @65
+    _creat                      = _CRTDLL__creat                @66
+    _cscanf                     = _CRTDLL__cscanf               @67
 ;   _ctype                                                      @68
     _cwait                      = _CRTDLL__cwait                @69
-;   _daylight_dll                                               @70
+    _daylight_dll               = CRTDLL_daylight_dll           @70
     _dup                        = _CRTDLL__dup                  @71
     _dup2                       = _CRTDLL__dup2                 @72
@@ -179 +179 @@
     _errno                      = _CRTDLL__errno                @77
     _except_handler2            = _CRTDLL__except_handler2      @78
-;   _execl                                                      @79
-;   _execle                                                     @80
-;   _execlp                                                     @81
-;   _execlpe                                                    @82
-;   _execv                                                      @83
-;   _execve                                                     @84
-;   _execvp                                                     @85
-;   _execvpe                                                    @86
+    _execl                      = _CRTDLL__execl                @79
+    _execle                     = _CRTDLL__execle               @80
+    _execlp                     = _CRTDLL__execlp               @81
+    _execlpe                    = _CRTDLL__execlpe              @82
+    _execv                      = _CRTDLL__execv                @83
+    _execve                     = _CRTDLL__execve               @84
+    _execvp                     = _CRTDLL__execvp               @85
+    _execvpe                    = _CRTDLL__execvpe              @86
     _exit                       = _CRTDLL__exit                 @87
     _expand                     = _CRTDLL__expand               @88
-;   _fcloseall                                                  @89
+    _fcloseall                  = _CRTDLL__fcloseall            @89
     _fcvt                       = _CRTDLL__fcvt                 @90
     _fdopen                     = _CRTDLL__fdopen               @91
     _fgetchar                   = _CRTDLL__fgetchar             @92
     _fgetwchar                  = _CRTDLL__fgetwchar            @93
-;   _filbuf                                                     @94
-;   _fileinfo_dll                                               @95
-;   _filelength                                                 @96
-;   _fileno                                                     @97
+    _filbuf                     = _CRTDLL__filbuf               @94
+    _fileinfo_dll               = CRTDLL_fileinfo_dll           @95
+    _filelength                 = _CRTDLL__filelength           @96
+    _fileno                     = _CRTDLL__fileno               @97
     _findclose                  = _CRTDLL__findclose            @98
     _findfirst                  = _CRTDLL__findfirst            @99
@@ -203 +203 @@
 
     _finite                     = _CRTDLL__finite               @101
-;   _flsbuf                                                     @102
-;   _flushall                                                   @103
+    _flsbuf                     = _CRTDLL__flsbuf               @102
+    _flushall                   = _CRTDLL__flushall             @103
     _fmode_dll                  = CRTDLL_fmode_dll              @104
-;   _fpclass                                                    @105
-;   _fpieee_flt                                                 @106
+    _fpclass                    = _CRTDLL__fpclass              @105
+    _fpieee_flt                 = _CRTDLL__fpieee_flt           @106
     _fpreset                    = _CRTDLL__fpreset              @107
     _fputchar                   = _CRTDLL__fputchar             @108
@@ -216 +216 @@
     _ftol                       = NTDLL__ftol                   @113
     _fullpath                   = _CRTDLL__fullpath             @114
-;   _futime                                                     @115
+    _futime                     = _CRTDLL__futime               @115
     _gcvt                       = _CRTDLL__gcvt                 @116
     _get_osfhandle              = _CRTDLL__get_osfhandle        @117
@@ -226 +226 @@
 ;   _getdllprocaddr                                             @123
     _getdrive                   = _CRTDLL__getdrive             @124
-;   _getdrives                                                  @125
-;   _getpid                                                     @126
+    _getdrives                  = _CRTDLL__getdrives            @125
+    _getpid                     = _CRTDLL__getpid               @126
 ;   _getsystime                                                 @127
     _getw                       = _CRTDLL__getw                 @128
@@ -235 +235 @@
     _heapset                    = _CRTDLL__heapset              @132
     _heapwalk                   = _CRTDLL__heapwalk             @133
-;   _hypot                                                      @134
-;    _initterm                  = _CRTDLL__initterm             @135
+    _hypot                      = _CRTDLL__hypot                @134
     _initterm                   = _DLL_InitTerm                 @135
     _iob                        = CRTDLL_iob                    @136
@@ -264 +263 @@
     _ismbcsymbol                = _CRTDLL__ismbcsymbol          @160
     _ismbcupper                 = _CRTDLL__ismbcupper           @161
-;   _ismbslead                                                  @162
-;   _ismbstrail                                                 @163
-;   _isnan                                                      @164
+    _ismbslead                  = _CRTDLL__ismbslead            @162
+    _ismbstrail                 = _CRTDLL__ismbstrail           @163
+    _isnan                      = _CRTDLL__isnan                @164
     _itoa                       = NTDLL__itoa                   @165
-;   _j0                                                         @166
-;   _j1                                                         @167
-;   _jn                                                         @168
-;   _kbhit                                                      @169
-;   _lfind                                                      @170
+    _j0                         = _CRTDLL__j0                   @166
+    _j1                         = _CRTDLL__j1                   @167
+    _jn                         = _CRTDLL__jn                   @168
+    _kbhit                      = _CRTDLL__kbhit                @169
+    _lfind                      = _CRTDLL__lfind                @170
 ;   _loaddll                                                    @171
     _local_unwind2              = _CRTDLL__local_unwind2        @172
     _locking                    = _CRTDLL__locking              @173
-;   _logb                                                       @174
+    _logb                       = _CRTDLL__logb                 @174
     _lrotl                      = _CRTDLL__lrotl                @175
     _lrotr                      = _CRTDLL__lrotr                @176
-;   _lsearch                                                    @177
+    _lsearch                    = _CRTDLL__lsearch              @177
     _lseek                      = _CRTDLL__lseek                @178
     _ltoa                       = NTDLL__ltoa                   @179
@@ -331 +330 @@
     _mbsstr                     = _CRTDLL__mbsstr               @226
     _mbstok                     = _CRTDLL__mbstok               @227
-;   _mbstrlen                                                   @228
+    _mbstrlen                   = _CRTDLL__mbstrlen             @228
     _mbsupr                     = _CRTDLL__mbsupr               @229
-;   _memccpy                                                    @230
+    _memccpy                    = _CRTDLL__memccpy              @230
     _memicmp                    = NTDLL__memicmp                @231
     _mkdir                      = _CRTDLL__mkdir                @232
     _mktemp                     = _CRTDLL__mktemp               @233
     _msize                      = _CRTDLL__msize                @234
-;   _nextafter                                                  @235
-;   _onexit                                                     @236
+    _nextafter                  = _CRTDLL__nextafter            @235
+    _onexit                     = _CRTDLL__onexit               @236
     _open                       = _CRTDLL__open                 @237
     _open_osfhandle             = _CRTDLL__open_osfhandle       @238
@@ -353 +352 @@
     _popen                      = _CRTDLL__popen                @248
 ;   _purecall                                                   @249
-;   _putch                                                      @250
-;   _putenv                                                     @251
+    _putch                      = _CRTDLL__putch                @250
+    _putenv                     = _CRTDLL__putenv               @251
     _putw                       = _CRTDLL__putw                 @252
 ;   _pwctype_dll                                                @253
     _read                       = _CRTDLL__read                 @254
-;   _rmdir                                                      @255
-;   _rmtmp                                                      @256
+    _rmdir                      = _CRTDLL__rmdir                @255
+    _rmtmp                      = _CRTDLL__rmtmp                @256
     _rotl                       = _CRTDLL__rotl                 @257
     _rotr                       = _CRTDLL__rotr                 @258
-;   _scalb                                                      @259
+    _scalb                      = _CRTDLL__scalb                @259
     _searchenv                  = _CRTDLL__searchenv            @260
-;   _seterrormode                                               @261
+    _seterrormode               = _CRTDLL__seterrormode         @261
     _setjmp                     = _CRTDLL__setjmp               @262
-    _setmode                                                    @263
+    _setmode                    = _CRTDLL__setmode              @263
 ;   _setsystime                                                 @264
     _sleep                      = _CRTDLL__sleep                @265
     _snprintf                   = NTDLL__snprintf               @266
     _snwprintf                  = NTDLL__snwprintf              @267
-;   _sopen                                                      @268
-;   _spawnl                                                     @269
-;   _spawnle                                                    @270
-;   _spawnlp                                                    @271
-;   _spawnlpe                                                   @272
-;   _spawnv                                                     @273
-;   _spawnve                                                    @274
-;   _spawnvp                                                    @275
-;   _spawnvpe                                                   @276
+    _sopen                      = _CRTDLL__sopen                @268
+    _spawnl                     = _CRTDLL__spawnl               @269
+    _spawnle                    = _CRTDLL__spawnle              @270
+    _spawnlp                    = _CRTDLL__spawnlp              @271
+    _spawnlpe                   = _CRTDLL__spawnlpe             @272
+    _spawnv                     = _CRTDLL__spawnv               @273
+    _spawnve                    = _CRTDLL__spawnve              @274
+    _spawnvp                    = _CRTDLL__spawnvp              @275
+    _spawnvpe                   = _CRTDLL__spawnvpe             @276
     _splitpath                  = NTDLL__splitpath              @277
     _stat                       = _CRTDLL__stat                 @278
-;   _statusfp                                                   @279
+    _statusfp                   = _CRTDLL__statusfp             @279
     _strcmpi                    = NTDLL__strcmpi                @280
     _strdate                    = _CRTDLL__strdate              @281
     _strdec                     = _CRTDLL__strdec               @282
     _strdup                     = _CRTDLL__strdup               @283
-;   _strerror                                                   @284
+    _strerror                   = _CRTDLL__strerror             @284
     _stricmp                    = NTDLL__stricmp                @285
     _stricoll                   = _CRTDLL__stricoll             @286
@@ -402 +401 @@
     _strtime                    = _CRTDLL__strtime              @297
     _strupr                     = NTDLL__strupr                 @298
-;   _swab                                                       @299
-
-;   _sys_errlist                                                @300
-;   _sys_nerr_dll                                               @301
-;   _tell                                                       @302
+    _swab                       = _CRTDLL__swab                 @299
+
+    _sys_errlist                = CRTDLL_sys_errlist            @300
+    _sys_nerr_dll               = CRTDLL_sys_nerr_dll           @301
+    _tell                       = _CRTDLL__tell                 @302
     _tempnam                    = _CRTDLL__tempnam              @303
-;   _timezone_dll                                               @304
+    _timezone_dll               = CRTDLL_timezone_dll           @304
     _tolower                    = _CRTDLL__tolower              @305
     _toupper                    = _CRTDLL__toupper              @306
-;   _tzname                                                     @307
-;   _tzset                                                      @308
+    _tzname                     = CRTDLL_tzname                 @307
+    _tzset                      = _CRTDLL__tzset                @308
     _ultoa                      = NTDLL__ultoa                  @309
-;   _umask                                                      @310
-;   _ungetch                                                    @311
+    _umask                      = _CRTDLL__umask                @310
+    _ungetch                    = _CRTDLL__ungetch              @311
     _unlink                     = _CRTDLL__unlink               @312
 ;   _unloaddll                                                  @313
@@ -436 +435 @@
     _wtoi                       = NTDLL__wtoi                   @330
     _wtol                       = NTDLL__wtol                   @331
-;   _y0                                                         @332
-;   _y1                                                         @333
-;   _yn                                                         @334
+    _y0                         = _CRTDLL__y0                   @332
+    _y1                         = _CRTDLL__y1                   @333
+    _yn                         = _CRTDLL__yn                   @334
     abort                       = _CRTDLL_abort                 @335
     abs                         = NTDLL_abs                     @336

trunk/src/crtdll/crtinc.h ¶

@@ -1 @@
-/* $Id: crtinc.h,v 1.3 1999-09-23 09:38:04 sandervl Exp $ */
+/* $Id: crtinc.h,v 1.4 1999-10-04 09:55:56 sandervl Exp $ */
 
 /* Definitions for the CRTDLL library (CRTDLL.DLL)
@@ -49 +49 @@
 CRTDLL_FILE * CDECL CRTDLL__fdopen(INT handle, LPCSTR mode);
 
-UINT CRTDLL_argc_dll;         /* CRTDLL.23 */
-LPSTR *CRTDLL_argv_dll;         /* CRTDLL.24 */
-LPSTR  CRTDLL_acmdln_dll;       /* CRTDLL.38 */
-UINT CRTDLL_basemajor_dll;    /* CRTDLL.42 */
-UINT CRTDLL_baseminor_dll;    /* CRTDLL.43 */
-UINT CRTDLL_baseversion_dll;  /* CRTDLL.44 */
-UINT CRTDLL_commode_dll;      /* CRTDLL.59 */
-LPSTR  CRTDLL_environ_dll;      /* CRTDLL.75 */
-UINT CRTDLL_fmode_dll;        /* CRTDLL.104 */
-UINT CRTDLL_osmajor_dll;      /* CRTDLL.241 */
-UINT CRTDLL_osminor_dll;      /* CRTDLL.242 */
-UINT CRTDLL_osmode_dll;       /* CRTDLL.243 */
-UINT CRTDLL_osver_dll;        /* CRTDLL.244 */
-UINT CRTDLL_osversion_dll;    /* CRTDLL.245 */
-UINT CRTDLL_winmajor_dll;     /* CRTDLL.329 */
-UINT CRTDLL_winminor_dll;     /* CRTDLL.330 */
-UINT CRTDLL_winver_dll;       /* CRTDLL.331 */
+
+
+UINT    CRTDLL_argc_dll;         /* CRTDLL.23 */
+LPSTR   *CRTDLL_argv_dll;        /* CRTDLL.24 */
+LPSTR   CRTDLL_acmdln_dll;       /* CRTDLL.38 */
+UINT    CRTDLL_basemajor_dll;    /* CRTDLL.42 */
+UINT    CRTDLL_baseminor_dll;    /* CRTDLL.43 */
+UINT    CRTDLL_baseversion_dll;  /* CRTDLL.44 */
+UINT    CRTDLL_commode_dll;      /* CRTDLL.59 */
+UINT    CRTDLL_daylight_dll;     /* CRTDLL.70 */
+LPSTR   CRTDLL_environ_dll;      /* CRTDLL.75 */
+LPSTR   CRTDLL_fileinfo_dll;     /* CRTDLL.95 */
+UINT    CRTDLL_fmode_dll;        /* CRTDLL.104 */
+UINT    CRTDLL_osmajor_dll;      /* CRTDLL.239 */
+UINT    CRTDLL_osminor_dll;      /* CRTDLL.240 */
+UINT    CRTDLL_osmode_dll;       /* CRTDLL.241 */
+UINT    CRTDLL_osver_dll;        /* CRTDLL.242 */
+UINT    CRTDLL_osversion_dll;    /* CRTDLL.243 */
+UINT    CRTDLL_sys_errlist;      /* CRTDLL.300 */
+UINT    CRTDLL_sys_nerr_dll;     /* CRTDLL.301 */
+UINT    CRTDLL_timezone_dll;     /* CRTDLL.304 */
+LPSTR   CRTDLL_tzname;           /* CRTDLL.307 */
+UINT    CRTDLL_winmajor_dll;     /* CRTDLL.326 */
+UINT    CRTDLL_winminor_dll;     /* CRTDLL.327 */
+UINT    CRTDLL_winver_dll;       /* CRTDLL.328 */
 
 INT CDECL NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 );

trunk/src/dplay/dplay.cpp ¶

@@ -1 @@
-/* $Id: dplay.cpp,v 1.1 1999-09-15 15:38:47 phaller Exp $ */
+/* $Id: dplay.cpp,v 1.2 1999-10-04 09:55:56 sandervl Exp $ */
 
 /* Direct Play 3 and Direct Play Lobby 2 Implementation
@@ -8 +8 @@
 
 #include <odin.h>
+#include <os2win.h>
 
 #define ICOM_CINTERFACE 1

trunk/src/kernel32/os2heap.cpp ¶

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.10 1999-10-01 16:03:10 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.11 1999-10-04 09:55:56 sandervl Exp $ */
 
 /*
@@ -150 +150 @@
   heapelem->flags   = 0;    //only used when allocated with LocalAlloc
   heapelem->lockCnt = 0;    //..    ..
+  heapelem->magic   = MAGIC_NR_HEAP;
 
   if(hmutex) {
@@ -179 +180 @@
     return(FALSE);
 
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::Lock ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
   helem->lockCnt++;
 
@@ -195 +202 @@
     return(FALSE);
 
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::UnLock ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
   helem->lockCnt--;
 
@@ -208 +221 @@
     return(FALSE);
 
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::GetFlags ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
   return(helem->flags);
 }
@@ -219 +238 @@
     return(666);
 
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::GetLockCnt ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
   return(helem->lockCnt);
 }
@@ -235 +260 @@
 LPVOID OS2Heap::ReAlloc(DWORD dwFlags, LPVOID lpMem, DWORD dwBytes)
 {
+  HEAPELEM *helem = (HEAPELEM *)((char *)lpMem - sizeof(HEAPELEM));
   LPVOID lpNewMem;
   int    i;
@@ -245 +271 @@
 //  if (lpMem == 0)   return NULL;
 
+  if (helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::ReAlloc ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return lpMem;
+  }
+
   if (Size(0,lpMem) == dwBytes) return lpMem; // if reallocation with same size
                                                 // don't do anything
@@ -267 +299 @@
     return(FALSE);
   }
+
+  if(helem->magic != MAGIC_NR_HEAP)
+  {
+    dprintf(("OS2Heap::Free ERROR BAD HEAP POINTER:%X\n", lpMem));
+    return FALSE;
+  }
+
 #ifdef DEBUG1
   int size = Size(0, lpMem);

trunk/src/kernel32/os2heap.h ¶

@@ -1 @@
-/* $Id: os2heap.h,v 1.3 1999-06-10 19:11:30 phaller Exp $ */
+/* $Id: os2heap.h,v 1.4 1999-10-04 09:55:57 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #include "vmutex.h"
 
+#define MAGIC_NR_HEAP  0x87654321
 typedef struct _tagHEAPELEM {
+  DWORD  magic;     //magic number
   struct _tagHEAPELEM *prev;
   struct _tagHEAPELEM *next;

trunk/src/kernel32/winimgres.cpp ¶

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.17 1999-09-23 14:12:14 phaller Exp $ */
+/* $Id: winimgres.cpp,v 1.18 1999-10-04 09:55:57 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
  * TODO: Check created resource objects before loading the resource!
  * TODO: Is the name id of the version resource always 1?
- * TODO: Once the resource handling in PE2LX/win32k is changed,
+ * TODO: Once the resource handling in PE2LX/win32k is changed, 
  *       getVersionStruct/Size can be moved into the Win32ImageBase class
  *
@@ -36 +36 @@
 //PE spec says names & ids are sorted; keep on searching just to be sure
 //******************************************************************************
-PIMAGE_RESOURCE_DATA_ENTRY
+PIMAGE_RESOURCE_DATA_ENTRY 
  Win32ImageBase::getPEResourceEntry(ULONG id, ULONG type, ULONG lang)
 {
@@ -73 +73 @@
     prdType = (PIMAGE_RESOURCE_DIRECTORY)((int)pResDir + (int)prde->u2.OffsetToData);
 
-    if(i < pResDir->NumberOfNamedEntries)
+    if(i < pResDir->NumberOfNamedEntries) 
     {//name or id entry?
         //SvL: 30-10-'97, high bit is set, so clear to get real offset
@@ -82 +82 @@
         lstrcpynWtoA(typename, pstring->NameString, pstring->Length+1);
         typename[pstring->Length] = 0;
-
+        
         if(!fNumType) {
             if(stricmp(typename, (char *)type) == 0) {
@@ -380 +380 @@
 HRSRC Win32ImageBase::findResourceW(LPWSTR lpszName, LPWSTR lpszType, ULONG lang)
 {
-  HRSRC hres;
-  char *astring1 = NULL,
-       *astring2 = NULL;
-  BOOL fAllocated1 = FALSE;
-  BOOL fAllocated2 = FALSE;
-
-  if(HIWORD(lpszName) != 0)
-  {
-    astring1 = UnicodeToAsciiString((LPWSTR)lpszName);
-    fAllocated1 = TRUE;
-  }
-  else
-    astring1 = (char *)lpszName;
-
-  if(HIWORD(lpszType) != 0)
-  {
-    astring2 = UnicodeToAsciiString(lpszType);
-    fAllocated2 = TRUE;
-  }
-  else
-    astring2 = (char *)lpszType;
-  hres = (HRSRC) findResourceA(astring1, astring2);
-
-   /* do NOT free untranslated numerical Resource IDs */
-  if(fAllocated1) FreeAsciiString(astring1);
-  if(fAllocated2) FreeAsciiString(astring2);
-
-  return(hres);
+ HRSRC hres;
+ char *astring1 = NULL, *astring2 = NULL;
+
+    if(HIWORD(lpszName) != 0) {
+                astring1 = UnicodeToAsciiString(lpszName);
+    }
+    else        astring1 = (char *)lpszName;
+
+    if(HIWORD(lpszType) != 0) {
+                astring2 = UnicodeToAsciiString(lpszType);
+    } 
+    else        astring2 = (char *)lpszType;
+
+    hres = (HRSRC) findResourceA(astring1, astring2);
+
+    if(HIWORD(astring1)) FreeAsciiString(astring1);
+    if(HIWORD(astring2)) FreeAsciiString(astring2);
+
+    return(hres);
 }
 //******************************************************************************
@@ -427 +418 @@
 ULONG Win32ImageBase::getResourceSizeW(LPCWSTR lpszName, LPWSTR lpszType, ULONG lang)
 {
-  char *astring1 = NULL,
-       *astring2 = NULL;
-  ULONG ressize;
-  BOOL fAllocated1 = FALSE;
-  BOOL fAllocated2 = FALSE;
-
-  if(HIWORD(lpszName) != 0)
-  {
-    astring1 = UnicodeToAsciiString((LPWSTR)lpszName);
-    fAllocated1 = TRUE;
-  }
-  else
-    astring1 = (char *)lpszName;
-
-  if(HIWORD(lpszType) != 0)
-  {
-    astring2 = UnicodeToAsciiString(lpszType);
-    fAllocated2 = TRUE;
-  }
-  else
-    astring2 = (char *)lpszType;
-
-  ressize =  getResourceSizeA(astring1, astring2, lang);
-
-  /* do NOT free untranslated numerical Resource IDs */
-  if(fAllocated1) FreeAsciiString(astring1);
-  if(fAllocated2) FreeAsciiString(astring2);
-
-  return(ressize);
+ char *astring1 = NULL, *astring2 = NULL;
+ ULONG ressize;
+
+    if(HIWORD(lpszName) != 0) {
+                astring1 = UnicodeToAsciiString((LPWSTR)lpszName);
+    }
+    else        astring1 = (char *)lpszName;
+
+    if(HIWORD(lpszType) != 0) {
+                astring2 = UnicodeToAsciiString(lpszType);
+    } 
+    else        astring2 = (char *)lpszType;
+
+    ressize =  getResourceSizeA(astring2, astring1, lang);
+
+    if(HIWORD(astring1)) FreeAsciiString(astring1);
+    if(HIWORD(astring2)) FreeAsciiString(astring2);
+
+    return(ressize);
 }
 //******************************************************************************
@@ -489 +470 @@
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
 
+  if(verstruct == NULL || bufLength == 0) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+  }
   pData = getPEResourceEntry(1, NTRT_VERSION);
   if(pData == NULL) {
@@ -494 +479 @@
         return 0;
   }
-  return pData->Size;
-}
-//******************************************************************************
-//******************************************************************************
+  char *resdata = (char *)((char *)pResDir + pData->OffsetToData - pResourceSectionStart);
+  memcpy(verstruct, resdata, min(bufLength, pData->Size));
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/wprocess.cpp ¶

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.33 1999-09-25 17:55:21 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.34 1999-10-04 09:55:57 sandervl Exp $ */
 
 /*
@@ -646 +646 @@
 BOOL SYSTEM GetVersionStruct(char *modname, char *verstruct, ULONG bufLength)
 {
- HINSTANCE       hinstance;
  Win32ImageBase *winimage;
 
   dprintf(("GetVersionStruct"));
-  hinstance = OSLibQueryModuleHandle(modname);
-  if(hinstance == 0) {
-        dprintf(("GetVersionStruct can't find handle for %s\n", modname));
-        return(FALSE);
-  }
-  if(WinExe && WinExe->getInstanceHandle() == hinstance) {
+  if(WinExe && !strcmp(WinExe->getFullPath(), modname)) {
         winimage = (Win32ImageBase *)WinExe;
   }
   else {
-        winimage = (Win32ImageBase *)Win32DllBase::findModule(hinstance);
+        winimage = (Win32ImageBase *)Win32DllBase::findModule(modname);
         if(winimage == NULL) {
                 dprintf(("GetVersionStruct can't find Win32Image for %s\n", modname));
@@ -671 +665 @@
 ULONG SYSTEM GetVersionSize(char *modname)
 {
- HINSTANCE       hinstance;
  Win32ImageBase *winimage;
 
   dprintf(("GetVersionSize of %s\n", modname));
-  hinstance = OSLibQueryModuleHandle(modname);
-  if(hinstance == 0) {
-        dprintf(("GetVersionSize can't find handle for %s\n", modname));
-        return(FALSE);
-  }
-
-  if(WinExe && WinExe->getInstanceHandle() == hinstance) {
+
+  if(WinExe && !strcmp(WinExe->getFullPath(), modname)) {
         winimage = (Win32ImageBase *)WinExe;
   }
   else {
-        winimage = (Win32ImageBase *)Win32DllBase::findModule(hinstance);
+        winimage = (Win32ImageBase *)Win32DllBase::findModule(modname);
         if(winimage == NULL) {
                 dprintf(("GetVersionSize can't find Win32Image for %s\n", modname));

trunk/src/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.22 1999-09-28 13:26:52 sandervl Exp $
+# $Id: makefile,v 1.23 1999-10-04 09:55:53 sandervl Exp $
 
 #
@@ -95 +95 @@
         cd ..\wnaspi32
         $(MAKE_CMD)
-        cd ..\dsound
-        $(MAKE_CMD)
+#        cd ..\dsound
+#        $(MAKE_CMD)
 
 clean:

trunk/src/msacm32/msacm32.cpp ¶

@@ -1 @@
-/* $Id: msacm32.cpp,v 1.2 1999-09-23 09:38:04 sandervl Exp $ */
+/* $Id: msacm32.cpp,v 1.3 1999-10-04 09:55:58 sandervl Exp $ */
 /*
  *      MSACM32 library
@@ -7 +7 @@
  */
 
-#include <winbase.h>
+#include <os2win.h>
 #include <winerror.h>
 #include <windef.h>

trunk/src/msvcrt/msvcrt.cpp ¶

@@ -1 @@
-/* $Id: msvcrt.cpp,v 1.2 1999-10-01 16:02:32 sandervl Exp $ */
+/* $Id: msvcrt.cpp,v 1.3 1999-10-04 09:55:58 sandervl Exp $ */
 
 /*
@@ -68 +68 @@
 
 /*********************************************************************
+ *                  _get_sbh_threshold    (MSVCRT.247)
+ */
+size_t CDECL MSVCRT__get_sbh_threshold( void )
+{
+  dprintf(("MSVCRT: _get_sbh_threshold not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _getmbcp    (MSVCRT.257)
+ */
+int CDECL MSVCRT__getmbcp( void )
+{
+  dprintf(("MSVCRT: _getmbcp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
  *                  _getws    (MSVCRT.261)
  */
@@ -79 +101 @@
 
 /*********************************************************************
+ *                  _inp    (MSVCRT.273)
+ */
+int CDECL MSVCRT__inp( unsigned short port )
+{
+  dprintf(("MSVCRT: _inp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _inpw    (MSVCRT.274)
+ */
+unsigned short CDECL MSVCRT__inpw( unsigned short port )
+{
+  dprintf(("MSVCRT: _inpw not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _inpd    (MSVCRT.275)
+ */
+unsigned long CDECL MSVCRT__inpd( unsigned short port )
+{
+  dprintf(("MSVCRT: _inpd not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
  *                  _ismbbkprint    (MSVCRT.284)
  */
@@ -123 +178 @@
 
 /*********************************************************************
+ *                  _itow    (MSVCRT.310)
+ */
+wchar_t * CDECL MSVCRT__itow( int value, wchar_t *string, int radix )
+{
+  dprintf(("MSVCRT: _itow not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _ltow    (MSVCRT.328)
+ */
+wchar_t * CDECL MSVCRT__ltow( long value, wchar_t *string, int radix )
+{
+  dprintf(("MSVCRT: _ltow not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _outp    (MSVCRT.395)
+ */
+int CDECL MSVCRT__outp( unsigned short port, int databyte )
+{
+  dprintf(("MSVCRT: _outp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _outpw    (MSVCRT.396)
+ */
+unsigned short CDECL MSVCRT__outpw( unsigned short port, unsigned short dataword )
+{
+  dprintf(("MSVCRT: _outpw not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _outpd    (MSVCRT.397)
+ */
+unsigned long CDECL MSVCRT__outpd( unsigned short port, unsigned long dataword )
+{
+  dprintf(("MSVCRT: _outpd not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
  *                  _putws    (MSVCRT.407)
  */
@@ -134 +244 @@
 
 /*********************************************************************
+ *                  _set_error_mode    (MSVCRT.421)
+ */
+int CDECL MSVCRT__set_error_mode( int modeval )
+{
+  dprintf(("MSVCRT: _set_error_mode not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _set_sbh_threshold    (MSVCRT.422)
+ */
+int CDECL MSVCRT__set_sbh_threshold( size_t size )
+{
+  dprintf(("MSVCRT: _set_sbh_threshold not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
  *                  _strncoll    (MSVCRT.453)
  */
@@ -150 +282 @@
 {
   dprintf(("MSVCRT: _strnicoll not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _ultow    (MSVCRT.475)
+ */
+wchar_t * CDECL MSVCRT__ultow( unsigned long value, wchar_t *string, int radix )
+{
+  dprintf(("MSVCRT: _ultow not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _umask    (MSVCRT.476)
+ */
+int CDECL MSVCRT__umask( int pmode )
+{
+  dprintf(("MSVCRT: _umask not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _waccess    (MSVCRT.484)
+ */
+int CDECL MSVCRT__waccess( const wchar_t *path, int mode )
+{
+  dprintf(("MSVCRT: _waccess not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wasctime    (MSVCRT.485)
+ */
+wchar_t * CDECL MSVCRT__wasctime( const struct tm *timeptr )
+{
+  dprintf(("MSVCRT: _wasctime not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wchdir    (MSVCRT.486)
+ */
+int CDECL MSVCRT__wchdir( const wchar_t *dirname )
+{
+  dprintf(("MSVCRT: _wchdir not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wchmod    (MSVCRT.487)
+ */
+int CDECL MSVCRT__wchmod( const wchar_t *filename, int pmode )
+{
+  dprintf(("MSVCRT: _wchmod not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wcreat    (MSVCRT.489)
+ */
+int CDECL MSVCRT__wcreat( const wchar_t *filename, int pmode )
+{
+  dprintf(("MSVCRT: _wcreat not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wcsncoll    (MSVCRT.494)
+ */
+int CDECL MSVCRT__wcsncoll( const wchar_t *string1, const wchar_t *string2, size_t count )
+{
+  dprintf(("MSVCRT: _wcsncoll not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wcsnicoll    (MSVCRT.496)
+ */
+int CDECL MSVCRT__wcsnicoll( const wchar_t *string1, const wchar_t *string2 , size_t count )
+{
+  dprintf(("MSVCRT: _wcsnicoll not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wctime       (MSVCRT.501)
+ */
+wchar_t * CDECL MSVCRT__wctime( const time_t *timer )
+{
+  dprintf(("MSVCRT: _wctime not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wexecl       (MSVCRT.503)
+ */
+int CDECL MSVCRT__wexecl( const wchar_t *path, const wchar_t *arg0, ... )
+{
+  dprintf(("MSVCRT: _wexecl not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wexecle       (MSVCRT.504)
+ */
+int CDECL MSVCRT__wexecle( const wchar_t *path, const wchar_t *arg0, ... )
+{
+  dprintf(("MSVCRT: _wexecle not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wexeclp       (MSVCRT.505)
+ */
+int CDECL MSVCRT__wexeclp( const wchar_t *file, const wchar_t *arg0, ... )
+{
+  dprintf(("MSVCRT: _wexeclp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wexeclpe      (MSVCRT.506)
+ */
+int CDECL MSVCRT__wexeclpe( const wchar_t *file, const wchar_t *arg0, ... )
+{
+  dprintf(("MSVCRT: _wexeclpe not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wexecv      (MSVCRT.507)
+ */
+int CDECL MSVCRT__wexecv( const wchar_t *path, const wchar_t *const argv[] )
+{
+  dprintf(("MSVCRT: _wexecv not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wexecve     (MSVCRT.508)
+ */
+int CDECL MSVCRT__wexecve( const wchar_t *path, const wchar_t *const argv[], 
+                                  const wchar_t *const envp[] )
+{
+  dprintf(("MSVCRT: _wexecve not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wexecvp     (MSVCRT.509)
+ */
+int CDECL MSVCRT__wexecvp( const wchar_t *file, const wchar_t *const argv[] )
+{
+  dprintf(("MSVCRT: _wexecvp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wexecvpe     (MSVCRT.510)
+ */
+int CDECL MSVCRT__wexecvpe( const wchar_t *file, const wchar_t *const argv[], 
+                                   const wchar_t *const envp[] )
+{
+  dprintf(("MSVCRT: _wexecvpe not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wfdopen     (MSVCRT.511)
+ */
+FILE * CDECL MSVCRT__wfdopen( int, const wchar_t *s )
+{
+  dprintf(("MSVCRT: _wfdopen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wfindfirst     (MSVCRT.512)
+ */
+long CDECL MSVCRT__wfindfirst( const wchar_t *filespec, struct _wfinddata_t *fileinfo )
+{
+  dprintf(("MSVCRT: _wfindfirst not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wfindnext     (MSVCRT.514)
+ */
+int CDECL MSVCRT__wfindnext( long handle, struct _wfinddata_t *fileinfo )
+{
+  dprintf(("MSVCRT: _wfindnext not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wfopen        (MSVCRT.516)
+ */
+FILE * CDECL MSVCRT__wfopen( const wchar_t *s1, const wchar_t *s2 )
+{
+  dprintf(("MSVCRT: _wfopen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wfreopen        (MSVCRT.517)
+ */
+FILE * CDECL MSVCRT__wfreopen( const wchar_t *s1, const wchar_t *s2, FILE * f)
+{
+  dprintf(("MSVCRT: _wfreopen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wfsopen        (MSVCRT.518)
+ */
+FILE * CDECL MSVCRT__wfsopen( const wchar_t *filename, const wchar_t *mode,  int shflag )
+{
+  dprintf(("MSVCRT: _wfsopen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wfullpath        (MSVCRT.519)
+ */
+wchar_t * CDECL MSVCRT__wfullpath( wchar_t *s1, const wchar_t *s2, size_t n )
+{
+  dprintf(("MSVCRT: _wfullpath not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wgetcwd          (MSVCRT.520)
+ */
+wchar_t * CDECL MSVCRT__wgetcwd( wchar_t *buf, size_t size )
+{
+  dprintf(("MSVCRT: _wgetcwd not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wgetdcwd          (MSVCRT.521)
+ */
+wchar_t * CDECL MSVCRT__wgetdcwd( int drive, wchar_t *buffer, size_t maxlen )
+{
+  dprintf(("MSVCRT: _wgetdcwd not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wgetenv          (MSVCRT.522)
+ */
+wchar_t * CDECL MSVCRT__wgetenv( const wchar_t *name )
+{
+  dprintf(("MSVCRT: _wgetenv not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wmakepath          (MSVCRT.526)
+ */
+void CDECL MSVCRT__wmakepath( wchar_t *path, const wchar_t *drive,
+            const wchar_t *dir, const wchar_t *fname, const wchar_t *ext )
+{
+  dprintf(("MSVCRT: _wmakepath not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+}
+
+
+/*********************************************************************
+ *                  _wmkdir           (MSVCRT.527)
+ */
+int CDECL MSVCRT__wmkdir( const wchar_t *path )
+{
+  dprintf(("MSVCRT: _wmkdir not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wmktemp           (MSVCRT.528)
+ */
+wchar_t * CDECL MSVCRT__wmktemp( wchar_t*  )
+{
+  dprintf(("MSVCRT: _wmktemp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wopen           (MSVCRT.529)
+ */
+int CDECL MSVCRT__wopen( const wchar_t *s, int n, ... )
+{
+  dprintf(("MSVCRT: _wopen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wperror          (MSVCRT.530)
+ */
+void CDECL MSVCRT__wperror( const wchar_t *s )
+{
+  dprintf(("MSVCRT: _wperror not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+}
+
+
+/*********************************************************************
+ *                  _wpopen           (MSVCRT.532)
+ */
+FILE * CDECL MSVCRT__wpopen( const wchar_t *command, const wchar_t *mode )
+{
+  dprintf(("MSVCRT: _wpopen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wputenv          (MSVCRT.533)
+ */
+int CDECL MSVCRT__wputenv( const wchar_t *env_string )
+{
+  dprintf(("MSVCRT: _wputenv not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wremove          (MSVCRT.534)
+ */
+int CDECL MSVCRT__wremove( const wchar_t *s )
+{
+  dprintf(("MSVCRT: _wremove not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wrename          (MSVCRT.535)
+ */
+int CDECL MSVCRT__wrename( const wchar_t *s1, const wchar_t *s2 )
+{
+  dprintf(("MSVCRT: _wrename not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wrmdir          (MSVCRT.537)
+ */
+int CDECL MSVCRT__wrmdir( const wchar_t *path )
+{
+  dprintf(("MSVCRT: _wrmdir not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wsearchenv          (MSVCRT.538)
+ */
+void CDECL MSVCRT__wsearchenv( const wchar_t *name, const wchar_t *env_var, wchar_t *buf )
+{
+  dprintf(("MSVCRT: _wsearchenv not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+}
+
+
+/*********************************************************************
+ *                  _wsetlocale          (MSVCRT.539)
+ */
+wchar_t * CDECL MSVCRT__wsetlocale(int category,const wchar_t *locale)
+{
+  dprintf(("MSVCRT: _wsetlocale not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wsopen          (MSVCRT.540)
+ */
+int CDECL MSVCRT__wsopen( const wchar_t *s, int n1, int n2, ... )
+{
+  dprintf(("MSVCRT: _wsopen not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wspawnl         (MSVCRT.541)
+ */
+int CDECL MSVCRT__wspawnl( int mode, const wchar_t *path, const wchar_t *arg0, ... )
+{
+  dprintf(("MSVCRT: _wspawnl not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wspawnle          (MSVCRT.542)
+ */
+int CDECL MSVCRT__wspawnle( int mode, const wchar_t *path, const wchar_t *arg0, ... )
+{
+  dprintf(("MSVCRT: _wspawnle not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wspawnlp          (MSVCRT.543)
+ */
+int CDECL MSVCRT__wspawnlp( int mode, const wchar_t *path, const wchar_t *arg0, ... )
+{
+  dprintf(("MSVCRT: _wspawnlp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wspawnlpe          (MSVCRT.544)
+ */
+int CDECL MSVCRT__wspawnlpe( int mode, const wchar_t *path, const wchar_t *arg0, ... )
+{
+  dprintf(("MSVCRT: _wspawnlpe not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wspawnv          (MSVCRT.545)
+ */
+int CDECL MSVCRT__wspawnv( int mode, const wchar_t *path, const wchar_t * const *argv )
+{
+  dprintf(("MSVCRT: _wspawnv not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wspawnve          (MSVCRT.546)
+ */
+int CDECL MSVCRT__wspawnve( int mode, const wchar_t *path, 
+           const wchar_t * const *argv, const wchar_t * const *envp )
+{
+  dprintf(("MSVCRT: _wspawnve not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wspawnvp          (MSVCRT.547)
+ */
+int CDECL MSVCRT__wspawnvp( int mode, const wchar_t *path, const wchar_t * const *argv )
+{
+  dprintf(("MSVCRT: _wspawnvp not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wspawnvpe          (MSVCRT.548)
+ */
+int CDECL MSVCRT__wspawnvpe( int mode, const wchar_t *path, 
+           const wchar_t * const *argv, const wchar_t * const *envp )
+{
+  dprintf(("MSVCRT: _wspawnvpe not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wsplitpath         (MSVCRT.549)
+ */
+void CDECL MSVCRT__wsplitpath( const wchar_t *path, wchar_t *drive, 
+                 wchar_t *dir, wchar_t *fname, wchar_t *ext )
+{
+  dprintf(("MSVCRT: _wsplitpath not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+}
+
+
+/*********************************************************************
+ *                  _wstat          (MSVCRT.550)
+ */
+int CDECL MSVCRT__wstat( const wchar_t *s, struct _wstat *w )
+{
+  dprintf(("MSVCRT: _wstat not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wstrdate          (MSVCRT.552)
+ */
+wchar_t * CDECL MSVCRT__wstrdate( wchar_t *buf )
+{
+  dprintf(("MSVCRT: _wstrdate not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wstrtime          (MSVCRT.553)
+ */
+wchar_t * CDECL MSVCRT__wstrtime( wchar_t *buf )
+{
+  dprintf(("MSVCRT: _wstrtime not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wsystem           (MSVCRT.554)
+ */
+int CDECL MSVCRT__wsystem( const wchar_t *cmd )
+{
+  dprintf(("MSVCRT: _wsystem not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wtempnam          (MSVCRT.555)
+ */
+wchar_t * CDECL MSVCRT__wtempnam( wchar_t *dir, wchar_t *prefix )
+{
+  dprintf(("MSVCRT: _wtempnam not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wtmpnam          (MSVCRT.555)
+ */
+wchar_t * CDECL MSVCRT__wtmpnam( wchar_t *tn )
+{
+  dprintf(("MSVCRT: _wtmpnam not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wunlink     (MSVCRT.560)
+ */
+int CDECL MSVCRT__wunlink(const wchar_t *path)
+{
+  dprintf(("MSVCRT: _wunlink not implemented.\n"));
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+
+/*********************************************************************
+ *                  _wutime     (MSVCRT.561)
+ */
+int CDECL MSVCRT__wutime( const wchar_t *path, const struct utimbuf * times )
+{
+  dprintf(("MSVCRT: _wutime not implemented.\n"));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;

trunk/src/msvcrt/msvcrt.def ¶

@@ -1 @@
-; $Id: msvcrt.def,v 1.2 1999-10-01 16:02:32 sandervl Exp $
+; $Id: msvcrt.def,v 1.3 1999-10-04 09:55:59 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -109 +109 @@
         CRTDLL___iscsym         = CRTDLL.__iscsym
         CRTDLL___iscsymf        = CRTDLL.__iscsymf
+        CRTDLL___mb_cur_max_dll = CRTDLL.___mb_cur_max_dll
         CRTDLL___threadhandle   = CRTDLL.__threadhandle
         CRTDLL___threadid       = CRTDLL.__threadid
@@ -127 +128 @@
         CRTDLL__CItanh          = CRTDLL._CItanh
         CRTDLL__access          = CRTDLL._access
+        CRTDLL__acmdln_dll      = CRTDLL.acmdln_dll
+        CRTDLL__aexit_rtn_dll   = CRTDLL.aexit_rtn_dll
         CRTDLL__amsg_exit       = CRTDLL._amsg_exit
+        CRTDLL__argc_dll        = CRTDLL.argc_dll
+        CRTDLL__argv_dll        = CRTDLL.argv_dll
         CRTDLL__assert          = CRTDLL._assert
         CRTDLL__beep            = CRTDLL._beep
@@ -142 +147 @@
         CRTDLL__clearfp         = CRTDLL._clearfp
         CRTDLL__close           = CRTDLL._close
+        CRTDLL__commode_dll     = CRTDLL.commode_dll
         CRTDLL__control87       = CRTDLL._control87
         CRTDLL__controlfp       = CRTDLL._controlfp
@@ -150 +156 @@
         CRTDLL__cscanf          = CRTDLL._cscanf
         CRTDLL__cwait           = CRTDLL._cwait
+        CRTDLL__daylight_dll    = CRTDLL.daylight_dll
         CRTDLL__dup             = CRTDLL._dup
         CRTDLL__dup2            = CRTDLL._dup2
         CRTDLL__ecvt            = CRTDLL._ecvt
         CRTDLL__endthread       = CRTDLL._endthread
+        CRTDLL__environ_dll     = CRTDLL.environ_dll
         CRTDLL__errno           = CRTDLL._errno
         CRTDLL__except_handler2 = CRTDLL._except_handler2
@@ -172 +180 @@
         CRTDLL__fgetwchar       = CRTDLL._fgetwchar
         CRTDLL__filbuf          = CRTDLL._filbuf
+        CRTDLL__fileinfo_dll    = CRTDLL.fileinfo_dll
         CRTDLL__filelength      = CRTDLL._filelength
         CRTDLL__fileno          = CRTDLL._fileno 
@@ -180 +189 @@
         CRTDLL__flsbuf          = CRTDLL._flsbuf
         CRTDLL__flushall        = CRTDLL._flushall
+        CRTDLL__fmode_dll       = CRTDLL.fmode_dll
         CRTDLL__fpclass         = CRTDLL._fpclass
         CRTDLL__fpieee_flt      = CRTDLL._fpieee_flt
@@ -306 +316 @@
         CRTDLL__open_osfhandle  = CRTDLL._open_osfhandle
         CRTDLL__pclose          = CRTDLL._pclose
+        CRTDLL__pctype_dll      = CRTDLL.pctype_dll
         CRTDLL__pipe            = CRTDLL._pipe
         CRTDLL__popen           = CRTDLL._popen
@@ -342 +353 @@
         CRTDLL__strtime         = CRTDLL._strtime
         CRTDLL__swab            = CRTDLL._swab
+        CRTDLL__sys_errlist     = CRTDLL.sys_errlist
+        CRTDLL__sys_nerr_dll    = CRTDLL.sys_nerr_dll
         CRTDLL__tell            = CRTDLL._tell
         CRTDLL__tempnam         = CRTDLL._tempnam
+        CRTDLL__timezone_dll    = CRTDLL.timezone_dll
         CRTDLL__tolower         = CRTDLL._tolower
         CRTDLL__toupper         = CRTDLL._toupper
         CRTDLL__tzset           = CRTDLL._tzset
+        CRTDLL__tzname          = CRTDLL.tzname
         CRTDLL__ungetch         = CRTDLL._ungetch
         CRTDLL__unlink          = CRTDLL._unlink
@@ -356 +371 @@
         CRTDLL__wcsrev          = CRTDLL._wcsrev
         CRTDLL__wcsset          = CRTDLL._wcsset
+        CRTDLL__winmajor_dll    = CRTDLL.winmajor_dll
+        CRTDLL__winminor_dll    = CRTDLL.winminor_dll
+        CRTDLL__winver_dll      = CRTDLL.winver_dll
         CRTDLL__write           = CRTDLL._write
         CRTDLL__y0              = CRTDLL._y0
@@ -563 +581 @@
 ;   __RTtypeid                                                  @78
 ;   __STRINGTOLD                                                @79
-;   __argc                                                      @80
-;   __argv                                                      @81
+    __argc                      = CRTDLL__argc_dll              @80
+    __argv                      = CRTDLL__argv_dll              @81
 ;   __badioinfo                                                 @82
     __crtCompareStringA         = KERNEL32_CompareStringA       @83
@@ -581 +599 @@
 ;   __lc_handle                                                 @96
 ;   __lconv_init                                                @97
-;   __mb_cur_max                                                @98
+    __mb_cur_max                = CRTDLL___mb_cur_max_dll       @98
 ;   __p___argc                                                  @99
 
@@ -629 +647 @@
 ;   _abnormal_termination                                       @142
     _access                     = CRTDLL__access                @143
-;   _acmdln                                                     @144
+    _acmdln                     = CRTDLL__acmdln_dll            @144
 ;   _adj_fdiv_m16i                                              @145
 ;   _adj_fdiv_m32                                               @146
@@ -644 +662 @@
 ;   _adj_fptan                                                  @157
 ;   _adjust_fdiv                                                @158
-;   _aexit_rtn                                                  @159
+    _aexit_rtn                  = CRTDLL__aexit_rtn_dll         @159
     _amsg_exit                  = CRTDLL__amsg_exit             @160
     _assert                     = CRTDLL__assert                @161
@@ -666 +684 @@
     _close                      = CRTDLL__close                 @180
 ;   _commit                                                     @181
-;   _commode                                                    @182
+    _commode                    = CRTDLL__commode_dll           @182
     _control87                  = CRTDLL__control87             @183
     _controlfp                  = CRTDLL__controlfp             @184
@@ -676 +694 @@
 ;   _ctype                                                      @190
     _cwait                      = CRTDLL__cwait                 @191
-;   _daylight_dll                                               @192
+    _daylight_dll               = CRTDLL__daylight_dll          @192
 ;   _dstbias                                                    @193
     _dup                        = CRTDLL__dup                   @194
@@ -683 +701 @@
     _endthread                  = CRTDLL__endthread             @197
 ;   _endthreadex                                                @198
-;   _environ                                                    @199
+    _environ                    = CRTDLL__environ_dll           @199
 
 
@@ -706 +724 @@
     _fgetwchar                  = CRTDLL__fgetwchar             @218
     _filbuf                     = CRTDLL__filbuf                @219
-;   _fileinfo                                                   @220
+    _fileinfo                   = CRTDLL__fileinfo_dll          @220
     _filelength                 = CRTDLL__filelength            @221
 ;   _filelengthi64                                              @222
@@ -718 +736 @@
     _flsbuf                     = CRTDLL__flsbuf                @230
     _flushall                   = CRTDLL__flushall              @231
-;   _fmode                                                      @232
+    _fmode                      = CRTDLL__fmode_dll             @232
     _fpclass                    = CRTDLL__fpclass               @233
     _fpieee_flt                 = CRTDLL__fpieee_flt            @234
@@ -733 +751 @@
     _gcvt                       = CRTDLL__gcvt                  @245
     _get_osfhandle              = CRTDLL__get_osfhandle         @246
-;   _get_sbh_threshold                                          @247
+    _get_sbh_threshold          = _MSVCRT__get_sbh_threshold    @247
     _getch                      = CRTDLL__getch                 @248
     _getche                     = CRTDLL__getche                @249
@@ -743 +761 @@
     _getdrives                  = CRTDLL__getdrives             @255
 ;   _getmaxstdio                                                @256
-;   _getmbcp                                                    @257
+    _getmbcp                    = _MSVCRT__getmbcp              @257
     _getpid                     = CRTDLL__getpid                @258
 ;   _getsystime                                                 @259
@@ -758 +776 @@
 ;   _i64tow                                                     @271
     _initterm                   = _DLL_InitTerm                 @272
-;   _inp                                                        @273
-;   _inpd                                                       @274
-;   _inpw                                                       @275
+    _inp                        = _MSVCRT__inp                  @273
+    _inpd                       = _MSVCRT__inpd                 @274
+    _inpw                       = _MSVCRT__inpw                 @275
     _iob                        = CRTDLL__iob                   @276
     _isatty                     = CRTDLL__isatty                @277
@@ -797 +815 @@
     _isnan                      = CRTDLL__isnan                 @308
     _itoa                       = NTDLL__itoa                   @309
-;   _itow                                                       @310
+    _itow                       = _MSVCRT__itow                 @310
     _j0                         = CRTDLL__j0                    @311
     _j1                         = CRTDLL__j1                    @312
@@ -815 +833 @@
 ;   _lseeki64                                                   @326
     _ltoa                       = NTDLL__ltoa                   @327
-;   _ltow                                                       @328
+    _ltow                       = _MSVCRT__ltow                 @328
     _makepath                   = CRTDLL__makepath              @329
     _mbbtombc                   = CRTDLL__mbbtombc              @330
@@ -882 +900 @@
     _open_osfhandle             = CRTDLL__open_osfhandle        @393
 ;   _osver                                                      @394
-;   _outp                                                       @395
-;   _outpd                                                      @396
-;   _outpw                                                      @397
+    _outp                       = _MSVCRT__outp                 @395
+    _outpd                      = _MSVCRT__outpd                @396
+    _outpw                      = _MSVCRT__outpw                @397
     _pclose                     = CRTDLL__pclose                @398
-;   _pctype                                                     @399
+    _pctype                     = CRTDLL__pctype_dll            @399
 
 
@@ -910 +928 @@
     _searchenv                  = CRTDLL__searchenv             @419
 ;   _seh_longjmp_unwind                                         @420
-;   _set_error_mode                                             @421
-;   _set_sbh_threshold                                          @422
+    _set_error_mode             = _MSVCRT__set_error_mode       @421
+    _set_sbh_threshold          = _MSVCRT__set_sbh_threshold    @422
     _seterrormode               = CRTDLL__seterrormode          @423
     _setjmp                     = CRTDLL__setjmp                @424
@@ -951 +969 @@
     _strupr                     = NTDLL__strupr                 @460
     _swab                       = CRTDLL__swab                  @461
-;   _sys_errlist                                                @462
-;   _sys_nerr                                                   @463
+    _sys_errlist                = CRTDLL__sys_errlist           @462
+    _sys_nerr                   = CRTDLL__sys_nerr_dll          @463
     _tell                       = CRTDLL__tell                  @464
 ;   _telli64                                                    @465
     _tempnam                    = CRTDLL__tempnam               @466
-;   _timezone                                                   @467
+    _timezone                   = CRTDLL__timezone_dll          @467
     _tolower                    = CRTDLL__tolower               @468
     _toupper                    = CRTDLL__toupper               @469
-;   _tzname                                                     @470
+    _tzname                     = CRTDLL__tzname                @470
     _tzset                      = CRTDLL__tzset                 @471
 ;   _ui64toa                                                    @472
 ;   _ui64tow                                                    @473
     _ultoa                      = NTDLL__ultoa                  @474
-;   _ultow                                                      @475
-;   _umask                                                      @476
+    _ultow                      = _MSVCRT__ultow                @475
+    _umask                      = _MSVCRT__umask                @476
     _ungetch                    = CRTDLL__ungetch               @477
     _unlink                     = CRTDLL__unlink                @478
@@ -973 +991 @@
     _vsnprintf                  = NTDLL__vsnprintf              @482
     _vsnwprintf                 = CRTDLL__vsnwprintf            @483
-;   _waccess                                                    @484
-;   _wasctime                                                   @485
-;   _wchdir                                                     @486
-;   _wchmod                                                     @487
+    _waccess                    = _MSVCRT__waccess              @484
+    _wasctime                   = _MSVCRT__wasctime             @485
+    _wchdir                     = _MSVCRT__wchdir               @486
+    _wchmod                     = _MSVCRT__wchmod               @487
 ;   _wcmdln                                                     @488    
-;   _wcreat                                                     @489
+    _wcreat                     = _MSVCRT__wcreat               @489
     _wcsdup                     = CRTDLL__wcsdup                @490
     _wcsicmp                    = NTDLL__wcsicmp                @491
     _wcsicoll                   = CRTDLL__wcsicoll              @492
     _wcslwr                     = NTDLL__wcslwr                 @493
-;   _wcsncoll                                                   @494
+    _wcsncoll                   = _MSVCRT__wcsncoll             @494
     _wcsnicmp                   = NTDLL__wcsnicmp               @495
-;   _wcsnicoll                                                  @496
+    _wcsnicoll                  = _MSVCRT__wcsnicoll            @496
     _wcsnset                    = CRTDLL__wcsnset               @497
     _wcsrev                     = CRTDLL__wcsrev                @498
@@ -992 +1010 @@
 
     _wcsupr                     = NTDLL__wcsupr                 @500
-;   _wctime                                                     @501
+    _wctime                     = _MSVCRT__wctime               @501
 ;   _wenviron                                                   @502
-;   _wexecl                                                     @503
-;   _wexecle                                                    @504
-;   _wexeclp                                                    @505
-;   _wexeclpe                                                   @506
-;   _wexecv                                                     @507
-;   _wexecve                                                    @508
-;   _wexecvp                                                    @509
-;   _wexecvpe                                                   @510
-;   _wfdopen                                                    @511
-;   _wfindfirst                                                 @512
+    _wexecl                     = _MSVCRT__wexecl               @503
+    _wexecle                    = _MSVCRT__wexecle              @504
+    _wexeclp                    = _MSVCRT__wexeclp              @505
+    _wexeclpe                   = _MSVCRT__wexeclpe             @506
+    _wexecv                     = _MSVCRT__wexecv               @507
+    _wexecve                    = _MSVCRT__wexecve              @508
+    _wexecvp                    = _MSVCRT__wexecvp              @509
+    _wexecvpe                   = _MSVCRT__wexecvpe             @510
+    _wfdopen                    = _MSVCRT__wfdopen              @511
+    _wfindfirst                 = _MSVCRT__wfindfirst           @512
 ;   _wfindfirsti64                                              @513
-;   _wfindnext                                                  @514
+    _wfindnext                  = _MSVCRT__wfindnext            @514
 ;   _wfindnexti64                                               @515
-;   _wfopen                                                     @516
-;   _wfreopen                                                   @517
-;   _wfsopen                                                    @518
-;   _wfullpath                                                  @519
-;   _wgetcwd                                                    @520
-;   _wgetdcwd                                                   @521
-;   _wgetenv                                                    @522
-;   _winmajor                                                   @523
-;   _winminor                                                   @524
-;   _winver                                                     @525
-;   _wmakepath                                                  @526
-;   _wmkdir                                                     @527
-;   _wmktemp                                                    @528
-;   _wopen                                                      @529
-;   _wperror                                                    @530
+    _wfopen                     = _MSVCRT__wfopen               @516
+    _wfreopen                   = _MSVCRT__wfreopen             @517
+    _wfsopen                    = _MSVCRT__wfsopen              @518
+    _wfullpath                  = _MSVCRT__wfullpath            @519
+    _wgetcwd                    = _MSVCRT__wgetcwd              @520
+    _wgetdcwd                   = _MSVCRT__wgetdcwd             @521
+    _wgetenv                    = _MSVCRT__wgetenv              @522
+    _winmajor                   = CRTDLL__winmajor_dll          @523
+    _winminor                   = CRTDLL__winminor_dll          @524
+    _winver                     = CRTDLL__winver_dll            @525
+    _wmakepath                  = _MSVCRT__wmakepath            @526
+    _wmkdir                     = _MSVCRT__wmkdir               @527
+    _wmktemp                    = _MSVCRT__wmktemp              @528
+    _wopen                      = _MSVCRT__wopen                @529
+    _wperror                    = _MSVCRT__wperror              @530
 ;   _wpgmptr                                                    @531
-;   _wpopen                                                     @532
-;   _wputenv                                                    @533
-;   _wremove                                                    @534
-;   _wrename                                                    @535
+    _wpopen                     = _MSVCRT__wpopen               @532
+    _wputenv                    = _MSVCRT__wputenv              @533
+    _wremove                    = _MSVCRT__wremove              @534
+    _wrename                    = _MSVCRT__wrename              @535
     _write                      = CRTDLL__write                 @536
-;   _wrmdir                                                     @537
-;   _wsearchenv                                                 @538
-;   _wsetlocale                                                 @539
-;   _wsopen                                                     @540
-;   _wspawnl                                                    @541
-;   _wspawnle                                                   @542
-;   _wspawnlp                                                   @543
-;   _wspawnlpe                                                  @544
-;   _wspawnv                                                    @545
-;   _wspawnve                                                   @546
-;   _wspawnvp                                                   @547
-;   _wspawnvpe                                                  @548
-;   _wsplitpath                                                 @549
-;   _wstat                                                      @550
+    _wrmdir                     = _MSVCRT__wrmdir               @537
+    _wsearchenv                 = _MSVCRT__wsearchenv           @538
+    _wsetlocale                 = _MSVCRT__wsetlocale           @539
+    _wsopen                     = _MSVCRT__wsopen               @540
+    _wspawnl                    = _MSVCRT__wspawnl              @541
+    _wspawnle                   = _MSVCRT__wspawnle             @542
+    _wspawnlp                   = _MSVCRT__wspawnlp             @543
+    _wspawnlpe                  = _MSVCRT__wspawnlpe            @544
+    _wspawnv                    = _MSVCRT__wspawnv              @545
+    _wspawnve                   = _MSVCRT__wspawnve             @546
+    _wspawnvp                   = _MSVCRT__wspawnvp             @547
+    _wspawnvpe                  = _MSVCRT__wspawnvpe            @548
+    _wsplitpath                 = _MSVCRT__wsplitpath           @549
+    _wstat                      = _MSVCRT__wstat                @550
 ;   _wstati64                                                   @551
-;   _wstrdate                                                   @552
-;   _wstrtime                                                   @553
-;   _wsystem                                                    @554
-;   _wtempnam                                                   @555
-;   _wtmpnam                                                    @556
+    _wstrdate                   = _MSVCRT__wstrdate             @552
+    _wstrtime                   = _MSVCRT__wstrtime             @553
+    _wsystem                    = _MSVCRT__wsystem              @554
+    _wtempnam                   = _MSVCRT__wtempnam             @555
+    _wtmpnam                    = _MSVCRT__wtmpnam              @556
     _wtoi                       = NTDLL__wtoi                   @557
 ;   _wtoi64                                                     @558
     _wtol                       = NTDLL__wtol                   @559
-;   _wunlink                                                    @560
-;   _wutime                                                     @561
+    _wunlink                    = _MSVCRT__wunlink              @560
+    _wutime                     = _MSVCRT__wutime               @561
     _y0                         = CRTDLL__y0                    @562
     _y1                         = CRTDLL__y1                    @563

trunk/src/shell32/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.10 1999-08-21 12:29:31 sandervl Exp $
+# $Id: makefile,v 1.11 1999-10-04 09:55:59 sandervl Exp $
 
 #
@@ -10 +10 @@
 PDWIN32_LIB = ..\..\lib
 PDWIN32_BIN = ..\..\bin
+PDWIN32_TOOLS = ..\..\tools\bin
 
 
@@ -35 +36 @@
 
 
-$(TARGET).lib: $(TARGET).dll
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).dll
+$(TARGET).lib: $(TARGET)exp.def
+        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
         $(CP) $@ $(PDWIN32_LIB)
 
-
+$(TARGET)exp.def: $(TARGET).def
+        $(IMPDEF) $** $@
 
 shell32.obj: shell32.cpp shell32.h

trunk/src/shell32/new/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.8 1999-09-09 13:04:55 phaller Exp $
+# $Id: makefile,v 1.9 1999-10-04 09:56:00 sandervl Exp $
 
 #
@@ -10 +10 @@
 PDWIN32_LIB = ..\..\..\lib
 PDWIN32_BIN = ..\..\..\bin
+PDWIN32_TOOLS = ..\..\tools\bin
 
 
@@ -43 +44 @@
 
 
-$(TARGET).lib: $(TARGET).dll
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).dll
+$(TARGET).lib: $(TARGET)exp.def
+        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
         $(CP) $@ $(PDWIN32_LIB)
+
+$(TARGET)exp.def: $(TARGET).def
+        $(IMPDEF) $** $@
 
 

trunk/src/user32/oslibwin.cpp ¶

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.11 1999-10-02 04:09:12 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.12 1999-10-04 09:56:00 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -126 +126 @@
   } else
   {
-    if(dwStyle & WS_CAPTION_W)
+    if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W)
           *OSFrameStyle |= FCF_TITLEBAR;
     if(dwStyle & WS_DLGFRAME_W)
@@ -828 +828 @@
                     (WinQueryWindowULong(hwnd, QWL_STYLE) & ~0xffff0000) |
                     OSWinStyle);
-}
-//******************************************************************************
-//******************************************************************************
+
+  if(OSFrameStyle != 0)  // maybe WinQueryClassName == WC_FRAME is better
+  {
+    if(OSFrameStyle & FCF_TITLEBAR)
+    {
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_TITLEBAR), hwnd, FALSE);
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MENU), hwnd, FALSE);
+    }
+    else
+    {
+      WinSetParent(WinWindowFromID(hwnd, FID_TITLEBAR), HWND_OBJECT, FALSE);
+      WinSetParent(WinWindowFromID(hwnd, FID_MENU), HWND_OBJECT, FALSE);
+    }
+    if(OSFrameStyle & FCF_SYSMENU)
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_SYSMENU), hwnd, FALSE);
+    else
+      WinSetParent(WinWindowFromID(hwnd, FID_SYSMENU), HWND_OBJECT, FALSE);
+
+    if(OSFrameStyle & FCF_MINBUTTON | OSFrameStyle & FCF_MAXBUTTON)
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MINMAX), hwnd, FALSE);
+    else
+      WinSetParent(WinWindowFromID(hwnd, FID_MINMAX), HWND_OBJECT, FALSE);
+
+    if(OSFrameStyle & FCF_VERTSCROLL)
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_VERTSCROLL), hwnd, FALSE);
+    else
+      WinSetParent(WinWindowFromID(hwnd, FID_VERTSCROLL), HWND_OBJECT, FALSE);
+
+    if(OSFrameStyle & FCF_HORZSCROLL)
+      WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_HORZSCROLL), hwnd, FALSE);
+    else
+      WinSetParent(WinWindowFromID(hwnd, FID_HORZSCROLL), HWND_OBJECT, FALSE);
+
+    WinSendMsg(hwnd, WM_UPDATEFRAME,
+               MPFROMLONG(FCF_TITLEBAR | FCF_SYSMENU | FCF_MINMAX |
+                          FCF_MENU | FCF_VERTSCROLL | FCF_HORZSCROLL),
+               MPVOID);
+  }
+}
+//******************************************************************************
+//******************************************************************************
+HWND OSLibWinObjectWindowFromID(HWND hwndOwner, ULONG ID)
+{
+  HWND   hwndNext, hwndFound=0;
+  HENUM  henum;
+
+  henum = WinBeginEnumWindows(HWND_OBJECT);
+  while ((hwndNext = WinGetNextWindow(henum)) != 0)
+  {
+    if(WinQueryWindow(hwndNext, QW_OWNER) == hwndOwner &&
+       WinQueryWindowUShort(hwndNext, QWS_ID) == ID)
+    {
+       hwndFound = hwndNext;
+       break;
+    }
+  }
+  WinEndEnumWindows(henum);
+  return hwndFound;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h ¶

@@ -1 @@
-/* $Id: oslibwin.h,v 1.7 1999-10-02 04:09:13 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.8 1999-10-04 09:56:00 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -243 +243 @@
 BOOL  OSLibWinMapWindowPoints (HWND hwndFrom, HWND hwndTo, OSLIBPOINT *pptl, ULONG num);
 
+HWND  OSLibWinObjectWindowFromID(HWND hwndOwner, ULONG ID);
+
 #define OSLIB_HSCROLL   0
 #define OSLIB_VSCROLL   1

trunk/src/user32/win32dlg.cpp ¶

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.5 1999-09-26 14:44:58 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.6 1999-10-04 09:56:01 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -19 +19 @@
 #include <win32dlg.h>
 #include "oslibmsg.h"
+#include "win32wdesktop.h"
 
 #define DEFAULT_DLGFONT "9.WarpSans"
@@ -229 +230 @@
     /* Owner must be a top-level window */
     if(getOwner() == NULL) {
-        dprintf(("Dialog box has no owner!!!"));
-        return -1;
-    }
-    topOwner = getOwner()->getTopParent();
+         topOwner = windowDesktop;
+    }
+    else topOwner = getOwner()->getTopParent();
+
     if(topOwner == NULL) {
         dprintf(("Dialog box has no top owner!!!"));

trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.21 1999-10-02 04:09:13 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.22 1999-10-04 09:56:02 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1152 +1152 @@
     //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
     if(lastHitTestVal != HTCLIENT) {
-            SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(ncx, ncy)); //TODO:
+            return SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(ncx, ncy)); //TODO:
     }
     return  SendInternalMessageA(win32msg, 0, MAKELONG(clx, cly));

trunk/src/user32/windlg.cpp ¶

@@ -1 @@
-/* $Id: windlg.cpp,v 1.2 1999-09-26 14:44:58 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.3 1999-10-04 09:56:03 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -39 +39 @@
         return 0;
 
-    return CreateDialogIndirectParamA(hInst, (DLGTEMPLATE*)LoadResource(hInst, hrsrc),
+    return CreateDialogIndirectParamA(hInst, (LPCDLGTEMPLATEA)LoadResource(hInst, hrsrc),
                                       hwndOwner, dlgproc, lParamInit);
 }
@@ -53 +53 @@
         return 0;
 
-    return CreateDialogIndirectParamW(hInst, (DLGTEMPLATE*)LoadResource(hInst, hrsrc),
+    return CreateDialogIndirectParamW(hInst, (LPCDLGTEMPLATEW)LoadResource(hInst, hrsrc),
                                       hwndOwner, dlgproc, lParamInit);
 }
@@ -59 +59 @@
 //******************************************************************************
 HWND WIN32API CreateDialogIndirectParamA(HINSTANCE hInst,
-                         DLGTEMPLATE *dlgtemplate,
+                         LPCDLGTEMPLATEA dlgtemplate,
                          HWND hwndParent, DLGPROC dlgproc,
                          LPARAM lParamInit)
@@ -87 +87 @@
 //******************************************************************************
 HWND WIN32API CreateDialogIndirectParamW(HINSTANCE hInst,
-                         DLGTEMPLATE *dlgtemplate,
+                         LPCDLGTEMPLATEW dlgtemplate,
                          HWND hwndParent, DLGPROC dlgproc,
                          LPARAM lParamInit)
@@ -115 +115 @@
 //******************************************************************************
 INT  WIN32API DialogBoxIndirectParamA(HINSTANCE hInst,
-                      DLGTEMPLATE *dlgtemplate,
+                      LPCDLGTEMPLATEA dlgtemplate,
                       HWND hwndParent, DLGPROC dlgproc,
                       LPARAM lParamInit)
@@ -136 +136 @@
 //******************************************************************************
 //******************************************************************************
-INT  WIN32API DialogBoxIndirectParamW(HINSTANCE hInst, DLGTEMPLATE *dlgtemplate,
+INT  WIN32API DialogBoxIndirectParamW(HINSTANCE hInst, LPCDLGTEMPLATEW dlgtemplate,
                                       HWND hwndParent, DLGPROC dlgproc,
                                       LPARAM lParamInit)

trunk/src/win32k/Makefile ¶

@@ -1 +1 @@
 ################################################################################
-# $Id: Makefile,v 1.2 1999-09-12 00:26:27 bird Exp $
+# $Id: Makefile,v 1.3 1999-10-04 09:56:03 sandervl Exp $
 #
 # Copyright 1998-1999 knut st. osmundsen
@@ -16 +16 @@
 # COMPILER/LINKER/ASSEMBLER
 ################################################################################
-CC16        = cl
+CC16        = $(MSCPATH)\binp\cl
 CC          = icc
+!if "$(CCENV)" == "VAC36"
+ILIB        = ilib /nofree
+!else
+ILIB        = ilib 
+!endif
 LD          = ilink
 AS          = alp
@@ -72 +77 @@
              -I.                                    \
              -I$(DDKPATH)\h                         \
-             -If:\ddktools\toolkits\msc60\include   \
+             -I$(MSCPATH)\include                   \
+#             -If:\ddktools\toolkits\msc60\include   \
              -I$(PDWIN32_INCLUDE)
 
@@ -134 +140 @@
 # TARGETS
 ################################################################################
-all:$(NAME).sys
+all: ProbKrnl.exe $(NAME).sys
+#all:$(NAME).sys
 
 
@@ -181 +188 @@
 
 
+!if "$(CCENV)" == "VAC36"
+LIBS  = $(VACPATH)\lib\cpprni36.lib         \
+!else
 LIBS  = $(VACPATH)\lib\cppon30.lib          \
+!endif
         $(DDKPATH)\lib\os2286.lib
 
@@ -197 +208 @@
         $(CDEFINES16) -DDEBUGR3 -Fa$(WIN32KLIST)\$(*B).s     \
         -Foprobkrnl.obj $(CINCLUDES16) dev16\probkrnl.c
-    link /NOD /MAP:FULL /CO /pmtype:vio probkrnl.obj, probkrnl.exe, probkrnl.map, f:\toolkit\lib\os2286.lib + $(MSCPATH)\lib\clibcep.lib;
+    $(MSCPATH)\binb\link /NOD /MAP:FULL /CO /pmtype:vio probkrnl.obj, probkrnl.exe, probkrnl.map, $(TOOLKIT)\lib\os2286.lib + $(MSCPATH)\lib\clibcr.lib;
+#    link /NOD /MAP:FULL /CO /pmtype:vio probkrnl.obj, probkrnl.exe, probkrnl.map, f:\toolkit\lib\os2286.lib + $(MSCPATH)\lib\clibcep.lib;
 
 
@@ -218 +230 @@
 devhelp.lib: $(DDKPATH)\lib\dhcalls.lib libconv.exe
     libconv $(DDKPATH)\lib\dhcalls.lib $@
-    ilib /nologo /nobackup /convformat $@;
+    $(ILIB) /nologo /nobackup /convformat $@;
+#   ilib /nologo /nobackup /convformat $@;
 
 clib.lib: $(MSCPATH)\lib\slibcep.lib libconv.exe
     libconv $(MSCPATH)\lib\clibcep.lib $@ > nul
-    ilib /nologo /nobackup /convformat $@;
+    $(ILIB) /nologo /nobackup /convformat $@;
+#   ilib /nologo /nobackup /convformat $@;
 
 last.lib: object\devlast.obj
     -@del $@ > nul 2> nul
-    ilib /nologo /nobackup $@ $**;
+    $(ILIB) /nologo /nobackup $@ $**;
+#   ilib /nologo /nobackup $@ $**;
 
 libconv.exe: libconv.c

trunk/src/win32k/include/pe2lx.h ¶

@@ -1 @@
-/* $Id: pe2lx.h,v 1.1 1999-09-06 02:19:59 bird Exp $
+/* $Id: pe2lx.h,v 1.2 1999-10-04 09:56:04 sandervl Exp $
  *
  * Common header file for pe2lx.
@@ -32 +32 @@
         #include <string.h>
         #include <builtin.h>
-        #if 0
+        #if 1
             #define __malloc_h /* to prevent using the VAC++ malloc.h */
             #include <stdlib.h>