Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 34055: - The CRT sync by "fireball" is incorrect and results in a broken ntos kernel. Although it may work on i386 builds, it results in a corrupted kernel anyways. On ARM, we try to hackfix around it by not including some routines that should not be in the kernel but were being imported due to the broken crt changes. - We do not attemp to build world anymore. We have handwritten a new ARM rbuild file that only builds what we need for our current ARM work. - HAL and FreeLDR do
by ros-arm-bringup＠svn.reactos.org 23 Jun '08

23 Jun '08

Author: ros-arm-bringup Date: Sun Jun 22 22:57:50 2008 New Revision: 34055 URL: http://svn.reactos.org/svn/reactos?rev=34055&view=rev Log: - The CRT sync by "fireball" is incorrect and results in a broken ntos kernel. Although it may work on i386 builds, it results in a corrupted kernel anyways. On ARM, we try to hackfix around it by not including some routines that should not be in the kernel but were being imported due to the broken crt changes. - We do not attemp to build world anymore. We have handwritten a new ARM rbuild file that only builds what we need for our current ARM work. - HAL and FreeLDR do not seem to have an "installpath"... why not? Added one at least for our ARM stuff, so that "make install" can drop the binaries. - Fixed some ARM DDK macro inconsistencies, allow more drivers to build. - It is now possible to use "make install -k" to drop a completely working ARM build onto an image due to all these changes. Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/boot/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/hal/halarm/up/halup.rbuild trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/lib/sdk/crt/string/wcs.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=340… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sun Jun 22 22:57:50 2008 @@ -7,11 +7,38 @@ </xi:fallback> </xi:include> - <xi:include href="ReactOS-generic.rbuild" /> + <xi:include href="baseaddress.rbuild" /> + <define name="__REACTOS__" /> <define name="_ARM_" /> <define name="__arm__" /> + <if property="DBG" value="1"> + <define name="DBG">1</define> + <define name="_SEH_ENABLE_TRACE" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="KDBG" value="1"> + <define name="KDBG">1</define> + <property name="DBG_OR_KDBG" value="true" /> + </if> + + <include>.</include> + <include>include</include> + <include root="intermediate">include</include> + <include>include/psdk</include> + <include root="intermediate">include/psdk</include> + <include>include/dxsdk</include> + <include root="intermediate">include/dxsdk</include> + <include>include/crt</include> + <include>include/crt/mingw32</include> + <include>include/ddk</include> + <include>include/GL</include> + <include>include/ndk</include> + <include>include/reactos</include> + <include root="intermediate">include/reactos</include> + <include root="intermediate">include/reactos/mc</include> + <include>include/reactos/libs</include> <include>include/reactos/arm</include> <property name="WINEBUILD_FLAGS" value="--kill-at"/> @@ -43,4 +70,124 @@ <linkerflag>-s</linkerflag> <linkerflag>-lgcc</linkerflag> <linkerflag>-static</linkerflag> + + <directory name="media"> + <directory name="nls"> + <xi:include href="media/nls/nls.rbuild" /> + </directory> + </directory> + <directory name="lib"> + <directory name="drivers"> + <directory name="csq"> + <xi:include href="lib/drivers/csq/csq.rbuild" /> +/directory> + </directory> + <directory name="debugsup"> + <xi:include href="lib/debugsup/debugsup.rbuild" /> + </directory> + <directory name="3rdparty"> + <directory name="zlib"> + <xi:include href="lib/3rdparty/zlib/zlib.rbuild" /> + </directory> + </directory> + <directory name="rtl"> + <xi:include href="lib/rtl/rtl.rbuild" /> + </directory> + <directory name="host"> + <directory name="wcsfuncs"> + <xi:include href="lib/host/wcsfuncs/wcsfuncs.rbuild" /> + </directory> + </directory> + <directory name="inflib"> + <xi:include href="lib/inflib/inflib.rbuild" /> + </directory> + <directory name="cmlib"> + <xi:include href="lib/cmlib/cmlib.rbuild" /> + </directory> + <directory name="pseh"> + <xi:include href="lib/pseh/pseh.rbuild" /> + </directory> + <directory name="rossym"> + <xi:include href="lib/rossym/rossym.rbuild" /> + </directory> + <directory name="sdk"> + <directory name="crt"> + <xi:include href="lib/sdk/crt/crt.rbuild" /> + <xi:include href="lib/sdk/crt/libcntpr.rbuild" /> + </directory> + <directory name="wdmguid"> + <xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" /> + </directory> + </directory> + </directory> + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + <directory name="tools"> + <xi:include href="tools/tools.rbuild" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + <directory name="hal"> + <directory name="halarm"> + <directory name="generic"> + <xi:include href="hal/halarm/generic/generic.rbuild" /> + </directory> + <directory name="up"> + <xi:include href="hal/halarm/up/halup.rbuild" /> + </directory> + </directory> + <directory name="hal"> + <xi:include href="hal/hal/hal.rbuild" /> + </directory> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + <directory name="drivers"> + <directory name="storage"> + <directory name="scsiport"> + <xi:include href="drivers/storage/scsiport/scsiport.rbuild" /> + </directory> + <directory name="port"> + <directory name="buslogic"> + <xi:include href="drivers/storage/port/buslogic/buslogic.rbuild" /> + </directory> + </directory> + <directory name="ide"> + <directory name="atapi"> + <xi:include href="drivers/storage/ide/atapi/atapi.rbuild" /> + </directory> + </directory> + <directory name="class"> + <directory name="class2"> + <xi:include href="drivers/storage/class/class2/class2.rbuild" /> + </directory> + <directory name="disk"> + <xi:include href="drivers/storage/class/disk/disk.rbuild" /> + </directory> + </directory> + </directory> + <directory name="filesystems"> + <directory name="fastfat"> + <xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" /> + </directory> + </directory> + <directory name="network"> + <directory name="ndis"> + <xi:include href="drivers/network/ndis/ndis.rbuild" /> + </directory> + </directory> + <directory name="base"> + <directory name="kdcom"> + <xi:include href="drivers/base/kdcom/kdcom.rbuild" /> + </directory> + <directory name="bootvid"> + <xi:include href="drivers/base/bootvid/bootvid.rbuild" /> + </directory> + </directory> + </directory> + + </project> Modified: trunk/reactos/boot/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr.rbuil… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr.rbuild [iso-8859-1] Sun Jun 22 22:57:50 2008 @@ -14,10 +14,4 @@ <xi:include href="freeldr/freeldr.rbuild" /> <xi:include href="freeldr/setupldr.rbuild" /> </directory> - <directory name="fdebug"> - <xi:include href="fdebug/fdebug.rbuild" /> - </directory> - <directory name="install"> - <xi:include href="install/installfreeldr.rbuild" /> - </directory> </group> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Sun Jun 22 22:57:50 2008 @@ -18,7 +18,7 @@ </module> </if> <if property="ARCH" value="arm"> - <module name="freeldr" type="bootloader"> + <module name="freeldr" type="bootloader" installbase=".." installname="freeldr.sys"> <bootstrap installbase="loader" /> <library>freeldr_startup</library> <library>freeldr_base64k</library> Modified: trunk/reactos/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] Sun Jun 22 22:57:50 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halarm_up" type="kernelmodedll"> +<module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll"> <importlibrary definition="../../hal/hal_arm.def" /> <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halarm_generic">../include</include> Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Sun Jun 22 22:57:50 2008 @@ -33,11 +33,13 @@ // // Just read it from the PCR // -#define KeGetCurrentProcessorNumber() PCR->Number +#define KeGetCurrentProcessorNumber() (int)PCR->Number #define KeGetCurrentIrql() PCR->CurrentIrql #define _KeGetCurrentThread() PCR->CurrentThread #define _KeGetPreviousMode() PCR->CurrentThread->PreviousMode #define _KeIsExecutingDpc() (PCR->DpcRoutineActive != 0) +#define KeGetCurrentThread() _KeGetCurrentThread() +#define KeGetPreviousMode() _KeGetPreviousMode() #define KeGetDcacheFillSize() PCR->DcacheFillSize // Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Sun Jun 22 22:57:50 2008 @@ -67,7 +67,6 @@ } return ret; } -#endif /********************************************************************* * _wcsicoll (MSVCRT.@) */ @@ -76,7 +75,7 @@ /* FIXME: handle collates */ return strcmpiW( str1, str2 ); } - +#endif /********************************************************************* * _wcsnset (MSVCRT.@) */ @@ -102,7 +101,7 @@ } return ret; } - +#ifndef _LIBCNT_ /********************************************************************* * _wcsset (MSVCRT.@) */ @@ -185,7 +184,6 @@ return ret; } -#ifndef _LIBCNT_ typedef struct pf_output_t { int used; Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Sun Jun 22 22:57:50 2008 @@ -17,8 +17,10 @@ #ifdef _NTOSKRNL_ +#ifndef _ARM_ #define KeGetCurrentThread _KeGetCurrentThread #define KeGetPreviousMode _KeGetPreviousMode +#endif #undef PsGetCurrentProcess #define PsGetCurrentProcess _PsGetCurrentProcess

1 0

[jimtabor] 34054: Update credits.
by jimtabor＠svn.reactos.org 23 Jun '08

23 Jun '08

Author: jimtabor Date: Sun Jun 22 20:09:20 2008 New Revision: 34054 URL: http://svn.reactos.org/svn/reactos?rev=34054&view=rev Log: Update credits. Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=34054&r1=34053… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Sun Jun 22 20:09:20 2008 @@ -29,11 +29,12 @@ Hernan Ochoa Herve Poussineau <hpoussin(a)reactos.com> Iwan Fatahi <i_fatahi(a)hotmail.com> -James B. Tabor <jimtabor(a)adsl-64-217-116-74.dsl.hstntx.swbell.net> +James B. Tabor <jimtabor.rosdev(a)gmail.com> <jimtabor(a)adsl-64-217-116-74.dsl.hstntx.swbell.net> Jason Eager Jason Filby <jasonfilby(a)yahoo.com> Jason Weiler Jean Michault +Jeffrey Morlan <mrnobo1024(a)yahoo.com> Jim Noeth Johannes Anderwald <johannes.anderwald(a)student.tugraz.at> Jonathan Wilson <jonwil(a)tpgi.com.au> @@ -59,6 +60,7 @@ Robert Dickenson <robd(a)reactos.org> Royce Mitchell III <royce3(a)ev1.net> Saveliy Tretiakov <saveliyt(a)mail.ru> +Stefan Ginsberg <stefan__100__(a)hotmail.com> Steven Edwards <steven_ed4153(a)yahoo.com> Thomas Weidenmueller <w3seek(a)users.sourceforge.net> Timo Kreuzer <timo.kreuzer(a)reactos.org>

1 0

[cfinck] 34053: - Rebuild the left popup menu containing the keyboard layouts on every click to take care of keyboard layout changes. I know this is probably not the best way for doing the job, but I don't know of any other method to achieve the same. - Change the right popup menu to only show the "Options" and "Exit" menu items (like ctfmon does) - Add the missing 'return 0; ' statements, when a message was handled See issue #3372 for more details.
by cfinck＠svn.reactos.org 22 Jun '08

22 Jun '08

Author: cfinck Date: Sun Jun 22 16:59:27 2008 New Revision: 34053 URL: http://svn.reactos.org/svn/reactos?rev=34053&view=rev Log: - Rebuild the left popup menu containing the keyboard layouts on every click to take care of keyboard layout changes. I know this is probably not the best way for doing the job, but I don't know of any other method to achieve the same. - Change the right popup menu to only show the "Options" and "Exit" menu items (like ctfmon does) - Add the missing 'return 0;' statements, when a message was handled See issue #3372 for more details. Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/lang/bg-BG.rc trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc trunk/reactos/base/applications/kbswitch/lang/de-DE.rc trunk/reactos/base/applications/kbswitch/lang/en-US.rc trunk/reactos/base/applications/kbswitch/lang/es-ES.rc trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc trunk/reactos/base/applications/kbswitch/lang/lt-LT.rc trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -142,7 +142,7 @@ tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); - lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip)); + lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip)); Shell_NotifyIcon(NIM_MODIFY, &tnid); } @@ -210,7 +210,7 @@ TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; TCHAR szLCID[CCH_LAYOUT_ID + 1]; HANDLE hLib; - int i, j, k; + UINT i, j, k; if(!GetLayoutID(szLayoutNum, szLCID)) return FALSE; @@ -329,52 +329,6 @@ return hMenu; } -static HMENU -BuildRightPopupMenu() -{ - HMENU hMenu; - HMENU hMenuTemplate; - DWORD dwIndex; - LPTSTR pszMenuItem; - MENUITEMINFO mii; - - // Add the keyboard layouts to the popup menu - hMenu = BuildLeftPopupMenu(); - - // Add the menu items from the popup menu template - hMenuTemplate = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); - dwIndex = 0; - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID; - mii.dwTypeData = NULL; - - while(GetMenuItemInfo(hMenuTemplate, dwIndex, TRUE, &mii)) - { - if(mii.cch > 0) - { - mii.cch++; - pszMenuItem = (LPTSTR)HeapAlloc(hProcessHeap, 0, mii.cch * sizeof(TCHAR)); - - mii.dwTypeData = pszMenuItem; - GetMenuItemInfo(hMenuTemplate, dwIndex, TRUE, &mii); - - AppendMenu(hMenu, mii.fType, mii.wID, mii.dwTypeData); - - HeapFree(hProcessHeap, 0, pszMenuItem); - mii.dwTypeData = NULL; - } - else - { - AppendMenu(hMenu, mii.fType, 0, NULL); - } - - dwIndex++; - } - - return hMenu; -} - BOOL SetHooks() { @@ -430,7 +384,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { - static HMENU hLeftPopupMenu, hRightPopupMenu; + static HMENU hRightPopupMenu; static TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH]; switch (Message) @@ -439,32 +393,35 @@ { SetHooks(); AddTrayIcon(hwnd); - hLeftPopupMenu = BuildLeftPopupMenu(hwnd); - hRightPopupMenu = BuildRightPopupMenu(hwnd); - } - break; + hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); + + return 0; + } case WM_LANG_CHANGED: { GetLayoutIDByHkl((HKL)lParam, szLCID); GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); UpdateTrayIcon(hwnd, szLCID, szLangName); - } - break; + + return 0; + } case WM_LOAD_LAYOUT: { ActivateLayout(hwnd, GetNextLayout()); - } - break; + + return 0; + } case WM_WINDOW_ACTIVATE: { GetLayoutIDByHkl(GetKeyboardLayout(GetWindowThreadProcessId((HWND)wParam, 0)), szLCID); GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); UpdateTrayIcon(hwnd, szLCID, szLangName); - } - break; + + return 0; + } case WM_NOTIFYICONMSG: switch (lParam) @@ -476,13 +433,25 @@ GetCursorPos(&pt); SetForegroundWindow(hwnd); + if (lParam == WM_LBUTTONDOWN) + { + HMENU hLeftPopupMenu; + + /* Rebuild the left popup menu on every click to take care of keyboard layout changes */ + hLeftPopupMenu = BuildLeftPopupMenu(); TrackPopupMenu(hLeftPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + DestroyMenu(hLeftPopupMenu); + } else + { TrackPopupMenu(hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + } + PostMessage(hwnd, WM_NULL, 0, 0); + + return 0; } - break; } break; @@ -491,7 +460,7 @@ { case ID_EXIT: SendMessage(hwnd, WM_CLOSE, 0, 0); - break; + return 0; case ID_PREFERENCES: { @@ -506,16 +475,15 @@ if (!ShellExecuteEx(&shInputDll)) MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR); } - break; default: ActivateLayout(hwnd, LOWORD(wParam)); - break; + return 0; } break; case WM_SETTINGCHANGE: - { + { if (wParam == SPI_SETDEFAULTINPUTLANG) { //FIXME: Should detect default language changes by CPL applet or by other tools and update UI @@ -526,12 +494,12 @@ case WM_DESTROY: { DeleteHooks(); - DestroyMenu(hLeftPopupMenu); DestroyMenu(hRightPopupMenu); DelTrayIcon(hwnd); PostQuitMessage(0); - } - break; + + return 0; + } } return DefWindowProc(hwnd, Message, wParam, lParam); Modified: trunk/reactos/base/applications/kbswitch/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/bg-BG.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -4,7 +4,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Ïðåäïî÷èòàíèÿ...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "Èç&õîä", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -9,7 +9,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Pøedvolby...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Ukonèit", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/de-DE.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -4,7 +4,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Einstellungen...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Beenden", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/en-US.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -4,7 +4,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Preferences...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Exit", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/es-ES.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -4,7 +4,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Preferencias...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Salir", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -4,7 +4,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Préférences...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "Quitt&er", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/lt-LT.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -6,7 +6,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Nuostatos...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Baigti", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -11,7 +11,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Ustawienia...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Wyjcie", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -4,7 +4,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Ïàðàìåòðû...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Âûõîä", ID_EXIT Modified: trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc [iso-8859-1] Sun Jun 22 16:59:27 2008 @@ -8,7 +8,6 @@ BEGIN POPUP "popup" BEGIN - MENUITEM SEPARATOR MENUITEM "&Nastavenia...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Zavrie", ID_EXIT

1 0

[cfinck] 34052: Fix the messed up "freeldr_arch" rbuild file: Specify one "freeldr_arch" module and then the files to build based on the architecture, not a separate module per architecture Patch by Alex
by cfinck＠svn.reactos.org 22 Jun '08

22 Jun '08

Author: cfinck Date: Sun Jun 22 16:43:02 2008 New Revision: 34052 URL: http://svn.reactos.org/svn/reactos?rev=34052&view=rev Log: Fix the messed up "freeldr_arch" rbuild file: Specify one "freeldr_arch" module and then the files to build based on the architecture, not a separate module per architecture Patch by Alex Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Sun Jun 22 16:43:02 2008 @@ -1,15 +1,24 @@ <?xml version="1.0"?> <!DOCTYPE directory SYSTEM "../../../tools/rbuild/project.dtd"> -<directory name="arch"> - <directory name="i386"> - <if property="ARCH" value="i386"> - <module name="freeldr_arch" type="objectlibrary"> - <include base="freeldr_base">include</include> - <include base="freeldr_base">cache</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> +<module name="freeldr_arch" type="objectlibrary"> + <include base="freeldr_base">include</include> + <include base="freeldr_base">cache</include> + <include base="ntoskrnl">include</include> + <include base="ReactOS">include/reactos/libs</include> + <include base="ReactOS">include/reactos/elf</include> + <define name="_NTHAL_" /> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + + <if property="ARCH" value="arm"> + <compilerflag>-ffreestanding</compilerflag> + <compilerflag>-fno-builtin</compilerflag> + <compilerflag>-Os</compilerflag> + </if> + + <directory name="arch"> + <directory name="i386"> + <if property="ARCH" value="i386"> <file>_alloca.S</file> <file>archmach.c</file> <file>hardware.c</file> @@ -35,23 +44,10 @@ <file>xboxmem.c</file> <file>xboxrtc.c</file> <file>xboxvideo.c</file> - </module> - </if> - </directory> - <directory name="powerpc"> - <if property="ARCH" value="powerpc"> - <module name="freeldr_arch" type="objectlibrary"> - <include base="freeldr_base">include</include> - <include base="freeldr_base">cache</include> - <include base="ntoskrnl">include</include> - <include base="ReactOS">include/reactos/libs</include> - <include base="ReactOS">include/reactos/elf</include> - <define name="_NTHAL_" /> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> + </if> + </directory> + <directory name="powerpc"> + <if property="ARCH" value="powerpc"> <file>boot.s</file> <file>loader.c</file> <file>mach.c</file> @@ -65,47 +61,16 @@ <file>prep_ide.c</file> <file>prep_pci.c</file> <file>prep_vga.c</file> - </module> - </if> - </directory> - <directory name="mips"> - <if property="ARCH" value="mips"> - <module name="freeldr_arch" type="objectlibrary"> - <include base="freeldr_base">include</include> - <include base="freeldr_base">cache</include> - <include base="ntoskrnl">include</include> - <define name="DEBUG" /> - <define name="_NTHAL_" /> - <file>boot.s</file> - <file>console.c</file> - <file>disk.c</file> - <file>hardware.c</file> - <file>loader.c</file> - <file>mach.c</file> - <file>portio.c</file> - <file>video.c</file> - </module> - </if> - </directory> - <directory name="arm"> - <if property="ARCH" value="arm"> - <module name="freeldr_arch" type="objectlibrary"> - <include base="freeldr_base">include</include> - <include base="freeldr_base">cache</include> - <include base="ntoskrnl">include</include> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> - <define name="DEBUG" /> - <define name="_NTHAL_" /> + </if> + </directory> + <directory name="arm"> + <if property="ARCH" value="arm"> <file>boot.s</file> <file>ferouart.c</file> <file>loader.c</file> <file>macharm.c</file> <file>versuart.c</file> - </module> - </if> + </if> + </directory> </directory> -</directory> +</module>

1 0

[cfinck] 34051: Build host_wcsfuncs as a host static library, not a target static library Fixes build for all non-Win32 hosts
by cfinck＠svn.reactos.org 22 Jun '08

22 Jun '08

Author: cfinck Date: Sun Jun 22 16:41:25 2008 New Revision: 34051 URL: http://svn.reactos.org/svn/reactos?rev=34051&view=rev Log: Build host_wcsfuncs as a host static library, not a target static library Fixes build for all non-Win32 hosts Modified: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild Modified: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/host/wcsfuncs/wcsfuncs… ============================================================================== --- trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] Sun Jun 22 16:41:25 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="host_wcsfuncs" type="staticlibrary"> +<module name="host_wcsfuncs" type="hoststaticlibrary"> <include base="ReactOS">include</include> <file>wcsfuncs.c</file> </module>

1 0

[cfinck] 34050: Add a library "host_wcsfuncs" with implementations for UTF-16 string functions needed for some host tools Instead of copying those functions into every host tool, which needs it (as we did previously), we can now implement them all in this library and link the host tools to it. If USE_HOST_WCSFUNCS is not defined, the "wcsfuncs.h" file will define them to the CRT functions (so this library does not create overhead, when the code is built for the target platform) See issue #3285 f
by cfinck＠svn.reactos.org 22 Jun '08

22 Jun '08

Author: cfinck Date: Sun Jun 22 15:58:56 2008 New Revision: 34050 URL: http://svn.reactos.org/svn/reactos?rev=34050&view=rev Log: Add a library "host_wcsfuncs" with implementations for UTF-16 string functions needed for some host tools Instead of copying those functions into every host tool, which needs it (as we did previously), we can now implement them all in this library and link the host tools to it. If USE_HOST_WCSFUNCS is not defined, the "wcsfuncs.h" file will define them to the CRT functions (so this library does not create overhead, when the code is built for the target platform) See issue #3285 for more details. Added: trunk/reactos/include/host/wcsfuncs.h (with props) trunk/reactos/lib/host/ trunk/reactos/lib/host/directory.rbuild (with props) trunk/reactos/lib/host/wcsfuncs/ trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c (with props) trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild (with props) Modified: trunk/reactos/lib/cmlib/cminit.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/lib.rbuild trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/mkhive.rbuild trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/rtl.c Added: trunk/reactos/include/host/wcsfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/wcsfuncs.h?re… ============================================================================== --- trunk/reactos/include/host/wcsfuncs.h (added) +++ trunk/reactos/include/host/wcsfuncs.h [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -1,0 +1,24 @@ +/* + PROJECT: ReactOS + LICENSE: GPL v2 or any later version + FILE: include/host/wcsfuncs.h + PURPOSE: Header for the "host_wcsfuncs" static library + COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> +*/ + +#ifndef _HOST_WCSFUNCS_H +#define _HOST_WCSFUNCS_H + +#ifdef USE_HOST_WCSFUNCS + /* Function prototypes */ + SIZE_T utf16_wcslen(PCWSTR str); + PWSTR utf16_wcschr(PWSTR str, WCHAR c); + INT utf16_wcsncmp(PCWSTR string1, PCWSTR string2, size_t count); +#else + /* Define the utf16_ functions to the CRT functions */ + #define utf16_wcslen wcslen + #define utf16_wcschr wcschr + #define utf16_wcsncmp wcsncmp +#endif + +#endif Propchange: trunk/reactos/include/host/wcsfuncs.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=340… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -19,7 +19,7 @@ SIZE_T NameSize; /* Allocate the cell */ - NameSize = wcslen(Name) * sizeof(WCHAR); + NameSize = utf16_wcslen(Name) * sizeof(WCHAR); RootCellIndex = HvAllocateCell(Hive, FIELD_OFFSET(CM_KEY_NODE, Name) + NameSize, Stable, Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=3405… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -9,21 +9,25 @@ #define CMLIB_H #ifdef CMLIB_HOST -#include <host/typedefs.h> -#include <stdio.h> -#include <string.h> - -// Definitions copied from <ntstatus.h> -// We only want to include host headers, so we define them manually -#define STATUS_SUCCESS ((NTSTATUS)0x00000000) -#define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002) -#define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017) -#define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009A) -#define STATUS_REGISTRY_CORRUPT ((NTSTATUS)0xC000014C) -#define STATUS_NOT_REGISTRY_FILE ((NTSTATUS)0xC000015C) -#define STATUS_REGISTRY_RECOVERED ((NTSTATUS)0x40000009) - -#endif + #include <host/typedefs.h> + #include <stdio.h> + #include <string.h> + + // Definitions copied from <ntstatus.h> + // We only want to include host headers, so we define them manually + #define STATUS_SUCCESS ((NTSTATUS)0x00000000) + #define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002) + #define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017) + #define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009A) + #define STATUS_REGISTRY_CORRUPT ((NTSTATUS)0xC000014C) + #define STATUS_NOT_REGISTRY_FILE ((NTSTATUS)0xC000015C) + #define STATUS_REGISTRY_RECOVERED ((NTSTATUS)0x40000009) + + /* For <host/wcsfuncs.h> */ + #define USE_HOST_WCSFUNCS +#endif + +#include <host/wcsfuncs.h> // // Debug support switch Added: trunk/reactos/lib/host/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/host/directory.rbuild?… ============================================================================== --- trunk/reactos/lib/host/directory.rbuild (added) +++ trunk/reactos/lib/host/directory.rbuild [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="wcsfuncs"> + <xi:include href="wcsfuncs/wcsfuncs.rbuild" /> + </directory> +</group> Propchange: trunk/reactos/lib/host/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/host/wcsfuncs/wcsfuncs… ============================================================================== --- trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c (added) +++ trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -1,0 +1,48 @@ +/* + PROJECT: ReactOS + LICENSE: GPL v2 or any later version + FILE: lib/host/wcsfuncs/wcsfuncs.c + PURPOSE: Reimplemented wide-character string functions for host tools (to be independent of the host wchar_t size) + COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> +*/ + +#include <host/typedefs.h> + +/* Function implementations */ +SIZE_T utf16_wcslen(PCWSTR str) +{ + SIZE_T i; + + for(i = 0; str[i]; i++); + + return i; +} + +PWSTR utf16_wcschr(PWSTR str, WCHAR c) +{ + SIZE_T i; + + for(i = 0; str[i] && str[i] != c; i++); + + if(str[i]) + return &str[i]; + else + return NULL; +} + +INT utf16_wcsncmp(PCWSTR string1, PCWSTR string2, size_t count) +{ + while(count--) + { + if(*string1 != *string2) + return 1; + + if(*string1 == 0) + return 0; + + string1++; + string2++; + } + + return 0; +} Propchange: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/host/wcsfuncs/wcsfuncs… ============================================================================== --- trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild (added) +++ trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -1,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="host_wcsfuncs" type="staticlibrary"> + <include base="ReactOS">include</include> + <file>wcsfuncs.c</file> +</module> Propchange: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=34050&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/lib.rbuild [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -21,6 +21,9 @@ </directory> <directory name="fslib"> <xi:include href="fslib/directory.rbuild" /> + </directory> + <directory name="host"> + <xi:include href="host/directory.rbuild" /> </directory> <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -31,6 +31,9 @@ #include <stdlib.h> #include <host/typedefs.h> + +#define USE_HOST_WCSFUNCS +#include <host/wcsfuncs.h> // Definitions copied from <ntstatus.h> // We only want to include host headers, so we define them manually @@ -96,13 +99,6 @@ #define GCC_PACKED __attribute__((packed)) #endif//_MSC_VER -/* rtl.c */ -PWSTR -xwcschr( - PWSTR String, - WCHAR Char -); - #endif /* __MKHIVE_H__ */ /* EOF */ Modified: trunk/reactos/tools/mkhive/mkhive.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -11,6 +11,7 @@ <compilerflag>-fshort-wchar</compilerflag> <library>inflibhost</library> <library>cmlibhost</library> + <library>host_wcsfuncs</library> <file>binhive.c</file> <file>cmi.c</file> <file>mkhive.c</file> Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -127,7 +127,7 @@ LocalKeyName = (PWSTR)KeyName; for (;;) { - End = (PWSTR) xwcschr(LocalKeyName, '\\'); + End = (PWSTR) utf16_wcschr(LocalKeyName, '\\'); if (End) { KeyString.Buffer = LocalKeyName; @@ -138,9 +138,9 @@ RtlInitUnicodeString(&KeyString, LocalKeyName); /* Redirect from 'CurrentControlSet' to 'ControlSet001' */ - if (!xwcsncmp(LocalKeyName, L"CurrentControlSet", 17) && - ParentKey->NameSize == 12 && - !memcmp(ParentKey->Name, L"SYSTEM", 12)) + if (!utf16_wcsncmp(LocalKeyName, L"CurrentControlSet", 17) && + ParentKey->NameSize == 12 && + !memcmp(ParentKey->Name, L"SYSTEM", 12)) RtlInitUnicodeString(&KeyString, L"ControlSet001"); /* Check subkey in memory structure */ Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=340… ============================================================================== --- trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] Sun Jun 22 15:58:56 2008 @@ -9,41 +9,6 @@ #include "mkhive.h" #include <bitmap.c> - -SIZE_T xwcslen( PCWSTR String ) { - SIZE_T i; - - for( i = 0; String[i]; i++ ); - - return i; -} - -PWSTR xwcschr( PWSTR String, WCHAR Char ) -{ - SIZE_T i; - - for( i = 0; String[i] && String[i] != Char; i++ ); - - if( String[i] ) return &String[i]; - else return NULL; -} - -int xwcsncmp(PCWSTR s1, PCWSTR s2, size_t n) -{ - while(n--) - { - if(*s1 != *s2) - return 1; - - if(*s1 == 0) - return 0; - - s1++; - s2++; - } - - return 0; -} /* * @implemented @@ -88,7 +53,7 @@ if(SourceString) { - DestSize = xwcslen(SourceString) * sizeof(WCHAR); + DestSize = utf16_wcslen(SourceString) * sizeof(WCHAR); DestinationString->Length = (USHORT)DestSize; DestinationString->MaximumLength = (USHORT)DestSize + sizeof(WCHAR); }

1 0

[cfinck] 34049: Add support for a new environment variable ROS_GENERATE_RSYM to disable RSYM during the build Patch by Alex
by cfinck＠svn.reactos.org 22 Jun '08

22 Jun '08

Author: cfinck Date: Sun Jun 22 13:38:12 2008 New Revision: 34049 URL: http://svn.reactos.org/svn/reactos?rev=34049&view=rev Log: Add support for a new environment variable ROS_GENERATE_RSYM to disable RSYM during the build Patch by Alex Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jun 22 13:38:12 2008 @@ -1551,9 +1551,13 @@ MingwModuleHandler::GenerateRunRsymCode () const { fprintf ( fMakefile, + "ifneq ($(ROS_GENERATE_RSYM),no)\n" ); + fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); + fprintf ( fMakefile, + "endif\n" ); } void

1 0

[cfinck] 34048: Move wshtcpip to dll/win32, it's a DLL and not a driver "Patch" by Alex
by cfinck＠svn.reactos.org 22 Jun '08

22 Jun '08

Author: cfinck Date: Sun Jun 22 13:19:19 2008 New Revision: 34048 URL: http://svn.reactos.org/svn/reactos?rev=34048&view=rev Log: Move wshtcpip to dll/win32, it's a DLL and not a driver "Patch" by Alex Added: trunk/reactos/dll/win32/wshtcpip/ - copied from r34037, trunk/reactos/drivers/network/wshtcpip/ Removed: trunk/reactos/drivers/network/wshtcpip/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/drivers/network/directory.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 22 13:19:19 2008 @@ -343,6 +343,7 @@ dll\win32\ws2_32\ws2_32.dll 1 dll\win32\ws2help\ws2help.dll 1 dll\win32\wshirda\wshirda.dll 1 +dll\win32\wshtcpip\wshtcpip.dll 1 dll\win32\wsock32\wsock32.dll 1 dll\win32\wtsapi32\wtsapi32.dll 1 dll\win32\winmm\midimap\midimap.dll 1 @@ -375,7 +376,6 @@ drivers\network\ndis\ndis.sys 2 drivers\network\tcpip\tcpip.sys 2 drivers\network\tdi\tdi.sys 2 -drivers\network\wshtcpip\wshtcpip.dll 1 drivers\network\dd\ne2000\ne2000.sys 2 drivers\network\dd\pcnet\pcnet.sys 2 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sun Jun 22 13:19:19 2008 @@ -388,6 +388,9 @@ <directory name="wshirda"> <xi:include href="wshirda/wshirda.rbuild" /> </directory> +<directory name="wshtcpip"> + <xi:include href="wshtcpip/wshtcpip.rbuild" /> +</directory> <directory name="wsock32"> <xi:include href="wsock32/wsock32.rbuild" /> </directory> Modified: trunk/reactos/drivers/network/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/directory.… ============================================================================== --- trunk/reactos/drivers/network/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/directory.rbuild [iso-8859-1] Sun Jun 22 13:19:19 2008 @@ -16,7 +16,4 @@ <directory name="tdi"> <xi:include href="tdi/tdi.rbuild" /> </directory> -<directory name="wshtcpip"> - <xi:include href="wshtcpip/wshtcpip.rbuild" /> -</directory> </group>

1 0

[fireball] 34047: - Extend SEH to cover writing result to output arguments. Noticed by Stefan Ginsberg.
by fireball＠svn.reactos.org 22 Jun '08

22 Jun '08

Author: fireball Date: Sun Jun 22 11:24:15 2008 New Revision: 34047 URL: http://svn.reactos.org/svn/reactos?rev=34047&view=rev Log: - Extend SEH to cover writing result to output arguments. Noticed by Stefan Ginsberg. Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sun Jun 22 11:24:15 2008 @@ -63,6 +63,23 @@ /* Save the class directly */ if (Class) ParseContext.Class = *Class; } + + /* Setup the parse context */ + ParseContext.CreateOperation = TRUE; + ParseContext.CreateOptions = CreateOptions; + + /* Do the create */ + Status = ObOpenObjectByName(ObjectAttributes, + CmpKeyObjectType, + PreviousMode, + NULL, + DesiredAccess, + &ParseContext, + &Handle); + if (NT_SUCCESS(Status)) *KeyHandle = Handle; + + /* Return data to user */ + if (Disposition) *Disposition = ParseContext.Disposition; } _SEH_HANDLE { @@ -70,24 +87,8 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if (!NT_SUCCESS(Status)) return Status; - - /* Setup the parse context */ - ParseContext.CreateOperation = TRUE; - ParseContext.CreateOptions = CreateOptions; - - /* Do the create */ - Status = ObOpenObjectByName(ObjectAttributes, - CmpKeyObjectType, - PreviousMode, - NULL, - DesiredAccess, - &ParseContext, - &Handle); - if (NT_SUCCESS(Status)) *KeyHandle = Handle; - - /* Return data to user */ - if (Disposition) *Disposition = ParseContext.Disposition; + + /* Return status */ return Status; } @@ -109,14 +110,24 @@ { /* Check for user-mode caller */ if (PreviousMode == UserMode) - { + { /* Probe the key handle */ ProbeForWriteHandle(KeyHandle); *KeyHandle = NULL; - + /* Probe object attributes */ ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 4); } + + /* Just let the object manager handle this */ + Status = ObOpenObjectByName(ObjectAttributes, + CmpKeyObjectType, + ExGetPreviousMode(), + NULL, + DesiredAccess, + &ParseContext, + &Handle); + if (NT_SUCCESS(Status)) *KeyHandle = Handle; } _SEH_HANDLE { @@ -124,18 +135,7 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if (!NT_SUCCESS(Status)) return Status; - - /* Just let the object manager handle this */ - Status = ObOpenObjectByName(ObjectAttributes, - CmpKeyObjectType, - ExGetPreviousMode(), - NULL, - DesiredAccess, - &ParseContext, - &Handle); - if (NT_SUCCESS(Status)) *KeyHandle = Handle; - + /* Return status */ return Status; }

1 0

[fireball] 34046: SVN Maintenance: set eol-style:native for lib/sdk/crt.
by fireball＠svn.reactos.org 22 Jun '08

22 Jun '08

Author: fireball Date: Sun Jun 22 07:08:15 2008 New Revision: 34046 URL: http://svn.reactos.org/svn/reactos?rev=34046&view=rev Log: SVN Maintenance: set eol-style:native for lib/sdk/crt. Modified: trunk/reactos/lib/sdk/crt/except/powerpc/chkstk_asm.s (props changed) trunk/reactos/lib/sdk/crt/except/powerpc/seh.s (contents, props changed) trunk/reactos/lib/sdk/crt/process/thread.c (contents, props changed) Propchange: trunk/reactos/lib/sdk/crt/except/powerpc/chkstk_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/except/powerpc/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/powerpc… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/powerpc/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/powerpc/seh.s [iso-8859-1] Sun Jun 22 07:08:15 2008 @@ -1,75 +1,75 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CRT - * FILE: lib/crt/misc/i386/seh.S - * PURPOSE: SEH Support for the CRT - * PROGRAMMERS: arty - */ - -/* INCLUDES ******************************************************************/ - -#include <ndk/asm.h> - -#define DISPOSITION_DISMISS 0 -#define DISPOSITION_CONTINUE_SEARCH 1 -#define DISPOSITION_COLLIDED_UNWIND 3 - -/* GLOBALS *******************************************************************/ - -.globl _global_unwind2 -.globl _local_unwind2 -.globl _abnormal_termination -.globl _except_handler2 -.globl _except_handler3 - -/* FUNCTIONS *****************************************************************/ - -unwind_handler: - blr - -_global_unwind2: - blr - -_local_unwind2: - blr - -_except_handler2: - blr - -_except_handler3: - blr - -// -// -// REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME -// sorry -// -// -.globl RtlpGetStackLimits -RtlpGetStackLimits: - stwu 1,16(1) - mflr 0 - - stw 0,4(1) - stw 3,8(1) - stw 4,12(1) - - /* Get the current thread */ - lwz 3,KPCR_CURRENT_THREAD(13) - - /* Get the stack limits */ - lwz 4,KTHREAD_STACK_LIMIT(3) - lwz 5,KTHREAD_INITIAL_STACK(3) - subi 5,5,SIZEOF_FX_SAVE_AREA - - /* Return them */ - lwz 3,8(1) - stw 4,0(3) - - lwz 3,12(1) - stw 5,0(3) - - addi 1,1,16 - - /* return */ - blr +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/crt/misc/i386/seh.S + * PURPOSE: SEH Support for the CRT + * PROGRAMMERS: arty + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/asm.h> + +#define DISPOSITION_DISMISS 0 +#define DISPOSITION_CONTINUE_SEARCH 1 +#define DISPOSITION_COLLIDED_UNWIND 3 + +/* GLOBALS *******************************************************************/ + +.globl _global_unwind2 +.globl _local_unwind2 +.globl _abnormal_termination +.globl _except_handler2 +.globl _except_handler3 + +/* FUNCTIONS *****************************************************************/ + +unwind_handler: + blr + +_global_unwind2: + blr + +_local_unwind2: + blr + +_except_handler2: + blr + +_except_handler3: + blr + +// +// +// REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME +// sorry +// +// +.globl RtlpGetStackLimits +RtlpGetStackLimits: + stwu 1,16(1) + mflr 0 + + stw 0,4(1) + stw 3,8(1) + stw 4,12(1) + + /* Get the current thread */ + lwz 3,KPCR_CURRENT_THREAD(13) + + /* Get the stack limits */ + lwz 4,KTHREAD_STACK_LIMIT(3) + lwz 5,KTHREAD_INITIAL_STACK(3) + subi 5,5,SIZEOF_FX_SAVE_AREA + + /* Return them */ + lwz 3,8(1) + stw 4,0(3) + + lwz 3,12(1) + stw 5,0(3) + + addi 1,1,16 + + /* return */ + blr Propchange: trunk/reactos/lib/sdk/crt/except/powerpc/seh.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/process/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/thread… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/thread.c [iso-8859-1] Sun Jun 22 07:08:15 2008 @@ -1,115 +1,115 @@ -/* - * msvcrt.dll thread functions - * - * Copyright 2000 Jon Griffiths - * - * 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 <precomp.h> -#include <internal/wine/msvcrt.h> - -#include <malloc.h> -#include <process.h> - -void _amsg_exit (int errnum); -/* Index to TLS */ -DWORD MSVCRT_tls_index; - -typedef void (*_beginthread_start_routine_t)(void *); -typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); - -/********************************************************************/ - -typedef struct { - _beginthread_start_routine_t start_address; - void *arglist; -} _beginthread_trampoline_t; - -/********************************************************************* - * msvcrt_get_thread_data - * - * Return the thread local storage structure. - */ -MSVCRT_thread_data *msvcrt_get_thread_data(void) -{ - MSVCRT_thread_data *ptr; - DWORD err = GetLastError(); /* need to preserve last error */ - - if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) - { - if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) _amsg_exit( _RT_THREAD ); - ptr->random_seed = 1; - } - SetLastError( err ); - return ptr; -} - - -/********************************************************************* - * _beginthread_trampoline - */ -static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) -{ - _beginthread_trampoline_t local_trampoline; - - /* Maybe it's just being paranoid, but freeing arg right - * away seems safer. - */ - memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - free(arg); - - local_trampoline.start_address(local_trampoline.arglist); - return 0; -} - -/********************************************************************* - * _beginthread (MSVCRT.@) - */ -unsigned long _beginthread( - _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ - unsigned int stack_size, /* [in] Stack size for new thread or 0 */ - void *arglist) /* [in] Argument list to be passed to new thread or NULL */ -{ - _beginthread_trampoline_t* trampoline; - - TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); - - /* Allocate the trampoline here so that it is still valid when the thread - * starts... typically after this function has returned. - * _beginthread_trampoline is responsible for freeing the trampoline - */ - trampoline=malloc(sizeof(*trampoline)); - trampoline->start_address = start_address; - trampoline->arglist = arglist; - - /* FIXME */ - return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, - trampoline, 0, NULL); -} - -/********************************************************************* - * _endthread (MSVCRT.@) - */ -void CDECL _endthread(void) -{ - TRACE("(void)\n"); - - /* FIXME */ - ExitThread(0); -} - +/* + * msvcrt.dll thread functions + * + * Copyright 2000 Jon Griffiths + * + * 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 <precomp.h> +#include <internal/wine/msvcrt.h> + +#include <malloc.h> +#include <process.h> + +void _amsg_exit (int errnum); +/* Index to TLS */ +DWORD MSVCRT_tls_index; + +typedef void (*_beginthread_start_routine_t)(void *); +typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); + +/********************************************************************/ + +typedef struct { + _beginthread_start_routine_t start_address; + void *arglist; +} _beginthread_trampoline_t; + +/********************************************************************* + * msvcrt_get_thread_data + * + * Return the thread local storage structure. + */ +MSVCRT_thread_data *msvcrt_get_thread_data(void) +{ + MSVCRT_thread_data *ptr; + DWORD err = GetLastError(); /* need to preserve last error */ + + if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) + { + if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) + _amsg_exit( _RT_THREAD ); + if (!TlsSetValue( MSVCRT_tls_index, ptr )) _amsg_exit( _RT_THREAD ); + ptr->random_seed = 1; + } + SetLastError( err ); + return ptr; +} + + +/********************************************************************* + * _beginthread_trampoline + */ +static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) +{ + _beginthread_trampoline_t local_trampoline; + + /* Maybe it's just being paranoid, but freeing arg right + * away seems safer. + */ + memcpy(&local_trampoline,arg,sizeof(local_trampoline)); + free(arg); + + local_trampoline.start_address(local_trampoline.arglist); + return 0; +} + +/********************************************************************* + * _beginthread (MSVCRT.@) + */ +unsigned long _beginthread( + _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ + unsigned int stack_size, /* [in] Stack size for new thread or 0 */ + void *arglist) /* [in] Argument list to be passed to new thread or NULL */ +{ + _beginthread_trampoline_t* trampoline; + + TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); + + /* Allocate the trampoline here so that it is still valid when the thread + * starts... typically after this function has returned. + * _beginthread_trampoline is responsible for freeing the trampoline + */ + trampoline=malloc(sizeof(*trampoline)); + trampoline->start_address = start_address; + trampoline->arglist = arglist; + + /* FIXME */ + return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, + trampoline, 0, NULL); +} + +/********************************************************************* + * _endthread (MSVCRT.@) + */ +void CDECL _endthread(void) +{ + TRACE("(void)\n"); + + /* FIXME */ + ExitThread(0); +} +

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