From: Dirk B. <db...@us...> - 2005-04-30 08:01:38
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/wincon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14791/extsrc/wincon Modified Files: BUILD.BAT BUILD.C WINCON.C WINCON.DSP wincon.aps wincon.i wincon.rc Added Files: BUILD.h Log Message: New Wincon.dll now 20,312 Windows Constants available Index: wincon.i =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/wincon/wincon.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wincon.i 22 Dec 2004 20:26:00 -0000 1.1 --- wincon.i 30 Apr 2005 08:01:02 -0000 1.2 *************** *** 1,15514 **** ! CONSTANT(WINVER) ! CONSTANT(STRICT) ! CONSTANT(MAX_PATH) ! CONSTANT(NULL) ! CONSTANT(FALSE) ! CONSTANT(TRUE) ! CONSTANT(ANYSIZE_ARRAY) ! CONSTANT(MEMORY_ALLOCATION_ALIGNMENT) ! CONSTANT(ADDRESS_TAG_BIT) ! CONSTANT(MAXUINT_PTR) [...35800 lines suppressed...] ! CONSTANT( WC_LINK ) ! CONSTANT( CERICHEDIT_CLASSA ) ! CONSTANT( CERICHEDIT_CLASSW ) ! CONSTANT( RICHEDIT_CLASSA ) ! CONSTANT( RICHEDIT_CLASS10A ) ! CONSTANT( RICHEDIT_CLASSW ) ! CONSTANT( MSH_MOUSEWHEEL ) ! CONSTANT( MOUSEZ_CLASSNAME ) ! CONSTANT( MOUSEZ_TITLE ) ! CONSTANT( MSH_WHEELSUPPORT ) ! CONSTANT( MSH_SCROLL_LINES ) ! CONSTANT( ACCESS_DS_SOURCE_W ) ! CONSTANT( ACCESS_DS_OBJECT_TYPE_NAME_W ) ! CONSTANT( ACMHELPMSGSTRINGA ) ! CONSTANT( ACMHELPMSGSTRINGW ) ! CONSTANT( ACMHELPMSGCONTEXTMENUA ) ! CONSTANT( ACMHELPMSGCONTEXTMENUW ) ! CONSTANT( ACMHELPMSGCONTEXTHELPA ) ! CONSTANT( ACMHELPMSGCONTEXTHELPW ) ! Index: WINCON.DSP =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/wincon/WINCON.DSP,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WINCON.DSP 22 Dec 2004 20:26:00 -0000 1.1 --- WINCON.DSP 30 Apr 2005 08:01:02 -0000 1.2 *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c ! # ADD CPP /nologo /Zp4 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c ! # ADD CPP /nologo /MT /W3 /GX /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 54,58 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\Wincon.dll" !ELSEIF "$(CFG)" == "wincon - Win32 Debug" --- 54,58 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\Win32Forth\Wincon.dll" !ELSEIF "$(CFG)" == "wincon - Win32 Debug" *************** *** 80,84 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\Wincon.dll" !ENDIF --- 80,84 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\Win32Forth\Wincon.dll" !ENDIF *************** *** 93,97 **** # Begin Source File ! SOURCE=.\wincon.c # End Source File # Begin Source File --- 93,97 ---- # Begin Source File ! SOURCE=.\WINCON.C # End Source File # Begin Source File *************** *** 116,119 **** --- 116,123 ---- SOURCE=.\wincon.i # End Source File + # Begin Source File + + SOURCE=.\wincon.ii + # End Source File # End Target # End Project Index: wincon.aps =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/wincon/wincon.aps,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs1EEjrO and /tmp/cvsUa17uj differ --- NEW FILE: BUILD.h --- // precompiler input to load windows constants // required predefined values #define WINVER 0x0501 #define _WIN32_IE 0x0501 #define _WIN32_WINNT 0x0501 #ifndef _WIN32 #define _WIN32 #endif #include <windows.h> #include <commctrl.h> #include <richedit.h> #include <zmouse.h> #include <vfw.h> #include <shlwapi.h> Index: BUILD.BAT =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/wincon/BUILD.BAT,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BUILD.BAT 22 Dec 2004 20:26:00 -0000 1.1 --- BUILD.BAT 30 Apr 2005 08:01:02 -0000 1.2 *************** *** 6,15 **** rem Change the -I option to point to your windows include directory. rem cpp.exe -I/msdev/include build.c > nul ! cpp.exe -Id:/vc/include build.c > nul rem rebuild the dll ! nmake /f wincon.mak CFG="wincon - Win32 Release" rem copy the files to the current directory ! copy release\wincon.dll . ! copy release\wincon.lib . --- 6,15 ---- rem Change the -I option to point to your windows include directory. rem cpp.exe -I/msdev/include build.c > nul ! cpp.exe -IC:/Programme/Microsoft_SDK/Include build.c >nul rem rebuild the dll ! rem nmake /f wincon.mak CFG="wincon - Win32 Release" rem copy the files to the current directory ! rem copy release\wincon.dll . ! rem copy release\wincon.lib . Index: wincon.rc =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/wincon/wincon.rc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wincon.rc 22 Dec 2004 20:26:00 -0000 1.1 --- wincon.rc 30 Apr 2005 08:01:02 -0000 1.2 *************** *** 29,34 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 2,0,0,1 ! PRODUCTVERSION 2,0,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG --- 29,34 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 3,0,0,1 ! PRODUCTVERSION 3,0,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG *************** *** 48,52 **** VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Win32Forth Windows constants support\0" ! VALUE "FileVersion", "2, 0, 0, 1\0" VALUE "InternalName", "WINCON\0" VALUE "LegalCopyright", "\0" --- 48,52 ---- VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Win32Forth Windows constants support\0" ! VALUE "FileVersion", "3, 0, 0, 1\0" VALUE "InternalName", "WINCON\0" VALUE "LegalCopyright", "\0" *************** *** 55,59 **** VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "2, 0, 0, 1\0" VALUE "SpecialBuild", "\0" END --- 55,59 ---- VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "3, 0, 0, 1\0" VALUE "SpecialBuild", "\0" END Index: BUILD.C =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/wincon/BUILD.C,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BUILD.C 22 Dec 2004 20:26:00 -0000 1.1 --- BUILD.C 30 Apr 2005 08:01:02 -0000 1.2 *************** *** 2,17 **** // required predefined values ! #define WINVER 0x0400 ! #define _WIN32 ! #define _M_IX86 300 ! #define _STDCALL_SUPPORTED ! ! // optional to make the dll smaller ! //#define WIN32_LEAN_AND_MEAN ! //#define NOMCX // Modem Configuration Extensions ! //#define NOKANJI // Kanji support stuff ! //#define NOIME ! ! #include <windows.h> ! #include <commctrl.h> ! --- 2,4 ---- // required predefined values ! #include "Build.h" Index: WINCON.C =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/wincon/WINCON.C,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WINCON.C 22 Dec 2004 20:26:00 -0000 1.1 --- WINCON.C 30 Apr 2005 08:01:02 -0000 1.2 *************** *** 1,9 **** // wincon.c // Andrew McKewan, August 1996 - #define WINVER 0x0501 - #include <windows.h> - #include <commctrl.h> - #include <Shlwapi.h> #include <stdio.h> ////////////////////////////////////////////////////////////////////// --- 1,8 ---- // wincon.c // Andrew McKewan, August 1996 #include <stdio.h> + #include <limits.h> + //#pragma warning ( disable: 4005 ) + #include "build.h" ////////////////////////////////////////////////////////////////////// *************** *** 29,33 **** // Create a hash table of the names for quick lookup. ! #define HASHSIZE 2003 Entry *hashTable[HASHSIZE]; --- 28,33 ---- // Create a hash table of the names for quick lookup. ! //#define HASHSIZE 2003 ! #define HASHSIZE 65536 Entry *hashTable[HASHSIZE]; *************** *** 192,196 **** return E_FAIL; ! pdvi->dwMajorVersion = 2; pdvi->dwMinorVersion = 0; pdvi->dwBuildNumber = 1; --- 192,196 ---- return E_FAIL; ! pdvi->dwMajorVersion = 3; pdvi->dwMinorVersion = 0; pdvi->dwBuildNumber = 1; |