Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sginsberg] 37214: - Remove unnecessary typedef
by sginsberg＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: sginsberg Date: Wed Nov 5 20:06:02 2008 New Revision: 37214 URL: http://svn.reactos.org/svn/reactos?rev=37214&view=rev Log: - Remove unnecessary typedef Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Wed Nov 5 20:06:02 2008 @@ -142,7 +142,7 @@ const Project& project; }; -typedef struct ModuleHandlerInformations +struct ModuleHandlerInformations { HostType DefaultHost; const char* cflags;

1 0

[sginsberg] 37213: - Fix an array overflow
by sginsberg＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: sginsberg Date: Wed Nov 5 19:00:24 2008 New Revision: 37213 URL: http://svn.reactos.org/svn/reactos?rev=37213&view=rev Log: - Fix an array overflow Modified: trunk/rosapps/applications/sysutils/ctm/ctm.c Modified: trunk/rosapps/applications/sysutils/ctm/ctm.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/ctm.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/ctm/ctm.c [iso-8859-1] Wed Nov 5 19:00:24 2008 @@ -59,7 +59,7 @@ DWORD inConMode; DWORD outConMode; -DWORD columnRightPositions[5]; +DWORD columnRightPositions[6]; TCHAR lpSeparator[80]; TCHAR lpHeader[80]; TCHAR lpMemUnit[3];

1 0

[fireball] 37212: - Fix behavior of KeRundownQueue (save the next link before freeing it and use proper locking and enumeration code). - This fixes behavior of I/O completion ports (thanks to Stefan and Alex for testing, reporting and fixing).
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 18:03:04 2008 New Revision: 37212 URL: http://svn.reactos.org/svn/reactos?rev=37212&view=rev Log: - Fix behavior of KeRundownQueue (save the next link before freeing it and use proper locking and enumeration code). - This fixes behavior of I/O completion ports (thanks to Stefan and Alex for testing, reporting and fixing). Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Wed Nov 5 18:03:04 2008 @@ -436,8 +436,7 @@ NTAPI KeRundownQueue(IN PKQUEUE Queue) { - PLIST_ENTRY ListHead, NextEntry; - PLIST_ENTRY FirstEntry = NULL; + PLIST_ENTRY FirstEntry, NextEntry; PKTHREAD Thread; KIRQL OldIrql; ASSERT_QUEUE(Queue); @@ -446,34 +445,41 @@ /* Get the Dispatcher Lock */ OldIrql = KiAcquireDispatcherLock(); - - /* Make sure the list is not empty */ - if (!IsListEmpty(&Queue->EntryListHead)) - { - /* Remove it */ - FirstEntry = RemoveHeadList(&Queue->EntryListHead); - } - - /* Unlink threads and clear their Thread->Queue */ - ListHead = &Queue->ThreadListHead; - NextEntry = ListHead->Flink; - while (ListHead != NextEntry) - { - /* Get the Entry's Thread */ + + /* Check if the list is empty */ + FirstEntry = Queue->EntryListHead.Flink; + if (FirstEntry == &Queue->EntryListHead) + { + /* We won't return anything */ + FirstEntry = NULL; + } + else + { + /* Remove this entry */ + RemoveEntryList(&Queue->EntryListHead); + } + + /* Loop the list */ + while (!IsListEmpty(&Queue->ThreadListHead)) + { + /* Get the next entry */ + NextEntry = Queue->ThreadListHead.Flink; + + /* Get the associated thread */ Thread = CONTAINING_RECORD(NextEntry, KTHREAD, QueueListEntry); - /* Kill its Queue */ + /* Clear its queue */ Thread->Queue = NULL; /* Remove this entry */ RemoveEntryList(NextEntry); - - /* Get the next entry */ - NextEntry = NextEntry->Flink; - } - - /* Release the lock and return */ - KiReleaseDispatcherLock(OldIrql); + } + + /* Release the dispatcher lock */ + KiReleaseDispatcherLockFromDpcLevel(); + + /* Exit the dispatcher and return the first entry (if any) */ + KiExitDispatcher(OldIrql); return FirstEntry; }

1 0

[fireball] 37211: - Sync WRC to Wine-20081105 (a few nice bugfixes).
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 17:16:19 2008 New Revision: 37211 URL: http://svn.reactos.org/svn/reactos?rev=37211&view=rev Log: - Sync WRC to Wine-20081105 (a few nice bugfixes). Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/wrc/genres.c trunk/reactos/tools/wrc/lex.yy.c trunk/reactos/tools/wrc/newstruc.c trunk/reactos/tools/wrc/parser.h trunk/reactos/tools/wrc/parser.l trunk/reactos/tools/wrc/parser.tab.c trunk/reactos/tools/wrc/parser.tab.h trunk/reactos/tools/wrc/parser.y trunk/reactos/tools/wrc/readres.c trunk/reactos/tools/wrc/translation.c trunk/reactos/tools/wrc/utils.c trunk/reactos/tools/wrc/wrc.c trunk/reactos/tools/wrc/writeres.c [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/wrc/genres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/genres.c?rev=372… Modified: trunk/reactos/tools/wrc/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/lex.yy.c?rev=372… Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=3… Modified: trunk/reactos/tools/wrc/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.h?rev=372… Modified: trunk/reactos/tools/wrc/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.l?rev=372… Modified: trunk/reactos/tools/wrc/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.c?rev… Modified: trunk/reactos/tools/wrc/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.h?rev… Modified: trunk/reactos/tools/wrc/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.y?rev=372… Modified: trunk/reactos/tools/wrc/readres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/readres.c?rev=37… Modified: trunk/reactos/tools/wrc/translation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/translation.c?re… Modified: trunk/reactos/tools/wrc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.c?rev=3721… Modified: trunk/reactos/tools/wrc/wrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.c?rev=37211&… Modified: trunk/reactos/tools/wrc/writeres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/writeres.c?rev=3…

1 0

[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

← Newer
1
...
52
53
54
55
56
57
58
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008