Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jimtabor] 34698: - Fix show window call and add message calls for future hook support.
by jimtabor＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: jimtabor Date: Wed Jul 23 16:18:48 2008 New Revision: 34698 URL: http://svn.reactos.org/svn/reactos?rev=34698&view=rev Log: - Fix show window call and add message calls for future hook support. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Wed Jul 23 16:18:48 2008 @@ -666,6 +666,13 @@ DeleteObject(DesktopRgn); } } +#if 0 + if (ISITHOOKED(WH_CBT)) + { + if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, (LPARAM)&sizingRect, 0, FNID_DEFWINDOWPROC, FALSE)) + moved = FALSE; + } +#endif (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL); SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 ); SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L); @@ -745,6 +752,13 @@ WINDOWPLACEMENT wp; POINT Pt; +#if 0 + if (ISITHOOKED(WH_CBT)) + { + if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE)) + return 0; + } +#endif switch (wParam & 0xfff0) { case SC_MOVE: @@ -1410,7 +1424,8 @@ case WM_SHOWWINDOW: { - NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE); + if (lParam) // Call when it is necessary. + NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE); break; }

1 0

[jimtabor] 34697: Enable message filter hooks and add call hook support for debug hook.
by jimtabor＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: jimtabor Date: Wed Jul 23 15:24:49 2008 New Revision: 34697 URL: http://svn.reactos.org/svn/reactos?rev=34697&view=rev Log: Enable message filter hooks and add call hook support for debug hook. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Wed Jul 23 15:24:49 2008 @@ -404,8 +404,119 @@ WPARAM wParam, LPARAM lParam) { - UNIMPLEMENTED - return 0; + LRESULT lResult = 0; + ULONG Size; + DEBUGHOOKINFO Debug; + PVOID HooklParam = NULL; + BOOL BadChk = FALSE; + + if (lParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(DEBUGHOOKINFO), + 1); + RtlCopyMemory( &Debug, + (PVOID)lParam, + sizeof(DEBUGHOOKINFO)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_DEBUG read from lParam ERROR!\n"); + return lResult; + } + } + else + return lResult; // Need lParam! + + switch (wParam) + { + case WH_CBT: + { + switch (Debug.code) + { + case HCBT_CLICKSKIPPED: + Size = sizeof(MOUSEHOOKSTRUCTEX); + break; + case HCBT_MOVESIZE: + Size = sizeof(RECT); + break; + case HCBT_ACTIVATE: + Size = sizeof(CBTACTIVATESTRUCT); + break; + case HCBT_CREATEWND: // Handle Ansi? + Size = sizeof(CBT_CREATEWND); + // What shall we do? Size += sizeof(CREATESTRUCTEX); + break; + default: + Size = sizeof(LPARAM); + } + } + break; + + case WH_MOUSE_LL: + Size = sizeof(MSLLHOOKSTRUCT); + break; + + case WH_KEYBOARD_LL: + Size = sizeof(KBDLLHOOKSTRUCT); + break; + + case WH_MSGFILTER: + case WH_SYSMSGFILTER: + case WH_GETMESSAGE: + Size = sizeof(MSG); + break; + + case WH_JOURNALPLAYBACK: + case WH_JOURNALRECORD: + Size = sizeof(EVENTMSG); + break; + + case WH_FOREGROUNDIDLE: + case WH_KEYBOARD: + case WH_SHELL: + default: + Size = sizeof(LPARAM); + } + + if (Size > sizeof(LPARAM)) + HooklParam = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_HOOK); + + if (HooklParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)Debug.lParam, + Size, + 1); + RtlCopyMemory( HooklParam, + (PVOID)Debug.lParam, + Size); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_DEBUG read from Debug.lParam ERROR!\n"); + ExFreePool(HooklParam); + return lResult; + } + } + + if (HooklParam) Debug.lParam = (LPARAM)HooklParam; + lResult = co_HOOK_CallHooks(WH_DEBUG, Code, wParam, (LPARAM)&Debug); + if (HooklParam) ExFreePool(HooklParam); + return lResult; } LRESULT @@ -445,8 +556,8 @@ DPRINT1("HOOK WH_MOUSE read from lParam ERROR!\n"); } } - if (!BadChk) - { + if (!BadChk) + { lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&Mouse); } return lResult; @@ -478,8 +589,8 @@ DPRINT1("HOOK WH_MOUSE_LL read from lParam ERROR!\n"); } } - if (!BadChk) - { + if (!BadChk) + { lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&Mouse); } break; @@ -509,13 +620,12 @@ DPRINT1("HOOK WH_KEYBORD_LL read from lParam ERROR!\n"); } } - if (!BadChk) - { + if (!BadChk) + { lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&Keyboard); } break; } - case WH_MSGFILTER: case WH_SYSMSGFILTER: @@ -543,8 +653,8 @@ DPRINT1("HOOK WH_XMESSAGEX read from lParam ERROR!\n"); } } - if (!BadChk) - { + if (!BadChk) + { lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&Msg); if (lParam && (HookId == WH_GETMESSAGE)) { @@ -574,7 +684,7 @@ case WH_CBT: switch (Code) { - case HCBT_CREATEWND: + case HCBT_CREATEWND: // Use Ansi. lResult = co_HOOK_CallHooks(HookId, Code, wParam, lParam); break; @@ -603,8 +713,8 @@ DPRINT1("HOOK HCBT_MOVESIZE read from lParam ERROR!\n"); } } - if (!BadChk) - { + if (!BadChk) + { lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&rt); } break; @@ -635,8 +745,8 @@ DPRINT1("HOOK HCBT_ACTIVATE read from lParam ERROR!\n"); } } - if (!BadChk) - { + if (!BadChk) + { lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&CbAs); } break; @@ -649,7 +759,6 @@ break; } break; - case WH_JOURNALPLAYBACK: case WH_JOURNALRECORD: @@ -902,8 +1011,6 @@ WH_FOREGROUNDIDLE == HookId && WH_KEYBOARD == HookId && WH_MOUSE == HookId && - WH_MSGFILTER == HookId && - WH_SYSMSGFILTER == HookId && WH_SHELL == HookId) { #if 0 /* Removed to get winEmbed working again */

1 0

[jimtabor] 34696: - Fix NtUserCallMsgFilter to use SEH. Add support for system commands related to hooks.
by jimtabor＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: jimtabor Date: Wed Jul 23 14:59:20 2008 New Revision: 34696 URL: http://svn.reactos.org/svn/reactos?rev=34696&view=rev Log: - Fix NtUserCallMsgFilter to use SEH. Add support for system commands related to hooks. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Wed Jul 23 14:59:20 2008 @@ -12,7 +12,25 @@ #define NDEBUG #include <debug.h> +LRESULT FASTCALL +IntDefWinHandleSysCommand( PWINDOW_OBJECT Window, WPARAM wParam, LPARAM lParam , BOOL Ansi) +{ + DPRINT1("hwnd %p WM_SYSCOMMAND %lx %lx\n", Window->hSelf, wParam, lParam ); + if (!ISITHOOKED(WH_CBT)) return 0; + + if (!UserCallNextHookEx(WH_CBT, HCBT_SYSCOMMAND, wParam, lParam, Ansi)) + return 0; + + switch (wParam & 0xfff0) + { + case SC_MOVE: + case SC_SIZE: + return UserCallNextHookEx(WH_CBT, HCBT_MOVESIZE, (WPARAM)Window->hSelf, lParam, Ansi); + break; + } + return 1; +} /* Win32k counterpart of User DefWindowProc */ @@ -25,6 +43,7 @@ BOOL Ansi) { PWINDOW Wnd; + LRESULT lResult = 0; if (Msg > WM_USER) return 0; @@ -33,6 +52,11 @@ switch (Msg) { + case WM_SYSCOMMAND: + { + lResult = IntDefWinHandleSysCommand( Window, wParam, lParam, Ansi ); + break; + } case WM_SHOWWINDOW: { if ((Wnd->Style & WS_VISIBLE) && wParam) break; @@ -54,7 +78,7 @@ break; } - return 0; + return lResult; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Wed Jul 23 14:59:20 2008 @@ -306,9 +306,9 @@ DPRINT("Enter NtUserCallMsgFilter\n"); UserEnterExclusive(); - if (co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)msg)) + if ( UserCallNextHookEx( WH_SYSMSGFILTER, code, 0, (LPARAM)msg, FALSE)) RETURN( TRUE); - RETURN( co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)msg)); + RETURN( UserCallNextHookEx( WH_MSGFILTER, code, 0, (LPARAM)msg, FALSE)); CLEANUP: DPRINT("Leave NtUserCallMsgFilter. ret=%i\n", _ret_);

1 0

[fireball] 34695: - Partly revert 24104: "I do not known if I done right in NtGdiRealizePalette step2, step2 is not tested." - if you don't know, don't do at all! Memory DC "supports drawing operations on a bitmap" according to MSDN, so why changing device's palette? I think it was not done for a reason, and if you can't test, don't touch before you have a test application. - Reformat another part of 24104, and include warning messages too, to track palette failures. - Put two mandatory debug pr
by fireball＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: fireball Date: Wed Jul 23 13:20:32 2008 New Revision: 34695 URL: http://svn.reactos.org/svn/reactos?rev=34695&view=rev Log: - Partly revert 24104: "I do not known if I done right in NtGdiRealizePalette step2, step2 is not tested." - if you don't know, don't do at all! Memory DC "supports drawing operations on a bitmap" according to MSDN, so why changing device's palette? I think it was not done for a reason, and if you can't test, don't touch before you have a test application. - Reformat another part of 24104, and include warning messages too, to track palette failures. - Put two mandatory debug prints to see when the code is being hit (one to memory managed DC case, and another one to the code commented out by Jim). - Tested with abiword, FF 1.5 and 2.0, openoffice 2.0 installer, in 8, 24 and 32 bit color modes, no problem arised, and no debug messages flood happened. Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Wed Jul 23 13:20:32 2008 @@ -488,7 +488,7 @@ { /* * This function doesn't do any real work now and there's plenty - * of bugd in it (calling SetPalette for high/true-color modes, + * of bugs in it (calling SetPalette for high/true-color modes, * using DEFAULT_PALETTE instead of the device palette, ...). */ @@ -497,12 +497,11 @@ int realized = 0; PDC dc; HPALETTE systemPalette; - BOOLEAN success; + //BOOLEAN success; USHORT sysMode, palMode; dc = DC_LockDc(hDC); - if (!dc) - return 0; + if (!dc) return 0; systemPalette = NtGdiGetStockObject((INT)DEFAULT_PALETTE); palGDI = PALETTE_LockPalette(dc->DcLevel.hpal); @@ -510,12 +509,9 @@ if (palGDI == NULL) { - /* FIXME - Handle palGDI == NULL!!!! - we should not unlock dc and return 0 ?? - shall we create the pallete ?? - */ - DC_UnlockDc(dc); - return 0; + DPRINT1("IntGdiRealizePalette(): palGDI is NULL, exiting\n"); + DC_UnlockDc(dc); + return 0; } sysGDI = PALETTE_LockPalette(systemPalette); @@ -523,13 +519,10 @@ if (sysGDI == NULL) { - /* FIXME - Handle sysGDI == NULL!!!!! - we should not unlock dc and return 0 ?? - shall we create the pallete ?? - */ - PALETTE_UnlockPalette(palGDI); - DC_UnlockDc(dc); - return 0; + DPRINT1("IntGdiRealizePalette(): sysGDI is NULL, exiting\n"); + PALETTE_UnlockPalette(palGDI); + DC_UnlockDc(dc); + return 0; } @@ -551,12 +544,10 @@ if(dc->DC_Type == DC_TYPE_MEMORY) { // Memory managed DC - ASSERT(sysGDI->NumColors <= 256); - success = ((GDIDEVICE *)dc->pPDev)->DriverFunctions.SetPalette( - dc->PDev, sysPtr, 0, 0, sysGDI->NumColors); - -/* See bug 733, keep the code for now. - } else { + DPRINT1("win32k: realizepalette unimplemented step 2 for DC_MEMORY\n"); + } else { + DPRINT1("win32k: realizepalette commented out step 2\n"); + /* See bug 733, keep the code for now. if( ((GDIDEVICE *)dc->pPDev)->DriverFunctions.SetPalette) { ASSERT(palGDI->NumColors <= 256);

1 0

[jmorlan] 34694: - Implement handle access checking on all console functions. - OpenConsoleW: Fourth parameter is actually share mode (passing a number from 0 to 2 will usually give ERROR_SHARING_VIOLATION on Windows) - CreateFileW: Move CONIN$/CONOUT$ handling after dwCreationDisposition checks (it must be valid, even though it doesn't matter which it is); pass FILE_SHARE_READ|FILE_SHARE_WRITE to OpenConsoleW (dwShareMode is ignored). - CloseConsoleHandle, CsrReleaseObject, CsrVerifyObject: Rem
by jmorlan＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: jmorlan Date: Wed Jul 23 11:21:46 2008 New Revision: 34694 URL: http://svn.reactos.org/svn/reactos?rev=34694&view=rev Log: - Implement handle access checking on all console functions. - OpenConsoleW: Fourth parameter is actually share mode (passing a number from 0 to 2 will usually give ERROR_SHARING_VIOLATION on Windows) - CreateFileW: Move CONIN$/CONOUT$ handling after dwCreationDisposition checks (it must be valid, even though it doesn't matter which it is); pass FILE_SHARE_READ|FILE_SHARE_WRITE to OpenConsoleW (dwShareMode is ignored). - CloseConsoleHandle, CsrReleaseObject, CsrVerifyObject: Remove IsConsoleHandle checks - Windows ignores lower 2 bits of handle for closing and verifying. - SetConsoleMode: Remove IsConsoleHandle check - it's redundant, since the same check is done in CsrGetObject. - CsrIsConsoleHandle, CsrReleaseObjectByPointer: Clean up a bit. - CsrFreeConsole: Remove the process from the console's list. Modified: trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/include/win32csr.h trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] Wed Jul 23 11:21:46 2008 @@ -104,16 +104,6 @@ TRACE("CreateFileW(lpFileName %S)\n",lpFileName); - /* check for console input/output */ - if (0 == _wcsicmp(L"CONOUT$", lpFileName) - || 0 == _wcsicmp(L"CONIN$", lpFileName)) - { - return OpenConsoleW(lpFileName, - dwDesiredAccess, - lpSecurityAttributes ? lpSecurityAttributes->bInheritHandle : FALSE, - dwCreationDisposition); - } - /* validate & translate the creation disposition */ switch (dwCreationDisposition) { @@ -141,6 +131,16 @@ SetLastError(ERROR_INVALID_PARAMETER); return (INVALID_HANDLE_VALUE); } + + /* check for console input/output */ + if (0 == _wcsicmp(L"CONOUT$", lpFileName) + || 0 == _wcsicmp(L"CONIN$", lpFileName)) + { + return OpenConsoleW(lpFileName, + dwDesiredAccess, + lpSecurityAttributes ? lpSecurityAttributes->bInheritHandle : FALSE, + FILE_SHARE_READ | FILE_SHARE_WRITE); + } /* validate & translate the flags */ Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Wed Jul 23 11:21:46 2008 @@ -906,7 +906,7 @@ OpenConsoleW (LPCWSTR wsName, DWORD dwDesiredAccess, BOOL bInheritHandle, - DWORD dwCreationDistribution) + DWORD dwShareMode) /* * Undocumented */ @@ -933,7 +933,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return(INVALID_HANDLE_VALUE); } - if (OPEN_EXISTING != dwCreationDistribution) + if (dwShareMode & ~(FILE_SHARE_READ|FILE_SHARE_WRITE)) { SetLastError(ERROR_INVALID_PARAMETER); return(INVALID_HANDLE_VALUE); @@ -1260,12 +1260,6 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; - - if (IsConsoleHandle (Handle) == FALSE) - { - SetLastError (ERROR_INVALID_PARAMETER); - return FALSE; - } CsrRequest = MAKE_CSR_API(CLOSE_HANDLE, CSR_NATIVE); Request.Data.CloseHandleRequest.Handle = Handle; @@ -2907,14 +2901,6 @@ NTSTATUS Status; - if (!IsConsoleHandle (hConsoleHandle)) - { - DPRINT("SetConsoleMode was called with a non console handle\n"); - SetLastError (ERROR_INVALID_PARAMETER); - return FALSE; - } - - CsrRequest = MAKE_CSR_API(SET_CONSOLE_MODE, CSR_CONSOLE); Request.Data.SetConsoleModeRequest.ConsoleHandle = hConsoleHandle; Request.Data.SetConsoleModeRequest.Mode = dwMode; Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Wed Jul 23 11:21:46 2008 @@ -19,10 +19,10 @@ static unsigned ObjectDefinitionsCount = 0; static PCSRSS_OBJECT_DEFINITION ObjectDefinitions = NULL; -BOOL +static BOOL CsrIsConsoleHandle(HANDLE Handle) { - return ((((ULONG)Handle) & 0x10000003) == 0x3) ? TRUE : FALSE; + return ((ULONG)Handle & 0x10000003) == 0x3; } @@ -89,26 +89,21 @@ NTSTATUS STDCALL CsrReleaseObjectByPointer(Object_t *Object) { - BOOL Found; unsigned DefIndex; /* dec ref count */ if (_InterlockedDecrement(&Object->ReferenceCount) == 0) { - Found = FALSE; - for (DefIndex = 0; ! Found && DefIndex < ObjectDefinitionsCount; DefIndex++) + for (DefIndex = 0; DefIndex < ObjectDefinitionsCount; DefIndex++) { if (Object->Type == ObjectDefinitions[DefIndex].Type) { (ObjectDefinitions[DefIndex].CsrCleanupObjectProc)(Object); - Found = TRUE; + return STATUS_SUCCESS; } } - if (! Found) - { - DPRINT1("CSR: Error: releaseing unknown object type 0x%x", Object->Type); - } + DPRINT1("CSR: Error: releasing unknown object type 0x%x", Object->Type); } return STATUS_SUCCESS; @@ -127,7 +122,7 @@ return STATUS_INVALID_PARAMETER; } RtlEnterCriticalSection(&ProcessData->HandleTableLock); - if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize + if (h >= ProcessData->HandleTableSize || (Object = ProcessData->HandleTable[h].Object) == NULL) { RtlLeaveCriticalSection(&ProcessData->HandleTableLock); @@ -234,7 +229,7 @@ { return STATUS_INVALID_PARAMETER; } - if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize + if (h >= ProcessData->HandleTableSize || ProcessData->HandleTable[h].Object == NULL) { return STATUS_INVALID_HANDLE; Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] Wed Jul 23 11:21:46 2008 @@ -152,12 +152,12 @@ #define ConioRectWidth(Rect) \ (((Rect)->left) > ((Rect)->right) ? 0 : ((Rect)->right) - ((Rect)->left) + 1) -#define ConioLockConsole(ProcessData, Handle, Ptr) \ - Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), CONIO_CONSOLE_MAGIC) +#define ConioLockConsole(ProcessData, Handle, Ptr, Access) \ + Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), Access, CONIO_CONSOLE_MAGIC) #define ConioUnlockConsole(Console) \ Win32CsrUnlockObject((Object_t *) Console) -#define ConioLockScreenBuffer(ProcessData, Handle, Ptr) \ - Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), CONIO_SCREEN_BUFFER_MAGIC) +#define ConioLockScreenBuffer(ProcessData, Handle, Ptr, Access) \ + Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), Access, CONIO_SCREEN_BUFFER_MAGIC) #define ConioUnlockScreenBuffer(Buff) \ Win32CsrUnlockObject((Object_t *) Buff) #define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon(Console, hWindowIcon) Modified: trunk/reactos/subsystems/win32/csrss/include/win32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/win32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/win32csr.h [iso-8859-1] Wed Jul 23 11:21:46 2008 @@ -24,12 +24,14 @@ NTSTATUS FASTCALL Win32CsrLockObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, + DWORD Access, long Type); VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); NTSTATUS FASTCALL Win32CsrGetObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, - Object_t **Object); + Object_t **Object, + DWORD Access); NTSTATUS FASTCALL Win32CsrReleaseObjectByPointer(Object_t *Object); NTSTATUS FASTCALL Win32CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Object); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Wed Jul 23 11:21:46 2008 @@ -397,6 +397,7 @@ Console = ProcessData->Console; ProcessData->Console = NULL; + RemoveEntryList(&ProcessData->ProcessEntry); if (0 == InterlockedDecrement(&Console->Header.ReferenceCount)) { ConioDeleteConsole((Object_t *) Console); @@ -578,7 +579,7 @@ Buffer = Request->Data.ReadConsoleRequest.Buffer; UnicodeBuffer = (PWCHAR)Buffer; Status = ConioLockConsole(ProcessData, Request->Data.ReadConsoleRequest.ConsoleHandle, - &Console); + &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -889,7 +890,7 @@ if (Buffer) { - Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (NT_SUCCESS(Status)) { Request->Status = ConioWriteConsole(Console, Buff, Buffer, @@ -1317,7 +1318,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.ScreenBufferInfoRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.ScreenBufferInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -1360,7 +1361,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -1480,7 +1481,8 @@ { Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleOutputCharRequest.ConsoleHandle, - &Buff); + &Buff, + GENERIC_WRITE); if (NT_SUCCESS(Status)) { X = Request->Data.WriteConsoleOutputCharRequest.Coord.X; @@ -1546,7 +1548,7 @@ return Request->Status = Status; } - Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -1605,7 +1607,7 @@ Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.ReadInputRequest.Event = ProcessData->ConsoleEvent; - Status = ConioLockConsole(ProcessData, Request->Data.ReadInputRequest.ConsoleHandle, &Console); + Status = ConioLockConsole(ProcessData, Request->Data.ReadInputRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -1702,7 +1704,8 @@ Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleOutputAttribRequest.ConsoleHandle, - &Buff); + &Buff, + GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -1766,7 +1769,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputAttribRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputAttribRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -1817,7 +1820,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.GetCursorInfoRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.GetCursorInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -1848,7 +1851,7 @@ return Request->Status = Status; } - Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorInfoRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorInfoRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -1900,7 +1903,7 @@ return Request->Status = Status; } - Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -1936,7 +1939,7 @@ Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = Win32CsrGetObject(ProcessData, Request->Data.SetConsoleModeRequest.ConsoleHandle, - (Object_t **) &Console); + (Object_t **) &Console, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -1972,7 +1975,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = Win32CsrGetObject(ProcessData, Request->Data.GetConsoleModeRequest.ConsoleHandle, - (Object_t **) &Console); + (Object_t **) &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -2085,7 +2088,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetScreenBufferRequest.OutputHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetScreenBufferRequest.OutputHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -2234,7 +2237,8 @@ Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleOutputRequest.ConsoleHandle, - &Buff); + &Buff, + GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -2321,7 +2325,8 @@ Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockConsole(ProcessData, Request->Data.FlushInputBufferRequest.ConsoleInput, - &Console); + &Console, + GENERIC_WRITE); if(! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -2375,7 +2380,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -2478,7 +2483,7 @@ return Request->Status = Status; } - Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); @@ -2548,7 +2553,7 @@ Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); ReadBuffer = Request->Data.ReadConsoleOutputAttribRequest.Attribute; - Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputAttribRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputAttribRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -2609,7 +2614,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console); + Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -2654,7 +2659,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console); + Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console, GENERIC_READ); if(! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -2732,7 +2737,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputRequest.ConsoleHandle, &Buff); + Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -2821,7 +2826,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockConsole(ProcessData, Request->Data.WriteConsoleInputRequest.ConsoleHandle, &Console); + Status = ConioLockConsole(ProcessData, Request->Data.WriteConsoleInputRequest.ConsoleHandle, &Console, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -2915,7 +2920,8 @@ Status = ConioLockConsole(ProcessData, Request->Data.ConsoleHardwareStateRequest.ConsoleHandle, - &Console); + &Console, + GENERIC_READ); if (! NT_SUCCESS(Status)) { DPRINT1("Failed to get console handle in SetConsoleHardwareState\n"); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Wed Jul 23 11:21:46 2008 @@ -106,20 +106,22 @@ NTSTATUS FASTCALL Win32CsrGetObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, - Object_t **Object) -{ - return (CsrExports.CsrGetObjectProc)(ProcessData, Handle, Object, 0); + Object_t **Object, + DWORD Access) +{ + return (CsrExports.CsrGetObjectProc)(ProcessData, Handle, Object, Access); } NTSTATUS FASTCALL Win32CsrLockObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, + DWORD Access, LONG Type) { NTSTATUS Status; - Status = (CsrExports.CsrGetObjectProc)(ProcessData, Handle, Object, 0); + Status = (CsrExports.CsrGetObjectProc)(ProcessData, Handle, Object, Access); if (! NT_SUCCESS(Status)) { return Status;

1 0

[fireball] 34693: - Revert 20424 and do a proper fix: Check if pool allocation succeeded right after allocation, not at the end of the function, when the pointer has been used quite a few times already.
by fireball＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: fireball Date: Wed Jul 23 10:18:25 2008 New Revision: 34693 URL: http://svn.reactos.org/svn/reactos?rev=34693&view=rev Log: - Revert 20424 and do a proper fix: Check if pool allocation succeeded right after allocation, not at the end of the function, when the pointer has been used quite a few times already. Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] Wed Jul 23 10:18:25 2008 @@ -248,6 +248,12 @@ ExFreePool(palPtr->mapping); mapping = ExAllocatePoolWithTag(PagedPool, sizeof(int)*palGDI->NumColors, TAG_PALETTEMAP); + if (!mapping) + { + DPRINT1("Failed allocating memory for palette mapping!\n"); + return 0; + } + palPtr->mapping = mapping; for(uNum += uStart; uStart < uNum; uStart++) @@ -326,11 +332,7 @@ } if( !prevMapping || palPtr->mapping[uStart] != index ) iRemapped++; - if (palPtr->mapping != NULL) - { - palPtr->mapping[uStart] = index; - } - + palPtr->mapping[uStart] = index; } return iRemapped; }

1 0

[cwittich] 34692: fix all kernel32 version winetests
by cwittich＠svn.reactos.org 23 Jul '08

23 Jul '08

Author: cwittich Date: Wed Jul 23 06:19:01 2008 New Revision: 34692 URL: http://svn.reactos.org/svn/reactos?rev=34692&view=rev Log: fix all kernel32 version winetests Modified: trunk/reactos/lib/rtl/version.c Modified: trunk/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/version.c?rev=3469… ============================================================================== --- trunk/reactos/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/version.c [iso-8859-1] Wed Jul 23 06:19:01 2008 @@ -22,16 +22,40 @@ /* FUNCTIONS ****************************************************************/ +static inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR condition) +{ + switch (condition) { + case VER_EQUAL: + if (left != right) return STATUS_REVISION_MISMATCH; + break; + case VER_GREATER: + if (left <= right) return STATUS_REVISION_MISMATCH; + break; + case VER_GREATER_EQUAL: + if (left < right) return STATUS_REVISION_MISMATCH; + break; + case VER_LESS: + if (left >= right) return STATUS_REVISION_MISMATCH; + break; + case VER_LESS_EQUAL: + if (left > right) return STATUS_REVISION_MISMATCH; + break; + default: + return STATUS_REVISION_MISMATCH; + } + return STATUS_SUCCESS; +} + /* * @implemented */ NTSTATUS NTAPI RtlVerifyVersionInfo( - IN PRTL_OSVERSIONINFOEXW VersionInfo, - IN ULONG TypeMask, - IN ULONGLONG ConditionMask - ) + IN PRTL_OSVERSIONINFOEXW VersionInfo, + IN ULONG TypeMask, + IN ULONGLONG ConditionMask + ) { RTL_OSVERSIONINFOEXW ver; NTSTATUS status; @@ -44,32 +68,20 @@ */ ver.dwOSVersionInfoSize = sizeof(ver); - if ((status = RtlGetVersion( (PRTL_OSVERSIONINFOW)&ver )) != STATUS_SUCCESS) return status; + status = RtlGetVersion( (PRTL_OSVERSIONINFOW)&ver ); + if (status != STATUS_SUCCESS) return status; if(!(TypeMask && ConditionMask)) return STATUS_INVALID_PARAMETER; if(TypeMask & VER_PRODUCT_TYPE) - switch(ConditionMask >> 7*3 & 0x07) { - case VER_EQUAL: - if(ver.wProductType != VersionInfo->wProductType) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER: - if(ver.wProductType <= VersionInfo->wProductType) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER_EQUAL: - if(ver.wProductType < VersionInfo->wProductType) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS: - if(ver.wProductType >= VersionInfo->wProductType) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS_EQUAL: - if(ver.wProductType > VersionInfo->wProductType) return STATUS_REVISION_MISMATCH; - break; - default: - return STATUS_INVALID_PARAMETER; - } + { + status = version_compare_values(ver.wProductType, VersionInfo->wProductType, ConditionMask >> 7 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + if (status != STATUS_SUCCESS) + return status; + } if(TypeMask & VER_SUITENAME) - switch(ConditionMask >> 6*3 & 0x07) + { + switch(ConditionMask >> 6 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK) { case VER_AND: if((VersionInfo->wSuiteMask & ver.wSuiteMask) != VersionInfo->wSuiteMask) @@ -82,132 +94,59 @@ default: return STATUS_INVALID_PARAMETER; } + } if(TypeMask & VER_PLATFORMID) - switch(ConditionMask >> 3*3 & 0x07) + { + status = version_compare_values(ver.dwPlatformId, VersionInfo->dwPlatformId, ConditionMask >> 3 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + if (status != STATUS_SUCCESS) + return status; + } + if(TypeMask & VER_BUILDNUMBER) + { + status = version_compare_values(ver.dwBuildNumber, VersionInfo->dwBuildNumber, ConditionMask >> 2 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK); + if (status != STATUS_SUCCESS) + return status; + } + if(TypeMask & (VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR)) + { + unsigned char condition = 0; + BOOLEAN do_next_check = TRUE; + + if(TypeMask & VER_MAJORVERSION) + condition = ConditionMask >> 1 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; + else if(TypeMask & VER_MINORVERSION) + condition = ConditionMask >> 0 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; + else if(TypeMask & VER_SERVICEPACKMAJOR) + condition = ConditionMask >> 5 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; + else if(TypeMask & VER_SERVICEPACKMINOR) + condition = ConditionMask >> 4 * VER_NUM_BITS_PER_CONDITION_MASK & VER_CONDITION_MASK; + + if(TypeMask & VER_MAJORVERSION) { - case VER_EQUAL: - if(ver.dwPlatformId != VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER: - if(ver.dwPlatformId <= VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER_EQUAL: - if(ver.dwPlatformId < VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS: - if(ver.dwPlatformId >= VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS_EQUAL: - if(ver.dwPlatformId > VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH; - break; - default: - return STATUS_INVALID_PARAMETER; + status = version_compare_values(ver.dwMajorVersion, VersionInfo->dwMajorVersion, condition); + do_next_check = (ver.dwMajorVersion == VersionInfo->dwMajorVersion) && + ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); } - if(TypeMask & VER_BUILDNUMBER) - switch(ConditionMask >> 2*3 & 0x07) + if((TypeMask & VER_MINORVERSION) && do_next_check) { - case VER_EQUAL: - if(ver.dwBuildNumber != VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER: - if(ver.dwBuildNumber <= VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER_EQUAL: - if(ver.dwBuildNumber < VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS: - if(ver.dwBuildNumber >= VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS_EQUAL: - if(ver.dwBuildNumber > VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH; - break; - default: - return STATUS_INVALID_PARAMETER; + status = version_compare_values(ver.dwMinorVersion, VersionInfo->dwMinorVersion, condition); + do_next_check = (ver.dwMinorVersion == VersionInfo->dwMinorVersion) && + ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); } - if(TypeMask & VER_MAJORVERSION) - switch(ConditionMask >> 1*3 & 0x07) + if((TypeMask & VER_SERVICEPACKMAJOR) && do_next_check) { - case VER_EQUAL: - if(ver.dwMajorVersion != VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER: - if(ver.dwMajorVersion <= VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER_EQUAL: - if(ver.dwMajorVersion < VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS: - if(ver.dwMajorVersion >= VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS_EQUAL: - if(ver.dwMajorVersion > VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH; - break; - default: - return STATUS_INVALID_PARAMETER; + status = version_compare_values(ver.wServicePackMajor, VersionInfo->wServicePackMajor, condition); + do_next_check = (ver.wServicePackMajor == VersionInfo->wServicePackMajor) && + ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); } - if(TypeMask & VER_MINORVERSION) - switch(ConditionMask >> 0*3 & 0x07) + if((TypeMask & VER_SERVICEPACKMINOR) && do_next_check) { - case VER_EQUAL: - if(ver.dwMinorVersion != VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER: - if(ver.dwMinorVersion <= VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER_EQUAL: - if(ver.dwMinorVersion < VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS: - if(ver.dwMinorVersion >= VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS_EQUAL: - if(ver.dwMinorVersion > VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH; - break; - default: - return STATUS_INVALID_PARAMETER; + status = version_compare_values(ver.wServicePackMinor, VersionInfo->wServicePackMinor, condition); } - if(TypeMask & VER_SERVICEPACKMAJOR) - switch(ConditionMask >> 5*3 & 0x07) - { - case VER_EQUAL: - if(ver.wServicePackMajor != VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER: - if(ver.wServicePackMajor <= VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER_EQUAL: - if(ver.wServicePackMajor < VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS: - if(ver.wServicePackMajor >= VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS_EQUAL: - if(ver.wServicePackMajor > VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH; - break; - default: - return STATUS_INVALID_PARAMETER; - } - if(TypeMask & VER_SERVICEPACKMINOR) - switch(ConditionMask >> 4*3 & 0x07) - { - case VER_EQUAL: - if(ver.wServicePackMinor != VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER: - if(ver.wServicePackMinor <= VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH; - break; - case VER_GREATER_EQUAL: - if(ver.wServicePackMinor < VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS: - if(ver.wServicePackMinor >= VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH; - break; - case VER_LESS_EQUAL: - if(ver.wServicePackMinor > VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH; - break; - default: - return STATUS_INVALID_PARAMETER; - } + + if (status != STATUS_SUCCESS) + return status; + } return STATUS_SUCCESS; }

1 0

[jimtabor] 34691: - Fixed CallNextHookEx, now we do make the callback. Q, how to reload it at the end of the list? Fix for bug 3549. - Tested with Opera 9.51(still breaks when getting the page see bug 3465), FF, Seamonkey, Abiword, and the rest of our applications.
by jimtabor＠svn.reactos.org 22 Jul '08

22 Jul '08

Author: jimtabor Date: Tue Jul 22 18:46:31 2008 New Revision: 34691 URL: http://svn.reactos.org/svn/reactos?rev=34691&view=rev Log: - Fixed CallNextHookEx, now we do make the callback. Q, how to reload it at the end of the list? Fix for bug 3549. - Tested with Opera 9.51(still breaks when getting the page see bug 3465), FF, Seamonkey, Abiword, and the rest of our applications. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Tue Jul 22 18:46:31 2008 @@ -183,30 +183,28 @@ /* - * @unimplemented + * @implemented */ LRESULT STDCALL CallNextHookEx( - HHOOK Hook, + HHOOK Hook, // Windows NT/XP/2003: Ignored. int Code, WPARAM wParam, LPARAM lParam) { PW32CLIENTINFO ClientInfo; + DWORD Flags, Save; PHOOK pHook; - DWORD Flags, Save; LRESULT lResult = 0; GetConnected(); ClientInfo = GetWin32ClientInfo(); - pHook = ValidateHandle(Hook, VALIDATE_TYPE_HOOK); - - if (!pHook) return 0; - - ClientInfo->phkCurrent = (PHOOK)pHook->Self; // Pass this over to the kernel. + if (!ClientInfo->phkCurrent) return 0; + + pHook = SharedPtrToUser(ClientInfo->phkCurrent); if (pHook->HookId == WH_CALLWNDPROC || pHook->HookId == WH_CALLWNDPROCRET) { @@ -508,7 +506,7 @@ case WH_SYSMSGFILTER: case WH_GETMESSAGE: Msg = (PMSG)((PCHAR) Common + Common->lParam); - FIXME("UHOOK Memory: %x: %x\n",Common, Msg); +// FIXME("UHOOK Memory: %x: %x\n",Common, Msg); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) Msg); break; default: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Tue Jul 22 18:46:31 2008 @@ -449,7 +449,7 @@ case WH_GETMESSAGE: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MSG)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); - DPRINT1("KHOOK Memory: %x\n",Common); +// DPRINT1("KHOOK Memory: %x\n",Common); break; // case WH_SHELL: // Extra = lParam; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Jul 22 18:46:31 2008 @@ -731,7 +731,6 @@ LPARAM lParam, BOOL Ansi) { - HHOOK Hook; PHOOK HookObj, NextObj; PW32CLIENTINFO ClientInfo; PWINSTATION_OBJECT WinStaObj; @@ -758,14 +757,7 @@ ClientInfo = GetWin32ClientInfo(); - Hook = (HHOOK)ClientInfo->phkCurrent; - - if (!(HookObj = IntGetHookObject(Hook))) - { - RETURN(0); - } - - ASSERT(Hook == HookObj->Self); + HookObj = ClientInfo->phkCurrent; // Use this one set from SetWindowHook. HookId = HookObj->HookId; Ansi = HookObj->Ansi; @@ -784,9 +776,12 @@ { lResult = UserCallNextHookEx( HookId, Code, wParam, lParam, Ansi); + ClientInfo->phkCurrent = NextObj; + if (lResult == 0) RETURN( 0); RETURN( (LRESULT)NextObj); } + ClientInfo->phkCurrent = NextObj; RETURN( 0); @@ -819,6 +814,7 @@ BOOL Ansi) { PWINSTATION_OBJECT WinStaObj; + PW32CLIENTINFO ClientInfo; BOOLEAN Global; PETHREAD Thread; PHOOK Hook; @@ -836,6 +832,8 @@ RETURN( NULL); } + ClientInfo = GetWin32ClientInfo(); + if (ThreadId) /* thread-local hook */ { if (HookId == WH_JOURNALRECORD || @@ -894,9 +892,19 @@ } /* We only (partially) support local WH_CBT hooks and - * WH_KEYBOARD_LL/WH_MOUSE_LL hooks for now */ - if ((WH_CBT != HookId || Global) - && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId && WH_GETMESSAGE != HookId) + * WH_KEYBOARD_LL, WH_MOUSE_LL and WH_GETMESSAGE hooks for now + */ + if (WH_CALLWNDPROC == HookId && + WH_CALLWNDPROCRET == HookId && + WH_DEBUG == HookId && + WH_JOURNALPLAYBACK == HookId && + WH_JOURNALRECORD == HookId && + WH_FOREGROUNDIDLE == HookId && + WH_KEYBOARD == HookId && + WH_MOUSE == HookId && + WH_MSGFILTER == HookId && + WH_SYSMSGFILTER == HookId && + WH_SHELL == HookId) { #if 0 /* Removed to get winEmbed working again */ UNIMPLEMENTED @@ -997,6 +1005,9 @@ Hook->Ansi = Ansi; Handle = Hook->Self; +// Set the client threads next hook based on the hooks type. + ClientInfo->phkCurrent = IntGetNextHook( Hook); + UserDereferenceObject(Hook); ObDereferenceObject(WinStaObj); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Jul 22 18:46:31 2008 @@ -818,8 +818,8 @@ // be returned by the GetMessage or PeekMessage function. if(ISITHOOKED(WH_GETMESSAGE)) { - DPRINT1("Peek WH_GETMESSAGE -> %x\n",&Msg); - co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg); + //DPRINT1("Peek WH_GETMESSAGE -> %x\n",&Msg); + co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); } return TRUE; }

1 0

[arty] 34690: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) Fixed my mistake leaving TCPConnect on a failure path without releasing the TCP lock.
by arty＠svn.reactos.org 22 Jul '08

22 Jul '08

Author: arty Date: Tue Jul 22 18:11:46 2008 New Revision: 34690 URL: http://svn.reactos.org/svn/reactos?rev=34690&view=rev Log: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) Fixed my mistake leaving TCPConnect on a failure path without releasing the TCP lock. Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Jul 22 18:11:46 2008 @@ -559,6 +559,7 @@ if (!NT_SUCCESS(Status)) { TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); + TcpipRecursiveMutexLeave( &TCPLock ); return Status; }

1 0

[mkupfer] 34689: revert on request, problem remains
by mkupfer＠svn.reactos.org 22 Jul '08

22 Jul '08

Author: mkupfer Date: Tue Jul 22 15:16:12 2008 New Revision: 34689 URL: http://svn.reactos.org/svn/reactos?rev=34689&view=rev Log: revert on request, problem remains Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Tue Jul 22 15:16:12 2008 @@ -512,6 +512,7 @@ _T("Help is not yet implemented\n"), _T("Note!"), MB_OK | MB_ICONINFORMATION); + SetFocus(Info->hListView); break; case ID_EXIT: @@ -569,6 +570,7 @@ MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, (DLGPROC)AboutDialogProc); + SetFocus(Info->hListView); break; }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008