Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[ion] 16729: - Fix compilation if redzone detection is diabled.

by ion＠svn.reactos.com

- Fix compilation if redzone detection is diabled. Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h _____ Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h --- trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-07-26 00:43:19 UTC (rev 16728) +++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-07-26 00:50:17 UTC (rev 16729) @@ -328,6 +328,7 @@ return pool; } +#if R_RZ static const char* RFormatTag ( rulong Tag, char* buf ) { @@ -341,6 +342,7 @@ } return buf; } +#endif #if !R_RZ #define RUsedRedZoneCheck(pUsed,Addr,file,line, printzone)

19 years, 6 months

[ion] 16728: - Don't try to get the length of a possibly empty string. This fixes many menu applications (such as WinRAR). However I'm now getting a bug due to a double-free. It seems a GDI Object is being freed twice. Can anyone check this out please?

by ion＠svn.reactos.com

- Don't try to get the length of a possibly empty string. This fixes many menu applications (such as WinRAR). However I'm now getting a bug due to a double-free. It seems a GDI Object is being freed twice. Can anyone check this out please? Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-07-25 23:19:12 UTC (rev 16727) +++ trunk/reactos/lib/user32/windows/menu.c 2005-07-26 00:43:19 UTC (rev 16728) @@ -3771,8 +3771,11 @@ } RtlCopyMemory(mii, &miiW, miiW.cbSize); - mii->dwTypeData = AnsiBuffer; - mii->cch = strlen(AnsiBuffer); + if (AnsiBuffer) + { + mii->dwTypeData = AnsiBuffer; + mii->cch = strlen(AnsiBuffer); + } return TRUE; }

19 years, 6 months

[ion] 16727: - Message Queue Fix, resolves a number of application regressions (Total Commander works again, for example). Patch by Hartmut Birr. To be commited into 0.2.7 after more testing.

by ion＠svn.reactos.com

- Message Queue Fix, resolves a number of application regressions (Total Commander works again, for example). Patch by Hartmut Birr. To be commited into 0.2.7 after more testing. Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-07-25 21:09:21 UTC (rev 16726) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-07-25 23:19:12 UTC (rev 16727) @@ -1577,6 +1577,7 @@ IntSetMenu(WindowObject, hMenu, &MenuChanged); } WindowObject->MessageQueue = PsGetWin32Thread()->MessageQueue; + IntReferenceMessageQueue(WindowObject->MessageQueue); WindowObject->Parent = (ParentWindow ? ParentWindow->Self : NULL); if((OwnerWindow = IntGetWindowObject(OwnerWindowHandle))) { @@ -2180,7 +2181,7 @@ if (Window->MessageQueue->CaptureWindow == Window->Self) Window->MessageQueue->CaptureWindow = NULL; IntUnLockMessageQueue(Window->MessageQueue); - + IntDereferenceMessageQueue(Window->MessageQueue); /* Call hooks */ #if 0 /* FIXME */ if (HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hwnd, 0, TRUE))

19 years, 6 months

[fireball] 16726: Fix stupid typo-mistake, which lead to allocating only 4 bytes intead of sizeof(struct pci_pool).

by fireball＠svn.reactos.com

Fix stupid typo-mistake, which lead to allocating only 4 bytes intead of sizeof(struct pci_pool). Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c _____ Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c --- trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-07-25 20:28:29 UTC (rev 16725) +++ trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-07-25 21:09:21 UTC (rev 16726) @@ -608,8 +608,8 @@ } else if (allocation < size) return 0; - retval = ExAllocatePool(NonPagedPool, sizeof(retval)); //FIXME: Should it be non-paged? - // pci_pool is rather big struct + retval = ExAllocatePool(NonPagedPool, sizeof(struct pci_pool)); // Non-paged because could be + // pci_pool is rather big struct // fill retval structure strncpy (retval->name, name, sizeof retval->name);

19 years, 6 months

[navaraf] 16725: Build Wine DLLs without the UNICODE and _UNICODE definitions. (Note: The Wine DLLs use A/W functions explicitely, so this doesn't have any performance impact.)

by navaraf＠svn.reactos.com

Build Wine DLLs without the UNICODE and _UNICODE definitions. (Note: The Wine DLLs use A/W functions explicitely, so this doesn't have any performance impact.) Modified: trunk/reactos/lib/comctl32/comctl32.xml Modified: trunk/reactos/lib/comdlg32/comdlg32.xml Modified: trunk/reactos/lib/dbghelp/dbghelp.xml Modified: trunk/reactos/lib/msvideo/msvfw32.xml Modified: trunk/reactos/lib/netapi32/netapi32.xml Modified: trunk/reactos/lib/ole32/ole32.xml Modified: trunk/reactos/lib/oleaut32/oleaut32.xml Modified: trunk/reactos/lib/olepro32/olepro32.xml Modified: trunk/reactos/lib/riched20/riched20.xml Modified: trunk/reactos/lib/richedit/riched32.xml Modified: trunk/reactos/lib/rpcrt4/rpcrt4.xml Modified: trunk/reactos/lib/shdocvw/shdocvw.xml Modified: trunk/reactos/lib/shlwapi/shlwapi.xml Modified: trunk/reactos/lib/urlmon/urlmon.xml Modified: trunk/reactos/lib/wininet/wininet.xml Modified: trunk/reactos/lib/winmm/winmm.xml _____ Modified: trunk/reactos/lib/comctl32/comctl32.xml --- trunk/reactos/lib/comctl32/comctl32.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/comctl32/comctl32.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/comdlg32/comdlg32.xml --- trunk/reactos/lib/comdlg32/comdlg32.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/comdlg32/comdlg32.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/dbghelp/dbghelp.xml --- trunk/reactos/lib/dbghelp/dbghelp.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/dbghelp/dbghelp.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="dbghelp.spec.def" /> <include base="dbghelp">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/msvideo/msvfw32.xml --- trunk/reactos/lib/msvideo/msvfw32.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/msvideo/msvfw32.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -1,8 +1,6 @@ <module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll"> <importlibrary definition="msvfw32.spec.def" /> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/netapi32/netapi32.xml --- trunk/reactos/lib/netapi32/netapi32.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/netapi32/netapi32.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="netapi32.spec.def" /> <include base="netapi32">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/ole32/ole32.xml --- trunk/reactos/lib/ole32/ole32.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/ole32/ole32.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="ole32.spec.def" /> <include base="ole32">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/oleaut32/oleaut32.xml --- trunk/reactos/lib/oleaut32/oleaut32.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/oleaut32/oleaut32.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="oleaut32.spec.def" /> <include base="oleaut32">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/olepro32/olepro32.xml --- trunk/reactos/lib/olepro32/olepro32.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/olepro32/olepro32.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="olepro32.spec.def" /> <include base="olepro32">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/riched20/riched20.xml --- trunk/reactos/lib/riched20/riched20.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/riched20/riched20.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="riched20.spec.def" /> <include base="riched20">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/richedit/riched32.xml --- trunk/reactos/lib/richedit/riched32.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/richedit/riched32.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="riched32.spec.def" /> <include base="riched32">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.xml --- trunk/reactos/lib/rpcrt4/rpcrt4.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/rpcrt4/rpcrt4.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="rpcrt4.spec.def" /> <include base="rpcrt4">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.xml --- trunk/reactos/lib/shdocvw/shdocvw.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/shdocvw/shdocvw.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="shdocvw.spec.def" /> <include base="shdocvw">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.xml --- trunk/reactos/lib/shlwapi/shlwapi.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/shlwapi/shlwapi.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="shlwapi.spec.def" /> <include base="shlwapi">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/urlmon/urlmon.xml --- trunk/reactos/lib/urlmon/urlmon.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/urlmon/urlmon.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="urlmon.spec.def" /> <include base="urlmon">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/wininet/wininet.xml --- trunk/reactos/lib/wininet/wininet.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/wininet/wininet.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="wininet.spec.def" /> <include base="wininet">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: trunk/reactos/lib/winmm/winmm.xml --- trunk/reactos/lib/winmm/winmm.xml 2005-07-25 20:07:19 UTC (rev 16724) +++ trunk/reactos/lib/winmm/winmm.xml 2005-07-25 20:28:29 UTC (rev 16725) @@ -2,8 +2,6 @@ <importlibrary definition="winmm.spec.def" /> <include base="winmm">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define>

19 years, 6 months

[jimtabor] 16724: Added more Wine MDI functions. I've tested these for +4 weeks, with Winefile, mdi(mdi test program), and AbiWord. More work is needed.

by jimtabor＠svn.reactos.com

Added more Wine MDI functions. I've tested these for +4 weeks, with Winefile, mdi(mdi test program), and AbiWord. More work is needed. Modified: trunk/reactos/lib/user32/windows/mdi.c _____ Modified: trunk/reactos/lib/user32/windows/mdi.c --- trunk/reactos/lib/user32/windows/mdi.c 2005-07-25 20:03:42 UTC (rev 16723) +++ trunk/reactos/lib/user32/windows/mdi.c 2005-07-25 20:07:19 UTC (rev 16724) @@ -362,10 +362,6 @@ static HWND MDI_GetWindow(MDICLIENTINFO *clientInfo, HWND hWnd, BOOL bNext, DWORD dwStyleMask ) { -#ifdef __REACTOS__ - /* FIXME */ - return 0; -#else int i; HWND *list; HWND last = 0; @@ -397,7 +393,6 @@ found: HeapFree( GetProcessHeap(), 0, list ); return last; -#endif } /********************************************************************** @@ -1777,10 +1772,10 @@ case WM_SETFOCUS: case WM_CHILDACTIVATE: case WM_SYSCOMMAND: -/* FIXME */ #ifndef __REACTOS__ case WM_SETVISIBLE: #endif + case WM_SHOWWINDOW: case WM_SIZE: case WM_NEXTMENU: case WM_SYSCHAR: @@ -1858,13 +1853,13 @@ } break; -/* FIXME */ #ifndef __REACTOS__ case WM_SETVISIBLE: +#endif + case WM_SHOWWINDOW: if( ci->hwndChildMaximized) ci->mdiFlags &= ~MDIF_NEEDUPDATE; else MDI_PostUpdate(client, ci, SB_BOTH+1); break; -#endif case WM_SIZE: if( ci->hwndActiveChild == hwnd && wParam != SIZE_MAXIMIZED ) @@ -2304,10 +2299,6 @@ { case WM_INITDIALOG: { -#ifdef __REACTOS__ - /* FIXME */ - return FALSE; -#else UINT widest = 0; UINT length; UINT i; @@ -2349,7 +2340,6 @@ /* Set the current selection */ SendMessageW(hListBox, LB_SETCURSEL, MDI_MOREWINDOWSLIMIT, 0); return TRUE; -#endif } case WM_COMMAND: @@ -2427,8 +2417,6 @@ static void MDI_SwapMenuItems(HWND parent, UINT pos1, UINT pos2) { -/* FIXME */ -#ifndef __REACTOS__ HWND *list; int i; @@ -2440,5 +2428,4 @@ else if (id == pos2) SetWindowLongW( list[i], GWL_ID, pos1 ); } HeapFree( GetProcessHeap(), 0, list ); -#endif }

19 years, 6 months

[navaraf] 16723: Miscellaneous header fixes (packing and TCHAR stuff).

by navaraf＠svn.reactos.com

Miscellaneous header fixes (packing and TCHAR stuff). Modified: trunk/reactos/w32api/include/commctrl.h Modified: trunk/reactos/w32api/include/ddeml.h Modified: trunk/reactos/w32api/include/lmalert.h Modified: trunk/reactos/w32api/include/ole2.h Modified: trunk/reactos/w32api/include/shlobj.h Modified: trunk/reactos/w32api/include/windns.h _____ Modified: trunk/reactos/w32api/include/commctrl.h --- trunk/reactos/w32api/include/commctrl.h 2005-07-25 04:21:29 UTC (rev 16722) +++ trunk/reactos/w32api/include/commctrl.h 2005-07-25 20:03:42 UTC (rev 16723) @@ -2049,13 +2049,6 @@ int yOffsetPercent; } LVBKIMAGEW, *LPLVBKIMAGEW; #endif /* _WIN32_IE >= 0x400 */ -typedef struct { - NMHDR hdr; - int iItem; - TBBUTTON tbButton; - int cchText; - LPTSTR pszText; -} TBNOTIFY,*LPTBNOTIFY; typedef struct _IMAGEINFO { HBITMAP hbmImage; HBITMAP hbmMask; _____ Modified: trunk/reactos/w32api/include/ddeml.h --- trunk/reactos/w32api/include/ddeml.h 2005-07-25 04:21:29 UTC (rev 16722) +++ trunk/reactos/w32api/include/ddeml.h 2005-07-25 20:03:42 UTC (rev 16723) @@ -185,14 +185,22 @@ DWORD cbData; DWORD Data[8]; } DDEML_MSG_HOOK_DATA; -typedef struct tagMONHSZSTRUCT { +typedef struct tagMONHSZSTRUCTA { UINT cb; BOOL fsAction; DWORD dwTime; HSZ hsz; HANDLE hTask; - TCHAR str[1]; -} MONHSZSTRUCT, *PMONHSZSTRUCT; + CHAR str[1]; +} MONHSZSTRUCTA, *PMONHSZSTRUCTA; +typedef struct tagMONHSZSTRUCTW { + UINT cb; + BOOL fsAction; + DWORD dwTime; + HSZ hsz; + HANDLE hTask; + WCHAR str[1]; +} MONHSZSTRUCTW, *PMONHSZSTRUCTW; typedef struct tagMONLINKSTRUCT { UINT cb; DWORD dwTime; @@ -292,6 +300,8 @@ #define SZDDESYS_ITEM_FORMATS L"Formats" #define SZDDESYS_ITEM_HELP L"Help" #define SZDDE_ITEM_ITEMLIST L"TopicItemList" +#define MONHSZSTRUCT MONHSZSTRUCTA +#define PMONHSZSTRUCT PMONHSZSTRUCTA #define DdeCreateStringHandle DdeCreateStringHandleW #define DdeInitialize DdeInitializeW #define DdeQueryString DdeQueryStringW @@ -304,6 +314,8 @@ #define SZDDESYS_ITEM_FORMATS "Formats" #define SZDDESYS_ITEM_HELP "Help" #define SZDDE_ITEM_ITEMLIST "TopicItemList" +#define MONHSZSTRUCT MONHSZSTRUCTW +#define PMONHSZSTRUCT PMONHSZSTRUCTW #define DdeCreateStringHandle DdeCreateStringHandleA #define DdeInitialize DdeInitializeA #define DdeQueryString DdeQueryStringA _____ Modified: trunk/reactos/w32api/include/lmalert.h --- trunk/reactos/w32api/include/lmalert.h 2005-07-25 04:21:29 UTC (rev 16722) +++ trunk/reactos/w32api/include/lmalert.h 2005-07-25 20:03:42 UTC (rev 16723) @@ -35,8 +35,8 @@ }ADMIN_OTHER_INFO,*PADMIN_OTHER_INFO,*LPADMIN_OTHER_INFO; typedef struct _STD_ALERT { DWORD alrt_timestamp; - TCHAR alrt_eventname[EVLEN+1]; - TCHAR alrt_servicename[SNLEN+1]; + WCHAR alrt_eventname[EVLEN+1]; + WCHAR alrt_servicename[SNLEN+1]; }STD_ALERT,*PSTD_ALERT,*LPSTD_ALERT; typedef struct _ERRLOG_OTHER_INFO { DWORD alrter_errcode; _____ Modified: trunk/reactos/w32api/include/ole2.h --- trunk/reactos/w32api/include/ole2.h 2005-07-25 04:21:29 UTC (rev 16722) +++ trunk/reactos/w32api/include/ole2.h 2005-07-25 20:03:42 UTC (rev 16723) @@ -4,12 +4,13 @@ #pragma GCC system_header #endif -#pragma pack(push,8) #include <winerror.h> #include <objbase.h> #include <olectlid.h> #include <oleauto.h> +#pragma pack(push,8) + #ifdef __cplusplus extern "C" { #endif _____ Modified: trunk/reactos/w32api/include/shlobj.h --- trunk/reactos/w32api/include/shlobj.h 2005-07-25 04:21:29 UTC (rev 16722) +++ trunk/reactos/w32api/include/shlobj.h 2005-07-25 20:03:42 UTC (rev 16723) @@ -12,9 +12,10 @@ #include <shlguid.h> #include <shellapi.h> #include <shtypes.h> -#pragma pack(push,1) #include <commctrl.h> +#pragma pack(push,1) + #define BIF_RETURNONLYFSDIRS 1 #define BIF_DONTGOBELOWDOMAIN 2 #define BIF_STATUSTEXT 4 _____ Modified: trunk/reactos/w32api/include/windns.h --- trunk/reactos/w32api/include/windns.h 2005-07-25 04:21:29 UTC (rev 16722) +++ trunk/reactos/w32api/include/windns.h 2005-07-25 20:03:42 UTC (rev 16723) @@ -163,28 +163,45 @@ DWORD dwAltitude; } DNS_LOC_DATA, *PDNS_LOC_DATA; typedef struct { - LPTSTR pNameMailbox; - LPTSTR pNameErrorsMailbox; -} DNS_MINFO_DATA, *PDNS_MINFO_DATA; + LPSTR pNameMailbox; + LPSTR pNameErrorsMailbox; +} DNS_MINFO_DATAA, *PDNS_MINFO_DATAA; typedef struct { - LPTSTR pNameExchange; + LPWSTR pNameMailbox; + LPWSTR pNameErrorsMailbox; +} DNS_MINFO_DATAW, *PDNS_MINFO_DATAW; +typedef struct { + LPSTR pNameExchange; WORD wPreference; WORD Pad; -} DNS_MX_DATA, *PDNS_MX_DATA; +} DNS_MX_DATAA, *PDNS_MX_DATAA; typedef struct { + LPWSTR pNameExchange; + WORD wPreference; + WORD Pad; +} DNS_MX_DATAW, *PDNS_MX_DATAW; +typedef struct { DWORD dwByteCount; BYTE Data[1]; } DNS_NULL_DATA, *PDNS_NULL_DATA; typedef struct { - LPTSTR pNameNext; + LPSTR pNameNext; WORD wNumTypes; WORD wTypes[1]; -} DNS_NXT_DATA, *PDNS_NXT_DATA; +} DNS_NXT_DATAA, *PDNS_NXT_DATAA; typedef struct { - LPTSTR pNameHost; -} DNS_PTR_DATA, *PDNS_PTR_DATA; + LPWSTR pNameNext; + WORD wNumTypes; + WORD wTypes[1]; +} DNS_NXT_DATAW, *PDNS_NXT_DATAW; typedef struct { - LPTSTR pNameSigner; + LPSTR pNameHost; +} DNS_PTR_DATAA, *PDNS_PTR_DATAA; +typedef struct { + LPWSTR pNameHost; +} DNS_PTR_DATAW, *PDNS_PTR_DATAW; +typedef struct { + LPSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -194,29 +211,61 @@ WORD wKeyTag; WORD Pad; BYTE Signature[1]; -} DNS_SIG_DATA, *PDNS_SIG_DATA; +} DNS_SIG_DATAA, *PDNS_SIG_DATAA; typedef struct { - LPTSTR pNamePrimaryServer; - LPTSTR pNameAdministrator; + LPWSTR pNameSigner; + WORD wTypeCovered; + BYTE chAlgorithm; + BYTE chLabelCount; + DWORD dwOriginalTtl; + DWORD dwExpiration; + DWORD dwTimeSigned; + WORD wKeyTag; + WORD Pad; + BYTE Signature[1]; +} DNS_SIG_DATAW, *PDNS_SIG_DATAW; +typedef struct { + LPSTR pNamePrimaryServer; + LPSTR pNameAdministrator; DWORD dwSerialNo; DWORD dwRefresh; DWORD dwRetry; DWORD dwExpire; DWORD dwDefaultTtl; -} DNS_SOA_DATA, *PDNS_SOA_DATA; +} DNS_SOA_DATAA, *PDNS_SOA_DATAA; typedef struct { - LPTSTR pNameTarget; + LPWSTR pNamePrimaryServer; + LPWSTR pNameAdministrator; + DWORD dwSerialNo; + DWORD dwRefresh; + DWORD dwRetry; + DWORD dwExpire; + DWORD dwDefaultTtl; +} DNS_SOA_DATAW, *PDNS_SOA_DATAW; +typedef struct { + LPSTR pNameTarget; WORD wPriority; WORD wWeight; WORD wPort; WORD Pad; -} DNS_SRV_DATA, *PDNS_SRV_DATA; +} DNS_SRV_DATAA, *PDNS_SRV_DATAA; typedef struct { + LPWSTR pNameTarget; + WORD wPriority; + WORD wWeight; + WORD wPort; + WORD Pad; +} DNS_SRV_DATAW, *PDNS_SRV_DATAW; +typedef struct { DWORD dwStringCount; - LPTSTR pStringArray[1]; -} DNS_TXT_DATA, *PDNS_TXT_DATA; + LPSTR pStringArray[1]; +} DNS_TXT_DATAA, *PDNS_TXT_DATAA; typedef struct { - LPTSTR pNameAlgorithm; + DWORD dwStringCount; + LPWSTR pStringArray[1]; +} DNS_TXT_DATAW, *PDNS_TXT_DATAW; +typedef struct { + LPSTR pNameAlgorithm; PBYTE pAlgorithmPacket; PBYTE pKey; PBYTE pOtherData; @@ -228,10 +277,24 @@ WORD wOtherLength; UCHAR cAlgNameLength; BOOL bPacketPointers; -} DNS_TKEY_DATA, *PDNS_TKEY_DATA; +} DNS_TKEY_DATAA, *PDNS_TKEY_DATAA; typedef struct { - LPTSTR pNameAlgorithm; + LPWSTR pNameAlgorithm; PBYTE pAlgorithmPacket; + PBYTE pKey; + PBYTE pOtherData; + DWORD dwCreateTime; + DWORD dwExpireTime; + WORD wMode; + WORD wError; + WORD wKeyLength; + WORD wOtherLength; + UCHAR cAlgNameLength; + BOOL bPacketPointers; +} DNS_TKEY_DATAW, *PDNS_TKEY_DATAW; +typedef struct { + LPSTR pNameAlgorithm; + PBYTE pAlgorithmPacket; PBYTE pSignature; PBYTE pOtherData; LONGLONG i64CreateTime; @@ -242,8 +305,22 @@ WORD wOtherLength; UCHAR cAlgNameLength; BOOL bPacketPointers; -} DNS_TSIG_DATA, *PDNS_TSIG_DATA; +} DNS_TSIG_DATAA, *PDNS_TSIG_DATAA; typedef struct { + LPWSTR pNameAlgorithm; + PBYTE pAlgorithmPacket; + PBYTE pSignature; + PBYTE pOtherData; + LONGLONG i64CreateTime; + WORD wFudgeTime; + WORD wOriginalXid; + WORD wError; + WORD wSigLength; + WORD wOtherLength; + UCHAR cAlgNameLength; + BOOL bPacketPointers; +} DNS_TSIG_DATAW, *PDNS_TSIG_DATAW; +typedef struct { DWORD dwMappingFlag; DWORD dwLookupTimeout; DWORD dwCacheTimeout; @@ -254,8 +331,14 @@ DWORD dwMappingFlag; DWORD dwLookupTimeout; DWORD dwCacheTimeout; - LPTSTR pNameResultDomain; -} DNS_WINSR_DATA, *PDNS_WINSR_DATA; + LPSTR pNameResultDomain; +} DNS_WINSR_DATAA, *PDNS_WINSR_DATAA; +typedef struct { + DWORD dwMappingFlag; + DWORD dwLookupTimeout; + DWORD dwCacheTimeout; + LPWSTR pNameResultDomain; +} DNS_WINSR_DATAW, *PDNS_WINSR_DATAW; typedef struct _DNS_WIRE_QUESTION { WORD QuestionType; WORD QuestionClass; @@ -271,9 +354,9 @@ UCHAR chProtocol; BYTE BitMask[1]; } DNS_WKS_DATA, *PDNS_WKS_DATA; -typedef struct _DnsRecord { - struct _DnsRecord* pNext; - LPTSTR pName; +typedef struct _DnsRecordA { + struct _DnsRecordA* pNext; + LPSTR pName; WORD wType; WORD wDataLength; union { @@ -284,26 +367,68 @@ DWORD dwReserved; union { DNS_A_DATA A; - DNS_SOA_DATA SOA, Soa; - DNS_PTR_DATA PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb, - MD, Md, MF, Mf, MG, Mg, MR, Mr; - DNS_MINFO_DATA MINFO, Minfo, RP, Rp; - DNS_MX_DATA MX, Mx, AFSDB, Afsdb, RT, Rt; - DNS_TXT_DATA HINFO, Hinfo, ISDN, Isdn, TXT, Txt, X25; + DNS_SOA_DATAA SOA, Soa; + DNS_PTR_DATAA PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb, + MD, Md, MF, Mf, MG, Mg, MR, Mr; + DNS_MINFO_DATAA MINFO, Minfo, RP, Rp; + DNS_MX_DATAA MX, Mx, AFSDB, Afsdb, RT, Rt; + DNS_TXT_DATAA HINFO, Hinfo, ISDN, Isdn, TXT, Txt, X25; DNS_NULL_DATA Null; DNS_WKS_DATA WKS, Wks; DNS_AAAA_DATA AAAA; DNS_KEY_DATA KEY, Key; - DNS_SIG_DATA SIG, Sig; + DNS_SIG_DATAA SIG, Sig; DNS_ATMA_DATA ATMA, Atma; - DNS_NXT_DATA NXT, Nxt; - DNS_SRV_DATA SRV, Srv; - DNS_TKEY_DATA TKEY, Tkey; - DNS_TSIG_DATA TSIG, Tsig; + DNS_NXT_DATAA NXT, Nxt; + DNS_SRV_DATAA SRV, Srv; + DNS_TKEY_DATAA TKEY, Tkey; + DNS_TSIG_DATAA TSIG, Tsig; DNS_WINS_DATA WINS, Wins; - DNS_WINSR_DATA WINSR, WinsR, NBSTAT, Nbstat; + DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; } Data; -} DNS_RECORD, *PDNS_RECORD; +} DNS_RECORDA, *PDNS_RECORDA; +typedef struct _DnsRecordW { + struct _DnsRecordW* pNext; + LPWSTR pName; + WORD wType; + WORD wDataLength; + union { + DWORD DW; + DNS_RECORD_FLAGS S; + } Flags; + DWORD dwTtl; + DWORD dwReserved; + union { + DNS_A_DATA A; + DNS_SOA_DATAW SOA, Soa; + DNS_PTR_DATAW PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb, + MD, Md, MF, Mf, MG, Mg, MR, Mr; + DNS_MINFO_DATAW MINFO, Minfo, RP, Rp; + DNS_MX_DATAW MX, Mx, AFSDB, Afsdb, RT, Rt; + DNS_TXT_DATAW HINFO, Hinfo, ISDN, Isdn, TXT, Txt, X25; + DNS_NULL_DATA Null; + DNS_WKS_DATA WKS, Wks; + DNS_AAAA_DATA AAAA; + DNS_KEY_DATA KEY, Key; + DNS_SIG_DATAW SIG, Sig; + DNS_ATMA_DATA ATMA, Atma; + DNS_NXT_DATAW NXT, Nxt; + DNS_SRV_DATAW SRV, Srv; + DNS_TKEY_DATAW TKEY, Tkey; + DNS_TSIG_DATAW TSIG, Tsig; + DNS_WINS_DATA WINS, Wins; + DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; + } Data; +} DNS_RECORDW, *PDNS_RECORDW; + +#ifdef UNICODE +#define DNS_RECORD DNS_RECORDW +#define PDNS_RECORD PDNS_RECORDW +#else +#define DNS_RECORD DNS_RECORDA +#define PDNS_RECORD PDNS_RECORDA +#endif + typedef struct _DnsRRSet { PDNS_RECORD pFirstRR; PDNS_RECORD pLastRR; @@ -339,6 +464,24 @@ BOOL WINAPI DnsWriteQuestionToBuffer_UTF8(PDNS_MESSAGE_BUFFER,LPDWORD,LPSTR,WORD,WOR D,BOOL); #ifdef UNICODE +#define DNS_MINFO_DATA DNS_MINFO_DATAW +#define PDNS_MINFO_DATA PDNS_MINFO_DATAW +#define DNS_MX_DATA DNS_MX_DATAW +#define PDNS_MX_DATA PDNS_MX_DATAW +#define DNS_NXT_DATA DNS_NXT_DATAW +#define PDNS_NXT_DATA PDNS_NXT_DATAW +#define DNS_PTR_DATA DNS_PTR_DATAW +#define PDNS_PTR_DATA PDNS_PTR_DATAW +#define DNS_SIG_DATA DNS_SIG_DATAW +#define PDNS_SIG_DATA PDNS_SIG_DATAW +#define DNS_SOA_DATA DNS_SOA_DATAW +#define PDNS_SOA_DATA PDNS_SOA_DATAW +#define DNS_TXT_DATA DNS_TXT_DATAW +#define PDNS_TXT_DATA PDNS_TXT_DATAW +#define DNS_TKEY_DATA DNS_TKEY_DATAW +#define PDNS_TKEY_DATA PDNS_TKEY_DATAW +#define DNS_WINSR_DATA DNS_WINSR_DATAW +#define PDNS_WINSR_DATA PDNS_WINSR_DATAW #define DnsAcquireContextHandle DnsAcquireContextHandle_W #define DnsModifyRecordsInSet DnsModifyRecordsInSet_W #define DnsNameCompare DnsNameCompare_W @@ -346,6 +489,24 @@ #define DnsReplaceRecordSet DnsReplaceRecordSetW #define DnsValidateName DnsValidateName_W #else +#define DNS_MINFO_DATA DNS_MINFO_DATAA +#define PDNS_MINFO_DATA PDNS_MINFO_DATAA +#define DNS_MX_DATA DNS_MX_DATAA +#define PDNS_MX_DATA PDNS_MX_DATAA +#define DNS_NXT_DATA DNS_NXT_DATAA +#define PDNS_NXT_DATA PDNS_NXT_DATAA +#define DNS_PTR_DATA DNS_PTR_DATAA +#define PDNS_PTR_DATA PDNS_PTR_DATAA +#define DNS_SIG_DATA DNS_SIG_DATAA +#define PDNS_SIG_DATA PDNS_SIG_DATAA +#define DNS_SOA_DATA DNS_SOA_DATAA +#define PDNS_SOA_DATA PDNS_SOA_DATAA +#define DNS_TXT_DATA DNS_TXT_DATAA +#define PDNS_TXT_DATA PDNS_TXT_DATAA +#define DNS_TKEY_DATA DNS_TKEY_DATAA +#define PDNS_TKEY_DATA PDNS_TKEY_DATAA +#define DNS_WINSR_DATA DNS_WINSR_DATAA +#define PDNS_WINSR_DATA PDNS_WINSR_DATAA #define DnsAcquireContextHandle DnsAcquireContextHandle_A #define DnsModifyRecordsInSet DnsModifyRecordsInSet_A #define DnsNameCompare DnsNameCompare_A

19 years, 6 months

[jimtabor] 16722: Patch by Robert Shearman rob@codeweavers.com, Use GdiGetCharDimensions Instead of DIALOG_GetCharSize.

by jimtabor＠svn.reactos.com

Patch by Robert Shearman rob(a)codeweavers.com, Use GdiGetCharDimensions Instead of DIALOG_GetCharSize. Modified: trunk/reactos/lib/gdi32/objects/font.c Modified: trunk/reactos/lib/user32/include/user32.h Modified: trunk/reactos/lib/user32/windows/dialog.c _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2005-07-24 22:17:02 UTC (rev 16721) +++ trunk/reactos/lib/gdi32/objects/font.c 2005-07-25 04:21:29 UTC (rev 16722) @@ -806,6 +806,12 @@ * * SEE ALSO * GetTextExtentPointW, GetTextMetricsW, MapDialogRect. + * + * Despite most of MSDN insisting that the horizontal base unit is + * tmAveCharWidth it isn't. Knowledge base article Q145994 + * "HOWTO: Calculate Dialog Units When Not Using the System Font", + * says that we should take the average of the 52 English upper and lower + * case characters. */ /* * @implemented _____ Modified: trunk/reactos/lib/user32/include/user32.h --- trunk/reactos/lib/user32/include/user32.h 2005-07-24 22:17:02 UTC (rev 16721) +++ trunk/reactos/lib/user32/include/user32.h 2005-07-25 04:21:29 UTC (rev 16722) @@ -33,5 +33,6 @@ /* FIXME: FILIP */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); +DWORD STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, DWORD *); #endif /* USER32_H */ _____ Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-07-24 22:17:02 UTC (rev 16721) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-07-25 04:21:29 UTC (rev 16722) @@ -692,11 +692,14 @@ if (dlgInfo->hUserFont) { SIZE charSize; - if (DIALOG_GetCharSize( dc, dlgInfo->hUserFont, &charSize )) + HFONT hOldFont = SelectObject( dc, dlgInfo->hUserFont ); + charSize.cx = GdiGetCharDimensions( dc, NULL, &charSize.cy ); + if (charSize.cx) { dlgInfo->xBaseUnit = charSize.cx; dlgInfo->yBaseUnit = charSize.cy; } + SelectObject( dc, hOldFont ); } ReleaseDC(0, dc); } @@ -1828,7 +1831,8 @@ if ((hdc = GetDC(0))) { - if (DIALOG_GetCharSize( hdc, 0, &size )) units = MAKELONG( size.cx, size.cy ); + size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + if (size.cx) units = MAKELONG( size.cx, size.cy ); ReleaseDC( 0, hdc ); } }

19 years, 6 months

[ekohl] 16721: Fix grammar of the size_is attribute so that size_is(*Length) gets accepted.

by ekohl＠svn.reactos.com

Fix grammar of the size_is attribute so that size_is(*Length) gets accepted. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/lex.yy.c Modified: trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/proxy.c Modified: trunk/reactos/tools/widl/server.c Modified: trunk/reactos/tools/widl/y.tab.c Modified: trunk/reactos/tools/widl/y.tab.h _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-07-24 21:42:00 UTC (rev 16720) +++ trunk/reactos/tools/widl/ChangeLog 2005-07-24 22:17:02 UTC (rev 16721) @@ -1,5 +1,17 @@ ChangeLog +2005-07-25 ekohl + + tools/widl/client.c + tools/widl/lex.yy.c + tools/widl/parser.y + tools/widl/proxy.c + tools/widl/server.c + tools/widl/y.tab.c + tools/widl/y.tab.h + +- Fix grammar of the size_is attribute so that size_is(*Length) gets accepted. + 2005-07-23 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-07-24 21:42:00 UTC (rev 16720) +++ trunk/reactos/tools/widl/client.c 2005-07-24 22:17:02 UTC (rev 16721) @@ -522,7 +522,7 @@ { unsigned char type_type = 0; - type = get_type_by_name(func, ((expr_t *)sizeis_attr)->u.sval); + type = get_type_by_name(func, ((var_t *)sizeis_attr)->name); if (type != NULL) type_type = type->type; @@ -541,10 +541,10 @@ fprintf(client, "#ifndef _ALPHA_\n"); print_client("NdrFcShort(0x%02X),\n", - get_var_stack_offset_32(func, ((expr_t *)sizeis_attr)->u.sval)); + get_var_stack_offset_32(func, ((var_t *)sizeis_attr)->name)); fprintf(client, "#else\n"); print_client("NdrFcShort(0x%02X),\n", - get_var_stack_offset_64(func, ((expr_t *)sizeis_attr)->u.sval)); + get_var_stack_offset_64(func, ((var_t *)sizeis_attr)->name)); fprintf(client, "#endif\n"); } else _____ Modified: trunk/reactos/tools/widl/lex.yy.c --- trunk/reactos/tools/widl/lex.yy.c 2005-07-24 21:42:00 UTC (rev 16720) +++ trunk/reactos/tools/widl/lex.yy.c 2005-07-24 22:17:02 UTC (rev 16721) @@ -1,3 +1,4 @@ +#line 2 "lex.yy.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -9,7 +10,6 @@ #define YY_FLEX_MINOR_VERSION 5 #include <stdio.h> -#include <unistd.h> /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ @@ -23,6 +23,7 @@ #ifdef __cplusplus #include <stdlib.h> +#include <unistd.h> /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -3087,7 +3088,7 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "./parser.l" +#line 1 "parser.l" #define INITIAL 0 /* * IDL Compiler @@ -3114,7 +3115,7 @@ #define pp_line 2 -#line 36 "./parser.l" +#line 36 "parser.l" #include "config.h" @@ -3185,7 +3186,7 @@ * The flexer starts here ************************************************************************ ** */ -#line 3189 "lex.yy.c" +#line 3190 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -3336,12 +3337,12 @@ YY_DECL { register yy_state_type yy_current_state; - register char *yy_cp = NULL, *yy_bp = NULL; + register char *yy_cp, *yy_bp; register int yy_act; -#line 108 "./parser.l" +#line 108 "parser.l" -#line 3345 "lex.yy.c" +#line 3346 "lex.yy.c" if ( yy_init ) { @@ -3430,12 +3431,12 @@ case 1: YY_RULE_SETUP -#line 109 "./parser.l" +#line 109 "parser.l" yy_push_state(pp_line); YY_BREAK case 2: YY_RULE_SETUP -#line 110 "./parser.l" +#line 110 "parser.l" { int lineno; char *cptr, *fname; @@ -3458,12 +3459,12 @@ YY_BREAK case 3: YY_RULE_SETUP -#line 129 "./parser.l" +#line 129 "parser.l" yy_push_state(QUOTE); cbufidx = 0; YY_BREAK case 4: YY_RULE_SETUP -#line 130 "./parser.l" +#line 130 "parser.l" { yy_pop_state(); yylval.str = get_buffered_cstring(); @@ -3471,25 +3472,25 @@ } YY_BREAK case 5: -#line 136 "./parser.l" +#line 136 "parser.l" case 6: YY_RULE_SETUP -#line 136 "./parser.l" +#line 136 "parser.l" addcchar(yytext[1]); YY_BREAK case 7: YY_RULE_SETUP -#line 137 "./parser.l" +#line 137 "parser.l" addcchar('\\'); addcchar(yytext[1]); YY_BREAK case 8: YY_RULE_SETUP -#line 138 "./parser.l" +#line 138 "parser.l" addcchar(yytext[0]); YY_BREAK case 9: YY_RULE_SETUP -#line 139 "./parser.l" +#line 139 "parser.l" { yylval.uuid = parse_uuid(yytext); return aUUID; @@ -3497,7 +3498,7 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 143 "./parser.l" +#line 143 "parser.l" { yylval.num = strtoul(yytext, NULL, 0); return aHEXNUM; @@ -3505,7 +3506,7 @@ YY_BREAK case 11: YY_RULE_SETUP -#line 147 "./parser.l" +#line 147 "parser.l" { yylval.num = strtoul(yytext, NULL, 0); return aNUM; @@ -3513,38 +3514,38 @@ YY_BREAK case 12: YY_RULE_SETUP -#line 151 "./parser.l" +#line 151 "parser.l" return kw_token(yytext); YY_BREAK case 13: YY_RULE_SETUP -#line 152 "./parser.l" +#line 152 "parser.l" line_number++; YY_BREAK case 14: YY_RULE_SETUP -#line 153 "./parser.l" +#line 153 "parser.l" YY_BREAK case 15: YY_RULE_SETUP -#line 154 "./parser.l" +#line 154 "parser.l" return SHL; YY_BREAK case 16: YY_RULE_SETUP -#line 155 "./parser.l" +#line 155 "parser.l" return SHR; YY_BREAK case 17: YY_RULE_SETUP -#line 156 "./parser.l" +#line 156 "parser.l" return yytext[0]; YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(QUOTE): case YY_STATE_EOF(pp_line): -#line 157 "./parser.l" +#line 157 "parser.l" { if (import_stack_ptr) { pop_import(); @@ -3555,10 +3556,10 @@ YY_BREAK case 18: YY_RULE_SETUP -#line 164 "./parser.l" +#line 164 "parser.l" ECHO; YY_BREAK -#line 3562 "lex.yy.c" +#line 3563 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -3934,7 +3935,6 @@ #endif /* ifndef YY_NO_UNPUT */ -#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else @@ -4007,8 +4007,8 @@ return c; } -#endif /* YY_NO_INPUT */ + #ifdef YY_USE_PROTOS void yyrestart( FILE *input_file ) #else @@ -4118,6 +4118,11 @@ } +#ifndef YY_ALWAYS_INTERACTIVE +#ifndef YY_NEVER_INTERACTIVE +extern int isatty YY_PROTO(( int )); +#endif +#endif #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) @@ -4435,7 +4440,7 @@ return 0; } #endif -#line 164 "./parser.l" +#line 164 "parser.l" #ifndef yywrap _____ Modified: trunk/reactos/tools/widl/parser.y --- trunk/reactos/tools/widl/parser.y 2005-07-24 21:42:00 UTC (rev 16720) +++ trunk/reactos/tools/widl/parser.y 2005-07-24 22:17:02 UTC (rev 16721) @@ -363,7 +363,7 @@ | tIMPLICITHANDLE '(' tHANDLET aIDENTIFIER ')' { $$ = make_attrp(ATTR_IMPLICIT_HANDLE, $4); } | tIN { $$ = make_attr(ATTR_IN); } | tINPUTSYNC { $$ = make_attr(ATTR_INPUTSYNC); } - | tLENGTHIS '(' m_exprs ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } + | tLENGTHIS '(' pident_list ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } | tLOCAL { $$ = make_attr(ATTR_LOCAL); } | tNONCREATABLE { $$ = make_attr(ATTR_NONCREATABLE); } | tOBJECT { $$ = make_attr(ATTR_OBJECT); } @@ -381,7 +381,7 @@ | tREF { $$ = make_attr(ATTR_REF); } | tRESTRICTED { $$ = make_attr(ATTR_RESTRICTED); } | tRETVAL { $$ = make_attr(ATTR_RETVAL); } - | tSIZEIS '(' m_exprs ')' { $$ = make_attrp(ATTR_SIZEIS, $3); } + | tSIZEIS '(' pident_list ')' { $$ = make_attrp(ATTR_SIZEIS, $3); } | tSOURCE { $$ = make_attr(ATTR_SOURCE); } | tSTRING { $$ = make_attr(ATTR_STRING); } | tSWITCHIS '(' expr ')' { $$ = make_attrp(ATTR_SWITCHIS, $3); } _____ Modified: trunk/reactos/tools/widl/proxy.c --- trunk/reactos/tools/widl/proxy.c 2005-07-24 21:42:00 UTC (rev 16720) +++ trunk/reactos/tools/widl/proxy.c 2005-07-24 22:17:02 UTC (rev 16721) @@ -206,13 +206,13 @@ { int index = 0; type_t *type = get_base_type(arg); - expr_t *expr; + var_t *var; - expr = get_attrp( arg->attrs, ATTR_SIZEIS ); - if (expr) + var = get_attrp( arg->attrs, ATTR_SIZEIS ); + if (var) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_name(proxy, var); fprintf(proxy, ";\n\n"); print_proxy( "NdrConformantArrayBufferSize( &_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); @@ -238,7 +238,7 @@ case RPC_FC_ENUM32: print_proxy( "_StubMsg.BufferLength += %d; /* %s */\n", 4, arg->name ); break; - + case RPC_FC_STRUCT: print_proxy( "NdrSimpleStructBufferSize(&_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index ); @@ -285,7 +285,7 @@ END_OF_LIST(arg); while (arg) { - if (is_attr(arg->attrs, ATTR_IN)) + if (is_attr(arg->attrs, ATTR_IN)) { marshall_size_arg( arg ); fprintf(proxy, "\n"); @@ -298,13 +298,13 @@ { int index = 0; type_t *type = get_base_type(arg); - expr_t *expr; + var_t *var; - expr = get_attrp( arg->attrs, ATTR_SIZEIS ); - if (expr) + var = get_attrp( arg->attrs, ATTR_SIZEIS ); + if (var) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_name(proxy, var); fprintf(proxy, ";\n\n"); print_proxy( "NdrConformantArrayMarshall( &_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); @@ -326,7 +326,7 @@ write_type(proxy, arg->type, arg, arg->tname); fprintf(proxy,"*)_StubMsg.Buffer)++ = %s;\n", arg->name ); break; - + case RPC_FC_STRUCT: /* FIXME: add the format string, and set the index below */ print_proxy( "NdrSimpleStructMarshall(&_StubMsg, (unsigned char*)%s, ", arg->name ); @@ -370,7 +370,7 @@ { END_OF_LIST(arg); while (arg) { - if (is_attr(arg->attrs, ATTR_IN)) + if (is_attr(arg->attrs, ATTR_IN)) { marshall_copy_arg( arg ); fprintf(proxy, "\n"); @@ -397,10 +397,10 @@ { int index = 0; type_t *type = get_base_type(arg); - expr_t *expr; + var_t *var; - expr = get_attrp( arg->attrs, ATTR_SIZEIS ); - if (expr) + var = get_attrp( arg->attrs, ATTR_SIZEIS ); + if (var) { print_proxy( "NdrConformantArrayUnmarshall( &_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); @@ -422,7 +422,7 @@ write_type(proxy, arg->type, arg, arg->tname); fprintf(proxy,"*)_StubMsg.Buffer)++;\n"); break; - + case RPC_FC_STRUCT: print_proxy( "NdrSimpleStructUnmarshall(&_StubMsg, (unsigned char**)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0);\n", index ); @@ -467,7 +467,7 @@ { END_OF_LIST(arg); while (arg) { - if (is_attr(arg->attrs, ATTR_OUT)) + if (is_attr(arg->attrs, ATTR_OUT)) { unmarshall_copy_arg( arg ); fprintf(proxy, "\n"); @@ -481,13 +481,13 @@ var_t *constraint; int index = 0; /* FIXME */ type_t *type; - expr_t *expr; + var_t *var; - expr = get_attrp( arg->attrs, ATTR_SIZEIS ); - if (expr) + var = get_attrp( arg->attrs, ATTR_SIZEIS ); + if (var) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_name(proxy, var); fprintf(proxy, ";\n\n"); print_proxy( "NdrClearOutParameters( &_StubMsg, "); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], ", index ); @@ -529,7 +529,7 @@ { END_OF_LIST(arg); while (arg) { - if (is_attr(arg->attrs, ATTR_OUT)) + if (is_attr(arg->attrs, ATTR_OUT)) { free_variable( arg ); fprintf(proxy, "\n"); @@ -587,7 +587,7 @@ gen_unmarshall( cur->args ); if (has_ret) { - /* + /* * FIXME: We only need to round the buffer up if it could be unaligned... * We should calculate how much buffer we used and output the following * line only if necessary. @@ -790,7 +790,7 @@ fprintf(proxy, "\n"); if (has_ret) { - /* + /* * FIXME: We only need to round the buffer up if it could be unaligned... * We should calculate how much buffer we used and output the following * line only if necessary. _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-07-24 21:42:00 UTC (rev 16720) +++ trunk/reactos/tools/widl/server.c 2005-07-24 22:17:02 UTC (rev 16721) @@ -113,7 +113,7 @@ get_var_type_offset(var_t *var) { unsigned int toffset = 0; - void *size_is_attr; + void *sizeis_attr; int string_attr; if (var->ptr_level == 0) @@ -138,10 +138,10 @@ } else if (var->ptr_level == 1) { - size_is_attr = get_attrp(var->attrs, ATTR_SIZEIS); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); string_attr = is_attr(var->attrs, ATTR_STRING); - if (size_is_attr) + if (sizeis_attr) { if (string_attr) { @@ -519,7 +519,7 @@ { unsigned char type_type = 0; - type = get_type_by_name(func, ((expr_t *)sizeis_attr)->u.sval); + type = get_type_by_name(func, ((var_t *)sizeis_attr)->name); if (type != NULL) type_type = type->type; @@ -538,10 +538,10 @@ fprintf(server, "#ifndef _ALPHA_\n"); print_server("NdrFcShort(0x%02X),\n", - get_var_stack_offset_32(func, ((expr_t *)sizeis_attr)->u.sval)); + get_var_stack_offset_32(func, ((var_t *)sizeis_attr)->name)); fprintf(server, "#else\n"); print_server("NdrFcShort(0x%02X),\n", - get_var_stack_offset_64(func, ((expr_t *)sizeis_attr)->u.sval)); + get_var_stack_offset_64(func, ((var_t *)sizeis_attr)->name)); fprintf(server, "#endif\n"); } else @@ -815,7 +815,7 @@ var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { - print_server("_StubMsg.MaxCount = %s;\n", ((expr_t *)sizeis_attr)->u.sval); + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); fprintf(server, "\n"); print_server("NdrConformantStringBufferSize(\n"); indent++; @@ -1160,7 +1160,7 @@ if (string_attr) { fprintf(server, "\n"); - print_server("_StubMsg.MaxCount = %s;\n", ((expr_t *)sizeis_attr)->u.sval); + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); fprintf(server, "\n"); print_server("NdrConformantStringMarshall(\n"); indent++; @@ -1360,7 +1360,7 @@ indent++; if (string_attr) { - print_server("_StubMsg.MaxCount = %s;\n", ((expr_t *)sizeis_attr)->u.sval); + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); fprintf(server, "\n"); print_server("NdrPointerFree(\n"); indent++; @@ -1406,7 +1406,7 @@ unsigned int i, sep; int in_attr; int out_attr; - void *size_is_attr; + void *sizeis_attr; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -1462,11 +1462,11 @@ { in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); - size_is_attr = get_attrp(var->attrs, ATTR_SIZEIS); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); if (!out_attr && !in_attr) in_attr = 1; - if (!in_attr && !size_is_attr) + if (!in_attr && !sizeis_attr) { if (var->type->type == RPC_FC_RP) { @@ -1567,16 +1567,16 @@ if (!out_attr && !in_attr) in_attr = 1; - size_is_attr = get_attrp(var->attrs, ATTR_SIZEIS); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); if (!in_attr) { - if (size_is_attr != NULL) + if (sizeis_attr != NULL) { print_server(""); write_name(server, var); fprintf(server, " = NdrAllocate(&_StubMsg, %s * %d);\n", - ((expr_t *)size_is_attr)->u.sval, get_type_size(var->type, 1)); + ((var_t *)sizeis_attr)->name, get_type_size(var->type, 1)); sep = 1; } else _____ Modified: trunk/reactos/tools/widl/y.tab.c --- trunk/reactos/tools/widl/y.tab.c 2005-07-24 21:42:00 UTC (rev 16720) +++ trunk/reactos/tools/widl/y.tab.c 2005-07-24 22:17:02 UTC (rev 16721) @@ -1,134 +1,313 @@ -/* A Bison parser, made from ./parser.y - by GNU bison 1.35. */ +/* A Bison parser, made by GNU Bison 1.875. */ -#define YYBISON 1 /* Identify Bison output. */ +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. -# define aIDENTIFIER 257 -# define aKNOWNTYPE 258 -# define aNUM 259 -# define aHEXNUM 260 -# define aSTRING 261 -# define aUUID 262 -# define aEOF 263 -# define SHL 264 -# define SHR 265 -# define tAGGREGATABLE 266 -# define tALLOCATE 267 -# define tAPPOBJECT 268 -# define tARRAYS 269 -# define tASYNC 270 -# define tASYNCUUID 271 -# define tAUTOHANDLE 272 -# define tBINDABLE 273 -# define tBOOLEAN 274 -# define tBROADCAST 275 -# define tBYTE 276 -# define tBYTECOUNT 277 -# define tCALLAS 278 -# define tCALLBACK 279 -# define tCASE 280 -# define tCDECL 281 -# define tCHAR 282 -# define tCOCLASS 283 -# define tCODE 284 -# define tCOMMSTATUS 285 -# define tCONST 286 -# define tCONTEXTHANDLE 287 -# define tCONTEXTHANDLENOSERIALIZE 288 -# define tCONTEXTHANDLESERIALIZE 289 -# define tCONTROL 290 -# define tCPPQUOTE 291 -# define tDEFAULT 292 -# define tDEFAULTVALUE 293 -# define tDISPINTERFACE 294 -# define tDLLNAME 295 -# define tDOUBLE 296 -# define tDUAL 297 -# define tENDPOINT 298 -# define tENTRY 299 -# define tENUM 300 -# define tERRORSTATUST 301 -# define tEXPLICITHANDLE 302 -# define tEXTERN 303 -# define tFLOAT 304 -# define tHANDLE 305 -# define tHANDLET 306 -# define tHELPCONTEXT 307 -# define tHELPFILE 308 -# define tHELPSTRING 309 -# define tHELPSTRINGCONTEXT 310 -# define tHELPSTRINGDLL 311 -# define tHIDDEN 312 -# define tHYPER 313 -# define tID 314 -# define tIDEMPOTENT 315 -# define tIIDIS 316 -# define tIMPLICITHANDLE 317 -# define tIMPORT 318 -# define tIMPORTLIB 319 -# define tIN 320 -# define tINCLUDE 321 -# define tINLINE 322 -# define tINPUTSYNC 323 -# define tINT 324 -# define tINT64 325 -# define tINTERFACE 326 -# define tLENGTHIS 327 -# define tLIBRARY 328 -# define tLOCAL 329 -# define tLONG 330 -# define tMETHODS 331 -# define tMODULE 332 -# define tNONCREATABLE 333 -# define tOBJECT 334 -# define tODL 335 -# define tOLEAUTOMATION 336 -# define tOPTIONAL 337 -# define tOUT 338 -# define tPOINTERDEFAULT 339 -# define tPROPERTIES 340 -# define tPROPGET 341 -# define tPROPPUT 342 -# define tPROPPUTREF 343 -# define tPTR 344 -# define tPUBLIC 345 -# define tREADONLY 346 -# define tREF 347 -# define tRESTRICTED 348 -# define tRETVAL 349 -# define tSHORT 350 -# define tSIGNED 351 -# define tSINGLE 352 -# define tSIZEIS 353 -# define tSIZEOF 354 -# define tSMALL 355 -# define tSOURCE 356 -# define tSTDCALL 357 -# define tSTRING 358 -# define tSTRUCT 359 -# define tSWITCH 360 -# define tSWITCHIS 361 -# define tSWITCHTYPE 362 -# define tTRANSMITAS 363 -# define tTYPEDEF 364 -# define tUNION 365 -# define tUNIQUE 366 -# define tUNSIGNED 367 -# define tUUID 368 -# define tV1ENUM 369 -# define tVARARG 370 -# define tVERSION 371 -# define tVOID 372 -# define tWCHAR 373 -# define tWIREMARSHAL 374 -# define tPOINTERTYPE 375 -# define COND 376 -# define CAST 377 -# define PPTR 378 -# define NEG 379 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -#line 1 "./parser.y" + This program 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 General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ + +/* Written by Richard Stallman by simplifying the original so called + ``semantic'' parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 0 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + aIDENTIFIER = 258, + aKNOWNTYPE = 259, + aNUM = 260, + aHEXNUM = 261, + aSTRING = 262, + aUUID = 263, + aEOF = 264, + SHL = 265, + SHR = 266, + tAGGREGATABLE = 267, + tALLOCATE = 268, + tAPPOBJECT = 269, + tARRAYS = 270, + tASYNC = 271, + tASYNCUUID = 272, + tAUTOHANDLE = 273, + tBINDABLE = 274, + tBOOLEAN = 275, + tBROADCAST = 276, + tBYTE = 277, + tBYTECOUNT = 278, + tCALLAS = 279, + tCALLBACK = 280, + tCASE = 281, + tCDECL = 282, + tCHAR = 283, + tCOCLASS = 284, + tCODE = 285, + tCOMMSTATUS = 286, + tCONST = 287, + tCONTEXTHANDLE = 288, + tCONTEXTHANDLENOSERIALIZE = 289, + tCONTEXTHANDLESERIALIZE = 290, + tCONTROL = 291, + tCPPQUOTE = 292, + tDEFAULT = 293, + tDEFAULTVALUE = 294, + tDISPINTERFACE = 295, + tDLLNAME = 296, + tDOUBLE = 297, + tDUAL = 298, + tENDPOINT = 299, + tENTRY = 300, + tENUM = 301, + tERRORSTATUST = 302, + tEXPLICITHANDLE = 303, + tEXTERN = 304, + tFLOAT = 305, + tHANDLE = 306, + tHANDLET = 307, + tHELPCONTEXT = 308, + tHELPFILE = 309, + tHELPSTRING = 310, + tHELPSTRINGCONTEXT = 311, + tHELPSTRINGDLL = 312, + tHIDDEN = 313, + tHYPER = 314, + tID = 315, + tIDEMPOTENT = 316, + tIIDIS = 317, + tIMPLICITHANDLE = 318, + tIMPORT = 319, + tIMPORTLIB = 320, + tIN = 321, + tINCLUDE = 322, + tINLINE = 323, + tINPUTSYNC = 324, + tINT = 325, + tINT64 = 326, + tINTERFACE = 327, + tLENGTHIS = 328, + tLIBRARY = 329, + tLOCAL = 330, + tLONG = 331, + tMETHODS = 332, + tMODULE = 333, + tNONCREATABLE = 334, + tOBJECT = 335, + tODL = 336, + tOLEAUTOMATION = 337, + tOPTIONAL = 338, + tOUT = 339, + tPOINTERDEFAULT = 340, + tPROPERTIES = 341, + tPROPGET = 342, + tPROPPUT = 343, + tPROPPUTREF = 344, + tPTR = 345, + tPUBLIC = 346, + tREADONLY = 347, + tREF = 348, + tRESTRICTED = 349, + tRETVAL = 350, + tSHORT = 351, + tSIGNED = 352, + tSINGLE = 353, + tSIZEIS = 354, + tSIZEOF = 355, + tSMALL = 356, + tSOURCE = 357, + tSTDCALL = 358, + tSTRING = 359, + tSTRUCT = 360, + tSWITCH = 361, + tSWITCHIS = 362, + tSWITCHTYPE = 363, + tTRANSMITAS = 364, + tTYPEDEF = 365, + tUNION = 366, + tUNIQUE = 367, + tUNSIGNED = 368, + tUUID = 369, + tV1ENUM = 370, + tVARARG = 371, + tVERSION = 372, + tVOID = 373, + tWCHAR = 374, + tWIREMARSHAL = 375, + tPOINTERTYPE = 376, + COND = 377, + CAST = 378, + PPTR = 379, + NEG = 380 + }; +#endif +#define aIDENTIFIER 258 +#define aKNOWNTYPE 259 +#define aNUM 260 +#define aHEXNUM 261 +#define aSTRING 262 +#define aUUID 263 +#define aEOF 264 +#define SHL 265 +#define SHR 266 +#define tAGGREGATABLE 267 +#define tALLOCATE 268 +#define tAPPOBJECT 269 +#define tARRAYS 270 +#define tASYNC 271 +#define tASYNCUUID 272 +#define tAUTOHANDLE 273 +#define tBINDABLE 274 +#define tBOOLEAN 275 +#define tBROADCAST 276 +#define tBYTE 277 +#define tBYTECOUNT 278 +#define tCALLAS 279 +#define tCALLBACK 280 +#define tCASE 281 +#define tCDECL 282 +#define tCHAR 283 +#define tCOCLASS 284 +#define tCODE 285 +#define tCOMMSTATUS 286 +#define tCONST 287 +#define tCONTEXTHANDLE 288 +#define tCONTEXTHANDLENOSERIALIZE 289 +#define tCONTEXTHANDLESERIALIZE 290 +#define tCONTROL 291 +#define tCPPQUOTE 292 +#define tDEFAULT 293 +#define tDEFAULTVALUE 294 +#define tDISPINTERFACE 295 +#define tDLLNAME 296 +#define tDOUBLE 297 +#define tDUAL 298 +#define tENDPOINT 299 +#define tENTRY 300 +#define tENUM 301 +#define tERRORSTATUST 302 +#define tEXPLICITHANDLE 303 +#define tEXTERN 304 +#define tFLOAT 305 +#define tHANDLE 306 +#define tHANDLET 307 +#define tHELPCONTEXT 308 +#define tHELPFILE 309 +#define tHELPSTRING 310 +#define tHELPSTRINGCONTEXT 311 +#define tHELPSTRINGDLL 312 +#define tHIDDEN 313 +#define tHYPER 314 +#define tID 315 +#define tIDEMPOTENT 316 +#define tIIDIS 317 +#define tIMPLICITHANDLE 318 +#define tIMPORT 319 +#define tIMPORTLIB 320 +#define tIN 321 +#define tINCLUDE 322 +#define tINLINE 323 +#define tINPUTSYNC 324 +#define tINT 325 +#define tINT64 326 +#define tINTERFACE 327 +#define tLENGTHIS 328 +#define tLIBRARY 329 +#define tLOCAL 330 +#define tLONG 331 +#define tMETHODS 332 +#define tMODULE 333 +#define tNONCREATABLE 334 +#define tOBJECT 335 +#define tODL 336 +#define tOLEAUTOMATION 337 +#define tOPTIONAL 338 +#define tOUT 339 +#define tPOINTERDEFAULT 340 +#define tPROPERTIES 341 +#define tPROPGET 342 +#define tPROPPUT 343 +#define tPROPPUTREF 344 +#define tPTR 345 +#define tPUBLIC 346 +#define tREADONLY 347 +#define tREF 348 +#define tRESTRICTED 349 +#define tRETVAL 350 +#define tSHORT 351 +#define tSIGNED 352 +#define tSINGLE 353 +#define tSIZEIS 354 +#define tSIZEOF 355 +#define tSMALL 356 +#define tSOURCE 357 +#define tSTDCALL 358 +#define tSTRING 359 [truncated at 1000 lines; 4948 more skipped]

19 years, 6 months

[mf] 16720: set eol-style for most xml files

by mf＠svn.reactos.com

set eol-style for most xml files Modified: trunk/reactos/ReactOS.xml Modified: trunk/reactos/apps/directory.xml Modified: trunk/reactos/apps/utils/directory.xml Modified: trunk/reactos/apps/utils/net/arp/arp.xml Modified: trunk/reactos/apps/utils/net/directory.xml Modified: trunk/reactos/apps/utils/net/ftp/ftp.xml Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.xml Modified: trunk/reactos/apps/utils/net/netstat/netstat.xml Modified: trunk/reactos/apps/utils/net/ping/ping.xml Modified: trunk/reactos/apps/utils/net/route/route.xml Modified: trunk/reactos/apps/utils/net/telnet/telnet.xml Modified: trunk/reactos/apps/utils/net/tracert/tracert.xml Modified: trunk/reactos/apps/utils/ps/ps.xml Modified: trunk/reactos/apps/utils/rosperf/rosperf.xml Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/boot/boot.xml Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.xml Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.xml Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml Modified: trunk/reactos/boot/freeldr/freeldr.xml Modified: trunk/reactos/bootdata/bootdata.xml Modified: trunk/reactos/config.template.xml Modified: trunk/reactos/drivers/bus/acpi/acpi.xml Modified: trunk/reactos/drivers/bus/directory.xml Modified: trunk/reactos/drivers/bus/isapnp/isapnp.xml Modified: trunk/reactos/drivers/bus/pci/pci.xml Modified: trunk/reactos/drivers/dd/beep/beep.xml Modified: trunk/reactos/drivers/dd/blue/blue.xml Modified: trunk/reactos/drivers/dd/bootvid/bootvid.xml Modified: trunk/reactos/drivers/dd/debugout/debugout.xml Modified: trunk/reactos/drivers/dd/directory.xml Modified: trunk/reactos/drivers/dd/mpu401/mpu401.xml Modified: trunk/reactos/drivers/dd/null/null.xml Modified: trunk/reactos/drivers/dd/parallel/parallel.xml Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.xml Modified: trunk/reactos/drivers/dd/serial/serial.xml Modified: trunk/reactos/drivers/dd/sndblst/sndblst.xml Modified: trunk/reactos/drivers/dd/sound/sound.xml Modified: trunk/reactos/drivers/directory.xml Modified: trunk/reactos/drivers/fs/cdfs/cdfs.xml Modified: trunk/reactos/drivers/fs/directory.xml Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.xml Modified: trunk/reactos/drivers/fs/ms/msfs.xml Modified: trunk/reactos/drivers/fs/mup/mup.xml Modified: trunk/reactos/drivers/fs/np/npfs.xml Modified: trunk/reactos/drivers/fs/ntfs/ntfs.xml Modified: trunk/reactos/drivers/fs/vfat/vfatfs.xml Modified: trunk/reactos/drivers/input/directory.xml Modified: trunk/reactos/drivers/input/mouclass/mouclass.xml Modified: trunk/reactos/drivers/input/sermouse/sermouse.xml Modified: trunk/reactos/drivers/lib/bzip2/bzip2.xml Modified: trunk/reactos/drivers/lib/csq/csq.xml Modified: trunk/reactos/drivers/lib/directory.xml Modified: trunk/reactos/drivers/lib/ip/ip.xml Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp.xml Modified: trunk/reactos/drivers/net/afd/afd.xml Modified: trunk/reactos/drivers/net/dd/directory.xml Modified: trunk/reactos/drivers/net/dd/ne2000/ne2000.xml Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.xml Modified: trunk/reactos/drivers/net/directory.xml Modified: trunk/reactos/drivers/net/ndis/ndis.xml Modified: trunk/reactos/drivers/net/npf/npf.xml Modified: trunk/reactos/drivers/net/tcpip/tcpip.xml Modified: trunk/reactos/drivers/net/tdi/tdi.xml Modified: trunk/reactos/drivers/net/wshtcpip/wshtcpip.xml Modified: trunk/reactos/drivers/storage/atapi/atapi.xml Modified: trunk/reactos/drivers/storage/cdrom/cdrom.xml Modified: trunk/reactos/drivers/storage/class2/class2.xml Modified: trunk/reactos/drivers/storage/directory.xml Modified: trunk/reactos/drivers/storage/disk/disk.xml Modified: trunk/reactos/drivers/storage/diskdump/diskdump.xml Modified: trunk/reactos/drivers/storage/floppy/floppy.xml Modified: trunk/reactos/drivers/storage/scsiport/scsiport.xml Modified: trunk/reactos/drivers/usb/directory.xml Modified: trunk/reactos/drivers/usb/miniport/directory.xml Modified: trunk/reactos/drivers/usb/usbhub/usbhub.xml Modified: trunk/reactos/drivers/video/directory.xml Modified: trunk/reactos/drivers/video/displays/directory.xml Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.xml Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.xml Modified: trunk/reactos/drivers/video/miniport/directory.xml Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.xml Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.xml Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml Modified: trunk/reactos/drivers/video/videoprt/videoprt.xml Modified: trunk/reactos/hal/directory.xml Modified: trunk/reactos/hal/hal/hal.xml Modified: trunk/reactos/hal/halx86/directory.xml Modified: trunk/reactos/hal/halx86/generic/generic.xml Modified: trunk/reactos/hal/halx86/mp/halmp.xml Modified: trunk/reactos/hal/halx86/up/halup.xml Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml Modified: trunk/reactos/lib/acledit/acledit.xml Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/adns/adns.xml [truncated at 100 lines; 154 more skipped] _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/ReactOS.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,80 +1,80 @@ -<?xml version="1.0"?> -<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config.xml"> - <xi:fallback> - <xi:include href="config.template.xml" /> - </xi:fallback> - </xi:include> - - <xi:include href="baseaddress.xml" /> - - <define name="_M_IX86" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="DBG" value="0"> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <compilerflag>-Wpointer-arith</compilerflag> - - <include>include</include> - <include>include/reactos</include> - <include>include/libs</include> - <include>include/drivers</include> - <include>include/subsys</include> - <include>w32api/include</include> - <include>w32api/include/ddk</include> - - <directory name="apps"> - <xi:include href="apps/directory.xml" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.xml" /> - </directory> - <directory name="bootdata"> - <xi:include href="bootdata/bootdata.xml" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/directory.xml" /> - </directory> - <directory name="hal"> - <xi:include href="hal/directory.xml" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.xml" /> - </directory> - <directory name="lib"> - <xi:include href="lib/directory.xml" /> - </directory> - <directory name="media"> - <xi:include href="media/directory.xml" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.xml" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.xml" /> - </directory> - <directory name="regtests"> - <xi:include href="regtests/directory.xml" /> - </directory> - <directory name="services"> - <xi:include href="services/directory.xml" /> - </directory> - <directory name="subsys"> - <xi:include href="subsys/directory.xml" /> - </directory> -</project> +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config.xml"> + <xi:fallback> + <xi:include href="config.template.xml" /> + </xi:fallback> + </xi:include> + + <xi:include href="baseaddress.xml" /> + + <define name="_M_IX86" /> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="DBG" value="0"> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <compilerflag>-Wpointer-arith</compilerflag> + + <include>include</include> + <include>include/reactos</include> + <include>include/libs</include> + <include>include/drivers</include> + <include>include/subsys</include> + <include>w32api/include</include> + <include>w32api/include/ddk</include> + + <directory name="apps"> + <xi:include href="apps/directory.xml" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.xml" /> + </directory> + <directory name="bootdata"> + <xi:include href="bootdata/bootdata.xml" /> + </directory> + <directory name="drivers"> + <xi:include href="drivers/directory.xml" /> + </directory> + <directory name="hal"> + <xi:include href="hal/directory.xml" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.xml" /> + </directory> + <directory name="lib"> + <xi:include href="lib/directory.xml" /> + </directory> + <directory name="media"> + <xi:include href="media/directory.xml" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.xml" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.xml" /> + </directory> + <directory name="regtests"> + <xi:include href="regtests/directory.xml" /> + </directory> + <directory name="services"> + <xi:include href="services/directory.xml" /> + </directory> + <directory name="subsys"> + <xi:include href="subsys/directory.xml" /> + </directory> +</project> Property changes on: trunk/reactos/ReactOS.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/directory.xml --- trunk/reactos/apps/directory.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/directory.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,3 +1,3 @@ -<directory name="utils"> - <xi:include href="utils/directory.xml" /> -</directory> +<directory name="utils"> + <xi:include href="utils/directory.xml" /> +</directory> Property changes on: trunk/reactos/apps/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/directory.xml --- trunk/reactos/apps/utils/directory.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/directory.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,10 +1,10 @@ -<directory name="net"> - <xi:include href="net/directory.xml" /> -</directory> -<directory name="rosperf"> - <xi:include href="rosperf/rosperf.xml" /> -</directory> -<directory name="ps"> - <xi:include href="ps/ps.xml" /> -</directory> - +<directory name="net"> + <xi:include href="net/directory.xml" /> +</directory> +<directory name="rosperf"> + <xi:include href="rosperf/rosperf.xml" /> +</directory> +<directory name="ps"> + <xi:include href="ps/ps.xml" /> +</directory> + Property changes on: trunk/reactos/apps/utils/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/arp/arp.xml --- trunk/reactos/apps/utils/net/arp/arp.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/arp/arp.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,11 +1,11 @@ -<module name="arp" type="win32cui" installbase="system32" installname="arp.exe"> - <include base="arp">.</include> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>iphlpapi</library> - <library>ws2_32</library> - <library>shlwapi</library> - <file>arp.c</file> - <file>arp.rc</file> -</module> - +<module name="arp" type="win32cui" installbase="system32" installname="arp.exe"> + <include base="arp">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>shlwapi</library> + <file>arp.c</file> + <file>arp.rc</file> +</module> + Property changes on: trunk/reactos/apps/utils/net/arp/arp.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/directory.xml --- trunk/reactos/apps/utils/net/directory.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/directory.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,30 +1,30 @@ -<directory name="arp"> - <xi:include href="arp/arp.xml" /> -</directory> -<directory name="finger"> - <xi:include href="finger/finger.xml" /> -</directory> -<directory name="ftp"> - <xi:include href="ftp/ftp.xml" /> -</directory> -<directory name="ipconfig"> - <xi:include href="ipconfig/ipconfig.xml" /> -</directory> -<directory name="netstat"> - <xi:include href="netstat/netstat.xml" /> -</directory> -<directory name="ping"> - <xi:include href="ping/ping.xml" /> -</directory> -<directory name="route"> - <xi:include href="route/route.xml" /> -</directory> -<directory name="telnet"> - <xi:include href="telnet/telnet.xml" /> -</directory> -<directory name="tracert"> - <xi:include href="tracert/tracert.xml" /> -</directory> -<directory name="whois"> - <xi:include href="whois/whois.xml" /> -</directory> +<directory name="arp"> + <xi:include href="arp/arp.xml" /> +</directory> +<directory name="finger"> + <xi:include href="finger/finger.xml" /> +</directory> +<directory name="ftp"> + <xi:include href="ftp/ftp.xml" /> +</directory> +<directory name="ipconfig"> + <xi:include href="ipconfig/ipconfig.xml" /> +</directory> +<directory name="netstat"> + <xi:include href="netstat/netstat.xml" /> +</directory> +<directory name="ping"> + <xi:include href="ping/ping.xml" /> +</directory> +<directory name="route"> + <xi:include href="route/route.xml" /> +</directory> +<directory name="telnet"> + <xi:include href="telnet/telnet.xml" /> +</directory> +<directory name="tracert"> + <xi:include href="tracert/tracert.xml" /> +</directory> +<directory name="whois"> + <xi:include href="whois/whois.xml" /> +</directory> Property changes on: trunk/reactos/apps/utils/net/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.xml --- trunk/reactos/apps/utils/net/ftp/ftp.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/ftp/ftp.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,16 +1,16 @@ -<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" warnings="true"> - <include base="ftp">.</include> - <define name="__USE_W32API" /> - <define name="lint" /> - <library>kernel32</library> - <library>ws2_32</library> - <library>iphlpapi</library> - <file>cmds.c</file> - <file>cmdtab.c</file> - <file>domacro.c</file> - <file>fake.c</file> - <file>ftp.c</file> - <file>main.c</file> - <file>ruserpass.c</file> - <file>ftp.rc</file> -</module> +<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" warnings="true"> + <include base="ftp">.</include> + <define name="__USE_W32API" /> + <define name="lint" /> + <library>kernel32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>cmds.c</file> + <file>cmdtab.c</file> + <file>domacro.c</file> + <file>fake.c</file> + <file>ftp.c</file> + <file>main.c</file> + <file>ruserpass.c</file> + <file>ftp.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/ftp/ftp.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.xml --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,10 +1,10 @@ -<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" warnings="true"> - <include base="ipconfig">.</include> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>user32</library> - <library>iphlpapi</library> - <file>ipconfig.c</file> - <file>trace.c</file> - <file>ipconfig.rc</file> -</module> +<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" warnings="true"> + <include base="ipconfig">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>iphlpapi</library> + <file>ipconfig.c</file> + <file>trace.c</file> + <file>ipconfig.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/ipconfig/ipconfig.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.xml --- trunk/reactos/apps/utils/net/netstat/netstat.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/netstat/netstat.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,14 +1,14 @@ -<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" warnings="true"> - <include base="netstat">.</include> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>user32</library> - <library>ws2_32</library> - <library>snmpapi</library> - <library>iphlpapi</library> - <file>netstat.c</file> - <file>trace.c</file> - <file>netstat.rc</file> -</module> +<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" warnings="true"> + <include base="netstat">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>ws2_32</library> + <library>snmpapi</library> + <library>iphlpapi</library> + <file>netstat.c</file> + <file>trace.c</file> + <file>netstat.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/netstat/netstat.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/ping/ping.xml --- trunk/reactos/apps/utils/net/ping/ping.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/ping/ping.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,11 +1,11 @@ -<module name="ping" type="win32cui" installbase="system32" installname="ping.exe"> - <include base="ping">.</include> - <define name="__USE_W32API" /> - <define name="__USE_W32_SOCKETS" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>ws2_32</library> - <file>ping.c</file> - <file>ping.rc</file> -</module> +<module name="ping" type="win32cui" installbase="system32" installname="ping.exe"> + <include base="ping">.</include> + <define name="__USE_W32API" /> + <define name="__USE_W32_SOCKETS" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>ws2_32</library> + <file>ping.c</file> + <file>ping.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/ping/ping.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/route/route.xml --- trunk/reactos/apps/utils/net/route/route.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/route/route.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,9 +1,9 @@ -<module name="route" type="win32cui" installbase="system32" installname="route.exe" warnings="true"> - <include base="route">.</include> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>ws2_32</library> - <library>iphlpapi</library> - <file>route.c</file> - <file>route.rc</file> -</module> +<module name="route" type="win32cui" installbase="system32" installname="route.exe" warnings="true"> + <include base="route">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>route.c</file> + <file>route.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/route/route.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/telnet/telnet.xml --- trunk/reactos/apps/utils/net/telnet/telnet.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/telnet/telnet.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,29 +1,29 @@ -<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe"> - <include base="telnet">.</include> - <define name="__USE_W32API" /> - <define name="__REACTOS__" /> - <library>kernel32</library> - <library>ws2_32</library> - <directory name="src"> - <file>ansiprsr.cpp</file> - <file>keytrans.cpp</file> - <file>tcharmap.cpp</file> - <file>tconsole.cpp</file> - <file>tkeydef.cpp</file> - <file>tkeymap.cpp</file> - <file>tmapldr.cpp</file> - <file>tmouse.cpp</file> - <file>tnclass.cpp</file> - <file>tnclip.cpp</file> - <file>tncon.cpp</file> - <file>tnconfig.cpp</file> - <file>tnerror.cpp</file> - <file>tnetwork.cpp</file> - <file>tnmain.cpp</file> - <file>tnmisc.cpp</file> - <file>tscript.cpp</file> - <file>tscroll.cpp</file> - <file>ttelhndl.cpp</file> - </directory> - <file>telnet.rc</file> -</module> +<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe"> + <include base="telnet">.</include> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <library>kernel32</library> + <library>ws2_32</library> + <directory name="src"> + <file>ansiprsr.cpp</file> + <file>keytrans.cpp</file> + <file>tcharmap.cpp</file> + <file>tconsole.cpp</file> + <file>tkeydef.cpp</file> + <file>tkeymap.cpp</file> + <file>tmapldr.cpp</file> + <file>tmouse.cpp</file> + <file>tnclass.cpp</file> + <file>tnclip.cpp</file> + <file>tncon.cpp</file> + <file>tnconfig.cpp</file> + <file>tnerror.cpp</file> + <file>tnetwork.cpp</file> + <file>tnmain.cpp</file> + <file>tnmisc.cpp</file> + <file>tscript.cpp</file> + <file>tscroll.cpp</file> + <file>ttelhndl.cpp</file> + </directory> + <file>telnet.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/telnet/telnet.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.xml --- trunk/reactos/apps/utils/net/tracert/tracert.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/net/tracert/tracert.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,12 +1,12 @@ -<module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe"> - <include base="tracert">.</include> - <define name="__USE_W32API" /> - <define name="__USE_W32_SOCKETS" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>ws2_32</library> - <library>winmm</library> - <file>tracert.c</file> - <file>tracert.rc</file> -</module> +<module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe"> + <include base="tracert">.</include> + <define name="__USE_W32API" /> + <define name="__USE_W32_SOCKETS" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>ws2_32</library> + <library>winmm</library> + <file>tracert.c</file> + <file>tracert.rc</file> +</module> Property changes on: trunk/reactos/apps/utils/net/tracert/tracert.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/ps/ps.xml --- trunk/reactos/apps/utils/ps/ps.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/ps/ps.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,8 +1,8 @@ -<module name="ps" type="win32cui" installbase="bin" installname="ps.exe"> - <include base="ps">.</include> - <define name="__USE_W32API" /> - <library>user32</library> - <library>kernel32</library> - <library>ntdll</library> - <file>ps.c</file> +<module name="ps" type="win32cui" installbase="bin" installname="ps.exe"> + <include base="ps">.</include> + <define name="__USE_W32API" /> + <library>user32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>ps.c</file> </module> \ No newline at end of file Property changes on: trunk/reactos/apps/utils/ps/ps.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/rosperf/rosperf.xml --- trunk/reactos/apps/utils/rosperf/rosperf.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/apps/utils/rosperf/rosperf.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,14 +1,14 @@ -<module name="rosperf" type="win32cui" installbase="system32" installname="rosperf.exe"> - <include base="rosperf">.</include> - <define name="__USE_W32API" /> - <library>version</library> - <library>gdi32</library> - <library>user32</library> - <library>kernel32</library> - <library>ntdll</library> - <file>rosperf.c</file> - <file>lines.c</file> - <file>fill.c</file> - <file>testlist.c</file> - <file>rosperf.rc</file> +<module name="rosperf" type="win32cui" installbase="system32" installname="rosperf.exe"> + <include base="rosperf">.</include> + <define name="__USE_W32API" /> + <library>version</library> + <library>gdi32</library> + <library>user32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>rosperf.c</file> + <file>lines.c</file> + <file>fill.c</file> + <file>testlist.c</file> + <file>rosperf.rc</file> </module> \ No newline at end of file Property changes on: trunk/reactos/apps/utils/rosperf/rosperf.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/baseaddress.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,106 +1,106 @@ -<property name="BASEADDRESS_REGTESTS" value="0x07000000" /> -<property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> -<property name="BASEADDRESS_DEVENUM" value="0x35680000" /> -<property name="BASEADDRESS_UXTHEME" value="0x5AD70000" /> -<property name="BASEADDRESS_DINPUT" value="0x5F580000" /> -<property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> -<property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> -<property name="BASEADDRESS_MAIN" value="0x64F40000" /> -<property name="BASEADDRESS_INTL" value="0x64FB0000" /> -<property name="BASEADDRESS_DESK" value="0x65080000" /> -<property name="BASEADDRESS_APPWIZ" value="0x65100000" /> -<property name="BASEADDRESS_ACCESS" value="0x65180000" /> -<property name="BASEADDRESS_PSAPI" value="0x68f70000" /> -<property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> -<property name="BASEADDRESS_UNICODE" value="0x6b200000" /> -<property name="BASEADDRESS_ADVPACK" value="0x6b300000" /> -<property name="BASEADDRESS_CONTROL" value="0x6b310000" /> -<property name="BASEADDRESS_NCPA" value="0x6b320000" /> -<property name="BASEADDRESS_DBGHELP" value="0x6b330000" /> -<property name="BASEADDRESS_DINPUT8" value="0x6b340000" /> -<property name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> -<property name="BASEADDRESS_DSOUND" value="0x6b360000" /> -<property name="BASEADDRESS_GLU32" value="0x6b370000" /> -<property name="BASEADDRESS_MESA32" value="0x6b380000" /> -<property name="BASEADDRESS_OPENGL32" value="0x6b390000" /> -<property name="BASEADDRESS_SECUR32" value="0x6b3A0000" /> -<property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> -<property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> -<property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> -<property name="BASEADDRESS_CARDS" value="0x701a0000" /> -<property name="BASEADDRESS_WININET" value="0x70200000" /> -<property name="BASEADDRESS_ACLUI" value="0x71550000" /> -<property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> -<property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> -<property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> -<property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> -<property name="BASEADDRESS_LZ32" value="0x73d80000" /> -<property name="BASEADDRESS_USERENV" value="0x74850000" /> -<property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> -<property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> -<property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> -<property name="BASEADDRESS_CABINET" value="0x75120000" /> -<property name="BASEADDRESS_MSGINA" value="0x75970000" /> -<property name="BASEADDRESS_IMM32" value="0x75e60000" /> -<property name="BASEADDRESS_RPCRT4" value="0x76000000" /> -<property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> -<property name="BASEADDRESS_COMCTL32" value="0x76160000" /> -<property name="BASEADDRESS_COMDLG32" value="0x76200000" /> -<property name="BASEADDRESS_OLEAUT32" value="0x76260000" /> -<property name="BASEADDRESS_RICHED32" value="0x76340000" /> -<property name="BASEADDRESS_RICHED20" value="0x76360000" /> -<property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> -<property name="BASEADDRESS_LSASRV" value="0x76540000" /> -<property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> -<property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> -<property name="BASEADDRESS_MPR" value="0x76620000" /> -<property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> -<property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> -<property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> -<property name="BASEADDRESS_FMIFS" value="0x76df0000" /> -<property name="BASEADDRESS_SHELL32" value="0x77260000" /> -<property name="BASEADDRESS_IPHLPAPI" value="0x77300000" /> -<property name="BASEADDRESS_MMDRV" value="0x77500000" /> -<property name="BASEADDRESS_CRTDLL" value="0x77630000" /> -<property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> -<property name="BASEADDRESS_MSAFD" value="0x777a0000" /> -<property name="BASEADDRESS_MSI" value="0x777b0000" /> -<property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> -<property name="BASEADDRESS_WINMM" value="0x777d0000" /> -<property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> -<property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> -<property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> -<property name="BASEADDRESS_VERSION" value="0x77a90000" /> -<property name="BASEADDRESS_WS2_32" value="0x77aa0000" /> -<property name="BASEADDRESS_OLE32" value="0x77a50000" /> -<property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> -<property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> -<property name="BASEADDRESS_USER32" value="0x77e50000" /> -<property name="BASEADDRESS_GDI32" value="0x77ee0000" /> -<property name="BASEADDRESS_DNSAPI" value="0x77f00000" /> -<property name="BASEADDRESS_MSVCRT" value="0x78000000" /> -<property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> -<property name="BASEADDRESS_MSVFW32" value="0x77400000" /> -<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> -<property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> -<property name="BASEADDRESS_NTDLL" value="0x7C900000" /> -<property name="BASEADDRESS_FREETYPE" value="0x7F000000" /> - -<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" /> -<property name="BASEADDRESS_NCPL" value="0x64EA0000" /> -<property name="BASEADDRESS_HID" value="0x688F0000" /> -<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> -<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> -<property name="BASEADDRESS_ACLUI" value="0x71550000" /> -<property name="BASEADDRESS_WINFAX" value="0x722C0000" /> -<property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> -<property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> -<property name="BASEADDRESS_COREDLL" value="0x73d80000" /> -<property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> -<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> -<property name="BASEADDRESS_D3D8THK" value="0x76340000" /> -<property name="BASEADDRESS_ODBC32" value="0x76660000" /> -<property name="BASEADDRESS_MSACM32" value="0x77400000" /> -<property name="BASEADDRESS_PACKET" value="0x77780000" /> -<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> -<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> +<property name="BASEADDRESS_REGTESTS" value="0x07000000" /> +<property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> +<property name="BASEADDRESS_DEVENUM" value="0x35680000" /> +<property name="BASEADDRESS_UXTHEME" value="0x5AD70000" /> +<property name="BASEADDRESS_DINPUT" value="0x5F580000" /> +<property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> +<property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> +<property name="BASEADDRESS_MAIN" value="0x64F40000" /> +<property name="BASEADDRESS_INTL" value="0x64FB0000" /> +<property name="BASEADDRESS_DESK" value="0x65080000" /> +<property name="BASEADDRESS_APPWIZ" value="0x65100000" /> +<property name="BASEADDRESS_ACCESS" value="0x65180000" /> +<property name="BASEADDRESS_PSAPI" value="0x68f70000" /> +<property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> +<property name="BASEADDRESS_UNICODE" value="0x6b200000" /> +<property name="BASEADDRESS_ADVPACK" value="0x6b300000" /> +<property name="BASEADDRESS_CONTROL" value="0x6b310000" /> +<property name="BASEADDRESS_NCPA" value="0x6b320000" /> +<property name="BASEADDRESS_DBGHELP" value="0x6b330000" /> +<property name="BASEADDRESS_DINPUT8" value="0x6b340000" /> +<property name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> +<property name="BASEADDRESS_DSOUND" value="0x6b360000" /> +<property name="BASEADDRESS_GLU32" value="0x6b370000" /> +<property name="BASEADDRESS_MESA32" value="0x6b380000" /> +<property name="BASEADDRESS_OPENGL32" value="0x6b390000" /> +<property name="BASEADDRESS_SECUR32" value="0x6b3A0000" /> +<property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> +<property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> +<property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> +<property name="BASEADDRESS_CARDS" value="0x701a0000" /> +<property name="BASEADDRESS_WININET" value="0x70200000" /> +<property name="BASEADDRESS_ACLUI" value="0x71550000" /> +<property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> +<property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> +<property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> +<property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> +<property name="BASEADDRESS_LZ32" value="0x73d80000" /> +<property name="BASEADDRESS_USERENV" value="0x74850000" /> +<property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> +<property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> +<property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> +<property name="BASEADDRESS_CABINET" value="0x75120000" /> +<property name="BASEADDRESS_MSGINA" value="0x75970000" /> +<property name="BASEADDRESS_IMM32" value="0x75e60000" /> +<property name="BASEADDRESS_RPCRT4" value="0x76000000" /> +<property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> +<property name="BASEADDRESS_COMCTL32" value="0x76160000" /> +<property name="BASEADDRESS_COMDLG32" value="0x76200000" /> +<property name="BASEADDRESS_OLEAUT32" value="0x76260000" /> +<property name="BASEADDRESS_RICHED32" value="0x76340000" /> +<property name="BASEADDRESS_RICHED20" value="0x76360000" /> +<property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> +<property name="BASEADDRESS_LSASRV" value="0x76540000" /> +<property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> +<property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> +<property name="BASEADDRESS_MPR" value="0x76620000" /> +<property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> +<property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> +<property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> +<property name="BASEADDRESS_FMIFS" value="0x76df0000" /> +<property name="BASEADDRESS_SHELL32" value="0x77260000" /> +<property name="BASEADDRESS_IPHLPAPI" value="0x77300000" /> +<property name="BASEADDRESS_MMDRV" value="0x77500000" /> +<property name="BASEADDRESS_CRTDLL" value="0x77630000" /> +<property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> +<property name="BASEADDRESS_MSAFD" value="0x777a0000" /> +<property name="BASEADDRESS_MSI" value="0x777b0000" /> +<property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> +<property name="BASEADDRESS_WINMM" value="0x777d0000" /> +<property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> +<property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> +<property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> +<property name="BASEADDRESS_VERSION" value="0x77a90000" /> +<property name="BASEADDRESS_WS2_32" value="0x77aa0000" /> +<property name="BASEADDRESS_OLE32" value="0x77a50000" /> +<property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> +<property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> +<property name="BASEADDRESS_USER32" value="0x77e50000" /> +<property name="BASEADDRESS_GDI32" value="0x77ee0000" /> +<property name="BASEADDRESS_DNSAPI" value="0x77f00000" /> +<property name="BASEADDRESS_MSVCRT" value="0x78000000" /> +<property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> +<property name="BASEADDRESS_MSVFW32" value="0x77400000" /> +<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> +<property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> +<property name="BASEADDRESS_NTDLL" value="0x7C900000" /> +<property name="BASEADDRESS_FREETYPE" value="0x7F000000" /> + +<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" /> +<property name="BASEADDRESS_NCPL" value="0x64EA0000" /> +<property name="BASEADDRESS_HID" value="0x688F0000" /> +<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> +<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> +<property name="BASEADDRESS_ACLUI" value="0x71550000" /> +<property name="BASEADDRESS_WINFAX" value="0x722C0000" /> +<property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> +<property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> +<property name="BASEADDRESS_COREDLL" value="0x73d80000" /> +<property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> +<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> +<property name="BASEADDRESS_D3D8THK" value="0x76340000" /> +<property name="BASEADDRESS_ODBC32" value="0x76660000" /> +<property name="BASEADDRESS_MSACM32" value="0x77400000" /> +<property name="BASEADDRESS_PACKET" value="0x77780000" /> +<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> +<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> Property changes on: trunk/reactos/baseaddress.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/boot/boot.xml --- trunk/reactos/boot/boot.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/boot/boot.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,3 +1,3 @@ -<directory name="freeldr"> - <xi:include href="freeldr/freeldr.xml" /> -</directory> +<directory name="freeldr"> + <xi:include href="freeldr/freeldr.xml" /> +</directory> Property changes on: trunk/reactos/boot/boot.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.xml --- trunk/reactos/boot/freeldr/bootsect/bootsect.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/boot/freeldr/bootsect/bootsect.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,20 +1,20 @@ -<module name="dosmbr" type="bootsector" > - <bootstrap base="loader" nameoncd="dosmbr.bin" /> - <file>dosmbr.asm</file> -</module> -<module name="ext2" type="bootsector"> - <bootstrap base="loader" nameoncd="ext2.bin" /> - <file>ext2.asm</file> -</module> -<module name="fat32" type="bootsector"> - <bootstrap base="loader" nameoncd="fat32.bin" /> - <file>fat32.asm</file> -</module> -<module name="fat" type="bootsector"> - <bootstrap base="loader" nameoncd="fat.bin" /> - <file>fat.asm</file> -</module> -<module name="isoboot" type="bootsector"> - <bootstrap base="loader" nameoncd="isoboot.bin" /> - <file>isoboot.asm</file> -</module> +<module name="dosmbr" type="bootsector" > + <bootstrap base="loader" nameoncd="dosmbr.bin" /> + <file>dosmbr.asm</file> +</module> +<module name="ext2" type="bootsector"> + <bootstrap base="loader" nameoncd="ext2.bin" /> + <file>ext2.asm</file> +</module> +<module name="fat32" type="bootsector"> + <bootstrap base="loader" nameoncd="fat32.bin" /> + <file>fat32.asm</file> +</module> +<module name="fat" type="bootsector"> + <bootstrap base="loader" nameoncd="fat.bin" /> + <file>fat.asm</file> +</module> +<module name="isoboot" type="bootsector"> + <bootstrap base="loader" nameoncd="isoboot.bin" /> + <file>isoboot.asm</file> +</module> Property changes on: trunk/reactos/boot/freeldr/bootsect/bootsect.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,8 +1,8 @@ -<module name="freeldr" type="bootloader"> - <bootstrap base="loader" /> - <library>freeldr_startup</library> - <library>freeldr_base64k</library> - <library>freeldr_base</library> - <library>freeldr_main</library> - <library>rossym</library> -</module> +<module name="freeldr" type="bootloader"> + <bootstrap base="loader" /> + <library>freeldr_startup</library> + <library>freeldr_base64k</library> + <library>freeldr_base</library> + <library>freeldr_main</library> + <library>rossym</library> +</module> Property changes on: trunk/reactos/boot/freeldr/freeldr/freeldr.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-07-24 21:44:45 UTC (rev 16719) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-07-24 21:42:00 UTC (rev 16720) @@ -1,109 +1,109 @@ -<module name="freeldr_base" type="objectlibrary" warnings="true"> - <include base="freeldr_base">include</include> - <include base="freeldr_base">cache</include> - <include base="ntoskrnl">include</include> - <define name="__USE_W32API" /> - <compilerflag>-nostdlib</compilerflag> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> - <directory name="arch"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>_alloca.S</file> - <file>archmach.c</file> - <file>hardware.c</file> - <file>hwacpi.c</file> - <file>hwapm.c</file> - <file>hwcpu.c</file> - <file>hwpci.c</file> - <file>i386disk.c</file> - <file>i386rtl.c</file> - <file>i386vid.c</file> - <file>machpc.c</file> - <file>machxbox.c</file> - <file>pccons.c</file> - <file>pcdisk.c</file> - <file>pcmem.c</file> - <file>pcrtc.c</file> - <file>pcvideo.c</file> - <file>portio.c</file> - <file>xboxcons.c</file> - <file>xboxdisk.c</file> - <file>xboxfont.c</file> - <file>xboxhw.c</file> - <file>xboxmem.c</file> - <file>xboxrtc.c</file> - <file>xboxvideo.c</file> - </directory> - </if> - </directory> - <directory name="cache"> - <file>blocklist.c</file> - <file>cache.c</file> [truncated at 1000 lines; 14400 more skipped]

19 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
57
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 July 2005