Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[ion] 19926: - Fix ETHREAD/PROCESS typos and add a function to psfuncs.h

by ion＠svn.reactos.com

- Fix ETHREAD/PROCESS typos and add a function to psfuncs.h Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/pstypes.h _____ Modified: trunk/reactos/include/ndk/psfuncs.h --- trunk/reactos/include/ndk/psfuncs.h 2005-12-06 01:09:09 UTC (rev 19925) +++ trunk/reactos/include/ndk/psfuncs.h 2005-12-06 01:53:03 UTC (rev 19926) @@ -74,6 +74,13 @@ PW32_CALLOUT_DATA CalloutData ); +VOID +NTAPI +PsReturnProcessNonPagedPoolQuota( + IN PEPROCESS Process, + IN ULONG_PTR Amount +); + // // Process Impersonation Functions // _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-12-06 01:09:09 UTC (rev 19925) +++ trunk/reactos/include/ndk/pstypes.h 2005-12-06 01:53:03 UTC (rev 19926) @@ -588,11 +588,11 @@ #include <pshpack4.h> typedef struct _ETHREAD { - KTHREAD Tcb; /* 1C0 */ - LARGE_INTEGER CreateTime; /* 1C0 */ - LARGE_INTEGER ExitTime; /* 1C0 */ + KTHREAD Tcb; /* 1B8 */ + LARGE_INTEGER CreateTime; /* 1B8 */ union { + LARGE_INTEGER ExitTime; /* 1C0 */ LIST_ENTRY LpcReplyChain; /* 1C0 */ LIST_ENTRY KeyedWaitChain; /* 1C0 */ }; @@ -609,12 +609,12 @@ PVOID KeyedWaitValue; /* 1D4 */ }; KSPIN_LOCK ActiveTimerListLock; /* 1D8 */ - LIST_ENTRY ActiveTimerListHead; /* 1D8 */ - CLIENT_ID Cid; /* 1E0 */ + LIST_ENTRY ActiveTimerListHead; /* 1DC */ + CLIENT_ID Cid; /* 1E4 */ union { - KSEMAPHORE LpcReplySemaphore; /* 1E4 */ - KSEMAPHORE KeyedReplySemaphore; /* 1E4 */ + KSEMAPHORE LpcReplySemaphore; /* 1EC */ + KSEMAPHORE KeyedReplySemaphore; /* 1EC */ }; union { @@ -747,7 +747,7 @@ LIST_ENTRY ThreadListHead; /* 184 */ PVOID SecurityPort; /* 188 */ PVOID PaeTop; /* 18C */ - ULONG ActiveThreds; /* 190 */ + ULONG ActiveThreads; /* 190 */ ACCESS_MASK GrantedAccess; /* 194 */ ULONG DefaultHardErrorProcessing; /* 198 */ NTSTATUS LastThreadExitStatus; /* 19C */

18 years, 9 months

[ion] 19925: - Make iofuncs.h standalone.

by ion＠svn.reactos.com

- Make iofuncs.h standalone. - Fix PWORD->PUSHORT Modified: trunk/reactos/include/ndk/iofuncs.h Modified: trunk/reactos/include/ndk/kdfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/rtl/network.c _____ Modified: trunk/reactos/include/ndk/iofuncs.h --- trunk/reactos/include/ndk/iofuncs.h 2005-12-06 01:08:33 UTC (rev 19924) +++ trunk/reactos/include/ndk/iofuncs.h 2005-12-06 01:09:09 UTC (rev 19925) @@ -23,6 +23,7 @@ // Dependencies // #include <umtypes.h> +#include <iotypes.h> // // Native calls _____ Modified: trunk/reactos/include/ndk/kdfuncs.h --- trunk/reactos/include/ndk/kdfuncs.h 2005-12-06 01:08:33 UTC (rev 19924) +++ trunk/reactos/include/ndk/kdfuncs.h 2005-12-06 01:09:09 UTC (rev 19925) @@ -97,6 +97,14 @@ NTAPI KdPortSave (VOID); +VOID +NTAPI +KdRestore(VOID); + +VOID +NTAPI +KdSave (VOID); + BOOLEAN NTAPI KdPortDisableInterrupts(VOID); _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-12-06 01:08:33 UTC (rev 19924) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-12-06 01:09:09 UTC (rev 19925) @@ -2307,7 +2307,7 @@ IN LPSTR AddressName, IN PVOID Address, IN PULONG ScopeId, - IN PWORD Port + IN PUSHORT Port ); NTSYSAPI @@ -2317,7 +2317,7 @@ IN LPWSTR AddressName, IN PVOID Address, IN PULONG ScopeId, - IN PWORD Port + IN PUSHORT Port ); _____ Modified: trunk/reactos/lib/rtl/network.c --- trunk/reactos/lib/rtl/network.c 2005-12-06 01:08:33 UTC (rev 19924) +++ trunk/reactos/lib/rtl/network.c 2005-12-06 01:09:09 UTC (rev 19925) @@ -249,7 +249,7 @@ RtlIpv6StringToAddressExA(IN LPSTR AddressName, IN PVOID Address, IN PULONG ScopeId, - IN PWORD Port) + IN PUSHORT Port) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -276,7 +276,7 @@ RtlIpv6StringToAddressExW(IN LPWSTR AddressName, IN PVOID Address, IN PULONG ScopeId, - IN PWORD Port) + IN PUSHORT Port) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

18 years, 9 months

[sedwards] 19924: linux fixes

by sedwards＠svn.reactos.com

linux fixes Modified: trunk/reactos/include/wine/config.h _____ Modified: trunk/reactos/include/wine/config.h --- trunk/reactos/include/wine/config.h 2005-12-05 23:28:48 UTC (rev 19923) +++ trunk/reactos/include/wine/config.h 2005-12-06 01:08:33 UTC (rev 19924) @@ -55,7 +55,7 @@ #define HAVE_DAYLIGHT 1 /* Define to 1 if you have the <direct.h> header file. */ -#define HAVE_DIRECT_H 1 +//#define HAVE_DIRECT_H 1 /* Define to 1 if you have the <dlfcn.h> header file. */ /* #undef HAVE_DLFCN_H */ @@ -217,7 +217,7 @@ /* #undef HAVE_IOKIT_IOKITLIB_H */ /* Define to 1 if you have the <io.h> header file. */ -#define HAVE_IO_H 1 +//#define HAVE_IO_H 1 /* Define to 1 if you have the <jack/jack.h> header file. */ /* #undef HAVE_JACK_JACK_H */ @@ -454,7 +454,7 @@ /* #undef HAVE_PREAD */ /* Define to 1 if you have the <process.h> header file. */ -#define HAVE_PROCESS_H 1 +// #define HAVE_PROCESS_H 1 /* Define to 1 if you have the `pthread_getattr_np' function. */ /* #undef HAVE_PTHREAD_GETATTR_NP */ @@ -853,7 +853,7 @@ #define HAVE__SPAWNVP 1 /* Define to 1 if you have the `_stricmp' function. */ -#define HAVE__STRICMP 1 +//#define HAVE__STRICMP 1 /* Define to 1 if you have the `_strnicmp' function. */ #define HAVE__STRNICMP 1

18 years, 9 months

[gvg] 19923: Move warranty info to license page

by gvg＠svn.reactos.com

Move warranty info to license page Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-12-05 22:29:36 UTC (rev 19922) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-12-05 23:28:48 UTC (rev 19923) @@ -35,7 +35,6 @@ START_PAGE, INTRO_PAGE, LICENSE_PAGE, - WARNING_PAGE, INSTALL_INTRO_PAGE, // SCSI_CONTROLLER_PAGE, @@ -701,6 +700,9 @@ SetTextXY(8, 19, "\x07 Press L to view the ReactOS Licensing Terms and Conditions"); SetTextXY(8, 21, "\x07 Press F3 to quit without installing ReactOS."); + SetTextXY(6, 23, "For more information on ReactOS, please visit:"); + SetHighlightedTextXY(6, 24, "http://www.reactos.org"); + SetStatusText(" ENTER = Continue R = Repair F3 = Quit"); if (IsUnattendedSetup) @@ -721,7 +723,7 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - return WARNING_PAGE; + return INSTALL_INTRO_PAGE; break; } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ @@ -747,23 +749,29 @@ static PAGE_NUMBER LicensePage(PINPUT_RECORD Ir) { - SetHighlightedTextXY(6, 8, "Licensing:"); + SetHighlightedTextXY(6, 6, "Licensing:"); - SetTextXY(8, 11, "The ReactOS System is licensed under the terms of the"); - SetTextXY(8, 12, "GNU GPL with parts containing code from other compatible"); - SetTextXY(8, 13, "licenses such as the X11 or BSD and GNU LGPL licenses."); - SetTextXY(8, 14, "All software that is part of the ReactOS system is"); - SetTextXY(8, 15, "therefore released under the GNU GPL as well as maintaining"); - SetTextXY(8, 16, "the original license."); + SetTextXY(8, 8, "The ReactOS System is licensed under the terms of the"); + SetTextXY(8, 9, "GNU GPL with parts containing code from other compatible"); + SetTextXY(8, 10, "licenses such as the X11 or BSD and GNU LGPL licenses."); + SetTextXY(8, 11, "All software that is part of the ReactOS system is"); + SetTextXY(8, 12, "therefore released under the GNU GPL as well as maintaining"); + SetTextXY(8, 13, "the original license."); - SetTextXY(8, 18, "This software comes with NO WARRANTY or restrictions on usage"); - SetTextXY(8, 19, "save applicable local and international law. The licensing of"); - SetTextXY(8, 20, "ReactOS only covers distribution to third parties."); + SetTextXY(8, 15, "This software comes with NO WARRANTY or restrictions on usage"); + SetTextXY(8, 16, "save applicable local and international law. The licensing of"); + SetTextXY(8, 17, "ReactOS only covers distribution to third parties."); - SetTextXY(8, 22, "If for some reason you did not receive a copy of the"); - SetTextXY(8, 23, "GNU General Public License with ReactOS please visit"); - SetHighlightedTextXY(8, 25, "http://www.gnu.org/licenses/licenses.html"); + SetTextXY(8, 18, "If for some reason you did not receive a copy of the"); + SetTextXY(8, 19, "GNU General Public License with ReactOS please visit"); + SetHighlightedTextXY(8, 20, "http://www.gnu.org/licenses/licenses.html"); + SetHighlightedTextXY(6, 22, "Warranty:"); + + SetTextXY(8, 24, "This is free software; see the source for copying conditions."); + SetTextXY(8, 25, "There is NO warranty; not even for MERCHANTABILITY or"); + SetTextXY(8, 26, "FITNESS FOR A PARTICULAR PURPOSE"); + SetStatusText(" ENTER = Return"); while (TRUE) @@ -780,47 +788,7 @@ return LICENSE_PAGE; } -/* - * Warning Page - * RETURNS - * Continues to setup - */ static PAGE_NUMBER -WarningPage(PINPUT_RECORD Ir) -{ - SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Warranty Statement"); - SetHighlightedTextXY(6, 8, "Warranty:"); - - SetTextXY(8, 11, "This is free software; see the source for copying conditions."); - SetTextXY(8, 12, "There is NO warranty; not even for MERCHANTABILITY or"); - SetTextXY(8, 13, "FITNESS FOR A PARTICULAR PURPOSE"); - - SetTextXY(8, 15, "For more information on ReactOS, please visit:"); - SetHighlightedTextXY(8, 16, "http://www.reactos.org"); - - SetStatusText(" F8 = Continue ESC = Exit"); - - while (TRUE) - { - ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F8)) /* F8 */ - { - return INSTALL_INTRO_PAGE; - break; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ - { - return QUIT_PAGE; - } - } - - return LICENSE_PAGE; -} - -static PAGE_NUMBER RepairIntroPage(PINPUT_RECORD Ir) { SetTextXY(6, 8, "ReactOS Setup is in an early development phase. It does not yet"); @@ -3719,11 +3687,6 @@ case LICENSE_PAGE: Page = LicensePage(&Ir); break; - - /* Warning page */ - case WARNING_PAGE: - Page = WarningPage(&Ir); - break; /* Intro page */ case INTRO_PAGE:

18 years, 9 months

[weiden] 19922: Patch by FRy2oo5 <fRy2oo5@gmail.com>:

by weiden＠svn.reactos.com

Patch by FRy2oo5 <fRy2oo5(a)gmail.com>: - Updated German translation of devmgr.dll Modified: trunk/reactos/lib/devmgr/De.rc _____ Modified: trunk/reactos/lib/devmgr/De.rc --- trunk/reactos/lib/devmgr/De.rc 2005-12-05 22:12:42 UTC (rev 19921) +++ trunk/reactos/lib/devmgr/De.rc 2005-12-05 22:29:36 UTC (rev 19922) @@ -19,6 +19,7 @@ IDS_DEVONPARENT "auf %1" IDS_TROUBLESHOOTDEV "Problem &l÷sen..." IDS_ENABLEDEV "Gerõt &aktivieren" + IDS_REINSTALLDRV "Treiber neu&installieren" END STRINGTABLE

18 years, 9 months

[ekohl] 19921: Change oldnames option from '-o' to '--oldnames'.

by ekohl＠svn.reactos.com

Change oldnames option from '-o' to '--oldnames'. Modified: trunk/reactos/include/idl/idl.xml Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/widl.c Modified: trunk/reactos/tools/widl/widl.man _____ Modified: trunk/reactos/include/idl/idl.xml --- trunk/reactos/include/idl/idl.xml 2005-12-05 22:06:58 UTC (rev 19920) +++ trunk/reactos/include/idl/idl.xml 2005-12-05 22:12:42 UTC (rev 19921) @@ -15,24 +15,24 @@ <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> - <file switches="-o">svcctl.idl</file> + <file switches="--oldnames">svcctl.idl</file> </module> <module name="scm_client" type="rpcclient"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> - <file switches="-o">svcctl.idl</file> + <file switches="--oldnames">svcctl.idl</file> </module> <module name="eventlog_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> - <file switches="-o">eventlogrpc.idl</file> + <file switches="--oldnames">eventlogrpc.idl</file> </module> <module name="eventlog_client" type="rpcclient"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> <define name="_X86_" /> - <file switches="-o">eventlogrpc.idl</file> + <file switches="--oldnames">eventlogrpc.idl</file> </module> </group> _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-12-05 22:06:58 UTC (rev 19920) +++ trunk/reactos/tools/widl/ChangeLog 2005-12-05 22:12:42 UTC (rev 19921) @@ -1,5 +1,12 @@ ChangeLog +2005-12-05 ekohl + + tools/widl/widl.c + tools/widl/widl.man + +- Change oldnames option from '-o' to '--oldnames'. + 2005-11-26 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/widl.c --- trunk/reactos/tools/widl/widl.c 2005-12-05 22:06:58 UTC (rev 19920) +++ trunk/reactos/tools/widl/widl.c 2005-12-05 22:12:42 UTC (rev 19921) @@ -30,6 +30,9 @@ #include <assert.h> #include <ctype.h> #include <signal.h> +#ifdef HAVE_GETOPT_H +# include <getopt.h> +#endif #define WIDL_FULLVERSION "0.1" @@ -58,7 +61,7 @@ " -H file Name of header file (default is infile.h)\n" " -I path Set include search dir to path (multiple -I allowed)\n" " -N Do not preprocess input\n" -" -o Use old naming conventions\n" +" --oldnames Use old naming conventions\n" " -p Generate proxy\n" " -P file Name of proxy file (default is infile_p.c)\n" " -s Generate server stub\n" @@ -116,6 +119,15 @@ static void rm_tempfile(void); static void segvhandler(int sig); +static const char* short_options = + "cC:d:D:EhH:I:NpP:sS:tT:VW"; + +static struct option long_options[] = { + {"oldnames", 0, 0, 1}, + { 0, 0, 0, 0 } +}; + + static char *make_token(const char *name) { char *token; @@ -139,13 +151,17 @@ extern int optind; int optc; int ret = 0; + int opti = 0; signal(SIGSEGV, segvhandler); now = time(NULL); - while((optc = getopt(argc, argv, "cC:d:D:EhH:I:NopP:sS:tT:VW")) != EOF) { + while((optc = getopt_long(argc, argv, short_options, long_options, &opti)) != EOF) { switch (optc) { + case 1: + old_names = 1; + break; case 'c': do_everything = 0; do_client = 1; @@ -176,9 +192,6 @@ case 'N': no_preprocess = 1; break; - case 'o': - old_names = 1; - break; case 'p': do_everything = 0; do_proxies = 1; _____ Modified: trunk/reactos/tools/widl/widl.man --- trunk/reactos/tools/widl/widl.man 2005-12-05 22:06:58 UTC (rev 19920) +++ trunk/reactos/tools/widl/widl.man 2005-12-05 22:12:42 UTC (rev 19921) @@ -4,7 +4,7 @@ .SH SYNOPSIS .BR "widl "\fI[options]\fR " \fIinfile.idl\fR" .SH DESCRIPTION -.B widl +.B widl is a Wine tool which purpose is to compile Interface Definition Language (IDL) files. .PP .SH OPTIONS @@ -14,6 +14,8 @@ The program prints the help info and then exits. .PP .B General options: +.IP \fB--oldnames\fR +Use old naming conventions. .IP \fB-V\fR Print version number and exits from the program. .PP @@ -28,7 +30,7 @@ .IP \fB-t\fR Generate a type library. .IP "\fB-T \fIfile\fR" -Define the name of the type library to be generated. +Define the name of the type library to be generated. The default filename is infile.tlb. .PP .B Proxy/stub generation options: @@ -47,7 +49,7 @@ .PP .B Preprocessor options: .IP "\fB-I \fIpath\fR" -Add a header search dir to path. Multiple search +Add a header search dir to path. Multiple search dirs are allowed. .IP "\fB-D \fIid[=val]\fR" Define preprocessor identifier id value. @@ -61,7 +63,7 @@ Enable pedantic warnings. .IP "\fB-d \fIn\fR" .nf -Set debug level to n. +Set debug level to n. n may be '0x01', '0x02', '0x04', '0x08', '0x10' or '0x20'. (See section \fBDebug\fR) .PP

18 years, 9 months

[gvg] 19920: Offer an explanation why AllocConsole() might have failed

by gvg＠svn.reactos.com

Offer an explanation why AllocConsole() might have failed Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-12-05 21:36:54 UTC (rev 19919) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-12-05 22:06:58 UTC (rev 19920) @@ -3679,7 +3679,9 @@ Status = AllocConsole(); if (!NT_SUCCESS(Status)) { - PrintString("AllocConsole() failed (Status = 0x%08lx)\n", Status); + PrintString("Unable to open the console (Status = 0x%08lx)\n\n", Status); + PrintString("The most common cause of this is using an USB keyboard\n"); + PrintString("USB keyboards are not fully supported yet\n"); /* Raise a hard error (crash the system/BSOD) */ NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED,

18 years, 9 months

[weiden] 19919: disable the device if the user selects "Do not show this dialog anymore". However, this doesn't work at the moment because disabling devices isn't implemented. Once it works, umpnpmgr shouldn't display the device installation wizard for disabled devices anymore.

by weiden＠svn.reactos.com

disable the device if the user selects "Do not show this dialog anymore". However, this doesn't work at the moment because disabling devices isn't implemented. Once it works, umpnpmgr shouldn't display the device installation wizard for disabled devices anymore. Modified: trunk/reactos/lib/newdev/newdev.c Modified: trunk/reactos/lib/newdev/newdev.h _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-12-05 21:04:44 UTC (rev 19918) +++ trunk/reactos/lib/newdev/newdev.c 2005-12-05 21:36:54 UTC (rev 19919) @@ -22,6 +22,118 @@ HINSTANCE hDllInstance; HANDLE hThread; +BOOL +CanDisableDevice(IN DEVINST DevInst, + IN HMACHINE hMachine, + OUT BOOL *CanDisable) +{ + CONFIGRET cr; + ULONG Status, ProblemNumber; + BOOL Ret = FALSE; + + cr = CM_Get_DevNode_Status_Ex(&Status, + &ProblemNumber, + DevInst, + 0, + hMachine); + if (cr == CR_SUCCESS) + { + *CanDisable = ((Status & DN_DISABLEABLE) != 0); + Ret = TRUE; + } + + return Ret; +} + + +BOOL +IsDeviceEnabled(IN DEVINST DevInst, + IN HMACHINE hMachine, + OUT BOOL *IsEnabled) +{ + CONFIGRET cr; + ULONG Status, ProblemNumber; + BOOL Ret = FALSE; + + cr = CM_Get_DevNode_Status_Ex(&Status, + &ProblemNumber, + DevInst, + 0, + hMachine); + if (cr == CR_SUCCESS) + { + *IsEnabled = ((Status & DN_STARTED) != 0); + Ret = TRUE; + } + + return Ret; +} + + +BOOL +EnableDevice(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DevInfoData OPTIONAL, + IN BOOL bEnable, + IN DWORD HardwareProfile OPTIONAL, + OUT BOOL *bNeedReboot OPTIONAL) +{ + SP_PROPCHANGE_PARAMS pcp; + SP_DEVINSTALL_PARAMS dp; + DWORD LastErr; + BOOL Ret = FALSE; + + pcp.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + pcp.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; + pcp.HwProfile = HardwareProfile; + + if (bEnable) + { + /* try to enable the device on the global profile */ + pcp.StateChange = DICS_ENABLE; + pcp.Scope = DICS_FLAG_GLOBAL; + + /* ignore errors */ + LastErr = GetLastError(); + if (SetupDiSetClassInstallParams(DeviceInfoSet, + DevInfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, + DeviceInfoSet, + DevInfoData); + } + SetLastError(LastErr); + } + + /* try config-specific */ + pcp.StateChange = (bEnable ? DICS_ENABLE : DICS_DISABLE); + pcp.Scope = DICS_FLAG_CONFIGSPECIFIC; + + if (SetupDiSetClassInstallParams(DeviceInfoSet, + DevInfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS)) && + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, + DeviceInfoSet, + DevInfoData)) + { + dp.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParams(DeviceInfoSet, + DevInfoData, + &dp)) + { + if (bNeedReboot != NULL) + { + *bNeedReboot = ((dp.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT)) != 0); + } + + Ret = TRUE; + } + } + return Ret; +} + /* * @unimplemented */ @@ -390,6 +502,7 @@ size_t nType; DWORD dwDrives; PDEVINSTDATA DevInstData; + DWORD config_flags; UINT i = 1; DevInstData = (PDEVINSTDATA)lpParam; @@ -419,6 +532,23 @@ i <<= 1; } + /* update device configuration */ + if(SetupDiGetDeviceRegistryProperty(DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDRP_CONFIGFLAGS, + NULL, + (BYTE *)&config_flags, + sizeof(config_flags), + NULL)) + { + config_flags |= CONFIGFLAG_FAILEDINSTALL; + SetupDiSetDeviceRegistryProperty( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDRP_CONFIGFLAGS, + NULL, 0 ); + } + PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 0, 0); return 0; } @@ -515,6 +645,7 @@ case WM_INITDIALOG: { HWND hwndControl; + BOOL DisableableDevice = FALSE; DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); @@ -529,14 +660,21 @@ WM_SETFONT, (WPARAM)DevInstData->hTitleFont, (LPARAM)TRUE); + + /* disable the "do not show this dialog anymore" checkbox + if the device cannot be disabled */ + CanDisableDevice(DevInstData->devInfoData.DevInst, + NULL, + &DisableableDevice); + EnableWindow(GetDlgItem(hwndDlg, + IDC_DONOTSHOWDLG), + DisableableDevice); } break; case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; - DWORD config_flags; - BOOL ret; switch (lpnm->code) { @@ -551,28 +689,29 @@ break; case PSN_WIZFINISH: - /* Handle a Finish button click, if necessary */ - if (SendDlgItemMessage(hwndDlg, IDC_DONOTSHOWDLG, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) + { + BOOL DisableableDevice = FALSE; + BOOL IsEnabled = FALSE; + + if (CanDisableDevice(DevInstData->devInfoData.DevInst, + NULL, + &DisableableDevice) && + DisableableDevice && + IsDeviceEnabled(DevInstData->devInfoData.DevInst, + NULL, + &IsEnabled) && + IsEnabled && + SendDlgItemMessage(hwndDlg, IDC_DONOTSHOWDLG, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) { - - if(SetupDiGetDeviceRegistryProperty(DevInstData->hDevInfo, - &DevInstData->devInfoData, - SPDRP_CONFIGFLAGS, - NULL, - (BYTE *)&config_flags, - sizeof(config_flags), - NULL)) - { - config_flags |= CONFIGFLAG_FAILEDINSTALL; - ret = SetupDiSetDeviceRegistryProperty( - DevInstData->hDevInfo, - &DevInstData->devInfoData, - SPDRP_CONFIGFLAGS, - NULL, 0 ); - } - + /* disable the device */ + EnableDevice(DevInstData->hDevInfo, + &DevInstData->devInfoData, + FALSE, + 0, + NULL); } break; + } default: break; _____ Modified: trunk/reactos/lib/newdev/newdev.h --- trunk/reactos/lib/newdev/newdev.h 2005-12-05 21:04:44 UTC (rev 19918) +++ trunk/reactos/lib/newdev/newdev.h 2005-12-05 21:36:54 UTC (rev 19919) @@ -2,6 +2,7 @@ #include <commctrl.h> #include <regstr.h> #include <setupapi.h> +#include <cfgmgr32.h> #include <tchar.h> #include <stdio.h>

18 years, 9 months

[greatlrd] 19918: adding debug trace for all dx api

by greatlrd＠svn.reactos.com

adding debug trace for all dx api Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-05 20:24:53 UTC (rev 19917) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-05 21:04:44 UTC (rev 19918) @@ -21,6 +21,8 @@ DD_Cleanup(PVOID ObjectBody) { PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(ObjectBody, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("DD_Cleanup"); + if (!pDirectDraw) return FALSE; @@ -37,6 +39,7 @@ DD_CALLBACKS callbacks; DD_SURFACECALLBACKS surface_callbacks; DD_PALETTECALLBACKS palette_callbacks; + DPRINT1("NtGdiDdCreateDirectDrawObject"); RtlZeroMemory(&callbacks, sizeof(DD_CALLBACKS)); callbacks.dwSize = sizeof(DD_CALLBACKS); @@ -109,6 +112,7 @@ HANDLE hDirectDrawLocal ) { + DPRINT1("NtGdiDdDeleteDirectDrawObject"); return GDIOBJ_FreeObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); } @@ -127,6 +131,8 @@ ) { PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdQueryDirectDrawObject"); + if (!pDirectDraw) return FALSE; @@ -178,6 +184,8 @@ DWORD ddRVal; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdGetDriverInfo"); + if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -209,6 +217,7 @@ { DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; + DPRINT1("NtGdiDdCreateSurface"); PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) @@ -242,7 +251,9 @@ { DWORD ddRVal; PDD_DIRECTDRAW_GLOBAL lgpl; + DPRINT1("NtGdiDdWaitForVerticalBlank"); + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -272,9 +283,10 @@ ) { DWORD ddRVal; - PDD_DIRECTDRAW_GLOBAL lgpl; + PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdCanCreateSurface"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -306,6 +318,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdGetScanLine"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -344,6 +357,7 @@ DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdDestroySurface"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -382,6 +396,8 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceTarget, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdFlip"); + if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -414,6 +430,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdLock"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -445,6 +462,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdUnlock"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -477,6 +495,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDest, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdBlt"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -508,6 +527,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdSetColorKey"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -541,6 +561,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceAttached, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdAddAttachedSurface"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -572,6 +593,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdGetBltStatus"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -603,6 +625,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdGetFlipStatus"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -635,6 +658,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDestination, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdUpdateOverlay"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -667,6 +691,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDestination, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdSetOverlayPosition"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -700,6 +725,7 @@ /* FIXME: implement * PDD_SURFACE pDDSurf = PVOID pDDSurf */ + DPRINT1("DDSURF_Cleanup"); return TRUE; } @@ -713,6 +739,7 @@ ) { PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdCreateSurfaceObject"); if (!pDirectDraw) return NULL; @@ -743,6 +770,7 @@ HANDLE hSurface ) { + DPRINT1("NtGdiDdDeleteSurfaceObject"); return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); } @@ -789,6 +817,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdGetAvailDriverMemory"); /* backup the orignal PDev and info */ lgpl = puGetAvailDriverMemoryData->lpDD; @@ -820,6 +849,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); + DPRINT1("NtGdiDdSetExclusiveMode"); /* backup the orignal PDev and info */ lgpl = puSetExclusiveModeData->lpDD;

18 years, 9 months

[weiden] 19917: add stub for SetupDiSetClassInstallParamsW

by weiden＠svn.reactos.com

add stub for SetupDiSetClassInstallParamsW Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-05 20:23:23 UTC (rev 19916) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-05 20:24:53 UTC (rev 19917) @@ -2952,6 +2952,20 @@ return FALSE; } +/********************************************************************** * + * SetupDiSetClassInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetClassInstallParamsW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_CLASSINSTALL_HEADER ClassInstallParams, + DWORD ClassInstallParamsSize) +{ + FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData, + ClassInstallParams->InstallFunction, ClassInstallParamsSize); + return FALSE; +} + static DWORD GetFunctionPointer( IN PWSTR InstallerName, _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-12-05 20:23:23 UTC (rev 19916) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-12-05 20:24:53 UTC (rev 19917) @@ -373,7 +373,7 @@ @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) -@ stub SetupDiSetClassInstallParamsW +@ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) @ stub SetupDiSetDeviceInstallParamsA @ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long)

18 years, 9 months

← Newer
1
...
55
56
57
58
59
60
61
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005