From d5dbbd12113c287798494f123f640b7619e794ef Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sun, 9 Jul 2006 16:25:25 +0000 Subject: [PATCH] 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. svn path=/trunk/; revision=22973 --- reactos/dll/cpl/access/access.c | 6 +- reactos/dll/cpl/access/access.def | 2 +- reactos/dll/cpl/access/display.c | 4 +- reactos/dll/cpl/access/general.c | 2 - reactos/dll/cpl/access/keyboard.c | 4 +- reactos/dll/cpl/access/mouse.c | 4 +- reactos/dll/cpl/access/sound.c | 4 +- reactos/dll/cpl/appwiz/appwiz.c | 18 +- reactos/dll/cpl/appwiz/appwiz.def | 2 +- reactos/dll/cpl/cplsample/cplsample.def | 2 +- reactos/dll/cpl/desk/appearance.c | 6 +- reactos/dll/cpl/desk/background.c | 4 +- reactos/dll/cpl/desk/desk.c | 9 +- reactos/dll/cpl/desk/desk.def | 4 +- reactos/dll/cpl/desk/settings.c | 10 +- reactos/dll/cpl/hdwwiz/hdwwiz.c | 8 +- reactos/dll/cpl/hdwwiz/hdwwiz.def | 2 +- reactos/dll/cpl/intl/intl.def | 4 +- reactos/dll/cpl/intl_new/En.rc | 26 +-- reactos/dll/cpl/intl_new/extra.c | 5 +- reactos/dll/cpl/intl_new/intl.c | 6 - reactos/dll/cpl/intl_new/intl.def | 6 +- reactos/dll/cpl/intl_new/locale.c | 24 +- reactos/dll/cpl/liccpa/liccpa.def | 2 +- reactos/dll/cpl/main/keyboard.c | 11 - reactos/dll/cpl/main/main.c | 2 - reactos/dll/cpl/main/main.def | 2 +- reactos/dll/cpl/main/mouse.c | 17 +- reactos/dll/cpl/mmsys/mmsys.c | 15 +- reactos/dll/cpl/mmsys/mmsys.def | 2 +- reactos/dll/cpl/ncpa/ncpa.c | 16 +- reactos/dll/cpl/ncpa/ncpa.def | 2 +- reactos/dll/cpl/powercfg/alarms.c | 4 +- reactos/dll/cpl/powercfg/powercfg.c | 12 +- reactos/dll/cpl/powercfg/powercfg.def | 2 +- reactos/dll/cpl/powercfg/powershemes.c | 8 +- reactos/dll/cpl/sysdm/advanced.c | 2 +- reactos/dll/cpl/sysdm/computer.c | 6 +- reactos/dll/cpl/sysdm/general.c | 4 +- reactos/dll/cpl/sysdm/hardware.c | 2 +- reactos/dll/cpl/sysdm/sysdm.c | 6 +- reactos/dll/cpl/sysdm/sysdm.def | 2 +- reactos/dll/cpl/sysdm/userprofile.c | 5 +- reactos/dll/cpl/sysdm/virtmem.c | 2 +- reactos/dll/cpl/timedate/timedate.def | 2 +- reactos/dll/keyboard/kbdbe/kbdbe.def | 2 +- reactos/dll/keyboard/kbdda/kbdda.def | 2 +- reactos/dll/keyboard/kbddv/kbddv.def | 2 +- reactos/dll/keyboard/kbdes/kbdes.def | 7 +- reactos/dll/keyboard/kbdfr/kbdfr.def | 2 +- reactos/dll/keyboard/kbdgr/kbdgr.def | 2 +- reactos/dll/keyboard/kbdhe/kbdhe.def | 2 +- reactos/dll/keyboard/kbdheb/kbdheb.def | 2 +- reactos/dll/keyboard/kbdhu/kbdhu.def | 2 +- reactos/dll/keyboard/kbdpo/kbdpo.def | 2 +- reactos/dll/keyboard/kbdru/kbdru.def | 2 +- reactos/dll/keyboard/kbdse/kbdse.def | 2 +- reactos/dll/keyboard/kbdsg/kbdsg.def | 2 +- reactos/dll/keyboard/kbdsk/kbdsk.def | 2 +- reactos/dll/keyboard/kbduk/kbduk.def | 2 +- reactos/dll/keyboard/kbdur/kbdur.def | 2 +- reactos/dll/keyboard/kbdus/kbdus.def | 2 +- reactos/dll/ntdll/ntdll.rbuild | 1 + reactos/dll/win32/cards/cards.def | 12 +- reactos/dll/win32/cfgmgr32/cfgmgr32.def | 220 +++++++++--------- reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild | 1 - reactos/dll/win32/kernel32/kernel32.rbuild | 1 + reactos/dll/win32/msvcrt/msvcrt.rbuild | 2 + reactos/dll/win32/shlwapi/shlwapi.rbuild | 1 + reactos/ntoskrnl/ntoskrnl.rbuild | 1 + reactos/tools/rbuild/backend/mingw/mingw.cpp | 4 +- .../rbuild/backend/mingw/modulehandler.cpp | 11 +- .../rbuild/backend/mingw/modulehandler.h | 4 +- .../tools/rbuild/backend/msvc/vcprojmaker.cpp | 8 +- reactos/tools/rbuild/module.cpp | 2 +- 75 files changed, 267 insertions(+), 328 deletions(-) diff --git a/reactos/dll/cpl/access/access.c b/reactos/dll/cpl/access/access.c index aebad19a8c5..689ac45b996 100644 --- a/reactos/dll/cpl/access/access.c +++ b/reactos/dll/cpl/access/access.c @@ -52,7 +52,7 @@ PropSheetProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -118,7 +118,7 @@ CPlApplet( LPARAM lParam2) { int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl); + UNREFERENCED_PARAMETER(hwndCPl) switch(uMsg) { @@ -155,7 +155,7 @@ DllMain( DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/access/access.def b/reactos/dll/cpl/access/access.def index 9b83348987b..1ed84314984 100644 --- a/reactos/dll/cpl/access/access.def +++ b/reactos/dll/cpl/access/access.def @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/access/display.c b/reactos/dll/cpl/access/display.c index 99cd40914aa..9708b04b171 100644 --- a/reactos/dll/cpl/access/display.c +++ b/reactos/dll/cpl/access/display.c @@ -22,8 +22,8 @@ DisplayPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/access/general.c b/reactos/dll/cpl/access/general.c index bdc9cb9d1d7..6ed4596e291 100644 --- a/reactos/dll/cpl/access/general.c +++ b/reactos/dll/cpl/access/general.c @@ -22,8 +22,6 @@ GeneralPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/access/keyboard.c b/reactos/dll/cpl/access/keyboard.c index c43a5d6d1a2..5e6c505ab77 100644 --- a/reactos/dll/cpl/access/keyboard.c +++ b/reactos/dll/cpl/access/keyboard.c @@ -22,8 +22,8 @@ KeyboardPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/access/mouse.c b/reactos/dll/cpl/access/mouse.c index 769257ac933..61a4e6ad715 100644 --- a/reactos/dll/cpl/access/mouse.c +++ b/reactos/dll/cpl/access/mouse.c @@ -22,8 +22,8 @@ MousePageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/access/sound.c b/reactos/dll/cpl/access/sound.c index dad0dfcc87d..34d50ca4646 100644 --- a/reactos/dll/cpl/access/sound.c +++ b/reactos/dll/cpl/access/sound.c @@ -22,8 +22,8 @@ SoundPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/appwiz/appwiz.c b/reactos/dll/cpl/appwiz/appwiz.c index 7d59d08173f..4fda4894b91 100644 --- a/reactos/dll/cpl/appwiz/appwiz.c +++ b/reactos/dll/cpl/appwiz/appwiz.c @@ -64,7 +64,7 @@ CallUninstall(HWND hwndDlg) 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 @@ static void FillSoftwareList(HWND hwndDlg) { 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 void FillSoftwareList(HWND hwndDlg) 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 @@ InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) 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 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) CPLINFO *CPlInfo; DWORD i; - UNREFERENCED_PARAMETER(hwndCPl); + UNREFERENCED_PARAMETER(hwndCPl) i = (DWORD)lParam1; switch(uMsg) @@ -328,7 +328,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/appwiz/appwiz.def b/reactos/dll/cpl/appwiz/appwiz.def index 0f56c708737..ff06b35280a 100644 --- a/reactos/dll/cpl/appwiz/appwiz.def +++ b/reactos/dll/cpl/appwiz/appwiz.def @@ -1,6 +1,6 @@ LIBRARY appwiz.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/cplsample/cplsample.def b/reactos/dll/cpl/cplsample/cplsample.def index 9b83348987b..1ed84314984 100644 --- a/reactos/dll/cpl/cplsample/cplsample.def +++ b/reactos/dll/cpl/cplsample/cplsample.def @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/desk/appearance.c b/reactos/dll/cpl/desk/appearance.c index 276a1c9f73f..3fda33dc132 100644 --- a/reactos/dll/cpl/desk/appearance.c +++ b/reactos/dll/cpl/desk/appearance.c @@ -15,9 +15,9 @@ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { diff --git a/reactos/dll/cpl/desk/background.c b/reactos/dll/cpl/desk/background.c index 6cfa90232f3..11cf35a708f 100644 --- a/reactos/dll/cpl/desk/background.c +++ b/reactos/dll/cpl/desk/background.c @@ -302,8 +302,8 @@ void OnColorButton() BOOL CheckListBoxFilename(HWND list, TCHAR *filename) { - UNREFERENCED_PARAMETER(filename); - UNREFERENCED_PARAMETER(list); + UNREFERENCED_PARAMETER(filename) + UNREFERENCED_PARAMETER(list) return FALSE; } diff --git a/reactos/dll/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c index b40c6612fa5..45f3b6c27d7 100644 --- a/reactos/dll/cpl/desk/desk.c +++ b/reactos/dll/cpl/desk/desk.c @@ -49,10 +49,10 @@ LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) 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 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/desk/desk.def b/reactos/dll/cpl/desk/desk.def index fdbb8869cfc..b060f7fb4b4 100644 --- a/reactos/dll/cpl/desk/desk.def +++ b/reactos/dll/cpl/desk/desk.def @@ -1,7 +1,7 @@ LIBRARY desk.cpl EXPORTS -CPlApplet -DisplayClassInstaller +CPlApplet@16 +DisplayClassInstaller@12 ; EOF diff --git a/reactos/dll/cpl/desk/settings.c b/reactos/dll/cpl/desk/settings.c index 44048d20002..8f1632a2f78 100644 --- a/reactos/dll/cpl/desk/settings.c +++ b/reactos/dll/cpl/desk/settings.c @@ -244,10 +244,10 @@ OnDisplayDeviceChanged(IN HWND hwndDlg, IN PDISPLAY_DEVICE_ENTRY pDeviceEntry) 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 @@ OnBPPChanged(IN HWND hwndDlg) 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 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar 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); } } diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.c b/reactos/dll/cpl/hdwwiz/hdwwiz.c index ea304dd7ec6..f8d0ee2320f 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.c +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.c @@ -53,9 +53,9 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) 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 @@ CPlApplet(HWND hwndCpl, BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.def b/reactos/dll/cpl/hdwwiz/hdwwiz.def index 90386378725..4b6a44b65b8 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.def +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.def @@ -1,6 +1,6 @@ LIBRARY hdwwiz.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/intl/intl.def b/reactos/dll/cpl/intl/intl.def index 7386407d5b9..d9e1b74fe14 100644 --- a/reactos/dll/cpl/intl/intl.def +++ b/reactos/dll/cpl/intl/intl.def @@ -1,7 +1,7 @@ LIBRARY intl.cpl EXPORTS -CPlApplet -LocalePageProc +CPlApplet@16 +LocalePageProc@16 ; EOF diff --git a/reactos/dll/cpl/intl_new/En.rc b/reactos/dll/cpl/intl_new/En.rc index 4191e4f1126..ead119f7fde 100644 --- a/reactos/dll/cpl/intl_new/En.rc +++ b/reactos/dll/cpl/intl_new/En.rc @@ -6,24 +6,24 @@ CAPTION "Regional options" 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 @@ BEGIN 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 diff --git a/reactos/dll/cpl/intl_new/extra.c b/reactos/dll/cpl/intl_new/extra.c index 73a6031fbb2..20dc3c888db 100644 --- a/reactos/dll/cpl/intl_new/extra.c +++ b/reactos/dll/cpl/intl_new/extra.c @@ -33,7 +33,7 @@ LanguagesEnumProc(LPTSTR lpLanguage) 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 @@ CreateLanguagesList(HWND hWnd) SendMessageW(hLanguageList, CB_SELECTSTRING, - (WPARAM) -1, + -1, (LPARAM)LangSel); } @@ -75,7 +75,6 @@ INT_PTR CALLBACK ExtraOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/intl_new/intl.c b/reactos/dll/cpl/intl_new/intl.c index 2f30236e48b..8ef0b3b6424 100644 --- a/reactos/dll/cpl/intl_new/intl.c +++ b/reactos/dll/cpl/intl_new/intl.c @@ -54,11 +54,6 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) 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)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); @@ -122,7 +117,6 @@ STDCALL DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { INITCOMMONCONTROLSEX InitControls; - UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/intl_new/intl.def b/reactos/dll/cpl/intl_new/intl.def index a8491e388ff..ca8e1e4e3fd 100644 --- a/reactos/dll/cpl/intl_new/intl.def +++ b/reactos/dll/cpl/intl_new/intl.def @@ -1,8 +1,8 @@ LIBRARY intl.cpl EXPORTS -CPlApplet -RegOptsProc -ExtraOptsProc +CPlApplet@16 +RegOptsProc@16 +ExtraOptsProc@16 ; EOF diff --git a/reactos/dll/cpl/intl_new/locale.c b/reactos/dll/cpl/intl_new/locale.c index bbbca257f05..b24d9c8a27c 100644 --- a/reactos/dll/cpl/intl_new/locale.c +++ b/reactos/dll/cpl/intl_new/locale.c @@ -34,7 +34,7 @@ LocationsEnumProc(GEOID gId) 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 @@ CreateLocationsList(HWND hWnd) SendMessageW(hGeoList, CB_SELECTSTRING, - (WPARAM) -1, + -1, (LPARAM)loc); } @@ -85,14 +85,14 @@ LocalesEnumProc(LPTSTR lpLocale) 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 @@ CreateLanguagesList(HWND hWnd) SendMessageW(hLocaleList, CB_SELECTSTRING, - (WPARAM) -1, + -1, (LPARAM)langSel); } @@ -208,7 +208,7 @@ SetNewLocale(LCID LcidLocale) } 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 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) 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 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) 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); diff --git a/reactos/dll/cpl/liccpa/liccpa.def b/reactos/dll/cpl/liccpa/liccpa.def index 207c1e493e9..06bb13fd129 100644 --- a/reactos/dll/cpl/liccpa/liccpa.def +++ b/reactos/dll/cpl/liccpa/liccpa.def @@ -1,6 +1,6 @@ LIBRARY liccpa.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/main/keyboard.c b/reactos/dll/cpl/main/keyboard.c index 4e87974d650..ac4ae5c8394 100644 --- a/reactos/dll/cpl/main/keyboard.c +++ b/reactos/dll/cpl/main/keyboard.c @@ -41,9 +41,6 @@ KeybSpeedProc(IN HWND hwndDlg, IN WPARAM wParam, IN LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: @@ -64,9 +61,6 @@ KeybHardwareProc(IN HWND hwndDlg, GUID Guids[1]; Guids[0] = GUID_DEVCLASS_KEYBOARD; - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch(uMsg) { case WM_INITDIALOG: @@ -93,11 +87,6 @@ KeyboardApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) 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)); diff --git a/reactos/dll/cpl/main/main.c b/reactos/dll/cpl/main/main.c index 3136b04591d..074cc0800ac 100644 --- a/reactos/dll/cpl/main/main.c +++ b/reactos/dll/cpl/main/main.c @@ -106,8 +106,6 @@ DllMain(HINSTANCE hinstDLL, LPVOID lpReserved) { INITCOMMONCONTROLSEX InitControls; - UNREFERENCED_PARAMETER(lpReserved); - switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/main/main.def b/reactos/dll/cpl/main/main.def index d02b28350e8..bcdd1dd2402 100644 --- a/reactos/dll/cpl/main/main.def +++ b/reactos/dll/cpl/main/main.def @@ -1,6 +1,6 @@ LIBRARY main.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c index 3fc0c71a453..de0de0c6ad1 100644 --- a/reactos/dll/cpl/main/mouse.c +++ b/reactos/dll/cpl/main/mouse.c @@ -106,9 +106,6 @@ MouseHardwareProc(IN HWND hwndDlg, GUID Guids[1]; Guids[0] = GUID_DEVCLASS_MOUSE; - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch(uMsg) { case WM_INITDIALOG: @@ -169,8 +166,6 @@ ClickLockProc(IN HWND hwndDlg, { HWND hDlgCtrl; int pos; - UNREFERENCED_PARAMETER(lParam); - switch(uMsg) { case WM_INITDIALOG: @@ -186,7 +181,7 @@ ClickLockProc(IN HWND hwndDlg, 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 @@ SaveSchemeProc(IN HWND hwndDlg, IN LPARAM lParam) { HWND hDlgCtrl; - UNREFERENCED_PARAMETER(lParam); switch(uMsg) { @@ -981,7 +975,7 @@ OptionProc(IN HWND hwndDlg, { 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 @@ OptionProc(IN HWND hwndDlg, else lResult = 0; - SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSETRAILS, lResult, 0, SPIF_SENDCHANGE); //FIXME //pointer precision @@ -1174,11 +1168,6 @@ MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2) 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)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); diff --git a/reactos/dll/cpl/mmsys/mmsys.c b/reactos/dll/cpl/mmsys/mmsys.c index 53d962b23d7..d9a5c5124f9 100644 --- a/reactos/dll/cpl/mmsys/mmsys.c +++ b/reactos/dll/cpl/mmsys/mmsys.c @@ -67,15 +67,14 @@ HardwareDlgProc(HWND hwndDlg, 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, @@ -99,11 +98,6 @@ MmSysApplet(HWND hwnd, PROPSHEETHEADER psh = {0}; TCHAR Caption[256]; - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); - UNREFERENCED_PARAMETER(hwnd); - LoadString(hApplet, IDS_CPLNAME, Caption, @@ -188,7 +182,6 @@ DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpReserved) { - UNREFERENCED_PARAMETER(lpReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/mmsys/mmsys.def b/reactos/dll/cpl/mmsys/mmsys.def index ee9fcff577d..3e5b9c95a49 100644 --- a/reactos/dll/cpl/mmsys/mmsys.def +++ b/reactos/dll/cpl/mmsys/mmsys.def @@ -1,6 +1,6 @@ LIBRARY mmsys.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c index 03a2de7b100..fc520ca3798 100644 --- a/reactos/dll/cpl/ncpa/ncpa.c +++ b/reactos/dll/cpl/ncpa/ncpa.c @@ -169,9 +169,6 @@ NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) TCHAR tpszNotifyObjectCLSID[MAX_PATH]; TCHAR *tpszSubKeyCopy; int nIndex; - - UNREFERENCED_PARAMETER(hBaseKey); - // CLSID CLSID_NotifObj; // IUnknown *pUnk = NULL; // INetCfgComponentControl *pNetCfg; @@ -227,7 +224,7 @@ NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) } 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 @@ NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) 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 @@ NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) // 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 @@ NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { 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 @@ DisplayApplet(VOID) LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - UNREFERENCED_PARAMETER(hwndCPl); switch (uMsg) { case CPL_INIT: @@ -718,8 +714,6 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/ncpa/ncpa.def b/reactos/dll/cpl/ncpa/ncpa.def index fa281311dba..e278ea10114 100644 --- a/reactos/dll/cpl/ncpa/ncpa.def +++ b/reactos/dll/cpl/ncpa/ncpa.def @@ -1,6 +1,6 @@ LIBRARY ncpa.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/powercfg/alarms.c b/reactos/dll/cpl/powercfg/alarms.c index 4c52b731e08..65eafd84c4c 100644 --- a/reactos/dll/cpl/powercfg/alarms.c +++ b/reactos/dll/cpl/powercfg/alarms.c @@ -31,8 +31,8 @@ alarmsProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/powercfg/powercfg.c b/reactos/dll/cpl/powercfg/powercfg.c index 8ac977c0268..fa82fe20804 100644 --- a/reactos/dll/cpl/powercfg/powercfg.c +++ b/reactos/dll/cpl/powercfg/powercfg.c @@ -55,7 +55,7 @@ PropSheetProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -90,10 +90,10 @@ Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) 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 @@ DllMain( DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/powercfg/powercfg.def b/reactos/dll/cpl/powercfg/powercfg.def index 37ff5c38c9d..5c8f7bf4520 100644 --- a/reactos/dll/cpl/powercfg/powercfg.def +++ b/reactos/dll/cpl/powercfg/powercfg.def @@ -1,6 +1,6 @@ LIBRARY powercfg.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/powercfg/powershemes.c b/reactos/dll/cpl/powercfg/powershemes.c index cf129c18d29..49a2bf4417a 100644 --- a/reactos/dll/cpl/powercfg/powershemes.c +++ b/reactos/dll/cpl/powercfg/powershemes.c @@ -225,10 +225,10 @@ BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName { 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)) { diff --git a/reactos/dll/cpl/sysdm/advanced.c b/reactos/dll/cpl/sysdm/advanced.c index 20806dbce12..7a4f026b479 100644 --- a/reactos/dll/cpl/sysdm/advanced.c +++ b/reactos/dll/cpl/sysdm/advanced.c @@ -40,7 +40,7 @@ AdvancedPageProc( WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/sysdm/computer.c b/reactos/dll/cpl/sysdm/computer.c index 220810a5333..a54cbb27530 100644 --- a/reactos/dll/cpl/sysdm/computer.c +++ b/reactos/dll/cpl/sysdm/computer.c @@ -40,11 +40,6 @@ ComputerPageProc( LPARAM lParam ) { - LPWKSTA_INFO_101 wki; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch(uMsg) { case WM_INITDIALOG: @@ -56,6 +51,7 @@ ComputerPageProc( { 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); diff --git a/reactos/dll/cpl/sysdm/general.c b/reactos/dll/cpl/sysdm/general.c index 686d0702a0a..c15382d4496 100644 --- a/reactos/dll/cpl/sysdm/general.c +++ b/reactos/dll/cpl/sysdm/general.c @@ -98,8 +98,8 @@ GeneralPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch(uMsg) { diff --git a/reactos/dll/cpl/sysdm/hardware.c b/reactos/dll/cpl/sysdm/hardware.c index 349afdc79c6..4a1eeeae5e3 100644 --- a/reactos/dll/cpl/sysdm/hardware.c +++ b/reactos/dll/cpl/sysdm/hardware.c @@ -63,7 +63,7 @@ HardwarePageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(lParam) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/sysdm/sysdm.c b/reactos/dll/cpl/sysdm/sysdm.c index f17b02fd585..b156cc3e6d4 100644 --- a/reactos/dll/cpl/sysdm/sysdm.c +++ b/reactos/dll/cpl/sysdm/sysdm.c @@ -64,7 +64,7 @@ PropSheetProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -130,7 +130,7 @@ CPlApplet( LPARAM lParam2) { int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl); + UNREFERENCED_PARAMETER(hwndCPl) switch(uMsg) { @@ -167,7 +167,7 @@ DllMain( DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/sysdm/sysdm.def b/reactos/dll/cpl/sysdm/sysdm.def index 9b83348987b..1ed84314984 100644 --- a/reactos/dll/cpl/sysdm/sysdm.def +++ b/reactos/dll/cpl/sysdm/sysdm.def @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/cpl/sysdm/userprofile.c b/reactos/dll/cpl/sysdm/userprofile.c index 3c2ebe9b36c..920980b4b9e 100644 --- a/reactos/dll/cpl/sysdm/userprofile.c +++ b/reactos/dll/cpl/sysdm/userprofile.c @@ -39,9 +39,8 @@ UserProfilePageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/sysdm/virtmem.c b/reactos/dll/cpl/sysdm/virtmem.c index 92fb7c9f9c7..4aefd68c014 100644 --- a/reactos/dll/cpl/sysdm/virtmem.c +++ b/reactos/dll/cpl/sysdm/virtmem.c @@ -14,7 +14,7 @@ VirtMemDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/timedate/timedate.def b/reactos/dll/cpl/timedate/timedate.def index 52c811fe993..8d67834a2ec 100644 --- a/reactos/dll/cpl/timedate/timedate.def +++ b/reactos/dll/cpl/timedate/timedate.def @@ -1,6 +1,6 @@ LIBRARY timedate.cpl EXPORTS -CPlApplet +CPlApplet@16 ; EOF diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.def b/reactos/dll/keyboard/kbdbe/kbdbe.def index ecfca35a466..ea0271f832a 100644 --- a/reactos/dll/keyboard/kbdbe/kbdbe.def +++ b/reactos/dll/keyboard/kbdbe/kbdbe.def @@ -4,5 +4,5 @@ LIBRARY kbdbe.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdda/kbdda.def b/reactos/dll/keyboard/kbdda/kbdda.def index 6f7bbf6800b..27d0cf710c0 100644 --- a/reactos/dll/keyboard/kbdda/kbdda.def +++ b/reactos/dll/keyboard/kbdda/kbdda.def @@ -1,3 +1,3 @@ LIBRARY kbdda.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 diff --git a/reactos/dll/keyboard/kbddv/kbddv.def b/reactos/dll/keyboard/kbddv/kbddv.def index faa724cc1eb..56443e9d88c 100644 --- a/reactos/dll/keyboard/kbddv/kbddv.def +++ b/reactos/dll/keyboard/kbddv/kbddv.def @@ -4,5 +4,5 @@ LIBRARY kbddvorak.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdes/kbdes.def b/reactos/dll/keyboard/kbdes/kbdes.def index 7f203ba29a0..27d0cf710c0 100644 --- a/reactos/dll/keyboard/kbdes/kbdes.def +++ b/reactos/dll/keyboard/kbdes/kbdes.def @@ -1,6 +1,3 @@ LIBRARY kbdda.dll - - -EXPORTS - -KbdLayerDescriptor \ No newline at end of file +EXPORTS +KbdLayerDescriptor@0 diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.def b/reactos/dll/keyboard/kbdfr/kbdfr.def index aff1acd91c5..a880573f8ca 100644 --- a/reactos/dll/keyboard/kbdfr/kbdfr.def +++ b/reactos/dll/keyboard/kbdfr/kbdfr.def @@ -4,5 +4,5 @@ LIBRARY kbdfr.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.def b/reactos/dll/keyboard/kbdgr/kbdgr.def index f0efa4d2d5b..7dc7cadfdad 100644 --- a/reactos/dll/keyboard/kbdgr/kbdgr.def +++ b/reactos/dll/keyboard/kbdgr/kbdgr.def @@ -4,5 +4,5 @@ LIBRARY kbdgr.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.def b/reactos/dll/keyboard/kbdhe/kbdhe.def index 50e9ea3f149..53beb921709 100644 --- a/reactos/dll/keyboard/kbdhe/kbdhe.def +++ b/reactos/dll/keyboard/kbdhe/kbdhe.def @@ -4,5 +4,5 @@ LIBRARY kbdhe.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF \ No newline at end of file diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.def b/reactos/dll/keyboard/kbdheb/kbdheb.def index cbfce3b7634..b8973ef638f 100644 --- a/reactos/dll/keyboard/kbdheb/kbdheb.def +++ b/reactos/dll/keyboard/kbdheb/kbdheb.def @@ -4,5 +4,5 @@ LIBRARY kbdheb.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF \ No newline at end of file diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.def b/reactos/dll/keyboard/kbdhu/kbdhu.def index dbd8a2a76d8..4c0c002cce1 100644 --- a/reactos/dll/keyboard/kbdhu/kbdhu.def +++ b/reactos/dll/keyboard/kbdhu/kbdhu.def @@ -4,5 +4,5 @@ LIBRARY kbdhu.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.def b/reactos/dll/keyboard/kbdpo/kbdpo.def index 8e511c8af5b..e1f395ca574 100644 --- a/reactos/dll/keyboard/kbdpo/kbdpo.def +++ b/reactos/dll/keyboard/kbdpo/kbdpo.def @@ -1,3 +1,3 @@ LIBRARY kbdpo.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 diff --git a/reactos/dll/keyboard/kbdru/kbdru.def b/reactos/dll/keyboard/kbdru/kbdru.def index 837a20f42e0..a0984619bec 100644 --- a/reactos/dll/keyboard/kbdru/kbdru.def +++ b/reactos/dll/keyboard/kbdru/kbdru.def @@ -4,5 +4,5 @@ LIBRARY kbdru.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdse/kbdse.def b/reactos/dll/keyboard/kbdse/kbdse.def index fd726c84101..862f723ab99 100644 --- a/reactos/dll/keyboard/kbdse/kbdse.def +++ b/reactos/dll/keyboard/kbdse/kbdse.def @@ -4,5 +4,5 @@ LIBRARY kbdse.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.def b/reactos/dll/keyboard/kbdsg/kbdsg.def index 5a8f14cb8a2..529859364c2 100644 --- a/reactos/dll/keyboard/kbdsg/kbdsg.def +++ b/reactos/dll/keyboard/kbdsg/kbdsg.def @@ -4,5 +4,5 @@ LIBRARY kbdsg.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.def b/reactos/dll/keyboard/kbdsk/kbdsk.def index 5229c646fa0..b0600ad2ee2 100644 --- a/reactos/dll/keyboard/kbdsk/kbdsk.def +++ b/reactos/dll/keyboard/kbdsk/kbdsk.def @@ -4,5 +4,5 @@ LIBRARY kbdsk.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbduk/kbduk.def b/reactos/dll/keyboard/kbduk/kbduk.def index 2d98a0fb9f2..984901486b1 100644 --- a/reactos/dll/keyboard/kbduk/kbduk.def +++ b/reactos/dll/keyboard/kbduk/kbduk.def @@ -4,5 +4,5 @@ LIBRARY kbduk.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdur/kbdur.def b/reactos/dll/keyboard/kbdur/kbdur.def index 841f3e34886..717b43c4bb0 100644 --- a/reactos/dll/keyboard/kbdur/kbdur.def +++ b/reactos/dll/keyboard/kbdur/kbdur.def @@ -4,5 +4,5 @@ LIBRARY kbdur.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/keyboard/kbdus/kbdus.def b/reactos/dll/keyboard/kbdus/kbdus.def index f23f74c5b43..309f9bc6188 100644 --- a/reactos/dll/keyboard/kbdus/kbdus.def +++ b/reactos/dll/keyboard/kbdus/kbdus.def @@ -4,5 +4,5 @@ LIBRARY kbdus.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild index 7a69ead3ea0..41bd902c1b2 100644 --- a/reactos/dll/ntdll/ntdll.rbuild +++ b/reactos/dll/ntdll/ntdll.rbuild @@ -14,6 +14,7 @@ string pseh -lgcc + -nostdlib -nostartfiles api.c diff --git a/reactos/dll/win32/cards/cards.def b/reactos/dll/win32/cards/cards.def index 0af62e9904a..b57a5b82f34 100644 --- a/reactos/dll/win32/cards/cards.def +++ b/reactos/dll/win32/cards/cards.def @@ -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 diff --git a/reactos/dll/win32/cfgmgr32/cfgmgr32.def b/reactos/dll/win32/cfgmgr32/cfgmgr32.def index e2ad27f2d29..a3bd0fed293 100644 --- a/reactos/dll/win32/cfgmgr32/cfgmgr32.def +++ b/reactos/dll/win32/cfgmgr32/cfgmgr32.def @@ -19,53 +19,47 @@ ; LIBRARY CFGMGR32.DLL EXPORTS -CMP_Init_Detection = SETUPAPI.CMP_Init_Detection +CMP_Init_Detection@4=SETUPAPI.CMP_Init_Detection ;CMP_RegisterNotification -CMP_Report_LogOn = SETUPAPI.CMP_Report_LogOn +CMP_Report_LogOn@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@16=SETUPAPI.CM_Add_Empty_Log_Conf +CM_Add_Empty_Log_Conf_Ex@20=SETUPAPI.CM_Add_Empty_Log_Conf_Ex +CM_Add_IDA@12=SETUPAPI.CM_Add_IDA +CM_Add_IDW@12=SETUPAPI.CM_Add_IDW +CM_Add_ID_ExA@16=SETUPAPI.CM_Add_ID_ExA +CM_Add_ID_ExW@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@8=SETUPAPI.CM_Connect_MachineA +CM_Connect_MachineW@8=SETUPAPI.CM_Connect_MachineW +CM_Create_DevNodeA@16=SETUPAPI.CM_Create_DevNodeA +CM_Create_DevNodeW@16=SETUPAPI.CM_Create_DevNodeW +CM_Create_DevNode_ExA@20=SETUPAPI.CM_Create_DevNode_ExA +CM_Create_DevNode_ExW@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@8=SETUPAPI.CM_Delete_Class_Key +CM_Delete_Class_Key_Ex@12=SETUPAPI.CM_Delete_Class_Key_Ex +CM_Delete_DevNode_Key@12=SETUPAPI.CM_Delete_DevNode_Key +CM_Delete_DevNode_Key_Ex@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@8=SETUPAPI.CM_Disable_DevNode +CM_Disable_DevNode_Ex@12=SETUPAPI.CM_Disable_DevNode_Ex +CM_Disconnect_Machine@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@8=SETUPAPI.CM_Enable_DevNode +CM_Enable_DevNode_Ex@12=SETUPAPI.CM_Enable_DevNode_Ex +CM_Enumerate_Classes@12=SETUPAPI.CM_Enumerate_Classes +CM_Enumerate_Classes_Ex@16=SETUPAPI.CM_Enumerate_Classes_Ex +CM_Enumerate_EnumeratorsA@16=SETUPAPI.CM_Enumerate_EnumeratorsA +CM_Enumerate_EnumeratorsW@16=SETUPAPI.CM_Enumerate_EnumeratorsW +CM_Enumerate_Enumerators_ExA@20=SETUPAPI.CM_Enumerate_Enumerators_ExA +CM_Enumerate_Enumerators_ExW@20=SETUPAPI.CM_Enumerate_Enumerators_ExW ;CM_Find_Range ;CM_First_Range ;CM_Free_Log_Conf @@ -75,38 +69,38 @@ CM_Free_Log_Conf_Handle@4=SETUPAPI.CM_Free_Log_Conf_Handle ;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@12=SETUPAPI.CM_Get_Child +CM_Get_Child_Ex@16=SETUPAPI.CM_Get_ChildEx +CM_Get_Class_Key_NameA@16=SETUPAPI.CM_Get_Class_Key_NameA +CM_Get_Class_Key_NameW@16=SETUPAPI.CM_Get_Class_Key_NameW +CM_Get_Class_Key_Name_ExA@20=SETUPAPI.CM_Get_Class_Key_Name_ExA +CM_Get_Class_Key_Name_ExW@20=SETUPAPI.CM_Get_Class_Key_Name_ExW +CM_Get_Class_NameA@16=SETUPAPI.CM_Get_Class_NameA +CM_Get_Class_NameW@16=SETUPAPI.CM_Get_Class_NameW +CM_Get_Class_Name_ExA@20=SETUPAPI.CM_Get_Class_Name_ExA +CM_Get_Class_Name_ExW@20=SETUPAPI.CM_Get_Class_Name_ExW +CM_Get_Depth@12=SETUPAPI.CM_Get_Depth +CM_Get_Depth_Ex@16=SETUPAPI.CM_Get_Depth_Ex +CM_Get_DevNode_Registry_PropertyA@24=SETUPAPI.CM_Get_DevNode_Registry_PropertyA +CM_Get_DevNode_Registry_PropertyW@24=SETUPAPI.CM_Get_DevNode_Registry_PropertyW +CM_Get_DevNode_Registry_Property_ExA@28=SETUPAPI.CM_Get_DevNode_Registry_Property_ExA +CM_Get_DevNode_Registry_Property_ExW@28=SETUPAPI.CM_Get_DevNode_Registry_Property_ExW +CM_Get_DevNode_Status@16=SETUPAPI.CM_Get_DevNode_Status +CM_Get_DevNode_Status_Ex@20=SETUPAPI.CM_Get_DevNode_Status_Ex +CM_Get_Device_IDA@16=SETUPAPI.CM_Get_Device_IDA +CM_Get_Device_IDW@16=SETUPAPI.CM_Get_Device_IDW +CM_Get_Device_ID_ExA@20=SETUPAPI.CM_Get_Device_ID_ExA +CM_Get_Device_ID_ExW@20=SETUPAPI.CM_Get_Device_ID_ExW +CM_Get_Device_ID_ListA@16=SETUPAPI.CM_Get_Device_ID_ListA +CM_Get_Device_ID_ListW@16=SETUPAPI.CM_Get_Device_ID_ListW +CM_Get_Device_ID_List_ExA@20=SETUPAPI.CM_Get_Device_ID_List_ExA +CM_Get_Device_ID_List_ExW@20=SETUPAPI.CM_Get_Device_ID_List_ExW +CM_Get_Device_ID_List_SizeA@12=SETUPAPI.CM_Get_Device_ID_List_SizeA +CM_Get_Device_ID_List_SizeW@12=SETUPAPI.CM_Get_Device_ID_List_SizeW +CM_Get_Device_ID_List_Size_ExA@16=SETUPAPI.CM_Get_Device_ID_List_Size_ExA +CM_Get_Device_ID_List_Size_ExW@16=SETUPAPI.CM_Get_Device_ID_List_Size_ExA +CM_Get_Device_ID_Size@12=SETUPAPI.CM_Get_Device_ID_Size +CM_Get_Device_ID_Size_Ex@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_ID_Size_Ex=SETUPAPI.CM_Get_Device_ID_Size_Ex ;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@8=SETUPAPI.CM_Get_Global_State +CM_Get_Global_State_Ex@12=SETUPAPI.CM_Get_Global_State_Ex +CM_Get_HW_Prof_FlagsA@16=SETUPAPI.CM_Get_HW_Prof_FlagsA +CM_Get_HW_Prof_FlagsW@16=SETUPAPI.CM_Get_HW_Prof_FlagsW +CM_Get_HW_Prof_Flags_ExA@20=SETUPAPI.CM_Get_HW_Prof_Flags_ExA +CM_Get_HW_Prof_Flags_ExW@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_HW_Prof_Flags_ExW=SETUPAPI.CM_Get_HW_Prof_Flags_ExW ;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@12=SETUPAPI.CM_Get_Parent +CM_Get_Parent_Ex@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@12=SETUPAPI.CM_Get_Sibling +CM_Get_Sibling_Ex@16=SETUPAPI.CM_Get_Sibling_Ex +CM_Get_Version@0=SETUPAPI.CM_Get_Version +CM_Get_Version_Ex@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@4=SETUPAPI.CM_Is_Dock_Station_Present +CM_Is_Dock_Station_Present_Ex@8=SETUPAPI.CM_Is_Dock_Station_Present_Ex +CM_Locate_DevNodeA@12=SETUPAPI.CM_Locate_DevNodeA +CM_Locate_DevNodeW@12=SETUPAPI.CM_Locate_DevNodeW +CM_Locate_DevNode_ExA@16=SETUPAPI.CM_Locate_DevNode_ExA +CM_Locate_DevNode_ExW@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@12=SETUPAPI.CM_Move_DevNode +CM_Move_DevNode_Ex@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@24=SETUPAPI.CM_Open_Class_KeyA +CM_Open_Class_KeyW@24=SETUPAPI.CM_Open_Class_KeyW +CM_Open_Class_Key_ExA@28=SETUPAPI.CM_Open_Class_Key_ExA +CM_Open_Class_Key_ExW@28=SETUPAPI.CM_Open_Class_Key_ExW +CM_Open_DevNode_Key@24=SETUPAPI.CM_Open_DevNode_Key +CM_Open_DevNode_Key_Ex@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@8=SETUPAPI.CM_Reenumerate_DevNode +CM_Reenumerate_DevNode_Ex@12=SETUAPI.CM_Reenumerate_DevNode_Ex ;CM_Register_Device_Driver ;CM_Register_Device_Driver_Ex ;CM_Register_Device_InterfaceA @@ -187,29 +181,29 @@ CM_Reenumerate_DevNode_Ex=SETUAPI.CM_Reenumerate_DevNode_Ex ;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@0=SETUPAPI.CM_Request_Eject_PC +CM_Request_Eject_PC_Ex@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@4=SETUPAPI.CM_Run_Detection +CM_Run_Detection_Ex@8=SETUPAPI.CM_Run_Detection_Ex +CM_Set_DevNode_Problem@12=SETUPAPI.CM_Set_DevNode_Problem +CM_Set_DevNode_Problem_Ex@16=SETUPAPI.CM_Set_DevNode_Problem_Ex +CM_Set_DevNode_Registry_PropertyA@20=SETUPAPI.CM_Set_DevNode_Registry_PropertyA +CM_Set_DevNode_Registry_PropertyW@20=SETUPAPI.CM_Set_DevNode_Registry_PropertyW +CM_Set_DevNode_Registry_Property_ExA@24=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA +CM_Set_DevNode_Registry_Property_ExW@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@16=SETUPAPI.CM_Set_HW_Prof_FlagsA +CM_Set_HW_Prof_FlagsW@16=SETUPAPI.CM_Set_HW_Prof_FlagsW +CM_Set_HW_Prof_Flags_ExA@20=SETUPAPI.CM_Set_HW_Prof_Flags_ExA +CM_Set_HW_Prof_Flags_ExW@20=SETUPAPI.CM_Set_HW_Prof_Flags_ExW +CM_Setup_DevNode@8=SETUPAPI.CM_Setup_DevNode +CM_Setup_DevNode_Ex@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@8=SETUPAPI.CM_Uninstall_DevNode +CM_Uninstall_DevNode_Ex@12=SETUPAPI.CM_Uninstall_DevNode_Ex ;CM_Unregister_Device_InterfaceA ;CM_Unregister_Device_InterfaceW ;CM_Unregister_Device_Interface_ExA diff --git a/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild b/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild index 0fbdd6f6a18..2fb10c9f91c 100644 --- a/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild +++ b/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild @@ -3,6 +3,5 @@ -nostdlib -lgcc - setupapi cfgmgr32.rc diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild index 06efc7b5f18..603704fc5ed 100644 --- a/reactos/dll/win32/kernel32/kernel32.rbuild +++ b/reactos/dll/win32/kernel32/kernel32.rbuild @@ -128,6 +128,7 @@ ntdll -lgcc -nostartfiles + -nostdlib kernel32.rc diff --git a/reactos/dll/win32/msvcrt/msvcrt.rbuild b/reactos/dll/win32/msvcrt/msvcrt.rbuild index 51a91cf693f..4c514064e4a 100644 --- a/reactos/dll/win32/msvcrt/msvcrt.rbuild +++ b/reactos/dll/win32/msvcrt/msvcrt.rbuild @@ -1,5 +1,7 @@ -nostartfiles + --enable-stdcall-fixup + -nostdlib -lgcc . diff --git a/reactos/dll/win32/shlwapi/shlwapi.rbuild b/reactos/dll/win32/shlwapi/shlwapi.rbuild index 7ee56aaa450..4cf0b9c5339 100644 --- a/reactos/dll/win32/shlwapi/shlwapi.rbuild +++ b/reactos/dll/win32/shlwapi/shlwapi.rbuild @@ -9,6 +9,7 @@ 0x501 "" + -nostdlib -lgcc wine uuid diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild index cf80c87306a..604d3568b6a 100644 --- a/reactos/ntoskrnl/ntoskrnl.rbuild +++ b/reactos/ntoskrnl/ntoskrnl.rbuild @@ -329,5 +329,6 @@ ntoskrnl.rc -nostartfiles + -nostdlib -lgcc diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp index 787778e0fa6..01350ee0af2 100644 --- a/reactos/tools/rbuild/backend/mingw/mingw.cpp +++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp @@ -420,8 +420,8 @@ MingwBackend::GenerateGlobalVariables () const 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" ); diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index 9ae35b91844..bd2f1c2fd71 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -1564,15 +1564,15 @@ MingwModuleHandler::GenerateLinkerCommand ( 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 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget () 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 @@ MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget () 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 () ); diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h index bc6dfb7a6f8..a000c2ad847 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.h +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h @@ -278,7 +278,7 @@ public: 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 @@ public: 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 (); }; diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp index f4d28787211..eaefd900e94 100644 --- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp +++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp @@ -371,9 +371,6 @@ MSVCBackend::_generate_vcproj ( const Module& module ) { fprintf ( OUT, "\t\t\tdefinition.c_str()); fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); @@ -446,10 +443,7 @@ MSVCBackend::_generate_vcproj ( const Module& module ) } 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 ); diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp index 4eb7468d608..8c642a6fba6 100644 --- a/reactos/tools/rbuild/module.cpp +++ b/reactos/tools/rbuild/module.cpp @@ -835,7 +835,7 @@ Module::GetDefaultModuleEntrypoint () const case NativeCUI: return "NtProcessStartup@4"; case Win32DLL: - return "DllMainCRTStartup@12"; + return "DllMain@12"; case Win32CUI: case Test: if ( isUnicode )