Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 37210: - Update NLS files from Wine (without adding new ones though).
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 17:10:32 2008 New Revision: 37210 URL: http://svn.reactos.org/svn/reactos?rev=37210&view=rev Log: - Update NLS files from Wine (without adding new ones though). Modified: trunk/reactos/dll/win32/kernel32/nls/div.nls trunk/reactos/dll/win32/kernel32/nls/guj.nls trunk/reactos/dll/win32/kernel32/nls/hin.nls trunk/reactos/dll/win32/kernel32/nls/hye.nls trunk/reactos/dll/win32/kernel32/nls/kan.nls trunk/reactos/dll/win32/kernel32/nls/kat.nls trunk/reactos/dll/win32/kernel32/nls/knk.nls trunk/reactos/dll/win32/kernel32/nls/mar.nls trunk/reactos/dll/win32/kernel32/nls/pan.nls trunk/reactos/dll/win32/kernel32/nls/san.nls trunk/reactos/dll/win32/kernel32/nls/syr.nls trunk/reactos/dll/win32/kernel32/nls/tam.nls trunk/reactos/dll/win32/kernel32/nls/tel.nls [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/nls/div.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/div… Modified: trunk/reactos/dll/win32/kernel32/nls/guj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/guj… Modified: trunk/reactos/dll/win32/kernel32/nls/hin.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hin… Modified: trunk/reactos/dll/win32/kernel32/nls/hye.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hye… Modified: trunk/reactos/dll/win32/kernel32/nls/kan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kan… Modified: trunk/reactos/dll/win32/kernel32/nls/kat.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kat… Modified: trunk/reactos/dll/win32/kernel32/nls/knk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/knk… Modified: trunk/reactos/dll/win32/kernel32/nls/mar.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mar… Modified: trunk/reactos/dll/win32/kernel32/nls/pan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/pan… Modified: trunk/reactos/dll/win32/kernel32/nls/san.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/san… Modified: trunk/reactos/dll/win32/kernel32/nls/syr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/syr… Modified: trunk/reactos/dll/win32/kernel32/nls/tam.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tam… Modified: trunk/reactos/dll/win32/kernel32/nls/tel.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tel…

1 0

[dreimer] 37209: Rename the GCC Folders to be more logical. Add Spanish Translation for options.exe by Javier Remacha
by dreimer＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: dreimer Date: Wed Nov 5 17:04:17 2008 New Revision: 37209 URL: http://svn.reactos.org/svn/reactos?rev=37209&view=rev Log: Rename the GCC Folders to be more logical. Add Spanish Translation for options.exe by Javier Remacha Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] Wed Nov 5 17:04:17 2008 @@ -25,8 +25,8 @@ set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_MODE=MinGW set _ROSBE_ORIGINALPATH=%PATH% -set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 -set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 +set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\i386 echo. echo. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed Nov 5 17:04:17 2008 @@ -32,8 +32,8 @@ set _ROSBE_USECCACHE=0 set _ROSBE_STRIP=0 set _ROSBE_NOSTRIP=0 -set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 -set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 +set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_LOGDIR=%CD%\RosBE-Logs set _ROSBE_OBJPATH= set _ROSBE_OUTPATH= Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Wed Nov 5 17:04:17 2008 @@ -37,17 +37,17 @@ if .%_ROSBE_ARCH%. == .1. ( set ROS_ARCH=arm set ROS_PREFIX=arm-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\arm ) if .%_ROSBE_ARCH%. == .2. ( set ROS_ARCH=ppc set ROS_PREFIX=ppc-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\ppc ) if .%_ROSBE_ARCH%. == .3. ( set ROS_ARCH=amd64 set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 ) :main Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Wed Nov 5 17:04:17 2008 @@ -221,7 +221,7 @@ :: Extract GCC. :: if !_ROSBE_GCCDATE! NEQ !_ROSBE_GCCDATE2! ( - "Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" + "Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\i386" ) ) if %_ROSBE_TOOLS% == yes ( Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Nov 5 17:04:17 2008 @@ -136,9 +136,9 @@ SectionEnd Section -MinGWGCCNASM SEC02 - SetOutPath "$INSTDIR\4.1.3" - SetOverwrite try - File /r Components\4.1.3\*.* + SetOutPath "$INSTDIR\i386" + SetOverwrite try + File /r Components\i386\*.* SectionEnd Section "RosBE Configurator (options)" SEC03 @@ -198,7 +198,7 @@ Section "ccache - Compiler Cache" SEC06 SetShellVarContext current - SetOutPath "$INSTDIR\4.1.3\bin" + SetOutPath "$INSTDIR\i386\bin" SetOverwrite try File /r Components\Tools\ccache.exe File /r Components\Tools\cygwin1.dll @@ -206,7 +206,7 @@ Section "GDB - The GNU Project Debugger" SEC07 SetShellVarContext current - SetOutPath "$INSTDIR\4.1.3\bin" + SetOutPath "$INSTDIR\i386\bin" SetOverwrite try File /r Components\Tools\gdb.exe File /r Components\Tools\gdbserver.exe @@ -331,7 +331,7 @@ ;; ;; Clean up installed files. ;; - RMDir /r /REBOOTOK "$INSTDIR\4.1.3" + RMDir /r /REBOOTOK "$INSTDIR\i386" RMDir /r /REBOOTOK "$INSTDIR\Tools" RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" IfFileExists "$PROFILE\RosBE\." 0 +2 Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Nov 5 17:04:17 2008 @@ -111,9 +111,9 @@ SectionEnd Section -MinGWGCCNASM SEC02 - SetOutPath "$INSTDIR\4.4.0" + SetOutPath "$INSTDIR\x86_64" SetOverwrite try - File /r Components\4.4.0\*.* + File /r Components\x86_64\*.* SectionEnd Section -StartMenuShortcuts SEC03 @@ -180,7 +180,7 @@ ;; ;; Clean up installed files. ;; - RMDir /r /REBOOTOK "$INSTDIR\4.4.0" + RMDir /r /REBOOTOK "$INSTDIR\x86_64" Delete /REBOOTOK "$INSTDIR\charch.cmd" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc [iso-8859-1] Wed Nov 5 17:04:17 2008 @@ -1,0 +1,77 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Configuración de ReactOS Build Environment" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Color de fondo", -1, 10, 10, 75, 12 + LTEXT "Color de fuente", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nTexto ejemplo", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Mostrar tiempo de creación", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Usar CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Limpiar salida", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Cree archivos no limpios para depuración", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 + LTEXT "Ruta de MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Guardar Logs (Registros)", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Cambiar carpeta parar OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Cambiar carpeta para OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Guardar", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Cancelar", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "¡Bienvenido!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +STRINGTABLE +BEGIN + CLR0, "Negro" + CLR1, "Azul" + CLR2, "Verde" + CLR3, "Turquesa" + CLR4, "Rojo" + CLR5, "Morado" + CLR6, "Amarillo" + CLR7, "Blanco" + CLR8, "Gris" + CLR9, "Azul claro" + CLR10, "Verde claro" + CLR11, "Turquesa claro" + CLR12, "Rojo claro" + CLR13, "MOrado claro" + CLR14, "Amarillo claro" + CLR15, "Blanco brillante" + MSG_NOGCCFOUND, "¡No se ha encontrado MinGW/GCC! Por favor, comprueba tu directorio." + MSG_FILEFAILED, "¡Fallo al crear rosbe-options.cmd!" + MSG_DIREFAILED, "¡Fallo al crear directorio!" + MSG_SETLOADSUC, "Opciones cargadas satisfactoriamente." + MSG_FINDLOGDIR, "Por favor, seleccione un directorio donde los logs (registros) serán almacenados:" + MSG_FINDMGWDIR, "Por favor, seleccione el directorio donde esta ubicado MinGW/GCC:" + MSG_FINDOBJDIR, "Por favor, seleccione un directorio donde quiere guardar los archivos OBJ:" + MSG_FINDOUTDIR, "Por favor, seleccione un directorio donde quiere guardar los archivos OUT:" + MSG_WARNINGBOX, "Advertencia" + MSG_EXITCHANGE, "¿Esta seguro de salir sin guardar los cambios?" + MSG_INVALIDDIR, "El directorio que ha introducido no existe. ¿Quiere crearlo?" + /* Help Strings */ + HLP_BACKCOLORC, "Seleccione el color de fondo para la ventana Dos de RosBE." + HLP_FONTCOLORC, "Seleccione el color para el texto en la ventana Dos de RosBE." + HLP_SBUILDTIME, "Le muestra el tiempo total de compilación al final de la misma." + HLP_CCACHEUSED, "Seleccione si quiere usar (compilador cache)." + HLP_STRIPEDEXE, "Seleccione si quiere producir ejecutables comprimidos stripped executables." + HLP_FINDMGWDIR, "Esta opción le permite seleccionar donde está ubicado MinGW/GCC." + HLP_FINDLOGDIR, "Esta opción le permite seleccionar donde se guardarán los archivos logs (Registros) creados." + HLP_FINDOBJDIR, "Esta opción le permite seleccionar donde se guardarán los archivos OBJ." + HLP_FINDOUTDIR, "Esta opción le permite seleccionar donde se guardarán los archivos OUT." + HLP_SAVEBUTTON, "Se activa cuando la configuración ha sido cambiada, cerra guardando los cambios." + HLP_QUITBUTTON, "Este botón le permite salir de la configuración sin guardar los cambios." + HLP_DEFAULTMSG, "Situese sobre un control para obtener ayuda." + HLP_NOSTRIP, "Crea información de depuración para el ReactOS Debugger." +END Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc [iso-8859-1] Wed Nov 5 17:04:17 2008 @@ -3,6 +3,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[dreimer] 37208: Accidently commited a hack together with r37190. This will be reverted.
by dreimer＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: dreimer Date: Wed Nov 5 16:32:27 2008 New Revision: 37208 URL: http://svn.reactos.org/svn/reactos?rev=37208&view=rev Log: Accidently commited a hack together with r37190. This will be reverted. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Nov 5 16:32:27 2008 @@ -885,6 +885,9 @@ bool MingwBackend::IsSupportedCompilerVersion ( const string& compilerVersion ) { + if ( strcmp ( compilerVersion.c_str (), "3.4.2") < 0 ) + return false; + else return true; }

1 0

[fireball] 37207: - Update wmc to Wine-20081105 (mostly typo fixes).
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 16:31:34 2008 New Revision: 37207 URL: http://svn.reactos.org/svn/reactos?rev=37207&view=rev Log: - Update wmc to Wine-20081105 (mostly typo fixes). Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/wmc/lang.c trunk/reactos/tools/wmc/mcl.c trunk/reactos/tools/wmc/write.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Nov 5 16:31:34 2008 @@ -24,7 +24,7 @@ reactos/tools/unicode # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wpp # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/wmc # Synced to Wine-20071201 +reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wrc # Synced to Wine-0_9_53 reactos/tools/widl # Synced to Wine-0_9_59 Modified: trunk/reactos/tools/wmc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/lang.c?rev=37207… ============================================================================== --- trunk/reactos/tools/wmc/lang.c [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/lang.c [iso-8859-1] Wed Nov 5 16:31:34 2008 @@ -50,7 +50,7 @@ {0x0011, 932, 932, "Japanese", NULL}, {0x0012, 949, 949, "Korean", NULL}, {0x0013, 850, 1252, "Dutch", NULL}, - {0x0014, 850, 1252, "Norwegian (Bokmål)", NULL}, + {0x0014, 850, 1252, "Norwegian (BokmÃ¥l)", NULL}, {0x0015, 852, 1250, "Polish", NULL}, {0x0016, 850, 1252, "Portuguese", NULL}, {0x0018, 852, 1250, "Romanian", NULL}, @@ -90,7 +90,7 @@ {0x0411, 932, 932, "Japanese", "Japan"}, {0x0412, 949, 949, "Korean", "Korea (south)"}, {0x0413, 850, 1252, "Dutch", "Netherlands"}, - {0x0414, 850, 1252, "Norwegian (Bokmål)", "Norway"}, + {0x0414, 850, 1252, "Norwegian (BokmÃ¥l)", "Norway"}, {0x0415, 852, 1250, "Polish", "Poland"}, {0x0416, 850, 1252, "Portuguese", "Brazil"}, {0x0418, 852, 1250, "Romanian", "Romania"}, Modified: trunk/reactos/tools/wmc/mcl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/mcl.c?rev=37207&… ============================================================================== --- trunk/reactos/tools/wmc/mcl.c [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/mcl.c [iso-8859-1] Wed Nov 5 16:31:34 2008 @@ -33,7 +33,7 @@ #include "mcy.tab.h" /* - * Keywords are case insenitive. All normal input is treated as + * Keywords are case insensitive. All normal input is treated as * being in codepage iso-8859-1 for ascii input files (unicode * page 0) and as equivalent unicode if unicode input is selected. * All normal input, which is not part of a message text, is @@ -205,7 +205,7 @@ if(n < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); if(n <= 1) - goto try_again; /* Should not hapen */ + goto try_again; /* Should not happen */ n--; /* Strip added conversion '\0' from input length */ /* * FIXME: Modified: trunk/reactos/tools/wmc/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.c?rev=3720… ============================================================================== --- trunk/reactos/tools/wmc/write.c [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/write.c [iso-8859-1] Wed Nov 5 16:31:34 2008 @@ -243,7 +243,7 @@ cptr = dup_u2c(ndp->u.msg->msgs[idx_en]->cp, ndp->u.msg->msgs[idx_en]->msg); killnl(cptr, 0); killcomment(cptr); - fprintf(fp, "/* Approx. msg: %s */\n", cptr); + fprintf(fp, "/* Approximate msg: %s */\n", cptr); free(cptr); cptr = dup_u2c(WMC_DEFAULT_CODEPAGE, ndp->u.msg->sym); if(ndp->u.msg->cast) @@ -274,8 +274,7 @@ internal_error(__FILE__, __LINE__, "Invalid base for number print\n"); } free(cptr); - if(cast) - free(cast); + free(cast); break; default: internal_error(__FILE__, __LINE__, "Invalid node type %d\n", ndp->type);

1 0

[fireball] 37206: - Fix build.
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 16:25:19 2008 New Revision: 37206 URL: http://svn.reactos.org/svn/reactos?rev=37206&view=rev Log: - Fix build. Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/res32.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/res32.c [iso-8859-1] Wed Nov 5 16:25:19 2008 @@ -207,7 +207,7 @@ res->data = file_pos - 2*sizeof(DWORD) + hdr_size; get_string( &res->type ); get_string( &res->name ); - if ((UINT_PTR)file_pos & 2) get_word(); /* align to dword boundary */ + if ((ULONG_PTR)file_pos & 2) get_word(); /* align to dword boundary */ get_dword(); /* skip data version */ get_word(); /* skip mem options */ res->lang = get_word();

1 0

[fireball] 37205: - Update winebuild to Wine-20081105. All ReactOS-specific stuff kept intact.
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 16:14:58 2008 New Revision: 37205 URL: http://svn.reactos.org/svn/reactos?rev=37205&view=rev Log: - Update winebuild to Wine-20081105. All ReactOS-specific stuff kept intact. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec16.c trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Nov 5 16:14:58 2008 @@ -23,7 +23,7 @@ reactos/tools/unicode # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wpp # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/winebuild # Synced to Wine-20071217 +reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wmc # Synced to Wine-20071201 reactos/tools/wrc # Synced to Wine-0_9_53 reactos/tools/widl # Synced to Wine-0_9_59 Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… ============================================================================== --- trunk/reactos/tools/winebuild/build.h [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/build.h [iso-8859-1] Wed Nov 5 16:14:58 2008 @@ -117,7 +117,7 @@ enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_WINDOWS + PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS }; extern enum target_cpu target_cpu; @@ -144,14 +144,22 @@ #define __attribute__(X) #endif +#ifndef DECLSPEC_NORETURN +# if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS) +# define DECLSPEC_NORETURN __declspec(noreturn) +# else +# define DECLSPEC_NORETURN __attribute__((noreturn)) +# endif +#endif + extern void *xmalloc (size_t size); extern void *xrealloc (void *ptr, size_t size); extern char *xstrdup( const char *str ); extern char *strupper(char *s); extern int strendswith(const char* str, const char* end); -extern void fatal_error( const char *msg, ... ) - __attribute__ ((__format__ (__printf__, 1, 2))); -extern void fatal_perror( const char *msg, ... ) +extern DECLSPEC_NORETURN void fatal_error( const char *msg, ... ) + __attribute__ ((__format__ (__printf__, 1, 2))); +extern DECLSPEC_NORETURN void fatal_perror( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void error( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/import.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/import.c [iso-8859-1] Wed Nov 5 16:14:58 2008 @@ -698,30 +698,20 @@ output( "\tjmp $31,($0)\n" ); break; case CPU_POWERPC: - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(9), ppc_reg(1) ); - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(8), ppc_reg(1) ); - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(7), ppc_reg(1) ); + output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); if (target_platform == PLATFORM_APPLE) { - output( "\tlis %s, ha16(%s+%d)\n", ppc_reg(9), table, pos ); - output( "\tla %s, lo16(%s+%d)(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) ); + output( "\tlis %s, ha16(%s+%d+32768)\n", ppc_reg(31), table, pos ); + output( "\tla %s, lo16(%s+%d)(%s)\n", ppc_reg(31), table, pos, ppc_reg(31) ); } else { - output( "\tlis %s, (%s+%d)@h\n", ppc_reg(9), table, pos ); - output( "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) ); - } - output( "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(8) ); - output( "\tmtctr %s\n", ppc_reg(7) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(8), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(9), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); + output( "\tlis %s, (%s+%d+32768)@h\n", ppc_reg(31), table, pos ); + output( "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(31), table, pos, ppc_reg(31) ); + } + output( "\tlwz %s, 0(%s)\n", ppc_reg(31), ppc_reg(31) ); + output( "\tmtctr %s\n", ppc_reg(31) ); + output( "\tmr %s, %s\n", ppc_reg(31), ppc_reg(0) ); output( "\tbctr\n" ); break; } Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… ============================================================================== --- trunk/reactos/tools/winebuild/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/main.c [iso-8859-1] Wed Nov 5 16:14:58 2008 @@ -58,6 +58,8 @@ #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; +#elif defined(__sun) +enum target_platform target_platform = PLATFORM_SOLARIS; #elif defined(_WINDOWS) enum target_platform target_platform = PLATFORM_WINDOWS; #else @@ -118,6 +120,7 @@ { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "solaris", PLATFORM_SOLARIS }, { "windows", PLATFORM_WINDOWS }, { "winnt", PLATFORM_WINDOWS } }; @@ -598,10 +601,12 @@ case MODE_DLL: if (spec->subsystem != IMAGE_SUBSYSTEM_NATIVE) spec->characteristics |= IMAGE_FILE_DLL; + if (!spec_file_name) fatal_error( "missing .spec file\n" ); + /* fall through */ + case MODE_EXE: load_resources( argv, spec ); load_import_libs( argv ); - if (!spec_file_name) fatal_error( "missing .spec file\n" ); - if (!parse_input_file( spec )) break; + if (spec_file_name && !parse_input_file( spec )) break; switch (spec->type) { case SPEC_WIN16: @@ -614,15 +619,6 @@ default: assert(0); } break; - case MODE_EXE: - if (spec->type == SPEC_WIN16) fatal_error( "Cannot build 16-bit exe files\n" ); - if (!spec->file_name) fatal_error( "executable must be named via the -F option\n" ); - load_resources( argv, spec ); - load_import_libs( argv ); - if (spec_file_name && !parse_input_file( spec )) break; - read_undef_symbols( spec, argv ); - BuildSpec32File( spec ); - break; case MODE_DEF: if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); if (spec->type == SPEC_WIN16) fatal_error( "Cannot yet build .def file for 16-bit dlls\n" ); Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/relay.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/relay.c [iso-8859-1] Wed Nov 5 16:14:58 2008 @@ -26,8 +26,10 @@ #include "wine/port.h" #include <ctype.h> - -#include "thread.h" +#include <stdarg.h> + +#define __WINESRC__ /* FIXME: for WINE_VM86_TEB_INFO */ +#include "winternl.h" #include "wine/winbase16.h" #include "build.h" @@ -383,7 +385,7 @@ * All routines expect that the 16-bit stack contents (arguments) and the * return address (segptr to CallTo16_Ret) were already set up by the * caller; nb_args must contain the number of bytes to be conserved. The - * 16-bit SS:SP will be set accordinly. + * 16-bit SS:SP will be set accordingly. * * All other registers are either taken from the CONTEXT86 structure * or else set to default values. The target routine address is either @@ -891,9 +893,11 @@ /* Check for pending events. */ - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", STRUCTOFFSET(TEB,vm86_pending) ); + output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", + STRUCTOFFSET(TEB,GdiTebBatch) + STRUCTOFFSET(WINE_VM86_TEB_INFO,vm86_pending) ); output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", STRUCTOFFSET(TEB,dpmi_vif) ); + output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", + STRUCTOFFSET(TEB,GdiTebBatch) + STRUCTOFFSET(WINE_VM86_TEB_INFO,dpmi_vif) ); output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); /* Process pending events. */ Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/res32.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/res32.c [iso-8859-1] Wed Nov 5 16:14:58 2008 @@ -207,7 +207,7 @@ res->data = file_pos - 2*sizeof(DWORD) + hdr_size; get_string( &res->type ); get_string( &res->name ); - if ((ULONG_PTR)file_pos & 2) get_word(); /* align to dword boundary */ + if ((UINT_PTR)file_pos & 2) get_word(); /* align to dword boundary */ get_dword(); /* skip data version */ get_word(); /* skip mem options */ res->lang = get_word(); Modified: trunk/reactos/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec16.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec16.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/spec16.c [iso-8859-1] Wed Nov 5 16:14:58 2008 @@ -435,6 +435,7 @@ { int i, j; + if (!count) return 0; qsort( list, count, sizeof(*list), compare ); for (i = j = 0; i < count; i++) @@ -461,7 +462,7 @@ output( "\t.align 4\n" ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", name ); - output( "subl $4,%%esp\n" ); + output( "\tsubl $4,%%esp\n" ); if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); @@ -485,7 +486,7 @@ output( "\t.align 4\n" ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", name ); - output( "subl $8,%%esp\n" ); + output( "\tsubl $8,%%esp\n" ); if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); @@ -528,6 +529,7 @@ void BuildSpec16File( DLLSPEC *spec ) { ORDDEF **typelist; + ORDDEF *entry_point = NULL; int i, j, nb_funcs; char header_name[256]; @@ -535,11 +537,39 @@ output_standard_file_header(); + if (!spec->file_name) + { + char *p; + spec->file_name = xstrdup( output_file_name ); + if ((p = strrchr( spec->file_name, '.' ))) *p = 0; + } if (!spec->dll_name) /* set default name from file name */ { char *p; spec->dll_name = xstrdup( spec->file_name ); if ((p = strrchr( spec->dll_name, '.' ))) *p = 0; + } + + /* store the main entry point as ordinal 0 */ + + if (!spec->ordinals) + { + spec->ordinals = xmalloc( sizeof(spec->ordinals[0]) ); + spec->ordinals[0] = NULL; + } + if (spec->init_func && !(spec->characteristics & IMAGE_FILE_DLL)) + { + entry_point = xmalloc( sizeof(*entry_point) ); + entry_point->type = TYPE_PASCAL; + entry_point->ordinal = 0; + entry_point->lineno = 0; + entry_point->flags = FLAG_REGISTER; + entry_point->name = NULL; + entry_point->link_name = xstrdup( spec->init_func ); + entry_point->export_name = NULL; + entry_point->u.func.arg_types[0] = 0; + assert( !spec->ordinals[0] ); + spec->ordinals[0] = entry_point; } /* Build sorted list of all argument types, without duplicates */ @@ -594,12 +624,15 @@ get_asm_short_keyword() ); output( "\t.long 0\n" ); /* ne_crc */ output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* ne_flags */ - NE_FFLAGS_SINGLEDATA | NE_FFLAGS_LIBMODULE ); + NE_FFLAGS_SINGLEDATA | + ((spec->characteristics & IMAGE_FILE_DLL) ? NE_FFLAGS_LIBMODULE : 0) ); output( "\t%s 2\n", get_asm_short_keyword() ); /* ne_autodata */ output( "\t%s %u\n", get_asm_short_keyword(), spec->heap_size ); /* ne_heap */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_stack */ - output( "\t.long 0\n" ); /* ne_csip */ - output( "\t.long 0\n" ); /* ne_sssp */ + if (!entry_point) output( "\t.long 0\n" ); /* ne_csip */ + else output( "\t%s .L__wine_%s_0-.L__wine_spec_code_segment,1\n", + get_asm_short_keyword(), make_c_identifier(spec->dll_name) ); + output( "\t%s 0,2\n", get_asm_short_keyword() ); /* ne_sssp */ output( "\t%s 2\n", get_asm_short_keyword() ); /* ne_cseg */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_cmod */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_cbnrestab */ Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] Wed Nov 5 16:14:58 2008 @@ -417,13 +417,38 @@ /* Reserve some space for the PE header */ - output( "\t.text\n" ); - output( "\t.align %d\n", get_alignment(page_size) ); - output( "__wine_spec_pe_header:\n" ); - if (target_platform == PLATFORM_APPLE) + switch (target_platform) + { + case PLATFORM_APPLE: + output( "\t.text\n" ); + output( "\t.align %d\n", get_alignment(page_size) ); + output( "__wine_spec_pe_header:\n" ); output( "\t.space 65536\n" ); - else - output( "\t.skip 65536\n" ); + break; + case PLATFORM_SOLARIS: + output( "\n\t.section \".text\",\"ax\"\n" ); + output( "__wine_spec_pe_header:\n" ); + output( "\t.skip %u\n", 65536 + page_size ); + break; + default: + output( "\n\t.section \".init\",\"ax\"\n" ); + switch(target_cpu) + { + case CPU_x86: + case CPU_x86_64: + case CPU_ALPHA: + case CPU_SPARC: + output( "\tjmp 1f\n" ); + break; + case CPU_POWERPC: + output( "\tb 1f\n" ); + break; + } + output( "__wine_spec_pe_header:\n" ); + output( "\t.skip %u\n", 65536 + page_size ); + output( "1:\n" ); + break; + } /* Output the NT header */

1 0

[fireball] 37204: - Update wpp to Wine-20081105.
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 15:47:55 2008 New Revision: 37204 URL: http://svn.reactos.org/svn/reactos?rev=37204&view=rev Log: - Update wpp to Wine-20081105. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/wpp/lex.yy.c trunk/reactos/tools/wpp/ppl.l trunk/reactos/tools/wpp/ppy.tab.c trunk/reactos/tools/wpp/ppy.tab.h trunk/reactos/tools/wpp/ppy.y trunk/reactos/tools/wpp/wpp.c trunk/reactos/tools/wpp/wpp_private.h Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -22,7 +22,7 @@ The following build tools are shared with Wine. reactos/tools/unicode # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/wpp # Synced to Wine-0_9_5 +reactos/tools/wpp # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/winebuild # Synced to Wine-20071217 reactos/tools/wmc # Synced to Wine-20071201 reactos/tools/wrc # Synced to Wine-0_9_53 Modified: trunk/reactos/tools/wpp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/lex.yy.c?rev=372… ============================================================================== --- trunk/reactos/tools/wpp/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/lex.yy.c [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -16,7 +16,7 @@ #define yytext ppy_text #define yywrap ppy_wrap -#line 20 "tools\\wpp_new\\lex.yy.c" +#line 20 "lex.yy.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -921,7 +921,7 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "tools\\wpp_new\\ppl.l" +#line 1 "ppl.l" #define INITIAL 0 /* -*-C-*- * Wrc preprocessor lexical analysis @@ -1050,6 +1050,7 @@ */ #define YY_STACK_USED 1 #define YY_NEVER_INTERACTIVE 1 +#define YY_NO_INPUT 1 #define YY_NO_UNPUT 1 #define pp_pp 1 @@ -1093,13 +1094,28 @@ #define RCINCL 21 -#line 159 "tools\\wpp_new\\ppl.l" -#include <config.h> +#line 159 "ppl.l" +#include "config.h" +#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <assert.h> +#include <errno.h> +#include <limits.h> + +#ifndef LLONG_MAX +# define LLONG_MAX ((long long)0x7fffffff << 32 | 0xffffffff) +# define LLONG_MIN (-LLONG_MAX - 1) +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ((long long)0xffffffff << 32 | 0xffffffff) +#endif + +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif #include "wpp_private.h" #include "ppy.tab.h" @@ -1138,7 +1154,6 @@ /* Include management */ include_state_t incl; char *include_filename; - int pass_data; } bufferstackentry_t; #define ALLOCBLOCKSIZE (1 << 10) /* Allocate these chunks at a time for string-buffers */ @@ -1171,7 +1186,6 @@ static void newline(int); static int make_number(int radix, YYSTYPE *val, const char *str, int len); static void put_buffer(const char *s, int len); -static int is_c_h_include(char *fname, int quoted); /* Buffer management */ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop); static bufferstackentry_t *pop_buffer(void); @@ -1210,8 +1224,6 @@ static bufferstackentry_t bufferstack[MAXBUFFERSTACK]; static int bufferstackidx = 0; -static int pass_data=1; - /* * Global variables */ @@ -1230,7 +1242,7 @@ * The scanner starts here ************************************************************************** */ -#line 1234 "tools\\wpp_new\\lex.yy.c" +#line 1246 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1384,7 +1396,7 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 298 "tools\\wpp_new\\ppl.l" +#line 309 "ppl.l" /* * Catch line-continuations. @@ -1398,7 +1410,7 @@ /* * Detect the leading # of a preprocessor directive. */ -#line 1402 "tools\\wpp_new\\lex.yy.c" +#line 1414 "lex.yy.c" if ( yy_init ) { @@ -1484,7 +1496,7 @@ case 1: YY_RULE_SETUP -#line 311 "tools\\wpp_new\\ppl.l" +#line 322 "ppl.l" pp_incl_state.seen_junk++; yy_push_state(pp_pp); YY_BREAK /* @@ -1492,102 +1504,102 @@ */ case 2: YY_RULE_SETUP -#line 316 "tools\\wpp_new\\ppl.l" +#line 327 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_inc); return tINCLUDE;} else {yy_pp_state(pp_eol);} YY_BREAK case 3: YY_RULE_SETUP -#line 317 "tools\\wpp_new\\ppl.l" +#line 328 "ppl.l" yy_pp_state(yy_current_state() != pp_ignore ? pp_def : pp_eol); YY_BREAK case 4: YY_RULE_SETUP -#line 318 "tools\\wpp_new\\ppl.l" +#line 329 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tERROR; YY_BREAK case 5: YY_RULE_SETUP -#line 319 "tools\\wpp_new\\ppl.l" +#line 330 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tWARNING; YY_BREAK case 6: YY_RULE_SETUP -#line 320 "tools\\wpp_new\\ppl.l" +#line 331 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPRAGMA; YY_BREAK case 7: YY_RULE_SETUP -#line 321 "tools\\wpp_new\\ppl.l" +#line 332 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPPIDENT; YY_BREAK case 8: YY_RULE_SETUP -#line 322 "tools\\wpp_new\\ppl.l" +#line 333 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_ifd); return tUNDEF;} else {yy_pp_state(pp_eol);} YY_BREAK case 9: YY_RULE_SETUP -#line 323 "tools\\wpp_new\\ppl.l" +#line 334 "ppl.l" yy_pp_state(pp_ifd); return tIFDEF; YY_BREAK case 10: YY_RULE_SETUP -#line 324 "tools\\wpp_new\\ppl.l" +#line 335 "ppl.l" pp_incl_state.seen_junk--; yy_pp_state(pp_ifd); return tIFNDEF; YY_BREAK case 11: YY_RULE_SETUP -#line 325 "tools\\wpp_new\\ppl.l" +#line 336 "ppl.l" yy_pp_state(pp_if); return tIF; YY_BREAK case 12: YY_RULE_SETUP -#line 326 "tools\\wpp_new\\ppl.l" +#line 337 "ppl.l" yy_pp_state(pp_if); return tELIF; YY_BREAK case 13: YY_RULE_SETUP -#line 327 "tools\\wpp_new\\ppl.l" +#line 338 "ppl.l" yy_pp_state(pp_endif); return tELSE; YY_BREAK case 14: YY_RULE_SETUP -#line 328 "tools\\wpp_new\\ppl.l" +#line 339 "ppl.l" yy_pp_state(pp_endif); return tENDIF; YY_BREAK case 15: YY_RULE_SETUP -#line 329 "tools\\wpp_new\\ppl.l" +#line 340 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tLINE;} else {yy_pp_state(pp_eol);} YY_BREAK case 16: YY_RULE_SETUP -#line 330 "tools\\wpp_new\\ppl.l" +#line 341 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tGCCLINE;} else {yy_pp_state(pp_eol);} YY_BREAK case 17: YY_RULE_SETUP -#line 331 "tools\\wpp_new\\ppl.l" +#line 342 "ppl.l" ppy_error("Invalid preprocessor token '%s'", ppy_text); YY_BREAK case 18: YY_RULE_SETUP -#line 332 "tools\\wpp_new\\ppl.l" +#line 343 "ppl.l" newline(1); yy_pop_state(); return tNL; /* This could be the null-token */ YY_BREAK case 19: YY_RULE_SETUP -#line 333 "tools\\wpp_new\\ppl.l" +#line 344 "ppl.l" newline(0); YY_BREAK case 20: YY_RULE_SETUP -#line 334 "tools\\wpp_new\\ppl.l" +#line 345 "ppl.l" ppy_error("Preprocessor junk '%s'", ppy_text); YY_BREAK case 21: YY_RULE_SETUP -#line 335 "tools\\wpp_new\\ppl.l" +#line 346 "ppl.l" return *ppy_text; YY_BREAK /* @@ -1595,37 +1607,37 @@ */ case 22: YY_RULE_SETUP -#line 340 "tools\\wpp_new\\ppl.l" +#line 351 "ppl.l" return make_number(10, &ppy_lval, ppy_text, ppy_leng); YY_BREAK case 23: YY_RULE_SETUP -#line 341 "tools\\wpp_new\\ppl.l" +#line 352 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_iqs); YY_BREAK case 24: YY_RULE_SETUP -#line 342 "tools\\wpp_new\\ppl.l" +#line 353 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK case 25: YY_RULE_SETUP -#line 343 "tools\\wpp_new\\ppl.l" +#line 354 "ppl.l" ; YY_BREAK case 26: YY_RULE_SETUP -#line 344 "tools\\wpp_new\\ppl.l" +#line 355 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 27: YY_RULE_SETUP -#line 345 "tools\\wpp_new\\ppl.l" +#line 356 "ppl.l" newline(0); YY_BREAK case 28: YY_RULE_SETUP -#line 346 "tools\\wpp_new\\ppl.l" +#line 357 "ppl.l" ppy_error(yy_current_state() == pp_inc ? "Trailing junk in #include" : "Trailing junk in #line"); YY_BREAK /* @@ -1633,22 +1645,22 @@ */ case 29: YY_RULE_SETUP -#line 351 "tools\\wpp_new\\ppl.l" +#line 362 "ppl.l" ; YY_BREAK case 30: YY_RULE_SETUP -#line 352 "tools\\wpp_new\\ppl.l" +#line 363 "ppl.l" newline(1); YY_BREAK case 31: YY_RULE_SETUP -#line 353 "tools\\wpp_new\\ppl.l" +#line 364 "ppl.l" newline(0); YY_BREAK case 32: YY_RULE_SETUP -#line 354 "tools\\wpp_new\\ppl.l" +#line 365 "ppl.l" ; YY_BREAK /* @@ -1659,107 +1671,107 @@ */ case 33: YY_RULE_SETUP -#line 363 "tools\\wpp_new\\ppl.l" +#line 374 "ppl.l" return make_number(8, &ppy_lval, ppy_text, ppy_leng); YY_BREAK case 34: YY_RULE_SETUP -#line 364 "tools\\wpp_new\\ppl.l" +#line 375 "ppl.l" ppy_error("Invalid octal digit"); YY_BREAK case 35: YY_RULE_SETUP -#line 365 "tools\\wpp_new\\ppl.l" +#line 376 "ppl.l" return make_number(10, &ppy_lval, ppy_text, ppy_leng); YY_BREAK case 36: YY_RULE_SETUP -#line 366 "tools\\wpp_new\\ppl.l" +#line 377 "ppl.l" return make_number(16, &ppy_lval, ppy_text, ppy_leng); YY_BREAK case 37: YY_RULE_SETUP -#line 367 "tools\\wpp_new\\ppl.l" +#line 378 "ppl.l" ppy_error("Invalid hex number"); YY_BREAK case 38: YY_RULE_SETUP -#line 368 "tools\\wpp_new\\ppl.l" +#line 379 "ppl.l" yy_push_state(pp_defined); return tDEFINED; YY_BREAK case 39: YY_RULE_SETUP -#line 369 "tools\\wpp_new\\ppl.l" +#line 380 "ppl.l" return tLSHIFT; YY_BREAK case 40: YY_RULE_SETUP -#line 370 "tools\\wpp_new\\ppl.l" +#line 381 "ppl.l" return tRSHIFT; YY_BREAK case 41: YY_RULE_SETUP -#line 371 "tools\\wpp_new\\ppl.l" +#line 382 "ppl.l" return tLOGAND; YY_BREAK case 42: YY_RULE_SETUP -#line 372 "tools\\wpp_new\\ppl.l" +#line 383 "ppl.l" return tLOGOR; YY_BREAK case 43: YY_RULE_SETUP -#line 373 "tools\\wpp_new\\ppl.l" +#line 384 "ppl.l" return tEQ; YY_BREAK case 44: YY_RULE_SETUP -#line 374 "tools\\wpp_new\\ppl.l" +#line 385 "ppl.l" return tNE; YY_BREAK case 45: YY_RULE_SETUP -#line 375 "tools\\wpp_new\\ppl.l" +#line 386 "ppl.l" return tLTE; YY_BREAK case 46: YY_RULE_SETUP -#line 376 "tools\\wpp_new\\ppl.l" +#line 387 "ppl.l" return tGTE; YY_BREAK case 47: YY_RULE_SETUP -#line 377 "tools\\wpp_new\\ppl.l" +#line 388 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 48: YY_RULE_SETUP -#line 378 "tools\\wpp_new\\ppl.l" +#line 389 "ppl.l" newline(0); YY_BREAK case 49: YY_RULE_SETUP -#line 379 "tools\\wpp_new\\ppl.l" +#line 390 "ppl.l" ppy_error("Junk in conditional expression"); YY_BREAK case 50: YY_RULE_SETUP -#line 380 "tools\\wpp_new\\ppl.l" +#line 391 "ppl.l" ; YY_BREAK case 51: YY_RULE_SETUP -#line 381 "tools\\wpp_new\\ppl.l" +#line 392 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 52: YY_RULE_SETUP -#line 382 "tools\\wpp_new\\ppl.l" +#line 393 "ppl.l" ppy_error("String constants not allowed in conditionals"); YY_BREAK case 53: YY_RULE_SETUP -#line 383 "tools\\wpp_new\\ppl.l" +#line 394 "ppl.l" return *ppy_text; YY_BREAK /* @@ -1768,27 +1780,27 @@ */ case 54: YY_RULE_SETUP -#line 389 "tools\\wpp_new\\ppl.l" +#line 400 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; YY_BREAK case 55: YY_RULE_SETUP -#line 390 "tools\\wpp_new\\ppl.l" +#line 401 "ppl.l" ; YY_BREAK case 56: YY_RULE_SETUP -#line 391 "tools\\wpp_new\\ppl.l" +#line 402 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 57: YY_RULE_SETUP -#line 392 "tools\\wpp_new\\ppl.l" +#line 403 "ppl.l" newline(0); YY_BREAK case 58: YY_RULE_SETUP -#line 393 "tools\\wpp_new\\ppl.l" +#line 404 "ppl.l" ppy_error("Identifier expected"); YY_BREAK /* @@ -1796,22 +1808,22 @@ */ case 59: YY_RULE_SETUP -#line 398 "tools\\wpp_new\\ppl.l" +#line 409 "ppl.l" ; YY_BREAK case 60: YY_RULE_SETUP -#line 399 "tools\\wpp_new\\ppl.l" +#line 410 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 61: YY_RULE_SETUP -#line 400 "tools\\wpp_new\\ppl.l" +#line 411 "ppl.l" newline(0); YY_BREAK case 62: YY_RULE_SETUP -#line 401 "tools\\wpp_new\\ppl.l" +#line 412 "ppl.l" ppy_error("Garbage after #else or #endif."); YY_BREAK /* @@ -1821,27 +1833,27 @@ */ case 63: YY_RULE_SETUP -#line 408 "tools\\wpp_new\\ppl.l" +#line 419 "ppl.l" yy_pop_state(); ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; YY_BREAK case 64: YY_RULE_SETUP -#line 409 "tools\\wpp_new\\ppl.l" +#line 420 "ppl.l" ; YY_BREAK case 65: YY_RULE_SETUP -#line 410 "tools\\wpp_new\\ppl.l" +#line 421 "ppl.l" return *ppy_text; YY_BREAK case 66: YY_RULE_SETUP -#line 411 "tools\\wpp_new\\ppl.l" +#line 422 "ppl.l" newline(0); YY_BREAK case 67: YY_RULE_SETUP -#line 412 "tools\\wpp_new\\ppl.l" +#line 423 "ppl.l" ppy_error("Identifier expected"); YY_BREAK /* @@ -1852,27 +1864,27 @@ */ case 68: YY_RULE_SETUP -#line 420 "tools\\wpp_new\\ppl.l" +#line 431 "ppl.l" if(yy_top_state() != pp_ignore) { ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; } YY_BREAK case 69: YY_RULE_SETUP -#line 421 "tools\\wpp_new\\ppl.l" +#line 432 "ppl.l" if(yy_top_state() != pp_ignore) { ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; } YY_BREAK case 70: YY_RULE_SETUP -#line 422 "tools\\wpp_new\\ppl.l" +#line 433 "ppl.l" if(yy_top_state() != pp_ignore) { ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; } YY_BREAK case 71: YY_RULE_SETUP -#line 423 "tools\\wpp_new\\ppl.l" +#line 434 "ppl.l" newline(1); yy_pop_state(); if(yy_current_state() != pp_ignore) { return tNL; } YY_BREAK case 72: YY_RULE_SETUP -#line 424 "tools\\wpp_new\\ppl.l" +#line 435 "ppl.l" newline(0); YY_BREAK /* @@ -1880,27 +1892,27 @@ */ case 73: YY_RULE_SETUP -#line 429 "tools\\wpp_new\\ppl.l" +#line 440 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); ppy_lval.cptr[ppy_leng-1] = '\0'; yy_pp_state(pp_macro); return tMACRO; YY_BREAK case 74: YY_RULE_SETUP -#line 430 "tools\\wpp_new\\ppl.l" +#line 441 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); yy_pp_state(pp_define); return tDEFINE; YY_BREAK case 75: YY_RULE_SETUP -#line 431 "tools\\wpp_new\\ppl.l" +#line 442 "ppl.l" ; YY_BREAK case 76: YY_RULE_SETUP -#line 432 "tools\\wpp_new\\ppl.l" +#line 443 "ppl.l" newline(0); YY_BREAK case 77: YY_RULE_SETUP -#line 433 "tools\\wpp_new\\ppl.l" +#line 444 "ppl.l" perror("Identifier expected"); YY_BREAK /* @@ -1908,37 +1920,37 @@ */ case 78: YY_RULE_SETUP -#line 438 "tools\\wpp_new\\ppl.l" +#line 449 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 79: YY_RULE_SETUP -#line 439 "tools\\wpp_new\\ppl.l" +#line 450 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 80: YY_RULE_SETUP -#line 440 "tools\\wpp_new\\ppl.l" +#line 451 "ppl.l" newline(0); ppy_lval.cptr = pp_xstrdup(" "); return tLITERAL; YY_BREAK case 81: YY_RULE_SETUP -#line 441 "tools\\wpp_new\\ppl.l" +#line 452 "ppl.l" newline(0); YY_BREAK case 82: YY_RULE_SETUP -#line 442 "tools\\wpp_new\\ppl.l" +#line 453 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 83: YY_RULE_SETUP -#line 443 "tools\\wpp_new\\ppl.l" +#line 454 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 84: YY_RULE_SETUP -#line 444 "tools\\wpp_new\\ppl.l" +#line 455 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK /* @@ -1946,37 +1958,37 @@ */ case 85: YY_RULE_SETUP -#line 449 "tools\\wpp_new\\ppl.l" +#line 460 "ppl.l" yy_pp_state(pp_mbody); return tMACROEND; YY_BREAK case 86: YY_RULE_SETUP -#line 450 "tools\\wpp_new\\ppl.l" +#line 461 "ppl.l" ; YY_BREAK case 87: YY_RULE_SETUP -#line 451 "tools\\wpp_new\\ppl.l" +#line 462 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; YY_BREAK case 88: YY_RULE_SETUP -#line 452 "tools\\wpp_new\\ppl.l" +#line 463 "ppl.l" return ','; YY_BREAK case 89: YY_RULE_SETUP -#line 453 "tools\\wpp_new\\ppl.l" +#line 464 "ppl.l" return tELIPSIS; YY_BREAK case 90: YY_RULE_SETUP -#line 454 "tools\\wpp_new\\ppl.l" +#line 465 "ppl.l" ppy_error("Argument identifier expected"); YY_BREAK case 91: YY_RULE_SETUP -#line 455 "tools\\wpp_new\\ppl.l" +#line 466 "ppl.l" newline(0); YY_BREAK /* @@ -1984,57 +1996,57 @@ */ case 92: YY_RULE_SETUP -#line 460 "tools\\wpp_new\\ppl.l" +#line 471 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 93: YY_RULE_SETUP -#line 461 "tools\\wpp_new\\ppl.l" +#line 472 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; YY_BREAK case 94: YY_RULE_SETUP -#line 462 "tools\\wpp_new\\ppl.l" +#line 473 "ppl.l" return tCONCAT; YY_BREAK case 95: YY_RULE_SETUP -#line 463 "tools\\wpp_new\\ppl.l" +#line 474 "ppl.l" return tSTRINGIZE; YY_BREAK case 96: YY_RULE_SETUP -#line 464 "tools\\wpp_new\\ppl.l" +#line 475 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 97: YY_RULE_SETUP -#line 465 "tools\\wpp_new\\ppl.l" +#line 476 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 98: YY_RULE_SETUP -#line 466 "tools\\wpp_new\\ppl.l" +#line 477 "ppl.l" newline(0); ppy_lval.cptr = pp_xstrdup(" "); return tLITERAL; YY_BREAK case 99: YY_RULE_SETUP -#line 467 "tools\\wpp_new\\ppl.l" +#line 478 "ppl.l" newline(0); YY_BREAK case 100: YY_RULE_SETUP -#line 468 "tools\\wpp_new\\ppl.l" +#line 479 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 101: YY_RULE_SETUP -#line 469 "tools\\wpp_new\\ppl.l" +#line 480 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 102: YY_RULE_SETUP -#line 470 "tools\\wpp_new\\ppl.l" +#line 481 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK /* @@ -2051,12 +2063,12 @@ yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 481 "tools\\wpp_new\\ppl.l" +#line 492 "ppl.l" yy_pp_state(pp_macscan); YY_BREAK case 104: YY_RULE_SETUP -#line 482 "tools\\wpp_new\\ppl.l" +#line 493 "ppl.l" { if(yy_top_state() != pp_macscan) newline(0); @@ -2064,12 +2076,12 @@ YY_BREAK case 105: YY_RULE_SETUP -#line 486 "tools\\wpp_new\\ppl.l" +#line 497 "ppl.l" newline(0); YY_BREAK case 106: YY_RULE_SETUP -#line 487 "tools\\wpp_new\\ppl.l" +#line 498 "ppl.l" { macexpstackentry_t *mac = pop_macro(); yy_pop_state(); @@ -2084,7 +2096,7 @@ */ case 107: YY_RULE_SETUP -#line 499 "tools\\wpp_new\\ppl.l" +#line 510 "ppl.l" { if(++MACROPARENTHESES() > 1) add_text_to_macro(ppy_text, ppy_leng); @@ -2092,7 +2104,7 @@ YY_BREAK case 108: YY_RULE_SETUP -#line 503 "tools\\wpp_new\\ppl.l" +#line 514 "ppl.l" { if(--MACROPARENTHESES() == 0) { @@ -2105,7 +2117,7 @@ YY_BREAK case 109: YY_RULE_SETUP -#line 512 "tools\\wpp_new\\ppl.l" +#line 523 "ppl.l" { if(MACROPARENTHESES() > 1) add_text_to_macro(ppy_text, ppy_leng); @@ -2115,32 +2127,32 @@ YY_BREAK case 110: YY_RULE_SETUP -#line 518 "tools\\wpp_new\\ppl.l" +#line 529 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK case 111: YY_RULE_SETUP -#line 519 "tools\\wpp_new\\ppl.l" +#line 530 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 112: YY_RULE_SETUP -#line 520 "tools\\wpp_new\\ppl.l" +#line 531 "ppl.l" yy_push_state(pp_comment); add_text_to_macro(" ", 1); YY_BREAK case 113: YY_RULE_SETUP -#line 521 "tools\\wpp_new\\ppl.l" +#line 532 "ppl.l" pp_status.line_number++; pp_status.char_number = 1; add_text_to_macro(ppy_text, ppy_leng); YY_BREAK case 114: YY_RULE_SETUP -#line 522 "tools\\wpp_new\\ppl.l" +#line 533 "ppl.l" add_text_to_macro(ppy_text, ppy_leng); YY_BREAK case 115: YY_RULE_SETUP -#line 523 "tools\\wpp_new\\ppl.l" +#line 534 "ppl.l" newline(0); YY_BREAK /* @@ -2148,22 +2160,22 @@ */ case 116: YY_RULE_SETUP -#line 528 "tools\\wpp_new\\ppl.l" +#line 539 "ppl.l" yy_push_state(pp_comment); YY_BREAK case 117: YY_RULE_SETUP -#line 529 "tools\\wpp_new\\ppl.l" +#line 540 "ppl.l" ; YY_BREAK case 118: YY_RULE_SETUP -#line 530 "tools\\wpp_new\\ppl.l" +#line 541 "ppl.l" newline(0); YY_BREAK case 119: YY_RULE_SETUP -#line 531 "tools\\wpp_new\\ppl.l" +#line 542 "ppl.l" yy_pop_state(); YY_BREAK /* @@ -2171,7 +2183,7 @@ */ case 120: YY_RULE_SETUP -#line 536 "tools\\wpp_new\\ppl.l" +#line 547 "ppl.l" { if(ppy_text[ppy_leng-1] == '\\') ppy_warning("C++ style comment ends with an escaped newline (escape ignored)"); @@ -2182,22 +2194,22 @@ */ case 121: YY_RULE_SETUP -#line 544 "tools\\wpp_new\\ppl.l" +#line 555 "ppl.l" pp_incl_state.seen_junk++; new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK case 122: YY_RULE_SETUP -#line 545 "tools\\wpp_new\\ppl.l" +#line 556 "ppl.l" pp_incl_state.seen_junk++; new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 123: YY_RULE_SETUP -#line 546 "tools\\wpp_new\\ppl.l" +#line 557 "ppl.l" add_string(ppy_text, ppy_leng); YY_BREAK case 124: YY_RULE_SETUP -#line 547 "tools\\wpp_new\\ppl.l" +#line 558 "ppl.l" { add_string(ppy_text, ppy_leng); yy_pop_state(); @@ -2213,8 +2225,6 @@ return tDQSTRING; case pp_line: ppy_lval.cptr = get_string(); - if (is_c_h_include(ppy_lval.cptr, 1)) pass_data=0; - else pass_data=1; return tDQSTRING; default: put_string(); @@ -2223,12 +2233,12 @@ YY_BREAK case 125: YY_RULE_SETUP -#line 569 "tools\\wpp_new\\ppl.l" +#line 578 "ppl.l" add_string(ppy_text, ppy_leng); YY_BREAK case 126: YY_RULE_SETUP -#line 570 "tools\\wpp_new\\ppl.l" +#line 579 "ppl.l" { add_string(ppy_text, ppy_leng); yy_pop_state(); @@ -2246,12 +2256,12 @@ YY_BREAK case 127: YY_RULE_SETUP -#line 584 "tools\\wpp_new\\ppl.l" +#line 593 "ppl.l" add_string(ppy_text, ppy_leng); YY_BREAK case 128: YY_RULE_SETUP -#line 585 "tools\\wpp_new\\ppl.l" +#line 594 "ppl.l" { add_string(ppy_text, ppy_leng); yy_pop_state(); @@ -2261,7 +2271,7 @@ YY_BREAK case 129: YY_RULE_SETUP -#line 591 "tools\\wpp_new\\ppl.l" +#line 600 "ppl.l" { /* * This is tricky; we need to remove the line-continuation @@ -2289,12 +2299,12 @@ YY_BREAK case 130: YY_RULE_SETUP -#line 615 "tools\\wpp_new\\ppl.l" +#line 624 "ppl.l" add_string(ppy_text, ppy_leng); YY_BREAK case 131: YY_RULE_SETUP -#line 616 "tools\\wpp_new\\ppl.l" +#line 625 "ppl.l" { newline(1); add_string(ppy_text, ppy_leng); @@ -2306,7 +2316,7 @@ */ case 132: YY_RULE_SETUP -#line 625 "tools\\wpp_new\\ppl.l" +#line 634 "ppl.l" { pp_entry_t *ppp; pp_incl_state.seen_junk++; @@ -2355,27 +2365,27 @@ */ case 133: YY_RULE_SETUP -#line 671 "tools\\wpp_new\\ppl.l" +#line 680 "ppl.l" pp_incl_state.seen_junk++; put_buffer(ppy_text, ppy_leng); YY_BREAK case 134: YY_RULE_SETUP -#line 672 "tools\\wpp_new\\ppl.l" +#line 681 "ppl.l" put_buffer(ppy_text, ppy_leng); YY_BREAK case 135: YY_RULE_SETUP -#line 673 "tools\\wpp_new\\ppl.l" +#line 682 "ppl.l" newline(1); YY_BREAK case 136: YY_RULE_SETUP -#line 674 "tools\\wpp_new\\ppl.l" +#line 683 "ppl.l" newline(0); YY_BREAK case 137: YY_RULE_SETUP -#line 675 "tools\\wpp_new\\ppl.l" +#line 684 "ppl.l" pp_incl_state.seen_junk++; put_buffer(ppy_text, ppy_leng); YY_BREAK /* @@ -2384,12 +2394,12 @@ */ case 138: YY_RULE_SETUP -#line 681 "tools\\wpp_new\\ppl.l" +#line 690 "ppl.l" put_buffer(ppy_text, ppy_leng); YY_BREAK case 139: YY_RULE_SETUP -#line 683 "tools\\wpp_new\\ppl.l" +#line 692 "ppl.l" { ppy_lval.cptr=pp_xstrdup(ppy_text); yy_pop_state(); @@ -2398,12 +2408,12 @@ YY_BREAK case 140: YY_RULE_SETUP -#line 689 "tools\\wpp_new\\ppl.l" +#line 698 "ppl.l" ; YY_BREAK case 141: YY_RULE_SETUP -#line 691 "tools\\wpp_new\\ppl.l" +#line 700 "ppl.l" { new_string(); add_string(ppy_text,ppy_leng);yy_push_state(pp_dqs); } @@ -2414,7 +2424,7 @@ */ case 142: YY_RULE_SETUP -#line 699 "tools\\wpp_new\\ppl.l" +#line 708 "ppl.l" pp_incl_state.seen_junk++; ppy_warning("Unmatched text '%c' (0x%02x); please report\n", isprint(*ppy_text & 0xff) ? *ppy_text : ' ', *ppy_text); YY_BREAK case YY_STATE_EOF(INITIAL): @@ -2439,7 +2449,7 @@ case YY_STATE_EOF(pp_defined): case YY_STATE_EOF(pp_ignore): case YY_STATE_EOF(RCINCL): -#line 701 "tools\\wpp_new\\ppl.l" +#line 710 "ppl.l" { YY_BUFFER_STATE b = YY_CURRENT_BUFFER; bufferstackentry_t *bep = pop_buffer(); @@ -2464,10 +2474,10 @@ YY_BREAK case 143: YY_RULE_SETUP -#line 723 "tools\\wpp_new\\ppl.l" +#line 732 "ppl.l" ECHO; YY_BREAK -#line 2471 "tools\\wpp_new\\lex.yy.c" +#line 2481 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -3353,7 +3363,7 @@ return 0; } #endif -#line 723 "tools\\wpp_new\\ppl.l" +#line 732 "ppl.l" /* ************************************************************************** @@ -3425,6 +3435,7 @@ int is_ll = 0; int is_u = 0; char ext[4]; + long l; ext[3] = '\0'; ext[2] = toupper(str[len-1]); @@ -3462,12 +3473,18 @@ #ifdef HAVE_LONG_LONG if (is_u) { + errno = 0; val->ull = strtoull(str, NULL, radix); + if (val->ull == ULLONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONGLONG; } else { + errno = 0; val->sll = strtoll(str, NULL, radix); + if ((val->sll == LLONG_MIN || val->sll == LLONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONGLONG; } #else @@ -3476,22 +3493,38 @@ } else if(is_u && is_l) { + errno = 0; val->ulong = strtoul(str, NULL, radix); + if (val->ulong == ULONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONG; } else if(!is_u && is_l) { + errno = 0; val->slong = strtol(str, NULL, radix); + if ((val->slong == LONG_MIN || val->slong == LONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONG; } else if(is_u && !is_l) { - val->uint = (unsigned int)strtoul(str, NULL, radix); + unsigned long ul; + errno = 0; + ul = strtoul(str, NULL, radix); + if ((ul == ULONG_MAX && errno == ERANGE) || (ul > UINT_MAX)) + ppy_error("integer constant %s is too large\n", str); + val->uint = (unsigned int)ul; return tUINT; } /* Else it must be an int... */ - val->sint = (int)strtol(str, NULL, radix); + errno = 0; + l = strtol(str, NULL, radix); + if (((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) || + (l > INT_MAX) || (l < INT_MIN)) + ppy_error("integer constant %s is too large\n", str); + val->sint = (int)l; return tSINT; } @@ -3825,7 +3858,6 @@ bufferstack[bufferstackidx].ncontinuations = ncontinuations; bufferstack[bufferstackidx].incl = pp_incl_state; bufferstack[bufferstackidx].include_filename = incname; - bufferstack[bufferstackidx].pass_data = pass_data; if(ppp) ppp->expanding = 1; @@ -3888,7 +3920,6 @@ } free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; - pass_data = bufferstack[bufferstackidx].pass_data; } } @@ -4044,10 +4075,8 @@ { if(top_macro()) add_text_to_macro(s, len); - else { - if(pass_data) + else fwrite(s, 1, len, ppy_out); - } } @@ -4056,15 +4085,6 @@ * Include management *------------------------------------------------------------------------- */ -static int is_c_h_include(char *fname, int quoted) -{ - int sl=strlen(fname); - if (sl < 2 + 2 * quoted) return 0; - if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0; - if (fname[sl-2-quoted]!='.') return 0; - return 1; -} - void pp_do_include(char *fname, int type) { char *newpath; @@ -4100,12 +4120,10 @@ pp_incl_state.seen_junk = 0; pp_incl_state.state = 0; pp_incl_state.ppp = NULL; - if (is_c_h_include(newpath, 0)) pass_data=0; - else pass_data=1; if(pp_status.debug) - fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d ,pass_data=%d\n", - pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth, pass_data); + fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", + pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); ppy__switch_to_buffer(ppy__create_buffer(ppy_in, YY_BUF_SIZE)); fprintf(ppy_out, "# 1 \"%s\" 1%s\n", newpath, type ? "" : " 3"); Modified: trunk/reactos/tools/wpp/ppl.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppl.l?rev=37204&… ============================================================================== --- trunk/reactos/tools/wpp/ppl.l [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppl.l [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -126,7 +126,7 @@ */ %option stack %option 8bit never-interactive -%option nounput +%option noinput nounput %option prefix="ppy_" %x pp_pp @@ -156,12 +156,27 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ -#include <config.h> +#include "config.h" +#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <assert.h> +#include <errno.h> +#include <limits.h> + +#ifndef LLONG_MAX +# define LLONG_MAX ((long long)0x7fffffff << 32 | 0xffffffff) +# define LLONG_MIN (-LLONG_MAX - 1) +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ((long long)0xffffffff << 32 | 0xffffffff) +#endif + +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif #include "wpp_private.h" #include "ppy.tab.h" @@ -200,7 +215,6 @@ /* Include management */ include_state_t incl; char *include_filename; - int pass_data; } bufferstackentry_t; #define ALLOCBLOCKSIZE (1 << 10) /* Allocate these chunks at a time for string-buffers */ @@ -233,7 +247,6 @@ static void newline(int); static int make_number(int radix, YYSTYPE *val, const char *str, int len); static void put_buffer(const char *s, int len); -static int is_c_h_include(char *fname, int quoted); /* Buffer management */ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop); static bufferstackentry_t *pop_buffer(void); @@ -272,8 +285,6 @@ static bufferstackentry_t bufferstack[MAXBUFFERSTACK]; static int bufferstackidx = 0; -static int pass_data=1; - /* * Global variables */ @@ -559,8 +570,6 @@ return tDQSTRING; case pp_line: ppy_lval.cptr = get_string(); - if (is_c_h_include(ppy_lval.cptr, 1)) pass_data=0; - else pass_data=1; return tDQSTRING; default: put_string(); @@ -791,6 +800,7 @@ int is_ll = 0; int is_u = 0; char ext[4]; + long l; ext[3] = '\0'; ext[2] = toupper(str[len-1]); @@ -828,12 +838,18 @@ #ifdef HAVE_LONG_LONG if (is_u) { + errno = 0; val->ull = strtoull(str, NULL, radix); + if (val->ull == ULLONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONGLONG; } else { + errno = 0; val->sll = strtoll(str, NULL, radix); + if ((val->sll == LLONG_MIN || val->sll == LLONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONGLONG; } #else @@ -842,22 +858,38 @@ } else if(is_u && is_l) { + errno = 0; val->ulong = strtoul(str, NULL, radix); + if (val->ulong == ULONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONG; } else if(!is_u && is_l) { + errno = 0; val->slong = strtol(str, NULL, radix); + if ((val->slong == LONG_MIN || val->slong == LONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONG; } else if(is_u && !is_l) { - val->uint = (unsigned int)strtoul(str, NULL, radix); + unsigned long ul; + errno = 0; + ul = strtoul(str, NULL, radix); + if ((ul == ULONG_MAX && errno == ERANGE) || (ul > UINT_MAX)) + ppy_error("integer constant %s is too large\n", str); + val->uint = (unsigned int)ul; return tUINT; } /* Else it must be an int... */ - val->sint = (int)strtol(str, NULL, radix); + errno = 0; + l = strtol(str, NULL, radix); + if (((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) || + (l > INT_MAX) || (l < INT_MIN)) + ppy_error("integer constant %s is too large\n", str); + val->sint = (int)l; return tSINT; } @@ -1191,7 +1223,6 @@ bufferstack[bufferstackidx].ncontinuations = ncontinuations; bufferstack[bufferstackidx].incl = pp_incl_state; bufferstack[bufferstackidx].include_filename = incname; - bufferstack[bufferstackidx].pass_data = pass_data; if(ppp) ppp->expanding = 1; @@ -1254,7 +1285,6 @@ } free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; - pass_data = bufferstack[bufferstackidx].pass_data; } } @@ -1410,10 +1440,8 @@ { if(top_macro()) add_text_to_macro(s, len); - else { - if(pass_data) + else fwrite(s, 1, len, ppy_out); - } } @@ -1422,15 +1450,6 @@ * Include management *------------------------------------------------------------------------- */ -static int is_c_h_include(char *fname, int quoted) -{ - int sl=strlen(fname); - if (sl < 2 + 2 * quoted) return 0; - if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0; - if (fname[sl-2-quoted]!='.') return 0; - return 1; -} - void pp_do_include(char *fname, int type) { char *newpath; @@ -1466,12 +1485,10 @@ pp_incl_state.seen_junk = 0; pp_incl_state.state = 0; pp_incl_state.ppp = NULL; - if (is_c_h_include(newpath, 0)) pass_data=0; - else pass_data=1; if(pp_status.debug) - fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d ,pass_data=%d\n", - pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth, pass_data); + fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", + pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); ppy__switch_to_buffer(ppy__create_buffer(ppy_in, YY_BUF_SIZE)); fprintf(ppy_out, "# 1 \"%s\" 1%s\n", newpath, type ? "" : " 3"); Modified: trunk/reactos/tools/wpp/ppy.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.tab.c?rev=37… ============================================================================== --- trunk/reactos/tools/wpp/ppy.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppy.tab.c [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -158,7 +158,7 @@ /* Copy the first part of user declarations. */ -#line 30 "tools\\wpp_new\\ppy.y" +#line 30 "ppy.y" #include "config.h" #include "wine/port.h" @@ -274,7 +274,7 @@ #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 126 "tools\\wpp_new\\ppy.y" +#line 126 "ppy.y" typedef union YYSTYPE { int sint; unsigned int uint; @@ -289,7 +289,7 @@ mtext_t *mtext; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 293 "tools\\wpp_new\\ppy.tab.c" +#line 293 "ppy.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -301,7 +301,7 @@ /* Line 219 of yacc.c. */ -#line 305 "tools\\wpp_new\\ppy.tab.c" +#line 305 "ppy.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -1214,7 +1214,7 @@ #endif #endif { - + int yystate; int yyn; int yyresult; @@ -1457,27 +1457,27 @@ switch (yyn) { case 4: -#line 186 "tools\\wpp_new\\ppy.y" +#line 186 "ppy.y" { pp_do_include((yyvsp[-1].cptr), 1); ;} break; case 5: -#line 187 "tools\\wpp_new\\ppy.y" +#line 187 "ppy.y" { pp_do_include((yyvsp[-1].cptr), 0); ;} break; case 6: -#line 188 "tools\\wpp_new\\ppy.y" +#line 188 "ppy.y" { pp_next_if_state(boolean(&(yyvsp[-1].cval))); ;} break; case 7: -#line 189 "tools\\wpp_new\\ppy.y" +#line 189 "ppy.y" { pp_next_if_state(pplookup((yyvsp[-1].cptr)) != NULL); free((yyvsp[-1].cptr)); ;} break; case 8: -#line 190 "tools\\wpp_new\\ppy.y" +#line 190 "ppy.y" { int t = pplookup((yyvsp[-1].cptr)) == NULL; if(pp_incl_state.state == 0 && t && !pp_incl_state.seen_junk) @@ -1501,7 +1501,7 @@ break; case 9: -#line 210 "tools\\wpp_new\\ppy.y" +#line 210 "ppy.y" { pp_if_state_t s = pp_pop_if(); switch(s) @@ -1526,7 +1526,7 @@ break; case 10: -#line 231 "tools\\wpp_new\\ppy.y" +#line 231 "ppy.y" { pp_if_state_t s = pp_pop_if(); switch(s) @@ -1553,7 +1553,7 @@ break; case 11: -#line 254 "tools\\wpp_new\\ppy.y" +#line 254 "ppy.y" { pp_pop_if(); if(pp_incl_state.ifdepth == pp_get_if_depth() && pp_incl_state.state == 1) @@ -1572,74 +1572,74 @@ break; case 12: -#line 269 "tools\\wpp_new\\ppy.y" +#line 269 "ppy.y" { pp_del_define((yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 13: -#line 270 "tools\\wpp_new\\ppy.y" +#line 270 "ppy.y" { pp_add_define((yyvsp[-2].cptr), (yyvsp[-1].cptr)); ;} break; case 14: -#line 271 "tools\\wpp_new\\ppy.y" +#line 271 "ppy.y" { pp_add_macro((yyvsp[-5].cptr), macro_args, nmacro_args, (yyvsp[-1].mtext)); ;} break; case 15: -#line 274 "tools\\wpp_new\\ppy.y" +#line 274 "ppy.y" { fprintf(ppy_out, "# %d %s\n", (yyvsp[-2].sint) , (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 16: -#line 275 "tools\\wpp_new\\ppy.y" +#line 275 "ppy.y" { fprintf(ppy_out, "# %d %s\n", (yyvsp[-2].sint) , (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 17: -#line 277 "tools\\wpp_new\\ppy.y" +#line 277 "ppy.y" { fprintf(ppy_out, "# %d %s %d\n", (yyvsp[-3].sint), (yyvsp[-2].cptr), (yyvsp[-1].sint)); free((yyvsp[-2].cptr)); ;} break; case 18: -#line 279 "tools\\wpp_new\\ppy.y" +#line 279 "ppy.y" { fprintf(ppy_out, "# %d %s %d %d\n", (yyvsp[-4].sint) ,(yyvsp[-3].cptr), (yyvsp[-2].sint), (yyvsp[-1].sint)); free((yyvsp[-3].cptr)); ;} break; case 19: -#line 281 "tools\\wpp_new\\ppy.y" +#line 281 "ppy.y" { fprintf(ppy_out, "# %d %s %d %d %d\n", (yyvsp[-5].sint) ,(yyvsp[-4].cptr) ,(yyvsp[-3].sint) ,(yyvsp[-2].sint), (yyvsp[-1].sint)); free((yyvsp[-4].cptr)); ;} break; case 20: -#line 283 "tools\\wpp_new\\ppy.y" +#line 283 "ppy.y" { fprintf(ppy_out, "# %d %s %d %d %d %d\n", (yyvsp[-6].sint) ,(yyvsp[-5].cptr) ,(yyvsp[-4].sint) ,(yyvsp[-3].sint), (yyvsp[-2].sint), (yyvsp[-1].sint)); free((yyvsp[-5].cptr)); ;} break; case 22: -#line 285 "tools\\wpp_new\\ppy.y" - { ppy_error("#error directive: '%s'", (yyvsp[-1].cptr)); if((yyvsp[-1].cptr)) free((yyvsp[-1].cptr)); ;} +#line 285 "ppy.y" + { ppy_error("#error directive: '%s'", (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 23: -#line 286 "tools\\wpp_new\\ppy.y" - { ppy_warning("#warning directive: '%s'", (yyvsp[-1].cptr)); if((yyvsp[-1].cptr)) free((yyvsp[-1].cptr)); ;} +#line 286 "ppy.y" + { ppy_warning("#warning directive: '%s'", (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 24: -#line 287 "tools\\wpp_new\\ppy.y" - { fprintf(ppy_out, "#pragma %s\n", (yyvsp[-1].cptr) ? (yyvsp[-1].cptr) : ""); if ((yyvsp[-1].cptr)) free((yyvsp[-1].cptr)); ;} +#line 287 "ppy.y" + { fprintf(ppy_out, "#pragma %s\n", (yyvsp[-1].cptr) ? (yyvsp[-1].cptr) : ""); free((yyvsp[-1].cptr)); ;} break; case 25: -#line 288 "tools\\wpp_new\\ppy.y" - { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", (yyvsp[-1].cptr)); if((yyvsp[-1].cptr)) free((yyvsp[-1].cptr)); ;} +#line 288 "ppy.y" + { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 26: -#line 289 "tools\\wpp_new\\ppy.y" +#line 289 "ppy.y" { int nl=strlen((yyvsp[0].cptr)) +3; char *fn=pp_xmalloc(nl); @@ -1650,94 +1650,94 @@ break; case 27: -#line 296 "tools\\wpp_new\\ppy.y" +#line 296 "ppy.y" { pp_do_include((yyvsp[0].cptr),1); ;} break; case 28: -#line 302 "tools\\wpp_new\\ppy.y" +#line 302 "ppy.y" { (yyval.cptr) = NULL; ;} break; case 29: -#line 303 "tools\\wpp_new\\ppy.y" +#line 303 "ppy.y" { (yyval.cptr) = (yyvsp[0].cptr); ;} break; case 30: -#line 306 "tools\\wpp_new\\ppy.y" +#line 306 "ppy.y" { (yyval.cptr) = (yyvsp[0].cptr); ;} break; case 31: -#line 307 "tools\\wpp_new\\ppy.y" +#line 307 "ppy.y" { (yyval.cptr) = (yyvsp[0].cptr); ;} break; case 32: -#line 308 "tools\\wpp_new\\ppy.y" +#line 308 "ppy.y" { (yyval.cptr) = (yyvsp[0].cptr); ;} break; case 33: -#line 309 "tools\\wpp_new\\ppy.y" +#line 309 "ppy.y" { (yyval.cptr) = merge_text((yyvsp[-1].cptr), (yyvsp[0].cptr)); ;} break; case 34: -#line 310 "tools\\wpp_new\\ppy.y" +#line 310 "ppy.y" { (yyval.cptr) = merge_text((yyvsp[-1].cptr), (yyvsp[0].cptr)); ;} break; case 35: -#line 311 "tools\\wpp_new\\ppy.y" +#line 311 "ppy.y" { (yyval.cptr) = merge_text((yyvsp[-1].cptr), (yyvsp[0].cptr)); ;} break; case 36: -#line 314 "tools\\wpp_new\\ppy.y" +#line 314 "ppy.y" { macro_args = NULL; nmacro_args = 0; ;} break; case 37: -#line 317 "tools\\wpp_new\\ppy.y" +#line 317 "ppy.y" { (yyval.sint) = 0; macro_args = NULL; nmacro_args = 0; ;} break; case 38: -#line 318 "tools\\wpp_new\\ppy.y" +#line 318 "ppy.y" { (yyval.sint) = nmacro_args; ;} break; case 39: -#line 321 "tools\\wpp_new\\ppy.y" +#line 321 "ppy.y" { (yyval.marg) = (yyvsp[0].marg); ;} break; case 40: -#line 322 "tools\\wpp_new\\ppy.y" +#line 322 "ppy.y" { (yyval.marg) = add_new_marg(NULL, arg_list); nmacro_args *= -1; ;} break; case 41: -#line 325 "tools\\wpp_new\\ppy.y" +#line 325 "ppy.y" { (yyval.marg) = add_new_marg((yyvsp[0].cptr), arg_single); ;} break; case 42: -#line 326 "tools\\wpp_new\\ppy.y" +#line 326 "ppy.y" { (yyval.marg) = add_new_marg((yyvsp[0].cptr), arg_single); ;} break; case 43: -#line 330 "tools\\wpp_new\\ppy.y" +#line 330 "ppy.y" { (yyval.mtext) = NULL; ;} break; case 44: -#line 331 "tools\\wpp_new\\ppy.y" +#line 331 "ppy.y" { for((yyval.mtext) = (yyvsp[0].mtext); (yyval.mtext) && (yyval.mtext)->prev; (yyval.mtext) = (yyval.mtext)->prev) ; @@ -1745,37 +1745,37 @@ break; case 45: -#line 337 "tools\\wpp_new\\ppy.y" +#line 337 "ppy.y" { (yyval.mtext) = (yyvsp[0].mtext); ;} break; case 46: -#line 338 "tools\\wpp_new\\ppy.y" +#line 338 "ppy.y" { (yyval.mtext) = combine_mtext((yyvsp[-1].mtext), (yyvsp[0].mtext)); ;} break; case 47: -#line 341 "tools\\wpp_new\\ppy.y" +#line 341 "ppy.y" { (yyval.mtext) = new_mtext((yyvsp[0].cptr), 0, exp_text); ;} break; case 48: -#line 342 "tools\\wpp_new\\ppy.y" +#line 342 "ppy.y" { (yyval.mtext) = new_mtext((yyvsp[0].cptr), 0, exp_text); ;} break; case 49: -#line 343 "tools\\wpp_new\\ppy.y" +#line 343 "ppy.y" { (yyval.mtext) = new_mtext((yyvsp[0].cptr), 0, exp_text); ;} break; case 50: -#line 344 "tools\\wpp_new\\ppy.y" +#line 344 "ppy.y" { (yyval.mtext) = new_mtext(NULL, 0, exp_concat); ;} break; case 51: -#line 345 "tools\\wpp_new\\ppy.y" +#line 345 "ppy.y" { int mat = marg_index((yyvsp[0].cptr)); if(mat < 0) @@ -1785,7 +1785,7 @@ break; case 52: -#line 351 "tools\\wpp_new\\ppy.y" +#line 351 "ppy.y" { int mat = marg_index((yyvsp[0].cptr)); if(mat >= 0) @@ -1796,162 +1796,162 @@ break; case 53: -#line 360 "tools\\wpp_new\\ppy.y" +#line 360 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = (yyvsp[0].sint); ;} break; case 54: -#line 361 "tools\\wpp_new\\ppy.y" +#line 361 "ppy.y" { (yyval.cval).type = cv_uint; (yyval.cval).val.ui = (yyvsp[0].uint); ;} break; case 55: -#line 362 "tools\\wpp_new\\ppy.y" +#line 362 "ppy.y" { (yyval.cval).type = cv_slong; (yyval.cval).val.sl = (yyvsp[0].slong); ;} break; case 56: -#line 363 "tools\\wpp_new\\ppy.y" +#line 363 "ppy.y" { (yyval.cval).type = cv_ulong; (yyval.cval).val.ul = (yyvsp[0].ulong); ;} break; case 57: -#line 364 "tools\\wpp_new\\ppy.y" +#line 364 "ppy.y" { (yyval.cval).type = cv_sll; (yyval.cval).val.sll = (yyvsp[0].sll); ;} break; case 58: -#line 365 "tools\\wpp_new\\ppy.y" +#line 365 "ppy.y" { (yyval.cval).type = cv_ull; (yyval.cval).val.ull = (yyvsp[0].ull); ;} break; case 59: -#line 366 "tools\\wpp_new\\ppy.y" +#line 366 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = pplookup((yyvsp[0].cptr)) != NULL; ;} break; case 60: -#line 367 "tools\\wpp_new\\ppy.y" +#line 367 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = pplookup((yyvsp[-1].cptr)) != NULL; ;} break; case 61: -#line 368 "tools\\wpp_new\\ppy.y" +#line 368 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = 0; ;} break; case 62: -#line 369 "tools\\wpp_new\\ppy.y" +#line 369 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = boolean(&(yyvsp[-2].cval)) || boolean(&(yyvsp[0].cval)); ;} break; case 63: -#line 370 "tools\\wpp_new\\ppy.y" +#line 370 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = boolean(&(yyvsp[-2].cval)) && boolean(&(yyvsp[0].cval)); ;} break; case 64: -#line 371 "tools\\wpp_new\\ppy.y" +#line 371 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), ==) ;} break; case 65: -#line 372 "tools\\wpp_new\\ppy.y" +#line 372 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), !=) ;} break; case 66: -#line 373 "tools\\wpp_new\\ppy.y" +#line 373 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), <) ;} break; case 67: -#line 374 "tools\\wpp_new\\ppy.y" +#line 374 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), >) ;} break; case 68: -#line 375 "tools\\wpp_new\\ppy.y" +#line 375 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), <=) ;} break; case 69: -#line 376 "tools\\wpp_new\\ppy.y" +#line 376 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), >=) ;} break; case 70: -#line 377 "tools\\wpp_new\\ppy.y" +#line 377 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), +) ;} break; case 71: -#line 378 "tools\\wpp_new\\ppy.y" +#line 378 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), -) ;} break; case 72: -#line 379 "tools\\wpp_new\\ppy.y" +#line 379 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), ^) ;} break; case 73: -#line 380 "tools\\wpp_new\\ppy.y" +#line 380 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), &) ;} break; case 74: -#line 381 "tools\\wpp_new\\ppy.y" +#line 381 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), |) ;} break; case 75: -#line 382 "tools\\wpp_new\\ppy.y" +#line 382 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), *) ;} break; case 76: -#line 383 "tools\\wpp_new\\ppy.y" +#line 383 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), /) ;} break; case 77: -#line 384 "tools\\wpp_new\\ppy.y" +#line 384 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), <<) ;} break; case 78: -#line 385 "tools\\wpp_new\\ppy.y" +#line 385 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), >>) ;} break; case 79: -#line 386 "tools\\wpp_new\\ppy.y" +#line 386 "ppy.y" { (yyval.cval) = (yyvsp[0].cval); ;} break; case 80: -#line 387 "tools\\wpp_new\\ppy.y" +#line 387 "ppy.y" { UNARY_OP((yyval.cval), (yyvsp[0].cval), -) ;} break; case 81: -#line 388 "tools\\wpp_new\\ppy.y" +#line 388 "ppy.y" { UNARY_OP((yyval.cval), (yyvsp[0].cval), ~) ;} break; case 82: -#line 389 "tools\\wpp_new\\ppy.y" +#line 389 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = !boolean(&(yyvsp[0].cval)); ;} break; case 83: -#line 390 "tools\\wpp_new\\ppy.y" +#line 390 "ppy.y" { (yyval.cval) = (yyvsp[-1].cval); ;} break; case 84: -#line 391 "tools\\wpp_new\\ppy.y" +#line 391 "ppy.y" { (yyval.cval) = boolean(&(yyvsp[-4].cval)) ? (yyvsp[-2].cval) : (yyvsp[0].cval); ;} break; @@ -1960,7 +1960,7 @@ } /* Line 1126 of yacc.c. */ -#line 1964 "tools\\wpp_new\\ppy.tab.c" +#line 1964 "ppy.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -2228,7 +2228,7 @@ } -#line 394 "tools\\wpp_new\\ppy.y" +#line 394 "ppy.y" /* Modified: trunk/reactos/tools/wpp/ppy.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.tab.h?rev=37… ============================================================================== --- trunk/reactos/tools/wpp/ppy.tab.h [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppy.tab.h [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -123,7 +123,7 @@ #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 126 "tools\\wpp_new\\ppy.y" +#line 126 "ppy.y" typedef union YYSTYPE { int sint; unsigned int uint; @@ -138,7 +138,7 @@ mtext_t *mtext; } YYSTYPE; /* Line 1447 of yacc.c. */ -#line 142 "tools\\wpp_new\\ppy.tab.h" +#line 142 "ppy.tab.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 Modified: trunk/reactos/tools/wpp/ppy.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.y?rev=37204&… ============================================================================== --- trunk/reactos/tools/wpp/ppy.y [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppy.y [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -282,10 +282,10 @@ | tGCCLINE tSINT tDQSTRING tSINT tSINT tSINT tSINT tNL { fprintf(ppy_out, "# %d %s %d %d %d %d\n", $2 ,$3 ,$4 ,$5, $6, $7); free($3); } | tGCCLINE tNL /* The null-token */ - | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); if($2) free($2); } - | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); if($2) free($2); } - | tPRAGMA opt_text tNL { fprintf(ppy_out, "#pragma %s\n", $2 ? $2 : ""); if ($2) free($2); } - | tPPIDENT opt_text tNL { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", $2); if($2) free($2); } + | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); free($2); } + | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); free($2); } + | tPRAGMA opt_text tNL { fprintf(ppy_out, "#pragma %s\n", $2 ? $2 : ""); free($2); } + | tPPIDENT opt_text tNL { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", $2); free($2); } | tRCINCLUDE tRCINCLUDEPATH { int nl=strlen($2) +3; char *fn=pp_xmalloc(nl); Modified: trunk/reactos/tools/wpp/wpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.c?rev=37204&… ============================================================================== --- trunk/reactos/tools/wpp/wpp.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/wpp.c [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -1,7 +1,7 @@ /* * Exported functions of the Wine preprocessor * - * Copyrignt 1998 Bertho A. Stultiens + * Copyright 1998 Bertho A. Stultiens * Copyright 2002 Alexandre Julliard * * This library is free software; you can redistribute it and/or Modified: trunk/reactos/tools/wpp/wpp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp_private.h?re… ============================================================================== --- trunk/reactos/tools/wpp/wpp_private.h [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/wpp_private.h [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -181,7 +181,7 @@ ctype_t type; union { #if 0 - signed char sc; /* Explicitely signed because compilers are stupid */ + signed char sc; /* Explicitly signed because compilers are stupid */ unsigned char uc; short ss; unsigned short us;

1 0

[fireball] 37203: - Update unicode lib to Wine-20081105 (~1.1.7 release).
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 15:35:45 2008 New Revision: 37203 URL: http://svn.reactos.org/svn/reactos?rev=37203&view=rev Log: - Update unicode lib to Wine-20081105 (~1.1.7 release). Added: trunk/reactos/tools/unicode/c_1361.c (with props) trunk/reactos/tools/unicode/c_20127.c (with props) Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/unicode/Makefile.in trunk/reactos/tools/unicode/c_037.c trunk/reactos/tools/unicode/c_10000.c trunk/reactos/tools/unicode/c_10006.c trunk/reactos/tools/unicode/c_10007.c trunk/reactos/tools/unicode/c_10029.c trunk/reactos/tools/unicode/c_1006.c trunk/reactos/tools/unicode/c_10079.c trunk/reactos/tools/unicode/c_10081.c trunk/reactos/tools/unicode/c_1026.c trunk/reactos/tools/unicode/c_1250.c trunk/reactos/tools/unicode/c_1251.c trunk/reactos/tools/unicode/c_1252.c trunk/reactos/tools/unicode/c_1253.c trunk/reactos/tools/unicode/c_1254.c trunk/reactos/tools/unicode/c_1255.c trunk/reactos/tools/unicode/c_1256.c trunk/reactos/tools/unicode/c_1257.c trunk/reactos/tools/unicode/c_1258.c trunk/reactos/tools/unicode/c_20866.c trunk/reactos/tools/unicode/c_21866.c trunk/reactos/tools/unicode/c_28591.c trunk/reactos/tools/unicode/c_28592.c trunk/reactos/tools/unicode/c_28593.c trunk/reactos/tools/unicode/c_28594.c trunk/reactos/tools/unicode/c_28595.c trunk/reactos/tools/unicode/c_28596.c trunk/reactos/tools/unicode/c_28597.c trunk/reactos/tools/unicode/c_28598.c trunk/reactos/tools/unicode/c_28599.c trunk/reactos/tools/unicode/c_28600.c trunk/reactos/tools/unicode/c_28603.c trunk/reactos/tools/unicode/c_28604.c trunk/reactos/tools/unicode/c_28605.c trunk/reactos/tools/unicode/c_28606.c trunk/reactos/tools/unicode/c_424.c trunk/reactos/tools/unicode/c_437.c trunk/reactos/tools/unicode/c_500.c trunk/reactos/tools/unicode/c_737.c trunk/reactos/tools/unicode/c_775.c trunk/reactos/tools/unicode/c_850.c trunk/reactos/tools/unicode/c_852.c trunk/reactos/tools/unicode/c_855.c trunk/reactos/tools/unicode/c_856.c trunk/reactos/tools/unicode/c_857.c trunk/reactos/tools/unicode/c_860.c trunk/reactos/tools/unicode/c_861.c trunk/reactos/tools/unicode/c_862.c trunk/reactos/tools/unicode/c_863.c trunk/reactos/tools/unicode/c_864.c trunk/reactos/tools/unicode/c_865.c trunk/reactos/tools/unicode/c_866.c trunk/reactos/tools/unicode/c_869.c trunk/reactos/tools/unicode/c_874.c trunk/reactos/tools/unicode/c_875.c trunk/reactos/tools/unicode/c_878.c trunk/reactos/tools/unicode/casemap.c trunk/reactos/tools/unicode/compose.c trunk/reactos/tools/unicode/cpmap.pl trunk/reactos/tools/unicode/cptable.c trunk/reactos/tools/unicode/mbtowc.c trunk/reactos/tools/unicode/sortkey.c trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/unicode.rbuild trunk/reactos/tools/unicode/utf8.c trunk/reactos/tools/unicode/wctomb.c trunk/reactos/tools/unicode/wctype.c trunk/reactos/tools/unicode/wine/unicode.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/unicode/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/Makefile.in?… Modified: trunk/reactos/tools/unicode/c_037.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_037.c?rev=… Modified: trunk/reactos/tools/unicode/c_10000.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10000.c?re… Modified: trunk/reactos/tools/unicode/c_10006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10006.c?re… Modified: trunk/reactos/tools/unicode/c_10007.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10007.c?re… Modified: trunk/reactos/tools/unicode/c_10029.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10029.c?re… Modified: trunk/reactos/tools/unicode/c_1006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1006.c?rev… Modified: trunk/reactos/tools/unicode/c_10079.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10079.c?re… Modified: trunk/reactos/tools/unicode/c_10081.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10081.c?re… Modified: trunk/reactos/tools/unicode/c_1026.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1026.c?rev… Modified: trunk/reactos/tools/unicode/c_1250.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1250.c?rev… Modified: trunk/reactos/tools/unicode/c_1251.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1251.c?rev… Modified: trunk/reactos/tools/unicode/c_1252.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1252.c?rev… Modified: trunk/reactos/tools/unicode/c_1253.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1253.c?rev… Modified: trunk/reactos/tools/unicode/c_1254.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1254.c?rev… Modified: trunk/reactos/tools/unicode/c_1255.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1255.c?rev… Modified: trunk/reactos/tools/unicode/c_1256.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1256.c?rev… Modified: trunk/reactos/tools/unicode/c_1257.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1257.c?rev… Modified: trunk/reactos/tools/unicode/c_1258.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1258.c?rev… Added: trunk/reactos/tools/unicode/c_1361.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1361.c?rev… Added: trunk/reactos/tools/unicode/c_20127.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20127.c?re… Modified: trunk/reactos/tools/unicode/c_20866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20866.c?re… Modified: trunk/reactos/tools/unicode/c_21866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_21866.c?re… Modified: trunk/reactos/tools/unicode/c_28591.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28591.c?re… Modified: trunk/reactos/tools/unicode/c_28592.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28592.c?re… Modified: trunk/reactos/tools/unicode/c_28593.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28593.c?re… Modified: trunk/reactos/tools/unicode/c_28594.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28594.c?re… Modified: trunk/reactos/tools/unicode/c_28595.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28595.c?re… Modified: trunk/reactos/tools/unicode/c_28596.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28596.c?re… Modified: trunk/reactos/tools/unicode/c_28597.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28597.c?re… Modified: trunk/reactos/tools/unicode/c_28598.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28598.c?re… Modified: trunk/reactos/tools/unicode/c_28599.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28599.c?re… Modified: trunk/reactos/tools/unicode/c_28600.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28600.c?re… Modified: trunk/reactos/tools/unicode/c_28603.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28603.c?re… Modified: trunk/reactos/tools/unicode/c_28604.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28604.c?re… Modified: trunk/reactos/tools/unicode/c_28605.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28605.c?re… Modified: trunk/reactos/tools/unicode/c_28606.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28606.c?re… Modified: trunk/reactos/tools/unicode/c_424.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_424.c?rev=… Modified: trunk/reactos/tools/unicode/c_437.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_437.c?rev=… Modified: trunk/reactos/tools/unicode/c_500.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_500.c?rev=… Modified: trunk/reactos/tools/unicode/c_737.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_737.c?rev=… Modified: trunk/reactos/tools/unicode/c_775.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_775.c?rev=… Modified: trunk/reactos/tools/unicode/c_850.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_850.c?rev=… Modified: trunk/reactos/tools/unicode/c_852.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_852.c?rev=… Modified: trunk/reactos/tools/unicode/c_855.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_855.c?rev=… Modified: trunk/reactos/tools/unicode/c_856.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_856.c?rev=… Modified: trunk/reactos/tools/unicode/c_857.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_857.c?rev=… Modified: trunk/reactos/tools/unicode/c_860.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_860.c?rev=… Modified: trunk/reactos/tools/unicode/c_861.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_861.c?rev=… Modified: trunk/reactos/tools/unicode/c_862.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_862.c?rev=… Modified: trunk/reactos/tools/unicode/c_863.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_863.c?rev=… Modified: trunk/reactos/tools/unicode/c_864.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_864.c?rev=… Modified: trunk/reactos/tools/unicode/c_865.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_865.c?rev=… Modified: trunk/reactos/tools/unicode/c_866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_866.c?rev=… Modified: trunk/reactos/tools/unicode/c_869.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_869.c?rev=… Modified: trunk/reactos/tools/unicode/c_874.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_874.c?rev=… Modified: trunk/reactos/tools/unicode/c_875.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_875.c?rev=… Modified: trunk/reactos/tools/unicode/c_878.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_878.c?rev=… Modified: trunk/reactos/tools/unicode/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/casemap.c?re… Modified: trunk/reactos/tools/unicode/compose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/compose.c?re… Modified: trunk/reactos/tools/unicode/cpmap.pl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cpmap.pl?rev… Modified: trunk/reactos/tools/unicode/cptable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cptable.c?re… Modified: trunk/reactos/tools/unicode/mbtowc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/mbtowc.c?rev… Modified: trunk/reactos/tools/unicode/sortkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/sortkey.c?re… Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… Modified: trunk/reactos/tools/unicode/unicode.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.rbui… Modified: trunk/reactos/tools/unicode/utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/utf8.c?rev=3… Modified: trunk/reactos/tools/unicode/wctomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctomb.c?rev… Modified: trunk/reactos/tools/unicode/wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctype.c?rev… Modified: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wine/unicode…

1 0

[fireball] 37239: - Import rpcss from Wine. It has a serious disadvantage: it's not a real service, but a simple exe app, which (in ReactOS) just infinitely waits after being started. In order to turn it into a real startable/stoppable service, ole32 needs to be modified to make it proper. Which is probably against Wine policy of "let's hack it together to make it work somehow and forget about it".
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Fri Nov 7 04:52:49 2008 New Revision: 37239 URL: http://svn.reactos.org/svn/reactos?rev=37239&view=rev Log: - Import rpcss from Wine. It has a serious disadvantage: it's not a real service, but a simple exe app, which (in ReactOS) just infinitely waits after being started. In order to turn it into a real startable/stoppable service, ole32 needs to be modified to make it proper. Which is probably against Wine policy of "let's hack it together to make it work somehow and forget about it". Added: trunk/reactos/base/services/rpcss/epm.idl trunk/reactos/base/services/rpcss/epmp.c (with props) trunk/reactos/base/services/rpcss/irot.idl trunk/reactos/base/services/rpcss/irotp.c (with props) trunk/reactos/base/services/rpcss/rpcss_main.c (with props) Removed: trunk/reactos/base/services/rpcss/endpoint.c trunk/reactos/base/services/rpcss/rpcss.c Modified: trunk/reactos/base/services/rpcss/rpcss.h trunk/reactos/base/services/rpcss/rpcss.rbuild Removed: trunk/reactos/base/services/rpcss/endpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/endpoi… ============================================================================== --- trunk/reactos/base/services/rpcss/endpoint.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/endpoint.c (removed) @@ -1,27 +1,0 @@ -/* - * PROJECT: ReactOS RpcSs service - * LICENSE: GPL - See COPYING in the top level directory - * FILE: services/rpcss/rpcss.c - * PURPOSE: Endpoint mapper - * COPYRIGHT: Copyright 2002 Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "rpc.h" - -/* FUNCTIONS ****************************************************************/ - -VOID -StartEndpointMapper(VOID) -{ -#if 0 - RpcServerRegisterProtseqW("ncacn_np", 1, "\pipe\epmapper"); - - RpcServerRegisterProtseqW("ncalrpc", 1, "epmapper"); - - RpcServerRegisterIf(epmapper_InterfaceHandle, 0, 0); -#endif -} - -/* EOF */ Added: trunk/reactos/base/services/rpcss/epm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epm.id… ============================================================================== --- trunk/reactos/base/services/rpcss/epm.idl (added) +++ trunk/reactos/base/services/rpcss/epm.idl [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,19 @@ +/* + * Copyright 2008 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/epm.idl" Added: trunk/reactos/base/services/rpcss/epmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epmp.c… ============================================================================== --- trunk/reactos/base/services/rpcss/epmp.c (added) +++ trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,284 @@ +/* + * Endpoint Mapper + * + * Copyright (C) 2007 Robert Shearman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "epm_s.h" + +#include "wine/debug.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +struct registered_ept_entry +{ + struct list entry; + GUID object; + RPC_SYNTAX_IDENTIFIER iface; + RPC_SYNTAX_IDENTIFIER syntax; + char *protseq; + char *endpoint; + char *address; + char annotation[ept_max_annotation_size]; +}; + +static struct list registered_ept_entry_list = LIST_INIT(registered_ept_entry_list); + +static CRITICAL_SECTION csEpm; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csEpm, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csEpm") } +}; +static CRITICAL_SECTION csEpm = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static const UUID nil_object; + +/* must be called inside csEpm */ +static void delete_registered_ept_entry(struct registered_ept_entry *entry) +{ + I_RpcFree(entry->protseq); + I_RpcFree(entry->endpoint); + I_RpcFree(entry->address); + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); +} + +static struct registered_ept_entry *find_ept_entry( + const RPC_SYNTAX_IDENTIFIER *iface, const RPC_SYNTAX_IDENTIFIER *syntax, + const char *protseq, const char *endpoint, const char *address, + const UUID *object) +{ + struct registered_ept_entry *entry; + LIST_FOR_EACH_ENTRY(entry, &registered_ept_entry_list, struct registered_ept_entry, entry) + { + if (memcmp(&entry->iface, iface, sizeof(RPC_SYNTAX_IDENTIFIER))) continue; + if (memcmp(&entry->syntax, syntax, sizeof(RPC_SYNTAX_IDENTIFIER))) continue; + if (strcmp(entry->protseq, protseq)) continue; + if (memcmp(&entry->object, object, sizeof(UUID))) continue; + WINE_TRACE("found entry with iface %d.%d %s, syntax %d.%d %s, protseq %s, object %s\n", + entry->iface.SyntaxVersion.MajorVersion, entry->iface.SyntaxVersion.MinorVersion, + wine_dbgstr_guid(&entry->iface.SyntaxGUID), + entry->syntax.SyntaxVersion.MajorVersion, entry->syntax.SyntaxVersion.MinorVersion, + wine_dbgstr_guid(&entry->syntax.SyntaxGUID), protseq, + wine_dbgstr_guid(&entry->object)); + return entry; + } + WINE_TRACE("not found\n"); + return NULL; +} + +void __RPC_USER ept_lookup_handle_t_rundown(ept_lookup_handle_t entry_handle) +{ + WINE_FIXME("%p\n", entry_handle); +} + +void ept_insert(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + boolean32 replace, + error_status_t *status) +{ + unsigned32 i; + RPC_STATUS rpc_status; + + WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status); + + *status = RPC_S_OK; + + EnterCriticalSection(&csEpm); + + for (i = 0; i < num_ents; i++) + { + struct registered_ept_entry *entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + if (!entry) + { + /* FIXME: cleanup code to delete added entries */ + *status = EPT_S_CANT_PERFORM_OP; + break; + } + list_init(&entry->entry); + memcpy(entry->annotation, entries[i].annotation, sizeof(entries[i].annotation)); + rpc_status = TowerExplode(entries[i].tower, &entry->iface, &entry->syntax, + &entry->protseq, &entry->endpoint, + &entry->address); + if (rpc_status != RPC_S_OK) + { + WINE_WARN("TowerExplode failed %lu\n", rpc_status); + *status = rpc_status; + break; /* FIXME: more cleanup? */ + } + + entry->object = entries[i].object; + + if (replace) + { + /* FIXME: correct find algorithm */ + struct registered_ept_entry *old_entry = find_ept_entry(&entry->iface, &entry->syntax, entry->protseq, entry->endpoint, entry->address, &entry->object); + if (old_entry) delete_registered_ept_entry(old_entry); + } + list_add_tail(&registered_ept_entry_list, &entry->entry); + } + + LeaveCriticalSection(&csEpm); +} + +void ept_delete(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + error_status_t *status) +{ + unsigned32 i; + RPC_STATUS rpc_status; + + *status = RPC_S_OK; + + WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status); + + EnterCriticalSection(&csEpm); + + for (i = 0; i < num_ents; i++) + { + struct registered_ept_entry *entry; + RPC_SYNTAX_IDENTIFIER iface, syntax; + char *protseq; + char *endpoint; + char *address; + rpc_status = TowerExplode(entries[i].tower, &iface, &syntax, &protseq, + &endpoint, &address); + if (rpc_status != RPC_S_OK) + break; + entry = find_ept_entry(&iface, &syntax, protseq, endpoint, address, &entries[i].object); + if (entry) + delete_registered_ept_entry(entry); + else + { + *status = EPT_S_NOT_REGISTERED; + break; + } + I_RpcFree(protseq); + I_RpcFree(endpoint); + I_RpcFree(address); + } + + LeaveCriticalSection(&csEpm); +} + +void ept_lookup(handle_t h, + unsigned32 inquiry_type, + uuid_p_t object, + rpc_if_id_p_t interface_id, + unsigned32 vers_option, + ept_lookup_handle_t *entry_handle, + unsigned32 max_ents, + unsigned32 *num_ents, + ept_entry_t entries[], + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_map(handle_t h, + uuid_p_t object, + twr_p_t map_tower, + ept_lookup_handle_t *entry_handle, + unsigned32 max_towers, + unsigned32 *num_towers, + twr_p_t *towers, + error_status_t *status) +{ + RPC_STATUS rpc_status; + RPC_SYNTAX_IDENTIFIER iface, syntax; + char *protseq; + struct registered_ept_entry *entry; + + *status = RPC_S_OK; + *num_towers = 0; + + WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower, + entry_handle, max_towers, num_towers, towers, status); + + rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq, + NULL, NULL); + if (rpc_status != RPC_S_OK) + { + *status = rpc_status; + return; + } + + EnterCriticalSection(&csEpm); + + LIST_FOR_EACH_ENTRY(entry, &registered_ept_entry_list, struct registered_ept_entry, entry) + { + if (IsEqualGUID(&entry->iface.SyntaxGUID, &iface.SyntaxGUID) && + (entry->iface.SyntaxVersion.MajorVersion == iface.SyntaxVersion.MajorVersion) && + (entry->iface.SyntaxVersion.MinorVersion >= iface.SyntaxVersion.MinorVersion) && + !memcmp(&entry->syntax, &syntax, sizeof(syntax)) && + !strcmp(entry->protseq, protseq) && + ((!object && IsEqualGUID(&entry->object, &nil_object)) || IsEqualGUID(object, &entry->object))) + { + if (*num_towers < max_towers) + { + rpc_status = TowerConstruct(&entry->iface, &entry->syntax, + entry->protseq, entry->endpoint, + entry->address, + &towers[*num_towers]); + if (rpc_status != RPC_S_OK) + { + *status = rpc_status; + break; /* FIXME: more cleanup? */ + } + } + (*num_towers)++; + } + } + + LeaveCriticalSection(&csEpm); +} + +void ept_lookup_handle_free(handle_t h, + ept_lookup_handle_t *entry_handle, + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_inq_object(handle_t h, + GUID *ept_object, + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, ept_object, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_mgmt_delete(handle_t h, + boolean32 object_speced, + uuid_p_t object, + twr_p_t tower, + error_status_t *status) +{ + WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status); + + *status = EPT_S_CANT_PERFORM_OP; +} Propchange: trunk/reactos/base/services/rpcss/epmp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/rpcss/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irot.i… ============================================================================== --- trunk/reactos/base/services/rpcss/irot.idl (added) +++ trunk/reactos/base/services/rpcss/irot.idl [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,19 @@ +/* + * Copyright 2007 Robert Shearman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/irot.idl" Added: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c (added) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,379 @@ +/* + * Running Object Table + * + * Copyright 2007 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" + +#include "irot_s.h" + +#include "wine/list.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rpcss); + +/* define the structure of the running object table elements */ +struct rot_entry +{ + struct list entry; + InterfaceData *object; /* marshaled running object*/ + InterfaceData *moniker; /* marshaled moniker that identifies this object */ + MonikerComparisonData *moniker_data; /* moniker comparison data that identifies this object */ + DWORD cookie; /* cookie identifying this object */ + FILETIME last_modified; + LONG refs; +}; + +static struct list RunningObjectTable = LIST_INIT(RunningObjectTable); + +static CRITICAL_SECTION csRunningObjectTable; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csRunningObjectTable, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csRunningObjectTable") } +}; +static CRITICAL_SECTION csRunningObjectTable = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static LONG last_cookie = 1; + +static inline void rot_entry_release(struct rot_entry *rot_entry) +{ + if (!InterlockedDecrement(&rot_entry->refs)) + { + HeapFree(GetProcessHeap(), 0, rot_entry->object); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data); + HeapFree(GetProcessHeap(), 0, rot_entry); + } +} + +HRESULT IrotRegister( + IrotHandle h, + const MonikerComparisonData *data, + const InterfaceData *obj, + const InterfaceData *mk, + const FILETIME *time, + DWORD grfFlags, + IrotCookie *cookie, + IrotContextHandle *ctxt_handle) +{ + struct rot_entry *rot_entry; + struct rot_entry *existing_rot_entry; + HRESULT hr; + + if (grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)) + { + WINE_ERR("Invalid grfFlags: 0x%08x\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)); + return E_INVALIDARG; + } + + rot_entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rot_entry)); + if (!rot_entry) + return E_OUTOFMEMORY; + + rot_entry->refs = 1; + rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[obj->ulCntData])); + if (!rot_entry->object) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->object->ulCntData = obj->ulCntData; + memcpy(&rot_entry->object->abData, obj->abData, obj->ulCntData); + + rot_entry->last_modified = *time; + + rot_entry->moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[mk->ulCntData])); + if (!rot_entry->moniker) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->moniker->ulCntData = mk->ulCntData; + memcpy(&rot_entry->moniker->abData, mk->abData, mk->ulCntData); + + rot_entry->moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[data->ulCntData])); + if (!rot_entry->moniker_data) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->moniker_data->ulCntData = data->ulCntData; + memcpy(&rot_entry->moniker_data->abData, data->abData, data->ulCntData); + + EnterCriticalSection(&csRunningObjectTable); + + hr = S_OK; + + LIST_FOR_EACH_ENTRY(existing_rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if ((existing_rot_entry->moniker_data->ulCntData == data->ulCntData) && + !memcmp(&data->abData, &existing_rot_entry->moniker_data->abData, data->ulCntData)) + { + hr = MK_S_MONIKERALREADYREGISTERED; + WINE_TRACE("moniker already registered with cookie %d\n", existing_rot_entry->cookie); + break; + } + } + + list_add_tail(&RunningObjectTable, &rot_entry->entry); + + LeaveCriticalSection(&csRunningObjectTable); + + /* gives a registration identifier to the registered object*/ + *cookie = rot_entry->cookie = InterlockedIncrement(&last_cookie); + *ctxt_handle = rot_entry; + + return hr; +} + +HRESULT IrotRevoke( + IrotHandle h, + IrotCookie cookie, + IrotContextHandle *ctxt_handle, + PInterfaceData *obj, + PInterfaceData *mk) +{ + struct rot_entry *rot_entry; + + WINE_TRACE("%d\n", cookie); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if (rot_entry->cookie == cookie) + { + HRESULT hr = S_OK; + + list_remove(&rot_entry->entry); + LeaveCriticalSection(&csRunningObjectTable); + + *obj = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->object->ulCntData])); + *mk = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->moniker->ulCntData])); + if (*obj && *mk) + { + (*obj)->ulCntData = rot_entry->object->ulCntData; + memcpy((*obj)->abData, rot_entry->object->abData, (*obj)->ulCntData); + (*mk)->ulCntData = rot_entry->moniker->ulCntData; + memcpy((*mk)->abData, rot_entry->moniker->abData, (*mk)->ulCntData); + } + else + { + MIDL_user_free(*obj); + MIDL_user_free(*mk); + hr = E_OUTOFMEMORY; + } + + rot_entry_release(rot_entry); + *ctxt_handle = NULL; + return hr; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return E_INVALIDARG; +} + +HRESULT IrotIsRunning( + IrotHandle h, + const MonikerComparisonData *data) +{ + const struct rot_entry *rot_entry; + HRESULT hr = S_FALSE; + + WINE_TRACE("\n"); + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + if ((rot_entry->moniker_data->ulCntData == data->ulCntData) && + !memcmp(&data->abData, &rot_entry->moniker_data->abData, data->ulCntData)) + { + hr = S_OK; + break; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +HRESULT IrotGetObject( + IrotHandle h, + const MonikerComparisonData *moniker_data, + PInterfaceData *obj, + IrotCookie *cookie) +{ + const struct rot_entry *rot_entry; + + WINE_TRACE("%p\n", moniker_data); + + *cookie = 0; + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + HRESULT hr = S_OK; + if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + { + *obj = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->object->ulCntData])); + if (*obj) + { + (*obj)->ulCntData = rot_entry->object->ulCntData; + memcpy((*obj)->abData, rot_entry->object->abData, (*obj)->ulCntData); + + *cookie = rot_entry->cookie; + } + else + hr = E_OUTOFMEMORY; + + LeaveCriticalSection(&csRunningObjectTable); + + return hr; + } + } + + LeaveCriticalSection(&csRunningObjectTable); + + return MK_E_UNAVAILABLE; +} + +HRESULT IrotNoteChangeTime( + IrotHandle h, + IrotCookie cookie, + const FILETIME *last_modified_time) +{ + struct rot_entry *rot_entry; + + WINE_TRACE("%d %p\n", cookie, last_modified_time); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if (rot_entry->cookie == cookie) + { + rot_entry->last_modified = *last_modified_time; + LeaveCriticalSection(&csRunningObjectTable); + return S_OK; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return E_INVALIDARG; +} + +HRESULT IrotGetTimeOfLastChange( + IrotHandle h, + const MonikerComparisonData *moniker_data, + FILETIME *time) +{ + const struct rot_entry *rot_entry; + HRESULT hr = MK_E_UNAVAILABLE; + + WINE_TRACE("%p\n", moniker_data); + + memset(time, 0, sizeof(*time)); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + { + *time = rot_entry->last_modified; + hr = S_OK; + break; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +HRESULT IrotEnumRunning( + IrotHandle h, + PInterfaceList *list) +{ + const struct rot_entry *rot_entry; + HRESULT hr = S_OK; + ULONG moniker_count = 0; + ULONG i = 0; + + WINE_TRACE("\n"); + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY( rot_entry, &RunningObjectTable, const struct rot_entry, entry ) + moniker_count++; + + *list = MIDL_user_allocate(FIELD_OFFSET(InterfaceList, interfaces[moniker_count])); + if (*list) + { + (*list)->size = moniker_count; + LIST_FOR_EACH_ENTRY( rot_entry, &RunningObjectTable, const struct rot_entry, entry ) + { + (*list)->interfaces[i] = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->moniker->ulCntData])); + if (!(*list)->interfaces[i]) + { + ULONG end = i - 1; + for (i = 0; i < end; i++) + MIDL_user_free((*list)->interfaces[i]); + MIDL_user_free(*list); + hr = E_OUTOFMEMORY; + break; + } + (*list)->interfaces[i]->ulCntData = rot_entry->moniker->ulCntData; + memcpy((*list)->interfaces[i]->abData, rot_entry->moniker->abData, rot_entry->moniker->ulCntData); + i++; + } + } + else + hr = E_OUTOFMEMORY; + + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) +{ + struct rot_entry *rot_entry = ctxt_handle; + EnterCriticalSection(&csRunningObjectTable); + list_remove(&rot_entry->entry); + LeaveCriticalSection(&csRunningObjectTable); + rot_entry_release(rot_entry); +} + +void * __RPC_USER MIDL_user_allocate(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +void __RPC_USER MIDL_user_free(void * p) +{ + HeapFree(GetProcessHeap(), 0, p); +} Propchange: trunk/reactos/base/services/rpcss/irotp.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/base/services/rpcss/rpcss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.c (removed) @@ -1,56 +1,0 @@ -/* - * PROJECT: ReactOS RpcSs service - * LICENSE: GPL - See COPYING in the top level directory - * FILE: services/rpcss/rpcss.c - * PURPOSE: Service initialization - * COPYRIGHT: Copyright 2002 Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "rpcss.h" - -#define NDEBUG -#include <debug.h> - - - -/* GLOBALS ******************************************************************/ - - - -/* FUNCTIONS *****************************************************************/ - - -VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv) -{ - - DPRINT("ServiceMain() called\n"); - - StartEndpointMapper(); - - DPRINT("ServiceMain() done\n"); -} - - -int main(int argc, char *argv[]) -{ -#if 0 - SERVICE_TABLE_ENTRY ServiceTable[] = {{"RpcSs", ServiceMain},{NULL, NULL}}; -#endif - - DPRINT("RpcSs service\n"); - -#if 0 - StartServiceCtrlDispatcher(ServiceTable); -#endif - - ServiceMain(0, NULL); - - DPRINT("RpcSS: done\n"); - - return 0; -} - -/* EOF */ Modified: trunk/reactos/base/services/rpcss/rpcss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.h [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.h [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,17 +1,26 @@ -#ifndef __RPCSS_H__ -#define __RPCSS_H__ +/* + * RPCSS definitions + * + * Copyright (C) 2002 Greg Turner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ -#define UNICODE +#ifndef __WINE_RPCSS_H +#define __WINE_RPCSS_H -#include <stdio.h> -#define WIN32_NO_STATUS -#include <windows.h> +#include "windows.h" - -VOID -StartEndpointMapper(VOID); - -#endif /* __RPCSS_H__ */ - -/* EOF */ - +#endif /* __WINE_RPCSS_H */ Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -2,9 +2,23 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe"> <include base="rpcss">.</include> + <include base="rpcss" root="intermediate">.</include> + <library>wine</library> + <library>rpcss_epm_server</library> + <library>rpcss_irot_server</library> + <library>rpcrt4</library> <library>kernel32</library> <library>advapi32</library> - <file>rpcss.c</file> - <file>endpoint.c</file> + <file>rpcss_main.c</file> + <file>epmp.c</file> + <file>irotp.c</file> + <file>epm.idl</file> + <file>irot.idl</file> <file>rpcss.rc</file> </module> +<module name="rpcss_epm_server" type="rpcserver"> + <file>epm.idl</file> +</module> +<module name="rpcss_irot_server" type="rpcserver"> + <file>irot.idl</file> +</module> Added: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c (added) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,144 @@ +/* + * Copyright 2001, Ove KÃ¥ven, TransGaming Technologies Inc. + * Copyright 2002 Greg Turner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * ---- rpcss_main.c: + * Initialize and start serving requests. Bail if rpcss already is + * running. + * + * ---- RPCSS.EXE: + * + * Wine needs a server whose role is somewhat like that + * of rpcss.exe in windows. This is not a clone of + * windows rpcss at all. It has been given the same name, however, + * to provide for the possibility that at some point in the future, + * it may become interface compatible with the "real" rpcss.exe on + * Windows. + * + * ---- KNOWN BUGS / TODO: + * + * o Service hooks are unimplemented (if you bother to implement + * these, also implement net.exe, at least for "net start" and + * "net stop" (should be pretty easy I guess, assuming the rest + * of the services API infrastructure works. + * + * o There is a looming problem regarding listening on privileged + * ports. We will need to be able to coexist with SAMBA, and be able + * to function without running winelib code as root. This may + * take some doing, including significant reconceptualization of the + * role of rpcss.exe in wine. + */ + +#include <stdio.h> +#include <limits.h> +#include <assert.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "rpcss.h" +#include "winnt.h" +#include "irot.h" +#include "epm.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +static HANDLE exit_event; + +//extern HANDLE __wine_make_process_system(void); + +static BOOL RPCSS_Initialize(void) +{ + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; + static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; + static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; + static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + RPC_STATUS status; + + WINE_TRACE("\n"); + + status = RpcServerRegisterIf(epm_v3_0_s_ifspec, NULL, NULL); + if (status != RPC_S_OK) + return status; + status = RpcServerRegisterIf(Irot_v0_2_s_ifspec, NULL, NULL); + if (status != RPC_S_OK) + { + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); + return FALSE; + } + + status = RpcServerUseProtseqEpW(epm_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + epm_endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerUseProtseqEpW(epm_protseq_lrpc, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + epm_endpoint_lrpc, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerUseProtseqEpW(irot_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + irot_endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); + if (status != RPC_S_OK) + goto fail; + + //exit_event = __wine_make_process_system(); + exit_event = CreateEventW(NULL, FALSE, FALSE, NULL); // never fires + + return TRUE; + +fail: + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); + RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, FALSE); + return FALSE; +} + +/* returns false if we discover at the last moment that we + aren't ready to terminate */ +static BOOL RPCSS_Shutdown(void) +{ + RpcMgmtStopServerListening(NULL); + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); + RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, TRUE); + + CloseHandle(exit_event); + + return TRUE; +} + +int main( int argc, char **argv ) +{ + /* + * We are invoked as a standard executable; we act in a + * "lazy" manner. We register our interfaces and endpoints, and hang around + * until we all user processes exit, and then silently terminate. + */ + + if (RPCSS_Initialize()) { + WaitForSingleObject(exit_event, INFINITE); + RPCSS_Shutdown(); + } + + return 0; +} Propchange: trunk/reactos/base/services/rpcss/rpcss_main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 37238: - Fix a memory leak
by cgutman＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: cgutman Date: Thu Nov 6 21:46:26 2008 New Revision: 37238 URL: http://svn.reactos.org/svn/reactos?rev=37238&view=rev Log: - Fix a memory leak Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Nov 6 21:46:26 2008 @@ -387,8 +387,10 @@ switch (AddrFile->Protocol) { case IPPROTO_TCP: TCPFreePort( AddrFile->Port ); - if( AddrFile->Listener ) - TCPClose( AddrFile->Listener ); + if( AddrFile->Listener ) { + TCPClose( AddrFile->Listener ); + ExFreePool( AddrFile->Listener ); + } break; case IPPROTO_UDP:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs