Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[mkupfer] 35113: - Fill combo box with languages and keyboard layouts. - Store data in structure for preselection of values. - TODO: preselect keyboard layout after language selection / default language
by mkupfer＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: mkupfer Date: Mon Aug 4 15:40:34 2008 New Revision: 35113 URL: http://svn.reactos.org/svn/reactos?rev=35113&view=rev Log: - Fill combo box with languages and keyboard layouts. - Store data in structure for preselection of values. - TODO: preselect keyboard layout after language selection / default language Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Aug 4 15:40:34 2008 @@ -26,6 +26,7 @@ */ #include <windows.h> +#include <windowsx.h> #include <commctrl.h> #include <tchar.h> #include <setupapi.h> @@ -37,19 +38,40 @@ HFONT hTitleFont; +typedef struct _LANG +{ + TCHAR LangId[9]; + TCHAR LangName[128]; + LONG DefaultKBLayout; +} LANG, *PLANG; + +typedef struct _KBLAYOUT +{ + TCHAR LayoutId[9]; + TCHAR LayoutName[128]; + TCHAR DllName[128]; +} KBLAYOUT, *PKBLAYOUT; + struct { + // Settings LONG DestDiskNumber; // physical disk LONG DestPartNumber; // partition on disk LONG DestPartSize; // if partition doesn't exist, size of partition LONG FSType; // file system type on partition LONG MBRInstallType; // install bootloader LONG FormatPart; // type of format the partition - WCHAR SelectedLangId[4]; // selected language + TCHAR SelectedLangId[9]; // selected language + TCHAR SelectedKBLayout[9]; // selected kayboard layout WCHAR InstallationDirectory[MAX_PATH]; // installation directory on hdd - WCHAR DefaultLang[20]; // default language - WCHAR DefaultKBLayout[20]; // default keyboard layout BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos + // txtsetup.sif data + TCHAR DefaultLang[20]; // default language + TCHAR DefaultKBLayout[20]; // default keyboard layout + PLANG pLanguages; + LONG LangCount; + PKBLAYOUT pKbLayouts; + LONG KbLayoutCount; } SetupData; typedef struct _IMGINFO @@ -202,6 +224,7 @@ LPARAM lParam) { PIMGINFO pImgInfo; + LONG i; pImgInfo = (PIMGINFO)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { @@ -236,6 +259,10 @@ WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ + for (i=0; i< SetupData.LangCount;i++) + (void)ComboBox_AddString(GetDlgItem(hwndDlg,IDC_LANGUAGES),SetupData.pLanguages[i].LangName); + for (i=0; i< SetupData.KbLayoutCount;i++) + (void)ComboBox_AddString(GetDlgItem(hwndDlg,IDC_KEYLAYOUT),SetupData.pKbLayouts[i].LayoutName); } break; case WM_DRAWITEM: @@ -566,6 +593,72 @@ return FALSE; } +void LoadSetupData() +{ + WCHAR szPath[MAX_PATH]; + WCHAR *ch; + HINF hTxtsetupSif; + INFCONTEXT InfContext; + //TCHAR szValue[MAX_PATH]; + DWORD LineLength; + LONG Count; + //HKEY hKey; + + GetModuleFileNameW(NULL,szPath,MAX_PATH); + ch = strrchrW(szPath,L'\\'); + if (ch != NULL) + *ch = L'\0'; + + wcscat(szPath, L"\\txtsetup.sif"); + hTxtsetupSif = SetupOpenInfFileW(szPath, NULL, INF_STYLE_OLDNT, NULL); + if (hTxtsetupSif != INVALID_HANDLE_VALUE) + { + // get language list + Count = SetupGetLineCount(hTxtsetupSif, _T("Language")); + if (Count > 0) + { + // TODO: alloc memory for all entries and read entries + SetupData.pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * Count); + if (SetupData.pLanguages != NULL) + { + SetupData.LangCount = Count; + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("Language"), + NULL,&InfContext)) + do + { + SetupGetStringField(&InfContext, 0, SetupData.pLanguages[Count].LangId, sizeof(SetupData.pLanguages[Count].LangId) / sizeof(TCHAR), &LineLength); + SetupGetStringField(&InfContext, 1, SetupData.pLanguages[Count].LangName, sizeof(SetupData.pLanguages[Count].LangName) / sizeof(TCHAR), &LineLength); + ++Count; + } + while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.LangCount); + } + } + // get keyboard layout list + Count = SetupGetLineCount(hTxtsetupSif, _T("KeyboardLayout")); + if (Count > 0) + { + // TODO: alloc memory for all entries and read entries + SetupData.pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * Count); + if (SetupData.pKbLayouts != NULL) + { + SetupData.KbLayoutCount = Count; + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("KeyboardLayout"), + NULL,&InfContext)) + do + { + SetupGetStringField(&InfContext, 0, SetupData.pKbLayouts[Count].LayoutId, sizeof(SetupData.pKbLayouts[Count].LayoutId) / sizeof(TCHAR), &LineLength); + SetupGetStringField(&InfContext, 1, SetupData.pKbLayouts[Count].LayoutName, sizeof(SetupData.pKbLayouts[Count].LayoutName) / sizeof(TCHAR), &LineLength); + ++Count; + } + while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.LangCount); + } + } + SetupCloseInfFile(hTxtsetupSif); + } +} + BOOL isUnattendSetup() { WCHAR szPath[MAX_PATH]; @@ -621,6 +714,8 @@ LoadString(hInst,IDS_ABORTSETUP, abort_msg, sizeof(abort_msg)/sizeof(TCHAR)); LoadString(hInst,IDS_ABORTSETUP2, abort_title,sizeof(abort_title)/sizeof(TCHAR)); + LoadSetupData(); + /* Create the Start page, until setup is working */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;

1 0

[gedmurphy] 35111: - handle servname being NULL - patch by Yuri Sidorov <jura at cp-lab dot com> See issue #3627 for more details.
by gedmurphy＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: gedmurphy Date: Mon Aug 4 12:26:03 2008 New Revision: 35111 URL: http://svn.reactos.org/svn/reactos?rev=35111&view=rev Log: - handle servname being NULL - patch by Yuri Sidorov <jura at cp-lab dot com> See issue #3627 for more details. Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Mon Aug 4 12:26:03 2008 @@ -1407,28 +1407,33 @@ if (!WSAINITIALIZED) return WSANOTINITIALISED; - /* converting port number */ - port = strtoul(servname, NULL, 10); - /* service name was specified? */ - if (port == 0) - { - /* protocol was specified? */ - if (hints && hints->ai_protocol) + if (servname) + { + /* converting port number */ + port = strtoul(servname, NULL, 10); + /* service name was specified? */ + if (port == 0) { - pent = getprotobynumber(hints->ai_protocol); - if (pent == NULL) - return WSAEINVAL; - proto = pent->p_name; + /* protocol was specified? */ + if (hints && hints->ai_protocol) + { + pent = getprotobynumber(hints->ai_protocol); + if (pent == NULL) + return WSAEINVAL; + proto = pent->p_name; + } + else + proto = NULL; + se = getservbyname(servname, proto); + if (se == NULL) + return WSATYPE_NOT_FOUND; + port = se->s_port; } else - proto = NULL; - se = getservbyname(servname, proto); - if (se == NULL) - return WSAHOST_NOT_FOUND; - port = se->s_port; + port = htons(port); } else - port = htons(port); + port = 0; if (nodename) {

1 0

[cgutman] 35110: - Forgot to include one fix in my last commit
by cgutman＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: cgutman Date: Mon Aug 4 12:11:04 2008 New Revision: 35110 URL: http://svn.reactos.org/svn/reactos?rev=35110&view=rev Log: - Forgot to include one fix in my last commit Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Aug 4 12:11:04 2008 @@ -238,6 +238,7 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, 0 ); + PoolFreeBuffer( Bucket ); } } }

1 0

[jmorlan] 35109: - Add a function in kernel32 for translating STD_*_HANDLE constants to actual handles, for those APIs which accept either. Replace code in 8 APIs that already did this translation. - Call it in WriteFile, ReadFile, and FlushFileBuffers, which previously did not.
by jmorlan＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: jmorlan Date: Mon Aug 4 12:08:52 2008 New Revision: 35109 URL: http://svn.reactos.org/svn/reactos?rev=35109&view=rev Log: - Add a function in kernel32 for translating STD_*_HANDLE constants to actual handles, for those APIs which accept either. Replace code in 8 APIs that already did this translation. - Call it in WriteFile, ReadFile, and FlushFileBuffers, which previously did not. Modified: trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/file/rw.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/misc/handle.c trunk/reactos/dll/win32/kernel32/synch/wait.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Mon Aug 4 12:08:52 2008 @@ -352,6 +352,8 @@ { NTSTATUS errCode; IO_STATUS_BLOCK IoStatusBlock; + + hFile = TranslateStdHandle(hFile); if (IsConsoleHandle(hFile)) { @@ -561,20 +563,7 @@ NTSTATUS Status; /* Get real handle */ - switch ((ULONG)hFile) - { - case STD_INPUT_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->StandardInput; - break; - - case STD_OUTPUT_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->StandardOutput; - break; - - case STD_ERROR_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->StandardError; - break; - } + hFile = TranslateStdHandle(hFile); /* Check for console handle */ if (IsConsoleHandle(hFile)) Modified: trunk/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/rw… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] Mon Aug 4 12:08:52 2008 @@ -37,6 +37,8 @@ *lpNumberOfBytesWritten = 0; } + hFile = TranslateStdHandle(hFile); + if (IsConsoleHandle(hFile)) { return WriteConsoleA(hFile, @@ -141,6 +143,8 @@ { *lpNumberOfBytesRead = 0; } + + hFile = TranslateStdHandle(hFile); if (IsConsoleHandle(hFile)) { Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Mon Aug 4 12:08:52 2008 @@ -72,6 +72,8 @@ DWORD dwShareMode); PTEB GetTeb(VOID); + +HANDLE FASTCALL TranslateStdHandle(HANDLE hHandle); PWCHAR FilenameA2W(LPCSTR NameA, BOOL alloc); Modified: trunk/reactos/dll/win32/kernel32/misc/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/handle.c [iso-8859-1] Mon Aug 4 12:08:52 2008 @@ -26,6 +26,21 @@ /* FUNCTIONS *****************************************************************/ +HANDLE FASTCALL +TranslateStdHandle(HANDLE hHandle) +{ + PRTL_USER_PROCESS_PARAMETERS Ppb = NtCurrentPeb()->ProcessParameters; + + switch ((ULONG)hHandle) + { + case STD_INPUT_HANDLE: return Ppb->StandardInput; + case STD_OUTPUT_HANDLE: return Ppb->StandardOutput; + case STD_ERROR_HANDLE: return Ppb->StandardError; + } + + return hHandle; +} + /* * @implemented */ @@ -33,25 +48,12 @@ GetHandleInformation (HANDLE hObject, LPDWORD lpdwFlags) { - PRTL_USER_PROCESS_PARAMETERS Ppb; OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; ULONG BytesWritten; NTSTATUS Status; DWORD Flags; - Ppb = NtCurrentPeb()->ProcessParameters; - switch ((ULONG)hObject) - { - case STD_INPUT_HANDLE: - hObject = Ppb->StandardInput; - break; - case STD_OUTPUT_HANDLE: - hObject = Ppb->StandardOutput; - break; - case STD_ERROR_HANDLE: - hObject = Ppb->StandardError; - break; - } + hObject = TranslateStdHandle(hObject); Status = NtQueryObject (hObject, ObjectHandleFlagInformation, @@ -86,24 +88,11 @@ DWORD dwMask, DWORD dwFlags) { - PRTL_USER_PROCESS_PARAMETERS Ppb; OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; ULONG BytesWritten; NTSTATUS Status; - Ppb = NtCurrentPeb()->ProcessParameters; - switch ((ULONG)hObject) - { - case STD_INPUT_HANDLE: - hObject = Ppb->StandardInput; - break; - case STD_OUTPUT_HANDLE: - hObject = Ppb->StandardOutput; - break; - case STD_ERROR_HANDLE: - hObject = Ppb->StandardError; - break; - } + hObject = TranslateStdHandle(hObject); Status = NtQueryObject (hObject, ObjectHandleFlagInformation, @@ -149,22 +138,9 @@ * If the function fails, the return value is zero */ { - PRTL_USER_PROCESS_PARAMETERS Ppb; NTSTATUS Status; - Ppb = NtCurrentPeb()->ProcessParameters; - switch ((ULONG)hObject) - { - case STD_INPUT_HANDLE: - hObject = Ppb->StandardInput; - break; - case STD_OUTPUT_HANDLE: - hObject = Ppb->StandardOutput; - break; - case STD_ERROR_HANDLE: - hObject = Ppb->StandardError; - break; - } + hObject = TranslateStdHandle(hObject); if (IsConsoleHandle(hObject)) { @@ -193,23 +169,10 @@ BOOL bInheritHandle, DWORD dwOptions) { - PRTL_USER_PROCESS_PARAMETERS Ppb; DWORD SourceProcessId, TargetProcessId; NTSTATUS Status; - Ppb = NtCurrentPeb()->ProcessParameters; - switch ((ULONG)hSourceHandle) - { - case STD_INPUT_HANDLE: - hSourceHandle = Ppb->StandardInput; - break; - case STD_OUTPUT_HANDLE: - hSourceHandle = Ppb->StandardOutput; - break; - case STD_ERROR_HANDLE: - hSourceHandle = Ppb->StandardError; - break; - } + hSourceHandle = TranslateStdHandle(hSourceHandle); if (IsConsoleHandle(hSourceHandle)) { Modified: trunk/reactos/dll/win32/kernel32/synch/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/w… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/wait.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/wait.c [iso-8859-1] Mon Aug 4 12:08:52 2008 @@ -41,29 +41,7 @@ NTSTATUS Status; /* Get real handle */ - switch ((ULONG)hHandle) - { - /* Input handle */ - case STD_INPUT_HANDLE: - - /* Read it from the PEB */ - hHandle = NtCurrentPeb()->ProcessParameters->StandardInput; - break; - - /* Output handle */ - case STD_OUTPUT_HANDLE: - - /* Read it from the PEB */ - hHandle = NtCurrentPeb()->ProcessParameters->StandardOutput; - break; - - /* Error handle */ - case STD_ERROR_HANDLE: - - /* Read it from the PEB */ - hHandle = NtCurrentPeb()->ProcessParameters->StandardError; - break; - } + hHandle = TranslateStdHandle(hHandle); /* Check for console handle */ if ((IsConsoleHandle(hHandle)) && (VerifyConsoleIoHandle(hHandle))) @@ -163,26 +141,7 @@ for (i = 0; i < nCount; i++) { /* Check what kind of handle this is */ - switch ((ULONG)HandleBuffer[i]) - { - /* Input handle */ - case STD_INPUT_HANDLE: - HandleBuffer[i] = NtCurrentPeb()-> - ProcessParameters->StandardInput; - break; - - /* Output handle */ - case STD_OUTPUT_HANDLE: - HandleBuffer[i] = NtCurrentPeb()-> - ProcessParameters->StandardOutput; - break; - - /* Error handle */ - case STD_ERROR_HANDLE: - HandleBuffer[i] = NtCurrentPeb()-> - ProcessParameters->StandardError; - break; - } + HandleBuffer[i] = TranslateStdHandle(HandleBuffer[i]); /* Check for console handle */ if ((IsConsoleHandle(HandleBuffer[i])) && @@ -249,32 +208,7 @@ NTSTATUS Status; /* Get real handle */ - switch ((ULONG)hObjectToWaitOn) - { - /* Input handle */ - case STD_INPUT_HANDLE: - - /* Read it from the PEB */ - hObjectToWaitOn = NtCurrentPeb()-> - ProcessParameters->StandardInput; - break; - - /* Output handle */ - case STD_OUTPUT_HANDLE: - - /* Read it from the PEB */ - hObjectToWaitOn = NtCurrentPeb()-> - ProcessParameters->StandardOutput; - break; - - /* Error handle */ - case STD_ERROR_HANDLE: - - /* Read it from the PEB */ - hObjectToWaitOn = NtCurrentPeb()-> - ProcessParameters->StandardError; - break; - } + hObjectToWaitOn = TranslateStdHandle(hObjectToWaitOn); /* Check for console handle */ if ((IsConsoleHandle(hObjectToWaitOn)) &&

1 0

[sginsberg] 35108: - Fix a typo
by sginsberg＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: sginsberg Date: Mon Aug 4 12:01:35 2008 New Revision: 35108 URL: http://svn.reactos.org/svn/reactos?rev=35108&view=rev Log: - Fix a typo Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Mon Aug 4 12:01:35 2008 @@ -654,7 +654,7 @@ USHORT MinorVersion; KAFFINITY SetMember; ULONG StallScaleFactor; - UCHAR SparedUnused; + UCHAR SpareUnused; UCHAR Number; UCHAR Reserved; UCHAR L2CacheAssociativity;

1 0

[cgutman] 35107: - Fix more memory leaks
by cgutman＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: cgutman Date: Mon Aug 4 11:46:53 2008 New Revision: 35107 URL: http://svn.reactos.org/svn/reactos?rev=35107&view=rev Log: - Fix more memory leaks Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Aug 4 11:46:53 2008 @@ -89,8 +89,10 @@ if( Status == STATUS_PENDING ) { InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); break; - } else + } else { Complete( Bucket->Request.RequestContext, Status, 0 ); + PoolFreeBuffer( Bucket ); + } } } @@ -141,6 +143,7 @@ Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, Received ); + PoolFreeBuffer( Bucket ); } else if( Status == STATUS_PENDING ) { InsertHeadList ( &Connection->ReceiveRequest, &Bucket->Entry ); @@ -150,6 +153,7 @@ ("Completing Receive request: %x %x\n", Bucket->Request, Status)); Complete( Bucket->Request.RequestContext, Status, 0 ); + PoolFreeBuffer( Bucket ); } } } @@ -198,6 +202,7 @@ Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, Sent ); + PoolFreeBuffer( Bucket ); } else if( Status == STATUS_PENDING ) { InsertHeadList ( &Connection->SendRequest, &Bucket->Entry ); @@ -207,6 +212,7 @@ ("Completing Send request: %x %x\n", Bucket->Request, Status)); Complete( Bucket->Request.RequestContext, Status, 0 ); + PoolFreeBuffer( Bucket ); } } }

1 0

[cgutman] 35106: - Fix more leaks
by cgutman＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: cgutman Date: Mon Aug 4 11:20:08 2008 New Revision: 35106 URL: http://svn.reactos.org/svn/reactos?rev=35106&view=rev Log: - Fix more leaks Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Mon Aug 4 11:20:08 2008 @@ -95,6 +95,7 @@ AFD_DbgPrint(MID_TRACE,("Completing connect %x\n", NextIrp)); NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = 0; + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Mon Aug 4 11:20:08 2008 @@ -31,6 +31,8 @@ FCB->RemoteAddress = TaCopyTransportAddress( Qelt->ConnInfo->RemoteAddress ); + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); @@ -69,6 +71,8 @@ IPAddr->Address[0].Address[0].sin_port)); AFD_DbgPrint(MID_TRACE,("IPAddr->Address[0].Address[0].sin_addr %x\n", IPAddr->Address[0].Address[0].in_addr)); + + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); Irp->IoStatus.Information = ((PCHAR)&IPAddr[1]) - ((PCHAR)ListenReceive); Irp->IoStatus.Status = STATUS_SUCCESS;

1 0

[fireball] 35105: - Call ChkDsk function with NT pathname, not DOS pathname.
by fireball＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: fireball Date: Mon Aug 4 11:08:03 2008 New Revision: 35105 URL: http://svn.reactos.org/svn/reactos?rev=35105&view=rev Log: - Call ChkDsk function with NT pathname, not DOS pathname. Modified: trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Mon Aug 4 11:08:03 2008 @@ -277,6 +277,7 @@ ANSI_STRING ChkdskFunctionName = RTL_CONSTANT_STRING("ChkdskEx"); PVOID Provider; CHKDSKEX ChkdskFunc; + WCHAR NtDrivePath[64]; UNICODE_STRING DrivePathU; NTSTATUS Status; @@ -315,7 +316,11 @@ /* Call provider */ //PrintString(" Verifying volume %S\n", DrivePath); - RtlInitUnicodeString(&DrivePathU, DrivePath); + swprintf(NtDrivePath, L"\\??\\"); + wcscat(NtDrivePath, DrivePath); + NtDrivePath[wcslen(NtDrivePath)-1] = 0; + RtlInitUnicodeString(&DrivePathU, NtDrivePath); + Status = ChkdskFunc(&DrivePathU, TRUE, // FixErrors TRUE, // Verbose

1 0

[fireball] 35104: - Get rid of crt dependencies. - Fix all printfs to VfatPrint function (which calls appropriate callback).
by fireball＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: fireball Date: Mon Aug 4 11:04:56 2008 New Revision: 35104 URL: http://svn.reactos.org/svn/reactos?rev=35104&view=rev Log: - Get rid of crt dependencies. - Fix all printfs to VfatPrint function (which calls appropriate callback). Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/fslib/vfatlib/check/check.h trunk/reactos/lib/fslib/vfatlib/check/common.c trunk/reactos/lib/fslib/vfatlib/check/common.h trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h trunk/reactos/lib/fslib/vfatlib/check/fat.c trunk/reactos/lib/fslib/vfatlib/check/file.c trunk/reactos/lib/fslib/vfatlib/check/io.c trunk/reactos/lib/fslib/vfatlib/check/lfn.c trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/bo… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -58,55 +58,55 @@ { unsigned short sectors; - printf("Boot sector contents:\n"); + VfatPrint("Boot sector contents:\n"); if (!atari_format) { char id[9]; strncpy(id,(char*)b->system_id,8); id[8] = 0; - printf("System ID \"%s\"\n",id); + VfatPrint("System ID \"%s\"\n",id); } else { /* On Atari, a 24 bit serial number is stored at offset 8 of the boot * sector */ - printf("Serial number 0x%x\n", + VfatPrint("Serial number 0x%x\n", b->system_id[5] | (b->system_id[6]<<8) | (b->system_id[7]<<16)); } - printf("Media byte 0x%02x (%s)\n",b->media,get_media_descr(b->media)); - printf("%10d bytes per logical sector\n",GET_UNALIGNED_W(b->sector_size)); - printf("%10d bytes per cluster\n",fs->cluster_size); - printf("%10d reserved sector%s\n",CF_LE_W(b->reserved), + VfatPrint("Media byte 0x%02x (%s)\n",b->media,get_media_descr(b->media)); + VfatPrint("%10d bytes per logical sector\n",GET_UNALIGNED_W(b->sector_size)); + VfatPrint("%10d bytes per cluster\n",fs->cluster_size); + VfatPrint("%10d reserved sector%s\n",CF_LE_W(b->reserved), CF_LE_W(b->reserved) == 1 ? "" : "s"); - printf("First FAT starts at byte %llu (sector %llu)\n", + VfatPrint("First FAT starts at byte %llu (sector %llu)\n", (__u64)fs->fat_start, (__u64)fs->fat_start/lss); - printf("%10d FATs, %d bit entries\n",b->fats,fs->fat_bits); - printf("%10d bytes per FAT (= %u sectors)\n",fs->fat_size, + VfatPrint("%10d FATs, %d bit entries\n",b->fats,fs->fat_bits); + VfatPrint("%10d bytes per FAT (= %u sectors)\n",fs->fat_size, fs->fat_size/lss); if (!fs->root_cluster) { - printf("Root directory starts at byte %llu (sector %llu)\n", + VfatPrint("Root directory starts at byte %llu (sector %llu)\n", (__u64)fs->root_start, (__u64)fs->root_start/lss); - printf("%10d root directory entries\n",fs->root_entries); + VfatPrint("%10d root directory entries\n",fs->root_entries); } else { - printf( "Root directory start at cluster %lu (arbitrary size)\n", + VfatPrint( "Root directory start at cluster %lu (arbitrary size)\n", fs->root_cluster); } - printf("Data area starts at byte %llu (sector %llu)\n", + VfatPrint("Data area starts at byte %llu (sector %llu)\n", (__u64)fs->data_start, (__u64)fs->data_start/lss); - printf("%10lu data clusters (%llu bytes)\n",fs->clusters, + VfatPrint("%10lu data clusters (%llu bytes)\n",fs->clusters, (__u64)fs->clusters*fs->cluster_size); - printf("%u sectors/track, %u heads\n",CF_LE_W(b->secs_track), + VfatPrint("%u sectors/track, %u heads\n",CF_LE_W(b->secs_track), CF_LE_W(b->heads)); - printf("%10u hidden sectors\n", + VfatPrint("%10u hidden sectors\n", atari_format ? /* On Atari, the hidden field is only 16 bit wide and unused */ (((unsigned char *)&b->hidden)[0] | ((unsigned char *)&b->hidden)[1] << 8) : CF_LE_L(b->hidden)); sectors = GET_UNALIGNED_W( b->sectors ); - printf("%10u sectors total\n", sectors ? sectors : CF_LE_L(b->total_sect)); + VfatPrint("%10u sectors total\n", sectors ? sectors : CF_LE_L(b->total_sect)); } static void check_backup_boot(DOS_FS *fs, struct boot_sector *b, int lss) @@ -114,14 +114,14 @@ struct boot_sector b2; if (!fs->backupboot_start) { - printf( "There is no backup boot sector.\n" ); + VfatPrint( "There is no backup boot sector.\n" ); if (CF_LE_W(b->reserved) < 3) { - printf( "And there is no space for creating one!\n" ); + VfatPrint( "And there is no space for creating one!\n" ); return; } if (interactive) - printf( "1) Create one\n2) Do without a backup\n" ); - else printf( " Auto-creating backup boot block.\n" ); + VfatPrint( "1) Create one\n2) Do without a backup\n" ); + else VfatPrint( " Auto-creating backup boot block.\n" ); if (!interactive || get_key("12","?") == '1') { int bbs; /* The usual place for the backup boot sector is sector 6. Choose @@ -138,7 +138,7 @@ fs_write(fs->backupboot_start,sizeof(*b),b); fs_write((off_t)offsetof(struct boot_sector,backup_boot), sizeof(b->backup_boot),&b->backup_boot); - printf( "Created backup of boot sector in sector %d\n", bbs ); + VfatPrint( "Created backup of boot sector in sector %d\n", bbs ); return; } else return; @@ -151,27 +151,27 @@ int i, pos, first = 1; char buf[20]; - printf( "There are differences between boot sector and its backup.\n" ); - printf( "Differences: (offset:original/backup)\n " ); + VfatPrint( "There are differences between boot sector and its backup.\n" ); + VfatPrint( "Differences: (offset:original/backup)\n " ); pos = 2; for( p = (__u8 *)b, q = (__u8 *)&b2, i = 0; i < sizeof(b2); ++p, ++q, ++i ) { if (*p != *q) { sprintf( buf, "%s%u:%02x/%02x", first ? "" : ", ", (unsigned)(p-(__u8 *)b), *p, *q ); - if (pos + strlen(buf) > 78) printf( "\n " ), pos = 2; - printf( "%s", buf ); + if (pos + strlen(buf) > 78) VfatPrint( "\n " ), pos = 2; + VfatPrint( "%s", buf ); pos += strlen(buf); first = 0; } } - printf( "\n" ); + VfatPrint( "\n" ); if (interactive) - printf( "1) Copy original to backup\n" + VfatPrint( "1) Copy original to backup\n" "2) Copy backup to original\n" "3) No action\n" ); - else printf( " Not automatically fixing this.\n" ); + else VfatPrint( " Not automatically fixing this.\n" ); switch (interactive ? get_key("123","?") : '3') { case '1': fs_write(fs->backupboot_start,sizeof(*b),b); @@ -199,10 +199,10 @@ struct info_sector i; if (!b->info_sector) { - printf( "No FSINFO sector\n" ); + VfatPrint( "No FSINFO sector\n" ); if (interactive) - printf( "1) Create one\n2) Do without FSINFO\n" ); - else printf( " Not automatically creating it.\n" ); + VfatPrint( "1) Create one\n2) Do without FSINFO\n" ); + else VfatPrint( " Not automatically creating it.\n" ); if (interactive && get_key("12","?") == '1') { /* search for a free reserved sector (not boot sector and not * backup boot sector) */ @@ -221,7 +221,7 @@ sizeof(b->info_sector),&b->info_sector); } else { - printf( "No free reserved sector found -- " + VfatPrint( "No free reserved sector found -- " "no space for FSINFO sector!\n" ); return; } @@ -235,22 +235,22 @@ if (i.magic != CT_LE_L(0x41615252) || i.signature != CT_LE_L(0x61417272) || i.boot_sign != CT_LE_W(0xaa55)) { - printf( "FSINFO sector has bad magic number(s):\n" ); + VfatPrint( "FSINFO sector has bad magic number(s):\n" ); if (i.magic != CT_LE_L(0x41615252)) - printf( " Offset %llu: 0x%08x != expected 0x%08x\n", + VfatPrint( " Offset %llu: 0x%08x != expected 0x%08x\n", (__u64)offsetof(struct info_sector,magic), CF_LE_L(i.magic),0x41615252); if (i.signature != CT_LE_L(0x61417272)) - printf( " Offset %llu: 0x%08x != expected 0x%08x\n", + VfatPrint( " Offset %llu: 0x%08x != expected 0x%08x\n", (__u64)offsetof(struct info_sector,signature), CF_LE_L(i.signature),0x61417272); if (i.boot_sign != CT_LE_W(0xaa55)) - printf( " Offset %llu: 0x%04x != expected 0x%04x\n", + VfatPrint( " Offset %llu: 0x%04x != expected 0x%04x\n", (__u64)offsetof(struct info_sector,boot_sign), CF_LE_W(i.boot_sign),0xaa55); if (interactive) - printf( "1) Correct\n2) Don't correct (FSINFO invalid then)\n" ); - else printf( " Auto-correcting it.\n" ); + VfatPrint( "1) Correct\n2) Don't correct (FSINFO invalid then)\n" ); + else VfatPrint( " Auto-correcting it.\n" ); if (!interactive || get_key("12","?") == '1') { init_fsinfo(&i); fs_write(fs->fsinfo_start,sizeof(i),&i); @@ -280,7 +280,7 @@ fs->nfats = b.fats; sectors = GET_UNALIGNED_W(b.sectors); total_sectors = sectors ? sectors : CF_LE_L(b.total_sect); - if (verbose) printf("Checking we can access the last sector of the filesystem\n"); + if (verbose) VfatPrint("Checking we can access the last sector of the filesystem\n"); /* Can't access last odd sector anyway, so round down */ fs_test((loff_t)((total_sectors & ~1)-1)*(loff_t)logical_sector_size, logical_sector_size); @@ -306,12 +306,12 @@ * (root_entries != 0), we handle the root dir the old way. Give a * warning, but convertig to a root dir in a cluster chain seems * to complex for now... */ - printf( "Warning: FAT32 root dir not in cluster chain! " + VfatPrint( "Warning: FAT32 root dir not in cluster chain! " "Compability mode...\n" ); else if (!fs->root_cluster && !fs->root_entries) die("No root directory!"); else if (fs->root_cluster && fs->root_entries) - printf( "Warning: FAT32 root dir is in a cluster chain, but " + VfatPrint( "Warning: FAT32 root dir is in a cluster chain, but " "a separate root dir\n" " area is defined. Cannot fix this easily.\n" ); Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -198,15 +198,22 @@ static char *file_stat(DOS_FILE *file) { static char temp[100]; - struct tm *tm; char tmp[100]; time_t date; + LARGE_INTEGER time; + TIME_FIELDS time_fields; date = date_dos2unix(CF_LE_W(file->dir_ent.time),CF_LE_W(file-> dir_ent.date)); - tm = localtime(&date); - strftime(tmp,99,"%H:%M:%S %b %d %Y",tm); - sprintf(temp," Size %u bytes, date %s",CF_LE_L(file->dir_ent.size),tmp); + + RtlSecondsSince1970ToTime(date, &time); + RtlTimeToTimeFields(&time, &time_fields); + + _snprintf(tmp, sizeof(tmp), "%d:%d:%d %d.%d.%d", + time_fields.Hour, time_fields.Minute, time_fields.Second, + time_fields.Day, time_fields.Month, time_fields.Year); + + _snprintf(temp, sizeof(temp), " Size %u bytes, date %s",CF_LE_L(file->dir_ent.size),tmp); return temp; } @@ -322,15 +329,16 @@ static void rename_file(DOS_FILE *file) { - unsigned char name[46]; - unsigned char *walk,*here; + //unsigned char name[46]; + //unsigned char *walk,*here; if (!file->offset) { - printf( "Cannot rename FAT32 root dir\n" ); + VfatPrint( "Cannot rename FAT32 root dir\n" ); return; /* cannot rename FAT32 root dir */ } while (1) { - printf("New name: "); + VfatPrint("New name: "); +#if 0 fflush(stdout); if (fgets((char*)name,45,stdin)) { if ((here = (unsigned char*)strchr((char*)name,'\n'))) *here = 0; @@ -343,6 +351,9 @@ return; } } +#else + return; +#endif } } @@ -353,18 +364,18 @@ name = strncmp((char*)file->dir_ent.name,MSDOS_DOT,MSDOS_NAME) ? ".." : "."; if (!(file->dir_ent.attr & ATTR_DIR)) { - printf("%s\n Is a non-directory.\n",path_name(file)); + VfatPrint("%s\n Is a non-directory.\n",path_name(file)); if (interactive) - printf("1) Drop it\n2) Auto-rename\n3) Rename\n" + VfatPrint("1) Drop it\n2) Auto-rename\n3) Rename\n" "4) Convert to directory\n"); - else printf(" Auto-renaming it.\n"); + else VfatPrint(" Auto-renaming it.\n"); switch (interactive ? get_key("1234","?") : '2') { case '1': drop_file(fs,file); return 1; case '2': auto_rename(file); - printf(" Renamed to %s\n",file_name(file->dir_ent.name)); + VfatPrint(" Renamed to %s\n",file_name(file->dir_ent.name)); return 0; case '3': rename_file(file); @@ -376,7 +387,7 @@ } } if (!dots) { - printf("Root contains directory \"%s\". Dropping it.\n",name); + VfatPrint("Root contains directory \"%s\". Dropping it.\n",name); drop_file(fs,file); return 1; } @@ -392,14 +403,14 @@ if (file->dir_ent.attr & ATTR_DIR) { if (CF_LE_L(file->dir_ent.size)) { - printf("%s\n Directory has non-zero size. Fixing it.\n", + VfatPrint("%s\n Directory has non-zero size. Fixing it.\n", path_name(file)); MODIFY(file,size,CT_LE_L(0)); } if (file->parent && !strncmp((char*)file->dir_ent.name,MSDOS_DOT,MSDOS_NAME)) { expect = FSTART(file->parent,fs); if (FSTART(file,fs) != expect) { - printf("%s\n Start (%ld) does not point to parent (%ld)\n", + VfatPrint("%s\n Start (%ld) does not point to parent (%ld)\n", path_name(file),FSTART(file,fs),expect); MODIFY_START(file,expect,fs); } @@ -411,21 +422,21 @@ if (fs->root_cluster && expect == fs->root_cluster) expect = 0; if (FSTART(file,fs) != expect) { - printf("%s\n Start (%lu) does not point to .. (%lu)\n", + VfatPrint("%s\n Start (%lu) does not point to .. (%lu)\n", path_name(file),FSTART(file,fs),expect); MODIFY_START(file,expect,fs); } return 0; } if (FSTART(file,fs)==0){ - printf ("%s\n Start does point to root directory. Deleting dir. \n", + VfatPrint ("%s\n Start does point to root directory. Deleting dir. \n", path_name(file)); MODIFY(file,name[0],DELETED_FLAG); return 0; } } if (FSTART(file,fs) >= fs->clusters+2) { - printf("%s\n Start cluster beyond limit (%lu > %lu). Truncating file.\n", + VfatPrint("%s\n Start cluster beyond limit (%lu > %lu). Truncating file.\n", path_name(file),FSTART(file,fs),fs->clusters+1); if (!file->offset) die( "Bad FAT32 root directory! (bad start cluster)\n" ); @@ -435,7 +446,7 @@ for (curr = FSTART(file,fs) ? FSTART(file,fs) : -1; curr != -1; curr = next_cluster(fs,curr)) { if (!fs->fat[curr].value || bad_cluster(fs,curr)) { - printf("%s\n Contains a %s cluster (%lu). Assuming EOF.\n", + VfatPrint("%s\n Contains a %s cluster (%lu). Assuming EOF.\n", path_name(file),fs->fat[curr].value ? "bad" : "free",curr); if (prev) set_fat(fs,prev,-1); else if (!file->offset) @@ -445,7 +456,7 @@ } if (!(file->dir_ent.attr & ATTR_DIR) && CF_LE_L(file->dir_ent.size) <= clusters*fs->cluster_size) { - printf("%s\n File size is %u bytes, cluster chain length is > %lu " + VfatPrint("%s\n File size is %u bytes, cluster chain length is > %lu " "bytes.\n Truncating file to %u bytes.\n",path_name(file), CF_LE_L(file->dir_ent.size),clusters*fs->cluster_size, CF_LE_L(file->dir_ent.size)); @@ -454,8 +465,8 @@ } if ((owner = get_owner(fs,curr))) { int do_trunc = 0; - printf("%s and\n",path_name(owner)); - printf("%s\n share clusters.\n",path_name(file)); + VfatPrint("%s and\n",path_name(owner)); + VfatPrint("%s\n share clusters.\n",path_name(file)); clusters2 = 0; for (walk = FSTART(owner,fs); walk > 0 && walk != -1; walk = next_cluster(fs,walk)) @@ -463,20 +474,20 @@ else clusters2++; restart = file->dir_ent.attr & ATTR_DIR; if (!owner->offset) { - printf( " Truncating second to %lu bytes because first " + VfatPrint( " Truncating second to %lu bytes because first " "is FAT32 root dir.\n", clusters2*fs->cluster_size ); do_trunc = 2; } else if (!file->offset) { - printf( " Truncating first to %lu bytes because second " + VfatPrint( " Truncating first to %lu bytes because second " "is FAT32 root dir.\n", clusters*fs->cluster_size ); do_trunc = 1; } else if (interactive) - printf("1) Truncate first to %lu bytes%s\n" + VfatPrint("1) Truncate first to %lu bytes%s\n" "2) Truncate second to %lu bytes\n",clusters*fs->cluster_size, restart ? " and restart" : "",clusters2*fs->cluster_size); - else printf(" Truncating second to %lu bytes.\n",clusters2* + else VfatPrint(" Truncating second to %lu bytes.\n",clusters2* fs->cluster_size); if (do_trunc != 2 && (do_trunc == 1 || @@ -515,7 +526,7 @@ } if (!(file->dir_ent.attr & ATTR_DIR) && CF_LE_L(file->dir_ent.size) > clusters*fs->cluster_size) { - printf("%s\n File size is %u bytes, cluster chain length is %lu bytes." + VfatPrint("%s\n File size is %u bytes, cluster chain length is %lu bytes." "\n Truncating file to %lu bytes.\n",path_name(file),CF_LE_L(file-> dir_ent.size),clusters*fs->cluster_size,clusters*fs->cluster_size); MODIFY(file,size,CT_LE_L(clusters*fs->cluster_size)); @@ -547,10 +558,10 @@ if (bad_name((*walk)->dir_ent.name)) bad++; else good++; if (*root && parent && good+bad > 4 && bad > good/2) { - printf("%s\n Has a large number of bad entries. (%d/%d)\n", + VfatPrint("%s\n Has a large number of bad entries. (%d/%d)\n", path_name(parent),bad,good+bad); - if (!dots) printf( " Not dropping root directory.\n" ); - else if (!interactive) printf(" Not dropping it in auto-mode.\n"); + if (!dots) VfatPrint( " Not dropping root directory.\n" ); + else if (!interactive) VfatPrint(" Not dropping it in auto-mode.\n"); else if (get_key("yn","Drop directory ? (y/n)") == 'y') { truncate_file(fs,parent,0); MODIFY(parent,name[0],DELETED_FLAG); @@ -572,11 +583,11 @@ } if (!((*walk)->dir_ent.attr & ATTR_VOLUME) && bad_name((*walk)->dir_ent.name)) { - printf("%s\n Bad file name.\n",path_name(*walk)); + VfatPrint("%s\n Bad file name.\n",path_name(*walk)); if (interactive) - printf("1) Drop file\n2) Rename file\n3) Auto-rename\n" + VfatPrint("1) Drop file\n2) Rename file\n3) Auto-rename\n" "4) Keep it\n"); - else printf(" Auto-renaming it.\n"); + else VfatPrint(" Auto-renaming it.\n"); switch (interactive ? get_key("1234","?") : '3') { case '1': drop_file(fs,*walk); @@ -588,7 +599,7 @@ break; case '3': auto_rename(*walk); - printf(" Renamed to %s\n",file_name((*walk)->dir_ent. + VfatPrint(" Renamed to %s\n",file_name((*walk)->dir_ent. name)); break; case '4': @@ -602,14 +613,14 @@ while (*scan && !skip) { if (!((*scan)->dir_ent.attr & ATTR_VOLUME) && !strncmp((char*)(*walk)->dir_ent.name,(char*)(*scan)->dir_ent.name,MSDOS_NAME)) { - printf("%s\n Duplicate directory entry.\n First %s\n", + VfatPrint("%s\n Duplicate directory entry.\n First %s\n", path_name(*walk),file_stat(*walk)); - printf(" Second %s\n",file_stat(*scan)); + VfatPrint(" Second %s\n",file_stat(*scan)); if (interactive) - printf("1) Drop first\n2) Drop second\n3) Rename first\n" + VfatPrint("1) Drop first\n2) Drop second\n3) Rename first\n" "4) Rename second\n5) Auto-rename first\n" "6) Auto-rename second\n"); - else printf(" Auto-renaming second.\n"); + else VfatPrint(" Auto-renaming second.\n"); switch (interactive ? get_key("123456","?") : '6') { case '1': drop_file(fs,*walk); @@ -622,22 +633,22 @@ continue; case '3': rename_file(*walk); - printf(" Renamed to %s\n",path_name(*walk)); + VfatPrint(" Renamed to %s\n",path_name(*walk)); redo = 1; break; case '4': rename_file(*scan); - printf(" Renamed to %s\n",path_name(*walk)); + VfatPrint(" Renamed to %s\n",path_name(*walk)); redo = 1; break; case '5': auto_rename(*walk); - printf(" Renamed to %s\n",file_name((*walk)->dir_ent. + VfatPrint(" Renamed to %s\n",file_name((*walk)->dir_ent. name)); break; case '6': auto_rename(*scan); - printf(" Renamed to %s\n",file_name((*scan)->dir_ent. + VfatPrint(" Renamed to %s\n",file_name((*scan)->dir_ent. name)); break; } @@ -653,10 +664,10 @@ } } if (dots && !dot) - printf("%s\n \".\" is missing. Can't fix this yet.\n", + VfatPrint("%s\n \".\" is missing. Can't fix this yet.\n", path_name(parent)); if (dots && !dotdot) - printf("%s\n \"..\" is missing. Can't fix this yet.\n", + VfatPrint("%s\n \"..\" is missing. Can't fix this yet.\n", path_name(parent)); return 0; } @@ -673,7 +684,7 @@ next_clu = next_cluster(fs,walk); if ((owner = get_owner(fs,walk))) { if (owner == file) { - printf("%s\n Circular cluster chain. Truncating to %lu " + VfatPrint("%s\n Circular cluster chain. Truncating to %lu " "cluster%s.\n",path_name(file),clusters,clusters == 1 ? "" : "s"); if (prev) set_fat(fs,prev,-1); @@ -690,7 +701,7 @@ clusters++; } else { - printf("%s\n Cluster %lu (%lu) is unreadable. Skipping it.\n", + VfatPrint("%s\n Cluster %lu (%lu) is unreadable. Skipping it.\n", path_name(file),clusters,walk); if (prev) set_fat(fs,prev,next_cluster(fs,walk)); else MODIFY_START(file,next_cluster(fs,walk),fs); @@ -723,7 +734,7 @@ if (prev) set_fat(fs,prev,-1); else MODIFY_START(file,0,fs); if (left) - printf("Warning: Did only undelete %lu of %lu cluster%s.\n",clusters-left, + VfatPrint("Warning: Did only undelete %lu of %lu cluster%s.\n",clusters-left, clusters,clusters == 1 ? "" : "s"); } @@ -779,10 +790,10 @@ **chain = new; *chain = &new->next; if (list) { - printf("Checking file %s",path_name(new)); + VfatPrint("Checking file %s",path_name(new)); if (new->lfn) - printf(" (%s)", file_name(new->dir_ent.name) ); - printf("\n"); + VfatPrint(" (%s)", file_name(new->dir_ent.name) ); + VfatPrint("\n"); } if (offset && strncmp((char*)de.name,MSDOS_DOT,MSDOS_NAME) != 0 && Modified: trunk/reactos/lib/fslib/vfatlib/check/check.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.h [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -9,7 +9,7 @@ loff_t alloc_rootdir_entry(DOS_FS *fs, DIR_ENT *de, const char *pattern); /* Allocate a free slot in the root directory for a new file. The file name is - constructed after 'pattern', which must include a %d type format for printf + constructed after 'pattern', which must include a %d type format for VfatPrint and expand to exactly 11 characters. The name actually used is written into the 'de' structure, the rest of *de is cleared. The offset returned is to where in the filesystem the entry belongs. */ Modified: trunk/reactos/lib/fslib/vfatlib/check/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/co… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/common.c [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -23,34 +23,48 @@ va_list args; va_start(args,msg); - vfprintf(stderr,msg,args); + //vfprintf(stderr,msg,args); + DPRINT1("Unrecoverable problem!\n"); va_end(args); - fprintf(stderr,"\n"); - exit(1); + //fprintf(stderr,"\n"); + //exit(1); } - void pdie(char *msg,...) { va_list args; va_start(args,msg); - vfprintf(stderr,msg,args); + //vfprintf(stderr,msg,args); + DPRINT1("Unrecoverable problem!\n"); va_end(args); - fprintf(stderr,":%s\n",strerror(errno)); - exit(1); + //fprintf(stderr,":%s\n",strerror(errno)); + //exit(1); + DbgBreakPoint(); } void *alloc(int size) { - void *this; + void *ptr; - if ((this = malloc(size))) return this; - pdie("malloc"); - return NULL; /* for GCC */ + ptr = RtlAllocateHeap(RtlGetProcessHeap (), + 0, + size); + + if (ptr == NULL) + { + DPRINT1("Allocation failed!\n"); + return NULL; + } + + return ptr; } +void free(void *ptr) +{ + RtlFreeHeap(RtlGetProcessHeap(), 0, ptr); +} void *qalloc(void **root,int size) { @@ -87,10 +101,11 @@ char get_key(char *valid,char *prompt) { +#if 0 int ch,okay; while (1) { - if (prompt) printf("%s ",prompt); + if (prompt) VfatPrint("%s ",prompt); fflush(stdout); while (ch = getchar(), ch == ' ' || ch == '\t'); if (ch == EOF) exit(1); @@ -98,8 +113,11 @@ while (ch = getchar(), ch != '\n' && ch != EOF); if (ch == EOF) exit(1); if (okay) return okay; - printf("Invalid input.\n"); + VfatPrint("Invalid input.\n"); } +#else + return 0; +#endif } /* Local Variables: */ Modified: trunk/reactos/lib/fslib/vfatlib/check/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/co… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/common.h [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -8,17 +8,17 @@ #define _COMMON_H //void die(char *msg,...) __attribute((noreturn)); -__declspec(noreturn) void die(char *msg,...); +void die(char *msg,...); /* Displays a prinf-style message and terminates the program. */ //void pdie(char *msg,...) __attribute((noreturn)); -__declspec(noreturn) void pdie(char *msg,...); +void pdie(char *msg,...); /* Like die, but appends an error message according to the state of errno. */ void *alloc(int size); - +void free(void *ptr); /* mallocs SIZE bytes and returns a pointer to the data. Terminates the program if malloc fails. */ Modified: trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/do… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -35,7 +35,10 @@ //#include <linux/version.h> //# include "types.h" -# include "byteorder.h" + +#ifdef _M_IX86 +#include "byteorder.h" +#endif #include "msdos_fs.h" Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fa… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -71,30 +71,30 @@ first_ok = (first_media.value & FAT_EXTD(fs)) == FAT_EXTD(fs); second_ok = (second_media.value & FAT_EXTD(fs)) == FAT_EXTD(fs); if (first_ok && !second_ok) { - printf("FATs differ - using first FAT.\n"); + VfatPrint("FATs differ - using first FAT.\n"); fs_write(fs->fat_start+fs->fat_size,eff_size,use = first); } if (!first_ok && second_ok) { - printf("FATs differ - using second FAT.\n"); + VfatPrint("FATs differ - using second FAT.\n"); fs_write(fs->fat_start,eff_size,use = second); } if (first_ok && second_ok) { if (interactive) { - printf("FATs differ but appear to be intact. Use which FAT ?\n" + VfatPrint("FATs differ but appear to be intact. Use which FAT ?\n" "1) Use first FAT\n2) Use second FAT\n"); if (get_key("12","?") == '1') fs_write(fs->fat_start+fs->fat_size,eff_size,use = first); else fs_write(fs->fat_start,eff_size,use = second); } else { - printf("FATs differ but appear to be intact. Using first " + VfatPrint("FATs differ but appear to be intact. Using first " "FAT.\n"); fs_write(fs->fat_start+fs->fat_size,eff_size,use = first); } } if (!first_ok && !second_ok) { - printf("Both FATs appear to be corrupt. Giving up.\n"); - exit(1); + VfatPrint("Both FATs appear to be corrupt. Giving up.\n"); + //exit(1); } } fs->fat = qalloc(&mem_queue,sizeof(FAT_ENTRY)*(fs->clusters+2)); @@ -102,7 +102,7 @@ for (i = 2; i < fs->clusters+2; i++) if (fs->fat[i].value >= fs->clusters+2 && (fs->fat[i].value < FAT_MIN_BAD(fs))) { - printf("Cluster %ld out of range (%ld > %ld). Setting to EOF.\n", + VfatPrint("Cluster %ld out of range (%ld > %ld). Setting to EOF.\n", i-2,fs->fat[i].value,fs->clusters+2-1); set_fat(fs,i,-1); } @@ -115,8 +115,8 @@ void set_fat(DOS_FS *fs,unsigned long cluster,unsigned long new) { unsigned char data[4]; - int size; - loff_t offs; + int size = 0; + loff_t offs = 0LL; if ((long)new == -1) new = FAT_EOF(fs); @@ -200,11 +200,11 @@ unsigned long i; if (verbose) - printf("Checking for bad clusters.\n"); + VfatPrint("Checking for bad clusters.\n"); for (i = 2; i < fs->clusters+2; i++) if (!get_owner(fs,i) && !FAT_IS_BAD(fs,fs->fat[i].value)) if (!fs_test(cluster_start(fs,i),fs->cluster_size)) { - printf("Cluster %lu is unreadable.\n",i); + VfatPrint("Cluster %lu is unreadable.\n",i); set_fat(fs,i,-2); } } @@ -216,7 +216,7 @@ unsigned long i; if (verbose) - printf("Checking for unused clusters.\n"); + VfatPrint("Checking for unused clusters.\n"); reclaimed = 0; for (i = 2; i < fs->clusters+2; i++) if (!get_owner(fs,i) && fs->fat[i].value && @@ -225,7 +225,7 @@ reclaimed++; } if (reclaimed) - printf("Reclaimed %d unused cluster%s (%d bytes).\n",reclaimed, + VfatPrint("Reclaimed %d unused cluster%s (%d bytes).\n",reclaimed, reclaimed == 1 ? "" : "s",reclaimed*fs->cluster_size); } @@ -262,7 +262,7 @@ unsigned long i,next,walk; if (verbose) - printf("Reclaiming unconnected clusters.\n"); + VfatPrint("Reclaiming unconnected clusters.\n"); for (i = 2; i < fs->clusters+2; i++) fs->fat[i].prev = 0; for (i = 2; i < fs->clusters+2; i++) { next = fs->fat[i].value; @@ -282,7 +282,7 @@ die("Internal error: prev going below zero"); set_fat(fs,i,-1); changed = 1; - printf("Broke cycle at cluster %lu in free chain.\n",i); + VfatPrint("Broke cycle at cluster %lu in free chain.\n",i); break; } } @@ -305,7 +305,7 @@ fs_write(offset,sizeof(DIR_ENT),&de); } if (reclaimed) - printf("Reclaimed %d unused cluster%s (%d bytes) in %d chain%s.\n", + VfatPrint("Reclaimed %d unused cluster%s (%d bytes) in %d chain%s.\n", reclaimed,reclaimed == 1 ? "" : "s",reclaimed*fs->cluster_size,files, files == 1 ? "" : "s"); } @@ -325,23 +325,23 @@ return free; if (verbose) - printf("Checking free cluster summary.\n"); + VfatPrint("Checking free cluster summary.\n"); if (fs->free_clusters >= 0) { if (free != fs->free_clusters) { - printf( "Free cluster summary wrong (%ld vs. really %ld)\n", + VfatPrint( "Free cluster summary wrong (%ld vs. really %ld)\n", fs->free_clusters,free); if (interactive) - printf( "1) Correct\n2) Don't correct\n" ); - else printf( " Auto-correcting.\n" ); + VfatPrint( "1) Correct\n2) Don't correct\n" ); + else VfatPrint( " Auto-correcting.\n" ); if (!interactive || get_key("12","?") == '1') do_set = 1; } } else { - printf( "Free cluster summary uninitialized (should be %ld)\n", free ); + VfatPrint( "Free cluster summary uninitialized (should be %ld)\n", free ); if (interactive) - printf( "1) Set it\n2) Leave it uninitialized\n" ); - else printf( " Auto-setting.\n" ); + VfatPrint( "1) Set it\n2) Leave it uninitialized\n" ); + else VfatPrint( " Auto-setting.\n" ); if (!interactive || get_key("12","?") == '1') do_set = 1; } Modified: trunk/reactos/lib/fslib/vfatlib/check/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -5,6 +5,9 @@ /* FAT32, VFAT, Atari format support, and various fixes additions May 1998 * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ +/* Need to define this so that islower isn't inlined + (ntdll doesn't export isctype) */ +#define __NO_CTYPE_INLINES #include "vfatlib.h" @@ -50,7 +53,6 @@ return path; } - int file_cvt(unsigned char *name,unsigned char *fixed) { unsigned char c; @@ -61,13 +63,13 @@ while (*name) { c = *name; if (c < ' ' || c > 0x7e || strchr("*?<>|\"/",c)) { - printf("Invalid character in name. Use \\ooo for special " + VfatPrint("Invalid character in name. Use \\ooo for special " "characters.\n"); return 0; } if (c == '.') { if (ext) { - printf("Duplicate dots in name.\n"); + VfatPrint("Duplicate dots in name.\n"); return 0; } while (size--) *fixed++ = ' '; @@ -80,13 +82,13 @@ c = 0; for (cnt = 3; cnt; cnt--) { if (*name < '0' || *name > '7') { - printf("Invalid octal character.\n"); + VfatPrint("Invalid octal character.\n"); return 0; } c = c*8+*name++-'0'; } if (cnt < 4) { - printf("Expected three octal digits.\n"); + VfatPrint("Expected three octal digits.\n"); return 0; } name += 3; @@ -119,7 +121,7 @@ path++; while (1) { if ((here = strchr(path,'/'))) *here = 0; - if (!file_cvt((unsigned char*)path,(unsigned char *)name)) exit(2); + if (!file_cvt((unsigned char*)path,(unsigned char *)name)) {return; /*exit(2);*/} for (walk = *current; walk; walk = walk->next) if (!here && (!strncmp(name,walk->name,MSDOS_NAME) || (type == fdt_undelete && !strncmp(name+1,walk->name+1,MSDOS_NAME-1)))) @@ -190,12 +192,12 @@ die("Internal error: file_find failed"); switch ((*this)->type) { case fdt_drop: - printf("Dropping %s\n",file_name(fixed)); + VfatPrint("Dropping %s\n",file_name(fixed)); *fixed = DELETED_FLAG; break; case fdt_undelete: *fixed = *(*this)->name; - printf("Undeleting %s\n",file_name(fixed)); + VfatPrint("Undeleting %s\n",file_name(fixed)); break; default: die("Internal error: file_modify"); @@ -214,7 +216,7 @@ next = this->next; if (this->first) report_unused(this->first); else if (this->type != fdt_none) - printf("Warning: did not %s file %s\n",this->type == fdt_drop ? + VfatPrint("Warning: did not %s file %s\n",this->type == fdt_drop ? "drop" : "undelete",file_name((unsigned char*)this->name)); free(this); this = next; Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -66,7 +66,7 @@ FILE_SYNCHRONOUS_IO_ALERT); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenFile() failed with status 0x%.08x\n", Status); + DPRINT1("NtOpenFile() failed with status 0x%.08x\n", Status); return; } @@ -86,7 +86,7 @@ const loff_t seekpos_aligned = pos - (pos % 512); // TMN: const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: - char* tmpBuf = malloc(readsize_aligned); // TMN: + char* tmpBuf = alloc(readsize_aligned); // TMN: if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %I64d",pos); if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %I64d",size,pos); assert(got >= size); @@ -274,7 +274,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("NtReadFile() failed (Status %lx)\n", Status); + DPRINT1("NtReadFile() failed (Status %lx)\n", Status); return -1; } @@ -298,7 +298,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); return -1; } Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -162,23 +162,23 @@ * checksum ok: clear start bit */ /* XXX: Should delay that until next LFN known (then can better * display the name) */ - printf( "A new long file name starts within an old one.\n" ); + VfatPrint( "A new long file name starts within an old one.\n" ); if ((lfn->id & LFN_ID_SLOTMASK) == lfn_slot && lfn->alias_checksum == lfn_checksum) { char *part1 = CNV_THIS_PART(lfn); char *part2 = CNV_PARTS_SO_FAR(); - printf( " It could be that the LFN start bit is wrong here\n" + VfatPrint( " It could be that the LFN start bit is wrong here\n" " if \"%s\" seems to match \"%s\".\n", part1, part2 ); free( part1 ); free( part2 ); can_clear = 1; } if (interactive) { - printf( "1: Delete previous LFN\n2: Leave it as it is.\n" ); + VfatPrint( "1: Delete previous LFN\n2: Leave it as it is.\n" ); if (can_clear) - printf( "3: Clear start bit and concatenate LFNs\n" ); - } - else printf( " Not auto-correcting this.\n" ); + VfatPrint( "3: Clear start bit and concatenate LFNs\n" ); + } + else VfatPrint( " Not auto-correcting this.\n" ); if (interactive) { switch( get_key( can_clear ? "123" : "12", "?" )) { case '1': @@ -207,14 +207,14 @@ * lost */ /* Fixes: 1) delete LFN, 2) set start bit */ char *part = CNV_THIS_PART(lfn); - printf( "Long filename fragment \"%s\" found outside a LFN " + VfatPrint( "Long filename fragment \"%s\" found outside a LFN " "sequence.\n (Maybe the start bit is missing on the " "last fragment)\n", part ); if (interactive) { - printf( "1: Delete fragment\n2: Leave it as it is.\n" + VfatPrint( "1: Delete fragment\n2: Leave it as it is.\n" "3: Set start bit\n" ); } - else printf( " Not auto-correcting this.\n" ); + else VfatPrint( " Not auto-correcting this.\n" ); if (interactive) { switch( get_key( "123", "?" )) { case '1': @@ -247,24 +247,24 @@ * are ok?, maybe only if checksum is ok?) (Attention: space * for name was allocated before!) */ int can_fix = 0; - printf( "Unexpected long filename sequence number " + VfatPrint( "Unexpected long filename sequence number " "(%d vs. expected %d).\n", (lfn->id & LFN_ID_SLOTMASK), lfn_slot ); if (lfn->alias_checksum == lfn_checksum) { char *part1 = CNV_THIS_PART(lfn); char *part2 = CNV_PARTS_SO_FAR(); - printf( " It could be that just the number is wrong\n" + VfatPrint( " It could be that just the number is wrong\n" " if \"%s\" seems to match \"%s\".\n", part1, part2 ); free( part1 ); free( part2 ); can_fix = 1; } if (interactive) { - printf( "1: Delete LFN\n2: Leave it as it is (and ignore LFN so far)\n" ); + VfatPrint( "1: Delete LFN\n2: Leave it as it is (and ignore LFN so far)\n" ); if (can_fix) - printf( "3: Correct sequence number\n" ); - } - else printf( " Not auto-correcting this.\n" ); + VfatPrint( "3: Correct sequence number\n" ); + } + else VfatPrint( " Not auto-correcting this.\n" ); if (interactive) { switch( get_key( can_fix ? "123" : "12", "?" )) { case '1': @@ -288,14 +288,14 @@ /* checksum mismatch */ /* Causes: 1) checksum field here destroyed */ /* Fixes: 1) delete LFN, 2) fix checksum */ - printf( "Checksum in long filename part wrong " + VfatPrint( "Checksum in long filename part wrong " "(%02x vs. expected %02x).\n", lfn->alias_checksum, lfn_checksum ); if (interactive) { - printf( "1: Delete LFN\n2: Leave it as it is.\n" + VfatPrint( "1: Delete LFN\n2: Leave it as it is.\n" "3: Correct checksum\n" ); } - else printf( " Not auto-correcting this.\n" ); + else VfatPrint( " Not auto-correcting this.\n" ); if (interactive) { switch( get_key( "123", "?" )) { case '1': @@ -324,11 +324,11 @@ } if (lfn->reserved != 0) { - printf( "Reserved field in VFAT long filename slot is not 0 " + VfatPrint( "Reserved field in VFAT long filename slot is not 0 " "(but 0x%02x).\n", lfn->reserved ); if (interactive) - printf( "1: Fix.\n2: Leave it.\n" ); - else printf( "Auto-setting to 0.\n" ); + VfatPrint( "1: Fix.\n2: Leave it.\n" ); + else VfatPrint( "Auto-setting to 0.\n" ); if (!interactive || get_key("12","?") == '1') { lfn->reserved = 0; fs_write( dir_offset+offsetof(LFN_ENT,reserved), @@ -336,11 +336,11 @@ } } if (lfn->start != CT_LE_W(0)) { - printf( "Start cluster field in VFAT long filename slot is not 0 " + VfatPrint( "Start cluster field in VFAT long filename slot is not 0 " "(but 0x%04x).\n", lfn->start ); if (interactive) - printf( "1: Fix.\n2: Leave it.\n" ); - else printf( "Auto-setting to 0.\n" ); + VfatPrint( "1: Fix.\n2: Leave it.\n" ); + else VfatPrint( "Auto-setting to 0.\n" ); if (!interactive || get_key("12","?") == '1') { lfn->start = CT_LE_W(0); fs_write( dir_offset+offsetof(LFN_ENT,start), @@ -363,7 +363,7 @@ #if 0 if (de->lcase) - printf( "lcase=%02x\n",de->lcase ); + VfatPrint( "lcase=%02x\n",de->lcase ); #endif if (lfn_slot == -1) @@ -378,16 +378,16 @@ * 3) renumber entries and truncate name */ char *long_name = CNV_PARTS_SO_FAR(); char *short_name = file_name(de->name); - printf( "Unfinished long file name \"%s\".\n" + VfatPrint( "Unfinished long file name \"%s\".\n" " (Start may have been overwritten by %s)\n", long_name, short_name ); free( long_name ); if (interactive) { - printf( "1: Delete LFN\n2: Leave it as it is.\n" + VfatPrint( "1: Delete LFN\n2: Leave it as it is.\n" "3: Fix numbering (truncates long name and attaches " "it to short name %s)\n", short_name ); } - else printf( " Not auto-correcting this.\n" ); + else VfatPrint( " Not auto-correcting this.\n" ); if (interactive) { switch( get_key( "123", "?" )) { case '1': @@ -418,16 +418,16 @@ /* Fixes: 1) Fix checksum in LFN entries */ char *long_name = CNV_PARTS_SO_FAR(); char *short_name = file_name(de->name); - printf( "Wrong checksum for long file name \"%s\".\n" + VfatPrint( "Wrong checksum for long file name \"%s\".\n" " (Short name %s may have changed without updating the long name)\n", long_name, short_name ); free( long_name ); if (interactive) { - printf( "1: Delete LFN\n2: Leave it as it is.\n" + VfatPrint( "1: Delete LFN\n2: Leave it as it is.\n" "3: Fix checksum (attaches to short name %s)\n", short_name ); } - else printf( " Not auto-correcting this.\n" ); + else VfatPrint( " Not auto-correcting this.\n" ); if (interactive) { switch( get_key( "123", "?" )) { case '1': @@ -460,10 +460,10 @@ return; long_name = CNV_PARTS_SO_FAR(); - printf("Orphaned long file name part \"%s\"\n", long_name); + VfatPrint("Orphaned long file name part \"%s\"\n", long_name); if (interactive) - printf( "1: Delete.\n2: Leave it.\n" ); - else printf( " Auto-deleting.\n" ); + VfatPrint( "1: Delete.\n2: Leave it.\n" ); + else VfatPrint( " Auto-deleting.\n" ); if (!interactive || get_key("12","?") == '1') { clear_lfn_slots(0, lfn_parts - 1); } Modified: trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ms… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/msdos_fs.h [iso-8859-1] Mon Aug 4 11:04:56 2008 @@ -4,7 +4,9 @@ /* * The MS-DOS filesystem constants/structures */ +#ifdef _M_IX86 #include "byteorder.h" +#endif #define SECTOR_SIZE 512 /* sector size (bytes) */ #define SECTOR_BITS 9 /* log2(SECTOR_SIZE) */

1 0

[sginsberg] 35103: - Export KeI386MachineType and KeInitializeThreadedDpc - Stubplement and export IoEnumerateRegisteredFiltersList, IoGetPagingIoPriority, KdRefreshDebuggerNotPresent, KeAcquireInStackQueuedSpinLockForDpc, KeReleaseInStackQueuedSpinLockForDpc, KeAcquireSpinLockForDpc, KeReleaseSpinLockForDpc, KeRegisterNmiCallback, KeDeregisterNmiCallback, KeInitializeCrashDumpHeader, KeTestSpinLock and MmAllocatePagesForMdlEx - Add IO_PAGING_PRIORITY enumeration and PNMI_CALLBACK prototype to h
by sginsberg＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: sginsberg Date: Mon Aug 4 10:48:46 2008 New Revision: 35103 URL: http://svn.reactos.org/svn/reactos?rev=35103&view=rev Log: - Export KeI386MachineType and KeInitializeThreadedDpc - Stubplement and export IoEnumerateRegisteredFiltersList, IoGetPagingIoPriority, KdRefreshDebuggerNotPresent, KeAcquireInStackQueuedSpinLockForDpc, KeReleaseInStackQueuedSpinLockForDpc, KeAcquireSpinLockForDpc, KeReleaseSpinLockForDpc, KeRegisterNmiCallback, KeDeregisterNmiCallback, KeInitializeCrashDumpHeader, KeTestSpinLock and MmAllocatePagesForMdlEx - Add IO_PAGING_PRIORITY enumeration and PNMI_CALLBACK prototype to headers Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/iomgr/volume.c (contents, props changed) trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/spinlock.c (contents, props changed) trunk/reactos/ntoskrnl/mm/mdlsup.c trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -746,6 +746,15 @@ #define IRP_MN_EXECUTE_METHOD 0x09 #define IRP_MN_REGINFO_EX 0x0b + +typedef enum _IO_PAGING_PRIORITY +{ + IoPagingPriorityInvalid, + IoPagingPriorityNormal, + IoPagingPriorityHigh, + IoPagingPriorityReserved1, + IoPagingPriorityReserved2 +} IO_PAGING_PRIORITY; typedef enum _IO_ALLOCATION_ACTION { KeepObject = 1, @@ -4856,6 +4865,11 @@ UCHAR State; } KBUGCHECK_CALLBACK_RECORD, *PKBUGCHECK_CALLBACK_RECORD; +typedef BOOLEAN +(DDKAPI *PNMI_CALLBACK)( + IN PVOID Context, + IN BOOLEAN Handled); + /* * VOID * KeInitializeCallbackRecord( Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -1535,6 +1535,19 @@ } /* + * @unimplemented + */ +IO_PAGING_PRIORITY +NTAPI +IoGetPagingIoPriority(IN PIRP Irp) +{ + UNIMPLEMENTED; + + /* Lie and say this isn't a paging IRP -- FIXME! */ + return IoPagingPriorityInvalid; +} + +/* * @implemented */ PEPROCESS NTAPI Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -646,6 +646,19 @@ /* PUBLIC FUNCTIONS **********************************************************/ /* + * @unimplemented + */ +NTSTATUS +NTAPI +IoEnumerateRegisteredFiltersList(IN PDRIVER_OBJECT *DriverObjectList, + IN ULONG DriverObjectListSize, + OUT PULONG ActualNumberDriverObjects) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* * @implemented */ NTSTATUS Propchange: trunk/reactos/ntoskrnl/io/iomgr/volume.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -210,6 +210,19 @@ /* * @implemented */ +BOOLEAN +NTAPI +KdRefreshDebuggerNotPresent(VOID) +{ + UNIMPLEMENTED; + + /* Just return whatever was set previously -- FIXME! */ + return KdDebuggerNotPresent; +} + +/* + * @implemented + */ NTSTATUS STDCALL KdDisableDebugger(VOID) Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -1300,6 +1300,17 @@ return STATUS_SUCCESS; } +/* + * @unimplemented + */ +BOOLEAN +NTAPI +KdRefreshDebuggerNotPresent(VOID) +{ + /* HACK */ + return KdDebuggerNotPresent; +} + NTSTATUS NTAPI NtQueryDebugFilterState(ULONG ComponentId, Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3510… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -1208,6 +1208,21 @@ /* PUBLIC FUNCTIONS **********************************************************/ /* + * @unimplemented + */ +NTSTATUS +NTAPI +KeInitializeCrashDumpHeader(IN ULONG Type, + IN ULONG Flags, + OUT PVOID Buffer, + IN ULONG BufferSize, + OUT ULONG BufferNeeded OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* * @implemented */ BOOLEAN @@ -1260,6 +1275,17 @@ /* Lower IRQL and return */ KeLowerIrql(OldIrql); return Status; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +KeDeregisterNmiCallback(PVOID Handle) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; } /* @@ -1333,6 +1359,18 @@ } /* + * @unimplemented + */ +PVOID +NTAPI +KeRegisterNmiCallback(IN PNMI_CALLBACK CallbackRoutine, + IN PVOID Context) +{ + UNIMPLEMENTED; + return NULL; +} + +/* * @implemented */ VOID Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -260,4 +260,59 @@ KeLowerIrql(OldIrql); } +/* + * @unimplemented + */ +KIRQL +FASTCALL +KeAcquireSpinLockForDpc(IN PKSPIN_LOCK SpinLock) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +VOID +FASTCALL +KeReleaseSpinLockForDpc(IN PKSPIN_LOCK SpinLock, + IN KIRQL OldIrql) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +KIRQL +FASTCALL +KeAcquireInStackQueuedSpinLockForDpc(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +VOID +FASTCALL +KeReleaseInStackQueuedSpinLockForDpc(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOLEAN +FASTCALL +KeTestSpinLock(IN PKSPIN_LOCK SpinLock) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ Propchange: trunk/reactos/ntoskrnl/ke/spinlock.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -616,6 +616,22 @@ } /* + * @unimplemented + */ +PMDL +NTAPI +MmAllocatePagesForMdlEx(IN PHYSICAL_ADDRESS LowAddress, + IN PHYSICAL_ADDRESS HighAddress, + IN PHYSICAL_ADDRESS SkipBytes, + IN SIZE_T Totalbytes, + IN MEMORY_CACHING_TYPE CacheType, + IN ULONG Flags) +{ + UNIMPLEMENTED; + return NULL; +} + +/* * @implemented */ PVOID Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Mon Aug 4 10:48:46 2008 @@ -388,7 +388,7 @@ IoDriverObjectType DATA IoEnqueueIrp@4 IoEnumerateDeviceObjectList@16 -;IoEnumerateRegisteredFiltersList +IoEnumerateRegisteredFiltersList@12 IoFastQueryNetworkAttributes@20 IoFileObjectType=_IoFileObjectType IoForwardAndCatchIrp@8=IoForwardIrpSynchronously@8 @@ -416,7 +416,7 @@ IoGetFileObjectGenericMapping@0 IoGetInitialStack@0 IoGetLowerDeviceObject@4 -;IoGetPagingIoPriority +IoGetPagingIoPriority@4 IoGetRelatedDeviceObject@4 IoGetRequestorProcess@4 IoGetRequestorProcessId@4 @@ -535,7 +535,7 @@ KdEnteredDebugger KdPollBreakIn@0 KdPowerTransition@4 -;KdRefreshDebuggerNotPresent +KdRefreshDebuggerNotPresent@0 KdSystemDebugControl@28 Ke386CallBios@8 ;Ke386IoSetAccessProcess @@ -544,10 +544,10 @@ @KeAcquireGuardedMutex@4 @KeAcquireGuardedMutexUnsafe@4 @KeAcquireInStackQueuedSpinLockAtDpcLevel@8 -;KeAcquireInStackQueuedSpinLockForDpc +@KeAcquireInStackQueuedSpinLockForDpc@8 KeAcquireInterruptSpinLock@4 KeAcquireSpinLockAtDpcLevel@4 -;KeAcquireSpinLockForDpc +@KeAcquireSpinLockForDpc@4 KeAddSystemServiceTable@20 KeAreAllApcsDisabled@0 KeAreApcsDisabled@0 @@ -561,7 +561,7 @@ KeDelayExecutionThread@12 KeDeregisterBugCheckCallback@4 KeDeregisterBugCheckReasonCallback@4 -;KeDeregisterNmiCallback +KeDeregisterNmiCallback@4 KeDetachProcess@0 KeDisconnectInterrupt@4 KeEnterCriticalRegion@0=_KeEnterCriticalRegion@0 @@ -581,12 +581,12 @@ ;KeI386Call16BitFunction KeI386FlatToGdtSelector@12 ;KeI386GetLid -;KeI386MachineType DATA +KeI386MachineType DATA KeI386ReleaseGdtSelectors@8 ;KeI386ReleaseLid ;KeI386SetGdtSelector KeInitializeApc@32 -;KeInitializeCrashDumpHeader +KeInitializeCrashDumpHeader@20 KeInitializeDeviceQueue@4 KeInitializeDpc@12 KeInitializeEvent@12 @@ -597,7 +597,7 @@ KeInitializeQueue@8 KeInitializeSemaphore@12 KeInitializeSpinLock@4 -;KeInitializeThreadedDpc +KeInitializeThreadedDpc@12 KeInitializeTimer@4 KeInitializeTimerEx@8 KeInsertByKeyDeviceQueue@12 @@ -634,16 +634,16 @@ KeReadStateTimer@4 KeRegisterBugCheckCallback@20 KeRegisterBugCheckReasonCallback@16 -;KeRegisterNmiCallback +KeRegisterNmiCallback@8 @KeReleaseGuardedMutex@4 @KeReleaseGuardedMutexUnsafe@4 -;KeReleaseInStackQueuedSpinLockForDpc +@KeReleaseInStackQueuedSpinLockForDpc@4 @KeReleaseInStackQueuedSpinLockFromDpcLevel@4 KeReleaseInterruptSpinLock@8 KeReleaseMutant@16 KeReleaseMutex@8 KeReleaseSemaphore@16 -;KeReleaseSpinLockForDpc +@KeReleaseSpinLockForDpc@8 KeReleaseSpinLockFromDpcLevel@4 KeRemoveByKeyDeviceQueue@8 KeRemoveByKeyDeviceQueueIfBusy@8 @@ -679,7 +679,7 @@ KeStackAttachProcess@8 KeSynchronizeExecution@12 KeTerminateThread@4 -;KeTestSpinLock +@KeTestSpinLock@4 KeTickCount DATA @KeTryToAcquireGuardedMutex@4 @KeTryToAcquireSpinLockAtDpcLevel@4 @@ -727,7 +727,7 @@ MmAllocateMappingAddress@8 MmAllocateNonCachedMemory@4 MmAllocatePagesForMdl@28 -;MmAllocatePagesForMdlEx +MmAllocatePagesForMdlEx@36 MmBuildMdlForNonPagedPool@4 MmCanFileBeTruncated@8 ;MmCommitSessionMappedView

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
86
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008