Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[tkreuzer] 34908: some 64 bit fixes in win32k

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 28 10:19:17 2008 New Revision: 34908 URL: http://svn.reactos.org/svn/reactos?rev=34908&view=rev Log: some 64 bit fixes in win32k Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/menu.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Jul 28 10:19:17 2008 @@ -273,7 +273,7 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQueue, (HWND) Code, HookId, + Status = co_MsqSendMessage(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQueue, (HWND)(INT_PTR) Code, HookId, wParam, lParam, 5000, TRUE, TRUE, &uResult); return NT_SUCCESS(Status) ? uResult : 0; @@ -903,7 +903,7 @@ HHOOK STDCALL NtUserSetWindowsHookAW( - int idHook, + int idHook, HOOKPROC lpfn, BOOL Ansi) { @@ -957,7 +957,7 @@ } Mod = NULL; Global = FALSE; - if (! NT_SUCCESS(PsLookupThreadByThreadId((HANDLE) ThreadId, &Thread))) + if (! NT_SUCCESS(PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)ThreadId, &Thread))) { DPRINT1("Invalid thread id 0x%x\n", ThreadId); SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -1170,5 +1170,5 @@ UserLeave(); END_CLEANUP; } - + /* EOF */ Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Mon Jul 28 10:19:17 2008 @@ -228,7 +228,7 @@ hKl |= 0xe001 << 16; /* FIXME */ else hKl |= hKl << 16; - NewKbl->hkl = (HKL) hKl; + NewKbl->hkl = (HKL)(ULONG_PTR) hKl; NewKbl->klid = LocaleId; NewKbl->Flags = 0; NewKbl->RefCount = 0; @@ -450,7 +450,7 @@ return W32Thread->KeyboardLayout->hkl; } - Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); + Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)dwThreadId, &Thread); if(!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Mon Jul 28 10:19:17 2008 @@ -1954,7 +1954,7 @@ RETURN(FALSE); } - hMenu = (HMENU)WindowObject->Wnd->IDMenu; + hMenu = (HMENU)(DWORD_PTR)WindowObject->Wnd->IDMenu; if (!(MenuObject = UserGetMenuObject(hMenu))) { @@ -2257,7 +2257,7 @@ RETURN(FALSE); } - if(Window->Wnd->IDMenu == (UINT)hMenu) + if(Window->Wnd->IDMenu == (UINT)(UINT_PTR)hMenu) { RETURN( IntHiliteMenuItem(Window, Menu, uItemHilite, uHilite)); } @@ -2664,7 +2664,7 @@ if bInsert == TRUE call NtUserInsertMenuItem() else NtUserSetMenuItemInfo() */ if (bInsert) return UserInsertMenuItem(hMenu, uItem, fByPosition, lpmii); - + UNIMPLEMENTED return 0; } Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Mon Jul 28 10:19:17 2008 @@ -1682,7 +1682,7 @@ && !(Wnd->ExStyle & WS_EX_TOOLWINDOW); } else - HasIcon = (BOOL) hIcon; + HasIcon = (hIcon != 0); IconWidth = UserGetSystemMetrics(SM_CXSIZE) + Padding;

16 years, 1 month

[tkreuzer] 34907: - #if out vista api for now - fix advapi and kernel32 spec files. They need more review though. - fix NtUserGetThreadState This fixes x86 build.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 28 10:14:30 2008 New Revision: 34907 URL: http://svn.reactos.org/svn/reactos?rev=34907&view=rev Log: - #if out vista api for now - fix advapi and kernel32 spec files. They need more review though. - fix NtUserGetThreadState This fixes x86 build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec branches/ros-amd64-bringup/reactos/dll/win32/kernel32/synch/critical.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Mon Jul 28 10:14:30 2008 @@ -7,13 +7,13 @@ @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr) @ stdcall AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) @ stub AccessCheckByType #(ptr ptr long long ptr long ptr ptr ptr ptr ptr) - @ stub AccessCheckByTypeAndAuditAlarmA - @ stub AccessCheckByTypeAndAuditAlarmW + @ stdcall AccessCheckByTypeAndAuditAlarmA(str ptr str str ptr ptr long long long ptr long ptr long ptr ptr ptr) + @ stdcall AccessCheckByTypeAndAuditAlarmW(wstr ptr wstr wstr ptr ptr long long long ptr long ptr long ptr ptr ptr) @ stub AccessCheckByTypeResultList - @ stub AccessCheckByTypeResultListAndAuditAlarmA - @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleA - @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleW - @ stub AccessCheckByTypeResultListAndAuditAlarmW + @ stdcall AccessCheckByTypeResultListAndAuditAlarmA(str ptr str str ptr long long long long ptr long ptr long ptr ptr ptr) + @ stdcall AccessCheckByTypeResultListAndAuditAlarmByHandleA(str ptr ptr str str ptr long long long long ptr long ptr long ptr ptr ptr) + @ stdcall AccessCheckByTypeResultListAndAuditAlarmByHandleW(wstr ptr ptr wstr wstr ptr long long long long ptr long ptr long ptr ptr ptr) + @ stdcall AccessCheckByTypeResultListAndAuditAlarmW(wstr ptr wstr wstr ptr long long long long ptr long ptr long ptr ptr ptr) @ stdcall AddAccessAllowedAce (ptr long long ptr) @ stdcall AddAccessAllowedAceEx (ptr long long long ptr) @ stub AddAccessAllowedObjectAce @@ -243,8 +243,8 @@ @ stdcall GetFileSecurityW(wstr long ptr long ptr) @ stub GetInformationCodeAuthzLevelW @ stub GetInformationCodeAuthzPolicyW - @ stub GetInheritanceSourceA - @ stdcall GetInheritanceSourceW (ptr long long long ptr long ptr ptr ptr ptr) + @ stdcall GetInheritanceSourceA(str long long long ptr long ptr ptr ptr ptr) + @ stdcall GetInheritanceSourceW(wstr long long long ptr long ptr ptr ptr ptr) @ stdcall GetKernelObjectSecurity(long long ptr long ptr) @ stdcall GetLengthSid(ptr) @ stub GetLocalManagedApplicationData @@ -448,6 +448,7 @@ @ stub QueryAllTracesA @ stub QueryAllTracesW @ stub QueryRecoveryAgentsOnEncryptedFile + @ stdcall QuerySecurityAccessMask(long ptr) @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) @ stdcall QueryServiceConfigA(long ptr long ptr) @@ -467,6 +468,8 @@ @ stdcall RegCloseKey(long) @ stdcall RegConnectRegistryA(str long ptr) @ stdcall RegConnectRegistryW(wstr long ptr) + @ stdcall RegCopyTreeA(ptr str ptr) + @ stdcall RegCopyTreeW(ptr wstr ptr) @ stdcall RegCreateKeyA(long str ptr) @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @@ -572,6 +575,7 @@ @ stdcall SetNamedSecurityInfoW(wstr long ptr ptr ptr ptr ptr) @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) @ stub SetPrivateObjectSecurityEx + @ stdcall SetSecurityAccessMask(long ptr) @ stdcall SetSecurityDescriptorControl(ptr long long) @ stdcall SetSecurityDescriptorDacl(ptr long ptr long) @ stdcall SetSecurityDescriptorGroup (ptr ptr long) Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Mon Jul 28 10:14:30 2008 @@ -120,8 +120,8 @@ @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) @ stdcall CreateSemaphoreA(ptr long long str) @ stdcall CreateSemaphoreW(ptr long long wstr) -@ stdcall CreateSemaphoreExA(ptr long long long str long long) -@ stdcall CreateSemaphoreExW(ptr long long long wstr long long) +@ stdcall CreateSemaphoreExA(ptr long long str long long) +@ stdcall CreateSemaphoreExW(ptr long long wstr long long) @ stdcall CreateSocketHandle() @ stdcall CreateSymbolicLinkA(str str long) @ stdcall CreateSymbolicLinkW(wstr wstr long) @@ -311,7 +311,7 @@ @ stdcall GetConsoleCP() @ stub GetConsoleCharType @ stdcall GetConsoleCommandHistoryA(long long long) #check -@ stdcall GetConsoleCommandHistoryLengthA(long long long)#check +@ stdcall GetConsoleCommandHistoryLengthA(long)#check @ stdcall GetConsoleCommandHistoryLengthW(long)#check @ stdcall GetConsoleCommandHistoryW(long long long)#check @ stdcall GetConsoleCursorInfo(long ptr) @@ -399,6 +399,7 @@ @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) @ stdcall GetLocaleInfoW(long long ptr long) +@ stdcall GetLocaleInfoEx(wstr long wstr long) @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives() @@ -575,7 +576,7 @@ @ stdcall InitAtomTable(long) @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) +#@ stdcall InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall InterlockedCompareExchange (ptr long long) Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/synch/critical.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1] Mon Jul 28 10:14:30 2008 @@ -58,11 +58,12 @@ /* * @implemented */ +#if 0 BOOL WINAPI InitializeCriticalSectionEx( CRITICAL_SECTION *crit, DWORD spincount, DWORD flags ) { NTSTATUS ret = RtlInitializeCriticalSectionEx( crit, spincount, flags ); if (ret) RtlRaiseStatus( ret ); return !ret; } - +#endif /* EOF */ Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Jul 28 10:14:30 2008 @@ -21,7 +21,7 @@ NtUserGetThreadState( DWORD Routine) { - DECLARE_RETURN(DWORD_PTR); + DWORD_PTR ret = 0; DPRINT("Enter NtUserGetThreadState\n"); if (Routine != THREADSTATE_GETTHREADINFO) @@ -37,26 +37,29 @@ { case THREADSTATE_GETTHREADINFO: GetW32ThreadInfo(); - RETURN(0); - + break; case THREADSTATE_FOCUSWINDOW: - RETURN( (DWORD_PTR)IntGetThreadFocusWindow()); + ret = (DWORD_PTR)IntGetThreadFocusWindow(); + break; case THREADSTATE_CAPTUREWINDOW: /* FIXME should use UserEnterShared */ - RETURN( (DWORD_PTR)IntGetCapture()); + ret = (DWORD_PTR)IntGetCapture(); + break; case THREADSTATE_PROGMANWINDOW: - RETURN( (DWORD_PTR)GetW32ThreadInfo()->Desktop->hProgmanWindow); + ret = (DWORD_PTR)GetW32ThreadInfo()->Desktop->hProgmanWindow; + break; case THREADSTATE_TASKMANWINDOW: - RETURN( (DWORD_PTR)GetW32ThreadInfo()->Desktop->hTaskManWindow); + ret = (DWORD_PTR)GetW32ThreadInfo()->Desktop->hTaskManWindow; + break; case THREADSTATE_ACTIVEWINDOW: - RETURN ( (DWORD_PTR)UserGetActiveWindow()); - } - RETURN( 0); - -CLEANUP: - DPRINT("Leave NtUserGetThreadState, ret=%i\n",_ret_); + ret = (DWORD_PTR)UserGetActiveWindow(); + break; + } + + DPRINT("Leave NtUserGetThreadState, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + + return ret; } @@ -124,7 +127,7 @@ if(idThread) { - Status = PsLookupThreadByThreadId((HANDLE)idThread, &Thread); + Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)idThread, &Thread); if(!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_ACCESS_DENIED); @@ -416,7 +419,7 @@ (ULONG_PTR)W32Process->HeapMappings.UserMapping; pi->psi = gpsi; - if (InterlockedCompareExchangePointer(&W32Process->ProcessInfo, + if (InterlockedCompareExchangePointer((PVOID*)&W32Process->ProcessInfo, pi, NULL) != NULL) {

16 years, 1 month

[sserapion] 34906: Warning and error fixes.

by sserapion＠svn.reactos.org

Author: sserapion Date: Mon Jul 28 09:50:17 2008 New Revision: 34906 URL: http://svn.reactos.org/svn/reactos?rev=34906&view=rev Log: Warning and error fixes. Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c branches/ros-amd64-bringup/reactos/base/applications/network/ftp/cmds.c branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp_var.h branches/ros-amd64-bringup/reactos/base/applications/network/ftp/main.c branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.c branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.h Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -854,7 +854,7 @@ return str; } -static LRESULT CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { TCHAR buffer[SIZEOF(calc.buffer)]; DWORD n; @@ -1224,7 +1224,7 @@ return 1L; } -static LRESULT CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; RECT rc; Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -417,7 +417,7 @@ if (!*tp) { tp = cp; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -574,7 +574,7 @@ if (!*tp) { tp = argv[2]; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -716,7 +716,7 @@ if (!*tp) { tp = cp; tp2 = tmpbuf; - while ((*tp2 = *tp) != (int) NULL) { + while ((*tp2 = *tp)) { if (isupper(*tp2)) { *tp2 = 'a' + *tp2 - 'A'; } @@ -1687,7 +1687,7 @@ if (!connected) return; (void) command("QUIT"); - cout = (int) NULL; + cout = 0; connected = 0; data = -1; if (!proxy) { Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -9,9 +9,4 @@ #define strcasecmp strcmp #define strncasecmp strnicmp -struct timezone { - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -int gettimeofday(struct timeval *tv, struct timezone *tz); +void __cdecl _tzset(void); Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -295,7 +295,7 @@ printf("\n"); (void) fflush(stdout); } - if (cout == (int) NULL) { + if (cout == 0) { perror ("No control connection for command"); code = -1; return (0); @@ -583,7 +583,7 @@ return; } dout = dataconn(mode); - if (dout == (int)NULL) + if (!dout) goto abort; (void) gettimeofday(&start, (struct timezone *)0); null();// oldintp = signal(SIGPIPE, SIG_IGN); @@ -888,7 +888,7 @@ } } din = dataconn("r"); - if (din == (int)NULL) + if (!din) goto abort; if (strcmp(local, "-") == 0) fout = stdout; @@ -1272,7 +1272,7 @@ if (s < 0) { perror("ftp: accept"); (void) closesocket(data), data = -1; - return (int) (NULL); + return 0; } if(closesocket(data)) { int iret=WSAGetLastError (); Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp_var.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -2,6 +2,7 @@ #include "fake.h" #include "prototypes.h" #include <setjmp.h> +#include <sys/time.h> //typedef void (*Sig_t)(int); @@ -48,11 +49,6 @@ #define STRU_F 1 #define STRU_R 2 #define STRU_P 3 - -#define SIGQUIT 1 -#define SIGPIPE 2 -#define SIGALRM 3 - #define FORM_N 1 #define FORM_T 2 Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/main.c [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -264,9 +264,9 @@ extern int data; if (connected) { - if (cout != (int) NULL) { + if (cout) { closesocket(cout); - cout = (int) NULL; + cout = 0; } if (data >= 0) { (void) shutdown(data, 1+1); @@ -277,9 +277,9 @@ } pswitch(1); if (connected) { - if (cout != (int)NULL) { + if (cout) { closesocket(cout); - cout = (int) NULL; + cout = 0; } connected = 0; } @@ -538,7 +538,7 @@ char *argv[]; { extern struct cmd cmdtab[]; - register struct cmd *c; + struct cmd *c; if (argc == 1) { register int i, j, w, k; @@ -591,7 +591,7 @@ else if (c == (struct cmd *)0) printf("?Invalid help command %s\n", arg); else - printf("%-*s\t%s\n", HELPINDENT, + printf("%-*s\t%s\n", (int)HELPINDENT, c->c_name, c->c_help); } (void) fflush(stdout); Modified: branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -28,9 +28,7 @@ <directory name="route"> <xi:include href="route/route.rbuild" /> </directory> - <directory name="telnet"> - <xi:include href="telnet/telnet.rbuild" /> - </directory> + <directory name="tracert"> <xi:include href="tracert/tracert.rbuild" /> </directory> Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.c [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -233,7 +233,7 @@ DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i); if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)) { - printf("Bad value for option -l, valid range is from 0 to %d.\n", + printf("Bad value for option -l, valid range is from 0 to %I64d.\n", ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)); return FALSE; } @@ -466,7 +466,7 @@ } - printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), + printf("Reply from %s: bytes=%I64d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL); if (RelativeTime.QuadPart < MinRTT.QuadPart || !MinRTTSet) { Modified: branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -396,7 +396,7 @@ DebugPrint(_T("Rouge packet: header id, process id %d"), TTLExceedHdr->OrigIcmpHeader.id, GetCurrentProcessId()); return -1; } - _tprintf(_T("%3Ld ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); + _tprintf(_T("%3I64d ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); return 0; case ECHO_REPLY : @@ -407,7 +407,7 @@ DebugPrint(_T("Rouge packet: header id %d, process id %d"), IcmpHdr->icmpheader.id, GetCurrentProcessId()); return -1; } - _tprintf(_T("%3Ld ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); + _tprintf(_T("%3I64d ms"), (pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart); return 1; case DEST_UNREACHABLE : Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -928,7 +928,7 @@ #ifdef _MSC_VER #pragma warning(disable : 4100) #endif -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.h [iso-8859-1] Mon Jul 28 09:50:17 2008 @@ -55,7 +55,7 @@ VOID DIALOG_TimeDate(VOID); -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* utility functions */ VOID ShowLastError(void);

16 years, 1 month

[sserapion] 34905: Fix x86 ntoskrnl build. Fix TreeView_EnsureVisible macro.

by sserapion＠svn.reactos.org

Author: sserapion Date: Mon Jul 28 09:48:07 2008 New Revision: 34905 URL: http://svn.reactos.org/svn/reactos?rev=34905&view=rev Log: Fix x86 ntoskrnl build. Fix TreeView_EnsureVisible macro. Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Mon Jul 28 09:48:07 2008 @@ -5796,17 +5796,6 @@ #define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer #define InterlockedExchangePointer _InterlockedExchangePointer -#define ExInterlockedPopEntrySList(Head, Lock) ExpInterlockedPopEntrySList(Head) -#define ExInterlockedPushEntrySList(Head, Entry, Lock) ExpInterlockedPushEntrySList(Head, Entry) -#define ExInterlockedFlushSList(Head) ExpInterlockedFlushSList(Head) - -#if !defined(_WINBASE_) -#define InterlockedPopEntrySList(Head) ExpInterlockedPopEntrySList(Head) -#define InterlockedPushEntrySList(Head, Entry) ExpInterlockedPushEntrySList(Head, Entry) -#define InterlockedFlushSList(Head) ExpInterlockedFlushSList(Head) -#define QueryDepthSList(Head) ExQueryDepthSList(Head) -#endif // !defined(_WINBASE_ - #endif // _M_AMD64 #endif /* !__INTERLOCKED_DECLARED */ Modified: branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] Mon Jul 28 09:48:07 2008 @@ -2812,7 +2812,7 @@ (LPARAM)(HTREEITEM)(hitem)) #define TreeView_EnsureVisible(hwnd, hitem) \ - (BOOL)SNDMSGA((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem)) + (BOOL)SNDMSGA((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(HTREEITEM)(hitem)) #define TreeView_SortChildrenCB(hwnd, psort, recurse) \ (BOOL)SNDMSGA((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \

16 years, 1 month

[arty] 34904: This is a patch i've been keeping for a while. Yes, it's not "as nt does it", but it solves a practical problem, and isn't particularly invasive (the main change is the call to KdpEnableSafeMem ... everything else could be macroed out if desired). This provides armour for kdbg and gdb that avoid faulting on bad addresses by implementing a simple poor-man's mmu and letting the debuggers use it.

by arty＠svn.reactos.org

Author: arty Date: Mon Jul 28 09:47:17 2008 New Revision: 34904 URL: http://svn.reactos.org/svn/reactos?rev=34904&view=rev Log: This is a patch i've been keeping for a while. Yes, it's not "as nt does it", but it solves a practical problem, and isn't particularly invasive (the main change is the call to KdpEnableSafeMem ... everything else could be macroed out if desired). This provides armour for kdbg and gdb that avoid faulting on bad addresses by implementing a simple poor-man's mmu and letting the debuggers use it. Added: trunk/reactos/ntoskrnl/kd/i386/ trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdinit.c trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/vdm/vdmmain.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Mon Jul 28 09:47:17 2008 @@ -250,6 +250,27 @@ IN PCH Message, IN ULONG Length ); + +BOOLEAN +STDCALL +KdpSafeReadMemory( + IN ULONG_PTR Addr, + IN LONG Len, + OUT PVOID Value +); + +BOOLEAN +STDCALL +KdpSafeWriteMemory( + IN ULONG_PTR Addr, + IN LONG Len, + IN ULONGLONG Value +); + +VOID +STDCALL +KdpEnableSafeMem(); + /* KD GLOBALS ***************************************************************/ Added: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdmemsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c (added) +++ trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] Mon Jul 28 09:47:17 2008 @@ -1,0 +1,247 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/kd/i386/kdmemsup.c + * PURPOSE: Kernel Debugger Safe Memory Support + * + * PROGRAMMERS: arty + */ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +#define HIGH_PHYS_MASK 0x80000000 +#define PAGE_TABLE_MASK 0x3ff +#define BIG_PAGE_SIZE (1<<22) +#define CR4_PAGE_SIZE_BIT 0x10 +#define PDE_PRESENT_BIT 1 +#define PDE_W_BIT 2 +#define PDE_PS_BIT 0x80 + +/* VARIABLES ***************************************************************/ + +extern ULONG MmGlobalKernelPageDirectory[1024]; +static BOOLEAN KdpPhysAccess = FALSE; +ULONG_PTR IdentityMapAddrHigh, IdentityMapAddrLow; +extern PFN_TYPE NTAPI MmAllocEarlyPage(); + +ULONGLONG +FASTCALL +KdpPhysRead(ULONG_PTR Addr, LONG Len) +{ + ULONGLONG Result = 0; + ULONG_PTR OldCR3 = __readcr3(), OldCR4 = __readcr4(); + + if (Addr & HIGH_PHYS_MASK) + { + Addr &= ~HIGH_PHYS_MASK; + __writecr3(IdentityMapAddrHigh); + } + else + __writecr3(IdentityMapAddrLow); + + __writecr4(OldCR4|CR4_PAGE_SIZE_BIT); // Turn on large page translation + __invlpg((PVOID)Addr); + + switch (Len) + { + case 8: + Result = *((PULONGLONG)Addr); + break; + case 4: + Result = *((PULONG)Addr); + break; + case 2: + Result = *((PUSHORT)Addr); + break; + case 1: + Result = *((PUCHAR)Addr); + break; + } + __writecr4(OldCR4); // Turn off large page translation + __writecr3(OldCR3); + __invlpg((PVOID)Addr); + + return Result; +} + + +VOID +NTAPI +KdpPhysWrite(ULONG_PTR Addr, LONG Len, ULONGLONG Value) +{ + ULONG_PTR OldCR3 = __readcr3(), OldCR4 = __readcr4(); + + if (Addr & HIGH_PHYS_MASK) + { + Addr &= ~HIGH_PHYS_MASK; + __writecr3(IdentityMapAddrHigh); + } + else + __writecr3(IdentityMapAddrLow); + + __writecr4(OldCR4|CR4_PAGE_SIZE_BIT); // Turn on large page translation + __invlpg((PVOID)Addr); + + switch (Len) + { + case 8: + *((PULONGLONG)Addr) = Value; + break; + case 4: + *((PULONG)Addr) = Value; + break; + case 2: + *((PUSHORT)Addr) = Value; + break; + case 1: + *((PUCHAR)Addr) = Value; + break; + } + __writecr4(OldCR4); // Turn off large page translation + __writecr3(OldCR3); + __invlpg((PVOID)Addr); +} + +BOOLEAN +NTAPI +KdpTranslateAddress(ULONG_PTR Addr, PULONG_PTR ResultAddr) +{ + ULONG_PTR CR3Value = __readcr3(); + ULONG_PTR CR4Value = __readcr4(); + ULONG_PTR PageDirectory = (CR3Value & ~(PAGE_SIZE-1)) + + ((Addr >> 22) * sizeof(ULONG)); + ULONG_PTR PageDirectoryEntry = KdpPhysRead(PageDirectory, sizeof(ULONG)); + + /* Not present -> fail */ + if (!(PageDirectoryEntry & PDE_PRESENT_BIT)) + { + return FALSE; + } + + /* Big Page? */ + if ((PageDirectoryEntry & PDE_PS_BIT) && (CR4Value & CR4_PAGE_SIZE_BIT)) + { + *ResultAddr = (PageDirectoryEntry & ~(BIG_PAGE_SIZE-1)) + + (Addr & (BIG_PAGE_SIZE-1)); + return TRUE; + } + else + { + ULONG_PTR PageTableAddr = + (PageDirectoryEntry & ~(PAGE_SIZE-1)) + + ((Addr >> PAGE_SHIFT) & PAGE_TABLE_MASK) * sizeof(ULONG); + ULONG_PTR PageTableEntry = KdpPhysRead(PageTableAddr, sizeof(ULONG)); + if (PageTableEntry & PDE_PRESENT_BIT) + { + *ResultAddr = (PageTableEntry & ~(PAGE_SIZE-1)) + + (Addr & (PAGE_SIZE-1)); + return TRUE; + } + } + + return FALSE; +} + +BOOLEAN +NTAPI +KdpSafeReadMemory(ULONG_PTR Addr, LONG Len, PVOID Value) +{ + ULONG_PTR ResultPhysAddr; + + if (!KdpPhysAccess) + { + memcpy(Value, (PVOID)Addr, Len); + return TRUE; + } + + memset(Value, 0, Len); + + if (!KdpTranslateAddress(Addr, &ResultPhysAddr)) + return FALSE; + + switch (Len) + { + case 8: + *((PULONGLONG)Value) = KdpPhysRead(ResultPhysAddr, Len); + break; + case 4: + *((PULONG)Value) = KdpPhysRead(ResultPhysAddr, Len); + break; + case 2: + *((PUSHORT)Value) = KdpPhysRead(ResultPhysAddr, Len); + break; + case 1: + *((PUCHAR)Value) = KdpPhysRead(ResultPhysAddr, Len); + break; + } + + return TRUE; +} + +BOOLEAN +NTAPI +KdpSafeWriteMemory(ULONG_PTR Addr, LONG Len, ULONGLONG Value) +{ + ULONG_PTR ResultPhysAddr; + + if (!KdpPhysAccess) + { + memcpy((PVOID)Addr, &Value, Len); + return TRUE; + } + + if (!KdpTranslateAddress(Addr, &ResultPhysAddr)) + return FALSE; + + KdpPhysWrite(ResultPhysAddr, Len, Value); + return TRUE; +} + +VOID +NTAPI +KdpEnableSafeMem() +{ + int i; + PULONG IdentityMapVirt; + PHYSICAL_ADDRESS IdentityMapPhys, Highest = { }; + + if (KdpPhysAccess) + return; + + Highest.LowPart = (ULONG)-1; + /* Allocate a physical page and map it to copy the phys copy code onto */ + IdentityMapVirt = (PULONG)MmAllocateContiguousMemory(2 * PAGE_SIZE, Highest); + IdentityMapPhys = MmGetPhysicalAddress(IdentityMapVirt); + IdentityMapAddrHigh = IdentityMapPhys.LowPart; + + /* Copy the kernel space */ + memcpy(IdentityMapVirt, + MmGlobalKernelPageDirectory, + PAGE_SIZE); + + /* Set up 512 4Mb pages (high 2Gig identity mapped) */ + for (i = 0; i < 512; i++) + { + IdentityMapVirt[i] = + HIGH_PHYS_MASK | (i << 22) | PDE_PS_BIT | PDE_W_BIT | PDE_PRESENT_BIT; + } + + /* Allocate a physical page and map it to copy the phys copy code onto */ + IdentityMapAddrLow = IdentityMapAddrHigh + PAGE_SIZE; + IdentityMapVirt += PAGE_SIZE / sizeof(ULONG); + + /* Copy the kernel space */ + memcpy(IdentityMapVirt, + MmGlobalKernelPageDirectory, + PAGE_SIZE); + + /* Set up 512 4Mb pages (low 2Gig identity mapped) */ + for (i = 0; i < 512; i++) + { + IdentityMapVirt[i] = (i << 22) | PDE_PS_BIT | PDE_W_BIT | PDE_PRESENT_BIT; + } + + KdpPhysAccess = TRUE; +} Propchange: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Mon Jul 28 09:47:17 2008 @@ -257,6 +257,8 @@ if (WrapperInitRoutine) WrapperInitRoutine(&WrapperTable, 0); return TRUE; } + else + KdpEnableSafeMem(); /* Call the Initialization Routines of the Registered Providers */ KdpCallInitRoutine(BootPhase); Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Mon Jul 28 09:47:17 2008 @@ -322,19 +322,9 @@ static CHAR GspReadMemSafe(PCHAR Address) { - CHAR ch; - - if (NULL == Address) - { - GspMemoryError = TRUE; - return '\0'; - } - - GspAccessLocation = Address; - ch = *Address; - GspAccessLocation = NULL; - - return ch; + CHAR ch; + KdpSafeReadMemory((ULONG_PTR)Address, 1, &ch); + return ch; } /* Convert the memory pointed to by Address into hex, placing result in Buffer */ @@ -455,19 +445,11 @@ return Buffer + 2 * Count; } -static CHAR -GspWriteMemSafeGetContent(PVOID Context, ULONG Offset) -{ - ASSERT(0 == Offset); - - return *((PCHAR) Context); -} - static void GspWriteMemSafe(PCHAR Address, CHAR Ch) { - GspWriteMem(Address, 1, TRUE, GspWriteMemSafeGetContent, &Ch); + KdpSafeWriteMemory((ULONG_PTR)Address, 1, Ch); } Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=34… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Mon Jul 28 09:47:17 2008 @@ -1658,21 +1658,31 @@ IN PVOID Src, IN ULONG Bytes) { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH_TRY - { - RtlCopyMemory(Dest, - Src, - Bytes); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; + BOOLEAN Result = TRUE; + + switch (Bytes) + { + case 1: + case 2: + case 4: + case 8: + Result = KdpSafeReadMemory((ULONG_PTR)Src, Bytes, Dest); + break; + default: + { + ULONG_PTR Start, End, Write; + for (Start = (ULONG_PTR)Src, + End = Start + Bytes, + Write = (ULONG_PTR)Dest; + Result && (Start < End); + Start++, Write++) + if (!KdpSafeReadMemory(Start, 1, (PVOID)Write)) + Result = FALSE; + break; + } + } + + return Result ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION; } NTSTATUS @@ -1680,19 +1690,16 @@ IN PVOID Src, IN ULONG Bytes) { - NTSTATUS Status = STATUS_SUCCESS; - - _SEH_TRY - { - RtlCopyMemory(Dest, - Src, - Bytes); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; -} + BOOLEAN Result; + ULONG_PTR Start, End, Write; + + for (Start = (ULONG_PTR)Src, + End = Start + Bytes, + Write = (ULONG_PTR)Dest; + Result && (Start < End); + Start++, Write++) + if (!KdpSafeReadMemory(Start, 1, (PVOID)Write)) + Result = FALSE; + + return Result ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Jul 28 09:47:17 2008 @@ -272,6 +272,13 @@ <file>pnproot.c</file> </directory> </directory> + <if property="DBG" value="1"> + <directory name="kd"> + <directory name="i386"> + <file>kdmemsup.c</file> + </directory> + </directory> + </if> <if property="_WINKD_" value="0"> <directory name="kdbg"> <if property="ARCH" value="i386"> Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Mon Jul 28 09:47:17 2008 @@ -23,16 +23,10 @@ INIT_FUNCTION NtEarlyInitVdm(VOID) { - /* GCC 3.4 hack */ - PVOID start = (PVOID)0x0; - - /* - * Save various BIOS data tables. At this point the lower 4MB memory - * map is still active so we can just copy the data from low memory. - * HACK HACK HACK: We should just map Physical Memory!!! - */ + PCHAR start = MmCreateHyperspaceMapping(0); memcpy(OrigIVT, start, 1024); - memcpy(OrigBDA, (PVOID)0x400, 256); + memcpy(OrigBDA, start+0x400, 256); + MmDeleteHyperspaceMapping(start); } VOID

16 years, 1 month

[tkreuzer] 34903: fix interlocked stuff in winddk, maybe not 100%, but better now

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 28 09:46:08 2008 New Revision: 34903 URL: http://svn.reactos.org/svn/reactos?rev=34903&view=rev Log: fix interlocked stuff in winddk, maybe not 100%, but better now Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Mon Jul 28 09:46:08 2008 @@ -5693,6 +5693,7 @@ #if !defined(__INTERLOCKED_DECLARED) #define __INTERLOCKED_DECLARED +#if defined (_X86_) #if defined(NO_INTERLOCKED_INTRINSICS) NTKERNELAPI LONG @@ -5727,20 +5728,31 @@ InterlockedExchangeAdd( IN OUT LONG volatile *Addend, IN LONG Value); -#endif - + +#else // !defined(NO_INTERLOCKED_INTRINSICS) + +#define InterlockedExchange _InterlockedExchange +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedCompareExchange (LONG)_InterlockedCompareExchange +#define InterlockedOr _InterlockedOr +#define InterlockedAnd _InterlockedAnd +#define InterlockedXor _InterlockedXor + +#endif // !defined(NO_INTERLOCKED_INTRINSICS) + +#endif // defined (_X86_) + +#if !defined (_WIN64) /* * PVOID * InterlockedExchangePointer( * IN OUT PVOID VOLATILE *Target, * IN PVOID Value) */ -#if defined (_M_AMD64) -#define InterlockedExchangePointer _InterlockedExchangePointer -#else #define InterlockedExchangePointer(Target, Value) \ ((PVOID) InterlockedExchange((PLONG) Target, (LONG) Value)) -#endif /* * PVOID @@ -5749,16 +5761,20 @@ * IN PVOID Exchange, * IN PVOID Comparand) */ -#if defined (_M_AMD64) -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#else #define InterlockedCompareExchangePointer(Destination, Exchange, Comparand) \ ((PVOID) InterlockedCompareExchange((PLONG) Destination, (LONG) Exchange, (LONG) Comparand)) -#endif #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)a, b) #define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)a) #define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)a) + +#endif // !defined (_WIN64) + +#if defined (_M_AMD64) + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONG *)a, b) +#define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONGLONG *)a) +#define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONGLONG *)a) #define InterlockedAnd _InterlockedAnd #define InterlockedOr _InterlockedOr #define InterlockedXor _InterlockedXor @@ -5790,6 +5806,8 @@ #define InterlockedFlushSList(Head) ExpInterlockedFlushSList(Head) #define QueryDepthSList(Head) ExQueryDepthSList(Head) #endif // !defined(_WINBASE_ + +#endif // _M_AMD64 #endif /* !__INTERLOCKED_DECLARED */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Mon Jul 28 09:46:08 2008 @@ -30,7 +30,7 @@ // #define InterlockedDecrement _InterlockedDecrement #define InterlockedIncrement _InterlockedIncrement -#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedCompareExchange (LONG)_InterlockedCompareExchange #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd

16 years, 1 month

[dchapyshev] 34902: - Add console version Appwiz. It is not finished, but fully works

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Mon Jul 28 09:40:32 2008 New Revision: 34902 URL: http://svn.reactos.org/svn/reactos?rev=34902&view=rev Log: - Add console version Appwiz. It is not finished, but fully works Added: trunk/rosapps/applications/cmdutils/appwiz/ trunk/rosapps/applications/cmdutils/appwiz/appwiz.c (with props) trunk/rosapps/applications/cmdutils/appwiz/appwiz.rbuild (with props) trunk/rosapps/applications/cmdutils/appwiz/appwiz.rc (with props) Modified: trunk/rosapps/applications/cmdutils/cmdutils.rbuild Added: trunk/rosapps/applications/cmdutils/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/appw… ============================================================================== --- trunk/rosapps/applications/cmdutils/appwiz/appwiz.c (added) +++ trunk/rosapps/applications/cmdutils/appwiz/appwiz.c [iso-8859-1] Mon Jul 28 09:40:32 2008 @@ -1,0 +1,261 @@ +/* + * + * PROJECT: Add or Remove Programs (Console Version) + * FILE: rosapps/applications/cmdutils/appwiz/appwiz.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * UPDATE HISTORY: + * 07-28-2008 Created + */ + +#define SHOW_ALL 1 +#define APP_ONLY 2 +#define UPD_ONLY 3 + +#include <windows.h> +#include <stdio.h> +#include <conio.h> +#include <tchar.h> + + +void PrintHelp() +{ + printf(_T("Add or Remove Programs\n\ +APPWIZ [/? /l] [/all /app /upd]\n\ + /?\t Help\n\ + /l\t Show list\n\ + /all\t Show programs and updates\n\ + /app\t Show programs only\n\ + /upd\t Show updates only\n")); + _getch(); +} + + +void RunGUIAppWiz() +{ + SHELLEXECUTEINFO shInputDll; + + memset(&shInputDll, 0x0, sizeof(SHELLEXECUTEINFO)); + shInputDll.cbSize = sizeof(shInputDll); + shInputDll.hwnd = NULL; + shInputDll.lpVerb = _T("open"); + shInputDll.lpFile = _T("RunDll32.exe"); + shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL appwiz.cpl"); + + if (ShellExecuteEx(&shInputDll) == 0) + { + MessageBox(NULL, _T("Can not start appwiz.cpl"), NULL, MB_OK | MB_ICONERROR); + } +} + +void CallUninstall(LPTSTR szUninstallString) +{ + STARTUPINFO si; + PROCESS_INFORMATION pi; + DWORD dwRet; + MSG msg; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = SW_SHOW; + + if (CreateProcess(NULL, szUninstallString, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hThread); + + for (;;) + { + dwRet = MsgWaitForMultipleObjects(1, &pi.hProcess, FALSE, INFINITE, QS_ALLEVENTS); + if (dwRet == WAIT_OBJECT_0 + 1) + { + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + else if (dwRet == WAIT_OBJECT_0 || dwRet == WAIT_FAILED) + break; + } + CloseHandle(pi.hProcess); + } +} + + +/* + dwMode: + SHOW_ALL - Applications & Updates + APP_ONLY - Applications only + UPD_ONLY - Updates only +*/ +int ShowAppList(DWORD dwMode, INT iItem) +{ + HKEY hKey, hSubKey; + DWORD dwSize, dwType, dwValue; + TCHAR szName[MAX_PATH]; + TCHAR szParentKeyName[MAX_PATH]; + TCHAR szDisplayName[MAX_PATH]; + TCHAR szOutBuf[MAX_PATH]; + FILETIME FileTime; + BOOL bIsUpdate = FALSE; + BOOL bIsSystemComponent = FALSE; + INT iIndex = 0, iColor = 0, iCount = 1; + HANDLE hOutput; + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), + &hKey) != ERROR_SUCCESS) + { + printf(_T("ERROR: Can not open Uninstall key. Press any key for continue...\n")); + _getch(); + return 0; + } + + hOutput = GetStdHandle(STD_OUTPUT_HANDLE); + SetConsoleTextAttribute(hOutput, FOREGROUND_GREEN | FOREGROUND_INTENSITY); + + dwSize = MAX_PATH; + while (RegEnumKeyEx(hKey, iIndex, szName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS) + { + if (RegOpenKey(hKey, szName, &hSubKey) == ERROR_SUCCESS) + { + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + + if (RegQueryValueEx(hSubKey, _T("SystemComponent"), + NULL, &dwType, + (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + { + bIsSystemComponent = (dwValue == 0x1); + } + else + { + bIsSystemComponent = FALSE; + } + + dwType = REG_SZ; + dwSize = MAX_PATH; + + bIsUpdate = (RegQueryValueEx(hSubKey, _T("ParentKeyName"), + NULL, &dwType, + (LPBYTE) szParentKeyName, + &dwSize) == ERROR_SUCCESS); + dwSize = MAX_PATH; + if (RegQueryValueEx(hSubKey, _T("DisplayName"), + NULL, &dwType, + (LPBYTE) szDisplayName, + &dwSize) == ERROR_SUCCESS) + { + if (!bIsSystemComponent) + { + if ((dwMode == SHOW_ALL) || ((dwMode == APP_ONLY) && (!bIsUpdate)) || ((dwMode == UPD_ONLY) && (bIsUpdate))) + { + if (iItem == -1) + { + wsprintf(szOutBuf, _T(" %d \t %s\n"), iCount, szDisplayName); + CharToOem(szOutBuf, szOutBuf); + printf("%s", szOutBuf); + } + else + { + dwType = REG_SZ; + dwSize = MAX_PATH; + + if ((RegQueryValueEx(hSubKey, _T("UninstallString"), NULL, &dwType, + (LPBYTE) szOutBuf, &dwSize) == ERROR_SUCCESS) && (iItem == iCount)) + { + CallUninstall(szOutBuf); + } + } + iCount++; + iColor++; + } + } + } + } + + if (iColor <= 5) + { + SetConsoleTextAttribute(hOutput, FOREGROUND_GREEN | FOREGROUND_INTENSITY); + } + else + { + SetConsoleTextAttribute(hOutput, FOREGROUND_GREEN | FOREGROUND_INTENSITY | FOREGROUND_RED); + if (iColor >= 10) iColor = 0; + } + + dwSize = MAX_PATH; + iIndex++; + } + + RegCloseKey(hSubKey); + RegCloseKey(hKey); + + SetConsoleTextAttribute(hOutput, FOREGROUND_GREEN | FOREGROUND_INTENSITY); + printf("\n\nPlease enter application/update number and press ENTER for uninstall\nor press any key for Exit...\n"); + + return 1; +} + + +int _tmain(int argc, _TCHAR* argv[]) +{ + INT iNumber; + TCHAR Char[4 + 1]; + + SetConsoleTitle(_T("Application Wizard")); + + if (argc < 2) + { + RunGUIAppWiz(); + return 0; + } + + if (_tcsncmp(argv[1], _T("/?"), 2) == 0) + { + PrintHelp(); + return 0; + } + + if (_tcsncmp(argv[1], _T("/l"), 2) == 0) + { + if (argc < 3) goto ShowAll; + if (_tcsncmp(argv[2], _T("/all"), 4) == 0) + { +ShowAll: + if (ShowAppList(SHOW_ALL, -1) == 0) return 0; + scanf(_T("%s"), Char); + + iNumber = atoi(Char); + + if (iNumber == 0) return 0; + ShowAppList(SHOW_ALL, iNumber); + } + else if (_tcsncmp(argv[2], _T("/app"), 4) == 0) + { + if (ShowAppList(APP_ONLY, -1) == 0) return 0; + + scanf(_T("%s"), Char); + + iNumber = atoi(Char); + + if (iNumber == 0) return 0; + ShowAppList(APP_ONLY, iNumber); + } + else if (_tcsncmp(argv[2], _T("/upd"), 4) == 0) + { + if (ShowAppList(UPD_ONLY, -1) == 0) return 0; + + scanf(_T("%s"), Char); + + iNumber = atoi(Char); + + if (iNumber == 0) return 0; + ShowAppList(UPD_ONLY, iNumber); + } + + return 0; + } + + return 0; +} Propchange: trunk/rosapps/applications/cmdutils/appwiz/appwiz.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/appw… ============================================================================== --- trunk/rosapps/applications/cmdutils/appwiz/appwiz.rbuild (added) +++ trunk/rosapps/applications/cmdutils/appwiz/appwiz.rbuild [iso-8859-1] Mon Jul 28 09:40:32 2008 @@ -1,0 +1,10 @@ +<module name="appwiz.exe" type="win32cui" installbase="system32" installname="appwiz.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>shell32</library> + <file>appwiz.c</file> + <file>appwiz.rc</file> +</module> Propchange: trunk/rosapps/applications/cmdutils/appwiz/appwiz.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/appw… ============================================================================== --- trunk/rosapps/applications/cmdutils/appwiz/appwiz.rc (added) +++ trunk/rosapps/applications/cmdutils/appwiz/appwiz.rc [iso-8859-1] Mon Jul 28 09:40:32 2008 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Add or Remove Programs (Console Version)\0" +#define REACTOS_STR_INTERNAL_NAME "appwiz\0" +#define REACTOS_STR_ORIGINAL_FILENAME "appwiz.exe\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/cmdutils/appwiz/appwiz.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/cmdu… ============================================================================== --- trunk/rosapps/applications/cmdutils/cmdutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/cmdutils.rbuild [iso-8859-1] Mon Jul 28 09:40:32 2008 @@ -1,5 +1,8 @@ <?xml version="1.0"?> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="appwiz"> + <xi:include href="appwiz/appwiz.rbuild" /> + </directory> <directory name="comp"> <xi:include href="comp/comp.rbuild" /> </directory>

16 years, 1 month

[fireball] 34901: Dmitry Gorbachev - PDT of CSRSS has no entry for TCB of the thread, fix this problem. See issue #3591 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 28 09:32:50 2008 New Revision: 34901 URL: http://svn.reactos.org/svn/reactos?rev=34901&view=rev Log: Dmitry Gorbachev - PDT of CSRSS has no entry for TCB of the thread, fix this problem. See issue #3591 for more details. Modified: trunk/reactos/ntoskrnl/ke/procobj.c Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Mon Jul 28 09:32:50 2008 @@ -451,6 +451,7 @@ (PVOID)Thread->StackLimit, Thread->LargeStack ? KERNEL_STACK_SIZE : KERNEL_LARGE_STACK_SIZE); + MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); /* Check if we're already in that process */ if (Thread->ApcState.Process == Process) return; @@ -580,6 +581,7 @@ (PVOID)Thread->StackLimit, Thread->LargeStack ? KERNEL_STACK_SIZE : KERNEL_LARGE_STACK_SIZE); + MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); /* Crash system if DPC is being executed! */ if (KeIsExecutingDpc())

16 years, 1 month

[tkreuzer] 34900: move the inlined InterlockedAnd/Or from rtl to winbase.h and rename it to InterlockedAnd/Or_Inline

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 28 09:05:45 2008 New Revision: 34900 URL: http://svn.reactos.org/svn/reactos?rev=34900&view=rev Log: move the inlined InterlockedAnd/Or from rtl to winbase.h and rename it to InterlockedAnd/Or_Inline Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h branches/ros-amd64-bringup/reactos/lib/rtl/srw.c Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] Mon Jul 28 09:05:45 2008 @@ -1707,7 +1707,7 @@ #ifndef __INTERLOCKED_DECLARED #define __INTERLOCKED_DECLARED -#if defined (_M_AMD64) +#if defined (_M_AMD64) || defined (_M_IA64) #define InterlockedAnd _InterlockedAnd #define InterlockedOr _InterlockedOr @@ -1737,7 +1737,8 @@ #define InterlockedCompareExchange64 _InterlockedCompareExchange64 #define InterlockedCompareExchangeAcquire64 InterlockedCompareExchange64 #define InterlockedCompareExchangeRelease64 InterlockedCompareExchange64 -#else + +#else // !(defined (_M_AMD64) || defined (_M_IA64)) LONG WINAPI InterlockedOr(IN OUT LONG volatile *,LONG); LONG WINAPI InterlockedAnd(IN OUT LONG volatile *,LONG); @@ -1769,8 +1770,56 @@ PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY); #endif -#endif /* !defined(_WIN64) */ +#endif // !(defined (_M_AMD64) || defined (_M_IA64)) + +#if !defined(InterlockedAnd) +#define InterlockedAnd InterlockedAnd_Inline +FORCEINLINE +LONG +InterlockedAnd_Inline(IN OUT volatile LONG *Target, + IN LONG Set) +{ + LONG i; + LONG j; + + j = *Target; + do { + i = j; + j = _InterlockedCompareExchange((PLONG)Target, + i & Set, + i); + + } while (i != j); + + return j; +} +#endif + +#if !defined(InterlockedOr) +#define InterlockedOr InterlockedOr_Inline +FORCEINLINE +LONG +InterlockedOr_Inline(IN OUT volatile LONG *Target, + IN LONG Set) +{ + LONG i; + LONG j; + + j = *Target; + do { + i = j; + j = _InterlockedCompareExchange((PLONG)Target, + i | Set, + i); + + } while (i != j); + + return j; +} +#endif + #endif /* __INTERLOCKED_DECLARED */ + BOOL WINAPI IsBadCodePtr(FARPROC); BOOL WINAPI IsBadHugeReadPtr(PCVOID,UINT_PTR); BOOL WINAPI IsBadHugeWritePtr(PVOID,UINT_PTR); Modified: branches/ros-amd64-bringup/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/srw.c [iso-8859-1] Mon Jul 28 09:05:45 2008 @@ -18,51 +18,6 @@ #define NDEBUG #include <debug.h> -/* FIXME *********************************************************************/ - -/* FIXME: Interlocked functions that need to be made into a public header */ -#if 0 -FORCEINLINE -LONG -InterlockedAnd(IN OUT volatile LONG *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = _InterlockedCompareExchange((PLONG)Target, - i & Set, - i); - - } while (i != j); - - return j; -} - -FORCEINLINE -LONG -InterlockedOr(IN OUT volatile LONG *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = _InterlockedCompareExchange((PLONG)Target, - i | Set, - i); - - } while (i != j); - - return j; -} -#endif - /* FUNCTIONS *****************************************************************/ #ifdef _WIN64

16 years, 1 month

[arty] 34899: Fix (among other things) failure to boot when a CD is not inserted, caused by the new (correct) ASSERT in mutex acquisition in MmProbeAndLockPages, which was erroneously being called from IoBuildAsynchronousFsdRequest at DISPATCH_LEVEL. The only correct course of action when calling IoBuildAsynchronousFsdRequest at DISPATCH_LEVEL is to MmBuildMdlForNonPagedPool since the buffer must be nonpaged (if the IRP completes synchronously, we'll still be at DISPATCH_LEVEL) This is the case

by arty＠svn.reactos.org

Author: arty Date: Mon Jul 28 07:38:47 2008 New Revision: 34899 URL: http://svn.reactos.org/svn/reactos?rev=34899&view=rev Log: Fix (among other things) failure to boot when a CD is not inserted, caused by the new (correct) ASSERT in mutex acquisition in MmProbeAndLockPages, which was erroneously being called from IoBuildAsynchronousFsdRequest at DISPATCH_LEVEL. The only correct course of action when calling IoBuildAsynchronousFsdRequest at DISPATCH_LEVEL is to MmBuildMdlForNonPagedPool since the buffer must be nonpaged (if the IRP completes synchronously, we'll still be at DISPATCH_LEVEL) This is the case when direct io is done at DISPATCH_LEVEL using IoBuildAsynchronousFsdRequest. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Mon Jul 28 07:38:47 2008 @@ -4405,7 +4405,8 @@ if (Irp->MdlAddress != NULL) { - MmUnlockPages(Irp->MdlAddress); + /* We don't need to unlock this MDL because the request could + * only have come from dispatch level */ IoFreeMdl(Irp->MdlAddress); Irp->MdlAddress = NULL; } 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 Jul 28 07:38:47 2008 @@ -682,23 +682,30 @@ return NULL; } - /* Probe and Lock */ - _SEH_TRY - { - /* Do the probe */ - MmProbeAndLockPages(Irp->MdlAddress, - KernelMode, - MajorFunction == IRP_MJ_READ ? - IoWriteAccess : IoReadAccess); - } - _SEH_HANDLE - { - /* Free the IRP and its MDL */ - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - Irp = NULL; - } - _SEH_END; + if (KeGetCurrentIrql() >= DISPATCH_LEVEL) + { + MmBuildMdlForNonPagedPool(Irp->MdlAddress); + } + else + { + /* Probe and Lock */ + _SEH_TRY + { + /* Do the probe */ + MmProbeAndLockPages(Irp->MdlAddress, + KernelMode, + MajorFunction == IRP_MJ_READ ? + IoWriteAccess : IoReadAccess); + } + _SEH_HANDLE + { + /* Free the IRP and its MDL */ + IoFreeMdl(Irp->MdlAddress); + IoFreeIrp(Irp); + Irp = NULL; + } + _SEH_END; + } /* This is how we know if we failed during the probe */ if (!Irp) return NULL; @@ -1344,7 +1351,7 @@ Mdl = Irp->MdlAddress; while (Mdl) { - MmUnlockPages(Mdl); + MmUnlockPages(Mdl); Mdl = Mdl->Next; }

16 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
...
77
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008