Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 22939: -don't use an entrypoint when entrypoint is set to "0"
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 23:13:39 2006 New Revision: 22939 URL: http://svn.reactos.org/svn/reactos?rev=22939&view=rev Log: -don't use an entrypoint when entrypoint is set to "0" Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Jul 8 23:13:39 2006 @@ -443,7 +443,10 @@ } else if ( dll ) { - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false) == "" ? "" : "_", module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ()); + if (module.GetEntryPoint(false) == "0") + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false) == "" ? "" : "_", module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );

1 0

[cwittich] 22938: -fixed some msvc /W4 warnings and errors
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 23:00:35 2006 New Revision: 22938 URL: http://svn.reactos.org/svn/reactos?rev=22938&view=rev Log: -fixed some msvc /W4 warnings and errors Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/settings.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/intl_new/En.rc trunk/reactos/dll/cpl/intl_new/extra.c trunk/reactos/dll/cpl/intl_new/intl.c trunk/reactos/dll/cpl/intl_new/locale.c trunk/reactos/dll/cpl/main/keyboard.c trunk/reactos/dll/cpl/main/main.c trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/powercfg/powershemes.c trunk/reactos/dll/cpl/sysdm/advanced.c trunk/reactos/dll/cpl/sysdm/computer.c trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/hardware.c trunk/reactos/dll/cpl/sysdm/sysdm.c trunk/reactos/dll/cpl/sysdm/userprofile.c trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Sat Jul 8 23:00:35 2006 @@ -52,7 +52,7 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -118,7 +118,7 @@ LPARAM lParam2) { int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl) + UNREFERENCED_PARAMETER(hwndCPl); switch(uMsg) { @@ -155,7 +155,7 @@ DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Sat Jul 8 23:00:35 2006 @@ -22,8 +22,8 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Sat Jul 8 23:00:35 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sat Jul 8 23:00:35 2006 @@ -22,8 +22,8 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Sat Jul 8 23:00:35 2006 @@ -22,8 +22,8 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Sat Jul 8 23:00:35 2006 @@ -22,8 +22,8 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Sat Jul 8 23:00:35 2006 @@ -64,7 +64,7 @@ TCHAR pszUninstallString[MAX_PATH]; DWORD dwSize; - nIndex = SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); + nIndex = (int) SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); if (nIndex == -1) { MessageBox(hwndDlg, @@ -173,12 +173,12 @@ { if ((!bIsUpdate) && (!bIsSystemComponent)) { - index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); } else if (bIsUpdate && bShowUpdates) { - index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); } } @@ -195,7 +195,7 @@ static INT_PTR CALLBACK InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(lParam); switch (uMsg) { case WM_INITDIALOG: @@ -235,9 +235,9 @@ static INT_PTR CALLBACK RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: @@ -297,7 +297,7 @@ CPLINFO *CPlInfo; DWORD i; - UNREFERENCED_PARAMETER(hwndCPl) + UNREFERENCED_PARAMETER(hwndCPl); i = (DWORD)lParam1; switch(uMsg) @@ -328,7 +328,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c (original) +++ trunk/reactos/dll/cpl/desk/appearance.c Sat Jul 8 23:00:35 2006 @@ -15,9 +15,9 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Sat Jul 8 23:00:35 2006 @@ -302,8 +302,8 @@ BOOL CheckListBoxFilename(HWND list, TCHAR *filename) { - UNREFERENCED_PARAMETER(filename) - UNREFERENCED_PARAMETER(list) + UNREFERENCED_PARAMETER(filename); + UNREFERENCED_PARAMETER(list); return FALSE; } Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Sat Jul 8 23:00:35 2006 @@ -49,10 +49,10 @@ PROPSHEETHEADER psh; TCHAR Caption[1024]; - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(uMsg) - UNREFERENCED_PARAMETER(hwnd) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -114,6 +114,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Sat Jul 8 23:00:35 2006 @@ -244,10 +244,10 @@ TCHAR Buffer[64]; if (LoadString(hApplet, (2900 + Current->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) { - index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); if (index == (DWORD)CB_ERR) { - index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_ADDSTRING, 0, (LPARAM)Buffer); + index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_ADDSTRING, 0, (LPARAM)Buffer); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SETITEMDATA, index, Current->dmBitsPerPel); } } @@ -322,8 +322,8 @@ TCHAR Buffer[64]; SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, WM_GETTEXT, (WPARAM)(sizeof(Buffer) / sizeof(TCHAR)), (LPARAM)Buffer); - index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); - dmNewBitsPerPel = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); + index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + dmNewBitsPerPel = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); /* find if new parameters are valid */ Current = CurrentDisplayDevice->CurrentSettings; @@ -518,7 +518,7 @@ case TB_BOTTOM: case TB_ENDTRACK: { - DWORD newPosition = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_GETPOS, 0, 0); + DWORD newPosition = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_GETPOS, 0, 0); OnResolutionChanged(hwndDlg, newPosition); } } Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Sat Jul 8 23:00:35 2006 @@ -53,9 +53,9 @@ BOOL ret; LONG rc; - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); hNewDev = LoadLibrary(_T("newdev.dll")); if (!hNewDev) @@ -140,7 +140,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/intl_new/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/En.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/En.rc (original) +++ trunk/reactos/dll/cpl/intl_new/En.rc Sat Jul 8 23:00:35 2006 @@ -6,24 +6,24 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Regional options and standards", IDC_GROUPBOX, 5, 3, 242, 165 - LTEXT "This option influences a way of display by some programs of numbers, sums of money, dates and time.", IDC_STATIC, 14, 15, 230, 16 - LTEXT "&Choose an element from the list or press the button ""Setup"" to set formats independently:", IDC_STATIC, 14, 36, 230, 16 + LTEXT "This option influences a way of display by some programs of numbers, sums of money, dates and time.", -1, 14, 15, 230, 16 + LTEXT "&Choose an element from the list or press the button ""Setup"" to set formats independently:", -1, 14, 36, 230, 16 COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT PUSHBUTTON "Se&tup...", IDC_SETUP_BUTTON, 187, 54, 52, 13 - LTEXT "Samples", IDC_STATIC, 14, 73, 70, 10 - LTEXT "Number:", IDC_STATIC, 16, 86, 48, 10 - LTEXT "Monetary:", IDC_STATIC, 16, 101, 48, 10 - LTEXT "Time:", IDC_STATIC, 16, 116, 48, 10 - LTEXT "Short date:", IDC_STATIC, 16, 131, 48, 10 - LTEXT "Long date:", IDC_STATIC, 16, 146, 48, 10 + LTEXT "Samples", -1, 14, 73, 70, 10 + LTEXT "Number:", -1, 16, 86, 48, 10 + LTEXT "Monetary:", -1, 16, 101, 48, 10 + LTEXT "Time:", -1, 16, 116, 48, 10 + LTEXT "Short date:", -1, 16, 131, 48, 10 + LTEXT "Long date:", -1, 16, 146, 48, 10 EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Geographic location", IDC_GROUPBOX, 5, 172, 242, 56 - LTEXT "Set up your location that services could supply you with the local information, for example, news and reports of weather", IDC_STATIC, 14, 184, 225, 24 + GROUPBOX "Geographic location", -1, 5, 172, 242, 56 + LTEXT "Set up your location that services could supply you with the local information, for example, news and reports of weather", -1, 14, 184, 225, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -36,9 +36,9 @@ GROUPBOX "Program language that not unicode supported", IDC_GROUPBOX, 5, 5, 242, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "This option...", IDC_STATIC, 14, 18, 223, 33 - LTEXT "Select language...", IDC_STATIC, 14, 55, 223, 18 - GROUPBOX "Transformation tables codepages", IDC_GROUPBOX, 5, 101, 242, 88 + LTEXT "This option...", -1, 14, 18, 223, 33 + LTEXT "Select language...", -1, 14, 55, 223, 18 + GROUPBOX "Transformation tables codepages", -1, 5, 101, 242, 88 END STRINGTABLE Modified: trunk/reactos/dll/cpl/intl_new/extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/extra.c?r… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/extra.c (original) +++ trunk/reactos/dll/cpl/intl_new/extra.c Sat Jul 8 23:00:35 2006 @@ -33,7 +33,7 @@ Lcid = wcstoul(lpLanguage, NULL, 16); GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); - Index = SendMessageW(hLanguageList, + Index = (int) SendMessageW(hLanguageList, CB_ADDSTRING, 0, (LPARAM)Lang); @@ -65,7 +65,7 @@ SendMessageW(hLanguageList, CB_SELECTSTRING, - -1, + (WPARAM) -1, (LPARAM)LangSel); } @@ -75,6 +75,7 @@ CALLBACK ExtraOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/intl_new/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.c (original) +++ trunk/reactos/dll/cpl/intl_new/intl.c Sat Jul 8 23:00:35 2006 @@ -53,6 +53,11 @@ PROPSHEETPAGE PsPage[NUM_SHEETS]; PROPSHEETHEADER psh; TCHAR Caption[MAX_STR_SIZE]; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -117,6 +122,7 @@ DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/intl_new/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/locale.c?… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/locale.c (original) +++ trunk/reactos/dll/cpl/intl_new/locale.c Sat Jul 8 23:00:35 2006 @@ -34,7 +34,7 @@ int index; GetGeoInfo(gId, GEO_FRIENDLYNAME, loc, MAX_FMT_SIZE, LANG_SYSTEM_DEFAULT); - index = SendMessageW(hGeoList, + index = (int) SendMessageW(hGeoList, CB_ADDSTRING, 0, (LPARAM)loc); @@ -69,7 +69,7 @@ SendMessageW(hGeoList, CB_SELECTSTRING, - -1, + (WPARAM) -1, (LPARAM)loc); } @@ -85,14 +85,14 @@ lcid = wcstoul(lpLocale, NULL, 16); GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); - index = SendMessageW(hLocaleList, + index = (int) SendMessageW(hLocaleList, CB_ADDSTRING, 0, (LPARAM)lang); SendMessageW(hLocaleList, CB_SETITEMDATA, - index, + (WPARAM) index, (LPARAM)lcid); return TRUE; @@ -117,7 +117,7 @@ SendMessageW(hLocaleList, CB_SELECTSTRING, - -1, + (WPARAM) -1, (LPARAM)langSel); } @@ -208,7 +208,7 @@ } wsprintf(Value, L"%04X", (DWORD)LcidLocale); - ValueSize = (wcslen(Value) + 1) * sizeof(WCHAR); + ValueSize = (DWORD) (wcslen(Value) + 1) * sizeof(WCHAR); RegSetValueExW(LocaleKey, L"Locale", 0, REG_SZ, (BYTE *)Value, ValueSize); RegCloseKey(LocaleKey); @@ -246,9 +246,9 @@ if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == CBN_EDITCHANGE) { - CurrSel = SendMessageW((HWND)lParam, CB_GETCURSEL, + CurrSel = (int) SendMessageW((HWND)lParam, CB_GETCURSEL, 0, 0); - NewLCID = SendMessageW((HWND)lParam, CB_GETITEMDATA, + NewLCID = (LCID) SendMessageW((HWND)lParam, CB_GETITEMDATA, CurrSel, 0); UpdateLocaleSample(hwndDlg, MAKELCID(NewLCID, SORT_DEFAULT)); @@ -273,20 +273,20 @@ if (lpnm->code == (UINT)PSN_APPLY) { /* Set locale */ - CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), + CurrSel = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), CB_GETCURSEL, 0, 0); - NewLCID = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), + NewLCID = (LCID) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), CB_GETITEMDATA, CurrSel, 0); if (NewLCID == (LCID)CB_ERR) break; SetNewLocale(MAKELCID(NewLCID, SORT_DEFAULT)); /* Set geo location */ - CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), + CurrSel = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), CB_GETCURSEL, 0, 0); - NewLocation = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), + NewLocation = (GEOID) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), CB_GETITEMDATA, CurrSel, 0); Modified: trunk/reactos/dll/cpl/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/keyboard.c?re… ============================================================================== --- trunk/reactos/dll/cpl/main/keyboard.c (original) +++ trunk/reactos/dll/cpl/main/keyboard.c Sat Jul 8 23:00:35 2006 @@ -41,6 +41,9 @@ IN WPARAM wParam, IN LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: @@ -60,6 +63,9 @@ { GUID Guids[1]; Guids[0] = GUID_DEVCLASS_KEYBOARD; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { @@ -87,6 +93,11 @@ PROPSHEETHEADER psh; TCHAR Caption[256]; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); + LoadString(hApplet, IDS_CPLNAME_2, Caption, sizeof(Caption) / sizeof(TCHAR)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); Modified: trunk/reactos/dll/cpl/main/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.c?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/main/main.c (original) +++ trunk/reactos/dll/cpl/main/main.c Sat Jul 8 23:00:35 2006 @@ -106,6 +106,8 @@ LPVOID lpReserved) { INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(lpReserved); + switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Sat Jul 8 23:00:35 2006 @@ -106,6 +106,9 @@ GUID Guids[1]; Guids[0] = GUID_DEVCLASS_MOUSE; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + switch(uMsg) { case WM_INITDIALOG: @@ -166,6 +169,8 @@ { HWND hDlgCtrl; int pos; + UNREFERENCED_PARAMETER(lParam); + switch(uMsg) { case WM_INITDIALOG: @@ -181,7 +186,7 @@ if (LOWORD(wParam) == IDOK) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_CLICK_LOCK); - g_ClickLockTime = (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200; + g_ClickLockTime = (DWORD) (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200; EndDialog(hwndDlg, TRUE); } else if (LOWORD(wParam) == IDCANCEL) @@ -610,6 +615,7 @@ IN LPARAM lParam) { HWND hDlgCtrl; + UNREFERENCED_PARAMETER(lParam); switch(uMsg) { @@ -975,7 +981,7 @@ { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); EnableWindow(hDlgCtrl, TRUE); - g_MouseTrails = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; + g_MouseTrails = (ULONG) SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; } break; } @@ -1028,7 +1034,7 @@ else lResult = 0; - SystemParametersInfo(SPI_SETMOUSETRAILS, lResult, 0, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE); //FIXME //pointer precision @@ -1167,6 +1173,11 @@ PROPSHEETPAGE psp[5]; PROPSHEETHEADER psh; TCHAR Caption[256]; + + UNREFERENCED_PARAMETER(lParam1); + UNREFERENCED_PARAMETER(lParam2); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Sat Jul 8 23:00:35 2006 @@ -169,6 +169,9 @@ TCHAR tpszNotifyObjectCLSID[MAX_PATH]; TCHAR *tpszSubKeyCopy; int nIndex; + + UNREFERENCED_PARAMETER(hBaseKey); + // CLSID CLSID_NotifObj; // IUnknown *pUnk = NULL; // INetCfgComponentControl *pNetCfg; @@ -224,7 +227,7 @@ } RegCloseKey(hKey); - nIndex = SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_ADDSTRING,0,(LPARAM)tpszDescription); + nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_ADDSTRING,0,(LPARAM)tpszDescription); tpszSubKeyCopy = _tcsdup(tpszSubKey); SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_SETITEMDATA,nIndex,(LPARAM)tpszSubKeyCopy); } @@ -309,7 +312,7 @@ HKEY hNDIKey; DWORD dwType,dwSize; HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST); - int iListBoxIndex = SendMessage(hListBox,LB_GETCURSEL,0,0); + int iListBoxIndex = (int) SendMessage(hListBox,LB_GETCURSEL,0,0); if(iListBoxIndex != LB_ERR) tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0); if(!tpszSubKey) @@ -572,7 +575,7 @@ // How is this done properly ? - nIndex = SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_ADDSTRING,0,(LPARAM)tpszDisplayName); + nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_ADDSTRING,0,(LPARAM)tpszDisplayName); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETITEMDATA,nIndex,(LPARAM)ptpszCfgInstanceID); RegCloseKey(hKey); } @@ -629,14 +632,14 @@ { case IDC_NETCARDLIST: if(HIWORD(wParam)==LBN_DBLCLK) { - nIndex = SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); + nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); if(nIndex!=-1) DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0)); } break; case IDC_PROPERTIES: - nIndex = SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); + nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); if(nIndex!=-1) DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0)); break; @@ -679,6 +682,7 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { + UNREFERENCED_PARAMETER(hwndCPl); switch (uMsg) { case CPL_INIT: @@ -714,6 +718,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved); + switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/powercfg/alarms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/alarms.c (original) +++ trunk/reactos/dll/cpl/powercfg/alarms.c Sat Jul 8 23:00:35 2006 @@ -31,8 +31,8 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Sat Jul 8 23:00:35 2006 @@ -55,7 +55,7 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -90,10 +90,10 @@ SYSTEM_POWER_CAPABILITIES spc; INT i=0; - UNREFERENCED_PARAMETER(hwnd) - UNREFERENCED_PARAMETER(uMsg) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwnd); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); memset(Caption, 0x0, sizeof(Caption)); LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -171,7 +171,7 @@ DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c Sat Jul 8 23:00:35 2006 @@ -225,10 +225,10 @@ { int index; - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(sDesc) - UNREFERENCED_PARAMETER(dwDesc) - UNREFERENCED_PARAMETER(dwName) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(sDesc); + UNREFERENCED_PARAMETER(dwDesc); + UNREFERENCED_PARAMETER(dwName); if (ValidatePowerPolicies(0,pp)) { Modified: trunk/reactos/dll/cpl/sysdm/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/advanced.c (original) +++ trunk/reactos/dll/cpl/sysdm/advanced.c Sat Jul 8 23:00:35 2006 @@ -40,7 +40,7 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(lParam); switch (uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/sysdm/computer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/computer.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/computer.c (original) +++ trunk/reactos/dll/cpl/sysdm/computer.c Sat Jul 8 23:00:35 2006 @@ -40,6 +40,11 @@ LPARAM lParam ) { + LPWKSTA_INFO_101 wki; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + switch(uMsg) { case WM_INITDIALOG: @@ -51,7 +56,6 @@ { SendDlgItemMessage(hwndDlg,IDC_COMPUTERNAME,WM_SETTEXT,0,(LPARAM)ComputerName); } - LPWKSTA_INFO_101 wki; if (NetWkstaGetInfo(NULL,101,(LPBYTE*)&wki) == NERR_Success) { SendDlgItemMessage(hwndDlg,IDC_WORKGROUPDOMAIN_NAME,WM_SETTEXT,0,(LPARAM)wki->wki101_langroup); Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Sat Jul 8 23:00:35 2006 @@ -98,8 +98,8 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { Modified: trunk/reactos/dll/cpl/sysdm/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardware.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardware.c (original) +++ trunk/reactos/dll/cpl/sysdm/hardware.c Sat Jul 8 23:00:35 2006 @@ -63,7 +63,7 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(lParam); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.c (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.c Sat Jul 8 23:00:35 2006 @@ -64,7 +64,7 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -130,7 +130,7 @@ LPARAM lParam2) { int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl) + UNREFERENCED_PARAMETER(hwndCPl); switch(uMsg) { @@ -167,7 +167,7 @@ DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c Sat Jul 8 23:00:35 2006 @@ -39,8 +39,9 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sat Jul 8 23:00:35 2006 @@ -14,7 +14,7 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(lParam); switch (uMsg) { case WM_INITDIALOG:

1 0

[ion] 22937: - Don't use FILE_ATTRIBUTE_NORMAL for mailslots/namedpipes.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 22:59:18 2006 New Revision: 22937 URL: http://svn.reactos.org/svn/reactos?rev=22937&view=rev Log: - Don't use FILE_ATTRIBUTE_NORMAL for mailslots/namedpipes. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:59:18 2006 @@ -1911,7 +1911,7 @@ PAGED_CODE(); /* Check for Timeout */ - if (DefaultTimeout) + if (TimeOut) { /* check if the call came from user mode */ if (KeGetPreviousMode() != KernelMode) @@ -1920,8 +1920,7 @@ _SEH_TRY { /* Probe the timeout */ - Buffer.DefaultTimeout = - ProbeForReadLargeInteger(DefaultTimeout); + Buffer.ReadTimeout = ProbeForReadLargeInteger(TimeOut); } _SEH_HANDLE { @@ -1936,7 +1935,7 @@ else { /* Otherwise, capture directly */ - Buffer.DefaultTimeout = *DefaultTimeout; + Buffer.ReadTimeout = *TimeOut; } /* Set the correct setting */

1 0

[ion] 22936: [FORMATTING] - STDCALL->NTAPI changes, tab->Spaces, name decoration, etc. - Add Eric's name since when I copied security.c into file.c, I forgot to add his name as well for that code.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 22:57:51 2006 New Revision: 22936 URL: http://svn.reactos.org/svn/reactos?rev=22936&view=rev Log: [FORMATTING] - STDCALL->NTAPI changes, tab->Spaces, name decoration, etc. - Add Eric's name since when I copied security.c into file.c, I forgot to add his name as well for that code. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:57:51 2006 @@ -5,6 +5,7 @@ * PURPOSE: Functions that deal with managing the FILE_OBJECT itself. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gunnar Dalsnes + * Eric Kohl * Filip Navara (navaraf(a)reactos.org) */ @@ -1197,7 +1198,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI IoCheckQuotaBufferValidity(IN PFILE_QUOTA_INFORMATION QuotaBuffer, IN ULONG QuotaLength, OUT PULONG ErrorOffset) @@ -1457,7 +1458,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI IoCreateFileSpecifyDeviceObjectHint(OUT PHANDLE FileHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, @@ -1534,7 +1535,7 @@ * @unimplemented */ PFILE_OBJECT -STDCALL +NTAPI IoCreateStreamFileObjectEx(IN PFILE_OBJECT FileObject OPTIONAL, IN PDEVICE_OBJECT DeviceObject OPTIONAL, OUT PHANDLE FileObjectHandle OPTIONAL) @@ -1547,7 +1548,7 @@ * @unimplemented */ PFILE_OBJECT -STDCALL +NTAPI IoCreateStreamFileObjectLite(IN PFILE_OBJECT FileObject OPTIONAL, IN PDEVICE_OBJECT DeviceObject OPTIONAL) { @@ -1559,9 +1560,10 @@ * @implemented */ PGENERIC_MAPPING -STDCALL +NTAPI IoGetFileObjectGenericMapping(VOID) { + /* Return the mapping */ return &IopFileMapping; } @@ -1574,6 +1576,264 @@ { /* Return the flag status */ return (FileObject->Flags & FO_REMOTE_ORIGIN); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK DesiredAccess, + IN ULONG OpenOptions, + OUT PIO_STATUS_BLOCK IoStatus, + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) +{ + NTSTATUS Status; + DUMMY_FILE_OBJECT DummyFileObject; + HANDLE Handle; + OPEN_PACKET OpenPacket; + PAGED_CODE(); + + /* Setup the Open Packet */ + OpenPacket.Type = IO_TYPE_OPEN_PACKET; + OpenPacket.Size = sizeof(OPEN_PACKET); + OpenPacket.FileObject = NULL; + OpenPacket.FinalStatus = STATUS_SUCCESS; + OpenPacket.Information = 0; + OpenPacket.ParseCheck = 0; + OpenPacket.RelatedFileObject = NULL; + OpenPacket.AllocationSize.QuadPart = 0; + OpenPacket.CreateOptions = OpenOptions | FILE_OPEN_REPARSE_POINT; + OpenPacket.FileAttributes = 0; + OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + OpenPacket.EaBuffer = NULL; + OpenPacket.EaLength = 0; + OpenPacket.Options = IO_FORCE_ACCESS_CHECK; + OpenPacket.Disposition = FILE_OPEN; + OpenPacket.BasicInformation = NULL; + OpenPacket.NetworkInformation = Buffer; + OpenPacket.CreateFileType = 0; + OpenPacket.MailslotOrPipeParameters = NULL; + OpenPacket.Override = FALSE; + OpenPacket.QueryOnly = TRUE; + OpenPacket.DeleteOnly = FALSE; + OpenPacket.FullAttributes = TRUE; + OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.InternalFlags = 0; + + /* + * Attempt opening the file. This will call the I/O Parse Routine for + * the File Object (IopParseDevice) which will use the dummy file obejct + * send the IRP to its device object. Note that we have two statuses + * to worry about: the Object Manager's status (in Status) and the I/O + * status, which is in the Open Packet's Final Status, and determined + * by the Parse Check member. + */ + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + KernelMode, + NULL, + DesiredAccess, + &OpenPacket, + &Handle); + if (OpenPacket.ParseCheck != TRUE) + { + /* Parse failed */ + IoStatus->Status = Status; + } + else + { + /* Use the Io status */ + IoStatus->Status = OpenPacket.FinalStatus; + IoStatus->Information = OpenPacket.Information; + } + + /* Return success */ + return TRUE; +} + +/* + * @implemented + */ +VOID +NTAPI +IoUpdateShareAccess(IN PFILE_OBJECT FileObject, + OUT PSHARE_ACCESS ShareAccess) +{ + PAGED_CODE(); + + if (FileObject->ReadAccess || + FileObject->WriteAccess || + FileObject->DeleteAccess) + { + ShareAccess->OpenCount++; + + ShareAccess->Readers += FileObject->ReadAccess; + ShareAccess->Writers += FileObject->WriteAccess; + ShareAccess->Deleters += FileObject->DeleteAccess; + ShareAccess->SharedRead += FileObject->SharedRead; + ShareAccess->SharedWrite += FileObject->SharedWrite; + ShareAccess->SharedDelete += FileObject->SharedDelete; + } +} + + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, + IN ULONG DesiredShareAccess, + IN PFILE_OBJECT FileObject, + IN PSHARE_ACCESS ShareAccess, + IN BOOLEAN Update) +{ + BOOLEAN ReadAccess; + BOOLEAN WriteAccess; + BOOLEAN DeleteAccess; + BOOLEAN SharedRead; + BOOLEAN SharedWrite; + BOOLEAN SharedDelete; + PAGED_CODE(); + + ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; + WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; + DeleteAccess = (DesiredAccess & DELETE) != 0; + + FileObject->ReadAccess = ReadAccess; + FileObject->WriteAccess = WriteAccess; + FileObject->DeleteAccess = DeleteAccess; + + if (ReadAccess || WriteAccess || DeleteAccess) + { + SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; + SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; + SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; + + FileObject->SharedRead = SharedRead; + FileObject->SharedWrite = SharedWrite; + FileObject->SharedDelete = SharedDelete; + + if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || + (WriteAccess && (ShareAccess->SharedWrite < ShareAccess->OpenCount)) || + (DeleteAccess && (ShareAccess->SharedDelete < ShareAccess->OpenCount)) || + ((ShareAccess->Readers != 0) && !SharedRead) || + ((ShareAccess->Writers != 0) && !SharedWrite) || + ((ShareAccess->Deleters != 0) && !SharedDelete)) + { + return(STATUS_SHARING_VIOLATION); + } + + if (Update) + { + ShareAccess->OpenCount++; + + ShareAccess->Readers += ReadAccess; + ShareAccess->Writers += WriteAccess; + ShareAccess->Deleters += DeleteAccess; + ShareAccess->SharedRead += SharedRead; + ShareAccess->SharedWrite += SharedWrite; + ShareAccess->SharedDelete += SharedDelete; + } + } + + return(STATUS_SUCCESS); +} + +/* + * @implemented + */ +VOID +NTAPI +IoRemoveShareAccess(IN PFILE_OBJECT FileObject, + IN PSHARE_ACCESS ShareAccess) +{ + PAGED_CODE(); + + if (FileObject->ReadAccess || + FileObject->WriteAccess || + FileObject->DeleteAccess) + { + ShareAccess->OpenCount--; + + ShareAccess->Readers -= FileObject->ReadAccess; + ShareAccess->Writers -= FileObject->WriteAccess; + ShareAccess->Deleters -= FileObject->DeleteAccess; + ShareAccess->SharedRead -= FileObject->SharedRead; + ShareAccess->SharedWrite -= FileObject->SharedWrite; + ShareAccess->SharedDelete -= FileObject->SharedDelete; + } +} + +/* + * @implemented + */ +VOID +NTAPI +IoSetShareAccess(IN ACCESS_MASK DesiredAccess, + IN ULONG DesiredShareAccess, + IN PFILE_OBJECT FileObject, + OUT PSHARE_ACCESS ShareAccess) +{ + BOOLEAN ReadAccess; + BOOLEAN WriteAccess; + BOOLEAN DeleteAccess; + BOOLEAN SharedRead; + BOOLEAN SharedWrite; + BOOLEAN SharedDelete; + PAGED_CODE(); + + ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; + WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; + DeleteAccess = (DesiredAccess & DELETE) != 0; + + FileObject->ReadAccess = ReadAccess; + FileObject->WriteAccess = WriteAccess; + FileObject->DeleteAccess = DeleteAccess; + + if (!ReadAccess && !WriteAccess && !DeleteAccess) + { + ShareAccess->OpenCount = 0; + ShareAccess->Readers = 0; + ShareAccess->Writers = 0; + ShareAccess->Deleters = 0; + + ShareAccess->SharedRead = 0; + ShareAccess->SharedWrite = 0; + ShareAccess->SharedDelete = 0; + } + else + { + SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; + SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; + SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; + + FileObject->SharedRead = SharedRead; + FileObject->SharedWrite = SharedWrite; + FileObject->SharedDelete = SharedDelete; + + ShareAccess->OpenCount = 1; + ShareAccess->Readers = ReadAccess; + ShareAccess->Writers = WriteAccess; + ShareAccess->Deleters = DeleteAccess; + + ShareAccess->SharedRead = SharedRead; + ShareAccess->SharedWrite = SharedWrite; + ShareAccess->SharedDelete = SharedDelete; + } +} + +/* + * @unimplemented + */ +VOID +STDCALL +IoCancelFileOpen(IN PDEVICE_OBJECT DeviceObject, + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; } /* @@ -1601,25 +1861,7 @@ } - /* - * NAME EXPORTED - * NtCreateFile@44 - * - * DESCRIPTION - * Entry point to call IoCreateFile with - * default parameters. - * - * ARGUMENTS - * See IoCreateFile. - * - * RETURN VALUE - * See IoCreateFile. - * - * REVISIONS - * 2000-03-25 (ea) - * Code originally in NtCreateFile moved in IoCreateFile. - * * @implemented */ NTSTATUS @@ -1665,41 +1907,44 @@ IN PLARGE_INTEGER TimeOut) { MAILSLOT_CREATE_PARAMETERS Buffer; - - DPRINT("NtCreateMailslotFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p)\n", - FileHandle,DesiredAccess,ObjectAttributes); - + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Check for Timeout */ - if (TimeOut != NULL) - { + if (DefaultTimeout) + { + /* check if the call came from user mode */ if (KeGetPreviousMode() != KernelMode) { - NTSTATUS Status = STATUS_SUCCESS; - + /* Enter SEH for Probe */ _SEH_TRY { - Buffer.ReadTimeout = ProbeForReadLargeInteger(TimeOut); + /* Probe the timeout */ + Buffer.DefaultTimeout = + ProbeForReadLargeInteger(DefaultTimeout); } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Return the exception */ if (!NT_SUCCESS(Status)) return Status; } else { - Buffer.ReadTimeout = *TimeOut; - } - + /* Otherwise, capture directly */ + Buffer.DefaultTimeout = *DefaultTimeout; + } + + /* Set the correct setting */ Buffer.TimeoutSpecified = TRUE; } else { + /* Tell the FSD we don't have a timeout */ Buffer.TimeoutSpecified = FALSE; } @@ -1713,7 +1958,7 @@ ObjectAttributes, IoStatusBlock, NULL, - FILE_ATTRIBUTE_NORMAL, + 0, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, CreateOptions, @@ -1725,58 +1970,63 @@ } NTSTATUS -STDCALL -NtCreateNamedPipeFile(PHANDLE FileHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, - ULONG ShareAccess, - ULONG CreateDisposition, - ULONG CreateOptions, - ULONG NamedPipeType, - ULONG ReadMode, - ULONG CompletionMode, - ULONG MaximumInstances, - ULONG InboundQuota, - ULONG OutboundQuota, - PLARGE_INTEGER DefaultTimeout) +NTAPI +NtCreateNamedPipeFile(OUT PHANDLE FileHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG ShareAccess, + IN ULONG CreateDisposition, + IN ULONG CreateOptions, + IN ULONG NamedPipeType, + IN ULONG ReadMode, + IN ULONG CompletionMode, + IN ULONG MaximumInstances, + IN ULONG InboundQuota, + IN ULONG OutboundQuota, + IN PLARGE_INTEGER DefaultTimeout) { NAMED_PIPE_CREATE_PARAMETERS Buffer; - - DPRINT("NtCreateNamedPipeFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p)\n", - FileHandle,DesiredAccess,ObjectAttributes); - + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Check for Timeout */ - if (DefaultTimeout != NULL) - { + if (DefaultTimeout) + { + /* check if the call came from user mode */ if (KeGetPreviousMode() != KernelMode) { - NTSTATUS Status = STATUS_SUCCESS; - + /* Enter SEH for Probe */ _SEH_TRY { - Buffer.DefaultTimeout = ProbeForReadLargeInteger(DefaultTimeout); + /* Probe the timeout */ + Buffer.DefaultTimeout = + ProbeForReadLargeInteger(DefaultTimeout); } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Return the exception */ if (!NT_SUCCESS(Status)) return Status; } else { + /* Otherwise, capture directly */ Buffer.DefaultTimeout = *DefaultTimeout; } + /* Set the correct setting */ Buffer.TimeoutSpecified = TRUE; } else + { + /* Tell the FSD we don't have a timeout */ Buffer.TimeoutSpecified = FALSE; + } /* Set Settings */ Buffer.NamedPipeType = NamedPipeType; @@ -1792,7 +2042,7 @@ ObjectAttributes, IoStatusBlock, NULL, - FILE_ATTRIBUTE_NORMAL, + 0, ShareAccess, CreateDisposition, CreateOptions, @@ -1804,58 +2054,27 @@ } NTSTATUS -STDCALL +NTAPI NtFlushWriteBuffer(VOID) { PAGED_CODE(); + /* Call the kernel */ KeFlushWriteBuffer(); return STATUS_SUCCESS; } /* - * NAME EXPORTED - * NtOpenFile@24 - * - * DESCRIPTION - * Opens an existing file (simpler than NtCreateFile). - * - * ARGUMENTS - * FileHandle (OUT) - * Variable that receives the file handle on return; - * - * DesiredAccess - * Access desired by the caller to the file; - * - * ObjectAttributes - * Structue describing the file to be opened; - * - * IoStatusBlock (OUT) - * Receives details about the result of the - * operation; - * - * ShareAccess - * Type of shared access the caller requires; - * - * OpenOptions - * Options for the file open. - * - * RETURN VALUE - * Status. - * - * NOTE - * Undocumented. - * * @implemented */ NTSTATUS -STDCALL -NtOpenFile(PHANDLE FileHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, - ULONG ShareAccess, - ULONG OpenOptions) +NTAPI +NtOpenFile(OUT PHANDLE FileHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG ShareAccess, + IN ULONG OpenOptions) { /* Call the I/O Function */ return IoCreateFile(FileHandle, @@ -1875,7 +2094,7 @@ } NTSTATUS -STDCALL +NTAPI NtQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_BASIC_INFORMATION FileInformation) { @@ -1887,7 +2106,7 @@ } NTSTATUS -STDCALL +NTAPI NtQueryFullAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation) { @@ -2089,263 +2308,4 @@ return OpenPacket.FinalStatus; } -/* - * @implemented - */ -BOOLEAN -NTAPI -IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ACCESS_MASK DesiredAccess, - IN ULONG OpenOptions, - OUT PIO_STATUS_BLOCK IoStatus, - OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) -{ - NTSTATUS Status; - DUMMY_FILE_OBJECT DummyFileObject; - HANDLE Handle; - OPEN_PACKET OpenPacket; - PAGED_CODE(); - - /* Setup the Open Packet */ - OpenPacket.Type = IO_TYPE_OPEN_PACKET; - OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.FileObject = NULL; - OpenPacket.FinalStatus = STATUS_SUCCESS; - OpenPacket.Information = 0; - OpenPacket.ParseCheck = 0; - OpenPacket.RelatedFileObject = NULL; - OpenPacket.AllocationSize.QuadPart = 0; - OpenPacket.CreateOptions = OpenOptions | FILE_OPEN_REPARSE_POINT; - OpenPacket.FileAttributes = 0; - OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - OpenPacket.EaBuffer = NULL; - OpenPacket.EaLength = 0; - OpenPacket.Options = IO_FORCE_ACCESS_CHECK; - OpenPacket.Disposition = FILE_OPEN; - OpenPacket.BasicInformation = NULL; - OpenPacket.NetworkInformation = Buffer; - OpenPacket.CreateFileType = 0; - OpenPacket.MailslotOrPipeParameters = NULL; - OpenPacket.Override = FALSE; - OpenPacket.QueryOnly = TRUE; - OpenPacket.DeleteOnly = FALSE; - OpenPacket.FullAttributes = TRUE; - OpenPacket.DummyFileObject = &DummyFileObject; - OpenPacket.InternalFlags = 0; - - /* - * Attempt opening the file. This will call the I/O Parse Routine for - * the File Object (IopParseDevice) which will use the dummy file obejct - * send the IRP to its device object. Note that we have two statuses - * to worry about: the Object Manager's status (in Status) and the I/O - * status, which is in the Open Packet's Final Status, and determined - * by the Parse Check member. - */ - Status = ObOpenObjectByName(ObjectAttributes, - NULL, - KernelMode, - NULL, - DesiredAccess, - &OpenPacket, - &Handle); - if (OpenPacket.ParseCheck != TRUE) - { - /* Parse failed */ - IoStatus->Status = Status; - } - else - { - /* Use the Io status */ - IoStatus->Status = OpenPacket.FinalStatus; - IoStatus->Information = OpenPacket.Information; - } - - /* Return success */ - return TRUE; -} - -/* - * @implemented - */ -VOID STDCALL -IoUpdateShareAccess(PFILE_OBJECT FileObject, - PSHARE_ACCESS ShareAccess) -{ - PAGED_CODE(); - - if (FileObject->ReadAccess || - FileObject->WriteAccess || - FileObject->DeleteAccess) - { - ShareAccess->OpenCount++; - - ShareAccess->Readers += FileObject->ReadAccess; - ShareAccess->Writers += FileObject->WriteAccess; - ShareAccess->Deleters += FileObject->DeleteAccess; - ShareAccess->SharedRead += FileObject->SharedRead; - ShareAccess->SharedWrite += FileObject->SharedWrite; - ShareAccess->SharedDelete += FileObject->SharedDelete; - } -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, - IN PFILE_OBJECT FileObject, - IN PSHARE_ACCESS ShareAccess, - IN BOOLEAN Update) -{ - BOOLEAN ReadAccess; - BOOLEAN WriteAccess; - BOOLEAN DeleteAccess; - BOOLEAN SharedRead; - BOOLEAN SharedWrite; - BOOLEAN SharedDelete; - - PAGED_CODE(); - - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; - DeleteAccess = (DesiredAccess & DELETE) != 0; - - FileObject->ReadAccess = ReadAccess; - FileObject->WriteAccess = WriteAccess; - FileObject->DeleteAccess = DeleteAccess; - - if (ReadAccess || WriteAccess || DeleteAccess) - { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - - if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || - (WriteAccess && (ShareAccess->SharedWrite < ShareAccess->OpenCount)) || - (DeleteAccess && (ShareAccess->SharedDelete < ShareAccess->OpenCount)) || - ((ShareAccess->Readers != 0) && !SharedRead) || - ((ShareAccess->Writers != 0) && !SharedWrite) || - ((ShareAccess->Deleters != 0) && !SharedDelete)) - { - return(STATUS_SHARING_VIOLATION); - } - - if (Update) - { - ShareAccess->OpenCount++; - - ShareAccess->Readers += ReadAccess; - ShareAccess->Writers += WriteAccess; - ShareAccess->Deleters += DeleteAccess; - ShareAccess->SharedRead += SharedRead; - ShareAccess->SharedWrite += SharedWrite; - ShareAccess->SharedDelete += SharedDelete; - } - } - - return(STATUS_SUCCESS); -} - - -/* - * @implemented - */ -VOID STDCALL -IoRemoveShareAccess(IN PFILE_OBJECT FileObject, - IN PSHARE_ACCESS ShareAccess) -{ - PAGED_CODE(); - - if (FileObject->ReadAccess || - FileObject->WriteAccess || - FileObject->DeleteAccess) - { - ShareAccess->OpenCount--; - - ShareAccess->Readers -= FileObject->ReadAccess; - ShareAccess->Writers -= FileObject->WriteAccess; - ShareAccess->Deleters -= FileObject->DeleteAccess; - ShareAccess->SharedRead -= FileObject->SharedRead; - ShareAccess->SharedWrite -= FileObject->SharedWrite; - ShareAccess->SharedDelete -= FileObject->SharedDelete; - } -} - - -/* - * @implemented - */ -VOID STDCALL -IoSetShareAccess(IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, - IN PFILE_OBJECT FileObject, - OUT PSHARE_ACCESS ShareAccess) -{ - BOOLEAN ReadAccess; - BOOLEAN WriteAccess; - BOOLEAN DeleteAccess; - BOOLEAN SharedRead; - BOOLEAN SharedWrite; - BOOLEAN SharedDelete; - - PAGED_CODE(); - - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; - DeleteAccess = (DesiredAccess & DELETE) != 0; - - FileObject->ReadAccess = ReadAccess; - FileObject->WriteAccess = WriteAccess; - FileObject->DeleteAccess = DeleteAccess; - - if (!ReadAccess && !WriteAccess && !DeleteAccess) - { - ShareAccess->OpenCount = 0; - ShareAccess->Readers = 0; - ShareAccess->Writers = 0; - ShareAccess->Deleters = 0; - - ShareAccess->SharedRead = 0; - ShareAccess->SharedWrite = 0; - ShareAccess->SharedDelete = 0; - } - else - { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - - ShareAccess->OpenCount = 1; - ShareAccess->Readers = ReadAccess; - ShareAccess->Writers = WriteAccess; - ShareAccess->Deleters = DeleteAccess; - - ShareAccess->SharedRead = SharedRead; - ShareAccess->SharedWrite = SharedWrite; - ShareAccess->SharedDelete = SharedDelete; - } -} - -/* - * @unimplemented - */ -VOID -STDCALL -IoCancelFileOpen( - IN PDEVICE_OBJECT DeviceObject, - IN PFILE_OBJECT FileObject - ) -{ - UNIMPLEMENTED; -} /* EOF */

1 0

[ion] 22935: - Implemented NtDeleteFile, also a piece of cake now that we have IopParseDevice done.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 22:47:26 2006 New Revision: 22935 URL: http://svn.reactos.org/svn/reactos?rev=22935&view=rev Log: - Implemented NtDeleteFile, also a piece of cake now that we have IopParseDevice done. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:47:26 2006 @@ -2023,14 +2023,70 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes) { - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + NTSTATUS Status; + DUMMY_FILE_OBJECT DummyFileObject; + HANDLE Handle; + KPROCESSOR_MODE AccessMode = KeGetPreviousMode(); + OPEN_PACKET OpenPacket; + PAGED_CODE(); + + /* Setup the Open Packet */ + OpenPacket.Type = IO_TYPE_OPEN_PACKET; + OpenPacket.Size = sizeof(OPEN_PACKET); + OpenPacket.FileObject = NULL; + OpenPacket.FinalStatus = STATUS_SUCCESS; + OpenPacket.Information = 0; + OpenPacket.ParseCheck = 0; + OpenPacket.RelatedFileObject = NULL; + OpenPacket.AllocationSize.QuadPart = 0; + OpenPacket.CreateOptions = FILE_DELETE_ON_CLOSE; + OpenPacket.FileAttributes = 0; + OpenPacket.ShareAccess = FILE_SHARE_READ | + FILE_SHARE_WRITE | + FILE_SHARE_DELETE; + OpenPacket.EaBuffer = NULL; + OpenPacket.EaLength = 0; + OpenPacket.Options = 0; + OpenPacket.Disposition = FILE_OPEN; + OpenPacket.BasicInformation = NULL; + OpenPacket.NetworkInformation = NULL; + OpenPacket.CreateFileType = 0; + OpenPacket.MailslotOrPipeParameters = NULL; + OpenPacket.Override = FALSE; + OpenPacket.QueryOnly = FALSE; + OpenPacket.DeleteOnly = TRUE; + OpenPacket.FullAttributes = FALSE; + OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.InternalFlags = 0; + + /* Update the operation counts */ + IopUpdateOperationCount(IopOtherTransfer); + + /* + * Attempt opening the file. This will call the I/O Parse Routine for + * the File Object (IopParseDevice) which will use the dummy file obejct + * send the IRP to its device object. Note that we have two statuses + * to worry about: the Object Manager's status (in Status) and the I/O + * status, which is in the Open Packet's Final Status, and determined + * by the Parse Check member. + */ + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + AccessMode, + NULL, + DELETE, + &OpenPacket, + &Handle); + if (OpenPacket.ParseCheck != TRUE) return Status; + + /* Retrn the Io status */ + return OpenPacket.FinalStatus; } /* @@ -2044,7 +2100,7 @@ OUT PIO_STATUS_BLOCK IoStatus, OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; DUMMY_FILE_OBJECT DummyFileObject; HANDLE Handle; OPEN_PACKET OpenPacket;

1 0

[ion] 22934: - Implement IoFastQueryNetworkAttributes which is now a piece of cake thanks to a properly implemented IopParseDevice.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 22:35:17 2006 New Revision: 22934 URL: http://svn.reactos.org/svn/reactos?rev=22934&view=rev Log: - Implement IoFastQueryNetworkAttributes which is now a piece of cake thanks to a properly implemented IopParseDevice. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:35:17 2006 @@ -2034,17 +2034,78 @@ } /* - * @unimplemented + * @implemented */ -BOOLEAN STDCALL +BOOLEAN +NTAPI IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ACCESS_MASK DesiredAccess, - IN ULONG OpenOptions, - OUT PIO_STATUS_BLOCK IoStatus, - OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) -{ - UNIMPLEMENTED; - return(FALSE); + IN ACCESS_MASK DesiredAccess, + IN ULONG OpenOptions, + OUT PIO_STATUS_BLOCK IoStatus, + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) +{ + NTSTATUS Status = STATUS_SUCCESS; + DUMMY_FILE_OBJECT DummyFileObject; + HANDLE Handle; + OPEN_PACKET OpenPacket; + PAGED_CODE(); + + /* Setup the Open Packet */ + OpenPacket.Type = IO_TYPE_OPEN_PACKET; + OpenPacket.Size = sizeof(OPEN_PACKET); + OpenPacket.FileObject = NULL; + OpenPacket.FinalStatus = STATUS_SUCCESS; + OpenPacket.Information = 0; + OpenPacket.ParseCheck = 0; + OpenPacket.RelatedFileObject = NULL; + OpenPacket.AllocationSize.QuadPart = 0; + OpenPacket.CreateOptions = OpenOptions | FILE_OPEN_REPARSE_POINT; + OpenPacket.FileAttributes = 0; + OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + OpenPacket.EaBuffer = NULL; + OpenPacket.EaLength = 0; + OpenPacket.Options = IO_FORCE_ACCESS_CHECK; + OpenPacket.Disposition = FILE_OPEN; + OpenPacket.BasicInformation = NULL; + OpenPacket.NetworkInformation = Buffer; + OpenPacket.CreateFileType = 0; + OpenPacket.MailslotOrPipeParameters = NULL; + OpenPacket.Override = FALSE; + OpenPacket.QueryOnly = TRUE; + OpenPacket.DeleteOnly = FALSE; + OpenPacket.FullAttributes = TRUE; + OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.InternalFlags = 0; + + /* + * Attempt opening the file. This will call the I/O Parse Routine for + * the File Object (IopParseDevice) which will use the dummy file obejct + * send the IRP to its device object. Note that we have two statuses + * to worry about: the Object Manager's status (in Status) and the I/O + * status, which is in the Open Packet's Final Status, and determined + * by the Parse Check member. + */ + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + KernelMode, + NULL, + DesiredAccess, + &OpenPacket, + &Handle); + if (OpenPacket.ParseCheck != TRUE) + { + /* Parse failed */ + IoStatus->Status = Status; + } + else + { + /* Use the Io status */ + IoStatus->Status = OpenPacket.FinalStatus; + IoStatus->Information = OpenPacket.Information; + } + + /* Return success */ + return TRUE; } /*

1 0

[ion] 22933: - Add support for cases when the FSD that actually did the FO create wasn't the one to whom we went the IRP. - Also add support for detecting volume opens and setting the FO_VOLUME_OPEN flag.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 22:30:59 2006 New Revision: 22933 URL: http://svn.reactos.org/svn/reactos?rev=22933&view=rev Log: - Add support for cases when the FSD that actually did the FO create wasn't the one to whom we went the IRP. - Also add support for detecting volume opens and setting the FO_VOLUME_OPEN flag. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:30:59 2006 @@ -30,7 +30,8 @@ OUT PVOID *Object) { POPEN_PACKET OpenPacket = (POPEN_PACKET)Context; - PDEVICE_OBJECT OriginalDeviceObject = (PDEVICE_OBJECT)ParseObject, DeviceObject; + PDEVICE_OBJECT OriginalDeviceObject = (PDEVICE_OBJECT)ParseObject; + PDEVICE_OBJECT DeviceObject, OwnerDevice; NTSTATUS Status; PFILE_OBJECT FileObject; PVPB Vpb = NULL; @@ -431,9 +432,43 @@ KEBUGCHECK(0); } + /* Get the owner of the File Object */ + OwnerDevice = IoGetRelatedDeviceObject(FileObject); + + /* + * It's possible that the device to whom we sent the IRP to + * isn't actually the device that ended opening the file object + * internally. + */ + if (OwnerDevice != DeviceObject) + { + /* We have to de-reference the VPB we had associated */ + if (Vpb) IopDereferenceVpb(Vpb); + + /* And re-associate with the actual one */ + Vpb = FileObject->Vpb; + if (Vpb) InterlockedIncrement(&Vpb->ReferenceCount); + } + /* Make sure we are not using a dummy */ if (!UseDummyFile) { + /* Check if this was a volume open */ + if ((!(FileObject->RelatedFileObject) || + (FileObject->RelatedFileObject->Flags & FO_VOLUME_OPEN)) && + !(FileObject->FileName.Length)) + { + /* All signs point to it, but make sure it was actually an FSD */ + if ((OwnerDevice->DeviceType == FILE_DEVICE_DISK_FILE_SYSTEM) || + (OwnerDevice->DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) || + (OwnerDevice->DeviceType == FILE_DEVICE_TAPE_FILE_SYSTEM) || + (OwnerDevice->DeviceType == FILE_DEVICE_FILE_SYSTEM)) + { + /* The owner device is an FSD, so this is a volume open for real */ + FileObject->Flags |= FO_VOLUME_OPEN; + } + } + /* Reference the object and set the parse check */ ObReferenceObject(FileObject); *Object = FileObject;

1 0

[cwittich] 22932: -fixed msvc /W4 warnings and errors
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 22:30:34 2006 New Revision: 22932 URL: http://svn.reactos.org/svn/reactos?rev=22932&view=rev Log: -fixed msvc /W4 warnings and errors Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c Sat Jul 8 22:30:34 2006 @@ -67,14 +67,15 @@ WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: { - GUID Guids[] = { - GUID_DEVCLASS_CDROM, - GUID_DEVCLASS_MEDIA, - }; + GUID Guids[2]; + Guids[0] = GUID_DEVCLASS_CDROM; + Guids[1] = GUID_DEVCLASS_MEDIA; /* create the hardware page */ DeviceCreateHardwarePageEx(hwndDlg, @@ -97,6 +98,11 @@ PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh = {0}; TCHAR Caption[256]; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); LoadString(hApplet, IDS_CPLNAME, @@ -182,6 +188,7 @@ DWORD dwReason, LPVOID lpReserved) { + UNREFERENCED_PARAMETER(lpReserved); switch(dwReason) { case DLL_PROCESS_ATTACH:

1 0

[cwittich] 22931: -use msvc compatible def files
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 22:25:19 2006 New Revision: 22931 URL: http://svn.reactos.org/svn/reactos?rev=22931&view=rev Log: -use msvc compatible def files Modified: trunk/reactos/dll/cpl/access/access.def trunk/reactos/dll/cpl/appwiz/appwiz.def trunk/reactos/dll/cpl/cplsample/cplsample.def trunk/reactos/dll/cpl/desk/desk.def trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def trunk/reactos/dll/cpl/intl/intl.def trunk/reactos/dll/cpl/intl_new/intl.def trunk/reactos/dll/cpl/liccpa/liccpa.def trunk/reactos/dll/cpl/main/main.def trunk/reactos/dll/cpl/mmsys/mmsys.def trunk/reactos/dll/cpl/ncpa/ncpa.def trunk/reactos/dll/cpl/powercfg/powercfg.def trunk/reactos/dll/cpl/sysdm/sysdm.def trunk/reactos/dll/cpl/timedate/timedate.def trunk/reactos/dll/keyboard/kbdbe/kbdbe.def trunk/reactos/dll/keyboard/kbdda/kbdda.def trunk/reactos/dll/keyboard/kbddv/kbddv.def trunk/reactos/dll/keyboard/kbdes/kbdes.def trunk/reactos/dll/keyboard/kbdfr/kbdfr.def trunk/reactos/dll/keyboard/kbdgr/kbdgr.def trunk/reactos/dll/keyboard/kbdhe/kbdhe.def trunk/reactos/dll/keyboard/kbdheb/kbdheb.def trunk/reactos/dll/keyboard/kbdhu/kbdhu.def trunk/reactos/dll/keyboard/kbdpo/kbdpo.def trunk/reactos/dll/keyboard/kbdru/kbdru.def trunk/reactos/dll/keyboard/kbdse/kbdse.def trunk/reactos/dll/keyboard/kbdsg/kbdsg.def trunk/reactos/dll/keyboard/kbdsk/kbdsk.def trunk/reactos/dll/keyboard/kbduk/kbduk.def trunk/reactos/dll/keyboard/kbdur/kbdur.def trunk/reactos/dll/keyboard/kbdus/kbdus.def Modified: trunk/reactos/dll/cpl/access/access.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.def?… ============================================================================== --- trunk/reactos/dll/cpl/access/access.def (original) +++ trunk/reactos/dll/cpl/access/access.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.def (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY appwiz.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/cplsample/cplsample.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cplsample/cplsampl… ============================================================================== --- trunk/reactos/dll/cpl/cplsample/cplsample.def (original) +++ trunk/reactos/dll/cpl/cplsample/cplsample.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/desk/desk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.def (original) +++ trunk/reactos/dll/cpl/desk/desk.def Sat Jul 8 22:25:19 2006 @@ -1,7 +1,7 @@ LIBRARY desk.cpl EXPORTS -CPlApplet@16 -DisplayClassInstaller@12 +CPlApplet +DisplayClassInstaller ; EOF Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY hdwwiz.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/intl/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.def (original) +++ trunk/reactos/dll/cpl/intl/intl.def Sat Jul 8 22:25:19 2006 @@ -1,7 +1,7 @@ LIBRARY intl.cpl EXPORTS -CPlApplet@16 -LocalePageProc@16 +CPlApplet +LocalePageProc ; EOF Modified: trunk/reactos/dll/cpl/intl_new/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.def?… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.def (original) +++ trunk/reactos/dll/cpl/intl_new/intl.def Sat Jul 8 22:25:19 2006 @@ -1,8 +1,8 @@ LIBRARY intl.cpl EXPORTS -CPlApplet@16 -RegOptsProc@16 -ExtraOptsProc@16 +CPlApplet +RegOptsProc +ExtraOptsProc ; EOF Modified: trunk/reactos/dll/cpl/liccpa/liccpa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.def?… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.def (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY liccpa.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/main/main.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/main/main.def (original) +++ trunk/reactos/dll/cpl/main/main.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY main.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY mmsys.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/ncpa/ncpa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.def (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY ncpa.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/powercfg/powercfg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.def (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY powercfg.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/sysdm/sysdm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.def?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.def (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/timedate/timedate.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.def (original) +++ trunk/reactos/dll/cpl/timedate/timedate.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY timedate.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/kbdbe.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbe/kbdbe.def (original) +++ trunk/reactos/dll/keyboard/kbdbe/kbdbe.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdbe.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.def (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.def Sat Jul 8 22:25:19 2006 @@ -1,3 +1,3 @@ LIBRARY kbdda.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/kbddv.def (original) +++ trunk/reactos/dll/keyboard/kbddv/kbddv.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbddvorak.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.def (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.def Sat Jul 8 22:25:19 2006 @@ -1,3 +1,6 @@ LIBRARY kbdda.dll -EXPORTS -KbdLayerDescriptor@0 + + +EXPORTS + +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.def (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdfr.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/kbdgr.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgr/kbdgr.def (original) +++ trunk/reactos/dll/keyboard/kbdgr/kbdgr.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdgr.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.def (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhe.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.def (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdheb.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.def (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhu.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/kbdpo.def (original) +++ trunk/reactos/dll/keyboard/kbdpo/kbdpo.def Sat Jul 8 22:25:19 2006 @@ -1,3 +1,3 @@ LIBRARY kbdpo.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/kbdru.def (original) +++ trunk/reactos/dll/keyboard/kbdru/kbdru.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdru.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdse/kbdse.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdse/kbdse.def (original) +++ trunk/reactos/dll/keyboard/kbdse/kbdse.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdse.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdsg/kbdsg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsg/kbdsg.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsg/kbdsg.def (original) +++ trunk/reactos/dll/keyboard/kbdsg/kbdsg.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsg.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.def (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsk.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.def (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbduk.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/kbdur.def (original) +++ trunk/reactos/dll/keyboard/kbdur/kbdur.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdur.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.def (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdus.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF

1 0

[cwittich] 22930: -fix msvc dll entrypoint -fix PROJECT_LFLAGS -added --enable-stdcall-fixup to PROJECT_LFLAGS
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 22:24:11 2006 New Revision: 22930 URL: http://svn.reactos.org/svn/reactos?rev=22930&view=rev Log: -fix msvc dll entrypoint -fix PROJECT_LFLAGS -added --enable-stdcall-fixup to PROJECT_LFLAGS Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Jul 8 22:24:11 2006 @@ -420,8 +420,8 @@ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" ); - fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", - GenerateProjectLFLAGS ().c_str () ); + fprintf ( fMakefile, "PROJECT_LFLAGS := %s %s\n", + GenerateProjectLFLAGS ().c_str (), "-Wl,--enable-stdcall-fixup" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); fprintf ( fMakefile, "\n" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Jul 8 22:24:11 2006 @@ -1564,15 +1564,15 @@ killAt.c_str () ); fprintf ( fMakefile, - "\t%s %s %s %s -o %s %s %s %s\n", + "\t%s %s %s %s %s -o %s %s %s\n", linker.c_str (), + GetLinkerMacro ().c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), temp_exp.c_str (), target.c_str (), objectsMacro.c_str (), - libsMacro.c_str (), - GetLinkerMacro ().c_str () ); + libsMacro.c_str () ); fprintf ( fMakefile, "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", @@ -2263,7 +2263,7 @@ fprintf ( fMakefile, "\t%s %s -o $@ %s %s\n\n", linker.c_str (), - GetLinkerMacro ().c_str (), + GetLinkerMacro().c_str (), objectsMacro.c_str (), libsMacro.c_str () ); } Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Jul 8 22:24:11 2006 @@ -443,7 +443,7 @@ } else if ( dll ) { - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false) == "" ? "DllMain" : module.GetEntryPoint(false).c_str ()); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false) == "" ? "" : "_", module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Sat Jul 8 22:24:11 2006 @@ -835,7 +835,7 @@ case NativeCUI: return "NtProcessStartup@4"; case Win32DLL: - return "DllMain@12"; + return "DllMainCRTStartup@12"; case Win32CUI: case Test: if ( isUnicode )

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs