Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[pschweitzer] 35816: - Primary implementation of sfc_os.dll. - Linked some functions of sfc.dll to sfc_os.dll
by pschweitzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: pschweitzer Date: Sat Aug 30 15:22:35 2008 New Revision: 35816 URL: http://svn.reactos.org/svn/reactos?rev=35816&view=rev Log: - Primary implementation of sfc_os.dll. - Linked some functions of sfc.dll to sfc_os.dll Added: trunk/reactos/dll/win32/sfc_os/ (with props) trunk/reactos/dll/win32/sfc_os/precomp.h (with props) trunk/reactos/dll/win32/sfc_os/sfc_os.c (with props) trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild (with props) trunk/reactos/dll/win32/sfc_os/sfc_os.spec (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/sfc/sfc.spec trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=358… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -149,6 +149,7 @@ <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_ATL" value="0x76a80000" /> <property name="BASEADDRESS_SFC" value="0x76b50000" /> + <property name="BASEADDRESS_SFC_OS" value="0x76c10000" /> <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -321,6 +321,7 @@ dll\win32\serialui\serialui.dll 1 dll\win32\setupapi\setupapi.dll 1 dll\win32\sfc\sfc.dll 1 +dll\win32\sfc_os\sfc_os.dll 1 dll\win32\shdocvw\shdocvw.dll 1 dll\win32\shell32\shell32.dll 1 dll\win32\shfolder\shfolder.dll 1 Modified: trunk/reactos/dll/win32/sfc/sfc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -10,9 +10,9 @@ @ stdcall SRSetRestorePoint (ptr ptr) SRSetRestorePointA @ stdcall SRSetRestorePointA (ptr ptr) @ stdcall SRSetRestorePointW (ptr ptr) -@ stub SfcGetNextProtectedFile -@ stub SfcIsFileProtected +@ stdcall SfcGetNextProtectedFile (ptr ptr) sfc_os.SfcGetNextProtectedFile +@ stdcall SfcIsFileProtected (ptr wstr) sfc_os.SfcIsFileProtected @ stub SfcWLEventLogoff @ stub SfcWLEventLogon -@ stdcall SfpVerifyFile (ptr ptr long) +@ stdcall SfpVerifyFile (str str long) @ stdcall start (long long ptr) DllMain Propchange: trunk/reactos/dll/win32/sfc_os/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Aug 30 15:22:35 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/sfc_os/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/sfc_os/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/sfc_os/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/sfc_os/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/precomp.h (added) +++ trunk/reactos/dll/win32/sfc_os/precomp.h [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -1,0 +1,6 @@ +#ifndef _PRECOMP_H__ +#define _PRECOMP_H__ + +#include <windows.h> + +#endif Propchange: trunk/reactos/dll/win32/sfc_os/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc_os/sfc_os.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.c?… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.c (added) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -1,0 +1,42 @@ +/* + * System File Checker (Windows File Protection) + * + * Copyright 2008 Pierre Schweitzer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "precomp.h" + +HINSTANCE hLibModule; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + hLibModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/sfc_os/sfc_os.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.rb… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild (added) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -1,0 +1,8 @@ +<module name="sfc_os" type="win32dll" baseaddress="${BASEADDRESS_SFC_OS}" installbase="system32" installname="sfc_os.dll" allowwarnings="yes"> + <importlibrary definition="sfc_os.spec.def" /> + <include base="sfc_os">.</include> + <library>kernel32</library> + <file>sfc_os.c</file> + <file>sfc_os.spec</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc_os/sfc_os.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.sp… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.spec (added) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -1,0 +1,12 @@ +@ stub sfc_os_1 +@ stub sfc_os_2 +@ stub sfc_os_3 +@ stub sfc_os_4 +@ stub sfc_os_5 +@ stub sfc_os_6 +@ stub sfc_os_7 +@ stub SfcGetNextProtectedFile +@ stub SfcIsFileProtected +@ stub SfcWLEventLogoff +@ stub SfcWLEventLogon +@ stdcall start (long long ptr) DllMain Propchange: trunk/reactos/dll/win32/sfc_os/sfc_os.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -298,6 +298,9 @@ <directory name="sfc"> <xi:include href="sfc/sfc.rbuild" /> </directory> +<directory name="sfc_os"> + <xi:include href="sfc_os/sfc_os.rbuild" /> +</directory> <directory name="shdocvw"> <xi:include href="shdocvw/shdocvw.rbuild" /> </directory>

1 0

[janderwald] 35815: - update russian translation by tower at reactos org
by janderwald＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: janderwald Date: Sat Aug 30 14:10:50 2008 New Revision: 35815 URL: http://svn.reactos.org/svn/reactos?rev=35815&view=rev Log: - update russian translation by tower at reactos org Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Sat Aug 30 14:10:50 2008 @@ -1,4 +1,50 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Îñíîâíûå" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "Ñîåäèíåíèå Èñïîëüçóåò:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Íàñòðîèòü", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Îòìå÷åíûå ýëåìåíòû èñïîëüçóþòñÿ ïðè ñîåäèíåíèè:", -1, 9, 59, 217, 8 + PUSHBUTTON "&Óñòàíîâèòü", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Óäàëèòü", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Îïèñàíèå", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Ñâîéñòâà êîìïîíåíòà èçëîæåíû íèæå...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Îòîáðàæàòü çíà÷åê â òðåå ïðè óñòàíîâëåíîì ñîåäèíåíèè", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Îïîâåùàòü â ñëó÷àå ðàçðûâà ñîåäèíåíèÿ", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Îñíîâíûå" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñîåäèíåíèå", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Ñòàòóñ:", -1, 19, 20, 60, 8 + LTEXT "Ïðîäîëæèòåëüíîñòü:", -1, 19, 34, 60, 8 + LTEXT "Ñêîðîñòü:", -1, 19, 48, 60, 8 + GROUPBOX "Àêòèâíîñòü", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Îòïðàâëåíî", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Ïðèíÿòî", -1, 149, 90, 37, 8 + LTEXT "Áàéò:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Ñâîéñòâà", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Îòêëþ÷èòü", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + STRINGTABLE DISCARDABLE BEGIN

1 0

[janderwald] 35814: - Implement enumerating network components (Client/Service/Transport) using NetCfg COM api - Add a check box to for enabling/disabling notification for network problems - Implement IOleCommandTarget interface for the LAN status dialog - Register the LAN property and LAN status CLSIDs
by janderwald＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: janderwald Date: Sat Aug 30 14:05:19 2008 New Revision: 35814 URL: http://svn.reactos.org/svn/reactos?rev=35814&view=rev Log: - Implement enumerating network components (Client/Service/Transport) using NetCfg COM api - Add a check box to for enabling/disabling notification for network problems - Implement IOleCommandTarget interface for the LAN status dialog - Register the LAN property and LAN status CLSIDs Added: trunk/reactos/dll/win32/netshell/lanstatusui.c (with props) Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/netshell.rbuild trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -1,4 +1,8 @@ #include <precomp.h> + +/// CLASSID +/// {7007ACC5-3202-11D1-AAD2-00805FC1270E} +/// open network properties and wlan properties typedef enum { @@ -20,11 +24,6 @@ INetConnection * pCon; LONG ref; }INetConnectionPropertyUiImpl, *LPINetConnectionPropertyUiImpl; - - -/// CLASSID -/// {7007ACC5-3202-11D1-AAD2-00805FC1270E} -/// open network properties and wlan properties HPROPSHEETPAGE InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) @@ -46,56 +45,6 @@ return CreatePropertySheetPageW(&ppage); } -HRESULT -LaunchUIDlg(UINT * pResourceIDs, DLGPROC * pDlgs, UINT Count, NETCON_PROPERTIES * pProperties) -{ - HPROPSHEETPAGE * hpsp; - PROPSHEETHEADERW psh; - BOOL ret; - UINT Index, Offset; - - hpsp = CoTaskMemAlloc(Count * sizeof(HPROPSHEETPAGE)); - if (!hpsp) - return E_OUTOFMEMORY; - - ZeroMemory(hpsp, Count * sizeof(HPROPSHEETPAGE)); - - Index = 0; - Offset = 0; - do - { - hpsp[Offset] = InitializePropertySheetPage(MAKEINTRESOURCEW(pResourceIDs[Index]), pDlgs[Index], (LPARAM)pProperties, NULL); - if (hpsp[Offset]) - Offset++; - - }while(++Index < Count); - - if (!Offset) - { - CoTaskMemFree(hpsp); - return E_FAIL; - } - - - ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); - psh.dwSize = sizeof(PROPSHEETHEADERW); - psh.dwFlags = PSP_DEFAULT | PSH_PROPTITLE; - psh.pszCaption = pProperties->pszwName; - psh.hwndParent = NULL; - psh.u3.phpage = hpsp; - psh.nPages = Offset; - psh.hInstance = netshell_hInstance; - - - ret = PropertySheetW(&psh); - CoTaskMemFree(hpsp); - - if (ret < 0) - return E_FAIL; - else - return S_OK; -} - VOID AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName) { @@ -106,8 +55,8 @@ lvItem.pszText = szName; lvItem.lParam = (LPARAM)pItem; lvItem.iItem = ListView_GetItemCount(hDlgCtrl); - - SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); + lvItem.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); + ListView_SetCheckState(hDlgCtrl, lvItem.iItem, TRUE); } VOID @@ -117,8 +66,8 @@ DWORD dwSize; DWORD dwRetVal; DWORD dwCharacteristics; - WCHAR szName[60]; - WCHAR szText[40]; + WCHAR szName[100]; + WCHAR szText[100]; WCHAR szHelp[200]; HKEY hSubKey; static WCHAR szNDI[] = L"\\Ndi"; @@ -173,6 +122,10 @@ RegCloseKey(hSubKey); } + if (!wcslen(szText)) + continue; + + pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); if (!pItem) continue; @@ -192,40 +145,96 @@ } +VOID +EnumComponents(HWND hDlgCtrl, INetCfg * pNCfg, const GUID * CompGuid, UINT Type) +{ + HRESULT hr; + IEnumNetCfgComponent * pENetCfg; + INetCfgComponent *pNCfgComp; + ULONG Num; + DWORD dwCharacteristics; + LPOLESTR pDisplayName, pHelpText; + PNET_ITEM pItem; + + + hr = INetCfg_EnumComponents(pNCfg, CompGuid, &pENetCfg); + if (FAILED(hr)) + { + INetCfg_Release(pNCfg); + return; + } + while(IEnumNetCfgComponent_Next(pENetCfg, 1, &pNCfgComp, &Num) == S_OK) + { + hr = INetCfgComponent_GetCharacteristics(pNCfgComp, &dwCharacteristics); + if (SUCCEEDED(hr) && (dwCharacteristics & NCF_HIDDEN)) + { + INetCfgComponent_Release(pNCfgComp); + continue; + } + pDisplayName = NULL; + pHelpText = NULL; + hr = INetCfgComponent_GetDisplayName(pNCfgComp, &pDisplayName); + hr = INetCfgComponent_GetHelpText(pNCfgComp, &pHelpText); + + pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); + if (!pItem) + continue; + pItem->dwCharacteristics = dwCharacteristics; + pItem->szHelp = pHelpText; + pItem->Type = Type; + AddItemToListView(hDlgCtrl, pItem, pDisplayName); + CoTaskMemFree(pDisplayName); + + INetCfgComponent_Release(pNCfgComp); + } + IEnumNetCfgComponent_Release(pENetCfg); +} + VOID InitializeLANPropertiesUIDlg(HWND hwndDlg) { - static WCHAR szNetClient[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e973-e325-11ce-bfc1-08002be10318}"; - static WCHAR szNetService[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e974-e325-11ce-bfc1-08002be10318}"; - static WCHAR szNetProtocol[] =L"System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}"; - HKEY hKey; - HWND hDlgCtrl; - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); - /* Enumerate Clients */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetClient, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_CLIENT); - RegCloseKey(hKey); - } - - /* Enumerate Service */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetService, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_SERVICE); - RegCloseKey(hKey); - } - - /* Enumerate Protocol */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetProtocol, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_PROTOCOL); - RegCloseKey(hKey); - } - - -} + HRESULT hr; + INetCfg * pNCfg; + HWND hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); + LVCOLUMNW lc; + RECT rc; + DWORD dwStyle; + + memset(&lc, 0, sizeof(LV_COLUMN)); + lc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_FMT; + lc.fmt = LVCFMT_FIXED_WIDTH; + if (GetClientRect(hDlgCtrl, &rc)) + { + lc.mask |= LVCF_WIDTH; + lc.cx = rc.right - rc.left; + } + lc.pszText = L""; + (void)SendMessageW(hDlgCtrl, LVM_INSERTCOLUMNW, 0, (LPARAM)&lc); + dwStyle = (DWORD) SendMessage(hDlgCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; + SendMessage(hDlgCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + + + + hr = CoCreateInstance(&CLSID_CNetCfg, NULL, CLSCTX_INPROC_SERVER, &IID_INetCfg, (LPVOID*)&pNCfg); + if (FAILED(hr)) + return; + + hr = INetCfg_Initialize(pNCfg, NULL); + if (FAILED(hr)) + { + INetCfg_Release(pNCfg); + return; + } + + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT); + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE); + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL); + + INetCfg_Release(pNCfg); +} + INT_PTR @@ -238,7 +247,11 @@ ) { PROPSHEETPAGE *page; - NETCON_PROPERTIES * pProperties = (NETCON_PROPERTIES*)GetWindowLongPtr(hwndDlg, DWLP_USER); + LPNMLISTVIEW lppl; + LVITEMW li; + PNET_ITEM pItem; + NETCON_PROPERTIES * pProperties; + switch(uMsg) { case WM_INITDIALOG: @@ -257,52 +270,39 @@ } InitializeLANPropertiesUIDlg(hwndDlg); return TRUE; + case WM_NOTIFY: + lppl = (LPNMLISTVIEW) lParam; + if (lppl->hdr.code == LVN_ITEMCHANGING) + { + ZeroMemory(&li, sizeof(li)); + li.mask = LVIF_PARAM; + li.iItem = lppl->iItem; + if (!SendMessageW(lppl->hdr.hwndFrom, LVM_GETITEMW, 0, (LPARAM)&li)) + return TRUE; + + pItem = (PNET_ITEM)li.lParam; + if (!pItem) + return TRUE; + + if (!(lppl->uOldState & LVIS_FOCUSED) && (lppl->uNewState & LVIS_FOCUSED)) + { + /* new focused item */ + if (pItem->dwCharacteristics & NCF_NOT_USER_REMOVABLE) + EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALL), FALSE); + else + EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALL), TRUE); + + if (pItem->dwCharacteristics & NCF_HAS_UI) + EnableWindow(GetDlgItem(hwndDlg, IDC_PROPERTIES), TRUE); + else + EnableWindow(GetDlgItem(hwndDlg, IDC_PROPERTIES), FALSE); + + SendDlgItemMessageW(hwndDlg, IDC_DESCRIPTION, WM_SETTEXT, 0, (LPARAM)pItem->szHelp); + } + } + break; } return FALSE; -} - - -HRESULT -ShowLANConnectionPropertyDialog(NETCON_PROPERTIES * pProperties) -{ - UINT ResourceId[1] = { IDD_NETPROPERTIES }; - DLGPROC Dlgs[1] = {LANPropertiesUIDlg}; - INITCOMMONCONTROLSEX ic; - - - ic.dwSize = sizeof(INITCOMMONCONTROLSEX); - ic.dwICC = ICC_LISTVIEW_CLASSES; - InitCommonControlsEx(&ic); - - return LaunchUIDlg(ResourceId, Dlgs, 1, pProperties); -} - -INT_PTR -CALLBACK -LANStatusUIDlg( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - NETCON_PROPERTIES * pProperties = (NETCON_PROPERTIES*)GetWindowLongPtr(hwndDlg, DWLP_USER); - switch(uMsg) - { - case WM_INITDIALOG: - pProperties = (NETCON_PROPERTIES*)lParam; - return TRUE; - } - return FALSE; -} - - -HRESULT -ShowLANConnectionStatusDialog(NETCON_PROPERTIES * pProperties) -{ - UINT ResourceId[1] = { IDD_NETSTATUS }; - DLGPROC Dlgs[1] = {LANStatusUIDlg}; - return LaunchUIDlg(ResourceId, Dlgs, 1, pProperties); } static Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -5,11 +5,11 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "List3", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP | LVS_EX_FULLROWSELECT, 9, 71, 230, 55 LTEXT "Verbindung herstellen über:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 - CONTROL "List3", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -5,11 +5,11 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 LTEXT "Connect Using:", -1, 9,9,217,8 EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 Added: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c (added) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -1,0 +1,170 @@ +#include <precomp.h> + + +/// CLSID +/// HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{7007ACCF-3202-11D1-AAD2-00805FC1270E} +// IID B722BCCB-4E68-101B-A2BC-00AA00404770 +typedef struct +{ + IOleCommandTarget * lpVtbl; + LONG ref; +}ILanStatusImpl, *LPILanStatusImpl; + + +INT_PTR +CALLBACK +LANStatusUIDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + } + return FALSE; +} + + + +static +HRESULT +WINAPI +IOleCommandTarget_fnQueryInterface( + IOleCommandTarget * iface, + REFIID iid, + LPVOID * ppvObj) +{ + ILanStatusImpl * This = (ILanStatusImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_IOleCommandTarget)) + { + *ppvObj = This; + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +IOleCommandTarget_fnAddRef( + IOleCommandTarget * iface) +{ + ILanStatusImpl * This = (ILanStatusImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI +IOleCommandTarget_fnRelease( + IOleCommandTarget * iface) +{ + ILanStatusImpl * This = (ILanStatusImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree (This); + } + return refCount; +} + +static +HRESULT +WINAPI +IOleCommandTarget_fnQueryStatus( + IOleCommandTarget * iface, + const GUID *pguidCmdGroup, + ULONG cCmds, + OLECMD *prgCmds, + OLECMDTEXT *pCmdText) +{ + MessageBoxW(NULL, L"IOleCommandTarget_fnQueryStatus", NULL, MB_OK); + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +IOleCommandTarget_fnExec( + IOleCommandTarget * iface, + const GUID *pguidCmdGroup, + DWORD nCmdID, + DWORD nCmdexecopt, + VARIANT *pvaIn, + VARIANT *pvaOut) +{ + NOTIFYICONDATA nid; + HWND hwndDlg; + //ILanStatusImpl * This = (ILanStatusImpl*)iface; + + hwndDlg = CreateDialogW(netshell_hInstance, MAKEINTRESOURCEW(IDD_NETSTATUS), NULL, LANStatusUIDlg); + if (pguidCmdGroup) + { + if (IsEqualIID(pguidCmdGroup, &CGID_ShellServiceObject)) + { + nid.cbSize = sizeof(nid); + nid.uID = 100; + nid.uFlags = NIF_ICON; + nid.u.uVersion = NOTIFYICON_VERSION; + nid.hWnd = hwndDlg; + nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_SHELL_NETWORK_FOLDER)); + + Shell_NotifyIcon(NIM_ADD, &nid); + return S_OK; + } + } + return S_OK; +} + + +static const IOleCommandTargetVtbl vt_OleCommandTarget = +{ + IOleCommandTarget_fnQueryInterface, + IOleCommandTarget_fnAddRef, + IOleCommandTarget_fnRelease, + IOleCommandTarget_fnQueryStatus, + IOleCommandTarget_fnExec, +}; + + +HRESULT WINAPI LanConnectStatusUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + ILanStatusImpl * This; + + if (!ppv) + return E_POINTER; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = (ILanStatusImpl *) CoTaskMemAlloc(sizeof (ILanStatusImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = (IOleCommandTarget*)&vt_OleCommandTarget; + + if (!SUCCEEDED (IOleCommandTarget_fnQueryInterface ((IOleCommandTarget*)This, riid, ppv))) + { + IOleCommandTarget_Release((IUnknown*)This); + return E_NOINTERFACE; + } + + IOleCommandTarget_Release((IUnknown*)This); + return S_OK; +} + + + Propchange: trunk/reactos/dll/win32/netshell/lanstatusui.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -1,12 +1,15 @@ #include "precomp.h" +#include <initguid.h> +#include <devguid.h> HINSTANCE netshell_hInstance; const GUID CLSID_LANConnectUI = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; const GUID CLSID_NetworkConnections = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; -const GUID GUID_DEVCLASS_NET = {0x4d36e972, 0xe325, 0x11ce, {0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}; - -static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AA-D200805FC1270E}"; +const GUID CLSID_LanConnectStatusUI = {0x7007ACCF, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; + +static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; +static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AA-D200805FC1270E}"; +static const WCHAR szLanConnectStatusUI[] = L"CLSID\\{7007ACCF-3202-11D1-AA-D200805FC1270E}"; static const WCHAR szNamespaceKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; static INTERFACE_TABLE InterfaceTable[] = @@ -22,6 +25,10 @@ { &CLSID_LANConnectUI, LanConnectUI_Constructor + }, + { + &CLSID_LanConnectStatusUI, + LanConnectStatusUI_Constructor }, { NULL, @@ -62,6 +69,7 @@ WCHAR szNet[20]; UINT Length, Offset; + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) return SELFREG_E_CLASS; @@ -98,6 +106,7 @@ if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) { RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); RegCloseKey(hSubKey); } @@ -108,6 +117,32 @@ } RegCloseKey(hKey); + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szLanConnectUI, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return SELFREG_E_CLASS; + + if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); + RegCloseKey(hSubKey); + } + + RegCloseKey(hKey); + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szLanConnectStatusUI, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return SELFREG_E_CLASS; + + if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); + RegCloseKey(hSubKey); + } + + RegCloseKey(hKey); + + return S_OK; } @@ -128,7 +163,7 @@ { UINT i; HRESULT hres = E_OUTOFMEMORY; - IClassFactory * pcf = NULL; + IClassFactory * pcf = NULL; if (!ppv) return E_INVALIDARG; Modified: trunk/reactos/dll/win32/netshell/netshell.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -27,4 +27,5 @@ <file>connectmanager.c</file> <file>netshell.spec</file> <file>lanconnectui.c</file> + <file>lanstatusui.c</file> </module> Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -33,6 +33,9 @@ #include <setupapi.h> #include <devguid.h> #include <netcon.h> +#include <docobj.h> +#include <netcfgx.h> + #include "wine/debug.h" #include "wine/unicode.h" @@ -94,7 +97,9 @@ /* lanconnectui.c */ HRESULT WINAPI LanConnectUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); -HRESULT ShowLANConnectionStatusDialog(NETCON_PROPERTIES * pProperties); + +/* lanstatusui.c */ +HRESULT WINAPI LanConnectStatusUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); #define NCCF_NOTIFY_DISCONNECTED 0x100000 Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -773,11 +773,13 @@ if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS)) { +#if 0 if (pProperties->MediaType == NCM_LAN) { hr = ShowLANConnectionStatusDialog(pProperties); NcFreeNetconProperties(pProperties); } +#endif return hr; } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES))

1 0

[pschweitzer] 35813: Primary implementation of sfc.dll. To have it "fully" working, sfc_os.dll is will be needed. It does nothing more. Don't shout, Fireball agreed for commit ; ).
by pschweitzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: pschweitzer Date: Sat Aug 30 13:53:27 2008 New Revision: 35813 URL: http://svn.reactos.org/svn/reactos?rev=35813&view=rev Log: Primary implementation of sfc.dll. To have it "fully" working, sfc_os.dll is will be needed. It does nothing more. Don't shout, Fireball agreed for commit ;). Added: trunk/reactos/dll/win32/sfc/ (with props) trunk/reactos/dll/win32/sfc/precomp.h (with props) trunk/reactos/dll/win32/sfc/sfc.c (with props) trunk/reactos/dll/win32/sfc/sfc.rbuild (with props) trunk/reactos/dll/win32/sfc/sfc.spec (with props) trunk/reactos/include/psdk/srrestoreptapi.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=358… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -148,6 +148,7 @@ <property name="BASEADDRESS_RASDLG" value="0x768d0000" /> <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_ATL" value="0x76a80000" /> + <property name="BASEADDRESS_SFC" value="0x76b50000" /> <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -320,6 +320,7 @@ dll\win32\sensapi\sensapi.dll 1 dll\win32\serialui\serialui.dll 1 dll\win32\setupapi\setupapi.dll 1 +dll\win32\sfc\sfc.dll 1 dll\win32\shdocvw\shdocvw.dll 1 dll\win32\shell32\shell32.dll 1 dll\win32\shfolder\shfolder.dll 1 Propchange: trunk/reactos/dll/win32/sfc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Aug 30 13:53:27 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/sfc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/sfc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/sfc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/sfc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/sfc/precomp.h (added) +++ trunk/reactos/dll/win32/sfc/precomp.h [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,14 @@ +#ifndef _PRECOMP_H__ +#define _PRECOMP_H__ + +#include <windows.h> +#include <sfc.h> +#include <srrestoreptapi.h> + +DWORD WINAPI sfc_8(); +DWORD WINAPI sfc_9(); + +typedef BOOL (WINAPI *PSRSRPA)(PRESTOREPOINTINFOA, PSTATEMGRSTATUS); +typedef BOOL (WINAPI *PSRSRPW)(PRESTOREPOINTINFOW, PSTATEMGRSTATUS); + +#endif Propchange: trunk/reactos/dll/win32/sfc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc/sfc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.c?rev=35… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.c (added) +++ trunk/reactos/dll/win32/sfc/sfc.c [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,130 @@ +/* + * System File Checker (Windows File Protection) + * + * Copyright 2008 Pierre Schweitzer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "precomp.h" + +HINSTANCE hLibModule; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + hLibModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} + +DWORD WINAPI sfc_8() +{ + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD WINAPI sfc_9() +{ + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL WINAPI SRSetRestorePointA(PRESTOREPOINTINFOA pRestorePtSpec, PSTATEMGRSTATUS pSMgrStatus) +{ + HMODULE hModule; + PSRSRPA pSRSRPA; + BOOL bStatus = FALSE; + LPCWSTR lpLibFileName = L"srclient.dll"; + LPCSTR lpProcName = "SRSetRestorePointA"; + + hModule = LoadLibraryW(lpLibFileName); + if (hModule) + { + pSRSRPA = (PSRSRPA)GetProcAddress(hModule, lpProcName); + if (pSRSRPA) + { + bStatus = pSRSRPA(pRestorePtSpec, pSMgrStatus); + } + else + { + if (pSMgrStatus) + { + pSMgrStatus->nStatus = ERROR_CALL_NOT_IMPLEMENTED; + } + } + FreeLibrary(hModule); + } + else + { + if (pSMgrStatus) + { + pSMgrStatus->nStatus = ERROR_CALL_NOT_IMPLEMENTED; + } + } + + return bStatus; +} + +BOOL WINAPI SRSetRestorePointW(PRESTOREPOINTINFOW pRestorePtSpec, PSTATEMGRSTATUS pSMgrStatus) +{ + HMODULE hModule; + PSRSRPW pSRSRPW; + BOOL bStatus = FALSE; + LPCWSTR lpLibFileName = L"srclient.dll"; + LPCSTR lpProcName = "SRSetRestorePointW"; + + hModule = LoadLibraryW(lpLibFileName); + if (hModule) + { + pSRSRPW = (PSRSRPW)GetProcAddress(hModule, lpProcName); + if (pSRSRPW) + { + bStatus = pSRSRPW(pRestorePtSpec, pSMgrStatus); + } + else + { + if (pSMgrStatus) + { + pSMgrStatus->nStatus = ERROR_CALL_NOT_IMPLEMENTED; + } + } + FreeLibrary(hModule); + } + else + { + if (pSMgrStatus) + { + pSMgrStatus->nStatus = ERROR_CALL_NOT_IMPLEMENTED; + } + } + + return bStatus; +} + +BOOL WINAPI SfpVerifyFile(LPCSTR pszFileName, LPSTR pszError, DWORD dwErrSize) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Propchange: trunk/reactos/dll/win32/sfc/sfc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc/sfc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.rbuild (added) +++ trunk/reactos/dll/win32/sfc/sfc.rbuild [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,8 @@ +<module name="sfc" type="win32dll" baseaddress="${BASEADDRESS_SFC}" installbase="system32" installname="sfc.dll" allowwarnings="yes"> + <importlibrary definition="sfc.spec.def" /> + <include base="sfc">.</include> + <library>kernel32</library> + <file>sfc.c</file> + <file>sfc.spec</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/reactos/dll/win32/sfc/sfc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc/sfc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.spec (added) +++ trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,18 @@ +@ stub sfc_1 +@ stub sfc_2 +@ stub sfc_3 +@ stub sfc_4 +@ stub sfc_5 +@ stub sfc_6 +@ stub sfc_7 +@ stdcall sfc_8 () +@ stdcall sfc_9 () +@ stdcall SRSetRestorePoint (ptr ptr) SRSetRestorePointA +@ stdcall SRSetRestorePointA (ptr ptr) +@ stdcall SRSetRestorePointW (ptr ptr) +@ stub SfcGetNextProtectedFile +@ stub SfcIsFileProtected +@ stub SfcWLEventLogoff +@ stub SfcWLEventLogon +@ stdcall SfpVerifyFile (ptr ptr long) +@ stdcall start (long long ptr) DllMain Propchange: trunk/reactos/dll/win32/sfc/sfc.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -295,6 +295,9 @@ <directory name="setupapi"> <xi:include href="setupapi/setupapi.rbuild" /> </directory> +<directory name="sfc"> + <xi:include href="sfc/sfc.rbuild" /> +</directory> <directory name="shdocvw"> <xi:include href="shdocvw/shdocvw.rbuild" /> </directory> Added: trunk/reactos/include/psdk/srrestoreptapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/srrestoreptap… ============================================================================== --- trunk/reactos/include/psdk/srrestoreptapi.h (added) +++ trunk/reactos/include/psdk/srrestoreptapi.h [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,64 @@ +/* + * Definitions for the System File Checker (Windows File Protection) + * + * Copyright 2008 Pierre Schweitzer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _SRRESTOREPTAPI_H +#define _SRRESTOREPTAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Defines */ + +#define MAX_DESC 64 +#define MAX_DESC_W 256 + +/* Types */ + +typedef struct _RESTOREPTINFOA { + DWORD dwEventType; + DWORD dwRestorePtType; + INT64 llSequenceNumber; + CHAR szDescription[MAX_DESC]; +} RESTOREPOINTINFOA, *PRESTOREPOINTINFOA; + +typedef struct _RESTOREPTINFOW { + DWORD dwEventType; + DWORD dwRestorePtType; + INT64 llSequenceNumber; + WCHAR szDescription[MAX_DESC_W]; +} RESTOREPOINTINFOW, *PRESTOREPOINTINFOW; + +typedef struct _SMGRSTATUS { + DWORD nStatus; + INT64 llSequenceNumber; +} STATEMGRSTATUS, *PSTATEMGRSTATUS; + +/* Functions */ + +BOOL WINAPI SRSetRestorePointA(PRESTOREPOINTINFOA, PSTATEMGRSTATUS); +BOOL WINAPI SRSetRestorePointW(PRESTOREPOINTINFOW, PSTATEMGRSTATUS); +DWORD WINAPI SRRemoveRestorePoint(DWORD); + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/psdk/srrestoreptapi.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 35812: - Updates to our vectored exception handling: - KiUserExceptionDispatcher: RtlDispatchException directly - RtlDispatchException: Call vectored exception handlers before doing anything else - Rename RtlpExecuteVectoredExceptionHandlers to RtlCallVectoredExceptionHandlers as this is the real name - References: "New Vectored Exception Handling in Windows XP" by Matt Pietrek
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 13:40:00 2008 New Revision: 35812 URL: http://svn.reactos.org/svn/reactos?rev=35812&view=rev Log: - Updates to our vectored exception handling: - KiUserExceptionDispatcher: RtlDispatchException directly - RtlDispatchException: Call vectored exception handlers before doing anything else - Rename RtlpExecuteVectoredExceptionHandlers to RtlCallVectoredExceptionHandlers as this is the real name - References: "New Vectored Exception Handling in Windows XP" by Matt Pietrek Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S trunk/reactos/lib/rtl/i386/except.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatc… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -15,10 +15,6 @@ typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength); -EXCEPTION_DISPOSITION NTAPI -RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context); - /* FUNCTIONS ****************************************************************/ /* @@ -32,26 +28,16 @@ EXCEPTION_RECORD NestedExceptionRecord; NTSTATUS Status; - /* call the vectored exception handlers */ - if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, - Context) != ExceptionContinueExecution) + /* Dispatch the exception and check the result */ + if (RtlDispatchException(ExceptionRecord, Context)) { - goto ContinueExecution; + /* Continue executing */ + Status = NtContinue(Context, FALSE); } else { - /* Dispatch the exception and check the result */ - if(RtlDispatchException(ExceptionRecord, Context)) - { -ContinueExecution: - /* Continue executing */ - Status = NtContinue(Context, FALSE); - } - else - { - /* Raise an exception */ - Status = NtRaiseException(ExceptionRecord, Context, FALSE); - } + /* Raise an exception */ + Status = NtRaiseException(ExceptionRecord, Context, FALSE); } /* Setup the Exception record */ Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -183,43 +183,13 @@ .globl _KiUserExceptionDispatcher@8 _KiUserExceptionDispatcher@8: - /* clear the direct flag - * text from bug 2279 - * if it not clear it means that if an exception occurs while - * the direction flag is set (typically inside memmove), the - * exception handlers will be called with the direction flag still - * set. The Windows x86-32 and x86-64 ABI requires that the - * direction flag be Calling memset() with a compile-time constant - * size on both GCC and MSVC will result in inlining a "rep stosd" - * instruction. Because of the ABI, they will assume that the - * direction flag is clear and not emit a "cld" instruction. - * Using memset() in an exception handler therefore will - * corrupt memory if the exception occurred during a reverse copy - * such as a forward overlapping memmove(). - * - * For reliability and ease of debugging, please add "cld" to the beginning of - * KiUserExceptionDispatcher. Note that the same will be true of x86-64 whenever - * that happens. This does not affect continuing execution; the CONTEXT of the - * exception has the direction flag set and will be restored upon NtContinue. - * KiUserApcDispatcher and KiUserCallbackDispatcher need to be evaluated for this - * issue. - */ - + /* Clear direction flag */ cld /* Save the Context and Exception Records */ mov ecx, [esp+4] mov ebx, [esp] - /* Call the vectored exception handler */ - push ecx - push ebx - call _RtlpExecuteVectoredExceptionHandlers@8 - - /* Check for success */ - or al, al - jnz ContinueExecution - /* Dispatch the exception */ sub esp, 8 call _RtlDispatchException@8 @@ -228,7 +198,6 @@ or al, al jz RaiseException -ContinueExecution: /* Pop off the records */ pop ebx pop ecx Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -73,6 +73,13 @@ EXCEPTION_DISPOSITION Disposition; ULONG_PTR StackLow, StackHigh; ULONG_PTR RegistrationFrameEnd; + + /* Call any registered vectored handlers */ + if (RtlCallVectoredExceptionHandlers(ExceptionRecord, Context)) + { + /* Exception handled, continue execution */ + return TRUE; + } /* Get the current stack limits and registration frame */ RtlpGetStackLimits(&StackLow, &StackHigh); Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=35812&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -36,6 +36,13 @@ VOID NTAPI RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); + +BOOLEAN +NTAPI +RtlCallVectoredExceptionHandlers( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context +); typedef struct _DISPATCHER_CONTEXT { Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=358… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -28,9 +28,10 @@ /* FUNCTIONS ***************************************************************/ -EXCEPTION_DISPOSITION NTAPI -RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) +BOOLEAN +NTAPI +RtlCallVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) { PLIST_ENTRY CurrentEntry; PRTL_VECTORED_EXCEPTION_HANDLER veh; @@ -55,7 +56,7 @@ if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) { - return ExceptionContinueSearch; + return TRUE; } RtlEnterCriticalSection(&RtlpVectoredExceptionLock); @@ -63,7 +64,7 @@ RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } - return ExceptionContinueExecution; + return FALSE; } VOID

1 0

[sserapion] 35811: Commit WIP. Part 4 of ?? - Create separate def file for amd64 - Update rbuild files, not even these require msvcrt dependency - define _MSVCRT_, necesary to build dll correctly
by sserapion＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sserapion Date: Sat Aug 30 12:01:14 2008 New Revision: 35811 URL: http://svn.reactos.org/svn/reactos?rev=35811&view=rev Log: Commit WIP. Part 4 of ?? - Create separate def file for amd64 - Update rbuild files, not even these require msvcrt dependency - define _MSVCRT_, necesary to build dll correctly Added: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def (with props) branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-i386.def (with props) Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] Sat Aug 30 12:01:14 2008 @@ -7,6 +7,7 @@ <define name="_WIN32_WINNT">0x501</define> <define name="USE_MSVCRT_PREFIX" /> <define name="_MSVCRT_LIB_" /> + <define name="_MSVCRT_" /> <define name="__NO_CTYPE_INLINES" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" /> Added: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def [iso-8859-1] Sat Aug 30 12:01:14 2008 @@ -1,0 +1,848 @@ +; +; ReactOS MSVCRT Library +; +LIBRARY msvcrt.dll + +EXPORTS + $I10_OUTPUT=MSVCRT_I10_OUTPUT @57 + ??0__non_rtti_object@@QAE@ABV0@@Z=MSVCRT___non_rtti_object_copy_ctor @1 + ??0__non_rtti_object@@QAE@PBD@Z=MSVCRT___non_rtti_object_ctor @2 +; ??0bad_cast@@AAE@PBQBD@Z @3 + ??0bad_cast@@QAE@ABQBD@Z=MSVCRT_bad_cast_ctor @4 + ??0bad_cast@@QAE@ABV0@@Z=MSVCRT_bad_cast_copy_ctor @5 +; ??0bad_cast@@QAE@PBD@Z @6 + ??0bad_typeid@@QAE@ABV0@@Z=MSVCRT_bad_typeid_copy_ctor @7 + ??0bad_typeid@@QAE@PBD@Z=MSVCRT_bad_typeid_ctor @8 + ??0exception@@QAE@ABQBD@Z=MSVCRT_exception_ctor @9 +; ??0exception@@QAE@ABQBDH@Z @10 + ??0exception@@QAE@ABV0@@Z=MSVCRT_exception_copy_ctor @11 + ??0exception@@QAE@XZ=MSVCRT_exception_default_ctor @12 + ??1__non_rtti_object@@UAE@XZ=MSVCRT___non_rtti_object_dtor @13 + ??1bad_cast@@UAE@XZ=MSVCRT_bad_cast_dtor @14 + ??1bad_typeid@@UAE@XZ=MSVCRT_bad_typeid_dtor @15 + ??1exception@@UAE@XZ=MSVCRT_exception_dtor @16 + ??1type_info@@UAE@XZ=MSVCRT_type_info_dtor @17 + ??2@YAPAXI@Z=MSVCRT_operator_new @18 + ??3@YAXPAX@Z=MSVCRT_operator_delete @19 + ??4__non_rtti_object@@QAEAAV0@ABV0@@Z=MSVCRT___non_rtti_object_opequals @20 + ??4bad_cast@@QAEAAV0@ABV0@@Z=MSVCRT_bad_cast_opequals @21 + ??4bad_typeid@@QAEAAV0@ABV0@@Z=MSVCRT_bad_typeid_opequals @22 + ??4exception@@QAEAAV0@ABV0@@Z=MSVCRT_exception_opequals @23 + ??8type_info@@QBEHABV0@@Z=MSVCRT_type_info_opequals_equals @24 + ??9type_info@@QBEHABV0@@Z=MSVCRT_type_info_opnot_equals @25 + ??_7__non_rtti_object@@6B@=MSVCRT___non_rtti_object_vtable@@6B@ @26 DATA + ??_7bad_cast@@6B@=MSVCRT_bad_cast_vtable @27 DATA + ??_7bad_typeid@@6B@=MSVCRT_bad_typeid_vtable @28 DATA + ??_7exception@@6B@=MSVCRT_exception_vtable @29 DATA + ??_E__non_rtti_object@@UAEPAXI@Z=MSVCRT___non_rtti_object_vector_dtor @30 + ??_Ebad_cast@@UAEPAXI@Z=MSVCRT_bad_cast_vector_dtor @31 + ??_Ebad_typeid@@UAEPAXI@Z=MSVCRT_bad_typeid_vector_dtor @32 + ??_Eexception@@UAEPAXI@Z=MSVCRT_exception_vector_dtor @33 +; ??_Fbad_cast@@QAEXXZ @34 +; ??_Fbad_typeid@@QAEXXZ @35 + ??_G__non_rtti_object@@UAEPAXI@Z=MSVCRT___non_rtti_object_scalar_dtor @36 + ??_Gbad_cast@@UAEPAXI@Z=MSVCRT_bad_cast_scalar_dtor @37 + ??_Gbad_typeid@@UAEPAXI@Z=MSVCRT_bad_typeid_scalar_dtor @38 + ??_Gexception@@UAEPAXI@Z=MSVCRT_exception_scalar_dtor @39 + ??_U@YAPAXI@Z=MSVCRT_operator_new @40 + ??_V@YAXPAX@Z=MSVCRT_operator_delete @41 + ?_query_new_handler@@YAP6AHI@ZXZ=MSVCRT__query_new_handler @43 + ?_query_new_mode@@YAHXZ=MSVCRT__query_new_mode @44 + ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=MSVCRT__set_new_handler @45 + ?_set_new_mode@@YAHH@Z=MSVCRT__set_new_mode @46 + ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z=MSVCRT__set_se_translator @47 + ?before@type_info@@QBEHABV1@@Z=MSVCRT_type_info_before @48 + ?name@type_info@@QBEPBDXZ=MSVCRT_type_info_name @49 + ?raw_name@type_info@@QBEPBDXZ=MSVCRT_type_info_raw_name @50 + ?set_new_handler@@YAP6AXXZP6AXXZ@Z=MSVCRT__set_new_handler @51 + ?set_terminate@@YAP6AXXZP6AXXZ@Z=MSVCRT_set_terminate @52 + ?set_unexpected@@YAP6AXXZP6AXXZ@Z=MSVCRT_set_unexpected @53 + ?terminate@@YAXXZ=MSVCRT_terminate @54 + ?unexpected@@YAXXZ=MSVCRT_unexpected @55 + ?what@exception@@UBEPBDXZ=MSVCRT_what_exception @56 + _CIacos @58 + _CIasin @59 + _CIatan @60 + _CIatan2 @61 + _CIcos @62 + _CIcosh @63 + _CIexp @64 + _CIfmod @65 + _CIlog @66 + _CIlog10 @67 + _CIpow @68 + _CIsin @69 + _CIsinh @70 + _CIsqrt @71 + _CItan @72 + _CItanh @73 + _CxxThrowException @74 + _EH_prolog @75 + _Getdays @76 + _Getmonths @77 + _Gettnames @78 + _HUGE @79 DATA + _Strftime @80 + _XcptFilter @81 + __CppXcptFilter @82 +; __CxxCallUnwindDtor @83 +; __CxxCallUnwindVecDtor @84 + __CxxDetectRethrow @85 +; __CxxExceptionFilter @86 + __CxxFrameHandler @87 +; __CxxFrameHandler2 @88 + __CxxLongjmpUnwind @89 + __CxxQueryExceptionSize @90 +; __CxxRegisterExceptionObject @91 +; __CxxUnregisterExceptionObject @92 +; __DestructExceptionObject @93 + __RTCastToVoid=MSVCRT___RTCastToVoid @94 + __RTDynamicCast=MSVCRT___RTDynamicCast @95 + __RTtypeid=MSVCRT___RTtypeid @96 + __STRINGTOLD @97 +; ___lc_codepage_func @98 +; ___lc_collate_cp_func @99 +; ___lc_handle_func @100 +; ___mb_cur_max_func @101 + ___setlc_active_func @102 + ___unguarded_readlc_active_add_func @103 + __argc @104 DATA + __argv @105 DATA + __badioinfo @106 DATA + __crtCompareStringA=kernel32.CompareStringA @107 + __crtCompareStringW=kernel32.CompareStringW @108 + __crtGetLocaleInfoW=kernel32.GetLocaleInfo @109 + __crtGetStringTypeW=kernel32.GetStringTypeW @110 + __crtLCMapStringA @111 +; __crtLCMapStringW @112 + __dllonexit @113 + __doserrno @114 + __fpecode @115 + __getmainargs @116 + __initenv @117 + __iob_func @118 + __isascii @119 + __iscsym @120 + __iscsymf @121 + __lc_codepage @122 DATA + __lc_collate_cp @123 DATA + __lc_handle @124 DATA + __lconv_init @125 + __mb_cur_max @126 DATA + __p___argc @127 + __p___argv @128 + __p___initenv @129 + __p___mb_cur_max @130 + __p___wargv @131 + __p___winitenv @132 + __p__acmdln @133 + __p__amblksiz @134 + __p__commode @135 + __p__daylight @136 + __p__dstbias @137 + __p__environ @138 +; __p__fileinfo @139 + __p__fmode @140 + __p__iob @141 +; __p__mbcasemap @142 + __p__mbctype @143 + __p__osver @144 + __p__pctype @145 + __p__pgmptr @146 + __p__pwctype @147 + __p__timezone @148 + __p__tzname @149 + __p__wcmdln @150 + __p__wenviron @151 + __p__winmajor @152 + __p__winminor @153 + __p__winver @154 + __p__wpgmptr @155 +; __pctype_func @156 + __pioinfo @157 DATA +; __pwctype_func @158 + __pxcptinfoptrs @159 + __set_app_type @160 + __setlc_active @161 DATA + __setusermatherr @162 + __threadhandle @163 + __threadid @164 + __toascii @165 + __unDName @166 + __unDNameEx @167 +; __uncaught_exception @42 + __unguarded_readlc_active @168 DATA + __wargv @169 DATA +; __wcserror @170 + __wgetmainargs @171 + __winitenv @172 DATA + _abnormal_termination @173 +; _abs64 @174 + _access @175 + _acmdln @176 DATA + _adj_fdiv_m16i @177 + _adj_fdiv_m32 @178 + _adj_fdiv_m32i @179 + _adj_fdiv_m64 @180 + _adj_fdiv_r @181 + _adj_fdivr_m16i @182 + _adj_fdivr_m32 @183 + _adj_fdivr_m32i @184 + _adj_fdivr_m64 @185 + _adj_fpatan @186 + _adj_fprem @187 + _adj_fprem1 @188 + _adj_fptan @189 + _adjust_fdiv @190 DATA + _aexit_rtn @191 + _aligned_free @192 + _aligned_malloc @193 + _aligned_offset_malloc @194 + _aligned_offset_realloc @195 + _aligned_realloc @196 + _amsg_exit @197 + _assert @198 +; _atodbl @199 + _atoi64 @200 + _atoldbl @201 + _beep @202 + _beginthread @203 + _beginthreadex @204 + _c_exit @205 + _cabs @206 + _callnewh @207 + _cexit @208 + _cgets @209 +; _cgetws @210 + _chdir @211 + _chdrive @212 + _chgsign @213 + _chkesp @214 + _chmod @215 + _chsize @216 + _clearfp @217 + _close @218 + _commit @219 + _commode @220 DATA + _control87 @221 + _controlfp @222 + _copysign @223 + _cprintf @224 + _cputs @225 +; _cputws @226 + _creat @227 + _cscanf @228 +; _ctime64 @229 + _ctype @230 DATA + _cwait @231 +; _cwprintf @232 +; _cwscanf @233 + _daylight @234 DATA + _dstbias @235 DATA + _dup @236 + _dup2 @237 + _ecvt @238 + _endthread @239 + _endthreadex @240 + _environ @241 DATA + _eof @242 + _errno @243 + _except_handler2 @244 + _except_handler3 @245 + _execl @246 + _execle @247 + _execlp @248 + _execlpe @249 + _execv @250 + _execve @251 + _execvp @252 + _execvpe @253 + _exit @254 + _expand @255 + _fcloseall @256 + _fcvt @257 + _fdopen @258 + _fgetchar @259 + _fgetwchar @260 + _filbuf @261 +; _fileinfo @262 + _filelength @263 + _filelengthi64 @264 + _fileno @265 + _findclose @266 + _findfirst @267 + _findfirst64 @268 + _findfirsti64 @269 + _findnext @270 + _findnext64 @271 + _findnexti64 @272 + _finite @273 + _flsbuf @274 + _flushall @275 + _fmode @276 DATA + _fpclass @277 + _fpieee_flt @278 + _fpreset @279 + _fputchar @280 + _fputwchar @281 + _fsopen @282 + _fstat @283 + _fstat64 @284 + _fstati64 @285 + _ftime @286 + _ftime64 @287 + _ftol @288 + _fullpath @289 + _futime @290 +; _futime64 @291 + _gcvt @292 +; _get_heap_handle @293 + _get_osfhandle @294 + _get_sbh_threshold @295 + _getch @296 + _getche @297 + _getcwd @298 + _getdcwd @299 + _getdiskfree @300 + _getdllprocaddr @301 + _getdrive @302 + _getdrives=kernel32.GetLogicalDrives @303 + _getmaxstdio @304 + _getmbcp @305 + _getpid=kernel32.GetCurrentProcessId @306 + _getsystime @307 + _getw @308 +; _getwch @309 +; _getwche @310 + _getws @311 + _global_unwind2 @312 + _gmtime64 @313 + _heapadd @314 + _heapchk @315 + _heapmin @316 + _heapset @317 +; _heapused @318 + _heapwalk @319 + _hypot @320 + _i64toa @321 + _i64tow @322 + _initterm @323 +; _inp @324 +; _inpd @325 +; _inpw @326 + _iob @327 DATA + _isatty @328 + _isctype @329 + _ismbbalnum @330 + _ismbbalpha @331 + _ismbbgraph @332 + _ismbbkalnum @333 + _ismbbkana @334 +; _ismbbkprint @335 + _ismbbkpunct @336 + _ismbblead @337 + _ismbbprint @338 + _ismbbpunct @339 + _ismbbtrail @340 + _ismbcalnum @341 + _ismbcalpha @342 + _ismbcdigit @343 + _ismbcgraph @344 + _ismbchira @345 + _ismbckata @346 + _ismbcl0 @347 + _ismbcl1 @348 + _ismbcl2 @349 + _ismbclegal @350 + _ismbclower @351 + _ismbcprint @352 + _ismbcpunct @353 + _ismbcspace @354 + _ismbcsymbol @355 + _ismbcupper @356 + _ismbslead @357 + _ismbstrail @358 + _isnan @359 + _itoa @360 + _itow @361 + _j0 @362 + _j1 @363 + _jn @364 + _kbhit @365 + _lfind @366 + _loaddll @367 + _local_unwind2 @368 + _localtime64 @369 + _lock @370 + _locking @371 + _logb @372 + _longjmpex=longjmp @373 + _lrotl @374 + _lrotr @375 + _lsearch @376 + _lseek @377 + _lseeki64 @378 + _ltoa @379 + _ltow @380 + _makepath @381 + _mbbtombc @382 + _mbbtype @383 +; _mbcasemap @384 + _mbccpy @385 + _mbcjistojms @386 + _mbcjmstojis @387 + _mbclen @388 + _mbctohira @389 + _mbctokata @390 + _mbctolower @391 + _mbctombb @392 + _mbctoupper @393 + _mbctype @394 DATA + _mbsbtype @395 + _mbscat @396 + _mbschr @397 + _mbscmp @398 + _mbscoll @399 + _mbscpy @400 + _mbscspn @401 + _mbsdec @402 + _mbsdup @403 + _mbsicmp @404 + _mbsicoll @405 + _mbsinc @406 + _mbslen @407 + _mbslwr @408 + _mbsnbcat @409 + _mbsnbcmp @410 + _mbsnbcnt @411 + _mbsnbcoll @412 + _mbsnbcpy @413 + _mbsnbicmp @414 + _mbsnbicoll @415 + _mbsnbset @416 + _mbsncat @417 + _mbsnccnt @418 + _mbsncmp @419 + _mbsncoll @420 + _mbsncpy @421 + _mbsnextc @422 + _mbsnicmp @423 + _mbsnicoll @424 + _mbsninc @425 + _mbsnset @426 + _mbspbrk @427 + _mbsrchr @428 + _mbsrev @429 + _mbsset @430 + _mbsspn @431 + _mbsspnp @432 + _mbsstr @433 + _mbstok @434 + _mbstrlen @435 + _mbsupr @436 + _memccpy @437 + _memicmp @438 + _mkdir @439 +; _mkgmtime @440 +; _mkgmtime64 @441 + _mktemp @442 +; _mktime64 @443 + _msize @444 + _nextafter @445 + _onexit @446 + _open @447 + _open_osfhandle @448 +; _osplatform @449 + _osver @450 DATA +; _outp @451 +; _outpd @452 +; _outpw @453 + _pclose @454 + _pctype @455 DATA + _pgmptr @456 DATA + _pipe @457 + _popen @458 + _purecall @459 + _putch @460 + _putenv @461 + _putw @462 +; _putwch @463 + _putws @464 + _pwctype @465 + _read @466 +; _resetstkoflw @467 + _rmdir @468 + _rmtmp @469 + _rotl @470 +; _rotl64 @471 + _rotr @472 +; _rotr64 @473 + _safe_fdiv @474 + _safe_fdivr @475 + _safe_fprem @476 + _safe_fprem1 @477 + _scalb @478 +; _scprintf @479 +; _scwprintf @480 + _searchenv @481 + _seh_longjmp_unwind=_seh_longjmp_unwind@4 @482 +; _set_SSE2_enable @483 + _set_error_mode @484 + _set_sbh_threshold @485 + _seterrormode @486 + _setjmp @487 + _setjmp3 @488 + _setmaxstdio @489 + _setmbcp @490 + _setmode @491 + _setsystime @492 + _sleep @493 + _snprintf @494 +; _snscanf @495 + _snwprintf @496 +; _snwscanf @497 + _sopen @498 + _spawnl @499 + _spawnle @500 + _spawnlp @501 + _spawnlpe @502 + _spawnv @503 + _spawnve @504 + _spawnvp @505 + _spawnvpe @506 + _splitpath @507 + _stat @508 + _stat64 @509 + _stati64 @510 + _statusfp @511 + _strcmpi @512 + _strdate @513 + _strdup @514 + _strerror @515 + _stricmp @516 + _stricoll @517 + _strlwr @518 + _strncoll @519 + _strnicmp @520 + _strnicoll @521 + _strnset @522 + _strrev @523 + _strset @524 + _strtime @525 +; _strtoi64 @526 + _strtoui64=strtoull @527 + _strupr @528 + _swab @529 + _sys_errlist @530 DATA + _sys_nerr @531 DATA + _tell @532 + _telli64 @533 + _tempnam @534 + _time64 @535 + _timezone @536 DATA + _tolower @537 + _toupper @538 + _tzname @539 DATA + _tzset @540 + _ui64toa @541 + _ui64tow @542 + _ultoa @543 + _ultow @544 + _umask @545 + _ungetch @546 +; _ungetwch @547 + _unlink @548 + _unloaddll @549 + _unlock @550 + _utime @551 +; _utime64 @552 +; _vscprintf @553 +; _vscwprintf @554 + _vsnprintf @555 + _vsnwprintf @556 + _waccess @557 + _wasctime @558 + _wchdir @559 + _wchmod @560 + _wcmdln @561 + _wcreat @562 + _wcsdup @563 +; _wcserror @564 + _wcsicmp @565 + _wcsicoll @566 + _wcslwr @567 + _wcsncoll @568 + _wcsnicmp @569 + _wcsnicoll @570 + _wcsnset @571 + _wcsrev @572 + _wcsset @573 +; _wcstoi64 @574 +; _wcstoui64 @575 + _wcsupr @576 + _wctime @577 +; _wctime64 @578 +; _wctype @579 + _wenviron @580 DATA + _wexecl @581 + _wexecle @582 + _wexeclp @583 + _wexeclpe @584 + _wexecv @585 + _wexecve @586 + _wexecvp @587 + _wexecvpe @588 + _wfdopen @589 + _wfindfirst @590 +; _wfindfirst64 @591 + _wfindfirsti64 @592 + _wfindnext @593 +; _wfindnext64 @594 + _wfindnexti64 @595 + _wfopen @596 + _wfreopen @597 + _wfsopen @598 + _wfullpath @599 + _wgetcwd @600 + _wgetdcwd @601 + _wgetenv @602 + _winmajor @603 DATA + _winminor @604 DATA + _winver @605 DATA + _wmakepath @606 + _wmkdir @607 + _wmktemp @608 + _wopen @609 + _wperror @610 + _wpgmptr @611 DATA + _wpopen @612 + _wputenv @613 + _wremove @614 + _wrename @615 + _write @616 + _wrmdir @617 + _wsearchenv @618 + _wsetlocale @619 + _wsopen @620 + _wspawnl @621 + _wspawnle @622 + _wspawnlp @623 + _wspawnlpe @624 + _wspawnv @625 + _wspawnve @626 + _wspawnvp @627 + _wspawnvpe @628 + _wsplitpath @629 + _wstat @630 + _wstat64 @631 + _wstati64 @632 + _wstrdate @633 + _wstrtime @634 + _wsystem @635 + _wtempnam @636 + _wtmpnam @637 +; _wtof @638 + _wtoi @639 + _wtoi64 @640 + _wtol @641 + _wunlink @642 + _wutime @643 +; _wutime64 @644 + _y0 @645 + _y1 @646 + _yn @647 + abort @648 + abs @649 + acos @650 + asctime @651 + asin @652 + atan @653 + atan2 @654 + atexit @655 + atof @656 + atoi @657 + atol @658 + bsearch @659 + calloc @660 + ceil @661 + clearerr @662 + clock @663 + cos @664 + cosh @665 + ctime @666 + difftime @667 + div @668 + exit @669 + exp @670 + fabs @671 + fclose @672 + feof @673 + ferror @674 + fflush @675 + fgetc @676 + fgetpos @677 + fgets @678 + fgetwc @679 + fgetws @680 + floor @681 + fmod @682 + fopen @683 + fprintf @684 + fputc @685 + fputs @686 + fputwc @687 + fputws @688 + fread @689 + free @690 + freopen @691 + frexp @692 + fscanf @693 + fseek @694 + fsetpos @695 + ftell @696 + fwprintf @697 + fwrite @698 + fwscanf @699 + getc @700 + getchar @701 + getenv @702 + gets @703 + getwc @704 + getwchar @705 + gmtime @706 + is_wctype @707 + isalnum @708 + isalpha @709 + iscntrl @710 + isdigit @711 + isgraph @712 + isleadbyte @713 + islower @714 + isprint @715 + ispunct @716 + isspace @717 + isupper @718 + iswalnum @719 + iswalpha @720 + iswascii @721 + iswcntrl @722 + iswctype @723 + iswdigit @724 + iswgraph @725 + iswlower @726 + iswprint @727 + iswpunct @728 + iswspace @729 + iswupper @730 + iswxdigit @731 + isxdigit @732 + labs @733 + ldexp @734 + ldiv @735 + localeconv @736 + localtime @737 + log @738 + log10 @739 + longjmp @740 + malloc @741 + mblen @742 + mbstowcs @743 + mbtowc @744 + memchr @745 + memcmp @746 + memcpy @747 + memmove @748 + memset @749 + mktime @750 + modf @751 + perror @752 + pow @753 + printf @754 + putc @755 + putchar @756 + puts @757 + putwc=fputwc @758 + putwchar=_fputwchar @759 + qsort @760 + raise @761 + rand @762 + realloc @763 + remove @764 + rename @765 + rewind @766 + scanf @767 + setbuf @768 + setlocale @769 + setvbuf @770 + signal @771 + sin @772 + sinh @773 + sprintf @774 + sqrt @775 + srand @776 + sscanf @777 + strcat @778 + strchr @779 + strcmp @780 + strcoll @781 + strcpy @782 + strcspn @783 + strerror @784 + strftime @785 + strlen @786 + strncat @787 + strncmp @788 + strncpy @789 + strpbrk @790 + strrchr @791 + strspn @792 + strstr @793 + strtod @794 + strtok @795 + strtol @796 + strtoul @797 + strxfrm @798 + swprintf @799 + swscanf @800 + system @801 + tan @802 + tanh @803 + time @804 + tmpfile @805 + tmpnam @806 + tolower @807 + toupper @808 + towlower @809 + towupper @810 + ungetc @811 + ungetwc @812 + vfprintf @813 + vfwprintf @814 + vprintf @815 + vsprintf @816 + vswprintf @817 + vwprintf @818 + wcscat @819 + wcschr @820 + wcscmp @821 + wcscoll @822 + wcscpy @823 + wcscspn @824 + wcsftime @825 + wcslen @826 + wcsncat @827 + wcsncmp @828 + wcsncpy @829 + wcspbrk @830 + wcsrchr @831 + wcsspn @832 + wcsstr @833 + wcstod @834 + wcstok @835 + wcstol @836 + wcstombs @837 + wcstoul @838 + wcsxfrm @839 + wctomb @840 + wprintf @841 + wscanf @842 Propchange: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-i386.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-i386.def (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-i386.def [iso-8859-1] Sat Aug 30 12:01:14 2008 @@ -1,0 +1,848 @@ +; +; ReactOS MSVCRT Library +; +LIBRARY msvcrt.dll + +EXPORTS + $I10_OUTPUT=MSVCRT_I10_OUTPUT @57 + ??0__non_rtti_object@@QAE@ABV0@@Z=__thiscall_MSVCRT___non_rtti_object_copy_ctor @1 + ??0__non_rtti_object@@QAE@PBD@Z=__thiscall_MSVCRT___non_rtti_object_ctor @2 +; ??0bad_cast@@AAE@PBQBD@Z @3 + ??0bad_cast@@QAE@ABQBD@Z=__thiscall_MSVCRT_bad_cast_ctor @4 + ??0bad_cast@@QAE@ABV0@@Z=__thiscall_MSVCRT_bad_cast_copy_ctor @5 +; ??0bad_cast@@QAE@PBD@Z @6 + ??0bad_typeid@@QAE@ABV0@@Z=__thiscall_MSVCRT_bad_typeid_copy_ctor @7 + ??0bad_typeid@@QAE@PBD@Z=__thiscall_MSVCRT_bad_typeid_ctor @8 + ??0exception@@QAE@ABQBD@Z=__thiscall_MSVCRT_exception_ctor @9 +; ??0exception@@QAE@ABQBDH@Z @10 + ??0exception@@QAE@ABV0@@Z=__thiscall_MSVCRT_exception_copy_ctor @11 + ??0exception@@QAE@XZ=__thiscall_MSVCRT_exception_default_ctor @12 + ??1__non_rtti_object@@UAE@XZ=__thiscall_MSVCRT___non_rtti_object_dtor @13 + ??1bad_cast@@UAE@XZ=__thiscall_MSVCRT_bad_cast_dtor @14 + ??1bad_typeid@@UAE@XZ=__thiscall_MSVCRT_bad_typeid_dtor @15 + ??1exception@@UAE@XZ=__thiscall_MSVCRT_exception_dtor @16 + ??1type_info@@UAE@XZ=__thiscall_MSVCRT_type_info_dtor @17 + ??2@YAPAXI@Z=MSVCRT_operator_new @18 + ??3@YAXPAX@Z=MSVCRT_operator_delete @19 + ??4__non_rtti_object@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT___non_rtti_object_opequals @20 + ??4bad_cast@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_bad_cast_opequals @21 + ??4bad_typeid@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_bad_typeid_opequals @22 + ??4exception@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_exception_opequals @23 + ??8type_info@@QBEHABV0@@Z=__thiscall_MSVCRT_type_info_opequals_equals @24 + ??9type_info@@QBEHABV0@@Z=__thiscall_MSVCRT_type_info_opnot_equals @25 + ??_7__non_rtti_object@@6B@=MSVCRT___non_rtti_object_vtable@@6B@ @26 DATA + ??_7bad_cast@@6B@=MSVCRT_bad_cast_vtable @27 DATA + ??_7bad_typeid@@6B@=MSVCRT_bad_typeid_vtable @28 DATA + ??_7exception@@6B@=MSVCRT_exception_vtable @29 DATA + ??_E__non_rtti_object@@UAEPAXI@Z=__thiscall_MSVCRT___non_rtti_object_vector_dtor @30 + ??_Ebad_cast@@UAEPAXI@Z=__thiscall_MSVCRT_bad_cast_vector_dtor @31 + ??_Ebad_typeid@@UAEPAXI@Z=__thiscall_MSVCRT_bad_typeid_vector_dtor @32 + ??_Eexception@@UAEPAXI@Z=__thiscall_MSVCRT_exception_vector_dtor @33 +; ??_Fbad_cast@@QAEXXZ @34 +; ??_Fbad_typeid@@QAEXXZ @35 + ??_G__non_rtti_object@@UAEPAXI@Z=__thiscall_MSVCRT___non_rtti_object_scalar_dtor @36 + ??_Gbad_cast@@UAEPAXI@Z=__thiscall_MSVCRT_bad_cast_scalar_dtor @37 + ??_Gbad_typeid@@UAEPAXI@Z=__thiscall_MSVCRT_bad_typeid_scalar_dtor @38 + ??_Gexception@@UAEPAXI@Z=__thiscall_MSVCRT_exception_scalar_dtor @39 + ??_U@YAPAXI@Z=MSVCRT_operator_new @40 + ??_V@YAXPAX@Z=MSVCRT_operator_delete @41 + ?_query_new_handler@@YAP6AHI@ZXZ=MSVCRT__query_new_handler @43 + ?_query_new_mode@@YAHXZ=MSVCRT__query_new_mode @44 + ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=MSVCRT__set_new_handler @45 + ?_set_new_mode@@YAHH@Z=MSVCRT__set_new_mode @46 + ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z=MSVCRT__set_se_translator @47 + ?before@type_info@@QBEHABV1@@Z=__thiscall_MSVCRT_type_info_before @48 + ?name@type_info@@QBEPBDXZ=__thiscall_MSVCRT_type_info_name @49 + ?raw_name@type_info@@QBEPBDXZ=__thiscall_MSVCRT_type_info_raw_name @50 + ?set_new_handler@@YAP6AXXZP6AXXZ@Z=MSVCRT__set_new_handler @51 + ?set_terminate@@YAP6AXXZP6AXXZ@Z=MSVCRT_set_terminate @52 + ?set_unexpected@@YAP6AXXZP6AXXZ@Z=MSVCRT_set_unexpected @53 + ?terminate@@YAXXZ=MSVCRT_terminate @54 + ?unexpected@@YAXXZ=MSVCRT_unexpected @55 + ?what@exception@@UBEPBDXZ=__thiscall_MSVCRT_what_exception @56 + _CIacos @58 + _CIasin @59 + _CIatan @60 + _CIatan2 @61 + _CIcos @62 + _CIcosh @63 + _CIexp @64 + _CIfmod @65 + _CIlog @66 + _CIlog10 @67 + _CIpow @68 + _CIsin @69 + _CIsinh @70 + _CIsqrt @71 + _CItan @72 + _CItanh @73 + _CxxThrowException @74 + _EH_prolog @75 + _Getdays @76 + _Getmonths @77 + _Gettnames @78 + _HUGE @79 DATA + _Strftime @80 + _XcptFilter @81 + __CppXcptFilter @82 +; __CxxCallUnwindDtor @83 +; __CxxCallUnwindVecDtor @84 + __CxxDetectRethrow @85 +; __CxxExceptionFilter @86 + __CxxFrameHandler @87 +; __CxxFrameHandler2 @88 + __CxxLongjmpUnwind @89 + __CxxQueryExceptionSize @90 +; __CxxRegisterExceptionObject @91 +; __CxxUnregisterExceptionObject @92 +; __DestructExceptionObject @93 + __RTCastToVoid=MSVCRT___RTCastToVoid @94 + __RTDynamicCast=MSVCRT___RTDynamicCast @95 + __RTtypeid=MSVCRT___RTtypeid @96 + __STRINGTOLD @97 +; ___lc_codepage_func @98 +; ___lc_collate_cp_func @99 +; ___lc_handle_func @100 +; ___mb_cur_max_func @101 + ___setlc_active_func @102 + ___unguarded_readlc_active_add_func @103 + __argc @104 DATA + __argv @105 DATA + __badioinfo @106 DATA + __crtCompareStringA=kernel32.CompareStringA @107 + __crtCompareStringW=kernel32.CompareStringW @108 + __crtGetLocaleInfoW=kernel32.GetLocaleInfo @109 + __crtGetStringTypeW=kernel32.GetStringTypeW @110 + __crtLCMapStringA @111 +; __crtLCMapStringW @112 + __dllonexit @113 + __doserrno @114 + __fpecode @115 + __getmainargs @116 + __initenv @117 +; __iob_func @118 + __isascii @119 + __iscsym @120 + __iscsymf @121 + __lc_codepage @122 DATA + __lc_collate_cp @123 DATA + __lc_handle @124 DATA + __lconv_init @125 + __mb_cur_max @126 DATA + __p___argc @127 + __p___argv @128 + __p___initenv @129 + __p___mb_cur_max @130 + __p___wargv @131 + __p___winitenv @132 + __p__acmdln @133 + __p__amblksiz @134 + __p__commode @135 + __p__daylight @136 + __p__dstbias @137 + __p__environ @138 +; __p__fileinfo @139 + __p__fmode @140 + __p__iob @141 +; __p__mbcasemap @142 + __p__mbctype @143 + __p__osver @144 + __p__pctype @145 + __p__pgmptr @146 + __p__pwctype @147 + __p__timezone @148 + __p__tzname @149 + __p__wcmdln @150 + __p__wenviron @151 + __p__winmajor @152 + __p__winminor @153 + __p__winver @154 + __p__wpgmptr @155 +; __pctype_func @156 + __pioinfo @157 DATA +; __pwctype_func @158 + __pxcptinfoptrs @159 + __set_app_type @160 + __setlc_active @161 DATA + __setusermatherr @162 + __threadhandle @163 + __threadid @164 + __toascii @165 + __unDName @166 + __unDNameEx @167 +; __uncaught_exception @42 + __unguarded_readlc_active @168 DATA + __wargv @169 DATA +; __wcserror @170 + __wgetmainargs @171 + __winitenv @172 DATA + _abnormal_termination @173 +; _abs64 @174 + _access @175 + _acmdln @176 DATA + _adj_fdiv_m16i @177 + _adj_fdiv_m32 @178 + _adj_fdiv_m32i @179 + _adj_fdiv_m64 @180 + _adj_fdiv_r @181 + _adj_fdivr_m16i @182 + _adj_fdivr_m32 @183 + _adj_fdivr_m32i @184 + _adj_fdivr_m64 @185 + _adj_fpatan @186 + _adj_fprem @187 + _adj_fprem1 @188 + _adj_fptan @189 + _adjust_fdiv @190 DATA + _aexit_rtn @191 + _aligned_free @192 + _aligned_malloc @193 + _aligned_offset_malloc @194 + _aligned_offset_realloc @195 + _aligned_realloc @196 + _amsg_exit @197 + _assert @198 +; _atodbl @199 + _atoi64 @200 + _atoldbl @201 + _beep @202 + _beginthread @203 + _beginthreadex @204 + _c_exit @205 + _cabs @206 + _callnewh @207 + _cexit @208 + _cgets @209 +; _cgetws @210 + _chdir @211 + _chdrive @212 + _chgsign @213 + _chkesp @214 + _chmod @215 + _chsize @216 + _clearfp @217 + _close @218 + _commit @219 + _commode @220 DATA + _control87 @221 + _controlfp @222 + _copysign @223 + _cprintf @224 + _cputs @225 +; _cputws @226 + _creat @227 + _cscanf @228 +; _ctime64 @229 + _ctype @230 DATA + _cwait @231 +; _cwprintf @232 +; _cwscanf @233 + _daylight @234 DATA + _dstbias @235 DATA + _dup @236 + _dup2 @237 + _ecvt @238 + _endthread @239 + _endthreadex @240 + _environ @241 DATA + _eof @242 + _errno @243 + _except_handler2 @244 + _except_handler3 @245 + _execl @246 + _execle @247 + _execlp @248 + _execlpe @249 + _execv @250 + _execve @251 + _execvp @252 + _execvpe @253 + _exit @254 + _expand @255 + _fcloseall @256 + _fcvt @257 + _fdopen @258 + _fgetchar @259 + _fgetwchar @260 + _filbuf @261 +; _fileinfo @262 + _filelength @263 + _filelengthi64 @264 + _fileno @265 + _findclose @266 + _findfirst @267 +; _findfirst64 @268 + ;_findfirsti64 @269 + _findnext @270 +; _findnext64 @271 + ;_findnexti64 @272 + _finite @273 + _flsbuf @274 + _flushall @275 + _fmode @276 DATA + _fpclass @277 + _fpieee_flt @278 + _fpreset @279 + _fputchar @280 + _fputwchar @281 + _fsopen @282 + _fstat @283 + _fstat64 @284 + ;_fstati64 @285 + ;_ftime @286 +; _ftime64 @287 + _ftol @288 + _fullpath @289 + _futime @290 +; _futime64 @291 + _gcvt @292 +; _get_heap_handle @293 + _get_osfhandle @294 + _get_sbh_threshold @295 + _getch @296 + _getche @297 + _getcwd @298 + _getdcwd @299 + _getdiskfree @300 + _getdllprocaddr @301 + _getdrive @302 + _getdrives=kernel32.GetLogicalDrives @303 + _getmaxstdio @304 + _getmbcp @305 + _getpid=kernel32.GetCurrentProcessId @306 + _getsystime @307 + _getw @308 +; _getwch @309 +; _getwche @310 + _getws @311 + _global_unwind2 @312 +; _gmtime64 @313 + _heapadd @314 + _heapchk @315 + _heapmin @316 + _heapset @317 +; _heapused @318 + _heapwalk @319 + _hypot @320 + _i64toa @321 + _i64tow @322 + _initterm @323 +; _inp @324 +; _inpd @325 +; _inpw @326 + _iob @327 DATA + _isatty @328 + _isctype @329 + _ismbbalnum @330 + _ismbbalpha @331 + _ismbbgraph @332 + _ismbbkalnum @333 + _ismbbkana @334 +; _ismbbkprint @335 + _ismbbkpunct @336 + _ismbblead @337 + _ismbbprint @338 + _ismbbpunct @339 + _ismbbtrail @340 + _ismbcalnum @341 + _ismbcalpha @342 + _ismbcdigit @343 + _ismbcgraph @344 + _ismbchira @345 + _ismbckata @346 + _ismbcl0 @347 + _ismbcl1 @348 + _ismbcl2 @349 + _ismbclegal @350 + _ismbclower @351 + _ismbcprint @352 + _ismbcpunct @353 + _ismbcspace @354 + _ismbcsymbol @355 + _ismbcupper @356 + _ismbslead @357 + _ismbstrail @358 + _isnan @359 + _itoa @360 + _itow @361 + _j0 @362 + _j1 @363 + _jn @364 + _kbhit @365 + _lfind @366 + _loaddll @367 + _local_unwind2 @368 +; _localtime64 @369 + _lock @370 + _locking @371 + _logb @372 + _longjmpex=longjmp @373 + _lrotl @374 + _lrotr @375 + _lsearch @376 + _lseek @377 + _lseeki64 @378 + _ltoa @379 + _ltow @380 + _makepath @381 + _mbbtombc @382 + _mbbtype @383 +; _mbcasemap @384 + _mbccpy @385 + _mbcjistojms @386 + _mbcjmstojis @387 + _mbclen @388 + _mbctohira @389 + _mbctokata @390 + _mbctolower @391 + _mbctombb @392 + _mbctoupper @393 + _mbctype @394 DATA + _mbsbtype @395 + _mbscat @396 + _mbschr @397 + _mbscmp @398 + _mbscoll @399 + _mbscpy @400 + _mbscspn @401 + _mbsdec @402 + _mbsdup @403 + _mbsicmp @404 + _mbsicoll @405 + _mbsinc @406 + _mbslen @407 + _mbslwr @408 + _mbsnbcat @409 + _mbsnbcmp @410 + _mbsnbcnt @411 + _mbsnbcoll @412 + _mbsnbcpy @413 + _mbsnbicmp @414 + _mbsnbicoll @415 + _mbsnbset @416 + _mbsncat @417 + _mbsnccnt @418 + _mbsncmp @419 + _mbsncoll @420 + _mbsncpy @421 + _mbsnextc @422 + _mbsnicmp @423 + _mbsnicoll @424 + _mbsninc @425 + _mbsnset @426 + _mbspbrk @427 + _mbsrchr @428 + _mbsrev @429 + _mbsset @430 + _mbsspn @431 + _mbsspnp @432 + _mbsstr @433 + _mbstok @434 + _mbstrlen @435 + _mbsupr @436 + _memccpy @437 + _memicmp @438 + _mkdir @439 +; _mkgmtime @440 +; _mkgmtime64 @441 + _mktemp @442 +; _mktime64 @443 + _msize @444 + _nextafter @445 + _onexit @446 + _open @447 + _open_osfhandle @448 +; _osplatform @449 + _osver @450 DATA +; _outp @451 +; _outpd @452 +; _outpw @453 + _pclose @454 + _pctype @455 DATA + _pgmptr @456 DATA + _pipe @457 + _popen @458 + _purecall @459 + _putch @460 + _putenv @461 + _putw @462 +; _putwch @463 + _putws @464 + _pwctype @465 + _read @466 +; _resetstkoflw @467 + _rmdir @468 + _rmtmp @469 + _rotl @470 +; _rotl64 @471 + _rotr @472 +; _rotr64 @473 + _safe_fdiv @474 + _safe_fdivr @475 + _safe_fprem @476 + _safe_fprem1 @477 + _scalb @478 +; _scprintf @479 +; _scwprintf @480 + _searchenv @481 + _seh_longjmp_unwind=_seh_longjmp_unwind@4 @482 +; _set_SSE2_enable @483 + _set_error_mode @484 + _set_sbh_threshold @485 + _seterrormode @486 + _setjmp @487 + _setjmp3 @488 + _setmaxstdio @489 + _setmbcp @490 + _setmode @491 + _setsystime @492 + _sleep @493 + _snprintf @494 +; _snscanf @495 + _snwprintf @496 +; _snwscanf @497 + _sopen @498 + _spawnl @499 + _spawnle @500 + _spawnlp @501 + _spawnlpe @502 + _spawnv @503 + _spawnve @504 + _spawnvp @505 + _spawnvpe @506 + _splitpath @507 + _stat @508 + _stat64 @509 + ;_stati64 @510 + _statusfp @511 + _strcmpi @512 + _strdate @513 + _strdup @514 + _strerror @515 + _stricmp @516 + _stricoll @517 + _strlwr @518 + _strncoll @519 + _strnicmp @520 + _strnicoll @521 + _strnset @522 + _strrev @523 + _strset @524 + _strtime @525 +; _strtoi64 @526 + _strtoui64=strtoull @527 + _strupr @528 + _swab @529 + _sys_errlist @530 DATA + _sys_nerr @531 DATA + _tell @532 + _telli64 @533 + _tempnam @534 +; _time64 @535 + _timezone @536 DATA + _tolower @537 + _toupper @538 + _tzname @539 DATA + _tzset @540 + _ui64toa @541 + _ui64tow @542 + _ultoa @543 + _ultow @544 + _umask @545 + _ungetch @546 +; _ungetwch @547 + _unlink @548 + _unloaddll @549 + _unlock @550 + _utime @551 +; _utime64 @552 +; _vscprintf @553 +; _vscwprintf @554 + _vsnprintf @555 + _vsnwprintf @556 + _waccess @557 + _wasctime @558 + _wchdir @559 + _wchmod @560 + _wcmdln @561 + _wcreat @562 + _wcsdup @563 +; _wcserror @564 + _wcsicmp @565 + _wcsicoll @566 + _wcslwr @567 + _wcsncoll @568 + _wcsnicmp @569 + _wcsnicoll @570 + _wcsnset @571 + _wcsrev @572 + _wcsset @573 +; _wcstoi64 @574 +; _wcstoui64 @575 + _wcsupr @576 + _wctime @577 +; _wctime64 @578 +; _wctype @579 + _wenviron @580 DATA + _wexecl @581 + _wexecle @582 + _wexeclp @583 + _wexeclpe @584 + _wexecv @585 + _wexecve @586 + _wexecvp @587 + _wexecvpe @588 + _wfdopen @589 + ;_wfindfirst @590 +; _wfindfirst64 @591 + ;_wfindfirsti64 @592 + ;_wfindnext @593 +; _wfindnext64 @594 + ;_wfindnexti64 @595 + _wfopen @596 + _wfreopen @597 + _wfsopen @598 + _wfullpath @599 + _wgetcwd @600 + _wgetdcwd @601 + _wgetenv @602 + _winmajor @603 DATA + _winminor @604 DATA + _winver @605 DATA + _wmakepath @606 + _wmkdir @607 + _wmktemp @608 + _wopen @609 + _wperror @610 + _wpgmptr @611 DATA + _wpopen @612 + _wputenv @613 + _wremove @614 + _wrename @615 + _write @616 + _wrmdir @617 + _wsearchenv @618 + _wsetlocale @619 + _wsopen @620 + _wspawnl @621 + _wspawnle @622 + _wspawnlp @623 + _wspawnlpe @624 + _wspawnv @625 + _wspawnve @626 + _wspawnvp @627 + _wspawnvpe @628 + _wsplitpath @629 + _wstat @630 + _wstat64 @631 + ;_wstati64 @632 + _wstrdate @633 + _wstrtime @634 + _wsystem @635 + _wtempnam @636 + _wtmpnam @637 +; _wtof @638 + _wtoi @639 + _wtoi64 @640 + _wtol @641 + _wunlink @642 + _wutime @643 +; _wutime64 @644 + _y0 @645 + _y1 @646 + _yn @647 + abort @648 + abs @649 + acos @650 + asctime @651 + asin @652 + atan @653 + atan2 @654 + atexit @655 + atof @656 + atoi @657 + atol @658 + bsearch @659 + calloc @660 + ceil @661 + clearerr @662 + clock @663 + cos @664 + cosh @665 + ctime @666 + difftime @667 + div @668 + exit @669 + exp @670 + fabs @671 + fclose @672 + feof @673 + ferror @674 + fflush @675 + fgetc @676 + fgetpos @677 + fgets @678 + fgetwc @679 + fgetws @680 + floor @681 + fmod @682 + fopen @683 + fprintf @684 + fputc @685 + fputs @686 + fputwc @687 + fputws @688 + fread @689 + free @690 + freopen @691 + frexp @692 + fscanf @693 + fseek @694 + fsetpos @695 + ftell @696 + fwprintf @697 + fwrite @698 + fwscanf @699 + getc @700 + getchar @701 + getenv @702 + gets @703 + getwc @704 + getwchar @705 + gmtime @706 + is_wctype @707 + isalnum @708 + isalpha @709 + iscntrl @710 + isdigit @711 + isgraph @712 + isleadbyte @713 + islower @714 + isprint @715 + ispunct @716 + isspace @717 + isupper @718 + iswalnum @719 + iswalpha @720 + iswascii @721 + iswcntrl @722 + iswctype @723 + iswdigit @724 + iswgraph @725 + iswlower @726 + iswprint @727 + iswpunct @728 + iswspace @729 + iswupper @730 + iswxdigit @731 + isxdigit @732 + labs @733 + ldexp @734 + ldiv @735 + localeconv @736 + localtime @737 + log @738 + log10 @739 + longjmp @740 + malloc @741 + mblen @742 + mbstowcs @743 + mbtowc @744 + memchr @745 + memcmp @746 + memcpy @747 + memmove @748 + memset @749 + mktime @750 + modf @751 + perror @752 + pow @753 + printf @754 + putc @755 + putchar @756 + puts @757 + putwc=fputwc @758 + putwchar=_fputwchar @759 + qsort @760 + raise @761 + rand @762 + realloc @763 + remove @764 + rename @765 + rewind @766 + scanf @767 + setbuf @768 + setlocale @769 + setvbuf @770 + signal @771 + sin @772 + sinh @773 + sprintf @774 + sqrt @775 + srand @776 + sscanf @777 + strcat @778 + strchr @779 + strcmp @780 + strcoll @781 + strcpy @782 + strcspn @783 + strerror @784 + strftime @785 + strlen @786 + strncat @787 + strncmp @788 + strncpy @789 + strpbrk @790 + strrchr @791 + strspn @792 + strstr @793 + strtod @794 + strtok @795 + strtol @796 + strtoul @797 + strxfrm @798 + swprintf @799 + swscanf @800 + system @801 + tan @802 + tanh @803 + time @804 + tmpfile @805 + tmpnam @806 + tolower @807 + toupper @808 + towlower @809 + towupper @810 + ungetc @811 + ungetwc @812 + vfprintf @813 + vfwprintf @814 + vprintf @815 + vsprintf @816 + vswprintf @817 + vwprintf @818 + wcscat @819 + wcschr @820 + wcscmp @821 + wcscoll @822 + wcscpy @823 + wcscspn @824 + wcsftime @825 + wcslen @826 + wcsncat @827 + wcsncmp @828 + wcsncpy @829 + wcspbrk @830 + wcsrchr @831 + wcsspn @832 + wcsstr @833 + wcstod @834 + wcstok @835 + wcstol @836 + wcstombs @837 + wcstoul @838 + wcsxfrm @839 + wctomb @840 + wprintf @841 + wscanf @842 Propchange: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-i386.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Sat Aug 30 12:01:14 2008 @@ -1,11 +1,12 @@ <module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll"> - <importlibrary definition="msvcrt.def" /> + <importlibrary definition="msvcrt-$(ARCH).def" /> <include base="msvcrt">.</include> <include base="crt">include</include> <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="USE_MSVCRT_PREFIX" /> + <define name="_MSVCRT_" /> <define name="_MSVCRT_LIB_" /> <define name="_MT" /> <define name="__NO_CTYPE_INLINES" /> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild [iso-8859-1] Sat Aug 30 12:01:14 2008 @@ -11,7 +11,6 @@ <file>msvcrt20.c</file> <file>msvcrt20.spec</file> <library>wine</library> - <library>msvcrt</library> <library>kernel32</library> <library>ntdll</library> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild [iso-8859-1] Sat Aug 30 12:01:14 2008 @@ -9,7 +9,6 @@ <file>msvcrt40.c</file> <file>msvcrt40.spec</file> <library>wine</library> - <library>msvcrt</library> <library>kernel32</library> </module> </group>

1 0

[sserapion] 35810: Commit WIP. Part 3 of ?? - Update crt to conform - add some amd64 stubs
by sserapion＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sserapion Date: Sat Aug 30 11:55:35 2008 New Revision: 35810 URL: http://svn.reactos.org/svn/reactos?rev=35810&view=rev Log: Commit WIP. Part 3 of ?? - Update crt to conform - add some amd64 stubs Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/ branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s (with props) branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s (with props) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/process.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/find.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/errno.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/getenv.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/rot.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/swab.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/atol.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/scanf.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/difftime.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="crt" type="staticlibrary"> +<module name="crt" type="staticlibrary" allowwarnings="true"> <include base="crt">.</include> <include base="crt">include</include> <define name="_DISABLE_TIDENTS" /> @@ -56,6 +56,12 @@ <file>chkstk_asm.s</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>seh.s</file> + <file>chkstk_asm.s</file> + </directory> + </if> <file>xcptfil.c</file> </directory> <directory name="float"> @@ -68,6 +74,14 @@ <file>nafter.c</file> <file>scalb.c</file> <if property="ARCH" value="i386"> + <directory name="i386"> + <file>clearfp.c</file> + <file>cntrlfp.c</file> + <file>logb.c</file> + <file>statfp.c</file> + </directory> + </if> + <if property="ARCH" value="amd64"> <directory name="i386"> <file>clearfp.c</file> <file>cntrlfp.c</file> @@ -112,8 +126,15 @@ <file>log10_asm.s</file> </directory> </if> - <ifnot property="ARCH" value="i386"> - </ifnot> + <if property="ARCH" value="amd64"> + <directory name="i386"> + <file>atan2.c</file> + <file>exp.c</file> + <file>fmod.c</file> + <file>ldexp.c</file> + </directory> + </if> + </directory> <directory name="mbstring"> Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -1,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Stack checker + * FILE: lib/ntdll/rtl/i386/chkstk.s + * PROGRAMER: + */ + +.globl _chkstk +.globl _alloca_probe + +/* + _chkstk() is called by all stack allocations of more than 4 KB. It grows the + stack in areas of 4 KB each, trying to access each area. This ensures that the + guard page for the stack is hit, and the stack growing triggered + */ +_chkstk: +_alloca_probe: + /* return */ + ret + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s (added) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -1,0 +1,84 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/crt/misc/i386/seh.S + * PURPOSE: SEH Support for the CRT + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/asm.h> +.intel_syntax noprefix + +#define DISPOSITION_DISMISS 0 +#define DISPOSITION_CONTINUE_SEARCH 1 +#define DISPOSITION_COLLIDED_UNWIND 3 + +/* GLOBALS *******************************************************************/ + +.globl __global_unwind2 +.globl __local_unwind2 +.globl __abnormal_termination +.globl __except_handler2 +.globl __except_handler3 + +/* FUNCTIONS *****************************************************************/ + +.func unwind_handler +_unwind_handler: + ret +.endfunc + +.func _global_unwind2 +__global_unwind2: + ret +.endfunc + +.func _abnormal_termination +__abnormal_termination: + ret +.endfunc + +.func _local_unwind2 +__local_unwind2: + ret +.endfunc + +.func _except_handler2 +__except_handler2: + ret +.endfunc + +.func _except_handler3 +__except_handler3: + ret +.endfunc + +// +// +// REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME +// +// +.func RtlpGetStackLimits@8 +.globl _RtlpGetStackLimits@8 +_RtlpGetStackLimits@8: + + /* Get the current thread */ + mov eax, [fs:KPCR_CURRENT_THREAD] + + /* Get the stack limits */ + mov ecx, [eax+KTHREAD_STACK_LIMIT] + mov edx, [eax+KTHREAD_INITIAL_STACK] + sub edx, SIZEOF_FX_SAVE_AREA + + /* Return them */ + mov eax, [esp+4] + mov [eax], ecx + + mov eax, [esp+8] + mov [eax], edx + + /* return */ + ret 8 +.endfunc Propchange: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/process.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/process/process.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -323,7 +323,7 @@ /* * @implemented */ -int _tspawnl(int mode, const _TCHAR *cmdname, const _TCHAR* arg0, ...) +intptr_t _tspawnl(int mode, const _TCHAR *cmdname, const _TCHAR* arg0, ...) { va_list argp; _TCHAR* args; @@ -345,7 +345,7 @@ /* * @implemented */ -int _tspawnv(int mode, const _TCHAR *cmdname, const _TCHAR* const* argv) +intptr_t _tspawnv(int mode, const _TCHAR *cmdname, const _TCHAR* const* argv) { _TCHAR* args; int ret = -1; @@ -365,7 +365,7 @@ /* * @implemented */ -int _tspawnle(int mode, const _TCHAR *cmdname, const _TCHAR* arg0, ... /*, NULL, const char* const* envp*/) +intptr_t _tspawnle(int mode, const _TCHAR *cmdname, const _TCHAR* arg0, ... /*, NULL, const char* const* envp*/) { va_list argp; _TCHAR* args; @@ -400,7 +400,7 @@ /* * @implemented */ -int _tspawnve(int mode, const _TCHAR *cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) +intptr_t _tspawnve(int mode, const _TCHAR *cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) { _TCHAR *args; _TCHAR *envs; @@ -426,7 +426,7 @@ /* * @implemented */ -int _tspawnvp(int mode, const _TCHAR* cmdname, const _TCHAR* const* argv) +intptr_t _tspawnvp(int mode, const _TCHAR* cmdname, const _TCHAR* const* argv) { _TCHAR pathname[FILENAME_MAX]; @@ -438,7 +438,7 @@ /* * @implemented */ -int _tspawnlp(int mode, const _TCHAR* cmdname, const _TCHAR* arg0, .../*, NULL*/) +intptr_t _tspawnlp(int mode, const _TCHAR* cmdname, const _TCHAR* arg0, .../*, NULL*/) { va_list argp; _TCHAR* args; @@ -461,7 +461,7 @@ /* * @implemented */ -int _tspawnlpe(int mode, const _TCHAR* cmdname, const _TCHAR* arg0, .../*, NULL, const char* const* envp*/) +intptr_t _tspawnlpe(int mode, const _TCHAR* cmdname, const _TCHAR* arg0, .../*, NULL, const char* const* envp*/) { va_list argp; _TCHAR* args; @@ -496,7 +496,7 @@ /* * @implemented */ -int _tspawnvpe(int mode, const _TCHAR* cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) +intptr_t _tspawnvpe(int mode, const _TCHAR* cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) { _TCHAR pathname[FILENAME_MAX]; @@ -508,7 +508,7 @@ /* * @implemented */ -int _texecl(const _TCHAR* cmdname, const _TCHAR* arg0, ...) +intptr_t _texecl(const _TCHAR* cmdname, const _TCHAR* arg0, ...) { _TCHAR* args; va_list argp; @@ -530,7 +530,7 @@ /* * @implemented */ -int _texecv(const _TCHAR* cmdname, const _TCHAR* const* argv) +intptr_t _texecv(const _TCHAR* cmdname, const _TCHAR* const* argv) { TRACE(MK_STR(_texecv)"('%"sT"')\n", cmdname); return _tspawnv(P_OVERLAY, cmdname, argv); @@ -539,7 +539,7 @@ /* * @implemented */ -int _texecle(const _TCHAR* cmdname, const _TCHAR* arg0, ... /*, NULL, char* const* envp */) +intptr_t _texecle(const _TCHAR* cmdname, const _TCHAR* arg0, ... /*, NULL, char* const* envp */) { va_list argp; _TCHAR* args; @@ -573,7 +573,7 @@ /* * @implemented */ -int _texecve(const _TCHAR* cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) +intptr_t _texecve(const _TCHAR* cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) { TRACE(MK_STR(_texecve)"('%"sT"')\n", cmdname); return _tspawnve(P_OVERLAY, cmdname, argv, envp); @@ -582,7 +582,7 @@ /* * @implemented */ -int _texeclp(const _TCHAR* cmdname, const _TCHAR* arg0, ...) +intptr_t _texeclp(const _TCHAR* cmdname, const _TCHAR* arg0, ...) { _TCHAR* args; va_list argp; @@ -605,7 +605,7 @@ /* * @implemented */ -int _texecvp(const _TCHAR* cmdname, const _TCHAR* const* argv) +intptr_t _texecvp(const _TCHAR* cmdname, const _TCHAR* const* argv) { TRACE(MK_STR(_texecvp)"('%"sT"')\n", cmdname); return _tspawnvp(P_OVERLAY, cmdname, argv); @@ -614,7 +614,7 @@ /* * @implemented */ -int _texeclpe(const _TCHAR* cmdname, const _TCHAR* arg0, ... /*, NULL, char* const* envp */) +intptr_t _texeclpe(const _TCHAR* cmdname, const _TCHAR* arg0, ... /*, NULL, char* const* envp */) { va_list argp; _TCHAR* args; @@ -649,7 +649,7 @@ /* * @implemented */ -int _texecvpe(const _TCHAR* cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) +intptr_t _texecvpe(const _TCHAR* cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) { TRACE(MK_STR(_texecvpe)"('%"sT"')\n", cmdname); return _tspawnvpe(P_OVERLAY, cmdname, argv, envp); Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -132,7 +132,8 @@ #define LOCK_FILES() do { EnterCriticalSection(&FILE_cs); } while (0) #define UNLOCK_FILES() do { LeaveCriticalSection(&FILE_cs); } while (0) -static void stat64_to_stat(const struct __stat64 *buf64, struct _stat *buf) +#ifndef _WIN64 +static void stat64_to_stati64(const struct __stat64 *buf64, struct _stati64 *buf) { buf->st_dev = buf64->st_dev; buf->st_ino = buf64->st_ino; @@ -146,21 +147,7 @@ buf->st_mtime = buf64->st_mtime; buf->st_ctime = buf64->st_ctime; } - -static void stat64_to_stati64(const struct __stat64 *buf64, struct _stati64 *buf) -{ - buf->st_dev = buf64->st_dev; - buf->st_ino = buf64->st_ino; - buf->st_mode = buf64->st_mode; - buf->st_nlink = buf64->st_nlink; - buf->st_uid = buf64->st_uid; - buf->st_gid = buf64->st_gid; - buf->st_rdev = buf64->st_rdev; - buf->st_size = buf64->st_size; - buf->st_atime = buf64->st_atime; - buf->st_mtime = buf64->st_mtime; - buf->st_ctime = buf64->st_ctime; -} +#endif static inline BOOL is_valid_fd(int fd) { @@ -494,7 +481,7 @@ */ FILE * CDECL __p__iob(void) { - return &_iob[0]; + return _iob; } /********************************************************************* @@ -1165,7 +1152,7 @@ /********************************************************************* * _fstat64 (MSVCRT.@) */ -int CDECL _fstat64(int fd, struct __stat64* buf) +int CDECL _fstat64(int fd, struct _stat64* buf) { DWORD dw; DWORD type; @@ -1238,14 +1225,60 @@ /********************************************************************* * _fstat (MSVCRT.@) */ -int CDECL _fstat(int fd, struct _stat* buf) -{ int ret; - struct __stat64 buf64; - - ret = _fstat64(fd, &buf64); - if (!ret) - stat64_to_stat(&buf64, buf); - return ret; +int CDECL _fstat(int fd, struct _stat32* buf) +{ + DWORD dw; + DWORD type; + BY_HANDLE_FILE_INFORMATION hfi; + HANDLE hand = fdtoh(fd); + + TRACE(":fd (%d) stat (%p)\n",fd,buf); + if (hand == INVALID_HANDLE_VALUE) + return -1; + + if (!buf) + { + WARN(":failed-NULL buf\n"); + __set_errno(ERROR_INVALID_PARAMETER); + return -1; + } + + memset(&hfi, 0, sizeof(hfi)); + memset(buf, 0, sizeof(struct _stat32)); + type = GetFileType(hand); + if (type == FILE_TYPE_PIPE) + { + buf->st_dev = buf->st_rdev = fd; + buf->st_mode = S_IFIFO; + buf->st_nlink = 1; + } + else if (type == FILE_TYPE_CHAR) + { + buf->st_dev = buf->st_rdev = fd; + buf->st_mode = S_IFCHR; + buf->st_nlink = 1; + } + else /* FILE_TYPE_DISK etc. */ + { + if (!GetFileInformationByHandle(hand, &hfi)) + { + WARN(":failed-last error (%d)\n",GetLastError()); + __set_errno(ERROR_INVALID_PARAMETER); + return -1; + } + buf->st_mode = S_IFREG | S_IREAD; + if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + buf->st_mode |= S_IWRITE; + buf->st_size = ((__int32)hfi.nFileSizeHigh << 16) + hfi.nFileSizeLow; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); + buf->st_atime = dw; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); + buf->st_mtime = buf->st_ctime = dw; + buf->st_nlink = hfi.nNumberOfLinks; + } + TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",hfi.dwFileAttributes, + buf->st_mode); + return 0; } /********************************************************************* @@ -1286,7 +1319,7 @@ /********************************************************************* * _get_osfhandle (MSVCRT.@) */ -long CDECL _get_osfhandle(int fd) +intptr_t CDECL _get_osfhandle(int fd) { HANDLE hand = fdtoh(fd); TRACE(":fd (%d) handle (%p)\n",fd,hand); @@ -1641,7 +1674,7 @@ /********************************************************************* * _open_osfhandle (MSVCRT.@) */ -int CDECL _open_osfhandle(long handle, int oflags) +int CDECL _open_osfhandle(intptr_t handle, int oflags) { int fd; @@ -1879,14 +1912,67 @@ /********************************************************************* * _stat (MSVCRT.@) */ -int CDECL _stat(const char* path, struct _stat * buf) -{ int ret; - struct __stat64 buf64; - - ret = _stat64( path, &buf64); - if (!ret) - stat64_to_stat(&buf64, buf); - return ret; +int CDECL _stat32(const char* path, struct _stat32 * buf) +{ + DWORD dw; + WIN32_FILE_ATTRIBUTE_DATA hfi; + unsigned short mode = ALL_S_IREAD; + int plen; + + TRACE(":file (%s) buf(%p)\n",path,buf); + + if (!GetFileAttributesExA(path, GetFileExInfoStandard, &hfi)) + { + TRACE("failed (%d)\n",GetLastError()); + __set_errno(ERROR_FILE_NOT_FOUND); + return -1; + } + + memset(buf,0,sizeof(struct _stat32)); + + /* FIXME: rdev isn't drive num, despite what the docs say-what is it? + Bon 011120: This FIXME seems incorrect + Also a letter as first char isn't enough to be classified + as a drive letter + */ + if (isalpha(*path)&& (*(path+1)==':')) + buf->st_dev = buf->st_rdev = toupper(*path) - 'A'; /* drive num */ + else + buf->st_dev = buf->st_rdev = _getdrive() - 1; + + plen = strlen(path); + + /* Dir, or regular file? */ + if ((hfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || + (path[plen-1] == '\\')) + mode |= (_S_IFDIR | ALL_S_IEXEC); + else + { + mode |= _S_IFREG; + /* executable? */ + if (plen > 6 && path[plen-4] == '.') /* shortest exe: "\x.exe" */ + { + unsigned int ext = tolower(path[plen-1]) | (tolower(path[plen-2]) << 8) | + (tolower(path[plen-3]) << 16); + if (ext == EXE || ext == BAT || ext == CMD || ext == COM) + mode |= ALL_S_IEXEC; + } + } + + if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + mode |= ALL_S_IWRITE; + + buf->st_mode = mode; + buf->st_nlink = 1; + buf->st_size = ((__int32)hfi.nFileSizeHigh << 16) + hfi.nFileSizeLow; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); + buf->st_atime = dw; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); + buf->st_mtime = buf->st_ctime = dw; + TRACE("%d %d 0x%08lx%08lx %ld %ld %ld\n", buf->st_mode,buf->st_nlink, + (long)(buf->st_size >> 16),(long)buf->st_size, + (long)buf->st_atime,(long)buf->st_mtime,(long)buf->st_ctime); + return 0; } /********************************************************************* @@ -1968,14 +2054,63 @@ /********************************************************************* * _wstat (MSVCRT.@) */ -int CDECL _wstat(const wchar_t* path, struct _stat * buf) -{ - int ret; - struct __stat64 buf64; - - ret = _wstat64( path, &buf64 ); - if (!ret) stat64_to_stat(&buf64, buf); - return ret; +int CDECL _wstat32(const wchar_t* path, struct _stat32 * buf) +{ + DWORD dw; + WIN32_FILE_ATTRIBUTE_DATA hfi; + unsigned short mode = ALL_S_IREAD; + int plen; + + TRACE(":file (%s) buf(%p)\n",debugstr_w(path),buf); + + if (!GetFileAttributesExW(path, GetFileExInfoStandard, &hfi)) + { + TRACE("failed (%d)\n",GetLastError()); + __set_errno(ERROR_FILE_NOT_FOUND); + return -1; + } + + memset(buf,0,sizeof(struct _stat32)); + + /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ + if (iswalpha(*path)) + buf->st_dev = buf->st_rdev = toupperW(*path - 'A'); /* drive num */ + else + buf->st_dev = buf->st_rdev = _getdrive() - 1; + + plen = strlenW(path); + + /* Dir, or regular file? */ + if ((hfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || + (path[plen-1] == '\\')) + mode |= (_S_IFDIR | ALL_S_IEXEC); + else + { + mode |= _S_IFREG; + /* executable? */ + if (plen > 6 && path[plen-4] == '.') /* shortest exe: "\x.exe" */ + { + ULONGLONG ext = tolowerW(path[plen-1]) | (tolowerW(path[plen-2]) << 16) | + ((ULONGLONG)tolowerW(path[plen-3]) << 32); + if (ext == WCEXE || ext == WCBAT || ext == WCCMD || ext == WCCOM) + mode |= ALL_S_IEXEC; + } + } + + if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + mode |= ALL_S_IWRITE; + + buf->st_mode = mode; + buf->st_nlink = 1; + buf->st_size = ((__int32)hfi.nFileSizeHigh << 16) + hfi.nFileSizeLow; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); + buf->st_atime = dw; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); + buf->st_mtime = buf->st_ctime = dw; + TRACE("%d %d 0x%08lx%08lx %ld %ld %ld\n", buf->st_mode,buf->st_nlink, + (long)(buf->st_size >> 16),(long)buf->st_size, + (long)buf->st_atime,(long)buf->st_mtime,(long)buf->st_ctime); + return 0; } /********************************************************************* Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/find.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/find.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/find.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -1,6 +1,6 @@ #include <precomp.h> #include <tchar.h> - +#include <io.h> /* * @implemented */ Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/errno.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/errno.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/errno.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -13,9 +13,9 @@ /* * @implemented */ -int* __doserrno(void) +unsigned long* __doserrno(void) { - return (int*)(&GetThreadData()->tdoserrno); + return (unsigned long*)(&GetThreadData()->tdoserrno); } /* Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/getenv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/getenv.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/getenv.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -9,7 +9,7 @@ */ #include <precomp.h> -#undef environ +//#undef environ /* * @implemented Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/rot.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/rot.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/rot.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -10,6 +10,7 @@ #include <stdlib.h> +unsigned int _rotr( unsigned int value, int shift ); /* * @implemented */ Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/swab.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/swab.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/swab.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -15,8 +15,7 @@ * * copy this swab from wine cvs 2006-05-24 */ -void _swab (const char * src, char * dst, size_t sizeToCopy - ) +void _swab (char * src, char * dst, int sizeToCopy) { if (sizeToCopy > 1) Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/atol.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/atol.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -11,9 +11,9 @@ return (long)_ttoi64(str); } -int _atoldbl(long double *value, const char *str) +int _atoldbl(_LDOUBLE *value, char *str) { /* FIXME needs error checking for huge/small values */ //*value = strtold(str,0); - return 0; + return -1; } Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -4,6 +4,7 @@ #include <ctype.h> #undef _pctype +#undef _pwctype /* MS's CRT header defines all that, and we actually implement that */ #undef iswalnum @@ -22,11 +23,13 @@ #undef iswspace #undef iswxdigit #undef __toascii +#undef _tolower +#undef _toupper #define upalpha ('A' - 'a') -unsigned short _ctype[] = { +const unsigned short _ctype[] = { 0, /* <EOF>, 0xFFFF */ _CONTROL, /* CTRL+@, 0x00 */ _CONTROL, /* CTRL+A, 0x01 */ @@ -545,7 +548,7 @@ */ int __toascii(int c) { - return((unsigned)(c) & 0x7f); + return((unsigned int)(c) & 0x7f); } /* Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/scanf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -24,8 +24,6 @@ */ #include <precomp.h> - -#include <wchar.h> #include <ctype.h> // HACK for LIBCNT @@ -183,7 +181,7 @@ /********************************************************************* * _cscanf (MSVCRT.@) */ -int _cscanf(/*const*/ char *format, ...) +int _cscanf(const char *format, ...) { va_list valist; int res; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -1450,12 +1450,12 @@ /********************************************************************* * _dstbias (MSVCRT.@) */ -int _dstbias = 0; +long _dstbias = 0; /********************************************************************* * __p_dstbias (MSVCRT.@) */ -int * __p__dstbias(void) +long * __p__dstbias(void) { return &_dstbias; } Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/difftime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/difftime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/difftime.c [iso-8859-1] Sat Aug 30 11:55:35 2008 @@ -5,7 +5,7 @@ * @implemented */ double -difftime(time_t time1, time_t time0) +difftime(time_t time1, time_t time2) { - return time1-time0; + return (double)(time1 - time2); }

1 0

[sserapion] 35809: Commit WIP. Part 2 of ?? Update mingw32 runtime to mingw-w64 trunk -Support for msvc 7.0 features -TLS support disabled because ros is not ready
by sserapion＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sserapion Date: Sat Aug 30 11:50:58 2008 New Revision: 35809 URL: http://svn.reactos.org/svn/reactos?rev=35809&view=rev Log: Commit WIP. Part 2 of ?? Update mingw32 runtime to mingw-w64 trunk -Support for msvc 7.0 features -TLS support disabled because ros is not ready Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_newmode.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/argv.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/charmax.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cinitexe.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/internal.h (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/merr.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_helpers.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/natstart.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/oscalls.h (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xncommod.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xthdloc.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xtxtmode.c (with props) Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRTfmode.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRTglob.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRTinit.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_wgetopt.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cpu_features.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cpu_features.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt1.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllcrt1.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/init.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/main.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tgetopt.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wbinmode.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcrt1.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/winit.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wmain.c Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/moldname-msvcrt.def [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRTfmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRTglob.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRTinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_newmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_wgetopt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/argv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/charmax.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cinitexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cpu_features.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cpu_features.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt1.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllcrt1.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/internal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/merr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_helpers.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/moldname-msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/natstart.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/oscalls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tgetopt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wbinmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcrt1.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/winit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xncommod.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xthdloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xtxtmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3…

1 0

[sginsberg] 35808: - [FORMATTING] Indentation and typo fixes
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 11:50:43 2008 New Revision: 35808 URL: http://svn.reactos.org/svn/reactos?rev=35808&view=rev Log: - [FORMATTING] Indentation and typo fixes Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Sat Aug 30 11:50:43 2008 @@ -95,7 +95,7 @@ } } - /* Add slashes were we previously had NULLs */ + /* Add slashes where we previously had NULLs */ CurrentDate[4] = CurrentDate[7] = '/'; /* Check which date is newer */ @@ -636,7 +636,7 @@ if (BiosHandle) { /* Get the BIOS Date Identifier */ - RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); + RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16 * PAGE_SIZE - 11), 8); Buffer[8] = ANSI_NULL; /* Convert it to unicode */ @@ -665,7 +665,7 @@ } /* Get the BIOS Version */ - if (CmpGetBiosVersion(BaseAddress, 16* PAGE_SIZE, Buffer)) + if (CmpGetBiosVersion(BaseAddress, 16 * PAGE_SIZE, Buffer)) { /* Start at the beginning of our buffer */ CurrentVersion = BiosVersion; @@ -764,7 +764,7 @@ } /* Get the Video BIOS Version */ - if (CmpGetBiosVersion(BaseAddress, 8* PAGE_SIZE, Buffer)) + if (CmpGetBiosVersion(BaseAddress, 8 * PAGE_SIZE, Buffer)) { /* Start at the beginning of our buffer */ CurrentVersion = BiosVersion;

1 0

[sserapion] 35807: Commit WIP. Part 1 of ?? Update mingw32 headers to mingw-w64 trunk -Too many changes to list -Important concepts: -- _INTEGRAL_MAX_BITS -- _USE_32BIT_TIME_T -- _USE_64BIT_TIME_T - adds crt secure API - Fixes so many types its not even funny.
by sserapion＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sserapion Date: Sat Aug 30 11:47:26 2008 New Revision: 35807 URL: http://svn.reactos.org/svn/reactos?rev=35807&view=rev Log: Commit WIP. Part 1 of ?? Update mingw32 headers to mingw-w64 trunk -Too many changes to list -Important concepts: -- _INTEGRAL_MAX_BITS -- _USE_32BIT_TIME_T -- _USE_64BIT_TIME_T - adds crt secure API - Fixes so many types its not even funny. Added: branches/ros-amd64-bringup/reactos/include/crt/mingw32/crtdbg.h (with props) branches/ros-amd64-bringup/reactos/include/crt/mingw32/vadefs.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/ branches/ros-amd64-bringup/reactos/include/crt/sec_api/conio_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/crtdbg_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/io_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/mbstring_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/search_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/stdio_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/stdlib_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/stralign_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/string_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/sys/ branches/ros-amd64-bringup/reactos/include/crt/sec_api/sys/timeb_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/tchar_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/time_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sec_api/wchar_s.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sys/cdefs.h (with props) branches/ros-amd64-bringup/reactos/include/crt/sys/ioctl.h (with props) Removed: branches/ros-amd64-bringup/reactos/include/crt/libgen.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/crt/assert.h branches/ros-amd64-bringup/reactos/include/crt/complex.h branches/ros-amd64-bringup/reactos/include/crt/conio.h branches/ros-amd64-bringup/reactos/include/crt/ctype.h branches/ros-amd64-bringup/reactos/include/crt/direct.h branches/ros-amd64-bringup/reactos/include/crt/dirent.h branches/ros-amd64-bringup/reactos/include/crt/dos.h branches/ros-amd64-bringup/reactos/include/crt/errno.h branches/ros-amd64-bringup/reactos/include/crt/excpt.h branches/ros-amd64-bringup/reactos/include/crt/fcntl.h branches/ros-amd64-bringup/reactos/include/crt/fenv.h branches/ros-amd64-bringup/reactos/include/crt/float.h branches/ros-amd64-bringup/reactos/include/crt/inttypes.h branches/ros-amd64-bringup/reactos/include/crt/io.h branches/ros-amd64-bringup/reactos/include/crt/limits.h branches/ros-amd64-bringup/reactos/include/crt/locale.h branches/ros-amd64-bringup/reactos/include/crt/malloc.h branches/ros-amd64-bringup/reactos/include/crt/math.h branches/ros-amd64-bringup/reactos/include/crt/mbctype.h branches/ros-amd64-bringup/reactos/include/crt/mbstring.h branches/ros-amd64-bringup/reactos/include/crt/mem.h branches/ros-amd64-bringup/reactos/include/crt/memory.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/stdarg.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h branches/ros-amd64-bringup/reactos/include/crt/process.h branches/ros-amd64-bringup/reactos/include/crt/search.h branches/ros-amd64-bringup/reactos/include/crt/setjmp.h branches/ros-amd64-bringup/reactos/include/crt/share.h branches/ros-amd64-bringup/reactos/include/crt/signal.h branches/ros-amd64-bringup/reactos/include/crt/stdint.h branches/ros-amd64-bringup/reactos/include/crt/stdio.h branches/ros-amd64-bringup/reactos/include/crt/stdlib.h branches/ros-amd64-bringup/reactos/include/crt/string.h branches/ros-amd64-bringup/reactos/include/crt/strings.h branches/ros-amd64-bringup/reactos/include/crt/sys/fcntl.h branches/ros-amd64-bringup/reactos/include/crt/sys/file.h branches/ros-amd64-bringup/reactos/include/crt/sys/locking.h branches/ros-amd64-bringup/reactos/include/crt/sys/param.h branches/ros-amd64-bringup/reactos/include/crt/sys/stat.h branches/ros-amd64-bringup/reactos/include/crt/sys/time.h branches/ros-amd64-bringup/reactos/include/crt/sys/timeb.h branches/ros-amd64-bringup/reactos/include/crt/sys/types.h branches/ros-amd64-bringup/reactos/include/crt/sys/unistd.h branches/ros-amd64-bringup/reactos/include/crt/sys/utime.h branches/ros-amd64-bringup/reactos/include/crt/time.h branches/ros-amd64-bringup/reactos/include/crt/unistd.h branches/ros-amd64-bringup/reactos/include/crt/utime.h branches/ros-amd64-bringup/reactos/include/crt/wchar.h branches/ros-amd64-bringup/reactos/include/crt/wctype.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/complex.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/direct.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/dirent.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/fenv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/inttypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/libgen.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/limits.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/locale.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/mem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/memory.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/mingw32/crtdbg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stdarg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/mingw32/vadefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/search.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/conio_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/crtdbg_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/io_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/mbstring_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/search_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/stdio_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/stdlib_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/stralign_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/string_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/sys/timeb_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/tchar_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/time_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sec_api/wchar_s.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/share.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/signal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/stdint.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/strings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sys/cdefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/fcntl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/file.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Added: branches/ros-amd64-bringup/reactos/include/crt/sys/ioctl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/locking.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/param.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/time.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/unistd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/unistd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/utime.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…

1 0

← Newer
1
2
3
4
5
6
7
...
86
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008