Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[mbosma] 22977: Add comments from cc-branch headers to trunk to make the header patch smaller.
by mbosma＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: mbosma Date: Sun Jul 9 23:37:39 2006 New Revision: 22977 URL: http://svn.reactos.org/svn/reactos?rev=22977&view=rev Log: Add comments from cc-branch headers to trunk to make the header patch smaller. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Sun Jul 9 23:37:39 2006 @@ -165,12 +165,12 @@ typedef struct _MM_SECTION_SEGMENT { - LONGLONG FileOffset; - ULONG_PTR VirtualAddress; - ULONG RawLength; - ULONG Length; + LONGLONG FileOffset; /* start offset into the file for image sections */ + ULONG_PTR VirtualAddress; /* dtart offset into the address range for image sections */ + ULONG RawLength; /* length of the segment which is part of the mapped file */ + ULONG Length; /* absolute length of the segment */ ULONG Protection; - FAST_MUTEX Lock; + FAST_MUTEX Lock; /* lock which protects the page directory */ ULONG ReferenceCount; SECTION_PAGE_DIRECTORY PageDirectory; ULONG Flags;

1 0

[ion] 22976: - Massive re-write of some parts of Ps, based on a patch I wrote almost a year ago and peer-reviewed with Thomas and Filip. Causes some shutdown regressions and process leaks (will fix). Needs more work. Changelog: - Architectural changes to match information in Windows Internals 4 and other documented sources of information (Windows Internals II by Probert). Code should match Win2003 layout. - Handle almost any possible process/thread sub structure and add its cleanup code stubs, s
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 22:54:13 2006 New Revision: 22976 URL: http://svn.reactos.org/svn/reactos?rev=22976&view=rev Log: - Massive re-write of some parts of Ps, based on a patch I wrote almost a year ago and peer-reviewed with Thomas and Filip. Causes some shutdown regressions and process leaks (will fix). Needs more work. Changelog: - Architectural changes to match information in Windows Internals 4 and other documented sources of information (Windows Internals II by Probert). Code should match Win2003 layout. - Handle almost any possible process/thread sub structure and add its cleanup code stubs, so that when we actually implement them, we won't forget to clean them up in the process code. - Add interlocked usage of process and thread flags in order to make everything more thread-safe. - Better handle cases where threads die instantly, race conditions, and other weird issues. - Better handle process termination and thread termination. - Implement NtCreateProcessEx and update PspCreateProcess/NtCreateProcess. - Improve cleanup of process object in PspProcessDelete. - Optimize some things like User Thread startup. - Add some extra asserts, paged_code checks and also user-mode security check. - Implement helper API PsGetNextProcessThread - Optimize thread reaper (thanks Filip) - Do proper referencing/dereferencing of thread/processes (thanks Thomas) - Document FIXMEs needed for Ps code to be up to standards and complete. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/ex/power.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/lpc/close.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/process.c trunk/reactos/ntoskrnl/ntoskrnl.mc trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/po/power.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/ntoskrnl/se/audit.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/power.c?rev=22… Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=2… Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=22… Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=22976… Modified: trunk/reactos/ntoskrnl/mm/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/process.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=2… Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=22… Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=2297… Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=229… Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=22… Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=22… Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=22…

1 0

[mbosma] 22975: sizeof(SECTION_OBJECT) => sizeof(ROS_SECTION_OBJECT)
by mbosma＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: mbosma Date: Sun Jul 9 21:35:36 2006 New Revision: 22975 URL: http://svn.reactos.org/svn/reactos?rev=22975&view=rev Log: sizeof(SECTION_OBJECT) => sizeof(ROS_SECTION_OBJECT) Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Sun Jul 9 21:35:36 2006 @@ -3427,7 +3427,7 @@ ObjectAttributes, ExGetPreviousMode(), NULL, - sizeof(SECTION_OBJECT), + sizeof(ROS_SECTION_OBJECT), 0, 0, (PVOID*)(PVOID)&Section);

1 0

[mbosma] 22974: Fix bug caused by stupidness.
by mbosma＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: mbosma Date: Sun Jul 9 20:50:40 2006 New Revision: 22974 URL: http://svn.reactos.org/svn/reactos?rev=22974&view=rev Log: Fix bug caused by stupidness. Modified: branches/cache_manager_rewrite/mm/mm.c Modified: branches/cache_manager_rewrite/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mm.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/mm.c (original) +++ branches/cache_manager_rewrite/mm/mm.c Sun Jul 9 20:50:40 2006 @@ -45,7 +45,6 @@ switch (MemoryArea->Type) { case MEMORY_AREA_SECTION_VIEW: - case MEMORY_AREA_CACHE_SEGMENT: Address = (PVOID)MemoryArea->StartingAddress; MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); MmUnmapViewOfSection((PEPROCESS)Process, Address); @@ -341,6 +340,7 @@ break; case MEMORY_AREA_SECTION_VIEW: + case MEMORY_AREA_CACHE_SEGMENT: Status = MmNotPresentFaultSectionView(AddressSpace, MemoryArea, (PVOID)Address,

1 0

[greatlrd] 22973: reverting : revison 22930 to 22932, 22938 to 22940, 22943, 22945, 22950, 22953 to 22954, 22959 to 22961, 22965 Reason : CRT/RTL/STRING are being static linkend into evething and cause CSR crash when it booting to GUI and some of the changes are wrong in rbuild as well. Do not hardcode example mingw32-ld name keep it to ld for it is the make file detmer the name of ld when it is building. and some other changes are also question about. It also fix so we can build ReactOS with Mi
by greatlrd＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: greatlrd Date: Sun Jul 9 20:25:25 2006 New Revision: 22973 URL: http://svn.reactos.org/svn/reactos?rev=22973&view=rev Log: reverting : revison 22930 to 22932, 22938 to 22940, 22943, 22945, 22950, 22953 to 22954, 22959 to 22961, 22965 Reason : CRT/RTL/STRING are being static linkend into evething and cause CSR crash when it booting to GUI and some of the changes are wrong in rbuild as well. Do not hardcode example mingw32-ld name keep it to ld for it is the make file detmer the name of ld when it is building. and some other changes are also question about. It also fix so we can build ReactOS with MinGW 3.4.2 again and BinUtils 2.15.91, it was also other problem with this changes. Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/access.def 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/appwiz/appwiz.def trunk/reactos/dll/cpl/cplsample/cplsample.def 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/desk.def trunk/reactos/dll/cpl/desk/settings.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def trunk/reactos/dll/cpl/intl/intl.def 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/intl.def trunk/reactos/dll/cpl/intl_new/locale.c trunk/reactos/dll/cpl/liccpa/liccpa.def trunk/reactos/dll/cpl/main/keyboard.c trunk/reactos/dll/cpl/main/main.c trunk/reactos/dll/cpl/main/main.def trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.def trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/ncpa.def trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/powercfg/powercfg.def 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/sysdm.def trunk/reactos/dll/cpl/sysdm/userprofile.c trunk/reactos/dll/cpl/sysdm/virtmem.c 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 trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/cards/cards.def trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/module.cpp 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 Sun Jul 9 20:25:25 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/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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 2006 @@ -22,8 +22,6 @@ 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 2006 @@ -64,7 +64,7 @@ TCHAR pszUninstallString[MAX_PATH]; DWORD dwSize; - nIndex = (int) SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); + nIndex = SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); if (nIndex == -1) { MessageBox(hwndDlg, @@ -173,12 +173,12 @@ { if ((!bIsUpdate) && (!bIsSystemComponent)) { - index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); } else if (bIsUpdate && bShowUpdates) { - index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + index = 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/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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY appwiz.cpl EXPORTS -CPlApplet +CPlApplet@16 ; 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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 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,7 +114,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: 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 Sun Jul 9 20:25:25 2006 @@ -1,7 +1,7 @@ LIBRARY desk.cpl EXPORTS -CPlApplet -DisplayClassInstaller +CPlApplet@16 +DisplayClassInstaller@12 ; EOF 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 Sun Jul 9 20:25:25 2006 @@ -244,10 +244,10 @@ TCHAR Buffer[64]; if (LoadString(hApplet, (2900 + Current->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) { - index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); if (index == (DWORD)CB_ERR) { - index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_ADDSTRING, 0, (LPARAM)Buffer); + index = 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 = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); - dmNewBitsPerPel = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); + index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + dmNewBitsPerPel = 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 = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_GETPOS, 0, 0); + DWORD newPosition = 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 Sun Jul 9 20:25:25 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/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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY hdwwiz.cpl EXPORTS -CPlApplet +CPlApplet@16 ; 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 Sun Jul 9 20:25:25 2006 @@ -1,7 +1,7 @@ LIBRARY intl.cpl EXPORTS -CPlApplet -LocalePageProc +CPlApplet@16 +LocalePageProc@16 ; EOF 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 Sun Jul 9 20:25:25 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.", -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 + 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 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", -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 + 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 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", -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 + 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 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...", -1, 14, 18, 223, 33 - LTEXT "Select language...", -1, 14, 55, 223, 18 - GROUPBOX "Transformation tables codepages", -1, 5, 101, 242, 88 + 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 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 Sun Jul 9 20:25:25 2006 @@ -33,7 +33,7 @@ Lcid = wcstoul(lpLanguage, NULL, 16); GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); - Index = (int) SendMessageW(hLanguageList, + Index = SendMessageW(hLanguageList, CB_ADDSTRING, 0, (LPARAM)Lang); @@ -65,7 +65,7 @@ SendMessageW(hLanguageList, CB_SELECTSTRING, - (WPARAM) -1, + -1, (LPARAM)LangSel); } @@ -75,7 +75,6 @@ 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 Sun Jul 9 20:25:25 2006 @@ -53,11 +53,6 @@ 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)); @@ -122,7 +117,6 @@ 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/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 Sun Jul 9 20:25:25 2006 @@ -1,8 +1,8 @@ LIBRARY intl.cpl EXPORTS -CPlApplet -RegOptsProc -ExtraOptsProc +CPlApplet@16 +RegOptsProc@16 +ExtraOptsProc@16 ; EOF 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 Sun Jul 9 20:25:25 2006 @@ -34,7 +34,7 @@ int index; GetGeoInfo(gId, GEO_FRIENDLYNAME, loc, MAX_FMT_SIZE, LANG_SYSTEM_DEFAULT); - index = (int) SendMessageW(hGeoList, + index = SendMessageW(hGeoList, CB_ADDSTRING, 0, (LPARAM)loc); @@ -69,7 +69,7 @@ SendMessageW(hGeoList, CB_SELECTSTRING, - (WPARAM) -1, + -1, (LPARAM)loc); } @@ -85,14 +85,14 @@ lcid = wcstoul(lpLocale, NULL, 16); GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); - index = (int) SendMessageW(hLocaleList, + index = SendMessageW(hLocaleList, CB_ADDSTRING, 0, (LPARAM)lang); SendMessageW(hLocaleList, CB_SETITEMDATA, - (WPARAM) index, + index, (LPARAM)lcid); return TRUE; @@ -117,7 +117,7 @@ SendMessageW(hLocaleList, CB_SELECTSTRING, - (WPARAM) -1, + -1, (LPARAM)langSel); } @@ -208,7 +208,7 @@ } wsprintf(Value, L"%04X", (DWORD)LcidLocale); - ValueSize = (DWORD) (wcslen(Value) + 1) * sizeof(WCHAR); + ValueSize = (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 = (int) SendMessageW((HWND)lParam, CB_GETCURSEL, + CurrSel = SendMessageW((HWND)lParam, CB_GETCURSEL, 0, 0); - NewLCID = (LCID) SendMessageW((HWND)lParam, CB_GETITEMDATA, + NewLCID = 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 = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), + CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), CB_GETCURSEL, 0, 0); - NewLCID = (LCID) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), + NewLCID = 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 = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), + CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), CB_GETCURSEL, 0, 0); - NewLocation = (GEOID) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), + NewLocation = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), CB_GETITEMDATA, CurrSel, 0); 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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY liccpa.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF 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 Sun Jul 9 20:25:25 2006 @@ -41,9 +41,6 @@ IN WPARAM wParam, IN LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: @@ -63,9 +60,6 @@ { GUID Guids[1]; Guids[0] = GUID_DEVCLASS_KEYBOARD; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); switch(uMsg) { @@ -93,11 +87,6 @@ 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 Sun Jul 9 20:25:25 2006 @@ -106,8 +106,6 @@ LPVOID lpReserved) { INITCOMMONCONTROLSEX InitControls; - UNREFERENCED_PARAMETER(lpReserved); - switch(dwReason) { case DLL_PROCESS_ATTACH: 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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY main.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF 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 Sun Jul 9 20:25:25 2006 @@ -106,9 +106,6 @@ GUID Guids[1]; Guids[0] = GUID_DEVCLASS_MOUSE; - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch(uMsg) { case WM_INITDIALOG: @@ -169,8 +166,6 @@ { HWND hDlgCtrl; int pos; - UNREFERENCED_PARAMETER(lParam); - switch(uMsg) { case WM_INITDIALOG: @@ -186,7 +181,7 @@ if (LOWORD(wParam) == IDOK) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_CLICK_LOCK); - g_ClickLockTime = (DWORD) (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200; + g_ClickLockTime = (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200; EndDialog(hwndDlg, TRUE); } else if (LOWORD(wParam) == IDCANCEL) @@ -615,7 +610,6 @@ IN LPARAM lParam) { HWND hDlgCtrl; - UNREFERENCED_PARAMETER(lParam); switch(uMsg) { @@ -981,7 +975,7 @@ { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); EnableWindow(hDlgCtrl, TRUE); - g_MouseTrails = (ULONG) SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; + g_MouseTrails = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; } break; } @@ -1034,7 +1028,7 @@ else lResult = 0; - SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSETRAILS, lResult, 0, SPIF_SENDCHANGE); //FIXME //pointer precision @@ -1173,11 +1167,6 @@ 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/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 Sun Jul 9 20:25:25 2006 @@ -67,15 +67,14 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: { - GUID Guids[2]; - Guids[0] = GUID_DEVCLASS_CDROM; - Guids[1] = GUID_DEVCLASS_MEDIA; + GUID Guids[] = { + GUID_DEVCLASS_CDROM, + GUID_DEVCLASS_MEDIA, + }; /* create the hardware page */ DeviceCreateHardwarePageEx(hwndDlg, @@ -98,11 +97,6 @@ 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, @@ -188,7 +182,6 @@ DWORD dwReason, LPVOID lpReserved) { - UNREFERENCED_PARAMETER(lpReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: 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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY mmsys.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF 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 Sun Jul 9 20:25:25 2006 @@ -169,9 +169,6 @@ TCHAR tpszNotifyObjectCLSID[MAX_PATH]; TCHAR *tpszSubKeyCopy; int nIndex; - - UNREFERENCED_PARAMETER(hBaseKey); - // CLSID CLSID_NotifObj; // IUnknown *pUnk = NULL; // INetCfgComponentControl *pNetCfg; @@ -227,7 +224,7 @@ } RegCloseKey(hKey); - nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_ADDSTRING,0,(LPARAM)tpszDescription); + nIndex = SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_ADDSTRING,0,(LPARAM)tpszDescription); tpszSubKeyCopy = _tcsdup(tpszSubKey); SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_SETITEMDATA,nIndex,(LPARAM)tpszSubKeyCopy); } @@ -312,7 +309,7 @@ HKEY hNDIKey; DWORD dwType,dwSize; HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST); - int iListBoxIndex = (int) SendMessage(hListBox,LB_GETCURSEL,0,0); + int iListBoxIndex = SendMessage(hListBox,LB_GETCURSEL,0,0); if(iListBoxIndex != LB_ERR) tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0); if(!tpszSubKey) @@ -575,7 +572,7 @@ // How is this done properly ? - nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_ADDSTRING,0,(LPARAM)tpszDisplayName); + nIndex = SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_ADDSTRING,0,(LPARAM)tpszDisplayName); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETITEMDATA,nIndex,(LPARAM)ptpszCfgInstanceID); RegCloseKey(hKey); } @@ -632,14 +629,14 @@ { case IDC_NETCARDLIST: if(HIWORD(wParam)==LBN_DBLCLK) { - nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); + nIndex = 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 = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); + nIndex = SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); if(nIndex!=-1) DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0)); break; @@ -682,7 +679,6 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - UNREFERENCED_PARAMETER(hwndCPl); switch (uMsg) { case CPL_INIT: @@ -718,8 +714,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) { case DLL_PROCESS_ATTACH: 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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY ncpa.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 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/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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY powercfg.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 2006 @@ -40,11 +40,6 @@ LPARAM lParam ) { - LPWKSTA_INFO_101 wki; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch(uMsg) { case WM_INITDIALOG: @@ -56,6 +51,7 @@ { 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 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 Sun Jul 9 20:25:25 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/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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF 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 Sun Jul 9 20:25:25 2006 @@ -39,9 +39,8 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) 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 Sun Jul 9 20:25:25 2006 @@ -14,7 +14,7 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: 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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,6 @@ LIBRARY timedate.cpl EXPORTS -CPlApplet +CPlApplet@16 ; 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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdbe.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -1,3 +1,3 @@ LIBRARY kbdda.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbddvorak.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -1,6 +1,3 @@ LIBRARY kbdda.dll - - -EXPORTS - -KbdLayerDescriptor +EXPORTS +KbdLayerDescriptor@0 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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdfr.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdgr.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhe.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdheb.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhu.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -1,3 +1,3 @@ LIBRARY kbdpo.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdru.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdse.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsg.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsk.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbduk.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdur.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;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 Sun Jul 9 20:25:25 2006 @@ -4,5 +4,5 @@ LIBRARY kbdus.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Sun Jul 9 20:25:25 2006 @@ -14,6 +14,7 @@ <library>string</library> <library>pseh</library> <linkerflag>-lgcc</linkerflag> + <linkerflag>-nostdlib</linkerflag> <linkerflag>-nostartfiles</linkerflag> <directory name="csr"> <file>api.c</file> Modified: trunk/reactos/dll/win32/cards/cards.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.def?… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.def (original) +++ trunk/reactos/dll/win32/cards/cards.def Sun Jul 9 20:25:25 2006 @@ -1,8 +1,8 @@ LIBRARY cards.dll EXPORTS -WEP -cdtAnimate -cdtDraw -cdtDrawExt -cdtInit -cdtTerm +WEP@4 +cdtAnimate@20 +cdtDraw@24 +cdtDrawExt@32 +cdtInit@8 +cdtTerm@0 Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sun Jul 9 20:25:25 2006 @@ -19,53 +19,47 @@ ; LIBRARY CFGMGR32.DLL EXPORTS -CMP_Init_Detection = SETUPAPI.CMP_Init_Detection +CMP_Init_Detection(a)4=SETUPAPI.CMP_Init_Detection ;CMP_RegisterNotification -CMP_Report_LogOn = SETUPAPI.CMP_Report_LogOn +CMP_Report_LogOn(a)4=SETUPAPI.CMP_Report_LogOn ;CMP_UnregisterNotification ;CMP_WaitNoPendingInstallEvents ;CMP_WaitServices -;CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf -;CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex -CM_Add_IDA=SETUPAPI.CM_Add_IDA -CM_Add_IDW=SETUPAPI.CM_Add_IDW -CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA -CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW -CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf -CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex -CM_Add_IDA=SETUPAPI.CM_Add_IDA -CM_Add_IDW=SETUPAPI.CM_Add_IDW -CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA -CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW +CM_Add_Empty_Log_Conf(a)16=SETUPAPI.CM_Add_Empty_Log_Conf +CM_Add_Empty_Log_Conf_Ex(a)20=SETUPAPI.CM_Add_Empty_Log_Conf_Ex +CM_Add_IDA(a)12=SETUPAPI.CM_Add_IDA +CM_Add_IDW(a)12=SETUPAPI.CM_Add_IDW +CM_Add_ID_ExA(a)16=SETUPAPI.CM_Add_ID_ExA +CM_Add_ID_ExW(a)16=SETUPAPI.CM_Add_ID_ExW ;CM_Add_Range ;CM_Add_Res_Des ;CM_Add_Res_Des_Ex -CM_Connect_MachineA=SETUPAPI.CM_Connect_MachineA -CM_Connect_MachineW=SETUPAPI.CM_Connect_MachineW -CM_Create_DevNodeA=SETUPAPI.CM_Create_DevNodeA -CM_Create_DevNodeW=SETUPAPI.CM_Create_DevNodeW -CM_Create_DevNode_ExA=SETUPAPI.CM_Create_DevNode_ExA -CM_Create_DevNode_ExW=SETUPAPI.CM_Create_DevNode_ExW +CM_Connect_MachineA(a)8=SETUPAPI.CM_Connect_MachineA +CM_Connect_MachineW(a)8=SETUPAPI.CM_Connect_MachineW +CM_Create_DevNodeA(a)16=SETUPAPI.CM_Create_DevNodeA +CM_Create_DevNodeW(a)16=SETUPAPI.CM_Create_DevNodeW +CM_Create_DevNode_ExA(a)20=SETUPAPI.CM_Create_DevNode_ExA +CM_Create_DevNode_ExW(a)20=SETUPAPI.CM_Create_DevNode_ExW ;CM_Create_Range_List -CM_Delete_Class_Key=SETUPAPI.CM_Delete_Class_Key -CM_Delete_Class_Key_Ex=SETUPAPI.CM_Delete_Class_Key_Ex -CM_Delete_DevNode_Key=SETUPAPI.CM_Delete_DevNode_Key -CM_Delete_DevNode_Key_Ex=SETUPAPI.CM_Delete_DevNode_Key_Ex +CM_Delete_Class_Key(a)8=SETUPAPI.CM_Delete_Class_Key +CM_Delete_Class_Key_Ex(a)12=SETUPAPI.CM_Delete_Class_Key_Ex +CM_Delete_DevNode_Key(a)12=SETUPAPI.CM_Delete_DevNode_Key +CM_Delete_DevNode_Key_Ex(a)16=SETUPAPI.CM_Delete_DevNode_Key_Ex ;CM_Delete_Range ;CM_Detect_Resource_Conflict ;CM_Detect_Resource_Conflict_Ex -CM_Disable_DevNode=SETUPAPI.CM_Disable_DevNode -CM_Disable_DevNode_Ex=SETUPAPI.CM_Disable_DevNode_Ex -CM_Disconnect_Machine=SETUPAPI.CM_Disconnect_Machine +CM_Disable_DevNode(a)8=SETUPAPI.CM_Disable_DevNode +CM_Disable_DevNode_Ex(a)12=SETUPAPI.CM_Disable_DevNode_Ex +CM_Disconnect_Machine(a)4=SETUPAPI.CM_Disconnect_Machine ;CM_Dup_Range_List -CM_Enable_DevNode=SETUPAPI.CM_Enable_DevNode -CM_Enable_DevNode_Ex=SETUPAPI.CM_Enable_DevNode_Ex -CM_Enumerate_Classes=SETUPAPI.CM_Enumerate_Classes -CM_Enumerate_Classes_Ex=SETUPAPI.CM_Enumerate_Classes_Ex -CM_Enumerate_EnumeratorsA=SETUPAPI.CM_Enumerate_EnumeratorsA -CM_Enumerate_EnumeratorsW=SETUPAPI.CM_Enumerate_EnumeratorsW -CM_Enumerate_Enumerators_ExA=SETUPAPI.CM_Enumerate_Enumerators_ExA -CM_Enumerate_Enumerators_ExW=SETUPAPI.CM_Enumerate_Enumerators_ExW +CM_Enable_DevNode(a)8=SETUPAPI.CM_Enable_DevNode +CM_Enable_DevNode_Ex(a)12=SETUPAPI.CM_Enable_DevNode_Ex +CM_Enumerate_Classes(a)12=SETUPAPI.CM_Enumerate_Classes +CM_Enumerate_Classes_Ex(a)16=SETUPAPI.CM_Enumerate_Classes_Ex +CM_Enumerate_EnumeratorsA(a)16=SETUPAPI.CM_Enumerate_EnumeratorsA +CM_Enumerate_EnumeratorsW(a)16=SETUPAPI.CM_Enumerate_EnumeratorsW +CM_Enumerate_Enumerators_ExA(a)20=SETUPAPI.CM_Enumerate_Enumerators_ExA +CM_Enumerate_Enumerators_ExW(a)20=SETUPAPI.CM_Enumerate_Enumerators_ExW ;CM_Find_Range ;CM_First_Range ;CM_Free_Log_Conf @@ -75,38 +69,38 @@ ;CM_Free_Res_Des ;CM_Free_Res_Des_Ex ;CM_Free_Res_Des_Handle -CM_Get_Child = SETUPAPI.CM_Get_Child -CM_Get_Child_Ex = SETUPAPI.CM_Get_Child_Ex -CM_Get_Class_Key_NameA=SETUPAPI.CM_Get_Class_Key_NameA -CM_Get_Class_Key_NameW=SETUPAPI.CM_Get_Class_Key_NameW -CM_Get_Class_Key_Name_ExA=SETUPAPI.CM_Get_Class_Key_Name_ExA -CM_Get_Class_Key_Name_ExW=SETUPAPI.CM_Get_Class_Key_Name_ExW -CM_Get_Class_NameA=SETUPAPI.CM_Get_Class_NameA -CM_Get_Class_NameW=SETUPAPI.CM_Get_Class_NameW -CM_Get_Class_Name_ExA=SETUPAPI.CM_Get_Class_Name_ExA -CM_Get_Class_Name_ExW=SETUPAPI.CM_Get_Class_Name_ExW -CM_Get_Depth=SETUPAPI.CM_Get_Depth -CM_Get_Depth_Ex=SETUPAPI.CM_Get_Depth_Ex -CM_Get_DevNode_Registry_PropertyA=SETUPAPI.CM_Get_DevNode_Registry_PropertyA -CM_Get_DevNode_Registry_PropertyW=SETUPAPI.CM_Get_DevNode_Registry_PropertyW -CM_Get_DevNode_Registry_Property_ExA=SETUPAPI.CM_Get_DevNode_Registry_Property_ExA -CM_Get_DevNode_Registry_Property_ExW=SETUPAPI.CM_Get_DevNode_Registry_Property_ExW -CM_Get_DevNode_Status=SETUPAPI.CM_Get_DevNode_Status -CM_Get_DevNode_Status_Ex=SETUPAPI.CM_Get_DevNode_Status_Ex -CM_Get_Device_IDA=SETUPAPI.CM_Get_Device_IDA -CM_Get_Device_IDW=SETUPAPI.CM_Get_Device_IDW -CM_Get_Device_ID_ExA=SETUPAPI.CM_Get_Device_ID_ExA -CM_Get_Device_ID_ExW=SETUPAPI.CM_Get_Device_ID_ExW -CM_Get_Device_ID_ListA=SETUPAPI.CM_Get_Device_ID_ListA -CM_Get_Device_ID_ListW=SETUPAPI.CM_Get_Device_ID_ListW -CM_Get_Device_ID_List_ExA=SETUPAPI.CM_Get_Device_ID_List_ExA -CM_Get_Device_ID_List_ExW=SETUPAPI.CM_Get_Device_ID_List_ExW -CM_Get_Device_ID_List_SizeA=SETUPAPI.CM_Get_Device_ID_List_SizeA -CM_Get_Device_ID_List_SizeW=SETUPAPI.CM_Get_Device_ID_List_SizeW -CM_Get_Device_ID_List_Size_ExA=SETUPAPI.CM_Get_Device_ID_List_Size_ExA -CM_Get_Device_ID_List_Size_ExW=SETUPAPI.CM_Get_Device_ID_List_Size_ExA -CM_Get_Device_ID_Size=SETUPAPI.CM_Get_Device_ID_Size -CM_Get_Device_ID_Size_Ex=SETUPAPI.CM_Get_Device_ID_Size_Ex +CM_Get_Child(a)12=SETUPAPI.CM_Get_Child +CM_Get_Child_Ex(a)16=SETUPAPI.CM_Get_ChildEx +CM_Get_Class_Key_NameA(a)16=SETUPAPI.CM_Get_Class_Key_NameA +CM_Get_Class_Key_NameW(a)16=SETUPAPI.CM_Get_Class_Key_NameW +CM_Get_Class_Key_Name_ExA(a)20=SETUPAPI.CM_Get_Class_Key_Name_ExA +CM_Get_Class_Key_Name_ExW(a)20=SETUPAPI.CM_Get_Class_Key_Name_ExW +CM_Get_Class_NameA(a)16=SETUPAPI.CM_Get_Class_NameA +CM_Get_Class_NameW(a)16=SETUPAPI.CM_Get_Class_NameW +CM_Get_Class_Name_ExA(a)20=SETUPAPI.CM_Get_Class_Name_ExA +CM_Get_Class_Name_ExW(a)20=SETUPAPI.CM_Get_Class_Name_ExW +CM_Get_Depth(a)12=SETUPAPI.CM_Get_Depth +CM_Get_Depth_Ex(a)16=SETUPAPI.CM_Get_Depth_Ex +CM_Get_DevNode_Registry_PropertyA(a)24=SETUPAPI.CM_Get_DevNode_Registry_PropertyA +CM_Get_DevNode_Registry_PropertyW(a)24=SETUPAPI.CM_Get_DevNode_Registry_PropertyW +CM_Get_DevNode_Registry_Property_ExA(a)28=SETUPAPI.CM_Get_DevNode_Registry_Property_ExA +CM_Get_DevNode_Registry_Property_ExW(a)28=SETUPAPI.CM_Get_DevNode_Registry_Property_ExW +CM_Get_DevNode_Status(a)16=SETUPAPI.CM_Get_DevNode_Status +CM_Get_DevNode_Status_Ex(a)20=SETUPAPI.CM_Get_DevNode_Status_Ex +CM_Get_Device_IDA(a)16=SETUPAPI.CM_Get_Device_IDA +CM_Get_Device_IDW(a)16=SETUPAPI.CM_Get_Device_IDW +CM_Get_Device_ID_ExA(a)20=SETUPAPI.CM_Get_Device_ID_ExA +CM_Get_Device_ID_ExW(a)20=SETUPAPI.CM_Get_Device_ID_ExW +CM_Get_Device_ID_ListA(a)16=SETUPAPI.CM_Get_Device_ID_ListA +CM_Get_Device_ID_ListW(a)16=SETUPAPI.CM_Get_Device_ID_ListW +CM_Get_Device_ID_List_ExA(a)20=SETUPAPI.CM_Get_Device_ID_List_ExA +CM_Get_Device_ID_List_ExW(a)20=SETUPAPI.CM_Get_Device_ID_List_ExW +CM_Get_Device_ID_List_SizeA(a)12=SETUPAPI.CM_Get_Device_ID_List_SizeA +CM_Get_Device_ID_List_SizeW(a)12=SETUPAPI.CM_Get_Device_ID_List_SizeW +CM_Get_Device_ID_List_Size_ExA(a)16=SETUPAPI.CM_Get_Device_ID_List_Size_ExA +CM_Get_Device_ID_List_Size_ExW(a)16=SETUPAPI.CM_Get_Device_ID_List_Size_ExA +CM_Get_Device_ID_Size(a)12=SETUPAPI.CM_Get_Device_ID_Size +CM_Get_Device_ID_Size_Ex(a)16=SETUPAPI.CM_Get_Device_ID_Size_Ex ;CM_Get_Device_Interface_AliasA ;CM_Get_Device_Interface_AliasW ;CM_Get_Device_Interface_Alias_ExA @@ -121,12 +115,12 @@ ;CM_Get_Device_Interface_List_Size_ExW ;CM_Get_First_Log_Conf ;CM_Get_First_Log_Conf_Ex -CM_Get_Global_State=SETUPAPI.CM_Get_Global_State -CM_Get_Global_State_Ex=SETUPAPI.CM_Get_Global_State_Ex -CM_Get_HW_Prof_FlagsA=SETUPAPI.CM_Get_HW_Prof_FlagsA -CM_Get_HW_Prof_FlagsW=SETUPAPI.CM_Get_HW_Prof_FlagsW -CM_Get_HW_Prof_Flags_ExA=SETUPAPI.CM_Get_HW_Prof_Flags_ExA -CM_Get_HW_Prof_Flags_ExW=SETUPAPI.CM_Get_HW_Prof_Flags_ExW +CM_Get_Global_State(a)8=SETUPAPI.CM_Get_Global_State +CM_Get_Global_State_Ex(a)12=SETUPAPI.CM_Get_Global_State_Ex +CM_Get_HW_Prof_FlagsA(a)16=SETUPAPI.CM_Get_HW_Prof_FlagsA +CM_Get_HW_Prof_FlagsW(a)16=SETUPAPI.CM_Get_HW_Prof_FlagsW +CM_Get_HW_Prof_Flags_ExA(a)20=SETUPAPI.CM_Get_HW_Prof_Flags_ExA +CM_Get_HW_Prof_Flags_ExW(a)20=SETUPAPI.CM_Get_HW_Prof_Flags_ExW ;CM_Get_Hardware_Profile_InfoA ;CM_Get_Hardware_Profile_InfoW ;CM_Get_Hardware_Profile_Info_ExA @@ -137,44 +131,44 @@ ;CM_Get_Next_Log_Conf_Ex ;CM_Get_Next_Res_Des ;CM_Get_Next_Res_Des_Ex -CM_Get_Parent=SETUPAPI.CM_Get_Parent -CM_Get_Parent_Ex=SETUPAPI.CM_Get_Parent_Ex +CM_Get_Parent(a)12=SETUPAPI.CM_Get_Parent +CM_Get_Parent_Ex(a)16=SETUPAPI.CM_Get_Parent_Ex ;CM_Get_Res_Des_Data ;CM_Get_Res_Des_Data_Ex ;CM_Get_Res_Des_Data_Size ;CM_Get_Res_Des_Data_Size_Ex -CM_Get_Sibling=SETUPAPI.CM_Get_Sibling -CM_Get_Sibling_Ex=SETUPAPI.CM_Get_Sibling_Ex -CM_Get_Version=SETUPAPI.CM_Get_Version -CM_Get_Version_Ex=SETUPAPI.CM_Get_Version_Ex +CM_Get_Sibling(a)12=SETUPAPI.CM_Get_Sibling +CM_Get_Sibling_Ex(a)16=SETUPAPI.CM_Get_Sibling_Ex +CM_Get_Version(a)0=SETUPAPI.CM_Get_Version +CM_Get_Version_Ex(a)4=SETUPAPI.CM_Get_Version_Ex ;CM_Intersect_Range_List ;CM_Invert_Range_List -CM_Is_Dock_Station_Present=SETUPAPI.CM_Is_Dock_Station_Present -CM_Is_Dock_Station_Present_Ex=SETUPAPI.CM_Is_Dock_Station_Present_Ex -CM_Locate_DevNodeA=SETUPAPI.CM_Locate_DevNodeA -CM_Locate_DevNodeW=SETUPAPI.CM_Locate_DevNodeW -CM_Locate_DevNode_ExA=SETUPAPI.CM_Locate_DevNode_ExA -CM_Locate_DevNode_ExW=SETUPAPI.CM_Locate_DevNode_ExW +CM_Is_Dock_Station_Present(a)4=SETUPAPI.CM_Is_Dock_Station_Present +CM_Is_Dock_Station_Present_Ex(a)8=SETUPAPI.CM_Is_Dock_Station_Present_Ex +CM_Locate_DevNodeA(a)12=SETUPAPI.CM_Locate_DevNodeA +CM_Locate_DevNodeW(a)12=SETUPAPI.CM_Locate_DevNodeW +CM_Locate_DevNode_ExA(a)16=SETUPAPI.CM_Locate_DevNode_ExA +CM_Locate_DevNode_ExW(a)16=SETUPAPI.CM_Locate_DevNode_ExW ;CM_Merge_Range_List ;CM_Modify_Res_Des ;CM_Modify_Res_Des_Ex -CM_Move_DevNode=SETUPAPI.CM_Move_DevNode -CM_Move_DevNode_Ex=SETUPAPI.CM_Move_DevNode_Ex +CM_Move_DevNode(a)12=SETUPAPI.CM_Move_DevNode +CM_Move_DevNode_Ex(a)16=SETUPAPI.CM_Move_DevNode_Ex ;CM_Next_Range -CM_Open_Class_KeyA=SETUPAPI.CM_Open_Class_KeyA -CM_Open_Class_KeyW=SETUPAPI.CM_Open_Class_KeyW -CM_Open_Class_Key_ExA=SETUPAPI.CM_Open_Class_Key_ExA -CM_Open_Class_Key_ExW=SETUPAPI.CM_Open_Class_Key_ExW -CM_Open_DevNode_Key=SETUPAPI.CM_Open_DevNode_Key -CM_Open_DevNode_Key_Ex=SETUPAPI.CM_Open_DevNode_Key_Ex +CM_Open_Class_KeyA(a)24=SETUPAPI.CM_Open_Class_KeyA +CM_Open_Class_KeyW(a)24=SETUPAPI.CM_Open_Class_KeyW +CM_Open_Class_Key_ExA(a)28=SETUPAPI.CM_Open_Class_Key_ExA +CM_Open_Class_Key_ExW(a)28=SETUPAPI.CM_Open_Class_Key_ExW +CM_Open_DevNode_Key(a)24=SETUPAPI.CM_Open_DevNode_Key +CM_Open_DevNode_Key_Ex(a)28=SETUPAPI.CM_Open_DevNode_Key_Ex ;CM_Query_Arbitrator_Free_Data ;CM_Query_Arbitrator_Free_Data_Ex ;CM_Query_Arbitrator_Free_Size ;CM_Query_Arbitrator_Free_Size_Ex ;CM_Query_Remove_SubTree ;CM_Query_Remove_SubTree_Ex -CM_Reenumerate_DevNode=SETUPAPI.CM_Reenumerate_DevNode -CM_Reenumerate_DevNode_Ex=SETUAPI.CM_Reenumerate_DevNode_Ex +CM_Reenumerate_DevNode(a)8=SETUPAPI.CM_Reenumerate_DevNode +CM_Reenumerate_DevNode_Ex(a)12=SETUAPI.CM_Reenumerate_DevNode_Ex ;CM_Register_Device_Driver ;CM_Register_Device_Driver_Ex ;CM_Register_Device_InterfaceA @@ -187,29 +181,29 @@ ;CM_Remove_Unmarked_Children_Ex ;CM_Request_Device_EjectA ;CM_Request_Device_EjectW -CM_Request_Eject_PC=SETUPAPI.CM_Request_Eject_PC -CM_Request_Eject_PC_Ex=SETUPAPI.CM_Request_Eject_PC_Ex +CM_Request_Eject_PC(a)0=SETUPAPI.CM_Request_Eject_PC +CM_Request_Eject_PC_Ex(a)4=SETUPAPI.CM_Request_Eject_PC_Ex ;CM_Reset_Children_Marks ;CM_Reset_Children_Marks_Ex -CM_Run_Detection=SETUPAPI.CM_Run_Detection -CM_Run_Detection_Ex=SETUPAPI.CM_Run_Detection_Ex -CM_Set_DevNode_Problem=SETUPAPI.CM_Set_DevNode_Problem -CM_Set_DevNode_Problem_Ex=SETUPAPI.CM_Set_DevNode_Problem_Ex -CM_Set_DevNode_Registry_PropertyA=SETUPAPI.CM_Set_DevNode_Registry_PropertyA -CM_Set_DevNode_Registry_PropertyW=SETUPAPI.CM_Set_DevNode_Registry_PropertyW -CM_Set_DevNode_Registry_Property_ExA=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA -CM_Set_DevNode_Registry_Property_ExW=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW +CM_Run_Detection(a)4=SETUPAPI.CM_Run_Detection +CM_Run_Detection_Ex(a)8=SETUPAPI.CM_Run_Detection_Ex +CM_Set_DevNode_Problem(a)12=SETUPAPI.CM_Set_DevNode_Problem +CM_Set_DevNode_Problem_Ex(a)16=SETUPAPI.CM_Set_DevNode_Problem_Ex +CM_Set_DevNode_Registry_PropertyA(a)20=SETUPAPI.CM_Set_DevNode_Registry_PropertyA +CM_Set_DevNode_Registry_PropertyW(a)20=SETUPAPI.CM_Set_DevNode_Registry_PropertyW +CM_Set_DevNode_Registry_Property_ExA(a)24=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA +CM_Set_DevNode_Registry_Property_ExW(a)24=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW ;CM_Set_HW_Prof ;CM_Set_HW_Prof_Ex -CM_Set_HW_Prof_FlagsA=SETUPAPI.CM_Set_HW_Prof_FlagsA -CM_Set_HW_Prof_FlagsW=SETUPAPI.CM_Set_HW_Prof_FlagsW -CM_Set_HW_Prof_Flags_ExA=SETUPAPI.CM_Set_HW_Prof_Flags_ExA -CM_Set_HW_Prof_Flags_ExW=SETUPAPI.CM_Set_HW_Prof_Flags_ExW -CM_Setup_DevNode=SETUPAPI.CM_Setup_DevNode -CM_Setup_DevNode_Ex=SETUPAPI.CM_Setup_DevNode_Ex +CM_Set_HW_Prof_FlagsA(a)16=SETUPAPI.CM_Set_HW_Prof_FlagsA +CM_Set_HW_Prof_FlagsW(a)16=SETUPAPI.CM_Set_HW_Prof_FlagsW +CM_Set_HW_Prof_Flags_ExA(a)20=SETUPAPI.CM_Set_HW_Prof_Flags_ExA +CM_Set_HW_Prof_Flags_ExW(a)20=SETUPAPI.CM_Set_HW_Prof_Flags_ExW +CM_Setup_DevNode(a)8=SETUPAPI.CM_Setup_DevNode +CM_Setup_DevNode_Ex(a)12=SETUPAPI.CM_Setup_DevNode_Ex ;CM_Test_Range_Available -CM_Uninstall_DevNode=SETUPAPI.CM_Uninstall_DevNode -CM_Uninstall_DevNode_Ex=SETUPAPI.CM_Uninstall_DevNode_Ex +CM_Uninstall_DevNode(a)8=SETUPAPI.CM_Uninstall_DevNode +CM_Uninstall_DevNode_Ex(a)12=SETUPAPI.CM_Uninstall_DevNode_Ex ;CM_Unregister_Device_InterfaceA ;CM_Unregister_Device_InterfaceW ;CM_Unregister_Device_Interface_ExA Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild Sun Jul 9 20:25:25 2006 @@ -3,6 +3,5 @@ <linkerflag>-nostdlib</linkerflag> <linkerflag>-lgcc</linkerflag> <importlibrary definition="cfgmgr32.def" /> - <library>setupapi</library> <file>cfgmgr32.rc</file> </module> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Sun Jul 9 20:25:25 2006 @@ -128,6 +128,7 @@ <library>ntdll</library> <linkerflag>-lgcc</linkerflag> <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> <file>kernel32.rc</file> </module> <directory name="tests"> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Sun Jul 9 20:25:25 2006 @@ -1,5 +1,7 @@ <module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll"> <linkerflag>-nostartfiles</linkerflag> + <linkerflag>--enable-stdcall-fixup</linkerflag> + <linkerflag>-nostdlib</linkerflag> <linkerflag>-lgcc</linkerflag> <importlibrary definition="msvcrt.def" /> <include base="msvcrt">.</include> Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild Sun Jul 9 20:25:25 2006 @@ -9,6 +9,7 @@ <define name="WINVER">0x501</define> <define name="_SHLWAPI_"/> <define name="WINSHLWAPI">""</define> + <linkerflag>-nostdlib</linkerflag> <linkerflag>-lgcc</linkerflag> <library>wine</library> <library>uuid</library> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Jul 9 20:25:25 2006 @@ -329,5 +329,6 @@ </directory> <file>ntoskrnl.rc</file> <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> <linkerflag>-lgcc</linkerflag> </module> 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 Sun Jul 9 20:25:25 2006 @@ -420,8 +420,8 @@ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" ); - fprintf ( fMakefile, "PROJECT_LFLAGS := %s %s\n", - GenerateProjectLFLAGS ().c_str (), "-Wl,--enable-stdcall-fixup" ); + fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", + GenerateProjectLFLAGS ().c_str () ); 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 Sun Jul 9 20:25:25 2006 @@ -1564,15 +1564,15 @@ killAt.c_str () ); fprintf ( fMakefile, - "\t%s %s %s %s %s -o %s %s %s\n", + "\t%s %s %s %s -o %s %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 () ); + libsMacro.c_str (), + GetLinkerMacro ().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 () ); } @@ -2742,7 +2742,8 @@ fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, - "\t${ld} -N -Ttext=0x8000 -o %s %s %s\n", + "\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n", + GetLinkerMacro ().c_str (), junk_tmp.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str () ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Sun Jul 9 20:25:25 2006 @@ -278,7 +278,7 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; } - std::string TypeSpecificLinkerFlags() { return "-nostartfiles"; } + std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateKernelModeDLLModuleTarget (); }; @@ -291,7 +291,7 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificCFlags() { return "-D__NTDRIVER__ -D_SEH_NO_NATIVE_NLG"; } - std::string TypeSpecificLinkerFlags() { return "-nostartfiles"; } + std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: void GenerateKernelModeDriverModuleTarget (); }; 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 Sun Jul 9 20:25:25 2006 @@ -371,9 +371,6 @@ { fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); - if (module.GetEntryPoint(false) == "0") - fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); - if (module.importLibrary != NULL) fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); @@ -446,10 +443,7 @@ } else if ( dll ) { - 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\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false) == "" ? "DllMain" : 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 Sun Jul 9 20:25:25 2006 @@ -835,7 +835,7 @@ case NativeCUI: return "NtProcessStartup@4"; case Win32DLL: - return "DllMainCRTStartup@12"; + return "DllMain@12"; case Win32CUI: case Test: if ( isUnicode )

1 0

[gedmurphy] 22972: check reg for NTP setting fix a few typos and msvc warnings
by gedmurphy＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: gedmurphy Date: Sun Jul 9 20:19:39 2006 New Revision: 22972 URL: http://svn.reactos.org/svn/reactos?rev=22972&view=rev Log: check reg for NTP setting fix a few typos and msvc warnings Modified: trunk/reactos/dll/cpl/timedate/internettime.c trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/timedate/internettime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/internett… ============================================================================== --- trunk/reactos/dll/cpl/timedate/internettime.c (original) +++ trunk/reactos/dll/cpl/timedate/internettime.c Sun Jul 9 20:19:39 2006 @@ -216,7 +216,7 @@ } RegCloseKey(hKey); - HeapFree(GetProcessHeap, + HeapFree(GetProcessHeap(), 0, buf); @@ -225,8 +225,8 @@ fail: GetError(); if (hKey) RegCloseKey(hKey); - HeapFree(GetProcessHeap, 0, buf); - HeapFree(GetProcessHeap, 0, *lpAddress); + HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, *lpAddress); return FALSE; } @@ -327,10 +327,52 @@ static VOID +GetSyncSetting(HWND hwnd) +{ + HKEY hKey; + HWND hCheck; + LONG Ret; + WCHAR Data[8]; + DWORD Size; + + Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Parameters", + 0, + KEY_QUERY_VALUE, + &hKey); + if (Ret != ERROR_SUCCESS) + { + GetError(); + return; + } + + Size = sizeof(Data); + Ret = RegQueryValueExW(hKey, + L"Type", + NULL, + NULL, + (LPBYTE)Data, + &Size); + if (Ret != ERROR_SUCCESS) + { + GetError(); + } + + if (lstrcmp(Data, L"NTP") == 0) + { + hCheck = GetDlgItem(hwnd, IDC_AUTOSYNC); + SendMessageW(hCheck, BM_SETCHECK, 0, 0); + } + + RegCloseKey(hKey); +} + + +static VOID InitialiseDialog(HWND hwnd) { - //check registry if button should be checked - //set button + GetSyncSetting(hwnd); + EnableDialogText(hwnd); CreateNTPServerList(hwnd); Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c Sun Jul 9 20:19:39 2006 @@ -237,11 +237,11 @@ TCHAR szBuf[64]; UINT i; - infoPtr->UIState = (DWORD) SendMessage(GetAncestor(infoPtr->hSelf, - GA_PARENT), - WM_QUERYUISTATE, - 0, - 0); + infoPtr->UIState = (DWORD)SendMessage(GetAncestor(infoPtr->hSelf, + GA_PARENT), + WM_QUERYUISTATE, + 0, + 0); /* cache the configuration */ infoPtr->FirstDayOfWeek = MonthCalFirstDayOfWeek(); @@ -631,8 +631,8 @@ static WORD MonthCalPtToDay(IN PMONTHCALWND infoPtr, - IN SHORT x, - IN SHORT y) + IN INT x, + IN INT y) { WORD Ret = 0; @@ -1017,7 +1017,7 @@ SetWindowLongPtr(hwnd, 0, - (DWORD_PTR)infoPtr); + (LONG_PTR)infoPtr); ZeroMemory(infoPtr, sizeof(MONTHCALWND)); Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c Sun Jul 9 20:19:39 2006 @@ -289,7 +289,7 @@ while (i < dwIndex) { if (Entry == NULL) - return; + return; i++; Entry = Entry->Next; @@ -328,6 +328,9 @@ &hKey)) return; + /* if the call fails (non zero), the reg value isn't available, + * which means it shouldn't be disabled, so we should check the button. + */ if (RegQueryValueExW(hKey, L"DisableAutoDaylightTimeSet", NULL,

1 0

[greatlrd] 22971: last patch Alex ask for this be revert for it should be fixed in another place.
by greatlrd＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: greatlrd Date: Sun Jul 9 19:33:33 2006 New Revision: 22971 URL: http://svn.reactos.org/svn/reactos?rev=22971&view=rev Log: last patch Alex ask for this be revert for it should be fixed in another place. Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/diskdump/d… ============================================================================== --- trunk/reactos/drivers/storage/diskdump/diskdump.c (original) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c Sun Jul 9 19:33:33 2006 @@ -28,7 +28,6 @@ /* INCLUDES *****************************************************************/ #include <ntddk.h> -#include <ntifs.h> #include <scsi.h> #include <ntdddisk.h> #include <ntddscsi.h>

1 0

[ion] 22970: - Small build fix
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 19:25:14 2006 New Revision: 22970 URL: http://svn.reactos.org/svn/reactos?rev=22970&view=rev Log: - Small build fix Modified: trunk/reactos/include/ndk/ifssupp.h Modified: trunk/reactos/include/ndk/ifssupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ifssupp.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ifssupp.h (original) +++ trunk/reactos/include/ndk/ifssupp.h Sun Jul 9 19:25:14 2006 @@ -28,6 +28,7 @@ } TOKEN_TYPE, *PTOKEN_TYPE; typedef PVOID PRTL_HEAP_PARAMETERS; +typedef PVOID PFS_FILTER_CALLBACKS; typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; typedef struct _RTL_SPLAY_LINKS

1 0

[ion] 22968: - Separate functions that deal with driver-related registry code, grouping, tagging, indexing, sorting into drvrlist.c... this code should eventually become part of Cm instead.
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 06:34:32 2006 New Revision: 22968 URL: http://svn.reactos.org/svn/reactos?rev=22968&view=rev Log: - Separate functions that deal with driver-related registry code, grouping, tagging, indexing, sorting into drvrlist.c... this code should eventually become part of Cm instead. Added: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jul 9 06:34:32 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/driver.c + * FILE: ntoskrnl/io/iomgr/driver.c * PURPOSE: Driver Object Management * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Filip Navara (navaraf(a)reactos.org) @@ -14,90 +14,38 @@ #define NDEBUG #include <internal/debug.h> -/* ke/main.c */ +/* GLOBALS ********************************************************************/ + +LIST_ENTRY DriverReinitListHead; +KSPIN_LOCK DriverReinitListLock; +PLIST_ENTRY DriverReinitTailEntry; + +PLIST_ENTRY DriverBootReinitTailEntry; +LIST_ENTRY DriverBootReinitListHead; +KSPIN_LOCK DriverBootReinitListLock; + +UNICODE_STRING IopHardwareDatabaseKey = + RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); + +POBJECT_TYPE IoDriverObjectType = NULL; + extern BOOLEAN SetupMode; extern BOOLEAN NoGuiBoot; -typedef struct _SERVICE_GROUP -{ - LIST_ENTRY GroupListEntry; - UNICODE_STRING GroupName; - BOOLEAN ServicesRunning; - ULONG TagCount; - PULONG TagArray; -} SERVICE_GROUP, *PSERVICE_GROUP; - -typedef struct _SERVICE -{ - LIST_ENTRY ServiceListEntry; - UNICODE_STRING ServiceName; - UNICODE_STRING RegistryPath; - UNICODE_STRING ServiceGroup; - UNICODE_STRING ImagePath; - - ULONG Start; - ULONG Type; - ULONG ErrorControl; - ULONG Tag; - -/* BOOLEAN ServiceRunning;*/ // needed ?? -} SERVICE, *PSERVICE; - -/* GLOBALS ********************************************************************/ - -static LIST_ENTRY DriverReinitListHead; -static KSPIN_LOCK DriverReinitListLock; -static PLIST_ENTRY DriverReinitTailEntry; - -static PLIST_ENTRY DriverBootReinitTailEntry; -static LIST_ENTRY DriverBootReinitListHead; -static KSPIN_LOCK DriverBootReinitListLock; - -static LIST_ENTRY GroupListHead = {NULL, NULL}; -static LIST_ENTRY ServiceListHead = {NULL, NULL}; - -static UNICODE_STRING IopHardwareDatabaseKey = - RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); - -POBJECT_TYPE IoDriverObjectType = NULL; - /* DECLARATIONS ***************************************************************/ -VOID STDCALL -IopDeleteDriver(PVOID ObjectBody); - NTSTATUS -LdrProcessModule(PVOID ModuleLoadBase, - PUNICODE_STRING ModuleName, - PLDR_DATA_TABLE_ENTRY *ModuleObject); - -static VOID -FASTCALL -INIT_FUNCTION -IopDisplayLoadingMessage(PVOID ServiceName, - BOOLEAN Unicode); - -static VOID INIT_FUNCTION -MiFreeBootDriverMemory(PVOID StartAddress, ULONG Length); - -NTSTATUS FASTCALL INIT_FUNCTION -IopInitializeBuiltinDriver( - PDEVICE_NODE ModuleDeviceNode, - PVOID ModuleLoadBase, - PCHAR FileName, - ULONG ModuleLength); - -static INIT_FUNCTION NTSTATUS -IopLoadDriver(PSERVICE Service); +LdrProcessModule( + PVOID ModuleLoadBase, + PUNICODE_STRING ModuleName, + PLDR_DATA_TABLE_ENTRY *ModuleObject +); #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IopInitDriverImplementation) #pragma alloc_text(INIT, IopDisplayLoadingMessage) -#pragma alloc_text(INIT, IoCreateDriverList) -#pragma alloc_text(INIT, IoDestroyDriverList) #pragma alloc_text(INIT, MiFreeBootDriverMemory) #pragma alloc_text(INIT, IopInitializeBuiltinDriver) -#pragma alloc_text(INIT, IopLoadDriver) #endif @@ -839,338 +787,6 @@ } return STATUS_SUCCESS; -} - -static NTSTATUS STDCALL -IopGetGroupOrderList(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PSERVICE_GROUP Group; - - DPRINT("IopGetGroupOrderList(%S, %x, 0x%p, %x, 0x%p, 0x%p)\n", - ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); - - if (ValueType == REG_BINARY && - ValueData != NULL && - ValueLength >= sizeof(DWORD) && - ValueLength >= (*(PULONG)ValueData + 1) * sizeof(DWORD)) - { - Group = (PSERVICE_GROUP)Context; - Group->TagCount = ((PULONG)ValueData)[0]; - if (Group->TagCount > 0) - { - if (ValueLength >= (Group->TagCount + 1) * sizeof(DWORD)) - { - Group->TagArray = ExAllocatePool(NonPagedPool, Group->TagCount * sizeof(DWORD)); - if (Group->TagArray == NULL) - { - Group->TagCount = 0; - return STATUS_INSUFFICIENT_RESOURCES; - } - memcpy(Group->TagArray, (PULONG)ValueData + 1, Group->TagCount * sizeof(DWORD)); - } - else - { - Group->TagCount = 0; - return STATUS_UNSUCCESSFUL; - } - } - } - return STATUS_SUCCESS; -} - -static NTSTATUS STDCALL -IopCreateGroupListEntry(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PSERVICE_GROUP Group; - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; - - - if (ValueType == REG_SZ) - { - DPRINT("GroupName: '%S'\n", (PWCHAR)ValueData); - - Group = ExAllocatePool(NonPagedPool, - sizeof(SERVICE_GROUP)); - if (Group == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - RtlZeroMemory(Group, sizeof(SERVICE_GROUP)); - - if (!RtlCreateUnicodeString(&Group->GroupName, (PWSTR)ValueData)) - { - ExFreePool(Group); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - RtlZeroMemory(&QueryTable, sizeof(QueryTable)); - QueryTable[0].Name = (PWSTR)ValueData; - QueryTable[0].QueryRoutine = IopGetGroupOrderList; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"GroupOrderList", - QueryTable, - (PVOID)Group, - NULL); - DPRINT("%x %d %S\n", Status, Group->TagCount, (PWSTR)ValueData); - - InsertTailList(&GroupListHead, - &Group->GroupListEntry); - } - - return(STATUS_SUCCESS); -} - - -static NTSTATUS STDCALL -IopCreateServiceListEntry(PUNICODE_STRING ServiceName) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[7]; - PSERVICE Service; - NTSTATUS Status; - - DPRINT("ServiceName: '%wZ'\n", ServiceName); - - /* Allocate service entry */ - Service = (PSERVICE)ExAllocatePool(NonPagedPool, sizeof(SERVICE)); - if (Service == NULL) - { - DPRINT1("ExAllocatePool() failed\n"); - return(STATUS_INSUFFICIENT_RESOURCES); - } - RtlZeroMemory(Service, sizeof(SERVICE)); - - /* Get service data */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"Start"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = &Service->Start; - - QueryTable[1].Name = L"Type"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[1].EntryContext = &Service->Type; - - QueryTable[2].Name = L"ErrorControl"; - QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[2].EntryContext = &Service->ErrorControl; - - QueryTable[3].Name = L"Group"; - QueryTable[3].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[3].EntryContext = &Service->ServiceGroup; - - QueryTable[4].Name = L"ImagePath"; - QueryTable[4].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[4].EntryContext = &Service->ImagePath; - - QueryTable[5].Name = L"Tag"; - QueryTable[5].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[5].EntryContext = &Service->Tag; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, - ServiceName->Buffer, - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status) || Service->Start > 1) - { - /* - * If something goes wrong during RtlQueryRegistryValues - * it'll just drop everything on the floor and return, - * so you have to check if the buffers were filled. - * Luckily we zerofilled the Service. - */ - if (Service->ServiceGroup.Buffer) - { - ExFreePool(Service->ServiceGroup.Buffer); - } - if (Service->ImagePath.Buffer) - { - ExFreePool(Service->ImagePath.Buffer); - } - ExFreePool(Service); - return(Status); - } - - /* Copy service name */ - Service->ServiceName.Length = ServiceName->Length; - Service->ServiceName.MaximumLength = ServiceName->Length + sizeof(WCHAR); - Service->ServiceName.Buffer = ExAllocatePool(NonPagedPool, - Service->ServiceName.MaximumLength); - RtlCopyMemory(Service->ServiceName.Buffer, - ServiceName->Buffer, - ServiceName->Length); - Service->ServiceName.Buffer[ServiceName->Length / sizeof(WCHAR)] = 0; - - /* Build registry path */ - Service->RegistryPath.MaximumLength = MAX_PATH * sizeof(WCHAR); - Service->RegistryPath.Buffer = ExAllocatePool(NonPagedPool, - MAX_PATH * sizeof(WCHAR)); - wcscpy(Service->RegistryPath.Buffer, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); - wcscat(Service->RegistryPath.Buffer, - Service->ServiceName.Buffer); - Service->RegistryPath.Length = wcslen(Service->RegistryPath.Buffer) * sizeof(WCHAR); - - DPRINT("ServiceName: '%wZ'\n", &Service->ServiceName); - DPRINT("RegistryPath: '%wZ'\n", &Service->RegistryPath); - DPRINT("ServiceGroup: '%wZ'\n", &Service->ServiceGroup); - DPRINT("ImagePath: '%wZ'\n", &Service->ImagePath); - DPRINT("Start %lx Type %lx Tag %lx ErrorControl %lx\n", - Service->Start, Service->Type, Service->Tag, Service->ErrorControl); - - /* Append service entry */ - InsertTailList(&ServiceListHead, - &Service->ServiceListEntry); - - return(STATUS_SUCCESS); -} - - -NTSTATUS INIT_FUNCTION -IoCreateDriverList(VOID) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - PKEY_BASIC_INFORMATION KeyInfo = NULL; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ServicesKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); - UNICODE_STRING SubKeyName; - HANDLE KeyHandle; - NTSTATUS Status; - ULONG Index; - - ULONG KeyInfoLength = 0; - ULONG ReturnedLength; - - DPRINT("IoCreateDriverList() called\n"); - - /* Initialize basic variables */ - InitializeListHead(&GroupListHead); - InitializeListHead(&ServiceListHead); - - /* Build group order list */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"List"; - QueryTable[0].QueryRoutine = IopCreateGroupListEntry; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"ServiceGroupOrder", - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - return(Status); - - /* Enumerate services and create the service list */ - InitializeObjectAttributes(&ObjectAttributes, - &ServicesKeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenKey(&KeyHandle, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - KeyInfoLength = sizeof(KEY_BASIC_INFORMATION) + MAX_PATH * sizeof(WCHAR); - KeyInfo = ExAllocatePool(NonPagedPool, KeyInfoLength); - if (KeyInfo == NULL) - { - ZwClose(KeyHandle); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Index = 0; - while (TRUE) - { - Status = ZwEnumerateKey(KeyHandle, - Index, - KeyBasicInformation, - KeyInfo, - KeyInfoLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - if (KeyInfo->NameLength < MAX_PATH * sizeof(WCHAR)) - { - - SubKeyName.Length = KeyInfo->NameLength; - SubKeyName.MaximumLength = KeyInfo->NameLength + sizeof(WCHAR); - SubKeyName.Buffer = KeyInfo->Name; - SubKeyName.Buffer[SubKeyName.Length / sizeof(WCHAR)] = 0; - - DPRINT("KeyName: '%wZ'\n", &SubKeyName); - IopCreateServiceListEntry(&SubKeyName); - } - } - - if (!NT_SUCCESS(Status)) - break; - - Index++; - } - - ExFreePool(KeyInfo); - ZwClose(KeyHandle); - - DPRINT("IoCreateDriverList() done\n"); - - return(STATUS_SUCCESS); -} - -NTSTATUS INIT_FUNCTION -IoDestroyDriverList(VOID) -{ - PSERVICE_GROUP CurrentGroup, tmp1; - PSERVICE CurrentService, tmp2; - - DPRINT("IoDestroyDriverList() called\n"); - - /* Destroy group list */ - LIST_FOR_EACH_SAFE(CurrentGroup, tmp1, &GroupListHead, SERVICE_GROUP, GroupListEntry) - { - ExFreePool(CurrentGroup->GroupName.Buffer); - RemoveEntryList(&CurrentGroup->GroupListEntry); - if (CurrentGroup->TagArray) - { - ExFreePool(CurrentGroup->TagArray); - } - ExFreePool(CurrentGroup); - } - - /* Destroy service list */ - LIST_FOR_EACH_SAFE(CurrentService, tmp2, &ServiceListHead, SERVICE, ServiceListEntry) - { - ExFreePool(CurrentService->ServiceName.Buffer); - ExFreePool(CurrentService->RegistryPath.Buffer); - ExFreePool(CurrentService->ServiceGroup.Buffer); - ExFreePool(CurrentService->ImagePath.Buffer); - RemoveEntryList(&CurrentService->ServiceListEntry); - ExFreePool(CurrentService); - } - - DPRINT("IoDestroyDriverList() done\n"); - - return(STATUS_SUCCESS); } static VOID INIT_FUNCTION @@ -1378,115 +994,6 @@ } } -static INIT_FUNCTION NTSTATUS -IopLoadDriver(PSERVICE Service) -{ - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - IopDisplayLoadingMessage(Service->ServiceName.Buffer, TRUE); - Status = ZwLoadDriver(&Service->RegistryPath); - IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT("IopLoadDriver() failed (Status %lx)\n", Status); -#if 0 - if (Service->ErrorControl == 1) - { - /* Log error */ - } - else if (Service->ErrorControl == 2) - { - if (IsLastKnownGood == FALSE) - { - /* Boot last known good configuration */ - } - } - else if (Service->ErrorControl == 3) - { - if (IsLastKnownGood == FALSE) - { - /* Boot last known good configuration */ - } - else - { - /* BSOD! */ - } - } -#endif - } - return Status; -} - - -/* - * IopInitializeSystemDrivers - * - * Load drivers marked as system start. - * - * Parameters - * None - * - * Return Value - * None - */ - -VOID FASTCALL -IopInitializeSystemDrivers(VOID) -{ - PSERVICE_GROUP CurrentGroup; - PSERVICE CurrentService; - NTSTATUS Status; - ULONG i; - - DPRINT("IopInitializeSystemDrivers()\n"); - - LIST_FOR_EACH(CurrentGroup, &GroupListHead, SERVICE_GROUP, GroupListEntry) - { - DPRINT("Group: %wZ\n", &CurrentGroup->GroupName); - - /* Load all drivers with a valid tag */ - for (i = 0; i < CurrentGroup->TagCount; i++) - { - LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) - { - if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, - &CurrentService->ServiceGroup, TRUE) == 0) && - (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/) && - (CurrentService->Tag == CurrentGroup->TagArray[i])) - { - DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); - Status = IopLoadDriver(CurrentService); - } - } - } - - /* Load all drivers without a tag or with an invalid tag */ - LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) - { - if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, - &CurrentService->ServiceGroup, TRUE) == 0) && - (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/)) - { - for (i = 0; i < CurrentGroup->TagCount; i++) - { - if (CurrentGroup->TagArray[i] == CurrentService->Tag) - { - break; - } - } - if (i >= CurrentGroup->TagCount) - { - DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); - Status = IopLoadDriver(CurrentService); - } - } - } - - } - - DPRINT("IopInitializeSystemDrivers() done\n"); -} - /* * IopUnloadDriver * Added: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c (added) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c Sun Jul 9 06:34:32 2006 @@ -1,0 +1,494 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/iomgr/drvrlist.c + * PURPOSE: Driver List support for Grouping, Tagging, Sorting, etc. + * PROGRAMMERS: <UNKNOWN> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +typedef struct _SERVICE_GROUP +{ + LIST_ENTRY GroupListEntry; + UNICODE_STRING GroupName; + BOOLEAN ServicesRunning; + ULONG TagCount; + PULONG TagArray; +} SERVICE_GROUP, *PSERVICE_GROUP; + +typedef struct _SERVICE +{ + LIST_ENTRY ServiceListEntry; + UNICODE_STRING ServiceName; + UNICODE_STRING RegistryPath; + UNICODE_STRING ServiceGroup; + UNICODE_STRING ImagePath; + + ULONG Start; + ULONG Type; + ULONG ErrorControl; + ULONG Tag; + +/* BOOLEAN ServiceRunning;*/ // needed ?? +} SERVICE, *PSERVICE; + +/* GLOBALS ********************************************************************/ + +LIST_ENTRY GroupListHead = {NULL, NULL}; +LIST_ENTRY ServiceListHead = {NULL, NULL}; +extern BOOLEAN SetupMode; +extern BOOLEAN NoGuiBoot; + +VOID +FASTCALL +INIT_FUNCTION +IopDisplayLoadingMessage(PVOID ServiceName, + BOOLEAN Unicode); + +/* PRIVATE FUNCTIONS **********************************************************/ + +static NTSTATUS STDCALL +IopGetGroupOrderList(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PSERVICE_GROUP Group; + + DPRINT("IopGetGroupOrderList(%S, %x, 0x%p, %x, 0x%p, 0x%p)\n", + ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); + + if (ValueType == REG_BINARY && + ValueData != NULL && + ValueLength >= sizeof(DWORD) && + ValueLength >= (*(PULONG)ValueData + 1) * sizeof(DWORD)) + { + Group = (PSERVICE_GROUP)Context; + Group->TagCount = ((PULONG)ValueData)[0]; + if (Group->TagCount > 0) + { + if (ValueLength >= (Group->TagCount + 1) * sizeof(DWORD)) + { + Group->TagArray = ExAllocatePool(NonPagedPool, Group->TagCount * sizeof(DWORD)); + if (Group->TagArray == NULL) + { + Group->TagCount = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + memcpy(Group->TagArray, (PULONG)ValueData + 1, Group->TagCount * sizeof(DWORD)); + } + else + { + Group->TagCount = 0; + return STATUS_UNSUCCESSFUL; + } + } + } + return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL +IopCreateGroupListEntry(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PSERVICE_GROUP Group; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + + if (ValueType == REG_SZ) + { + DPRINT("GroupName: '%S'\n", (PWCHAR)ValueData); + + Group = ExAllocatePool(NonPagedPool, + sizeof(SERVICE_GROUP)); + if (Group == NULL) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + RtlZeroMemory(Group, sizeof(SERVICE_GROUP)); + + if (!RtlCreateUnicodeString(&Group->GroupName, (PWSTR)ValueData)) + { + ExFreePool(Group); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + RtlZeroMemory(&QueryTable, sizeof(QueryTable)); + QueryTable[0].Name = (PWSTR)ValueData; + QueryTable[0].QueryRoutine = IopGetGroupOrderList; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"GroupOrderList", + QueryTable, + (PVOID)Group, + NULL); + DPRINT("%x %d %S\n", Status, Group->TagCount, (PWSTR)ValueData); + + InsertTailList(&GroupListHead, + &Group->GroupListEntry); + } + + return(STATUS_SUCCESS); +} + + +static NTSTATUS STDCALL +IopCreateServiceListEntry(PUNICODE_STRING ServiceName) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[7]; + PSERVICE Service; + NTSTATUS Status; + + DPRINT("ServiceName: '%wZ'\n", ServiceName); + + /* Allocate service entry */ + Service = (PSERVICE)ExAllocatePool(NonPagedPool, sizeof(SERVICE)); + if (Service == NULL) + { + DPRINT1("ExAllocatePool() failed\n"); + return(STATUS_INSUFFICIENT_RESOURCES); + } + RtlZeroMemory(Service, sizeof(SERVICE)); + + /* Get service data */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L"Start"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &Service->Start; + + QueryTable[1].Name = L"Type"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[1].EntryContext = &Service->Type; + + QueryTable[2].Name = L"ErrorControl"; + QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[2].EntryContext = &Service->ErrorControl; + + QueryTable[3].Name = L"Group"; + QueryTable[3].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[3].EntryContext = &Service->ServiceGroup; + + QueryTable[4].Name = L"ImagePath"; + QueryTable[4].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[4].EntryContext = &Service->ImagePath; + + QueryTable[5].Name = L"Tag"; + QueryTable[5].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[5].EntryContext = &Service->Tag; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, + ServiceName->Buffer, + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status) || Service->Start > 1) + { + /* + * If something goes wrong during RtlQueryRegistryValues + * it'll just drop everything on the floor and return, + * so you have to check if the buffers were filled. + * Luckily we zerofilled the Service. + */ + if (Service->ServiceGroup.Buffer) + { + ExFreePool(Service->ServiceGroup.Buffer); + } + if (Service->ImagePath.Buffer) + { + ExFreePool(Service->ImagePath.Buffer); + } + ExFreePool(Service); + return(Status); + } + + /* Copy service name */ + Service->ServiceName.Length = ServiceName->Length; + Service->ServiceName.MaximumLength = ServiceName->Length + sizeof(WCHAR); + Service->ServiceName.Buffer = ExAllocatePool(NonPagedPool, + Service->ServiceName.MaximumLength); + RtlCopyMemory(Service->ServiceName.Buffer, + ServiceName->Buffer, + ServiceName->Length); + Service->ServiceName.Buffer[ServiceName->Length / sizeof(WCHAR)] = 0; + + /* Build registry path */ + Service->RegistryPath.MaximumLength = MAX_PATH * sizeof(WCHAR); + Service->RegistryPath.Buffer = ExAllocatePool(NonPagedPool, + MAX_PATH * sizeof(WCHAR)); + wcscpy(Service->RegistryPath.Buffer, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); + wcscat(Service->RegistryPath.Buffer, + Service->ServiceName.Buffer); + Service->RegistryPath.Length = wcslen(Service->RegistryPath.Buffer) * sizeof(WCHAR); + + DPRINT("ServiceName: '%wZ'\n", &Service->ServiceName); + DPRINT("RegistryPath: '%wZ'\n", &Service->RegistryPath); + DPRINT("ServiceGroup: '%wZ'\n", &Service->ServiceGroup); + DPRINT("ImagePath: '%wZ'\n", &Service->ImagePath); + DPRINT("Start %lx Type %lx Tag %lx ErrorControl %lx\n", + Service->Start, Service->Type, Service->Tag, Service->ErrorControl); + + /* Append service entry */ + InsertTailList(&ServiceListHead, + &Service->ServiceListEntry); + + return(STATUS_SUCCESS); +} + + +NTSTATUS INIT_FUNCTION +IoCreateDriverList(VOID) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + PKEY_BASIC_INFORMATION KeyInfo = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ServicesKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); + UNICODE_STRING SubKeyName; + HANDLE KeyHandle; + NTSTATUS Status; + ULONG Index; + + ULONG KeyInfoLength = 0; + ULONG ReturnedLength; + + DPRINT("IoCreateDriverList() called\n"); + + /* Initialize basic variables */ + InitializeListHead(&GroupListHead); + InitializeListHead(&ServiceListHead); + + /* Build group order list */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L"List"; + QueryTable[0].QueryRoutine = IopCreateGroupListEntry; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"ServiceGroupOrder", + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + return(Status); + + /* Enumerate services and create the service list */ + InitializeObjectAttributes(&ObjectAttributes, + &ServicesKeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwOpenKey(&KeyHandle, + KEY_ENUMERATE_SUB_KEYS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + KeyInfoLength = sizeof(KEY_BASIC_INFORMATION) + MAX_PATH * sizeof(WCHAR); + KeyInfo = ExAllocatePool(NonPagedPool, KeyInfoLength); + if (KeyInfo == NULL) + { + ZwClose(KeyHandle); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + Index = 0; + while (TRUE) + { + Status = ZwEnumerateKey(KeyHandle, + Index, + KeyBasicInformation, + KeyInfo, + KeyInfoLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + if (KeyInfo->NameLength < MAX_PATH * sizeof(WCHAR)) + { + + SubKeyName.Length = KeyInfo->NameLength; + SubKeyName.MaximumLength = KeyInfo->NameLength + sizeof(WCHAR); + SubKeyName.Buffer = KeyInfo->Name; + SubKeyName.Buffer[SubKeyName.Length / sizeof(WCHAR)] = 0; + + DPRINT("KeyName: '%wZ'\n", &SubKeyName); + IopCreateServiceListEntry(&SubKeyName); + } + } + + if (!NT_SUCCESS(Status)) + break; + + Index++; + } + + ExFreePool(KeyInfo); + ZwClose(KeyHandle); + + DPRINT("IoCreateDriverList() done\n"); + + return(STATUS_SUCCESS); +} + +NTSTATUS INIT_FUNCTION +IoDestroyDriverList(VOID) +{ + PSERVICE_GROUP CurrentGroup, tmp1; + PSERVICE CurrentService, tmp2; + + DPRINT("IoDestroyDriverList() called\n"); + + /* Destroy group list */ + LIST_FOR_EACH_SAFE(CurrentGroup, tmp1, &GroupListHead, SERVICE_GROUP, GroupListEntry) + { + ExFreePool(CurrentGroup->GroupName.Buffer); + RemoveEntryList(&CurrentGroup->GroupListEntry); + if (CurrentGroup->TagArray) + { + ExFreePool(CurrentGroup->TagArray); + } + ExFreePool(CurrentGroup); + } + + /* Destroy service list */ + LIST_FOR_EACH_SAFE(CurrentService, tmp2, &ServiceListHead, SERVICE, ServiceListEntry) + { + ExFreePool(CurrentService->ServiceName.Buffer); + ExFreePool(CurrentService->RegistryPath.Buffer); + ExFreePool(CurrentService->ServiceGroup.Buffer); + ExFreePool(CurrentService->ImagePath.Buffer); + RemoveEntryList(&CurrentService->ServiceListEntry); + ExFreePool(CurrentService); + } + + DPRINT("IoDestroyDriverList() done\n"); + + return(STATUS_SUCCESS); +} + +static INIT_FUNCTION NTSTATUS +IopLoadDriver(PSERVICE Service) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + IopDisplayLoadingMessage(Service->ServiceName.Buffer, TRUE); + Status = ZwLoadDriver(&Service->RegistryPath); + IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT("IopLoadDriver() failed (Status %lx)\n", Status); +#if 0 + if (Service->ErrorControl == 1) + { + /* Log error */ + } + else if (Service->ErrorControl == 2) + { + if (IsLastKnownGood == FALSE) + { + /* Boot last known good configuration */ + } + } + else if (Service->ErrorControl == 3) + { + if (IsLastKnownGood == FALSE) + { + /* Boot last known good configuration */ + } + else + { + /* BSOD! */ + } + } +#endif + } + return Status; +} + +/* + * IopInitializeSystemDrivers + * + * Load drivers marked as system start. + * + * Parameters + * None + * + * Return Value + * None + */ + +VOID FASTCALL +IopInitializeSystemDrivers(VOID) +{ + PSERVICE_GROUP CurrentGroup; + PSERVICE CurrentService; + NTSTATUS Status; + ULONG i; + + DPRINT("IopInitializeSystemDrivers()\n"); + + LIST_FOR_EACH(CurrentGroup, &GroupListHead, SERVICE_GROUP, GroupListEntry) + { + DPRINT("Group: %wZ\n", &CurrentGroup->GroupName); + + /* Load all drivers with a valid tag */ + for (i = 0; i < CurrentGroup->TagCount; i++) + { + LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) + { + if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, + &CurrentService->ServiceGroup, TRUE) == 0) && + (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/) && + (CurrentService->Tag == CurrentGroup->TagArray[i])) + { + DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); + Status = IopLoadDriver(CurrentService); + } + } + } + + /* Load all drivers without a tag or with an invalid tag */ + LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) + { + if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, + &CurrentService->ServiceGroup, TRUE) == 0) && + (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/)) + { + for (i = 0; i < CurrentGroup->TagCount; i++) + { + if (CurrentGroup->TagArray[i] == CurrentService->Tag) + { + break; + } + } + if (i >= CurrentGroup->TagCount) + { + DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); + Status = IopLoadDriver(CurrentService); + } + } + } + + } + + DPRINT("IopInitializeSystemDrivers() done\n"); +} +/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Jul 9 06:34:32 2006 @@ -172,6 +172,7 @@ <file>deviface.c</file> <file>disk.c</file> <file>driver.c</file> + <file>drvrlist.c</file> <file>error.c</file> <file>event.c</file> <file>file.c</file>

1 0

[ion] 22967: - Simplify IopReinitializeBootDrivers and IopReinitializeDrivers. - For some strange reason, boot drivers were re-initailized *after* system drivers.
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 06:21:13 2006 New Revision: 22967 URL: http://svn.reactos.org/svn/reactos?rev=22967&view=rev Log: - Simplify IopReinitializeBootDrivers and IopReinitializeDrivers. - For some strange reason, boot drivers were re-initailized *after* system drivers. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jul 9 06:21:13 2006 @@ -862,19 +862,13 @@ ); VOID -FASTCALL -IopMarkLastReinitializeDriver( - VOID -); - -VOID -FASTCALL +NTAPI IopReinitializeDrivers( VOID ); VOID -FASTCALL +NTAPI IopReinitializeBootDrivers( VOID ); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jul 9 06:21:13 2006 @@ -660,8 +660,6 @@ DPRINT("RegistryKey: %wZ\n", &RegistryKey); DPRINT("Calling driver entrypoint at %08lx\n", DriverEntry); - - IopMarkLastReinitializeDriver(); Status = DriverEntry(*DriverObject, &RegistryKey); @@ -1630,113 +1628,76 @@ return STATUS_SUCCESS; } -VOID FASTCALL -IopMarkLastReinitializeDriver(VOID) -{ - KIRQL Irql; - - KeAcquireSpinLock(&DriverReinitListLock, - &Irql); - - if (IsListEmpty(&DriverReinitListHead)) - { - DriverReinitTailEntry = NULL; - } - else - { - DriverReinitTailEntry = DriverReinitListHead.Blink; - } - - KeReleaseSpinLock(&DriverReinitListLock, - Irql); -} - - -VOID FASTCALL +VOID +NTAPI IopReinitializeDrivers(VOID) { - PDRIVER_REINIT_ITEM ReinitItem; - PLIST_ENTRY Entry; - KIRQL Irql; - - KeAcquireSpinLock(&DriverReinitListLock, - &Irql); - - Entry = DriverReinitTailEntry; - - KeReleaseSpinLock(&DriverReinitListLock, - Irql); - - if (Entry == NULL) - { - return; - } - - for (;;) - { + PDRIVER_REINIT_ITEM ReinitItem; + PLIST_ENTRY Entry; + + /* Get the first entry and start looping */ Entry = ExInterlockedRemoveHeadList(&DriverReinitListHead, - &DriverReinitListLock); - if (Entry == NULL) - return; - - ReinitItem = (PDRIVER_REINIT_ITEM)CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); - - /* Increment reinitialization counter */ - ReinitItem->DriverObject->DriverExtension->Count++; - - ReinitItem->ReinitRoutine(ReinitItem->DriverObject, - ReinitItem->Context, - ReinitItem->DriverObject->DriverExtension->Count); - - ExFreePool(Entry); - - if (Entry == DriverReinitTailEntry) - return; - } -} - -VOID FASTCALL + &DriverReinitListLock); + while (Entry) + { + /* Get the item*/ + ReinitItem = CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); + + /* Increment reinitialization counter */ + ReinitItem->DriverObject->DriverExtension->Count++; + + /* Remove the device object flag */ + ReinitItem->DriverObject->Flags &= ~DRVO_REINIT_REGISTERED; + + /* Call the routine */ + ReinitItem->ReinitRoutine(ReinitItem->DriverObject, + ReinitItem->Context, + ReinitItem->DriverObject-> + DriverExtension->Count); + + /* Free the entry */ + ExFreePool(Entry); + + /* Move to the next one */ + Entry = ExInterlockedRemoveHeadList(&DriverReinitListHead, + &DriverReinitListLock); + } +} + +VOID +NTAPI IopReinitializeBootDrivers(VOID) { - PDRIVER_REINIT_ITEM ReinitItem; - PLIST_ENTRY Entry; - KIRQL Irql; - - KeAcquireSpinLock(&DriverBootReinitListLock, - &Irql); - - DriverBootReinitTailEntry = IsListEmpty(&DriverBootReinitListHead) ? NULL : DriverBootReinitListHead.Blink; - Entry = DriverBootReinitTailEntry; - - KeReleaseSpinLock(&DriverBootReinitListLock, - Irql); - - if (Entry == NULL) - { - return; - } - - for (;;) - { + PDRIVER_REINIT_ITEM ReinitItem; + PLIST_ENTRY Entry; + + /* Get the first entry and start looping */ Entry = ExInterlockedRemoveHeadList(&DriverBootReinitListHead, - &DriverBootReinitListLock); - if (Entry == NULL) - return; - - ReinitItem = (PDRIVER_REINIT_ITEM)CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); - - /* Increment reinitialization counter */ - ReinitItem->DriverObject->DriverExtension->Count++; - - ReinitItem->ReinitRoutine(ReinitItem->DriverObject, - ReinitItem->Context, - ReinitItem->DriverObject->DriverExtension->Count); - - ExFreePool(Entry); - - if (Entry == DriverBootReinitTailEntry) - return; - } + &DriverBootReinitListLock); + while (Entry) + { + /* Get the item*/ + ReinitItem = CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); + + /* Increment reinitialization counter */ + ReinitItem->DriverObject->DriverExtension->Count++; + + /* Remove the device object flag */ + ReinitItem->DriverObject->Flags &= ~DRVO_BOOTREINIT_REGISTERED; + + /* Call the routine */ + ReinitItem->ReinitRoutine(ReinitItem->DriverObject, + ReinitItem->Context, + ReinitItem->DriverObject-> + DriverExtension->Count); + + /* Free the entry */ + ExFreePool(Entry); + + /* Move to the next one */ + Entry = ExInterlockedRemoveHeadList(&DriverBootReinitListHead, + &DriverBootReinitListLock); + } } /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Sun Jul 9 06:21:13 2006 @@ -457,6 +457,9 @@ /* Load boot start drivers */ IopInitializeBootDrivers(); + + /* Call back drivers that asked for */ + IopReinitializeBootDrivers(); } VOID @@ -490,8 +493,8 @@ IopInitializeSystemDrivers(); IoDestroyDriverList(); - /* Call back drivers that asked for */ - IopReinitializeBootDrivers(); + /* Reinitialize drivers that requested it */ + IopReinitializeDrivers(); /* Stop boot logging */ IopStopBootLog();

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006