Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[jimtabor] 16641: Implement GdiGetCharDimensions by Robert Shearman rob@codeweavers.com.

by jimtabor＠svn.reactos.com

Implement GdiGetCharDimensions by Robert Shearman rob(a)codeweavers.com. Modified: trunk/reactos/lib/gdi32/misc/stubs.c Modified: trunk/reactos/lib/gdi32/objects/font.c Modified: trunk/reactos/lib/gdi32/objects/text.c _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-19 03:13:11 UTC (rev 16640) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-19 11:18:40 UTC (rev 16641) @@ -2772,17 +2772,6 @@ return 0; } -/* - * @unimplemented - */ -DWORD -STDCALL -GdiGetCharDimensions(HDC hdc,LPTEXTMETRICW lptm,BOOL unk) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2005-07-19 03:13:11 UTC (rev 16640) +++ trunk/reactos/lib/gdi32/objects/font.c 2005-07-19 11:18:40 UTC (rev 16641) @@ -782,3 +782,49 @@ return rc; } + +/********************************************************************** * + * GdiGetCharDimensions + * + * Gets the average width of the characters in the English alphabet. + * + * PARAMS + * hdc [I] Handle to the device context to measure on. + * lptm [O] Pointer to memory to store the text metrics into. + * height [O] On exit, the maximum height of characters in the English alphabet. + * + * RETURNS + * The average width of characters in the English alphabet. + * + * NOTES + * This function is used by the dialog manager to get the size of a dialog + * unit. It should also be used by other pieces of code that need to know + * the size of a dialog unit in logical units without having access to the + * window handle of the dialog. + * Windows caches the font metrics from this function, but we don't and + * there doesn't appear to be an immediate advantage to do so. + * + * SEE ALSO + * GetTextExtentPointW, GetTextMetricsW, MapDialogRect. + */ +/* + * @implemented + */ +DWORD +STDCALL +GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, DWORD *height) +{ + SIZE sz; + static const WCHAR alphabet[] = { + 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q', + 'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G','H', + 'I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', 0}; + + if(lptm && !GetTextMetricsW(hdc, lptm)) return 0; + + if(!GetTextExtentPointW(hdc, alphabet, 52, &sz)) return 0; + + if (height) *height = sz.cy; + return (sz.cx / 26 + 1) / 2; +} + _____ Modified: trunk/reactos/lib/gdi32/objects/text.c --- trunk/reactos/lib/gdi32/objects/text.c 2005-07-19 03:13:11 UTC (rev 16640) +++ trunk/reactos/lib/gdi32/objects/text.c 2005-07-19 11:18:40 UTC (rev 16641) @@ -309,3 +309,5 @@ HeapFree( GetProcessHeap(), 0, nameW ); return res; } + +

19 years, 3 months

[jimtabor] 16640: Fixup UnrealizeObject so it can return the correct state for a Brush Object.

by jimtabor＠svn.reactos.com

Fixup UnrealizeObject so it can return the correct state for a Brush Object. Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-07-19 01:55:16 UTC (rev 16639) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-07-19 03:13:11 UTC (rev 16640) @@ -594,14 +594,14 @@ GDIOBJHDR * ptr; DWORD objectType; - + BOOL Ret = FALSE; UNIMPLEMENTED; ptr = GDIOBJ_LockObj(hgdiobj, GDI_OBJECT_TYPE_DONTCARE); if (ptr == 0) { SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; + return Ret; } objectType = GDIOBJ_GetObjectType(hgdiobj); switch(objectType) @@ -612,9 +612,16 @@ DPRINT1("GDI_OBJECT_TYPE_PALETTE\n"); break; } +/* + msdn.microsoft.com, + "Windows 2000/XP: If hgdiobj is a brush, UnrealizeObject does nothing, + and the function returns TRUE. Use SetBrushOrgEx to set the origin of + a brush." + */ case GDI_OBJECT_TYPE_BRUSH: { DPRINT1("GDI_OBJECT_TYPE_BRUSH\n"); + Ret = TRUE; break; } default: @@ -623,7 +630,7 @@ } GDIOBJ_UnlockObjByPtr(ptr); - return FALSE; + return Ret; } BOOL STDCALL

19 years, 3 months

[greatlrd] 16639: Cd does rember the cd c:\gcc and you can do c:

by greatlrd＠svn.reactos.com

Cd does rember the cd c:\gcc and you can do c: and it jump to c:\gcc not tested in reactos yet. but cd have other bugs that need to be fix. Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-19 01:36:54 UTC (rev 16638) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-19 01:55:16 UTC (rev 16639) @@ -271,7 +271,7 @@ if (!dir || !dir[0]) { TCHAR szPath[MAX_PATH]; - + GetCurrentDirectory (MAX_PATH, szPath); ConOutPuts (szPath); return 0; @@ -290,7 +290,7 @@ TCHAR szPath[MAX_PATH]; szRoot[0] = _totupper (dir[0]); - GetFullPathName (szRoot, MAX_PATH, szPath, NULL); + GetRootPath (szRoot, szPath,MAX_PATH); /* PathRemoveBackslash */ if (_tcslen (szPath) > 3) @@ -314,6 +314,7 @@ lpOldPath = (LPTSTR)malloc (MAX_PATH * sizeof(TCHAR)); GetCurrentDirectory (MAX_PATH, lpOldPath); + chdir(dir); if (!SetCurrentDirectory (dir)) { @@ -338,6 +339,7 @@ { FindClose(hSearch); // change folder + chdir(dir); if (!SetCurrentDirectory (FileData.cFileName)) { ConOutFormatMessage(GetLastError()); @@ -377,6 +379,7 @@ GetCurrentDirectory(MAX_PATH, dir); if (dir[0]!=lpOldPath[0]) { + chdir(lpOldPath); SetCurrentDirectory(lpOldPath); free(lpOldPath); }

19 years, 3 months

[greatlrd] 16638: make GetRootPath bit smarter

by greatlrd＠svn.reactos.com

make GetRootPath bit smarter Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 23:04:39 UTC (rev 16637) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-19 01:36:54 UTC (rev 16638) @@ -159,33 +159,44 @@ INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) { INT retcode = 1; - INT t; + if (_tcslen(InPath)>1) { - if (InPath[1]==_T(':')) + if (InPath[1]==_T(':')) { - for (t=0;t<32;t++) - { - if (_tgetdcwd(t,OutPath,size) != NULL) - { - if (_tcsncicmp(InPath,OutPath,2)) - { - retcode = 0; - return retcode; - } - } - } - } - } + TCHAR num[2]; + INT t=0; + + num[1] = _T('\0'); + num[0] = InPath[0]; + _tcslwr(num); + + if ((InPath[0] >= _T('0')) && (InPath[0] <= _T('9'))) + { + t = (InPath[0] - _T('0')) +28; + } + + if ((InPath[0] >= _T('a')) && (InPath[0] <= _T('z'))) + { + t = (InPath[0] - _T('a')) +1; + } + + if (_tgetdcwd(t,OutPath,size) != NULL) + { + return 0; + } + } + } - /* fail to getting path devic did not exists */ + /* fail */ if (_tcslen(InPath)>1) { if (InPath[1]==_T(':')) return 1; } + /* Get current directory */ retcode = GetCurrentDirectory(size,OutPath); if (retcode==0) return 1; @@ -220,6 +231,7 @@ nErrorLevel = 0; + /* The whole param string is our parameter these days. The only thing we do is eliminating every quotation mark */ /* Is it safe to change the characters param is pointing to? I presume it is, as there doesn't seem to be any post-processing of it after the function call (what would that accomplish?) */

19 years, 3 months

[greatlrd] 16637: make GetRootPath bit faster if it does not get a drive name with :

by greatlrd＠svn.reactos.com

make GetRootPath bit faster if it does not get a drive name with : Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 22:44:13 UTC (rev 16636) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 23:04:39 UTC (rev 16637) @@ -148,10 +148,10 @@ free (lpLastPath); } -/* help functions for getting current path from driver - without changing driver. Return code 0 = ok, 1 = fail. +/* help functions for getting current path from drive + without changing drive. Return code 0 = ok, 1 = fail. INT GetRootPath("C:",outbuffer,chater size of outbuffer); - the frist param can have any size, if the the two frist + the first param can have any size, if the the two frist letter are not a drive with : it will get Currentpath on current drive exacly as GetCurrentDirectory does. */ @@ -161,17 +161,23 @@ INT retcode = 1; INT t; - for (t=0;t<32;t++) - { - if (_tgetdcwd(t,OutPath,size) != NULL) - { - if (_tcsncicmp(InPath,OutPath,2)) - { - retcode = 0; - return retcode; - } - } - } + if (_tcslen(InPath)>1) + { + if (InPath[1]==_T(':')) + { + for (t=0;t<32;t++) + { + if (_tgetdcwd(t,OutPath,size) != NULL) + { + if (_tcsncicmp(InPath,OutPath,2)) + { + retcode = 0; + return retcode; + } + } + } + } + } /* fail to getting path devic did not exists */ if (_tcslen(InPath)>1)

19 years, 3 months

[greatlrd] 16636: add a new interal function call GetRootPath(TCHAR *InPath, TCHAR *OutPath, INT size) it get the a driver current path without change the current driver directory, it is not in use yet, prep for copy, cd, rm, and all other commands.

by greatlrd＠svn.reactos.com

add a new interal function call GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) it get the a driver current path without change the current driver directory, it is not in use yet, prep for copy, cd, rm, and all other commands. Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/precomp.h _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-07-18 19:50:23 UTC (rev 16635) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-07-18 22:44:13 UTC (rev 16636) @@ -291,6 +291,7 @@ /* Prototypes for MISC.C */ +INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size); TCHAR cgetchar (VOID); BOOL CheckCtrlBreak (INT); LPTSTR *split (LPTSTR, LPINT, BOOL); _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 19:50:23 UTC (rev 16635) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-18 22:44:13 UTC (rev 16636) @@ -148,6 +148,46 @@ free (lpLastPath); } +/* help functions for getting current path from driver + without changing driver. Return code 0 = ok, 1 = fail. + INT GetRootPath("C:",outbuffer,chater size of outbuffer); + the frist param can have any size, if the the two frist + letter are not a drive with : it will get Currentpath on + current drive exacly as GetCurrentDirectory does. + */ + +INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) +{ + INT retcode = 1; + INT t; + + for (t=0;t<32;t++) + { + if (_tgetdcwd(t,OutPath,size) != NULL) + { + if (_tcsncicmp(InPath,OutPath,2)) + { + retcode = 0; + return retcode; + } + } + } + + /* fail to getting path devic did not exists */ + if (_tcslen(InPath)>1) + { + if (InPath[1]==_T(':')) + return 1; + } + + retcode = GetCurrentDirectory(size,OutPath); + if (retcode==0) + return 1; + + return 0; +} + + /* * CD / CHDIR * _____ Modified: trunk/reactos/subsys/system/cmd/precomp.h --- trunk/reactos/subsys/system/cmd/precomp.h 2005-07-18 19:50:23 UTC (rev 16635) +++ trunk/reactos/subsys/system/cmd/precomp.h 2005-07-18 22:44:13 UTC (rev 16636) @@ -4,6 +4,8 @@ #include <shellapi.h> #include <tchar.h> +#include <direct.h> + #include <ctype.h> #include <string.h> #include <stdio.h> @@ -15,3 +17,4 @@ #include "cmd.h" #include "config.h" #include "batch.h" +

19 years, 3 months

[ion] 16635: - Fix nasty APC delivery bug (in case a Kernel-Mode Special APC still returned with a Normal Routine, the Normal Routine was called with incorrect values (Special Routines take PVOID* arguments, while Normal Routines do not!))

by ion＠svn.reactos.com

- Fix nasty APC delivery bug (in case a Kernel-Mode Special APC still returned with a Normal Routine, the Normal Routine was called with incorrect values (Special Routines take PVOID* arguments, while Normal Routines do not!)) - Remove APC from list before setting it to non-inserted. - Do proper thread termination piggybacking; terminate threads in user-mode as Hartmut correctly fixed. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-07-18 15:05:58 UTC (rev 16634) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-07-18 19:50:23 UTC (rev 16635) @@ -567,9 +567,9 @@ Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); /* Save Parameters so that it's safe to free the Object in Kernel Routine*/ - NormalRoutine = Apc->NormalRoutine; - KernelRoutine = Apc->KernelRoutine; - NormalContext = Apc->NormalContext; + NormalRoutine = Apc->NormalRoutine; + KernelRoutine = Apc->KernelRoutine; + NormalContext = Apc->NormalContext; SystemArgument1 = Apc->SystemArgument1; SystemArgument2 = Apc->SystemArgument2; @@ -577,8 +577,8 @@ if (NormalRoutine == NULL) { /* Remove the APC from the list */ + RemoveEntryList(ApcListEntry); Apc->Inserted = FALSE; - RemoveEntryList(ApcListEntry); /* Go back to APC_LEVEL */ KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); @@ -586,10 +586,10 @@ /* Call the Special APC */ DPRINT("Delivering a Special APC: %x\n", Apc); KernelRoutine(Apc, - &NormalRoutine, - &NormalContext, - &SystemArgument1, - &SystemArgument2); + &NormalRoutine, + &NormalContext, + &SystemArgument1, + &SystemArgument2); /* Raise IRQL and Lock again */ KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); @@ -612,8 +612,8 @@ } /* Dequeue the APC */ + Apc->Inserted = FALSE; RemoveEntryList(ApcListEntry); - Apc->Inserted = FALSE; /* Go back to APC_LEVEL */ KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); @@ -621,10 +621,10 @@ /* Call the Kernel APC */ DPRINT("Delivering a Normal APC: %x\n", Apc); KernelRoutine(Apc, - &NormalRoutine, - &NormalContext, - &SystemArgument1, - &SystemArgument2); + &NormalRoutine, + &NormalContext, + &SystemArgument1, + &SystemArgument2); /* If There still is a Normal Routine, then we need to call this at PASSIVE_LEVEL */ if (NormalRoutine != NULL) { @@ -635,7 +635,7 @@ /* Call and Raise IRQ back to APC_LEVEL */ DPRINT("Calling the Normal Routine for a Normal APC: %x\n", Apc); - NormalRoutine(&NormalContext, &SystemArgument1, &SystemArgument2); + NormalRoutine(NormalContext, SystemArgument1, SystemArgument2); KeRaiseIrql(APC_LEVEL, &OldIrql); } @@ -657,23 +657,23 @@ Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); /* Save Parameters so that it's safe to free the Object in Kernel Routine*/ - NormalRoutine = Apc->NormalRoutine; - KernelRoutine = Apc->KernelRoutine; - NormalContext = Apc->NormalContext; + NormalRoutine = Apc->NormalRoutine; + KernelRoutine = Apc->KernelRoutine; + NormalContext = Apc->NormalContext; SystemArgument1 = Apc->SystemArgument1; SystemArgument2 = Apc->SystemArgument2; /* Remove the APC from Queue, restore IRQL and call the APC */ RemoveEntryList(ApcListEntry); Apc->Inserted = FALSE; + KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); - KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); DPRINT("Calling the Kernel Routine for for a User APC: %x\n", Apc); KernelRoutine(Apc, - &NormalRoutine, - &NormalContext, - &SystemArgument1, - &SystemArgument2); + &NormalRoutine, + &NormalContext, + &SystemArgument1, + &SystemArgument2); if (NormalRoutine == NULL) { @@ -685,11 +685,11 @@ /* Set up the Trap Frame and prepare for Execution in NTDLL.DLL */ DPRINT("Delivering a User APC: %x\n", Apc); KiInitializeUserApc(Reserved, - TrapFrame, - NormalRoutine, - NormalContext, - SystemArgument1, - SystemArgument2); + TrapFrame, + NormalRoutine, + NormalContext, + SystemArgument1, + SystemArgument2); } } else { _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-07-18 15:05:58 UTC (rev 16634) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-07-18 19:50:23 UTC (rev 16635) @@ -346,18 +346,23 @@ PVOID* SystemArgument1, PVOID* SystemArguemnt2) { - NTSTATUS ExitStatus = (NTSTATUS)Apc->NormalContext; + DPRINT1("PsExitSpecialApc called: 0x%x (proc: 0x%x)\n", + PsGetCurrentThread(), PsGetCurrentProcess()); - DPRINT("PsExitSpecialApc called: 0x%x (proc: 0x%x)\n", PsGetCurrentThread(), PsGetCurrentProcess()); + /* Don't do anything unless we are in User-Mode */ + if (Apc->SystemArgument2) + { + NTSTATUS ExitStatus = (NTSTATUS)Apc->NormalContext; - /* Free the APC */ - ExFreePool(Apc); + /* Free the APC */ + ExFreePool(Apc); - /* Terminate the Thread */ - PspExitThread(ExitStatus); + /* Terminate the Thread */ + PspExitThread(ExitStatus); - /* we should never reach this point! */ - KEBUGCHECK(0); + /* we should never reach this point! */ + KEBUGCHECK(0); + } } VOID @@ -366,14 +371,46 @@ PVOID SystemArgument1, PVOID SystemArgument2) { - /* Not fully supported yet... must work out some issues that - * I don't understand yet -- Alex - */ - DPRINT1("APC2\n"); - PspExitThread((NTSTATUS)NormalContext); + PKAPC Apc = (PKAPC)SystemArgument1; + PETHREAD Thread = PsGetCurrentThread(); + NTSTATUS ExitStatus; + + DPRINT1("PspExitNormalApc called: 0x%x (proc: 0x%x)\n", + PsGetCurrentThread(), PsGetCurrentProcess()); - /* we should never reach this point! */ - KEBUGCHECK(0); + /* This should never happen */ + ASSERT(!SystemArgument2); + + /* If this is a system thread, we can safely kill it from Kernel-Mode */ + if (PsIsSystemThread(Thread)) + { + /* Get the Exit Status */ + DPRINT1("Killing System Thread\n"); + ExitStatus = (NTSTATUS)Apc->NormalContext; + + /* Free the APC */ + ExFreePool(Apc); + + /* Exit the Thread */ + PspExitThread(ExitStatus); + } + + /* If we're here, this is not a System Thread, so kill it from User-Mode */ + DPRINT1("Initializing User-Mode APC\n"); + KeInitializeApc(Apc, + &Thread->Tcb, + OriginalApcEnvironment, + PsExitSpecialApc, + NULL, + PspExitNormalApc, + UserMode, + NormalContext); + + /* Now insert the APC with the User-Mode Flag */ + KeInsertQueueApc(Apc, Apc, (PVOID)UserMode, 2); + + /* Forcefully resume the thread */ + KeForceResumeThread(&Thread->Tcb); } /* @@ -402,14 +439,14 @@ /* Allocate the APC */ Apc = ExAllocatePoolWithTag(NonPagedPool, sizeof(KAPC), TAG_TERMINATE_APC); - /* Initialize a User Mode APC to Kill the Thread */ + /* Initialize a Kernel Mode APC to Kill the Thread */ KeInitializeApc(Apc, &Thread->Tcb, OriginalApcEnvironment, PsExitSpecialApc, NULL, PspExitNormalApc, - UserMode, + KernelMode, (PVOID)ExitStatus); /* Insert it into the APC Queue */

19 years, 3 months

[hbirr] 16634: Removed the message also from the senders queue (in MsqCleanupMessageQueue).

by hbirr＠svn.reactos.com

Removed the message also from the senders queue (in MsqCleanupMessageQueue). Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-18 14:10:56 UTC (rev 16633) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-18 15:05:58 UTC (rev 16634) @@ -1423,6 +1423,13 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + IntLockMessageQueue(CurrentSentMessage->SenderQueue); + /* remove the message from the dispatching list */ + if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) + { + RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); + } + DPRINT("Notify the sender, the thread has been terminated while dispatching a message!\n"); /* wake the sender's thread */ @@ -1430,7 +1437,8 @@ { KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - + IntUnLockMessageQueue(CurrentSentMessage->SenderQueue); + /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue);

19 years, 3 months

[hpoussin] 16633: Forward more exports to setupapi.dll

by hpoussin＠svn.reactos.com

Forward more exports to setupapi.dll Modified: trunk/reactos/lib/cfgmgr32/cfgmgr32.def _____ Modified: trunk/reactos/lib/cfgmgr32/cfgmgr32.def --- trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2005-07-18 11:57:16 UTC (rev 16632) +++ trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2005-07-18 14:10:56 UTC (rev 16633) @@ -25,8 +25,8 @@ ;CMP_UnregisterNotification ;CMP_WaitNoPendingInstallEvents ;CMP_WaitServices -;CM_Add_Empty_Log_Conf -;CM_Add_Empty_Log_Conf_Ex +;CM_Add_Empty_Log_Conf(a)16=SETUPAPI.CM_Add_Empty_Log_Conf +;CM_Add_Empty_Log_Conf_Ex(a)20=SETUPAPI.CM_Add_Empty_Log_Conf_Ex ;CM_Add_IDA ;CM_Add_IDW ;CM_Add_ID_ExA @@ -54,8 +54,8 @@ ;CM_Dup_Range_List ;CM_Enable_DevNode ;CM_Enable_DevNode_Ex -;CM_Enumerate_Classes -;CM_Enumerate_Classes_Ex +CM_Enumerate_Classes(a)12=SETUPAPI.CM_Enumerate_Classes +CM_Enumerate_Classes_Ex(a)16=SETUPAPI.CM_Enumerate_Classes_Ex ;CM_Enumerate_EnumeratorsA ;CM_Enumerate_EnumeratorsW ;CM_Enumerate_Enumerators_ExA @@ -81,10 +81,10 @@ ;CM_Get_Class_Name_ExW ;CM_Get_Depth ;CM_Get_Depth_Ex -;CM_Get_DevNode_Registry_PropertyA -;CM_Get_DevNode_Registry_PropertyW -;CM_Get_DevNode_Registry_Property_ExA -;CM_Get_DevNode_Registry_Property_ExW +CM_Get_DevNode_Registry_PropertyA(a)24=SETUPAPI.CM_Get_DevNode_Registry_P ropertyA +CM_Get_DevNode_Registry_PropertyW(a)24=SETUPAPI.CM_Get_DevNode_Registry_P ropertyW +CM_Get_DevNode_Registry_Property_ExA(a)28=SETUPAPI.CM_Get_DevNode_Registr y_Property_ExA +CM_Get_DevNode_Registry_Property_ExW(a)28=SETUPAPI.CM_Get_DevNode_Registr y_Property_ExW ;CM_Get_DevNode_Status ;CM_Get_DevNode_Status_Ex ;CM_Get_Device_IDA

19 years, 3 months

[hpoussin] 16632: Move serial ports and mice classes parameters to their own .inf files. They would be regenerated during 2nd stage setup

by hpoussin＠svn.reactos.com

Move serial ports and mice classes parameters to their own .inf files. They would be regenerated during 2nd stage setup Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/media/inf/inf.xml Added: trunk/reactos/media/inf/mouse.inf Added: trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/media/inf/syssetup.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/bootdata/hivesys.inf 2005-07-18 11:57:16 UTC (rev 16632) @@ -578,16 +578,14 @@ ;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x000000 01 ; i8042 port driver -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ErrorControl",0x0001 0001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Group",0x00000000,"K eyboard Port" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ImagePath",0x0002000 0,"system32\drivers\i8042prt.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x 00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Type",0x00010001,0x0 0000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x0001 0001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x 00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x0 0000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x0000 0000,"i8042prt" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x00 000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x0000 0000,"i8042prt" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x00 000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRat e",0x00010001,0x0000003c -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","BreakOnSy sRq",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","MouseReso lution",0x00010001,0x00000003 - ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Ke yboard Class" @@ -596,19 +594,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00 000001 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08 002BE10318}","UpperFilters",0x00010000,"kbdclass" -; Serial port enumerator -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ErrorControl",0x00010 001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Group",0x00000000,"PN P Filter" -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ImagePath",0x00020000 ,"system32\drivers\serenum.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Start",0x00010001,0x0 0000003 -HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Type",0x00010001,0x00 000001 -;hard coded values -HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","0",0x00000000,"A CPI\PNP0501" -HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","Count",0x0001000 1,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","NextInstance",0x 00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00 010000,"serenum" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00 010000,"serenum" - ; SB16 driver HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Bas e" HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ServiceType",0x0001000 1,0x00000001 @@ -825,19 +810,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x000000 01 ; Serial device driver -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ErrorControl",0x000100 01,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Ext ended Base" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000, "system32\drivers\serial.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x000 00001 -;hard coded values -HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"AC PI\PNP0501" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001 ,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x0 0010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","ClassGUID",0x000000 00,"{4D36E978-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","Service",0x00000000 ,"serial" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00 010000,"serenum" HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","ClassGUID",0x000000 00,"{4D36E978-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","Service",0x00000000 ,"serial" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00 010000,"serenum" ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x0001000 1,0x00000001 _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-07-18 11:57:16 UTC (rev 16632) @@ -265,5 +265,7 @@ media\drivers\etc\services 5 media\inf\NET_NIC.inf 6 media\inf\layout.inf 6 +media\inf\mouse.inf 6 +media\inf\ports.inf 6 media\inf\scsi.inf 6 media\inf\syssetup.inf 6 _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/media/inf/inf.xml 2005-07-18 11:57:16 UTC (rev 16632) @@ -1,4 +1,6 @@ <installfile base="inf">layout.inf</installfile> +<installfile base="inf">mouse.inf</installfile> <installfile base="inf">NET_NIC.inf</installfile> +<installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> <installfile base="inf">syssetup.inf</installfile> _____ Added: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/media/inf/mouse.inf 2005-07-18 11:57:16 UTC (rev 16632) @@ -0,0 +1,127 @@ +; MOUSE.INF + +; Installation file for mouse devices + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Mouse +ClassGUID = {4D36E96F-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/19/1999,5.00.2157.1 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = MouseClass.NT.AddReg + +[MouseClass.NT.AddReg] +HKR, , , 0, %MouseClassName% +HKR, , Icon, 0, "-2" +HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" +HKR, , NoInstallClass, 0, 1 + +[Manufacturer] +%StdMfg% = StdMfg +%LogMfg = LogMsf +%MSMfg% = MSMfg + +[StdMfg] +%SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOU SE +%PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE + +[LogMfg] +%*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08 +%*PNP0F12.DeviceDesc% = PS2_Inst,*PNP0F12 + +[MSMfg] +%*PNP0F01.DeviceDesc% = Serial_Inst,*PNP0F01,SERENUM\PNP0F01 +%*PNP0F03.DeviceDesc% = PS2_Inst,*PNP0F03 +%*PNP0F13.DeviceDesc" = PS2_Inst,*PNP0F13 + +;---------------------------- MOUCLASS DRIVER --------------------------- + +[Mouclass_CopyFiles.NT] +mouclass.sys + +[mouclass_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\mouclass.sys +LoadOrderGroup = Pointer Class + +;----------------------------- SERIAL DRIVER ---------------------------- + +[Serial_Inst.NT] +CopyFiles = Serial_CopyFiles, Mouclass_CopyFiles + +[Serial_CopyFiles.NT] +sermouse.sys + +[Serial_Inst.NT.Services] +AddService = sermouse, 0x00000002, sermouse_Service_Inst +AddService = mouclass, , mouclass_Service_Inst + +[sermouse_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 1 +ServiceBinary = %12%\sermouse.sys +LoadOrderGroup = Pointer Port + +;------------------------------ PS/2 DRIVER ----------------------------- + +[PS2_Inst.NT] +CopyFiles = PS2_CopyFiles, Mouclass_CopyFiles +AddReg = PS2_AddReg + +[PS2_CopyFiles.NT] +i8042prt.sys + +[PS2_Inst.NT.Services] +AddService = i8042prt, 0x00000002, i8042prt_Service_Inst +AddService = mouclass, , mouclass_Service_Inst + +[i8042prt_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 1 +ServiceBinary = %12%\i8042prt.sys +LoadOrderGroup = Keyboard Port + +[PS2_AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","SampleRat e",0x00010001,0x0000003c +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSy sRq",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseReso lution",0x00010001,0x00000003 + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +MouseClassName = "Mice and other pointing devices" +StdMfg = "(Standard mice)" +LogMfg = "Logitech" +MSMfg = "Microsoft" + +*PNP0F01.DeviceDesc = "Microsoft Serial Mouse" +*PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse" +*PNP0F08.DeviceDesc = "Logitech Serial Mouse" +*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse" +*PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice" +SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse" +PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse" + +[String.040c] +MouseClassName = "Souris et autres dispositifs de pointage" +StdMfg = "(Souris standard)" + +*PNP0F01.DeviceDesc = "Souris Microsoft sur port sÚrie" +*PNP0F03.DeviceDesc = "Souris Microsoft sur port PS/2" +*PNP0F08.DeviceDesc = "Souris Logitech sur port sÚrie" +*PNP0F12.DeviceDesc = "Souris Logitech sur port PS/2" +*PNP0F13.DeviceDesc = "Souris compatible PS/2" +SERIAL_MOUSE.DeviceDesc = "Souris standard sur port sÚrie" +PS2_MOUSE.DeviceDesc = "Souris standard sur port PS/2" \ No newline at end of file _____ Added: trunk/reactos/media/inf/ports.inf --- trunk/reactos/media/inf/ports.inf 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/media/inf/ports.inf 2005-07-18 11:57:16 UTC (rev 16632) @@ -0,0 +1,74 @@ +; PORTS.INF + +; Installation file for communication ports + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Ports +ClassGUID = {4D36E978-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 10/19/1999,5.00.2157.1 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = PortsClass.NT.AddReg + +[PortsClass.NT.AddReg] +HKR, , , 0, %PortsClassName% +HKR, , Icon, 0, "-23" +HKR, , Installer32, 0, "msports.dll,PortsClassInstaller" + +[Manufacturer] +%StdMfg% = StdMfg + +[StdMfg] +%*PNP0500.DeviceDesc% = ComPort_Inst,*PNP0500,*PNP0501 +%*PNP0501.DeviceDesc% = ComPort_Inst,*PNP0501 + +;---------------------------- COM PORT DRIVER --------------------------- + +[ComPort_Inst.NT] +CopyFiles = ComPort_CopyFiles.NT + +[ComPort_CopyFiles.NT] +serial.sys +serenum.sys + +[ComPort_Inst.NT.Services] +AddService = serial, 0x00000002, serial_Service_Inst +AddService = serenum, , serenum_Service_Inst + +[serial_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\serial.sys +LoadOrderGroup = Extended base + +[serenum_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\serenum.sys +LoadOrderGroup = PNP Filter + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +PortsClassName = "Serial and parallel ports" +StdMfg = "(Standard ports)" + +*PNP0500.DeviceDesc = "Serial communication port" +*PNP0501.DeviceDesc = "Serial communication port" + +[String.040c] +PortsClassName = "Ports (SÚrie et parallÞle)" +StdMfg = "(Ports standard)" + +*PNP0500.DeviceDesc = "Port de communication sÚrie" +*PNP0501.DeviceDesc = "Port de communication sÚrie" \ No newline at end of file _____ Modified: trunk/reactos/media/inf/syssetup.inf --- trunk/reactos/media/inf/syssetup.inf 2005-07-18 07:17:53 UTC (rev 16631) +++ trunk/reactos/media/inf/syssetup.inf 2005-07-18 11:57:16 UTC (rev 16632) @@ -14,5 +14,7 @@ [DeviceInfsToInstall] ; MS uses netnovel.inf as class-installer INF for NICs ; we use a separate one to keep things clean +mouse.inf NET_NIC.inf +ports.inf scsi.inf

19 years, 3 months

← Newer
1
...
26
27
28
29
30
31
32
...
57
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 July 2005