Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-30 02:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

reverting : revison 22930 to 22932, 22938 to 22940, 22943, 22945, 22950, 22953 to 22954, 22959 to 22961, 22965

Browse source 
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
This commit is contained in:
Magnus Olsen 2006-07-09 16:25:25 +00:00
parent ab8a344656
commit d5dbbd1211
75 changed files with 267 additions and 328 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/cpl/access/access.c
View file

@ -52,7 +52,7 @@ PropSheetProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {
case PSCB_BUTTONPRESSED: case PSCB_BUTTONPRESSED:
@ -118,7 +118,7 @@ CPlApplet(
LPARAM lParam2) LPARAM lParam2)
{ {
int i = (int)lParam1; int i = (int)lParam1;
UNREFERENCED_PARAMETER(hwndCPl); UNREFERENCED_PARAMETER(hwndCPl)
switch(uMsg) switch(uMsg)
{ {
@ -155,7 +155,7 @@ DllMain(
DWORD dwReason, DWORD dwReason,
LPVOID lpvReserved) LPVOID lpvReserved)
{ {
UNREFERENCED_PARAMETER(lpvReserved); UNREFERENCED_PARAMETER(lpvReserved)
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
reactos/dll/cpl/access/access.def
View file

@ -1,6 +1,6 @@
LIBRARY cplsample.cpl LIBRARY cplsample.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

4
reactos/dll/cpl/access/display.c
View file

@ -22,8 +22,8 @@ DisplayPageProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

2
reactos/dll/cpl/access/general.c
View file

@ -22,8 +22,6 @@ GeneralPageProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(hwndDlg);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

4
reactos/dll/cpl/access/keyboard.c
View file

@ -22,8 +22,8 @@ KeyboardPageProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

4
reactos/dll/cpl/access/mouse.c
View file

@ -22,8 +22,8 @@ MousePageProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

4
reactos/dll/cpl/access/sound.c
View file

@ -22,8 +22,8 @@ SoundPageProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

18
reactos/dll/cpl/appwiz/appwiz.c
View file

@ -64,7 +64,7 @@ CallUninstall(HWND hwndDlg)
TCHAR pszUninstallString[MAX_PATH]; TCHAR pszUninstallString[MAX_PATH];
DWORD dwSize; DWORD dwSize;
nIndex = (int) SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); nIndex = SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0);
if (nIndex == -1) if (nIndex == -1)
{ {
MessageBox(hwndDlg, MessageBox(hwndDlg,
@ -173,12 +173,12 @@ static void FillSoftwareList(HWND hwndDlg)
{ {
if ((!bIsUpdate) && (!bIsSystemComponent)) 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); SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey);
} }
else if (bIsUpdate && bShowUpdates) 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); SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey);
} }
} }
@ -195,7 +195,7 @@ static void FillSoftwareList(HWND hwndDlg)
static INT_PTR CALLBACK static INT_PTR CALLBACK
InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
switch (uMsg) switch (uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -235,9 +235,9 @@ InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
static INT_PTR CALLBACK static INT_PTR CALLBACK
RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam)
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -297,7 +297,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
CPLINFO *CPlInfo; CPLINFO *CPlInfo;
DWORD i; DWORD i;
UNREFERENCED_PARAMETER(hwndCPl); UNREFERENCED_PARAMETER(hwndCPl)
i = (DWORD)lParam1; i = (DWORD)lParam1;
switch(uMsg) switch(uMsg)
@ -328,7 +328,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
BOOL WINAPI BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
{ {
UNREFERENCED_PARAMETER(lpvReserved); UNREFERENCED_PARAMETER(lpvReserved)
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
reactos/dll/cpl/appwiz/appwiz.def
View file

@ -1,6 +1,6 @@
LIBRARY appwiz.cpl LIBRARY appwiz.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

2
reactos/dll/cpl/cplsample/cplsample.def
View file

@ -1,6 +1,6 @@
LIBRARY cplsample.cpl LIBRARY cplsample.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

6
reactos/dll/cpl/desk/appearance.c
View file

@ -15,9 +15,9 @@ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg,
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam)
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {

4
reactos/dll/cpl/desk/background.c
View file

@ -302,8 +302,8 @@ void OnColorButton()
BOOL CheckListBoxFilename(HWND list, TCHAR *filename) BOOL CheckListBoxFilename(HWND list, TCHAR *filename)
{ {
UNREFERENCED_PARAMETER(filename); UNREFERENCED_PARAMETER(filename)
UNREFERENCED_PARAMETER(list); UNREFERENCED_PARAMETER(list)
return FALSE; return FALSE;
} }

9
reactos/dll/cpl/desk/desk.c
View file

@ -49,10 +49,10 @@ LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
PROPSHEETHEADER psh; PROPSHEETHEADER psh;
TCHAR Caption[1024]; TCHAR Caption[1024];
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam)
UNREFERENCED_PARAMETER(uMsg); UNREFERENCED_PARAMETER(uMsg)
UNREFERENCED_PARAMETER(hwnd); UNREFERENCED_PARAMETER(hwnd)
LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); 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) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
{ {
UNREFERENCED_PARAMETER(lpvReserved);
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

4
reactos/dll/cpl/desk/desk.def
View file

@ -1,7 +1,7 @@
LIBRARY desk.cpl LIBRARY desk.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
DisplayClassInstaller DisplayClassInstaller@12
; EOF ; EOF

10
reactos/dll/cpl/desk/settings.c
View file

@ -244,10 +244,10 @@ OnDisplayDeviceChanged(IN HWND hwndDlg, IN PDISPLAY_DEVICE_ENTRY pDeviceEntry)
TCHAR Buffer[64]; TCHAR Buffer[64];
if (LoadString(hApplet, (2900 + Current->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) 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) 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); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SETITEMDATA, index, Current->dmBitsPerPel);
} }
} }
@ -322,8 +322,8 @@ OnBPPChanged(IN HWND hwndDlg)
TCHAR Buffer[64]; TCHAR Buffer[64];
SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, WM_GETTEXT, (WPARAM)(sizeof(Buffer) / sizeof(TCHAR)), (LPARAM)Buffer); 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); index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer);
dmNewBitsPerPel = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); dmNewBitsPerPel = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0);
/* find if new parameters are valid */ /* find if new parameters are valid */
Current = CurrentDisplayDevice->CurrentSettings; 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_BOTTOM:
case TB_ENDTRACK: 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); OnResolutionChanged(hwndDlg, newPosition);
} }
} }

8
reactos/dll/cpl/hdwwiz/hdwwiz.c
View file

@ -53,9 +53,9 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
BOOL ret; BOOL ret;
LONG rc; LONG rc;
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam)
UNREFERENCED_PARAMETER(uMsg); UNREFERENCED_PARAMETER(uMsg)
hNewDev = LoadLibrary(_T("newdev.dll")); hNewDev = LoadLibrary(_T("newdev.dll"));
if (!hNewDev) if (!hNewDev)
@ -140,7 +140,7 @@ CPlApplet(HWND hwndCpl,
BOOL WINAPI BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
{ {
UNREFERENCED_PARAMETER(lpvReserved); UNREFERENCED_PARAMETER(lpvReserved)
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
reactos/dll/cpl/hdwwiz/hdwwiz.def
View file

@ -1,6 +1,6 @@
LIBRARY hdwwiz.cpl LIBRARY hdwwiz.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

4
reactos/dll/cpl/intl/intl.def
View file

@ -1,7 +1,7 @@
LIBRARY intl.cpl LIBRARY intl.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
LocalePageProc LocalePageProc@16
; EOF ; EOF

26
reactos/dll/cpl/intl_new/En.rc
View file

@ -6,24 +6,24 @@ CAPTION "Regional options"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
GROUPBOX "Regional options and standards", IDC_GROUPBOX, 5, 3, 242, 165 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 "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:", -1, 14, 36, 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 | COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | CBS_SORT WS_VSCROLL | WS_TABSTOP | CBS_SORT
PUSHBUTTON "Se&tup...", IDC_SETUP_BUTTON, 187, 54, 52, 13 PUSHBUTTON "Se&tup...", IDC_SETUP_BUTTON, 187, 54, 52, 13
LTEXT "Samples", -1, 14, 73, 70, 10 LTEXT "Samples", IDC_STATIC, 14, 73, 70, 10
LTEXT "Number:", -1, 16, 86, 48, 10 LTEXT "Number:", IDC_STATIC, 16, 86, 48, 10
LTEXT "Monetary:", -1, 16, 101, 48, 10 LTEXT "Monetary:", IDC_STATIC, 16, 101, 48, 10
LTEXT "Time:", -1, 16, 116, 48, 10 LTEXT "Time:", IDC_STATIC, 16, 116, 48, 10
LTEXT "Short date:", -1, 16, 131, 48, 10 LTEXT "Short date:", IDC_STATIC, 16, 131, 48, 10
LTEXT "Long date:", -1, 16, 146, 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_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_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_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_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 EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP
GROUPBOX "Geographic location", -1, 5, 172, 242, 56 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", -1, 14, 184, 225, 24 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 | COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | CBS_SORT WS_VSCROLL | WS_TABSTOP | CBS_SORT
END END
@ -36,9 +36,9 @@ BEGIN
GROUPBOX "Program language that not unicode supported", IDC_GROUPBOX, 5, 5, 242, 90 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 | COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | CBS_SORT WS_VSCROLL | WS_TABSTOP | CBS_SORT
LTEXT "This option...", -1, 14, 18, 223, 33 LTEXT "This option...", IDC_STATIC, 14, 18, 223, 33
LTEXT "Select language...", -1, 14, 55, 223, 18 LTEXT "Select language...", IDC_STATIC, 14, 55, 223, 18
GROUPBOX "Transformation tables codepages", -1, 5, 101, 242, 88 GROUPBOX "Transformation tables codepages", IDC_GROUPBOX, 5, 101, 242, 88
END END
STRINGTABLE STRINGTABLE

5
reactos/dll/cpl/intl_new/extra.c
View file

@ -33,7 +33,7 @@ LanguagesEnumProc(LPTSTR lpLanguage)
Lcid = wcstoul(lpLanguage, NULL, 16); Lcid = wcstoul(lpLanguage, NULL, 16);
GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang));
Index = (int) SendMessageW(hLanguageList, Index = SendMessageW(hLanguageList,
CB_ADDSTRING, CB_ADDSTRING,
0, 0,
(LPARAM)Lang); (LPARAM)Lang);
@ -65,7 +65,7 @@ CreateLanguagesList(HWND hWnd)
SendMessageW(hLanguageList, SendMessageW(hLanguageList,
CB_SELECTSTRING, CB_SELECTSTRING,
(WPARAM) -1, -1,
(LPARAM)LangSel); (LPARAM)LangSel);
} }
@ -75,7 +75,6 @@ INT_PTR
CALLBACK CALLBACK
ExtraOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) ExtraOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(wParam);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

6
reactos/dll/cpl/intl_new/intl.c
View file

@ -54,11 +54,6 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
PROPSHEETHEADER psh; PROPSHEETHEADER psh;
TCHAR Caption[MAX_STR_SIZE]; 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)); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
@ -122,7 +117,6 @@ STDCALL
DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
{ {
INITCOMMONCONTROLSEX InitControls; INITCOMMONCONTROLSEX InitControls;
UNREFERENCED_PARAMETER(lpvReserved);
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

6
reactos/dll/cpl/intl_new/intl.def
View file

@ -1,8 +1,8 @@
LIBRARY intl.cpl LIBRARY intl.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
RegOptsProc RegOptsProc@16
ExtraOptsProc ExtraOptsProc@16
; EOF ; EOF

24
reactos/dll/cpl/intl_new/locale.c
View file

@ -34,7 +34,7 @@ LocationsEnumProc(GEOID gId)
int index; int index;
GetGeoInfo(gId, GEO_FRIENDLYNAME, loc, MAX_FMT_SIZE, LANG_SYSTEM_DEFAULT); GetGeoInfo(gId, GEO_FRIENDLYNAME, loc, MAX_FMT_SIZE, LANG_SYSTEM_DEFAULT);
index = (int) SendMessageW(hGeoList, index = SendMessageW(hGeoList,
CB_ADDSTRING, CB_ADDSTRING,
0, 0,
(LPARAM)loc); (LPARAM)loc);
@ -69,7 +69,7 @@ CreateLocationsList(HWND hWnd)
SendMessageW(hGeoList, SendMessageW(hGeoList,
CB_SELECTSTRING, CB_SELECTSTRING,
(WPARAM) -1, -1,
(LPARAM)loc); (LPARAM)loc);
} }
@ -85,14 +85,14 @@ LocalesEnumProc(LPTSTR lpLocale)
lcid = wcstoul(lpLocale, NULL, 16); lcid = wcstoul(lpLocale, NULL, 16);
GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang));
index = (int) SendMessageW(hLocaleList, index = SendMessageW(hLocaleList,
CB_ADDSTRING, CB_ADDSTRING,
0, 0,
(LPARAM)lang); (LPARAM)lang);
SendMessageW(hLocaleList, SendMessageW(hLocaleList,
CB_SETITEMDATA, CB_SETITEMDATA,
(WPARAM) index, index,
(LPARAM)lcid); (LPARAM)lcid);
return TRUE; return TRUE;
@ -117,7 +117,7 @@ CreateLanguagesList(HWND hWnd)
SendMessageW(hLocaleList, SendMessageW(hLocaleList,
CB_SELECTSTRING, CB_SELECTSTRING,
(WPARAM) -1, -1,
(LPARAM)langSel); (LPARAM)langSel);
} }
@ -208,7 +208,7 @@ SetNewLocale(LCID LcidLocale)
} }
wsprintf(Value, L"%04X", (DWORD)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); RegSetValueExW(LocaleKey, L"Locale", 0, REG_SZ, (BYTE *)Value, ValueSize);
RegCloseKey(LocaleKey); RegCloseKey(LocaleKey);
@ -246,9 +246,9 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (HIWORD(wParam) == CBN_SELCHANGE || if (HIWORD(wParam) == CBN_SELCHANGE ||
HIWORD(wParam) == CBN_EDITCHANGE) HIWORD(wParam) == CBN_EDITCHANGE)
{ {
CurrSel = (int) SendMessageW((HWND)lParam, CB_GETCURSEL, CurrSel = SendMessageW((HWND)lParam, CB_GETCURSEL,
0, 0); 0, 0);
NewLCID = (LCID) SendMessageW((HWND)lParam, CB_GETITEMDATA, NewLCID = SendMessageW((HWND)lParam, CB_GETITEMDATA,
CurrSel, 0); CurrSel, 0);
UpdateLocaleSample(hwndDlg, UpdateLocaleSample(hwndDlg,
MAKELCID(NewLCID, SORT_DEFAULT)); MAKELCID(NewLCID, SORT_DEFAULT));
@ -273,20 +273,20 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (lpnm->code == (UINT)PSN_APPLY) if (lpnm->code == (UINT)PSN_APPLY)
{ {
/* Set locale */ /* Set locale */
CurrSel = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO),
CB_GETCURSEL, 0, 0); CB_GETCURSEL, 0, 0);
NewLCID = (LCID) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), NewLCID = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO),
CB_GETITEMDATA, CurrSel, 0); CB_GETITEMDATA, CurrSel, 0);
if (NewLCID == (LCID)CB_ERR) break; if (NewLCID == (LCID)CB_ERR) break;
SetNewLocale(MAKELCID(NewLCID, SORT_DEFAULT)); SetNewLocale(MAKELCID(NewLCID, SORT_DEFAULT));
/* Set geo location */ /* Set geo location */
CurrSel = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO),
CB_GETCURSEL, CB_GETCURSEL,
0, 0,
0); 0);
NewLocation = (GEOID) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), NewLocation = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO),
CB_GETITEMDATA, CB_GETITEMDATA,
CurrSel, CurrSel,
0); 0);

2
reactos/dll/cpl/liccpa/liccpa.def
View file

@ -1,6 +1,6 @@
LIBRARY liccpa.cpl LIBRARY liccpa.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

11
reactos/dll/cpl/main/keyboard.c
View file

@ -41,9 +41,6 @@ KeybSpeedProc(IN HWND hwndDlg,
IN WPARAM wParam, IN WPARAM wParam,
IN LPARAM lParam) IN LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(hwndDlg);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -64,9 +61,6 @@ KeybHardwareProc(IN HWND hwndDlg,
GUID Guids[1]; GUID Guids[1];
Guids[0] = GUID_DEVCLASS_KEYBOARD; Guids[0] = GUID_DEVCLASS_KEYBOARD;
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -93,11 +87,6 @@ KeyboardApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
PROPSHEETHEADER psh; PROPSHEETHEADER psh;
TCHAR Caption[256]; 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)); LoadString(hApplet, IDS_CPLNAME_2, Caption, sizeof(Caption) / sizeof(TCHAR));
ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER));

2
reactos/dll/cpl/main/main.c
View file

@ -106,8 +106,6 @@ DllMain(HINSTANCE hinstDLL,
LPVOID lpReserved) LPVOID lpReserved)
{ {
INITCOMMONCONTROLSEX InitControls; INITCOMMONCONTROLSEX InitControls;
UNREFERENCED_PARAMETER(lpReserved);
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
reactos/dll/cpl/main/main.def
View file

@ -1,6 +1,6 @@
LIBRARY main.cpl LIBRARY main.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

17
reactos/dll/cpl/main/mouse.c
View file

@ -106,9 +106,6 @@ MouseHardwareProc(IN HWND hwndDlg,
GUID Guids[1]; GUID Guids[1];
Guids[0] = GUID_DEVCLASS_MOUSE; Guids[0] = GUID_DEVCLASS_MOUSE;
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -169,8 +166,6 @@ ClickLockProc(IN HWND hwndDlg,
{ {
HWND hDlgCtrl; HWND hDlgCtrl;
int pos; int pos;
UNREFERENCED_PARAMETER(lParam);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -186,7 +181,7 @@ ClickLockProc(IN HWND hwndDlg,
if (LOWORD(wParam) == IDOK) if (LOWORD(wParam) == IDOK)
{ {
hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_CLICK_LOCK); 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); EndDialog(hwndDlg, TRUE);
} }
else if (LOWORD(wParam) == IDCANCEL) else if (LOWORD(wParam) == IDCANCEL)
@ -615,7 +610,6 @@ SaveSchemeProc(IN HWND hwndDlg,
IN LPARAM lParam) IN LPARAM lParam)
{ {
HWND hDlgCtrl; HWND hDlgCtrl;
UNREFERENCED_PARAMETER(lParam);
switch(uMsg) switch(uMsg)
{ {
@ -981,7 +975,7 @@ OptionProc(IN HWND hwndDlg,
{ {
SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
EnableWindow(hDlgCtrl, TRUE); EnableWindow(hDlgCtrl, TRUE);
g_MouseTrails = (ULONG) SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; g_MouseTrails = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2;
} }
break; break;
} }
@ -1034,7 +1028,7 @@ OptionProc(IN HWND hwndDlg,
else else
lResult = 0; lResult = 0;
SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE); SystemParametersInfo(SPI_SETMOUSETRAILS, lResult, 0, SPIF_SENDCHANGE);
//FIXME //FIXME
//pointer precision //pointer precision
@ -1174,11 +1168,6 @@ MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2)
PROPSHEETHEADER psh; PROPSHEETHEADER psh;
TCHAR Caption[256]; 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)); LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR));
ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER));

15
reactos/dll/cpl/mmsys/mmsys.c
View file

@ -67,15 +67,14 @@ HardwareDlgProc(HWND hwndDlg,
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
GUID Guids[2]; GUID Guids[] = {
Guids[0] = GUID_DEVCLASS_CDROM; GUID_DEVCLASS_CDROM,
Guids[1] = GUID_DEVCLASS_MEDIA; GUID_DEVCLASS_MEDIA,
};
/* create the hardware page */ /* create the hardware page */
DeviceCreateHardwarePageEx(hwndDlg, DeviceCreateHardwarePageEx(hwndDlg,
@ -99,11 +98,6 @@ MmSysApplet(HWND hwnd,
PROPSHEETHEADER psh = {0}; PROPSHEETHEADER psh = {0};
TCHAR Caption[256]; TCHAR Caption[256];
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(uMsg);
UNREFERENCED_PARAMETER(hwnd);
LoadString(hApplet, LoadString(hApplet,
IDS_CPLNAME, IDS_CPLNAME,
Caption, Caption,
@ -188,7 +182,6 @@ DllMain(HINSTANCE hinstDLL,
DWORD dwReason, DWORD dwReason,
LPVOID lpReserved) LPVOID lpReserved)
{ {
UNREFERENCED_PARAMETER(lpReserved);
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
reactos/dll/cpl/mmsys/mmsys.def
View file

@ -1,6 +1,6 @@
LIBRARY mmsys.cpl LIBRARY mmsys.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

16
reactos/dll/cpl/ncpa/ncpa.c
View file

@ -169,9 +169,6 @@ NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey)
TCHAR tpszNotifyObjectCLSID[MAX_PATH]; TCHAR tpszNotifyObjectCLSID[MAX_PATH];
TCHAR *tpszSubKeyCopy; TCHAR *tpszSubKeyCopy;
int nIndex; int nIndex;
UNREFERENCED_PARAMETER(hBaseKey);
// CLSID CLSID_NotifObj; // CLSID CLSID_NotifObj;
// IUnknown *pUnk = NULL; // IUnknown *pUnk = NULL;
// INetCfgComponentControl *pNetCfg; // INetCfgComponentControl *pNetCfg;
@ -227,7 +224,7 @@ NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey)
} }
RegCloseKey(hKey); 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); tpszSubKeyCopy = _tcsdup(tpszSubKey);
SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_SETITEMDATA,nIndex,(LPARAM)tpszSubKeyCopy); SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_SETITEMDATA,nIndex,(LPARAM)tpszSubKeyCopy);
} }
@ -312,7 +309,7 @@ NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
HKEY hNDIKey; HKEY hNDIKey;
DWORD dwType,dwSize; DWORD dwType,dwSize;
HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST); 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) if(iListBoxIndex != LB_ERR)
tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0); tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0);
if(!tpszSubKey) if(!tpszSubKey)
@ -575,7 +572,7 @@ NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey)
// How is this done properly ? // 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); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETITEMDATA,nIndex,(LPARAM)ptpszCfgInstanceID);
RegCloseKey(hKey); RegCloseKey(hKey);
} }
@ -632,14 +629,14 @@ NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
case IDC_NETCARDLIST: case IDC_NETCARDLIST:
if(HIWORD(wParam)==LBN_DBLCLK) { 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) if(nIndex!=-1)
DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0)); DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0));
} }
break; break;
case IDC_PROPERTIES: 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) if(nIndex!=-1)
DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0)); DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0));
break; break;
@ -682,7 +679,6 @@ DisplayApplet(VOID)
LONG CALLBACK LONG CALLBACK
CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
{ {
UNREFERENCED_PARAMETER(hwndCPl);
switch (uMsg) switch (uMsg)
{ {
case CPL_INIT: 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) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
{ {
UNREFERENCED_PARAMETER(lpvReserved);
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
reactos/dll/cpl/ncpa/ncpa.def
View file

@ -1,6 +1,6 @@
LIBRARY ncpa.cpl LIBRARY ncpa.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

4
reactos/dll/cpl/powercfg/alarms.c
View file

@ -31,8 +31,8 @@ alarmsProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam)
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

12
reactos/dll/cpl/powercfg/powercfg.c
View file

@ -55,7 +55,7 @@ PropSheetProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {
case PSCB_BUTTONPRESSED: case PSCB_BUTTONPRESSED:
@ -90,10 +90,10 @@ Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
SYSTEM_POWER_CAPABILITIES spc; SYSTEM_POWER_CAPABILITIES spc;
INT i=0; INT i=0;
UNREFERENCED_PARAMETER(hwnd); UNREFERENCED_PARAMETER(hwnd)
UNREFERENCED_PARAMETER(uMsg); UNREFERENCED_PARAMETER(uMsg)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam)
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
memset(Caption, 0x0, sizeof(Caption)); memset(Caption, 0x0, sizeof(Caption));
LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR));
@ -171,7 +171,7 @@ DllMain(
DWORD dwReason, DWORD dwReason,
LPVOID lpvReserved) LPVOID lpvReserved)
{ {
UNREFERENCED_PARAMETER(lpvReserved); UNREFERENCED_PARAMETER(lpvReserved)
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
reactos/dll/cpl/powercfg/powercfg.def
View file

@ -1,6 +1,6 @@
LIBRARY powercfg.cpl LIBRARY powercfg.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

8
reactos/dll/cpl/powercfg/powershemes.c
View file

@ -225,10 +225,10 @@ BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName
{ {
int index; int index;
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(sDesc); UNREFERENCED_PARAMETER(sDesc)
UNREFERENCED_PARAMETER(dwDesc); UNREFERENCED_PARAMETER(dwDesc)
UNREFERENCED_PARAMETER(dwName); UNREFERENCED_PARAMETER(dwName)
if (ValidatePowerPolicies(0,pp)) if (ValidatePowerPolicies(0,pp))
{ {

2
reactos/dll/cpl/sysdm/advanced.c
View file

@ -40,7 +40,7 @@ AdvancedPageProc(
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
switch (uMsg) switch (uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

6
reactos/dll/cpl/sysdm/computer.c
View file

@ -40,11 +40,6 @@ ComputerPageProc(
LPARAM lParam LPARAM lParam
) )
{ {
LPWKSTA_INFO_101 wki;
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -56,6 +51,7 @@ ComputerPageProc(
{ {
SendDlgItemMessage(hwndDlg,IDC_COMPUTERNAME,WM_SETTEXT,0,(LPARAM)ComputerName); SendDlgItemMessage(hwndDlg,IDC_COMPUTERNAME,WM_SETTEXT,0,(LPARAM)ComputerName);
} }
LPWKSTA_INFO_101 wki;
if (NetWkstaGetInfo(NULL,101,(LPBYTE*)&wki) == NERR_Success) if (NetWkstaGetInfo(NULL,101,(LPBYTE*)&wki) == NERR_Success)
{ {
SendDlgItemMessage(hwndDlg,IDC_WORKGROUPDOMAIN_NAME,WM_SETTEXT,0,(LPARAM)wki->wki101_langroup); SendDlgItemMessage(hwndDlg,IDC_WORKGROUPDOMAIN_NAME,WM_SETTEXT,0,(LPARAM)wki->wki101_langroup);

4
reactos/dll/cpl/sysdm/general.c
View file

@ -98,8 +98,8 @@ GeneralPageProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam)
switch(uMsg) switch(uMsg)
{ {

2
reactos/dll/cpl/sysdm/hardware.c
View file

@ -63,7 +63,7 @@ HardwarePageProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

6
reactos/dll/cpl/sysdm/sysdm.c
View file

@ -64,7 +64,7 @@ PropSheetProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(hwndDlg)
switch(uMsg) switch(uMsg)
{ {
case PSCB_BUTTONPRESSED: case PSCB_BUTTONPRESSED:
@ -130,7 +130,7 @@ CPlApplet(
LPARAM lParam2) LPARAM lParam2)
{ {
int i = (int)lParam1; int i = (int)lParam1;
UNREFERENCED_PARAMETER(hwndCPl); UNREFERENCED_PARAMETER(hwndCPl)
switch(uMsg) switch(uMsg)
{ {
@ -167,7 +167,7 @@ DllMain(
DWORD dwReason, DWORD dwReason,
LPVOID lpvReserved) LPVOID lpvReserved)
{ {
UNREFERENCED_PARAMETER(lpvReserved); UNREFERENCED_PARAMETER(lpvReserved)
switch(dwReason) switch(dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
reactos/dll/cpl/sysdm/sysdm.def
View file

@ -1,6 +1,6 @@
LIBRARY cplsample.cpl LIBRARY cplsample.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

5
reactos/dll/cpl/sysdm/userprofile.c
View file

@ -39,9 +39,8 @@ UserProfilePageProc(
LPARAM lParam LPARAM lParam
) )
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam)
UNREFERENCED_PARAMETER(hwndDlg);
switch(uMsg) switch(uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

2
reactos/dll/cpl/sysdm/virtmem.c
View file

@ -14,7 +14,7 @@ VirtMemDlgProc(HWND hwndDlg,
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam)
switch (uMsg) switch (uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:

2
reactos/dll/cpl/timedate/timedate.def
View file

@ -1,6 +1,6 @@
LIBRARY timedate.cpl LIBRARY timedate.cpl
EXPORTS EXPORTS
CPlApplet CPlApplet@16
; EOF ; EOF

2
reactos/dll/keyboard/kbdbe/kbdbe.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdbe.dll LIBRARY kbdbe.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdda/kbdda.def
View file

@ -1,3 +1,3 @@
LIBRARY kbdda.dll LIBRARY kbdda.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0

2
reactos/dll/keyboard/kbddv/kbddv.def
View file

@ -4,5 +4,5 @@
LIBRARY kbddvorak.dll LIBRARY kbddvorak.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

7
reactos/dll/keyboard/kbdes/kbdes.def
View file

@ -1,6 +1,3 @@
LIBRARY kbdda.dll LIBRARY kbdda.dll
EXPORTS
KbdLayerDescriptor@0
EXPORTS
KbdLayerDescriptor

2
reactos/dll/keyboard/kbdfr/kbdfr.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdfr.dll LIBRARY kbdfr.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdgr/kbdgr.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdgr.dll LIBRARY kbdgr.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdhe/kbdhe.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdhe.dll LIBRARY kbdhe.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdheb/kbdheb.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdheb.dll LIBRARY kbdheb.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdhu/kbdhu.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdhu.dll LIBRARY kbdhu.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdpo/kbdpo.def
View file

@ -1,3 +1,3 @@
LIBRARY kbdpo.dll LIBRARY kbdpo.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0

2
reactos/dll/keyboard/kbdru/kbdru.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdru.dll LIBRARY kbdru.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdse/kbdse.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdse.dll LIBRARY kbdse.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdsg/kbdsg.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdsg.dll LIBRARY kbdsg.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdsk/kbdsk.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdsk.dll LIBRARY kbdsk.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbduk/kbduk.def
View file

@ -4,5 +4,5 @@
LIBRARY kbduk.dll LIBRARY kbduk.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdur/kbdur.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdur.dll LIBRARY kbdur.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

2
reactos/dll/keyboard/kbdus/kbdus.def
View file

@ -4,5 +4,5 @@
LIBRARY kbdus.dll LIBRARY kbdus.dll
EXPORTS EXPORTS
KbdLayerDescriptor KbdLayerDescriptor@0
;EOF ;EOF

1
reactos/dll/ntdll/ntdll.rbuild
View file

@ -14,6 +14,7 @@
<library>string</library> <library>string</library>
<library>pseh</library> <library>pseh</library>
<linkerflag>-lgcc</linkerflag> <linkerflag>-lgcc</linkerflag>
<linkerflag>-nostdlib</linkerflag>
<linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostartfiles</linkerflag>
<directory name="csr"> <directory name="csr">
<file>api.c</file> <file>api.c</file>

12
reactos/dll/win32/cards/cards.def
View file

@ -1,8 +1,8 @@
LIBRARY cards.dll LIBRARY cards.dll
EXPORTS EXPORTS
WEP WEP@4
cdtAnimate cdtAnimate@20
cdtDraw cdtDraw@24
cdtDrawExt cdtDrawExt@32
cdtInit cdtInit@8
cdtTerm cdtTerm@0

220
reactos/dll/win32/cfgmgr32/cfgmgr32.def
View file

@ -19,53 +19,47 @@
; ;
LIBRARY CFGMGR32.DLL LIBRARY CFGMGR32.DLL
EXPORTS EXPORTS
CMP_Init_Detection = SETUPAPI.CMP_Init_Detection CMP_Init_Detection@4=SETUPAPI.CMP_Init_Detection
;CMP_RegisterNotification ;CMP_RegisterNotification
CMP_Report_LogOn = SETUPAPI.CMP_Report_LogOn CMP_Report_LogOn@4=SETUPAPI.CMP_Report_LogOn
;CMP_UnregisterNotification ;CMP_UnregisterNotification
;CMP_WaitNoPendingInstallEvents ;CMP_WaitNoPendingInstallEvents
;CMP_WaitServices ;CMP_WaitServices
;CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf CM_Add_Empty_Log_Conf@16=SETUPAPI.CM_Add_Empty_Log_Conf
;CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex CM_Add_Empty_Log_Conf_Ex@20=SETUPAPI.CM_Add_Empty_Log_Conf_Ex
CM_Add_IDA=SETUPAPI.CM_Add_IDA CM_Add_IDA@12=SETUPAPI.CM_Add_IDA
CM_Add_IDW=SETUPAPI.CM_Add_IDW CM_Add_IDW@12=SETUPAPI.CM_Add_IDW
CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA CM_Add_ID_ExA@16=SETUPAPI.CM_Add_ID_ExA
CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW CM_Add_ID_ExW@16=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_Range ;CM_Add_Range
;CM_Add_Res_Des ;CM_Add_Res_Des
;CM_Add_Res_Des_Ex ;CM_Add_Res_Des_Ex
CM_Connect_MachineA=SETUPAPI.CM_Connect_MachineA CM_Connect_MachineA@8=SETUPAPI.CM_Connect_MachineA
CM_Connect_MachineW=SETUPAPI.CM_Connect_MachineW CM_Connect_MachineW@8=SETUPAPI.CM_Connect_MachineW
CM_Create_DevNodeA=SETUPAPI.CM_Create_DevNodeA CM_Create_DevNodeA@16=SETUPAPI.CM_Create_DevNodeA
CM_Create_DevNodeW=SETUPAPI.CM_Create_DevNodeW CM_Create_DevNodeW@16=SETUPAPI.CM_Create_DevNodeW
CM_Create_DevNode_ExA=SETUPAPI.CM_Create_DevNode_ExA CM_Create_DevNode_ExA@20=SETUPAPI.CM_Create_DevNode_ExA
CM_Create_DevNode_ExW=SETUPAPI.CM_Create_DevNode_ExW CM_Create_DevNode_ExW@20=SETUPAPI.CM_Create_DevNode_ExW
;CM_Create_Range_List ;CM_Create_Range_List
CM_Delete_Class_Key=SETUPAPI.CM_Delete_Class_Key CM_Delete_Class_Key@8=SETUPAPI.CM_Delete_Class_Key
CM_Delete_Class_Key_Ex=SETUPAPI.CM_Delete_Class_Key_Ex CM_Delete_Class_Key_Ex@12=SETUPAPI.CM_Delete_Class_Key_Ex
CM_Delete_DevNode_Key=SETUPAPI.CM_Delete_DevNode_Key CM_Delete_DevNode_Key@12=SETUPAPI.CM_Delete_DevNode_Key
CM_Delete_DevNode_Key_Ex=SETUPAPI.CM_Delete_DevNode_Key_Ex CM_Delete_DevNode_Key_Ex@16=SETUPAPI.CM_Delete_DevNode_Key_Ex
;CM_Delete_Range ;CM_Delete_Range
;CM_Detect_Resource_Conflict ;CM_Detect_Resource_Conflict
;CM_Detect_Resource_Conflict_Ex ;CM_Detect_Resource_Conflict_Ex
CM_Disable_DevNode=SETUPAPI.CM_Disable_DevNode CM_Disable_DevNode@8=SETUPAPI.CM_Disable_DevNode
CM_Disable_DevNode_Ex=SETUPAPI.CM_Disable_DevNode_Ex CM_Disable_DevNode_Ex@12=SETUPAPI.CM_Disable_DevNode_Ex
CM_Disconnect_Machine=SETUPAPI.CM_Disconnect_Machine CM_Disconnect_Machine@4=SETUPAPI.CM_Disconnect_Machine
;CM_Dup_Range_List ;CM_Dup_Range_List
CM_Enable_DevNode=SETUPAPI.CM_Enable_DevNode CM_Enable_DevNode@8=SETUPAPI.CM_Enable_DevNode
CM_Enable_DevNode_Ex=SETUPAPI.CM_Enable_DevNode_Ex CM_Enable_DevNode_Ex@12=SETUPAPI.CM_Enable_DevNode_Ex
CM_Enumerate_Classes=SETUPAPI.CM_Enumerate_Classes CM_Enumerate_Classes@12=SETUPAPI.CM_Enumerate_Classes
CM_Enumerate_Classes_Ex=SETUPAPI.CM_Enumerate_Classes_Ex CM_Enumerate_Classes_Ex@16=SETUPAPI.CM_Enumerate_Classes_Ex
CM_Enumerate_EnumeratorsA=SETUPAPI.CM_Enumerate_EnumeratorsA CM_Enumerate_EnumeratorsA@16=SETUPAPI.CM_Enumerate_EnumeratorsA
CM_Enumerate_EnumeratorsW=SETUPAPI.CM_Enumerate_EnumeratorsW CM_Enumerate_EnumeratorsW@16=SETUPAPI.CM_Enumerate_EnumeratorsW
CM_Enumerate_Enumerators_ExA=SETUPAPI.CM_Enumerate_Enumerators_ExA CM_Enumerate_Enumerators_ExA@20=SETUPAPI.CM_Enumerate_Enumerators_ExA
CM_Enumerate_Enumerators_ExW=SETUPAPI.CM_Enumerate_Enumerators_ExW CM_Enumerate_Enumerators_ExW@20=SETUPAPI.CM_Enumerate_Enumerators_ExW
;CM_Find_Range ;CM_Find_Range
;CM_First_Range ;CM_First_Range
;CM_Free_Log_Conf ;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
;CM_Free_Res_Des_Ex ;CM_Free_Res_Des_Ex
;CM_Free_Res_Des_Handle ;CM_Free_Res_Des_Handle
CM_Get_Child = SETUPAPI.CM_Get_Child CM_Get_Child@12=SETUPAPI.CM_Get_Child
CM_Get_Child_Ex = SETUPAPI.CM_Get_Child_Ex CM_Get_Child_Ex@16=SETUPAPI.CM_Get_ChildEx
CM_Get_Class_Key_NameA=SETUPAPI.CM_Get_Class_Key_NameA CM_Get_Class_Key_NameA@16=SETUPAPI.CM_Get_Class_Key_NameA
CM_Get_Class_Key_NameW=SETUPAPI.CM_Get_Class_Key_NameW CM_Get_Class_Key_NameW@16=SETUPAPI.CM_Get_Class_Key_NameW
CM_Get_Class_Key_Name_ExA=SETUPAPI.CM_Get_Class_Key_Name_ExA CM_Get_Class_Key_Name_ExA@20=SETUPAPI.CM_Get_Class_Key_Name_ExA
CM_Get_Class_Key_Name_ExW=SETUPAPI.CM_Get_Class_Key_Name_ExW CM_Get_Class_Key_Name_ExW@20=SETUPAPI.CM_Get_Class_Key_Name_ExW
CM_Get_Class_NameA=SETUPAPI.CM_Get_Class_NameA CM_Get_Class_NameA@16=SETUPAPI.CM_Get_Class_NameA
CM_Get_Class_NameW=SETUPAPI.CM_Get_Class_NameW CM_Get_Class_NameW@16=SETUPAPI.CM_Get_Class_NameW
CM_Get_Class_Name_ExA=SETUPAPI.CM_Get_Class_Name_ExA CM_Get_Class_Name_ExA@20=SETUPAPI.CM_Get_Class_Name_ExA
CM_Get_Class_Name_ExW=SETUPAPI.CM_Get_Class_Name_ExW CM_Get_Class_Name_ExW@20=SETUPAPI.CM_Get_Class_Name_ExW
CM_Get_Depth=SETUPAPI.CM_Get_Depth CM_Get_Depth@12=SETUPAPI.CM_Get_Depth
CM_Get_Depth_Ex=SETUPAPI.CM_Get_Depth_Ex CM_Get_Depth_Ex@16=SETUPAPI.CM_Get_Depth_Ex
CM_Get_DevNode_Registry_PropertyA=SETUPAPI.CM_Get_DevNode_Registry_PropertyA CM_Get_DevNode_Registry_PropertyA@24=SETUPAPI.CM_Get_DevNode_Registry_PropertyA
CM_Get_DevNode_Registry_PropertyW=SETUPAPI.CM_Get_DevNode_Registry_PropertyW CM_Get_DevNode_Registry_PropertyW@24=SETUPAPI.CM_Get_DevNode_Registry_PropertyW
CM_Get_DevNode_Registry_Property_ExA=SETUPAPI.CM_Get_DevNode_Registry_Property_ExA CM_Get_DevNode_Registry_Property_ExA@28=SETUPAPI.CM_Get_DevNode_Registry_Property_ExA
CM_Get_DevNode_Registry_Property_ExW=SETUPAPI.CM_Get_DevNode_Registry_Property_ExW CM_Get_DevNode_Registry_Property_ExW@28=SETUPAPI.CM_Get_DevNode_Registry_Property_ExW
CM_Get_DevNode_Status=SETUPAPI.CM_Get_DevNode_Status CM_Get_DevNode_Status@16=SETUPAPI.CM_Get_DevNode_Status
CM_Get_DevNode_Status_Ex=SETUPAPI.CM_Get_DevNode_Status_Ex CM_Get_DevNode_Status_Ex@20=SETUPAPI.CM_Get_DevNode_Status_Ex
CM_Get_Device_IDA=SETUPAPI.CM_Get_Device_IDA CM_Get_Device_IDA@16=SETUPAPI.CM_Get_Device_IDA
CM_Get_Device_IDW=SETUPAPI.CM_Get_Device_IDW CM_Get_Device_IDW@16=SETUPAPI.CM_Get_Device_IDW
CM_Get_Device_ID_ExA=SETUPAPI.CM_Get_Device_ID_ExA CM_Get_Device_ID_ExA@20=SETUPAPI.CM_Get_Device_ID_ExA
CM_Get_Device_ID_ExW=SETUPAPI.CM_Get_Device_ID_ExW CM_Get_Device_ID_ExW@20=SETUPAPI.CM_Get_Device_ID_ExW
CM_Get_Device_ID_ListA=SETUPAPI.CM_Get_Device_ID_ListA CM_Get_Device_ID_ListA@16=SETUPAPI.CM_Get_Device_ID_ListA
CM_Get_Device_ID_ListW=SETUPAPI.CM_Get_Device_ID_ListW CM_Get_Device_ID_ListW@16=SETUPAPI.CM_Get_Device_ID_ListW
CM_Get_Device_ID_List_ExA=SETUPAPI.CM_Get_Device_ID_List_ExA CM_Get_Device_ID_List_ExA@20=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_ExW@20=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_SizeA@12=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_SizeW@12=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_ExA@16=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_List_Size_ExW@16=SETUPAPI.CM_Get_Device_ID_List_Size_ExA
CM_Get_Device_ID_Size=SETUPAPI.CM_Get_Device_ID_Size CM_Get_Device_ID_Size@12=SETUPAPI.CM_Get_Device_ID_Size
CM_Get_Device_ID_Size_Ex=SETUPAPI.CM_Get_Device_ID_Size_Ex CM_Get_Device_ID_Size_Ex@16=SETUPAPI.CM_Get_Device_ID_Size_Ex
;CM_Get_Device_Interface_AliasA ;CM_Get_Device_Interface_AliasA
;CM_Get_Device_Interface_AliasW ;CM_Get_Device_Interface_AliasW
;CM_Get_Device_Interface_Alias_ExA ;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_Device_Interface_List_Size_ExW
;CM_Get_First_Log_Conf ;CM_Get_First_Log_Conf
;CM_Get_First_Log_Conf_Ex ;CM_Get_First_Log_Conf_Ex
CM_Get_Global_State=SETUPAPI.CM_Get_Global_State CM_Get_Global_State@8=SETUPAPI.CM_Get_Global_State
CM_Get_Global_State_Ex=SETUPAPI.CM_Get_Global_State_Ex CM_Get_Global_State_Ex@12=SETUPAPI.CM_Get_Global_State_Ex
CM_Get_HW_Prof_FlagsA=SETUPAPI.CM_Get_HW_Prof_FlagsA CM_Get_HW_Prof_FlagsA@16=SETUPAPI.CM_Get_HW_Prof_FlagsA
CM_Get_HW_Prof_FlagsW=SETUPAPI.CM_Get_HW_Prof_FlagsW CM_Get_HW_Prof_FlagsW@16=SETUPAPI.CM_Get_HW_Prof_FlagsW
CM_Get_HW_Prof_Flags_ExA=SETUPAPI.CM_Get_HW_Prof_Flags_ExA CM_Get_HW_Prof_Flags_ExA@20=SETUPAPI.CM_Get_HW_Prof_Flags_ExA
CM_Get_HW_Prof_Flags_ExW=SETUPAPI.CM_Get_HW_Prof_Flags_ExW CM_Get_HW_Prof_Flags_ExW@20=SETUPAPI.CM_Get_HW_Prof_Flags_ExW
;CM_Get_Hardware_Profile_InfoA ;CM_Get_Hardware_Profile_InfoA
;CM_Get_Hardware_Profile_InfoW ;CM_Get_Hardware_Profile_InfoW
;CM_Get_Hardware_Profile_Info_ExA ;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_Log_Conf_Ex
;CM_Get_Next_Res_Des ;CM_Get_Next_Res_Des
;CM_Get_Next_Res_Des_Ex ;CM_Get_Next_Res_Des_Ex
CM_Get_Parent=SETUPAPI.CM_Get_Parent CM_Get_Parent@12=SETUPAPI.CM_Get_Parent
CM_Get_Parent_Ex=SETUPAPI.CM_Get_Parent_Ex CM_Get_Parent_Ex@16=SETUPAPI.CM_Get_Parent_Ex
;CM_Get_Res_Des_Data ;CM_Get_Res_Des_Data
;CM_Get_Res_Des_Data_Ex ;CM_Get_Res_Des_Data_Ex
;CM_Get_Res_Des_Data_Size ;CM_Get_Res_Des_Data_Size
;CM_Get_Res_Des_Data_Size_Ex ;CM_Get_Res_Des_Data_Size_Ex
CM_Get_Sibling=SETUPAPI.CM_Get_Sibling CM_Get_Sibling@12=SETUPAPI.CM_Get_Sibling
CM_Get_Sibling_Ex=SETUPAPI.CM_Get_Sibling_Ex CM_Get_Sibling_Ex@16=SETUPAPI.CM_Get_Sibling_Ex
CM_Get_Version=SETUPAPI.CM_Get_Version CM_Get_Version@0=SETUPAPI.CM_Get_Version
CM_Get_Version_Ex=SETUPAPI.CM_Get_Version_Ex CM_Get_Version_Ex@4=SETUPAPI.CM_Get_Version_Ex
;CM_Intersect_Range_List ;CM_Intersect_Range_List
;CM_Invert_Range_List ;CM_Invert_Range_List
CM_Is_Dock_Station_Present=SETUPAPI.CM_Is_Dock_Station_Present CM_Is_Dock_Station_Present@4=SETUPAPI.CM_Is_Dock_Station_Present
CM_Is_Dock_Station_Present_Ex=SETUPAPI.CM_Is_Dock_Station_Present_Ex CM_Is_Dock_Station_Present_Ex@8=SETUPAPI.CM_Is_Dock_Station_Present_Ex
CM_Locate_DevNodeA=SETUPAPI.CM_Locate_DevNodeA CM_Locate_DevNodeA@12=SETUPAPI.CM_Locate_DevNodeA
CM_Locate_DevNodeW=SETUPAPI.CM_Locate_DevNodeW CM_Locate_DevNodeW@12=SETUPAPI.CM_Locate_DevNodeW
CM_Locate_DevNode_ExA=SETUPAPI.CM_Locate_DevNode_ExA CM_Locate_DevNode_ExA@16=SETUPAPI.CM_Locate_DevNode_ExA
CM_Locate_DevNode_ExW=SETUPAPI.CM_Locate_DevNode_ExW CM_Locate_DevNode_ExW@16=SETUPAPI.CM_Locate_DevNode_ExW
;CM_Merge_Range_List ;CM_Merge_Range_List
;CM_Modify_Res_Des ;CM_Modify_Res_Des
;CM_Modify_Res_Des_Ex ;CM_Modify_Res_Des_Ex
CM_Move_DevNode=SETUPAPI.CM_Move_DevNode CM_Move_DevNode@12=SETUPAPI.CM_Move_DevNode
CM_Move_DevNode_Ex=SETUPAPI.CM_Move_DevNode_Ex CM_Move_DevNode_Ex@16=SETUPAPI.CM_Move_DevNode_Ex
;CM_Next_Range ;CM_Next_Range
CM_Open_Class_KeyA=SETUPAPI.CM_Open_Class_KeyA CM_Open_Class_KeyA@24=SETUPAPI.CM_Open_Class_KeyA
CM_Open_Class_KeyW=SETUPAPI.CM_Open_Class_KeyW CM_Open_Class_KeyW@24=SETUPAPI.CM_Open_Class_KeyW
CM_Open_Class_Key_ExA=SETUPAPI.CM_Open_Class_Key_ExA CM_Open_Class_Key_ExA@28=SETUPAPI.CM_Open_Class_Key_ExA
CM_Open_Class_Key_ExW=SETUPAPI.CM_Open_Class_Key_ExW CM_Open_Class_Key_ExW@28=SETUPAPI.CM_Open_Class_Key_ExW
CM_Open_DevNode_Key=SETUPAPI.CM_Open_DevNode_Key CM_Open_DevNode_Key@24=SETUPAPI.CM_Open_DevNode_Key
CM_Open_DevNode_Key_Ex=SETUPAPI.CM_Open_DevNode_Key_Ex CM_Open_DevNode_Key_Ex@28=SETUPAPI.CM_Open_DevNode_Key_Ex
;CM_Query_Arbitrator_Free_Data ;CM_Query_Arbitrator_Free_Data
;CM_Query_Arbitrator_Free_Data_Ex ;CM_Query_Arbitrator_Free_Data_Ex
;CM_Query_Arbitrator_Free_Size ;CM_Query_Arbitrator_Free_Size
;CM_Query_Arbitrator_Free_Size_Ex ;CM_Query_Arbitrator_Free_Size_Ex
;CM_Query_Remove_SubTree ;CM_Query_Remove_SubTree
;CM_Query_Remove_SubTree_Ex ;CM_Query_Remove_SubTree_Ex
CM_Reenumerate_DevNode=SETUPAPI.CM_Reenumerate_DevNode CM_Reenumerate_DevNode@8=SETUPAPI.CM_Reenumerate_DevNode
CM_Reenumerate_DevNode_Ex=SETUAPI.CM_Reenumerate_DevNode_Ex CM_Reenumerate_DevNode_Ex@12=SETUAPI.CM_Reenumerate_DevNode_Ex
;CM_Register_Device_Driver ;CM_Register_Device_Driver
;CM_Register_Device_Driver_Ex ;CM_Register_Device_Driver_Ex
;CM_Register_Device_InterfaceA ;CM_Register_Device_InterfaceA
@ -187,29 +181,29 @@ CM_Reenumerate_DevNode_Ex=SETUAPI.CM_Reenumerate_DevNode_Ex
;CM_Remove_Unmarked_Children_Ex ;CM_Remove_Unmarked_Children_Ex
;CM_Request_Device_EjectA ;CM_Request_Device_EjectA
;CM_Request_Device_EjectW ;CM_Request_Device_EjectW
CM_Request_Eject_PC=SETUPAPI.CM_Request_Eject_PC CM_Request_Eject_PC@0=SETUPAPI.CM_Request_Eject_PC
CM_Request_Eject_PC_Ex=SETUPAPI.CM_Request_Eject_PC_Ex CM_Request_Eject_PC_Ex@4=SETUPAPI.CM_Request_Eject_PC_Ex
;CM_Reset_Children_Marks ;CM_Reset_Children_Marks
;CM_Reset_Children_Marks_Ex ;CM_Reset_Children_Marks_Ex
CM_Run_Detection=SETUPAPI.CM_Run_Detection CM_Run_Detection@4=SETUPAPI.CM_Run_Detection
CM_Run_Detection_Ex=SETUPAPI.CM_Run_Detection_Ex CM_Run_Detection_Ex@8=SETUPAPI.CM_Run_Detection_Ex
CM_Set_DevNode_Problem=SETUPAPI.CM_Set_DevNode_Problem CM_Set_DevNode_Problem@12=SETUPAPI.CM_Set_DevNode_Problem
CM_Set_DevNode_Problem_Ex=SETUPAPI.CM_Set_DevNode_Problem_Ex CM_Set_DevNode_Problem_Ex@16=SETUPAPI.CM_Set_DevNode_Problem_Ex
CM_Set_DevNode_Registry_PropertyA=SETUPAPI.CM_Set_DevNode_Registry_PropertyA CM_Set_DevNode_Registry_PropertyA@20=SETUPAPI.CM_Set_DevNode_Registry_PropertyA
CM_Set_DevNode_Registry_PropertyW=SETUPAPI.CM_Set_DevNode_Registry_PropertyW CM_Set_DevNode_Registry_PropertyW@20=SETUPAPI.CM_Set_DevNode_Registry_PropertyW
CM_Set_DevNode_Registry_Property_ExA=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA CM_Set_DevNode_Registry_Property_ExA@24=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA
CM_Set_DevNode_Registry_Property_ExW=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW CM_Set_DevNode_Registry_Property_ExW@24=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW
;CM_Set_HW_Prof ;CM_Set_HW_Prof
;CM_Set_HW_Prof_Ex ;CM_Set_HW_Prof_Ex
CM_Set_HW_Prof_FlagsA=SETUPAPI.CM_Set_HW_Prof_FlagsA CM_Set_HW_Prof_FlagsA@16=SETUPAPI.CM_Set_HW_Prof_FlagsA
CM_Set_HW_Prof_FlagsW=SETUPAPI.CM_Set_HW_Prof_FlagsW CM_Set_HW_Prof_FlagsW@16=SETUPAPI.CM_Set_HW_Prof_FlagsW
CM_Set_HW_Prof_Flags_ExA=SETUPAPI.CM_Set_HW_Prof_Flags_ExA CM_Set_HW_Prof_Flags_ExA@20=SETUPAPI.CM_Set_HW_Prof_Flags_ExA
CM_Set_HW_Prof_Flags_ExW=SETUPAPI.CM_Set_HW_Prof_Flags_ExW CM_Set_HW_Prof_Flags_ExW@20=SETUPAPI.CM_Set_HW_Prof_Flags_ExW
CM_Setup_DevNode=SETUPAPI.CM_Setup_DevNode CM_Setup_DevNode@8=SETUPAPI.CM_Setup_DevNode
CM_Setup_DevNode_Ex=SETUPAPI.CM_Setup_DevNode_Ex CM_Setup_DevNode_Ex@12=SETUPAPI.CM_Setup_DevNode_Ex
;CM_Test_Range_Available ;CM_Test_Range_Available
CM_Uninstall_DevNode=SETUPAPI.CM_Uninstall_DevNode CM_Uninstall_DevNode@8=SETUPAPI.CM_Uninstall_DevNode
CM_Uninstall_DevNode_Ex=SETUPAPI.CM_Uninstall_DevNode_Ex CM_Uninstall_DevNode_Ex@12=SETUPAPI.CM_Uninstall_DevNode_Ex
;CM_Unregister_Device_InterfaceA ;CM_Unregister_Device_InterfaceA
;CM_Unregister_Device_InterfaceW ;CM_Unregister_Device_InterfaceW
;CM_Unregister_Device_Interface_ExA ;CM_Unregister_Device_Interface_ExA

1
reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild
View file

@ -3,6 +3,5 @@
<linkerflag>-nostdlib</linkerflag> <linkerflag>-nostdlib</linkerflag>
<linkerflag>-lgcc</linkerflag> <linkerflag>-lgcc</linkerflag>
<importlibrary definition="cfgmgr32.def" /> <importlibrary definition="cfgmgr32.def" />
<library>setupapi</library>
<file>cfgmgr32.rc</file> <file>cfgmgr32.rc</file>
</module> </module>

1
reactos/dll/win32/kernel32/kernel32.rbuild
View file

@ -128,6 +128,7 @@
<library>ntdll</library> <library>ntdll</library>
<linkerflag>-lgcc</linkerflag> <linkerflag>-lgcc</linkerflag>
<linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostartfiles</linkerflag>
<linkerflag>-nostdlib</linkerflag>
<file>kernel32.rc</file> <file>kernel32.rc</file>
</module> </module>
<directory name="tests"> <directory name="tests">

2
reactos/dll/win32/msvcrt/msvcrt.rbuild
View file

@ -1,5 +1,7 @@
<module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll"> <module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll">
<linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostartfiles</linkerflag>
<linkerflag>--enable-stdcall-fixup</linkerflag>
<linkerflag>-nostdlib</linkerflag>
<linkerflag>-lgcc</linkerflag> <linkerflag>-lgcc</linkerflag>
<importlibrary definition="msvcrt.def" /> <importlibrary definition="msvcrt.def" />
<include base="msvcrt">.</include> <include base="msvcrt">.</include>

1
reactos/dll/win32/shlwapi/shlwapi.rbuild
View file

@ -9,6 +9,7 @@
<define name="WINVER">0x501</define> <define name="WINVER">0x501</define>
<define name="_SHLWAPI_"/> <define name="_SHLWAPI_"/>
<define name="WINSHLWAPI">""</define> <define name="WINSHLWAPI">""</define>
<linkerflag>-nostdlib</linkerflag>
<linkerflag>-lgcc</linkerflag> <linkerflag>-lgcc</linkerflag>
<library>wine</library> <library>wine</library>
<library>uuid</library> <library>uuid</library>

1
reactos/ntoskrnl/ntoskrnl.rbuild
View file

@ -329,5 +329,6 @@
</directory> </directory>
<file>ntoskrnl.rc</file> <file>ntoskrnl.rc</file>
<linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostartfiles</linkerflag>
<linkerflag>-nostdlib</linkerflag>
<linkerflag>-lgcc</linkerflag> <linkerflag>-lgcc</linkerflag>
</module> </module>

4
reactos/tools/rbuild/backend/mingw/mingw.cpp
View file

@ -420,8 +420,8 @@ MingwBackend::GenerateGlobalVariables () const
fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" );
fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" );
fprintf ( fMakefile, "PROJECT_LFLAGS := %s %s\n", fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n",
GenerateProjectLFLAGS ().c_str (), "-Wl,--enable-stdcall-fixup" ); GenerateProjectLFLAGS ().c_str () );
fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" );
fprintf ( fMakefile, "\n" ); fprintf ( fMakefile, "\n" );

11
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -1564,15 +1564,15 @@ MingwModuleHandler::GenerateLinkerCommand (
killAt.c_str () ); killAt.c_str () );
fprintf ( fMakefile, 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 (), linker.c_str (),
GetLinkerMacro ().c_str (),
linkerParameters.c_str (), linkerParameters.c_str (),
linkerScriptArgument.c_str (), linkerScriptArgument.c_str (),
temp_exp.c_str (), temp_exp.c_str (),
target.c_str (), target.c_str (),
objectsMacro.c_str (), objectsMacro.c_str (),
libsMacro.c_str () ); libsMacro.c_str (),
GetLinkerMacro ().c_str () );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n",
@ -2263,7 +2263,7 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ()
fprintf ( fMakefile, fprintf ( fMakefile,
"\t%s %s -o $@ %s %s\n\n", "\t%s %s -o $@ %s %s\n\n",
linker.c_str (), linker.c_str (),
GetLinkerMacro().c_str (), GetLinkerMacro ().c_str (),
objectsMacro.c_str (), objectsMacro.c_str (),
libsMacro.c_str () ); libsMacro.c_str () );
} }
@ -2742,7 +2742,8 @@ MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
fprintf ( fMakefile, 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 (), junk_tmp.c_str (),
objectsMacro.c_str (), objectsMacro.c_str (),
linkDepsMacro.c_str () ); linkDepsMacro.c_str () );

4
reactos/tools/rbuild/backend/mingw/modulehandler.h
View file

@ -278,7 +278,7 @@ public:
virtual HostType DefaultHost() { return HostFalse; } virtual HostType DefaultHost() { return HostFalse; }
virtual void Process (); virtual void Process ();
std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; } std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; }
std::string TypeSpecificLinkerFlags() { return "-nostartfiles"; } std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
private: private:
void GenerateKernelModeDLLModuleTarget (); void GenerateKernelModeDLLModuleTarget ();
}; };
@ -291,7 +291,7 @@ public:
virtual HostType DefaultHost() { return HostFalse; } virtual HostType DefaultHost() { return HostFalse; }
virtual void Process (); virtual void Process ();
std::string TypeSpecificCFlags() { return "-D__NTDRIVER__ -D_SEH_NO_NATIVE_NLG"; } std::string TypeSpecificCFlags() { return "-D__NTDRIVER__ -D_SEH_NO_NATIVE_NLG"; }
std::string TypeSpecificLinkerFlags() { return "-nostartfiles"; } std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
private: private:
void GenerateKernelModeDriverModuleTarget (); void GenerateKernelModeDriverModuleTarget ();
}; };

8
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
View file

@ -371,9 +371,6 @@ MSVCBackend::_generate_vcproj ( const Module& module )
{ {
fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t<Tool\r\n" );
fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" );
if (module.GetEntryPoint(false) == "0")
fprintf ( OUT, "AdditionalOptions=\"/noentry\"" );
if (module.importLibrary != NULL) if (module.importLibrary != NULL)
fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str());
fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" );
@ -446,10 +443,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
} }
else if ( dll ) else if ( dll )
{ {
if (module.GetEntryPoint(false) == "0") fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false) == "" ? "DllMain" : module.GetEntryPoint(false).c_str ());
fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" );
else
fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false) == "" ? "" : "_", module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ());
fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ());
} }
fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );

2
reactos/tools/rbuild/module.cpp
View file

@ -835,7 +835,7 @@ Module::GetDefaultModuleEntrypoint () const
case NativeCUI: case NativeCUI:
return "NtProcessStartup@4"; return "NtProcessStartup@4";
case Win32DLL: case Win32DLL:
return "DllMainCRTStartup@12"; return "DllMain@12";
case Win32CUI: case Win32CUI:
case Test: case Test:
if ( isUnicode ) if ( isUnicode )