Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[navaraf] 16869: Stop abusing the non-paged pool.

by navaraf＠svn.reactos.com

Stop abusing the non-paged pool. Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-07-29 15:00:02 UTC (rev 16868) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-07-29 15:08:20 UTC (rev 16869) @@ -118,6 +118,8 @@ ULONG j = 0; OBJECT_ATTRIBUTES ObjectAttributes; + ASSERT_IRQL(PASSIVE_LEVEL); + Status = RtlStringFromGUID(InterfaceClassGuid, &GuidString); if (!NT_SUCCESS(Status)) { @@ -131,7 +133,7 @@ BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); BaseKeyName.MaximumLength = BaseKeyName.Length + (38 * sizeof(WCHAR)); BaseKeyName.Buffer = ExAllocatePool( - NonPagedPool, + PagedPool, BaseKeyName.MaximumLength); ASSERT(BaseKeyName.Buffer != NULL); wcscpy(BaseKeyName.Buffer, BaseKeyString); @@ -197,7 +199,7 @@ return Status; } - fip = (PKEY_FULL_INFORMATION)ExAllocatePool(NonPagedPool, Size); + fip = (PKEY_FULL_INFORMATION)ExAllocatePool(PagedPool, Size); ASSERT(fip != NULL); Status = ZwQueryKey( @@ -237,7 +239,7 @@ return Status; } - bip = (PKEY_BASIC_INFORMATION)ExAllocatePool(NonPagedPool, Size); + bip = (PKEY_BASIC_INFORMATION)ExAllocatePool(PagedPool, Size); ASSERT(bip != NULL); Status = ZwEnumerateKey( @@ -262,7 +264,7 @@ SubKeyName.Length = 0; SubKeyName.MaximumLength = BaseKeyName.Length + bip->NameLength + sizeof(WCHAR); - SubKeyName.Buffer = ExAllocatePool(NonPagedPool, SubKeyName.MaximumLength); + SubKeyName.Buffer = ExAllocatePool(PagedPool, SubKeyName.MaximumLength); ASSERT(SubKeyName.Buffer != NULL); TempString.Length = TempString.MaximumLength = bip->NameLength; TempString.Buffer = bip->Name; @@ -314,7 +316,7 @@ return Status; } - bfip = (PKEY_FULL_INFORMATION)ExAllocatePool(NonPagedPool, Size); + bfip = (PKEY_FULL_INFORMATION)ExAllocatePool(PagedPool, Size); ASSERT(bfip != NULL); Status = ZwQueryKey( @@ -362,7 +364,7 @@ return Status; } - bip = (PKEY_BASIC_INFORMATION)ExAllocatePool(NonPagedPool, Size); + bip = (PKEY_BASIC_INFORMATION)ExAllocatePool(PagedPool, Size); ASSERT(bip != NULL); Status = ZwEnumerateKey( @@ -395,7 +397,7 @@ SymbolicLinkKeyName.Length = 0; SymbolicLinkKeyName.MaximumLength = SubKeyName.Length + bip->NameLength + sizeof(WCHAR); - SymbolicLinkKeyName.Buffer = ExAllocatePool(NonPagedPool, SymbolicLinkKeyName.MaximumLength); + SymbolicLinkKeyName.Buffer = ExAllocatePool(PagedPool, SymbolicLinkKeyName.MaximumLength); ASSERT(SymbolicLinkKeyName.Buffer != NULL); TempString.Length = TempString.MaximumLength = bip->NameLength; TempString.Buffer = bip->Name; @@ -405,7 +407,7 @@ ControlKeyName.Length = 0; ControlKeyName.MaximumLength = SymbolicLinkKeyName.Length + Control.Length + sizeof(WCHAR); - ControlKeyName.Buffer = ExAllocatePool(NonPagedPool, ControlKeyName.MaximumLength); + ControlKeyName.Buffer = ExAllocatePool(PagedPool, ControlKeyName.MaximumLength); ASSERT(ControlKeyName.Buffer != NULL); RtlCopyUnicodeString(&ControlKeyName, &SymbolicLinkKeyName); RtlAppendUnicodeStringToString(&ControlKeyName, &Control); @@ -466,7 +468,7 @@ return Status; } - vpip = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePool(NonPagedPool, Size); + vpip = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePool(PagedPool, Size); ASSERT(vpip != NULL); Status = ZwQueryValueKey( @@ -502,7 +504,7 @@ if (SymLinkList == NULL) { SymLinkListSize = vpip->DataLength; - SymLinkList = ExAllocatePool(NonPagedPool, SymLinkListSize + sizeof(WCHAR)); + SymLinkList = ExAllocatePool(PagedPool, SymLinkListSize + sizeof(WCHAR)); ASSERT(SymLinkList != NULL); RtlCopyMemory(SymLinkList, vpip->Data, vpip->DataLength); SymLinkList[vpip->DataLength / sizeof(WCHAR)] = 0; @@ -517,7 +519,7 @@ OldSymLinkList = SymLinkList; OldSymLinkListSize = SymLinkListSize; SymLinkListSize += vpip->DataLength; - SymLinkList = ExAllocatePool(NonPagedPool, SymLinkListSize + sizeof(WCHAR)); + SymLinkList = ExAllocatePool(PagedPool, SymLinkListSize + sizeof(WCHAR)); ASSERT(SymLinkList != NULL); RtlCopyMemory(SymLinkList, OldSymLinkList, OldSymLinkListSize); ExFreePool(OldSymLinkList); @@ -544,7 +546,7 @@ } else { - SymLinkList = ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR)); + SymLinkList = ExAllocatePool(PagedPool, 2 * sizeof(WCHAR)); SymLinkList[0] = 0; } @@ -587,6 +589,8 @@ ULONG i; NTSTATUS Status; + ASSERT_IRQL(PASSIVE_LEVEL); + if (!(PhysicalDeviceObject->Flags & DO_BUS_ENUMERATED_DEVICE)) { DPRINT("PhysicalDeviceObject 0x%p is not a valid Pdo\n", PhysicalDeviceObject); @@ -620,7 +624,7 @@ BaseKeyName.MaximumLength = BaseKeyName.Length + GuidString.Length; BaseKeyName.Buffer = ExAllocatePool( - NonPagedPool, + PagedPool, BaseKeyName.MaximumLength); if (!BaseKeyName.Buffer) { @@ -662,7 +666,7 @@ sizeof(WCHAR) + /* 1 = size of # */ GuidString.Length; InterfaceKeyName.Buffer = ExAllocatePool( - NonPagedPool, + PagedPool, InterfaceKeyName.MaximumLength); if (!InterfaceKeyName.Buffer) { @@ -730,7 +734,7 @@ if (ReferenceString && ReferenceString->Length) SubKeyName.MaximumLength += ReferenceString->Length; SubKeyName.Buffer = ExAllocatePool( - NonPagedPool, + PagedPool, SubKeyName.MaximumLength); if (!SubKeyName.Buffer) { @@ -783,7 +787,7 @@ if (ReferenceString && ReferenceString->Length) SymbolicLinkName->MaximumLength += sizeof(WCHAR) + ReferenceString->Length; SymbolicLinkName->Buffer = ExAllocatePool( - NonPagedPool, + PagedPool, SymbolicLinkName->MaximumLength); if (!SymbolicLinkName->Buffer) { _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-07-29 15:00:02 UTC (rev 16868) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-07-29 15:08:20 UTC (rev 16869) @@ -1525,6 +1525,8 @@ DPRINT("IopUnloadDriver('%wZ', %d)\n", DriverServiceName, UnloadPnpDrivers); + PAGED_CODE(); + /* * Get the service name from the registry key name */ @@ -1543,7 +1545,7 @@ ObjectName.Length = (wcslen(Start) + 8) * sizeof(WCHAR); ObjectName.MaximumLength = ObjectName.Length + sizeof(WCHAR); - ObjectName.Buffer = ExAllocatePool(NonPagedPool, ObjectName.MaximumLength); + ObjectName.Buffer = ExAllocatePool(PagedPool, ObjectName.MaximumLength); wcscpy(ObjectName.Buffer, L"\\Driver\\"); memcpy(ObjectName.Buffer + 8, Start, (ObjectName.Length - 8) * sizeof(WCHAR)); ObjectName.Buffer[ObjectName.Length/sizeof(WCHAR)] = 0; _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-07-29 15:00:02 UTC (rev 16868) +++ trunk/reactos/ntoskrnl/io/file.c 2005-07-29 15:08:20 UTC (rev 16869) @@ -129,8 +129,7 @@ DeviceObject = DeviceObject->Vpb->DeviceObject; DPRINT("FsDeviceObject %lx\n", DeviceObject); } - RtlpCreateUnicodeString(&(FileObject->FileName), - RemainingPath, NonPagedPool); + RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); } } else @@ -147,8 +146,7 @@ FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; - RtlpCreateUnicodeString(&(FileObject->FileName), - RemainingPath, NonPagedPool); + RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); } DPRINT("FileObject->FileName %wZ\n",

19 years, 6 months

[navaraf] 16868: Fix the file to be actually compilable (with GAS 2.16.91).

by navaraf＠svn.reactos.com

Fix the file to be actually compilable (with GAS 2.16.91). Modified: trunk/reactos/lib/rtl/i386/random.S _____ Modified: trunk/reactos/lib/rtl/i386/random.S --- trunk/reactos/lib/rtl/i386/random.S 2005-07-29 14:56:38 UTC (rev 16867) +++ trunk/reactos/lib/rtl/i386/random.S 2005-07-29 15:00:02 UTC (rev 16868) @@ -102,8 +102,8 @@ mov ecx,eax // pos and ecx, 0x7f // pos = seed & 0x7f mov eax,ecx// - mov eax, dword [_SavedValue + ecx*4] - mov dword [_SavedValue + ecx*4], edx + mov eax, [_SavedValue + ecx*4] + mov [_SavedValue + ecx*4], edx ret 4 .RtlRandom_Seed1: @@ -118,8 +118,8 @@ mov ecx,eax // pos and ecx, 0x7f // pos = seed & 0x7f mov eax,ecx// - mov eax, dword [_SavedValue + ecx*4] - mov dword [_SavedValue + ecx*4], edx + mov eax, [_SavedValue + ecx*4] + mov [_SavedValue + ecx*4], edx ret 4 .RtlRandom_Seed2: @@ -133,8 +133,8 @@ mov ecx,eax // pos and ecx, 0x7f // pos = seed & 0x7f mov eax,ecx// - mov eax, dword [_SavedValue + ecx*4] - mov dword [_SavedValue + ecx*4], edx + mov eax, [_SavedValue + ecx*4] + mov [_SavedValue + ecx*4], edx ret 4 .RtlRandom_Seed3: @@ -151,8 +151,8 @@ mov ecx,eax // pos and ecx, 0x7f // pos = seed & 0x7f mov eax,ecx// - mov eax, dword [_SavedValue + ecx*4] - mov dword [_SavedValue + ecx*4], edx + mov eax, [_SavedValue + ecx*4] + mov [_SavedValue + ecx*4], edx ret 4 // prototype: ULONG STDCALL RtlUniform (PULONG Seed)

19 years, 6 months

[ion] 16867: - Add back and fix useful dprint.

by ion＠svn.reactos.com

- Add back and fix useful dprint. Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-29 14:36:11 UTC (rev 16866) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-29 14:56:38 UTC (rev 16867) @@ -1160,6 +1160,8 @@ if(vkPtr->wch[CapsState] == wChar) { CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState]; + DPRINT("nMod %d wC %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n", + nMod, wChar, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits); return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff)); } }

19 years, 6 months

[chorns] 16866: Add stylesheet header to xml

by chorns＠svn.reactos.com

Add stylesheet header to xml Modified: trunk/reactos/tools/rgenstat/rgenstat.c _____ Modified: trunk/reactos/tools/rgenstat/rgenstat.c --- trunk/reactos/tools/rgenstat/rgenstat.c 2005-07-29 13:58:25 UTC (rev 16865) +++ trunk/reactos/tools/rgenstat/rgenstat.c 2005-07-29 14:36:11 UTC (rev 16866) @@ -772,6 +772,7 @@ index = 0; write_line("<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>"); + write_line("<?xml-stylesheet type=\"text/xsl\" href=\"rapistatus.xsl\"?>"); write_line(""); write_line("<components>");

19 years, 6 months

[navaraf] 16865: IoAllocateAdapterChannel should set CurrentIrp field in the wait context block.

by navaraf＠svn.reactos.com

IoAllocateAdapterChannel should set CurrentIrp field in the wait context block. Modified: trunk/reactos/ntoskrnl/io/adapter.c _____ Modified: trunk/reactos/ntoskrnl/io/adapter.c --- trunk/reactos/ntoskrnl/io/adapter.c 2005-07-29 13:56:00 UTC (rev 16864) +++ trunk/reactos/ntoskrnl/io/adapter.c 2005-07-29 13:58:25 UTC (rev 16865) @@ -33,6 +33,7 @@ { DeviceObject->Queue.Wcb.DeviceObject = DeviceObject; DeviceObject->Queue.Wcb.DeviceContext = Context; + DeviceObject->Queue.Wcb.CurrentIrp = DeviceObject->CurrentIrp; return HalAllocateAdapterChannel( AdapterObject, &DeviceObject->Queue.Wcb,

19 years, 6 months

[ea] 16864: Add posix, os2, and vms optional modules.

by ea＠svn.reactos.com

Add posix, os2, and vms optional modules. Modified: trunk/reactos/modules/directory.xml _____ Modified: trunk/reactos/modules/directory.xml --- trunk/reactos/modules/directory.xml 2005-07-29 13:54:13 UTC (rev 16863) +++ trunk/reactos/modules/directory.xml 2005-07-29 13:56:00 UTC (rev 16864) @@ -1,3 +1,17 @@ +<directory name="posix"> + <xi:include href="posix/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> +</directory> +<directory name="os2"> + <xi:include href="os2/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> +</directory> <directory name="rosapps"> <xi:include href="rosapps/directory.xml"> <xi:fallback> @@ -5,3 +19,10 @@ </xi:fallback> </xi:include> </directory> +<directory name="vms"> + <xi:include href="vms/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> +</directory>

19 years, 6 months

[navaraf] 16863: IoAllocateAdapterChannel should set CurrentIrp field in the wait context block.

by navaraf＠svn.reactos.com

IoAllocateAdapterChannel should set CurrentIrp field in the wait context block. Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-07-29 13:50:05 UTC (rev 16862) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-07-29 13:54:13 UTC (rev 16863) @@ -1212,7 +1212,7 @@ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); if (!NT_SUCCESS(Status)) { - CPRINT("Driver load failed, status (%x)\n", Status); + CPRINT("Driver '%s' load failed, status (%x)\n", FileName, Status); return(Status); } } else @@ -1242,7 +1242,7 @@ { if (ModuleDeviceNode == NULL) IopFreeDeviceNode(DeviceNode); - CPRINT("Driver load failed, status (%x)\n", Status); + CPRINT("Driver '%s' load failed, status (%x)\n", FileName, Status); return Status; } @@ -1271,7 +1271,7 @@ { if (ModuleDeviceNode == NULL) IopFreeDeviceNode(DeviceNode); - CPRINT("Driver load failed, status (%x)\n", Status); + CPRINT("Driver '%s' load failed, status (%x)\n", FileName, Status); return Status; }

19 years, 6 months

[weiden] 16862: Saveliy Tretiakov <saveliyt@mail.ru>:

by weiden＠svn.reactos.com

Saveliy Tretiakov <saveliyt(a)mail.ru>: serialui returns error codes directly. Modified: trunk/reactos/lib/kernel32/misc/comm.c Modified: trunk/reactos/lib/serialui/serialui.c Modified: trunk/reactos/lib/serialui/serialui.h _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-07-29 13:46:03 UTC (rev 16861) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-07-29 13:50:05 UTC (rev 16862) @@ -834,7 +834,7 @@ CommConfigDialogA(LPCSTR lpszName, HWND hWnd, LPCOMMCONFIG lpCC) { PWCHAR NameW; - BOOL result; + DWORD result; /* don't use the static thread buffer so operations in serialui don't overwrite the string */ @@ -858,9 +858,9 @@ STDCALL CommConfigDialogW(LPCWSTR lpszName, HWND hWnd, LPCOMMCONFIG lpCC) { - BOOL (STDCALL *drvCommDlgW)(LPCWSTR, HWND, LPCOMMCONFIG); + DWORD (STDCALL *drvCommDlgW)(LPCWSTR, HWND, LPCOMMCONFIG); HMODULE hSerialuiDll; - BOOL result; + DWORD result; //FIXME: Get dll name from registry. (setupapi needed) if(!(hSerialuiDll = LoadLibraryW(L"serialui.dll"))) @@ -869,7 +869,8 @@ return FALSE; } - drvCommDlgW = GetProcAddress(hSerialuiDll, "drvCommConfigDialogW"); + drvCommDlgW = (DWORD (STDCALL *)(LPCWSTR, HWND, LPCOMMCONFIG)) + GetProcAddress(hSerialuiDll, "drvCommConfigDialogW"); if(!drvCommDlgW) { @@ -879,8 +880,10 @@ } result = drvCommDlgW(lpszName, hWnd, lpCC); + SetLastError(result); FreeLibrary(hSerialuiDll); - return result; + + return (result == ERROR_SUCCESS ? TRUE : FALSE); } _____ Modified: trunk/reactos/lib/serialui/serialui.c --- trunk/reactos/lib/serialui/serialui.c 2005-07-29 13:46:03 UTC (rev 16861) +++ trunk/reactos/lib/serialui/serialui.c 2005-07-29 13:50:05 UTC (rev 16862) @@ -98,7 +98,7 @@ /* * @implemented */ -BOOL WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice, +DWORD WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice, HWND hWnd, LPCOMMCONFIG lpCommConfig) { @@ -106,7 +106,7 @@ if(!lpszDevice || !lpCommConfig) { - return FALSE; + return ERROR_INVALID_PARAMETER; } DialogInfo.lpszDevice = lpszDevice; @@ -119,7 +119,7 @@ /* * @implemented */ -BOOL WINAPI drvCommConfigDialogA(LPCSTR lpszDevice, +DWORD WINAPI drvCommConfigDialogA(LPCSTR lpszDevice, HWND hWnd, LPCOMMCONFIG lpCommConfig) { @@ -136,13 +136,13 @@ return result; } else - return FALSE; + return ERROR_NOT_ENOUGH_MEMORY; } /* * @unimplemented */ -BOOL WINAPI drvSetDefaultCommConfigW(LPCWSTR lpszDevice, +DWORD WINAPI drvSetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, DWORD dwSize) { @@ -152,7 +152,7 @@ /* * @unimplemented */ -BOOL WINAPI drvSetDefaultCommConfigA(LPCSTR lpszDevice, +DWORD WINAPI drvSetDefaultCommConfigA(LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig, DWORD dwSize) { @@ -162,7 +162,7 @@ /* * @unimplemented */ -BOOL WINAPI drvGetDefaultCommConfigW(LPCWSTR lpszDevice, +DWORD WINAPI drvGetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, LPDWORD lpdwSize) { @@ -172,7 +172,7 @@ /* * @unimplemented */ -BOOL WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice, +DWORD WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig, LPDWORD lpdwSize) { @@ -231,7 +231,7 @@ /* Initialize baud rate combo */ if(!(hBox = GetDlgItem(hDlg, IDC_BAUDRATE))) - EndDialog(hDlg, 0); + EndDialog(hDlg, ERROR_CANCELLED); for(i = 0; Bauds[i]; i++) { @@ -246,7 +246,7 @@ /* Initialize byte size combo */ if(!(hBox = GetDlgItem(hDlg, IDC_BYTESIZE))) - EndDialog(hDlg, 0); + EndDialog(hDlg, ERROR_CANCELLED); for(i = 0; ByteSizes[i]; i++) { @@ -261,7 +261,7 @@ /* Initialize parity combo */ if(!(hBox = GetDlgItem(hDlg, IDC_PARITY))) - EndDialog(hDlg, 0); + EndDialog(hDlg, ERROR_CANCELLED); for(i = 0; Parities[i].StrId; i++) { @@ -278,7 +278,7 @@ /* Initialize stop bits combo */ if(!(hBox = GetDlgItem(hDlg, IDC_STOPBITS))) - EndDialog(hDlg, 0); + EndDialog(hDlg, ERROR_CANCELLED); for(i = 0; StopBits[i].StrId; i++) { @@ -295,7 +295,7 @@ /* Initialize flow control combo */ if(!(hBox = GetDlgItem(hDlg, IDC_FLOW))) - EndDialog(hDlg, 0); + EndDialog(hDlg, ERROR_CANCELLED); if(LoadStringW(hDllInstance, IDS_FC_NO, wstr, sizeof(wstr) / sizeof(wstr[0]))) { @@ -337,11 +337,11 @@ switch(wParam) { case IDC_CANCELBTN: - EndDialog(hDlg, FALSE); + EndDialog(hDlg, ERROR_CANCELLED); break; case IDC_OKBTN: OkButton(hDlg); - EndDialog(hDlg, TRUE); + EndDialog(hDlg, ERROR_SUCCESS); break; } return TRUE; @@ -349,11 +349,11 @@ case WM_CLOSE: { - EndDialog(hDlg, FALSE); + EndDialog(hDlg, ERROR_CANCELLED); return TRUE; } /* WM_CLOSE */ - default: + default: return FALSE; } _____ Modified: trunk/reactos/lib/serialui/serialui.h --- trunk/reactos/lib/serialui/serialui.h 2005-07-29 13:46:03 UTC (rev 16861) +++ trunk/reactos/lib/serialui/serialui.h 2005-07-29 13:50:05 UTC (rev 16862) @@ -11,8 +11,7 @@ #include "resource.h" #define UNIMPLEMENTED \ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ - return FALSE; + return ERROR_CALL_NOT_IMPLEMENTED ; #define DEFAULT_BAUD_INDEX 6 #define DEFAULT_BYTESIZE_INDEX 3 @@ -45,27 +44,27 @@ * ************************************/ -BOOL WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice, +DWORD WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice, HWND hWnd, LPCOMMCONFIG lpCommConfig); -BOOL WINAPI drvCommConfigDialogA(LPCSTR lpszDevice, +DWORD WINAPI drvCommConfigDialogA(LPCSTR lpszDevice, HWND hWnd, LPCOMMCONFIG lpCommConfig); -BOOL WINAPI drvSetDefaultCommConfigW(LPCWSTR lpszDevice, +DWORD WINAPI drvSetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, DWORD dwSize); -BOOL WINAPI drvSetDefaultCommConfigA(LPCSTR lpszDevice, +DWORD WINAPI drvSetDefaultCommConfigA(LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig, DWORD dwSize); -BOOL WINAPI drvGetDefaultCommConfigW(LPCWSTR lpszDevice, +DWORD WINAPI drvGetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, LPDWORD lpdwSize); -BOOL WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice, +DWORD WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig, LPDWORD lpdwSize);

19 years, 6 months

[ea] 16861: More details in the rosapps makefile message.

by ea＠svn.reactos.com

More details in the rosapps makefile message. Split sysutils. Modified: trunk/rosapps/cmdutils/find.rc Modified: trunk/rosapps/cmdutils/mode/mode.rc Modified: trunk/rosapps/cmdutils/more.rc Modified: trunk/rosapps/cmdutils/sort.rc Modified: trunk/rosapps/cmdutils/tee.rc Modified: trunk/rosapps/cmdutils/touch/touch.rc Modified: trunk/rosapps/cmdutils/y.rc Modified: trunk/rosapps/devutils/gdb2/gdb2.cpp Modified: trunk/rosapps/makefile Modified: trunk/rosapps/net/niclist/niclist.rc Added: trunk/rosapps/sysutils/chkdsk/ Added: trunk/rosapps/sysutils/chkdsk/chkdsk.c Added: trunk/rosapps/sysutils/chkdsk/chkdsk.rc Added: trunk/rosapps/sysutils/chkdsk/chkdsk.xml Deleted: trunk/rosapps/sysutils/chkdsk.c Deleted: trunk/rosapps/sysutils/chkdsk.rc Added: trunk/rosapps/sysutils/chklib/ Added: trunk/rosapps/sysutils/chklib/chklib.c Added: trunk/rosapps/sysutils/chklib/chklib.rc Added: trunk/rosapps/sysutils/chklib/chklib.xml Deleted: trunk/rosapps/sysutils/chklib.c Deleted: trunk/rosapps/sysutils/chklib.rc Added: trunk/rosapps/sysutils/format/ Added: trunk/rosapps/sysutils/format/format.c Added: trunk/rosapps/sysutils/format/format.rc Deleted: trunk/rosapps/sysutils/format.c Deleted: trunk/rosapps/sysutils/format.rc Deleted: trunk/rosapps/sysutils/ldd.c Deleted: trunk/rosapps/sysutils/ldd.rc Added: trunk/rosapps/sysutils/lib/ Added: trunk/rosapps/sysutils/lib/lib.xml Added: trunk/rosapps/sysutils/lib/win32err.c Added: trunk/rosapps/sysutils/lsdd/ Added: trunk/rosapps/sysutils/lsdd/lsdd.c Added: trunk/rosapps/sysutils/lsdd/lsdd.rc Added: trunk/rosapps/sysutils/lsdd/lsdd.xml Added: trunk/rosapps/sysutils/pedump/ Added: trunk/rosapps/sysutils/pedump/pedump.c Added: trunk/rosapps/sysutils/pedump/pedump.rc Added: trunk/rosapps/sysutils/pedump/pedump.xml Deleted: trunk/rosapps/sysutils/pedump.c Deleted: trunk/rosapps/sysutils/pedump.rc Deleted: trunk/rosapps/sysutils/qsi.c Deleted: trunk/rosapps/sysutils/qsi.rc Added: trunk/rosapps/sysutils/qssi/ Added: trunk/rosapps/sysutils/qssi/qssi.c Added: trunk/rosapps/sysutils/qssi/qssi.rc Added: trunk/rosapps/sysutils/shutdown/ Added: trunk/rosapps/sysutils/shutdown/shutdown.c Added: trunk/rosapps/sysutils/shutdown/shutdown.rc Added: trunk/rosapps/sysutils/shutdown/shutdown.xml Deleted: trunk/rosapps/sysutils/shutdown.c Deleted: trunk/rosapps/sysutils/shutdown.rc Modified: trunk/rosapps/sysutils/sysutils.xml Deleted: trunk/rosapps/sysutils/win32err.c _____ Modified: trunk/rosapps/cmdutils/find.rc --- trunk/rosapps/cmdutils/find.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/cmdutils/find.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: find.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "W32 find command\0" #define REACTOS_STR_INTERNAL_NAME "find\0" _____ Modified: trunk/rosapps/cmdutils/mode/mode.rc --- trunk/rosapps/cmdutils/mode/mode.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/cmdutils/mode/mode.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: mode.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS mode utility\0" #define REACTOS_STR_INTERNAL_NAME "mode\0" _____ Modified: trunk/rosapps/cmdutils/more.rc --- trunk/rosapps/cmdutils/more.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/cmdutils/more.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: more.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "W32 more command\0" #define REACTOS_STR_INTERNAL_NAME "more\0" _____ Modified: trunk/rosapps/cmdutils/sort.rc --- trunk/rosapps/cmdutils/sort.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/cmdutils/sort.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: sort.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "W32 sort command\0" #define REACTOS_STR_INTERNAL_NAME "sort\0" _____ Modified: trunk/rosapps/cmdutils/tee.rc --- trunk/rosapps/cmdutils/tee.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/cmdutils/tee.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: tee.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "W32 tee command\0" #define REACTOS_STR_INTERNAL_NAME "tee\0" _____ Modified: trunk/rosapps/cmdutils/touch/touch.rc --- trunk/rosapps/cmdutils/touch/touch.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/cmdutils/touch/touch.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: touch.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Touch utility\0" #define REACTOS_STR_INTERNAL_NAME "touch\0" _____ Modified: trunk/rosapps/cmdutils/y.rc --- trunk/rosapps/cmdutils/y.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/cmdutils/y.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: y.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "W32 y command\0" #define REACTOS_STR_INTERNAL_NAME "y\0" _____ Modified: trunk/rosapps/devutils/gdb2/gdb2.cpp --- trunk/rosapps/devutils/gdb2/gdb2.cpp 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/devutils/gdb2/gdb2.cpp 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: gdb2.cpp,v 1.1 2001/04/15 23:42:07 narnaoud Exp $ +/* $Id$ * * gdb2 - gdb output splitter * _____ Modified: trunk/rosapps/makefile --- trunk/rosapps/makefile 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/makefile 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,3 +1,13 @@ all: - @echo To build rosapps it has to be copied it into the reactos\modules folder. After - @echo this you can run "make depends" in the \reactos directory to compile it. + @echo To build "rosapps" there are two paths: + @echo --- + @echo 1. copy the rosapps folder into the reactos\modules folder + @echo 2. link reactos/modules/rosapps to rosapps + @echo UNIX + @echo cd $${ROS_SRC_ROOT}/reactos/modules + @echo ln -s $${ROS_SRC_ROOT}/rosapps rosapps + @echo WINDOWS + @echo cd %%ROS_SRC_ROOT%%\reactos\modules + @echo junction rosapps %%ROS_SRC_ROOT%%\rosapps + @echo --- + @echo Eventually you can run "make depends" in the \reactos directory to compile it. _____ Modified: trunk/rosapps/net/niclist/niclist.rc --- trunk/rosapps/net/niclist/niclist.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/net/niclist/niclist.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,4 +1,4 @@ -/* $Id: niclist.rc,v 1.4 2004/10/16 22:30:17 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS packet driver niclist\0" #define REACTOS_STR_INTERNAL_NAME "niclist\0" _____ Copied: trunk/rosapps/sysutils/chkdsk/chkdsk.c (from rev 16855, trunk/rosapps/sysutils/chkdsk.c) _____ Copied: trunk/rosapps/sysutils/chkdsk/chkdsk.rc (from rev 16855, trunk/rosapps/sysutils/chkdsk.rc) _____ Added: trunk/rosapps/sysutils/chkdsk/chkdsk.xml --- trunk/rosapps/sysutils/chkdsk/chkdsk.xml 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/sysutils/chkdsk/chkdsk.xml 2005-07-29 13:46:03 UTC (rev 16861) @@ -0,0 +1,9 @@ +<module name="chkdsk" type="win32cui" installbase="system32" installname="chkdsk.exe" warnings="true"> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>fmifs</library> + <library>ntdll</library> + <file>chkdsk.c</file> + <file>chkdsk.rc</file> +</module> Property changes on: trunk/rosapps/sysutils/chkdsk/chkdsk.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/rosapps/sysutils/chkdsk.c --- trunk/rosapps/sysutils/chkdsk.c 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/sysutils/chkdsk.c 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,478 +0,0 @@ -//===================================================================== = -// -// $Id$ -// -// Chkdskx -// -// Copyright (c) 1998 Mark Russinovich -// Systems Internals -// http://www.sysinternals.com/ -// -// -------------------------------------------------------------------- -// -// This software is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. -// -// This software 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 -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this software; see the file COPYING.LIB. If -// not, write to the Free Software Foundation, Inc., 675 Mass Ave, -// Cambridge, MA 02139, USA. -// -// -------------------------------------------------------------------- -// -// Chkdsk clone that demonstrates the use of the FMIFS file system -// utility library. -// -// 1999 February (Emanuele Aliberti) -// Adapted for ReactOS and lcc-win32. -// -// 1999 April (Emanuele Aliberti) -// Adapted for ReactOS and egcs. -// -//===================================================================== = -#define UNICODE -#include <windows.h> -#include <stdio.h> -#include <fmifs.h> -#define _UNICODE 1 -#include <tchar.h> -#include "config.h" -#include "win32err.h" - -// -// Globals -// -BOOL Error = FALSE; - -// switches -BOOL FixErrors = FALSE; -BOOL SkipClean = FALSE; -BOOL ScanSectors = FALSE; -BOOL Verbose = FALSE; -PWCHAR Drive = NULL; -WCHAR CurrentDirectory[1024]; - -#ifndef FMIFS_IMPORT_DLL -// -// FMIFS function -// -//PCHKDSK Chkdsk; -#endif /* ndef FMIFS_IMPORT_DLL */ - - -//-------------------------------------------------------------------- -// -// CtrlCIntercept -// -// Intercepts Ctrl-C's so that the program can't be quit with the -// disk in an inconsistent state. -// -//-------------------------------------------------------------------- -BOOL -WINAPI -CtrlCIntercept( DWORD dwCtrlType ) -{ - // - // Handle the event so that the default handler doesn't - // - return TRUE; -} - - -//--------------------------------------------------------------------- - -// -// Usage -// -// Tell the user how to use the program -// -// 19990216 EA Missing printf %s argument -//--------------------------------------------------------------------- - -VOID -Usage( PWCHAR ProgramName ) -{ - _tprintf( - L"\ -Usage: %s [drive:] [-F] [-V] [-R] [-C]\n\n\ - [drive:] Specifies the drive to check.\n\ - -F Fixes errors on the disk.\n\ - -V Displays the full path of every file on the disk.\n\ - -R Locates bad sectors and recovers readable information.\n\ - -C Checks the drive only if it is dirty.\n\n", - ProgramName - ); -} - - -//--------------------------------------------------------------------- - -// -// ParseCommandLine -// -// Get the switches. -// -//--------------------------------------------------------------------- - -int -ParseCommandLine( - int argc, - WCHAR *argv [] - ) -{ - int i; - BOOLEAN gotFix = FALSE; - BOOLEAN gotVerbose = FALSE; - BOOLEAN gotClean = FALSE; - /*BOOLEAN gotScan = FALSE;*/ - - - for ( i = 1; - (i < argc); - i++ - ) { - switch( argv[i][0] ) - { - case L'-': - case L'/': - - switch( argv[i][1] ) - { - case L'F': - case L'f': - - if( gotFix ) return i; - FixErrors = TRUE; - gotFix = TRUE; - break; - - case L'V': - case L'v': - - if( gotVerbose) return i; - Verbose = TRUE; - gotVerbose = TRUE; - break; - - case L'R': - case L'r': - - if( gotFix ) return i; - ScanSectors = TRUE; - gotFix = TRUE; - break; - - case L'C': - case L'c': - - if( gotClean ) return i; - SkipClean = TRUE; - gotClean = TRUE; - break; - - default: - return i; - } - break; - - default: - - if( Drive ) return i; - if( argv[i][1] != L':' ) return i; - - Drive = argv[i]; - break; - } - } - return 0; -} - - -//--------------------------------------------------------------------- - -// -// ChkdskCallback -// -// The file system library will call us back with commands that we -// can interpret. If we wanted to halt the chkdsk we could return FALSE. -// -//--------------------------------------------------------------------- - -BOOLEAN -STDCALL -ChkdskCallback( - CALLBACKCOMMAND Command, - DWORD Modifier, - PVOID Argument - ) -{ - PDWORD percent; - PBOOLEAN status; - PTEXTOUTPUT output; - - // - // We get other types of commands, - // but we don't have to pay attention to them - // - switch( Command ) - { - case UNKNOWN2: - wprintf(L"UNKNOWN2\r"); - break; - - case UNKNOWN3: - wprintf(L"UNKNOWN3\r"); - break; - - case UNKNOWN4: - wprintf(L"UNKNOWN4\r"); - break; - - case UNKNOWN5: - wprintf(L"UNKNOWN5\r"); - break; - - case UNKNOWN7: - wprintf(L"UNKNOWN7\r"); - break; - - case UNKNOWN8: - wprintf(L"UNKNOWN8\r"); - break; - - case UNKNOWN9: - wprintf(L"UNKNOWN9\r"); - break; - - case UNKNOWNA: - wprintf(L"UNKNOWNA\r"); - break; - - case UNKNOWNC: - wprintf(L"UNKNOWNC\r"); - break; - - case UNKNOWND: - wprintf(L"UNKNOWND\r"); - break; - - case INSUFFICIENTRIGHTS: - wprintf(L"INSUFFICIENTRIGHTS\r"); - break; - - case STRUCTUREPROGRESS: - wprintf(L"STRUCTUREPROGRESS\r"); - break; - - case DONEWITHSTRUCTURE: - wprintf(L"DONEWITHSTRUCTURE\r"); - break; - - case PROGRESS: - percent = (PDWORD) Argument; - wprintf(L"%d percent completed.\r", *percent); - break; - - case OUTPUT: - output = (PTEXTOUTPUT) Argument; - fwprintf(stdout, L"%s", output->Output); - break; - - case DONE: - status = (PBOOLEAN) Argument; - if ( *status == TRUE ) - { - wprintf(L"Chkdsk was unable to complete successfully.\n\n"); - Error = TRUE; - } - break; - } - return TRUE; -} - -#ifndef FMIFS_IMPORT_DLL -//--------------------------------------------------------------------- - -// -// LoadFMIFSEntryPoints -// -// Loads FMIFS.DLL and locates the entry point(s) we are going to use -// -// 19990216 EA Used wide functions -// -//--------------------------------------------------------------------- - -BOOLEAN -LoadFMIFSEntryPoints(VOID) -{ - LoadLibraryW( L"fmifs.dll" ); - - if( !(Chkdsk = - (void *) GetProcAddress( - GetModuleHandleW(L"fmifs.dll"), - "Chkdsk" )) - ) - { - return FALSE; - } - return TRUE; -} -#endif /* ndef FMIFS_IMPORT_DLL */ - - -//--------------------------------------------------------------------- - -// -// WMain -// -// Engine. Just get command line switches and fire off a chkdsk. This -// could also be done in a GUI like Explorer does when you select a -// drive and run a check on it. -// -// We do this in UNICODE because the chkdsk command expects PWCHAR -// arguments. -// -//--------------------------------------------------------------------- - -int -wmain( int argc, WCHAR *argv[] ) -{ - int badArg; - HANDLE volumeHandle; - WCHAR fileSystem [1024]; - WCHAR volumeName [1024]; - DWORD serialNumber; - DWORD flags, - maxComponent; - - wprintf( - L"\n\ -Chkdskx v1.0.1 by Mark Russinovich\n\ -Systems Internals - http://www.sysinternals.com/\n\ -ReactOS adaptation 1999 by Emanuele Aliberti\n\n" - ); -#ifndef FMIFS_IMPORT_DLL - // - // Get function pointers - // - if( !LoadFMIFSEntryPoints()) - { - wprintf(L"Could not located FMIFS entry points.\n\n"); - return -1; - } -#endif /* ndef FMIFS_IMPORT_DLL */ - // - // Parse command line - // - if( (badArg = ParseCommandLine( argc, argv ))) - { - wprintf( - L"Unknown argument: %s\n", - argv[badArg] - ); - - Usage(argv[0]); - return -1; - } - - // - // Get the drive's format - // - if( !Drive ) - { - if( !GetCurrentDirectoryW( - sizeof(CurrentDirectory), - CurrentDirectory - ) - ) { - - PrintWin32Error( - L"Could not get current directory", - GetLastError() - ); - return -1; - } - - } else { - - wcscpy( CurrentDirectory, Drive ); - } - CurrentDirectory[2] = L'\\'; - CurrentDirectory[3] = L'\0'; - Drive = CurrentDirectory; - - // - // Determine the drive's file system format, which we need to - // tell chkdsk - // - if( !GetVolumeInformationW( - Drive, - volumeName, - sizeof volumeName, - & serialNumber, - & maxComponent, - & flags, - fileSystem, - sizeof fileSystem - ) - ) { - PrintWin32Error( - L"Could not query volume", - GetLastError() - ); - return -1; - } - - // - // If they want to fix, we need to have access to the drive - // - if ( FixErrors ) - { - swprintf( - volumeName, - L"\\\\.\\%C:", - Drive[0] - ); - volumeHandle = CreateFileW( - volumeName, - GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - 0, - 0 - ); - if( volumeHandle == INVALID_HANDLE_VALUE ) - { - wprintf(L"Chdskx cannot run because the volume is in use by another process.\n\n"); - return -1; - } - CloseHandle( volumeHandle ); - - // - // Can't let the user break out of a chkdsk that can modify the drive - // - SetConsoleCtrlHandler( CtrlCIntercept, TRUE ); - } - - // - // Just do it - // - wprintf( - L"The type of file system is %s.\n", - fileSystem - ); - Chkdsk( - Drive, - fileSystem, - FixErrors, - Verbose, - SkipClean, - ScanSectors, - NULL, - NULL, - ChkdskCallback - ); - - if ( Error ) return -1; - return 0; -} - -/* EOF */ _____ Deleted: trunk/rosapps/sysutils/chkdsk.rc --- trunk/rosapps/sysutils/chkdsk.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/sysutils/chkdsk.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,7 +0,0 @@ -/* $Id$ */ - -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Disk Checking Utility\0" -#define REACTOS_STR_INTERNAL_NAME "chkdsk\0" -#define REACTOS_STR_ORIGINAL_FILENAME "chkdsk.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "1998 Mark Russinovich\0" -#include <reactos/version.rc> _____ Copied: trunk/rosapps/sysutils/chklib/chklib.c (from rev 16855, trunk/rosapps/sysutils/chklib.c) _____ Copied: trunk/rosapps/sysutils/chklib/chklib.rc (from rev 16855, trunk/rosapps/sysutils/chklib.rc) --- trunk/rosapps/sysutils/chklib.rc 2005-07-29 11:40:01 UTC (rev 16855) +++ trunk/rosapps/sysutils/chklib/chklib.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -0,0 +1,6 @@ +/* $Id$ */ + +#define REACTOS_STR_FILE_DESCRIPTION "Tool to check a dynamic library for a symbol\0" +#define REACTOS_STR_INTERNAL_NAME "chklib\0" +#define REACTOS_STR_ORIGINAL_FILENAME "chklib.exe\0" +#include <reactos/version.rc> _____ Added: trunk/rosapps/sysutils/chklib/chklib.xml --- trunk/rosapps/sysutils/chklib/chklib.xml 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/sysutils/chklib/chklib.xml 2005-07-29 13:46:03 UTC (rev 16861) @@ -0,0 +1,10 @@ +<module name="chklib" type="win32cui" installbase="system32" installname="chklib.exe" warnings="true"> + <linkerflag>--numeric-sort</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>win32err</library> + <file>chklib.c</file> + <file>chklib.rc</file> +</module> Property changes on: trunk/rosapps/sysutils/chklib/chklib.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/rosapps/sysutils/chklib.c --- trunk/rosapps/sysutils/chklib.c 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/sysutils/chklib.c 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,200 +0,0 @@ -/* $Id$ - * - * chklib.c - * - * Copyright (C) 1998, 1999 Emanuele Aliberti. - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software 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. - * - * You should have received a copy of the GNU General Public - * License along with this software; see the file COPYING. If - * not, write to the Free Software Foundation, Inc., 675 Mass Ave, - * Cambridge, MA 02139, USA. - * - * -------------------------------------------------------------------- - * Check a PE DLL for loading and get an exported symbol's address - * (relocated). - * - */ -//#define UNICODE -#include <stdio.h> -#include <stdlib.h> -#include <assert.h> - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> - -#include "win32err.h" - -#ifdef DISPLAY_VERSION -static -void -DisplayVersion( - HANDLE dll, - PCHAR ModuleName - ) -{ - DWORD Zero; - DWORD Size; - PVOID vi = NULL; - - assert(ModuleName); - Size = GetFileVersionInfoSize( - ModuleName, - & Zero - ); - if (Size == 0) - { - PrintWin32Error( - L"GetFileVersionInfoSize", - GetLastError() - ); - return; - } - vi = (PVOID) LocalAlloc(LMEM_ZEROINIT,Size); - if (!vi) return; - assert(dll != INVALID_HANDLE_VALUE); - if (0 == GetFileVersionInfo( - ModuleName, - (DWORD) dll, - Size, - vi - ) - ) { - PrintWin32Error( - L"GetFileVersionInfo", - GetLastError() - ); - return; - } -/* - VerQueryValue( - vi, - L"\\StringFileInfo\\040904E4\\FileDescription", - & lpBuffer, - & dwBytes - ); -*/ - LocalFree(vi); -} -#endif /* def DISPLAY_VERSION */ - - -static -void -DisplayEntryPoint( - const HANDLE dll, - LPCSTR SymbolName - ) -{ - FARPROC EntryPoint; - - printf( - "[%s]\n", - SymbolName - ); - EntryPoint = GetProcAddress( - dll, - SymbolName - ); - if (!EntryPoint) - { - PrintWin32Error( - L"GetProcAddress", - GetLastError() - ); - return; - } - printf( - "%08X %s\n", - EntryPoint, - SymbolName - ); -} - - -/* --- MAIN --- */ - - -int -main( - int argc, - char * argv [] - ) -{ - HINSTANCE dll; - TCHAR ModuleName [_MAX_PATH]; - - if (argc < 2) - { - fprintf( - stderr, - "\ -ReactOS System Tools\n\ -Check a Dynamic Link Library (DLL) for loading\n\ -Copyright (c) 1998, 1999 Emanuele Aliberti\n\n\ -usage: %s module [symbol [, ...]]\n", - argv[0] - ); - exit(EXIT_FAILURE); - } - dll = LoadLibraryA(argv[1]); - if (!dll) - { - UINT LastError; - - LastError = GetLastError(); - PrintWin32Error(L"LoadLibrary",LastError); - fprintf( - stderr, - "%s: loading %s failed (%d).\n", - argv[0], - argv[1], - LastError - ); - exit(EXIT_FAILURE); - } - GetModuleFileName( - (HANDLE) dll, - ModuleName, - sizeof ModuleName - ); - printf( - "%s loaded.\n", - ModuleName - ); -#ifdef DISPLAY_VERSION - DisplayVersion(dll,ModuleName); -#endif - if (argc > 2) - { - int CurrentSymbol; - - for ( CurrentSymbol = 2; - (CurrentSymbol < argc); - ++CurrentSymbol - ) - { - DisplayEntryPoint( dll, argv[CurrentSymbol] ); - } - } - FreeLibrary(dll); - printf( - "%s unloaded.\n", - ModuleName - ); - return EXIT_SUCCESS; -} - -/* EOF */ _____ Deleted: trunk/rosapps/sysutils/chklib.rc --- trunk/rosapps/sysutils/chklib.rc 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/sysutils/chklib.rc 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,6 +0,0 @@ -/* $Id: chklib.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */ - -#define REACTOS_STR_FILE_DESCRIPTION "Tool to check a dynamic library for a symbol\0" -#define REACTOS_STR_INTERNAL_NAME "chklib\0" -#define REACTOS_STR_ORIGINAL_FILENAME "chklib.exe\0" -#include <reactos/version.rc> _____ Copied: trunk/rosapps/sysutils/format/format.c (from rev 16855, trunk/rosapps/sysutils/format.c) _____ Copied: trunk/rosapps/sysutils/format/format.rc (from rev 16855, trunk/rosapps/sysutils/format.rc) _____ Deleted: trunk/rosapps/sysutils/format.c --- trunk/rosapps/sysutils/format.c 2005-07-29 13:30:22 UTC (rev 16860) +++ trunk/rosapps/sysutils/format.c 2005-07-29 13:46:03 UTC (rev 16861) @@ -1,648 +0,0 @@ -//===================================================================== = -// -// $Id$ -// -// Formatx -// -// Copyright (c) 1998 Mark Russinovich -// Systems Internals -// http://www.sysinternals.com/ -// -// This software is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. -// -// This software 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 -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this software; see the file COPYING.LIB. If -// not, write to the Free Software Foundation, Inc., 675 Mass Ave, -// Cambridge, MA 02139, USA. -// -// --------------------------------------------------------------------- -// Format clone that demonstrates the use of the FMIFS file system -// utility library. -// -// 1999 February (Emanuele Aliberti) -// Adapted for ReactOS and lcc-win32. -// -// 1999 April (Emanuele Aliberti) -// Adapted for ReactOS and egcs. -// -//===================================================================== = -#define UNICODE 1 -#define _UNICODE 1 -#include <windows.h> -#include <stdio.h> -#include "../../reactos/include/fmifs.h" -//#include <tchar.h> -#include "win32err.h" -#include "config.h" - -#define WBUFSIZE(b) (sizeof(b) / sizeof (wchar_t)) - - -// -// Globals -// -BOOL Error = FALSE; - -// switches -BOOL QuickFormat = FALSE; -DWORD ClusterSize = 0; -BOOL CompressDrive = FALSE; -BOOL GotALabel = FALSE; -PWCHAR Label = L""; -PWCHAR Drive = NULL; -PWCHAR Format = L"FAT"; - -WCHAR RootDirectory [MAX_PATH]; -WCHAR LabelString [12]; - -#ifndef FMIFS_IMPORT_DLL -// -// Functions in FMIFS.DLL -// -PFORMATEX FormatEx; -PENABLEVOLUMECOMPRESSION EnableVolumeCompression; -#endif /* ndef FMIFS_IMPORT_DLL */ - -// -// Size array -// -typedef -struct -{ - WCHAR SizeString [16]; - DWORD ClusterSize; - -} SIZEDEFINITION, *PSIZEDEFINITION; - - -SIZEDEFINITION -LegalSizes [] = -{ - { L"512", 512 }, - { L"1024", 1024 }, - { L"2048", 2048 }, - { L"4096", 4096 }, - { L"8192", 8192 }, - { L"16K", 16384 }, - { L"32K", 32768 }, - { L"64K", 65536 }, - { L"128K", 65536 * 2 }, - { L"256K", 65536 * 4 }, - { L"", 0 }, -}; - - -//--------------------------------------------------------------------- - -// -// Usage -// -// Tell the user how to use the program -// -// 1990218 EA ProgramName missing in wprintf arg list -// -//--------------------------------------------------------------------- - -VOID -Usage( PWCHAR ProgramName ) -{ - wprintf( - L"\ -Usage: %s drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ - [drive:] Specifies the drive to format.\n\ - -FS:file-system Specifies the type of file system (e.g. FAT).\n\ - -V:label Specifies volume label.\n\ - -Q Performs a quick format.\n\ [truncated at 1000 lines; 8522 more skipped]

19 years, 6 months

[navaraf] 16860: Initialize DescriptorTranslated->u.Interrupt.Level before calling HalGetInterruptVector. Remember, casting hides bugs! Debugged by Hervé Poussineau.

by navaraf＠svn.reactos.com

Initialize DescriptorTranslated->u.Interrupt.Level before calling HalGetInterruptVector. Remember, casting hides bugs! Debugged by Hervé Poussineau. Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-07-29 13:28:37 UTC (rev 16859) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-07-29 13:30:22 UTC (rev 16860) @@ -1003,6 +1003,7 @@ else DescriptorRaw->u.Interrupt.Vector = ResourceDescriptor->u.Interrupt.MinimumVector; + DescriptorTranslated->u.Interrupt.Level = 0; DescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector( DeviceNode->ResourceRequirements->InterfaceType, DeviceNode->ResourceRequirements->BusNumber,

19 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
57
Older →

Jump to page:

2025

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