Changeset 21299 for trunk/include

Timestamp:

Jun 16, 2009, 3:08:41 PM (16 years ago)

Author:

ydario

Message:

Header updates.

Location:

trunk/include

Files:

• OS2WIN.H (modified) (1 diff)
• initdll.h (modified) (3 diffs)
• odin.h (modified) (2 diffs)
• odin32.dbg.emx.mk (modified) (3 diffs)
• odin32.post.emx.mk (modified) (2 diffs)
• odinbuild.h (modified) (1 diff)
• win/winbase.h (modified) (1 diff)
• win/windef.h (modified) (4 diffs)
• win/wine/unicode.h (modified) (1 diff)
• win/winnt.h (modified) (1 diff)
• win/winuser.h (modified) (1 diff)
• win32type.h (modified) (1 diff)

trunk/include/OS2WIN.H

@@ -1628 +1628 @@
 HANDLE  OPEN32API O32_GetPMHandleFromGDIHandle(HGDIOBJ hGDI);
 
+VOID OPEN32API _O32_GetStartupInfo(LPSTARTUPINFOA lpStartupInfo);
+
+inline VOID O32_GetStartupInfo(LPSTARTUPINFOA lpStartupInfo)
+{
+ USHORT sel = RestoreOS2FS();
+
+    _O32_GetStartupInfo(lpStartupInfo);
+    SetFS(sel);
+}
+
 #endif    /* ifdef _OS2WIN_H */

trunk/include/initdll.h

@@ -2 +2 @@
 #define __INITDLL_H__
 
-#if (defined(__IBMCPP__) || defined(__IBMC__))
+#if (defined(__IBMCPP__) || defined(__IBMC__) || defined(__INNOTEK_LIBC__))
 
 #define DLLENTRYPOINT_CCONV SYSTEM
@@ -25 +25 @@
 #define ctordtorTerm()  __ctordtorTerm(0)
 
+#elif defined(__INNOTEK_LIBC__)
+
+extern void __ctordtorInit(void);
+extern void __ctordtorTerm(void);
+
 #else
 #error "Unknown compiler!"
 #endif
 
+#ifndef __INNOTEK_LIBC__
 
 /*-------------------------------------------------------------------*/
@@ -42 +48 @@
 /*-------------------------------------------------------------------*/
 void _Optlink _CRT_term(void);
+#endif // __INNOTEK_LIBC__
 
 

trunk/include/odin.h

@@ -84 +84 @@
   #define WIN32API  __stdcall
   #define WINAPI    __stdcall
-  #define SYSTEM    CDECL
   #define PASCAL    __stdcall
   #define INLINE    __inline__
@@ -90 +89 @@
   #define NONAMELESSUNION
   #define NONAMELESSSTRUCT
+  #ifdef __INNOTEK_LIBC__
+  #define SYSTEM    _System
+  #define APIENTRY  _System
+  #else
+  #define SYSTEM    CDECL
   #undef  APIENTRY
   #define APIENTRY  CDECL
+  #endif
 
 #else

trunk/include/odin32.dbg.emx.mk

@@ -52 +52 @@
 AS     = alp
 LD     = gcc
-LD2    = link386
+LD2    = gcc
 IMPLIB = implib
 ILIB   = emxomfar
@@ -67 +67 @@
 RCFLAGS          = -s -I. -I$(CPPMAIN)\include  -D__WIN32OS2__
 !ifdef WRC_PREFIX_RESOURCE
-RCFLAGS          = $(RCFLAGS) -p $(TARGET)
+RCFLAGS          = $(RCFLAGS) -p _$(TARGET)
 !endif
 OS2RCFLAGS       = -r -n
@@ -125 +125 @@
 !else
 LDTARGETFLAGS    = -Zdll -Zso -Zsys
-LD2TARGETFLAGS   = /DLL
+LD2TARGETFLAGS   = -Zdll
 !endif
 !ifdef NODEBUGINFO
 LDFLAGS          = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /exepack:2 /Nod" $(LDTARGETFLAGS) -s
 LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /exepack:2     " $(LDTARGETFLAGS) -s
-LD2FLAGS         = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /nodebug /nod $(LD2TARGETFLAGS)
+#LD2FLAGS         = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /nodebug /nod $(LD2TARGETFLAGS)
+LD2FLAGS         = -Zmap -s $(LD2TARGETFLAGS)
 LD2FLAGS_ODINCRT = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /nodebug      $(LD2TARGETFLAGS)
+LD2FLAGS_ODINCRT         = -Zmap -s $(LD2TARGETFLAGS)
+
 !else
 LDFLAGS          = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /exepack:2 /Nod" $(LDTARGETFLAGS) -g
 LDFLAGS_ODINCRT  = -Zmt -Zomf -Zmap -Zlinker "/MAP:FULL /Linenumbers /exepack:2     " $(LDTARGETFLAGS) -g
-LD2FLAGS         = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /debug /nod $(LD2TARGETFLAGS)
-LD2FLAGS_ODINCRT = /nologo /noe /map:full /NoIgnoreCase /Linenumbers /packcode /packdata /exepack:2 /debug      $(LD2TARGETFLAGS)
+LD2FLAGS         = -g -Zomf -Zhigh-mem $(LD2TARGETFLAGS)
+LD2FLAGS_ODINCRT = -g -Zomf -Zhigh-mem $(LD2TARGETFLAGS)
 !endif
 

trunk/include/odin32.post.emx.mk

@@ -1 @@
-# $Id: odin32.post.emx.mk,v 1.13 2001-07-30 22:52:08 bird Exp $
+# $Id: odin32.post.emx.mk,v 1.30 2003-10-26 01:47:51 bird Exp $
 
 #
@@ -6 +6 @@
 # Common dll makefile rules (must be included at the last line of the makefile)
 #
-
-#
-# This is shared with VAC3 cause there is only tree minor differences.
-#
-!include $(ODIN32_INCLUDE)/odin32.post.vac3.mk
+# If ORGTARGET is defined it is used to generate the importlibrary.
+#
+# Define NOTEXPDEF to remove the $(TARGET).lib and $(TARGET)exp.def rules.
+# Define EXETARGET to make an executable. (This also applies to odin32.mk.)
+# Define LIBTARGET to make an internal library.
+# Define LOCALCLEAN if only the local directory is to be clean.
+# Define CLEAN2 to invoke a second clean rule named 'clean2'.
+# Define NOCLEAN to exclude the clean rule. (Remember to make your own!)
+#
+# New style: (!defined OLD_STYLE)
+# Define NO_ALL_RULE to not make default all rule.
+# Define NO_LIB_RULE to not make default lib rule.
+# Define NO_MAIN_RULE to not make default main target rule.
+# Define NO_LNKFILE_RULE to not make default link-file rule.
+# Define NO_DEP_RULE to not make dependencies rule.
+# Define NO_CLEAN_RULE to not make clean rule (same as NOCLEAN - use this!).
+# Define NO_INTERNAL_LIBS to not include libs rule for subdirectories.
+# Define NO_MAIN_BIN_COPY to not copy the target and sym file to the main
+#    binary directory. It is only copied to the compiler specific directory.
+#    Main bin is /bin. Compiler specific bin is /bin/debug, /bin/debug.vac36, etc.
+# Define ADDITIONAL_DEP to add dependencies rules.
+# Define ADDITIONAL_ALL to add targets all should depend on.
+#
+# Define MAKEFILE if the name of the makefile isn't "makefile".
+# Define DEFFILE to specify another file than $(TARGET).def or $(ORGTARGET).def.
+#    Define this if your .exe file have a .def file.
+# Define OS2RES as the names of the OS/2 .res file to create and link
+#    with the target .dll or .exe.
+# Define LIBS as a list of all the libraries to link
+#    with the target .dll or .exe.
+# Define SUBDIRS when you have subdirectories which should be made.
+#    dep and lib supports this fully. The rule libs are added, since we assume you
+#    makes internal libraries in the subdirectories. The libs rule is one of the
+#    dependencies of the main target.
+#
+
+# Sanity check
+!ifndef ODIN32_LIB
+!   error "ODIN32_LIB is not defined"
+!endif ODIN32_LIB
+!ifndef ODIN32_TOOLS
+!   error "ODIN32_TOOLS is not defined"
+!endif ODIN32_TOOLS
+
+
+!ifndef TARGET_EXTENSION
+!   ifdef LIBTARGET
+TARGET_EXTENSION=lib
+!    else
+!       ifdef EXETARGET
+TARGET_EXTENSION=exe
+!       else
+TARGET_EXTENSION=dll
+!       endif
+!   endif
+!endif
+
+
+!ifndef OLD_STYLE
+
+# Set default MAKEFILE if needed
+!ifndef MAKEFILE
+MAKEFILE = makefile
+!endif
+
+# Set default ORGTARGET if needed.
+!ifndef ORGTARGET
+ORGTARGET=$(TARGET)
+!endif
+
+# Set default DEFFILE if needed. (Required for both DLLs and EXEs!)
+!ifndef DEFFILE
+DEFFILE = $(ORGTARGET).def
+!endif
+!ifndef ORGDEFFILE
+ORGDEFFILE = $(ORGTARGET).def
+!endif
+
+# Set INTLIBS (interal) if SUBDIRS is defined and NO_INTERNAL_LIBS is undefined.
+!ifdef SUBDIRS
+!   ifndef NO_INTERNAL_LIBS
+!       ifndef LIBTARGET
+INTLIBS = libs
+!       else
+INTLIBS = libs_sub
+!       endif
+!   endif
+!endif
+
+
+!ifndef LIBTARGET
+!ifndef EXETARGET
+###############################################################################
+# DLL Target
+###############################################################################
+
+#
+# Dll: All rule - build objs, target dll, copies target to bin and makes libs.
+#
+!ifndef NO_ALL_RULE
+all:    $(OBJDIR) \
+        $(INTLIBS) \
+        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
+        $(OBJDIR)\$(TARGET).sym \
+        $(ODIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
+        $(ODIN32_BIN)\$(TARGET).sym \
+        lib \
+        $(ADDITIONAL_ALL)
+!endif
+
+
+#
+# Dll: Lib rule - build importlibrary (and evt. other libs)
+#
+!ifndef NO_LIB_RULE
+lib:    $(OBJDIR) \
+        $(OBJDIR)\$(ORGTARGET).lib \
+        $(ODIN32_LIB)\$(ORGTARGET).lib
+!endif
+
+
+#
+# Dll: Main target rule - builds the target dll.
+#
+!ifndef NO_MAIN_RULE
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(OBJDIR)\$(TARGET).lrf
+    $(CMDQD_WAIT)
+    $(LD2) $(LD2FLAGS) $(OBJ_PROFILE) -o $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) $(OBJS) $(LIB_PROFILE) $(LIBS) $(OBJDIR)\bldlevel.$(ORGDEFFILE)
+
+!ifdef OS2RES
+    $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
+!endif
+!if !defined(DEBUG) && !defined(NO_LXLITE)
+# remove all EAs from the file to prevent errors running LXLITE on
+# a LAN server mounted JFS volume
+    eautil $@ nul /s
+    $(LXLITE) $@
+!endif
+!endif
+
+
+#
+# Dll: Linker file - creates the parameter file passed on to the linker.
+#
+!ifndef NO_LNKFILE_RULE
+$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.emx.mk
+    @echo emx
+    @echo Creating file <<$@
+$(OBJ_PROFILE) 
+$(OBJS)
+-o $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
+$(LIB_PROFILE)
+$(LIBS)
+$(OBJDIR)\bldlevel.$(ORGDEFFILE)
+<<keep
+!endif
+
+
+!else # !ifndef EXETARGET
+###############################################################################
+# EXE Target
+###############################################################################
+
+#
+# Exe: All rule - build objs, target exe, copies target to bin.
+#
+!ifndef NO_ALL_RULE
+all:    $(OBJDIR) \
+        $(INTLIBS) \
+        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
+        $(OBJDIR)\$(TARGET).sym \
+        $(ODIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
+        $(ODIN32_BIN)\$(TARGET).sym \
+        $(ADDITIONAL_ALL)
+!endif
+
+
+#
+# Exe: Lib rule - dummy rule
+#
+!ifndef NO_LIB_RULE
+lib:
+!endif
+
+
+#
+# Exe: Main target rule - builds the target exe.
+#
+!ifndef NO_MAIN_RULE
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(ORGDEFFILE) $(OBJDIR)\$(TARGET).lrf
+    $(CMDQD_WAIT)
+    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+!ifdef OS2RES
+    $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
+!endif
+!if !defined(DEBUG) && !defined(NO_LXLITE)
+# remove all EAs from the file to prevent errors running LXLITE on
+# a LAN server mounted JFS volume
+    eautil $@ nul /s
+    $(LXLITE) $@
+!endif
+!endif
+
+
+#
+# Exe: Linker file - creates the parameter file passed on to the linker.
+#
+!ifndef NO_LNKFILE_RULE
+$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.emx.mk
+!if "$(CCENV)" != "EMX"
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS:  =^
+)
+$(OBJ_PROFILE) $(LIB_PROFILE)
+$(LIBS:  =^
+)
+$(OBJDIR)\bldlevel.$(ORGDEFFILE)
+<<keep
+!else
+    @echo Creating file <<$@
+$(EMX)\lib\crt0.obj+$(OBJ_PROFILE)$(OBJS: =+^
+),
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION),
+$(OBJDIR)\$(TARGET).map,
+$(LIB_PROFILE)+$(LIBS: =+^
+)+$(EMX)\lib\end.lib,
+$(OBJDIR)\bldlevel.$(ORGDEFFILE);
+<<keep
+!endif
+!endif
+
+
+!endif # !ifndef EXETARGET !else
+!else # !ifndef LIBTARGET
+###############################################################################
+# LIB target (internal or public object library)
+###############################################################################
+
+#
+# Localcleanup is default for internal object libraries.
+#
+!ifndef PUBLICLIB
+LOCALCLEAN = 1
+!endif
+
+
+#
+# Lib: All rule - build objs and target library.
+#
+!ifndef NO_ALL_RULE
+all:    $(OBJDIR) \
+        $(INTLIBS) \
+!ifndef PUBLICLIB
+        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
+        $(ADDITIONAL_ALL)
+!else
+        $(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION) \
+        $(ODIN32_LIB)\$(TARGET)$(CUST).$(TARGET_EXTENSION) \
+        $(ADDITIONAL_ALL)
+!endif
+!endif
+
+
+#
+# Lib: Lib rule - dummy rule
+#
+!ifndef NO_LIB_RULE
+!ifndef PUBLICLIB
+lib:
+!else
+lib: all
+!endif
+!endif
+
+
+#
+# Lib: Internal library rule. Same as the all rule.
+#
+!ifndef NO_INTERNAL_LIBS
+libs: all
+!endif
+
+
+#
+# Lib: Main target rule - builds the target internal library.
+#
+!ifndef NO_MAIN_RULE
+$(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION): $(OBJS)
+    $(CMDQD_WAIT)
+    $(RM) $@
+!if "$(CCENV)" != "EMX"
+    -4 $(ILIB) $(ILIBFLAGS) $@ @<<$@.parm
+$(OBJS:  =&^
+)
+$(OBJDIR)\$(@B).lst
+<<keep
+!else
+    $(ILIB) $(ILIBFLAGS) $@ @<<$@.parm
+$(OBJS:  =^
+)
+<<keep
+!endif
+!endif
+
+
+!endif # !ifndef LIBTARGET
+
+
+###############################################################################
+# Common rules for both exe and dll, new style
+###############################################################################
+
+#
+# Common (new): Dep rule - makes depenencies for C, C++ and Asm files.
+#
+!ifndef NO_DEP_RULE
+dep: dep_internal $(ADDITIONAL_DEP)
+dep_internal:
+    $(DEPEND) $(CINCLUDES) -xdummy.c *.c *.cpp *.h *.asm *.inc *.rc *.dlg -robj *.orc
+!ifdef SUBDIRS
+    @$(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) dep
+!endif
+!endif
+
+
+#
+# Common: Internal library rule. Make libraries in subdirectories.
+#   For makefiles with subdirectories is common to have make libraries in subdirectories.
+#
+!ifndef NO_INTERNAL_LIBS
+!ifdef INTLIBS
+$(INTLIBS):
+    @$(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) libs
+!endif
+!endif
+
+!endif # OLD_STYLE
+
+###############################################################################
+# Common rules for both exe and dll, old and new style.
+###############################################################################
+
+#
+# Common: Copy library rule.
+#
+!ifndef PUBLICLIB
+$(ODIN32_LIB)\$(ORGTARGET).lib: $(OBJDIR)\$(ORGTARGET).lib
+!else
+$(ODIN32_LIB)\$(TARGET)$(CUST).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION)
+!endif
+    @if not exist $(@D) $(CREATEPATH) $(@D)
+    $(CP) $** $@
+!if "$(CUSTOMBUILD)" == "1"
+    $(RM) dummy.c
+!endif
+
+
+#
+# Common: Copy dll/exe rule.
+#
+$(ODIN32_BIN)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
+    @if not exist $(@D) $(CREATEPATH) $(@D)
+    $(CP) $** $@
+!ifndef NO_MAIN_BIN_COPY
+    -$(CP) $** $(@D)..\..\$(@F)
+!endif
+
+
+#
+# Common: Copy sym rule.
+#
+$(ODIN32_BIN)\$(TARGET).sym: $(OBJDIR)\$(TARGET).sym
+    @if not exist $(@D) $(CREATEPATH) $(@D)
+    $(CP) $** $@
+!ifndef NO_MAIN_BIN_COPY
+    -$(CP) $** $(@D)..\..\$(@F)
+!endif
+
+
+#
+# Common: Make sym file rule.
+#
+$(OBJDIR)\$(TARGET).sym: $(OBJDIR)\$(TARGET).map
+    cd $(OBJDIR)
+    $(MAPSYM) $(TARGET).map
+    cd ..\..
+
+
+#
+# Common: Make library from the <>exp.def or the <>.def file.
+#
+!ifndef LIBTARGET
+!ifndef NOTEXPDEF
+$(OBJDIR)\$(ORGTARGET).lib: $(OBJDIR)\$(ORGTARGET)exp.def
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+!else
+$(OBJDIR)\$(TARGET).lib: $(DEFFILE)
+    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+!endif
+!endif
+
+
+#
+# Common: Make the <>exp.def file.
+#
+!ifndef LIBTARGET
+!ifndef NOTEXPDEF
+$(OBJDIR)\$(ORGTARGET)exp.def: $(ORGDEFFILE)
+    $(IMPDEF) $(IMPDEF_FLAGS) $** $@
+!endif
+!endif
+
+
+#
+# Common: Make .def-file with buildlevel info.
+#
+$(OBJDIR)\bldlevel.$(ORGDEFFILE): $(DEFFILE)
+    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
+        -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\odinbuild.h" \
+        -M"#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\odinbuild.h"
+
+
+!ifndef NOPEHDR
+#
+# Common: Make the pe_$(ORGTARGET).obj
+#
+$(OBJDIR)\pe_$(ORGTARGET).obj: $(DEFFILE) $(PEBUILD)
+        $(PEBUILD) $(ORGTARGET) $(DEFFILE) > $(@R).asm
+    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(@R).asm
+!endif
+
+#
+# Common: Create the object directory.
+#
+$(OBJDIR):
+    @if not exist $(OBJDIR) $(CREATEPATH) $(OBJDIR)
+
+
+#
+# Common: Generate Visual SlickEdit project.
+#
+!ifndef NO_VSLICKRULES
+!ifdef ORGTARGET
+vslick $(ORGTARGET).vpj:
+    $(RM) $(ORGTARGET).vtg
+    $(ODIN32_BASE)\tools\vslick\genproject.cmd $(CINCLUDES) $(ORGTARGET).vpj
+!endif
+!endif
+
+
+#
+# Common: General clean rule. To clean more add it to CLEANEXTRAS!
+#
+!ifndef NOCLEAN
+!ifndef CLEAN2
+clean:
+!else
+clean:  clean2
+!endif
+    $(RM) *.lib *.res *.map *.pch dummy.c \
+!if "$(OBJDIR)" != ""
+     $(OBJDIR)\* \
+!endif
+!ifndef LOCALCLEAN
+        $(ODIN32_LIB)\$(ORGTARGET).lib \
+        $(ORGTARGET)exp.def \
+!ifndef PUBLICLIB
+        $(ODIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) *.$(TARGET_EXTENSION) \
+        $(ODIN32_BIN)\$(TARGET).sym *.sym \
+!endif
+        $(CLEANEXTRAS)
+!else
+        $(CLEANEXTRAS)
+!endif
+!ifdef SUBDIRS
+    @$(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) clean
+!endif
+!endif
+
+
+#
+# Common: Include the .depend file.
+#   If the depend file don't exists we'll complain about it.
+#
+!ifndef NODEP
+!   if [$(EXISTS) .depend] == 0
+!       include .depend
+!   else
+!       if [$(ECHO) .depend doesn't exist]
+!       endif
+!   endif
+!   if [$(EXISTS) $(ODIN32_INCLUDE)\.depend] == 0
+!       include $(ODIN32_INCLUDE)\.depend
+!   else
+!       if [$(ECHO) /include/.depend doesn't exist]
+!       endif
+!   endif
+!endif
+
+
+#
+# Common: If MULTIJOBS is defined make sure cmdqd is running.
+#
+!ifndef NO_MULTIJOBS
+!   ifdef MULTIJOBS
+!      if [$(CMDQD) queryrunning] != 0
+!          if [$(DODIRS) "$(ODIN32_BASE)\tools\cmdqd" $(MAKE_CMD) all] == 0
+!          endif
+!          if [$(CMDQD) init 7] == 0
+!          endif
+!      endif
+!   endif
+!endif
+
+

trunk/include/odinbuild.h

@@ -29 +29 @@
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

trunk/include/win/winbase.h

@@ -185 +185 @@
   DWORD  dwLowDateTime;
   DWORD  dwHighDateTime;
-} FILETIME, *LPFILETIME;
+} FILETIME, *LPFILETIME, *PFILETIME;
 #endif /* _FILETIME_ */
 

trunk/include/win/windef.h

@@ -151 +151 @@
 #endif
 
-
+#ifndef __EMX__
 #if (__IBMC__ < 400) && (__IBMCPP__ < 360)
 #ifndef __declspec
@@ -165 +165 @@
 #endif
 #endif // (__IBMC__ < 400) && (__IBMCPP__ < 360)
+#endif // __EMX__
 
 #ifndef CONST
@@ -309 +310 @@
 typedef double          __int64;
 #elif defined (__EMX__)
+#ifndef _JAVASOFT_JNI_MD_H_
 typedef long long       __int64;
+#endif
 #endif
 #else
@@ -532 +535 @@
 #define __TEXT(string) L##string /*probably wrong */
 # else  /* UNICODE */
-typedef CHAR TCHAR;
+typedef CHAR            TCHAR,      *PTCHAR;
 typedef LPSTR LPTSTR;
 typedef LPCSTR LPCTSTR;

trunk/include/win/wine/unicode.h

@@ -68 +68 @@
 
 #ifdef __EMX__ 
-#define _K32CONV _optlink
+#define _K32CONV _Optlink
 #else
 #define _K32CONV

trunk/include/win/winnt.h

@@ -122 +122 @@
 #  define __TEXT(string) L##string
 # else  /* UNICODE */
+#ifndef __WINE_WINDEF_H
 typedef CHAR            TCHAR,      *PTCHAR;
 typedef LPSTR           PTSTR;
 typedef LPCSTR          PCTSTR;
+#endif
 #  define __TEXT(string) string
 # endif /* UNICODE */

trunk/include/win/winuser.h

@@ -3731 +3731 @@
 LONG        WINAPI GetWindowLongW(HWND,INT);
 #define     GetWindowLong WINELIB_NAME_AW(GetWindowLong)
+
+#ifndef GetWindowLongPtr
+  #define GetWindowLongPtrA   GetWindowLongA
+  #define GetWindowLongPtrW   GetWindowLongW
+  #ifdef UNICODE
+    #define GetWindowLongPtr  GetWindowLongPtrW
+  #else
+    #define GetWindowLongPtr  GetWindowLongPtrA
+  #endif // !UNICODE
+#endif // !GetWindowLongPtr
+
+#ifndef SetWindowLongPtr
+  #define SetWindowLongPtrA   SetWindowLongA
+  #define SetWindowLongPtrW   SetWindowLongW
+  #ifdef UNICODE
+    #define SetWindowLongPtr  SetWindowLongPtrW
+  #else
+    #define SetWindowLongPtr  SetWindowLongPtrA
+  #endif // !UNICODE
+#endif // !SetWindowLongPtr
+
 BOOL      WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT);
 BOOL      WINAPI GetWindowRect(HWND,LPRECT);

trunk/include/win32type.h

@@ -268 +268 @@
 #define HWND16  WORD
 #define HWND32  DWORD
-typedef WORD *LPUINT16;
+//typedef WORD *LPUINT16;
 #define HTASK16  WORD
 #define HMMIO16  WORD