Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 20687: fix msvc compile problems
by cwittich＠svn.reactos.org 08 Jan '06

08 Jan '06

fix msvc compile problems Modified: trunk/reactos/lib/cpl/intl/es.rc Modified: trunk/reactos/lib/cpl/intl/hu.rc _____ Modified: trunk/reactos/lib/cpl/intl/es.rc --- trunk/reactos/lib/cpl/intl/es.rc 2006-01-07 23:45:59 UTC (rev 20686) +++ trunk/reactos/lib/cpl/intl/es.rc 2006-01-08 00:01:16 UTC (rev 20687) @@ -50,10 +50,10 @@ LTEXT "SÝmbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE - LTEXT "Formato de Notaci¾n del Tiempo\n\n" - "h = hora m = minuto s = segundo t = am ¾ pm\n\n" - "h = 12 houras H = 24 houras\n" - "hh, mm, ss = cero inicial h, m, s = sin cero inicial", + LTEXT "Formato de Notaci¾n del Tiempo\n\n\ + h = hora m = minuto s = segundo t = am ¾ pm\n\n\ + h = 12 houras H = 24 houras\n\ + hh, mm, ss = cero inicial h, m, s = sin cero inicial", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/hu.rc --- trunk/reactos/lib/cpl/intl/hu.rc 2006-01-07 23:45:59 UTC (rev 20686) +++ trunk/reactos/lib/cpl/intl/hu.rc 2006-01-08 00:01:16 UTC (rev 20687) @@ -45,10 +45,10 @@ LTEXT "&DÚlutßn jele:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE - LTEXT "Id§formßtum jel÷lÚse\n\n" - "o = ¾ra p = perc m = mßsodperc n = de. vagy du.\n\n" - "o = 12 ¾rßs O = 24 ¾rßs\n" - "oo, pp, mm = nulla hasznßlata o, p, m = nincs nulla", + LTEXT "Id§formßtum jel÷lÚse\n\n\ + o = ¾ra p = perc m = mßsodperc n = de. vagy du.\n\n\ + o = 12 ¾rßs O = 24 ¾rßs\n\ + oo, pp, mm = nulla hasznßlata o, p, m = nincs nulla", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END

1 0

[mbosma] 20686: German translation by DJ_Smith from IRC (dj_smith_reactos@online.de)
by mbosma＠svn.reactos.org 07 Jan '06

07 Jan '06

German translation by DJ_Smith from IRC (dj_smith_reactos(a)online.de) Modified: trunk/reactos/subsys/system/servman/De.rc _____ Modified: trunk/reactos/subsys/system/servman/De.rc --- trunk/reactos/subsys/system/servman/De.rc 2006-01-07 23:42:34 UTC (rev 20685) +++ trunk/reactos/subsys/system/servman/De.rc 2006-01-07 23:45:59 UTC (rev 20686) @@ -2,9 +2,9 @@ IDR_MAINMENU MENU BEGIN - POPUP "&File" + POPUP "&Datei" BEGIN - MENUITEM "E&xit",ID_FILE_EXIT + MENUITEM "B&eenden",ID_FILE_EXIT END POPUP "Action" BEGIN @@ -28,6 +28,46 @@ END END +IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,190,182 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "?ber den Service Manager" +FONT 8, "Tahoma" +BEGIN + CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,48,7,130,26 + DEFPUSHBUTTON "Schlie?en",IDOK,140,162,44,15,WS_GROUP + ICON IDI_SM_ICON,IDC_STATIC,12,7,30,20 + EDITTEXT IDC_LICENSE_EDIT,8,44,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + + +IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +CAPTION "Allgemein" +FONT 8,"MS Sans Serif",0,0 +STYLE 0x10CF0000 +BEGIN + CONTROL "Dienstname:",IDC_STATIC,"Static",0x50000000,4,11,53,11 + CONTROL "Anzeigename:",IDC_STATIC,"Static",0x50000000,4,29,53,11 + CONTROL "Beschreibung",IDC_STATIC,"Static",0x50000000,4,51,53,11 + CONTROL "",IDC_SERV_NAME,"Static",0x50000000,70,11,176,11 + CONTROL "",IDC_DISP_NAME,"Static",0x50001000,70,29,176,12 + CONTROL "",IDC_DESCRIPTION,"Static",0x50201000,70,46,176,22 + CONTROL "Pfad zum ausf³hrbarem Programm:",IDC_STATIC,"Static",0x50000000,6,73,150,9 + CONTROL "",IDC_STATIC,"Static",0x50001000,6,86,238,12 + CONTROL "Starttyp:",IDC_STATIC,"Static",0x50000000,6,108,53,11 + CONTROL "",IDC_START_TYPE,"ComboBox",0x50010003,70,107,176,11 + CONTROL "Status des Dienstes:",IDC_STATIC,"Static",0x50000000,4,138,100,11 + CONTROL "",IDC_SERV_STATUS,"Static",0x50000000,70,138,176,11 + CONTROL "Start",IDC_START,"Button",0x50010000,6,155,54,15 + CONTROL "Stopp",IDC_STOP,"Button",0x50010000,68,155,54,15 + CONTROL "Pause",IDC_PAUSE,"Button",0x50010000,130,155,54,15 + CONTROL "Fortsetzen",IDC_RESUME,"Button",0x50010000,192,155,54,15 + CONTROL "Sie k÷nnen die Startparameter festlegen, die verwendet werden, wenn Sie den Dienst von hier aus starten.",IDC_STATIC,"Static",0x50000000,6,177,240,15 + CONTROL "Startparameter",IDC_STATIC,"Static",0x50000000,6,199,53,11 + CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 +END + STRINGTABLE DISCARDABLE BEGIN IDS_FIRSTCOLUMN "Name" @@ -43,12 +83,29 @@ IDS_SERVICES_STATUS_STOPPED "Gestoppt" IDS_SERVICES_YES "Ja" IDS_SERVICES_UNKNOWN "Unbekannt" + IDS_SERVICES_AUTO "Automatisch" + IDS_SERVICES_MAN "Manuel" + IDS_SERVICES_DIS "Deaktiviert" END STRINGTABLE DISCARDABLE BEGIN IDS_SERVICES_NUM_SERVICES "Dienste: %d" IDB_START "res/start.bmp" + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + /*"This program is free software; you can redistribute it " + "and/or modify it under the terms of the GNU Lesser General " + "Public License as published by the Free Software Foundation; " + "either version 2.1 of the License, or (at your option) any " + "later version.\r\n\r\nThis program is distributed in the hope " + "that it will be useful, but WITHOUT ANY WARRANTY; without even " + "the implied warranty of MERCHANTABILITY or FITNESS FOR A " + "PARTICULAR PURPOSE. See the GNU General Public License for more " + "details.\r\n\r\nYou should have received a copy of the GNU " + "General Public License along with this program; if not, write " + "to the Free Software Foundation, Inc., 59 Temple Place - Suite " + "330, Boston, MA 02111-1307, USA." */ + END STRINGTABLE DISCARDABLE

1 0

[cwittich] 20685: fix msvc compile problem
by cwittich＠svn.reactos.org 07 Jan '06

07 Jan '06

fix msvc compile problem Modified: trunk/reactos/lib/cpl/desk/resource.h _____ Modified: trunk/reactos/lib/cpl/desk/resource.h --- trunk/reactos/lib/cpl/desk/resource.h 2006-01-07 23:41:42 UTC (rev 20684) +++ trunk/reactos/lib/cpl/desk/resource.h 2006-01-07 23:42:34 UTC (rev 20685) @@ -1,6 +1,8 @@ #ifndef __CPL_DESK_RESOURCE_H__ #define __CPL_DESK_RESOURCE_H__ +#include <commctrl.h> + /* metrics */ #define PROPSHEETWIDTH 246 #define PROPSHEETHEIGHT 228

1 0

[ros-diffs] [gvg] 20684: inet_addr returns address in network order, the IP address control wants it
by gvg＠svn.reactos.org 07 Jan '06

07 Jan '06

inet_addr returns address in network order, the IP address control wants it in host order Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c _____ Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c --- trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2006-01-07 23:34:23 UTC (rev 20683) +++ trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2006-01-07 23:41:42 UTC (rev 20684) @@ -179,15 +179,18 @@ while(pString->Next) pString = pString->Next; dwIPAddr = inet_addr(pString->IpAddress.String); - SendDlgItemMessage(hwndDlg,IDC_IPADDR,IPM_SETADDRESS,0,dwIPAddr); + SendDlgItemMessage(hwndDlg,IDC_IPADDR,IPM_SETADDRESS,0, + ntohl(dwIPAddr)); dwIPAddr = inet_addr(pString->IpMask.String); - SendDlgItemMessage(hwndDlg,IDC_SUBNETMASK,IPM_SETADDRESS,0,dwIPAddr); + SendDlgItemMessage(hwndDlg,IDC_SUBNETMASK,IPM_SETADDRESS,0, + ntohl(dwIPAddr)); pString = &pInfo->GatewayList; while(pString->Next) pString = pString->Next; dwIPAddr = inet_addr(pString->IpAddress.String); - SendDlgItemMessage(hwndDlg,IDC_DEFGATEWAY,IPM_SETADDRESS,0,dwIPAddr); + SendDlgItemMessage(hwndDlg,IDC_DEFGATEWAY,IPM_SETADDRESS,0, + ntohl(dwIPAddr)); } { @@ -208,7 +211,8 @@ while( NextDNSServer && StaticDNS < 2 ) { dwIPAddr = inet_addr(NextDNSServer); if( dwIPAddr != INADDR_NONE ) { - SendDlgItemMessage(hwndDlg,IDC_DNS1 + StaticDNS,IPM_SETADDRESS,0,dwIPAddr); + SendDlgItemMessage(hwndDlg,IDC_DNS1 + StaticDNS, + IPM_SETADDRESS,0,ntohl(dwIPAddr)); StaticDNS++; } NextDNSServer = strchr( pszDNS, ',' );

1 0

[mflyer] 20683: Proper IBrowser icon to replace the newyears version which was made in 9 minutes under influence of alcohol
by mflyer＠svn.reactos.org 07 Jan '06

07 Jan '06

Proper IBrowser icon to replace the newyears version which was made in 9 minutes under influence of alcohol Modified: trunk/reactos/subsys/system/ibrowser/res/ibrowser.ico _____ Modified: trunk/reactos/subsys/system/ibrowser/res/ibrowser.ico (Binary files differ)

1 0

[gvg] 20682: j_anderw <j_anderw@sbox.tugraz.at>:
by gvg＠svn.reactos.org 07 Jan '06

07 Jan '06

j_anderw <j_anderw(a)sbox.tugraz.at>: ReactOS system control panel displays wrong title Modified: trunk/reactos/lib/cpl/sysdm/resource.h _____ Modified: trunk/reactos/lib/cpl/sysdm/resource.h --- trunk/reactos/lib/cpl/sysdm/resource.h 2006-01-07 23:22:56 UTC (rev 20681) +++ trunk/reactos/lib/cpl/sysdm/resource.h 2006-01-07 23:25:02 UTC (rev 20682) @@ -24,6 +24,11 @@ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 +#define IDS_DRIVE 3000 +#define IDS_SPACE 3001 +#define IDS_MIN 3002 +#define IDS_REC 3003 +#define IDS_CUR 3004 /* controls */ #define IDC_LICENSEMEMO 101 @@ -83,15 +88,6 @@ #define IDC_RECOMMENDED 252 #define IDC_CURRENT 253 -#define IDS_DRIVE 1000 -#define IDS_SPACE 1001 -#define IDS_MIN 1002 -#define IDS_REC 1003 -#define IDS_CUR 1004 - - - - #endif /* __CPL_RESOURCE_H */ /* EOF */

1 0

[ion] 20681: - Temporarily revert 20639 until a better fix is found. Thanks to Gé.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Temporarily revert 20639 until a better fix is found. Thanks to Gé. Modified: trunk/reactos/tools/rbuild/module.cpp _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2006-01-07 23:13:08 UTC (rev 20680) +++ trunk/reactos/tools/rbuild/module.cpp 2006-01-07 23:22:56 UTC (rev 20681) @@ -817,7 +817,7 @@ case Kernel: return "_NtProcessStartup"; case KernelModeDLL: - return "DriverEntry"; + return "_DriverEntry@8"; case NativeDLL: return "_DllMainCRTStartup@12"; case NativeCUI: @@ -836,7 +836,7 @@ else return "_WinMainCRTStartup"; case KernelModeDriver: - return "DriverEntry"; + return "_DriverEntry@8"; case BuildTool: case StaticLibrary: case ObjectLibrary:

1 0

[cwittich] 20680: updated resource file (patch by Brezenbak)
by cwittich＠svn.reactos.org 07 Jan '06

07 Jan '06

updated resource file (patch by Brezenbak) Modified: trunk/reactos/subsys/system/msconfig/En.rc Modified: trunk/reactos/subsys/system/msconfig/resource.h _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2006-01-07 22:49:41 UTC (rev 20679) +++ trunk/reactos/subsys/system/msconfig/En.rc 2006-01-07 23:13:08 UTC (rev 20680) @@ -41,6 +41,65 @@ PUSHBUTTON "&Deactivate all",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 END +IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + GROUPBOX "Startup Selection", -1, 10, 10, 340, 150 + CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "&L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Boot Options", -1, 10, 80, 250, 90 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 50, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 50, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&Timeout:", -1, 280, 90, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 10, ES_LEFT + LTEXT "sec.", -1, 340, 90, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12 +END + STRINGTABLE DISCARDABLE BEGIN IDS_MSCONFIG "System configuration program" _____ Modified: trunk/reactos/subsys/system/msconfig/resource.h --- trunk/reactos/subsys/system/msconfig/resource.h 2006-01-07 22:49:41 UTC (rev 20679) +++ trunk/reactos/subsys/system/msconfig/resource.h 2006-01-07 23:13:08 UTC (rev 20680) @@ -5,6 +5,7 @@ #define IDD_STARTUP_PAGE 105 #define IDD_FREELDR_PAGE 106 #define IDD_SYSTEM_PAGE 107 +#define IDD_FREELDR_ADVANCED_PAGE 108 #define IDC_TAB 1001 #define IDC_BTN_APPLY 1002 @@ -18,6 +19,43 @@ #define IDC_BTN_SERVICES_DEACTIVATE 1010 #define IDC_BTN_STARTUP_ACTIVATE 1011 #define IDC_BTN_STARTUP_DEACTIVATE 1012 +#define IDC_CBX_NORMAL_START 1013 +#define IDC_CBX_DIAGNOSTIC_START 1014 +#define IDC_CBX_SELECTIVE_STARTUP 1015 +#define IDC_CBX_SYSTEM_INI 1016 +#define IDC_CBX_SYSTEM_SERVICE 1017 +#define IDC_CBX_STARTUP_ITEM 1018 +#define IDC_LIST_BOX 1019 +#define IDC_BTN_CHECK_BOOT_PATH 1020 +#define IDC_BTN_SET_DEFAULT_BOOT 1021 +#define IDC_BTN_MOVE_UP_BOOT_OPTION 1022 +#define IDC_BTN_MOVE_DOWN_BOOT_OPTION 1023 +#define IDC_CBX_SAFE_BOOT 1024 +#define IDC_CBX_NO_GUI_BOOT 1025 +#define IDC_CBX_BOOT_LOG 1026 +#define IDC_CBX_BASE_VIDEO 1027 +#define IDC_CBX_SOS 1028 +#define IDC_BTN_ADVANCED_OPTIONS 1029 +#define IDC_TXT_BOOT_TIMEOUT 1030 +#define IDC_CBX_MAX_MEM 1031 +#define IDC_TXT_MAX_MEM 1032 +#define IDC_SCR_MAX_MEM 1033 +#define IDC_CBX_NUM_PROC 1034 +#define IDC_DRP_NUM_PROC 1035 +#define IDC_CBX_PCI_LOCK 1036 +#define IDC_CBX_PROFILE 1037 +#define IDC_CBX_IRQ 1038 +#define IDC_TXT_IRQ 1039 +#define IDC_CBX_DEBUG 1040 +#define IDC_CBX_DEBUG_PORT 1041 +#define IDC_DRP_DEBUG_PORT 1042 +#define IDC_CBX_BAUD_RATE 1043 +#define IDC_DRP_DRP_BAUD_RATE 1044 +#define IDC_CBX_CHANNEL 1045 +#define IDC_TXT_CHANNEL 1046 +#define IDC_SCR_CHANNEL 1047 +#define IDC_OK 1048 +#define IDC_CANCEL 1049 #define IDS_TAB_TOOLS 2001 #define IDS_TAB_SYSTEM 2002

1 0

[ion] 20679: - Get xboxvmp to compile.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get xboxvmp to compile. Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2006-01-07 22:36:56 UTC (rev 20678) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2006-01-07 22:49:41 UTC (rev 20679) @@ -135,9 +135,9 @@ PVOID HwDeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket) { - BOOL Result; + BOOLEAN Result; - RequestPacket->StatusBlock->Status = STATUS_UNSUCCESSFUL; + RequestPacket->StatusBlock->Status = ERROR_INVALID_PARAMETER; switch (RequestPacket->IoControlCode) { @@ -230,13 +230,13 @@ default: VideoPortDebugPrint(Warn, "XboxVmpStartIO 0x%x not implemented\n"); - RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } if (Result) { - RequestPacket->StatusBlock->Status = STATUS_SUCCESS; + RequestPacket->StatusBlock->Status = NO_ERROR; } return TRUE; @@ -278,7 +278,7 @@ { VideoPortDebugPrint(Error, "XboxVmpGetPowerState is not supported\n"); - return ERROR_NOT_SUPPORTED; + return ERROR_INVALID_FUNCTION; } /* @@ -295,7 +295,7 @@ { VideoPortDebugPrint(Error, "XboxVmpSetPowerState not supported\n"); - return ERROR_NOT_SUPPORTED; + return ERROR_INVALID_FUNCTION; } /* @@ -304,7 +304,7 @@ * Sets the adapter to the specified operating mode. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpSetCurrentMode( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE RequestedMode, @@ -327,7 +327,7 @@ * at system boot. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpResetDevice( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PSTATUS_BLOCK StatusBlock) @@ -344,7 +344,7 @@ * space of the requestor. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpMapVideoMemory( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY RequestedAddress, @@ -356,13 +356,14 @@ SYSTEM_BASIC_INFORMATION BasicInfo; ULONG Length; + /* FIXME: this should probably be done differently, without native API */ StatusBlock->Information = sizeof(VIDEO_MEMORY_INFORMATION); FrameBuffer.u.HighPart = 0; - if (NT_SUCCESS(ZwQuerySystemInformation(SystemBasicInformation, + if (ZwQuerySystemInformation(SystemBasicInformation, (PVOID) &BasicInfo, sizeof(SYSTEM_BASIC_INFORMATION), - &Length))) + &Length) == NO_ERROR) { FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPageNumber * PAGE_SIZE; } @@ -398,7 +399,7 @@ * frame buffer and video RAM. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpUnmapVideoMemory( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY VideoMemory, @@ -418,7 +419,7 @@ * buffer for an IOCTL_VIDEO_QUERY_AVAIL_MODES request. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryNumAvailModes( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_NUM_MODES Modes, @@ -430,7 +431,7 @@ return TRUE; } -static BOOL +static BOOLEAN ReadfromSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG *Data_to_smbus) { int nRetriesToLive=50; @@ -508,7 +509,7 @@ } -static BOOL +static BOOLEAN I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return) { return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); @@ -520,7 +521,7 @@ * Returns information about each video mode supported by the adapter. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryAvailModes( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoMode, @@ -535,7 +536,7 @@ * Returns information about current video mode. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryCurrentMode( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoMode, _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2006-01-07 22:36:56 UTC (rev 20678) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2006-01-07 22:49:41 UTC (rev 20679) @@ -25,11 +25,35 @@ /* INCLUDES *******************************************************************/ +#ifdef _MSC_VER +#include "dderror.h" +#include "devioctl.h" +#define PAGE_SIZE 4096 +#else #include <ntddk.h> -#include <miniport.h> -#include <video.h> -#include <ndk/exfuncs.h> +#endif +#include "miniport.h" +#include "ntddvdeo.h" +#include "video.h" + +/* FIXME: NDK not compatible with miniport drivers */ +#define SystemBasicInformation 0 +typedef struct _SYSTEM_BASIC_INFORMATION +{ + ULONG Reserved; + ULONG TimerResolution; + ULONG PageSize; + ULONG NumberOfPhysicalPages; + ULONG LowestPhysicalPageNumber; + ULONG HighestPhysicalPageNumber; + ULONG AllocationGranularity; + ULONG MinimumUserModeAddress; + ULONG MaximumUserModeAddress; + KAFFINITY ActiveProcessorsAffinityMask; + CCHAR NumberOfProcessors; +} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION; + typedef struct { PHYSICAL_ADDRESS PhysControlStart; @@ -72,49 +96,49 @@ ULONG HwId, PVIDEO_POWER_MANAGEMENT VideoPowerControl); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpSetCurrentMode( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE RequestedMode, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpResetDevice( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpMapVideoMemory( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY RequestedAddress, PVIDEO_MEMORY_INFORMATION MapInformation, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpUnmapVideoMemory( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY VideoMemory, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryNumAvailModes( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_NUM_MODES Modes, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryAvailModes( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION ReturnedModes, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryCurrentMode( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoModeInfo, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpSetColorRegisters( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable,

1 0

[ion] 20678: - Make VBEMP compile with msvc/ddk.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Make VBEMP compile with msvc/ddk. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2006-01-07 22:34:25 UTC (rev 20677) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2006-01-07 22:36:56 UTC (rev 20678) @@ -110,7 +110,7 @@ ULONG Pos; int Result; VBE_MODEINFO TempModeInfo; - WORD TempModeNumber; + USHORT TempModeNumber; while (!Finished) { @@ -301,7 +301,7 @@ VBEDeviceExtension->ModeInfo = VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(VBE_MODEINFO), TAG_VBE); VBEDeviceExtension->ModeNumbers = - VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(WORD), TAG_VBE); + VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(USHORT), TAG_VBE); /* * Get the actual mode infos. @@ -404,9 +404,9 @@ PVOID HwDeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket) { - BOOL Result; + BOOLEAN Result; - RequestPacket->StatusBlock->Status = STATUS_UNSUCCESSFUL; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; switch (RequestPacket->IoControlCode) { @@ -507,12 +507,12 @@ break; default: - RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } if (Result) - RequestPacket->StatusBlock->Status = STATUS_SUCCESS; + RequestPacket->StatusBlock->Status = NO_ERROR; return TRUE; } @@ -615,7 +615,7 @@ &BiosRegisters); if (BiosRegisters.Eax == VBE_NOT_SUPPORTED) - return ERROR_NOT_SUPPORTED; + return ERROR_DEV_NOT_EXIST; if (BiosRegisters.Eax != VBE_SUCCESS) return ERROR_INVALID_FUNCTION; @@ -648,7 +648,7 @@ return NO_ERROR; } - return ERROR_NOT_SUPPORTED; + return ERROR_DEV_NOT_EXIST; } /* @@ -697,7 +697,7 @@ &BiosRegisters); if (BiosRegisters.Eax == VBE_NOT_SUPPORTED) - return ERROR_NOT_SUPPORTED; + return ERROR_DEV_NOT_EXIST; if (BiosRegisters.Eax != VBE_SUCCESS) return ERROR_INVALID_FUNCTION; @@ -710,7 +710,7 @@ * Sets the adapter to the specified operating mode. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBESetCurrentMode( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE RequestedMode, @@ -750,7 +750,7 @@ * at system boot. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEResetDevice( PVBE_DEVICE_EXTENSION DeviceExtension, PSTATUS_BLOCK StatusBlock) @@ -774,7 +774,7 @@ * space of the requestor. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEMapVideoMemory( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY RequestedAddress, @@ -831,7 +831,7 @@ * frame buffer and video RAM. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEUnmapVideoMemory( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY VideoMemory, @@ -850,7 +850,7 @@ * buffer for an IOCTL_VIDEO_QUERY_AVAIL_MODES request. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryNumAvailModes( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_NUM_MODES Modes, @@ -942,7 +942,7 @@ * Returns information about each video mode supported by the adapter. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryAvailModes( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION ReturnedModes, @@ -972,7 +972,7 @@ * Returns information about current video mode. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryCurrentMode( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoModeInfo, @@ -997,7 +997,7 @@ * yet implemented. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBESetColorRegisters( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable, _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2006-01-07 22:34:25 UTC (rev 20677) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2006-01-07 22:36:56 UTC (rev 20678) @@ -23,10 +23,17 @@ /* INCLUDES *******************************************************************/ +#ifdef _MSC_VER +#include "dderror.h" +#include "devioctl.h" +#else #include <ntddk.h> -#include <miniport.h> -#include <video.h> +#endif +#include "miniport.h" +#include "ntddvdeo.h" +#include "video.h" + #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_VBE TAG('V', 'B', 'E', ' ') @@ -91,15 +98,15 @@ typedef struct { CHAR Signature[4]; - WORD Version; - DWORD OemStringPtr; + USHORT Version; + ULONG OemStringPtr; LONG Capabilities; - DWORD VideoModePtr; - WORD TotalMemory; - WORD OemSoftwareRevision; - DWORD OemVendorNamePtr; - DWORD OemProductNamePtr; - DWORD OemProductRevPtr; + ULONG VideoModePtr; + USHORT TotalMemory; + USHORT OemSoftwareRevision; + ULONG OemVendorNamePtr; + ULONG OemProductNamePtr; + ULONG OemProductRevPtr; CHAR Reserved[222]; CHAR OemData[256]; } VBE_INFO, *PVBE_INFO; @@ -112,58 +119,58 @@ typedef struct { /* Mandatory information for all VBE revisions */ - WORD ModeAttributes; - BYTE WinAAttributes; - BYTE WinBAttributes; - WORD WinGranularity; - WORD WinSize; - WORD WinASegment; - WORD WinBSegment; - DWORD WinFuncPtr; - WORD BytesPerScanLine; + USHORT ModeAttributes; + UCHAR WinAAttributes; + UCHAR WinBAttributes; + USHORT WinGranularity; + USHORT WinSize; + USHORT WinASegment; + USHORT WinBSegment; + ULONG WinFuncPtr; + USHORT BytesPerScanLine; /* Mandatory information for VBE 1.2 and above */ - WORD XResolution; - WORD YResolution; - BYTE XCharSize; - BYTE YCharSize; - BYTE NumberOfPlanes; - BYTE BitsPerPixel; - BYTE NumberOfBanks; - BYTE MemoryModel; - BYTE BankSize; - BYTE NumberOfImagePages; - BYTE Reserved1; + USHORT XResolution; + USHORT YResolution; + UCHAR XCharSize; + UCHAR YCharSize; + UCHAR NumberOfPlanes; + UCHAR BitsPerPixel; + UCHAR NumberOfBanks; + UCHAR MemoryModel; + UCHAR BankSize; + UCHAR NumberOfImagePages; + UCHAR Reserved1; /* Direct Color fields (required for Direct/6 and YUV/7 memory models) */ - BYTE RedMaskSize; - BYTE RedFieldPosition; - BYTE GreenMaskSize; - BYTE GreenFieldPosition; - BYTE BlueMaskSize; - BYTE BlueFieldPosition; - BYTE ReservedMaskSize; - BYTE ReservedFieldPosition; - BYTE DirectColorModeInfo; + UCHAR RedMaskSize; + UCHAR RedFieldPosition; + UCHAR GreenMaskSize; + UCHAR GreenFieldPosition; + UCHAR BlueMaskSize; + UCHAR BlueFieldPosition; + UCHAR ReservedMaskSize; + UCHAR ReservedFieldPosition; + UCHAR DirectColorModeInfo; /* Mandatory information for VBE 2.0 and above */ - DWORD PhysBasePtr; - DWORD Reserved2; - WORD Reserved3; + ULONG PhysBasePtr; + ULONG Reserved2; + USHORT Reserved3; /* Mandatory information for VBE 3.0 and above */ - WORD LinBytesPerScanLine; - BYTE BnkNumberOfImagePages; - BYTE LinNumberOfImagePages; - BYTE LinRedMaskSize; - BYTE LinRedFieldPosition; - BYTE LinGreenMaskSize; - BYTE LinGreenFieldPosition; - BYTE LinBlueMaskSize; - BYTE LinBlueFieldPosition; - BYTE LinReservedMaskSize; - BYTE LinReservedFieldPosition; - DWORD MaxPixelClock; + USHORT LinBytesPerScanLine; + UCHAR BnkNumberOfImagePages; + UCHAR LinNumberOfImagePages; + UCHAR LinRedMaskSize; + UCHAR LinRedFieldPosition; + UCHAR LinGreenMaskSize; + UCHAR LinGreenFieldPosition; + UCHAR LinBlueMaskSize; + UCHAR LinBlueFieldPosition; + UCHAR LinReservedMaskSize; + UCHAR LinReservedFieldPosition; + ULONG MaxPixelClock; CHAR Reserved4[189]; } VBE_MODEINFO, *PVBE_MODEINFO; @@ -184,9 +191,9 @@ /* Saved information about video modes */ ULONG ModeCount; - WORD *ModeNumbers; + USHORT *ModeNumbers; PVBE_MODEINFO ModeInfo; - WORD CurrentMode; + USHORT CurrentMode; } VBE_DEVICE_EXTENSION, *PVBE_DEVICE_EXTENSION; VP_STATUS STDCALL @@ -223,49 +230,49 @@ ULONG HwId, PVIDEO_POWER_MANAGEMENT VideoPowerControl); -BOOL FASTCALL +BOOLEAN FASTCALL VBESetCurrentMode( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE RequestedMode, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEResetDevice( PVBE_DEVICE_EXTENSION DeviceExtension, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEMapVideoMemory( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY RequestedAddress, PVIDEO_MEMORY_INFORMATION MapInformation, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEUnmapVideoMemory( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY VideoMemory, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryNumAvailModes( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_NUM_MODES Modes, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryAvailModes( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION ReturnedModes, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryCurrentMode( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoModeInfo, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBESetColorRegisters( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs