Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 32935: PatchPatch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - remove NtUserGetWindowRect, use GetWindowRect instead - remove NtUserGetClientOrigin and NtUserGetClientRect (unused) - remove NtUserManualGuiCheck, use NtUserCallOneParam like other private CSRSS functions do
by tkreuzer＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: tkreuzer Date: Sat Apr 12 18:22:58 2008 New Revision: 32935 URL: http://svn.reactos.org/svn/reactos?rev=32935&view=rev Log: PatchPatch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - remove NtUserGetWindowRect, use GetWindowRect instead - remove NtUserGetClientOrigin and NtUserGetClientRect (unused) - remove NtUserManualGuiCheck, use NtUserCallOneParam like other private CSRSS functions do Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -1193,7 +1193,7 @@ if (SB_CTL != SBType) { - NtUserGetWindowRect(Wnd, &WindowRect); + GetWindowRect(Wnd, &WindowRect); Pt.x -= WindowRect.left; Pt.y -= WindowRect.top; Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -55,7 +55,7 @@ STDCALL PrivateCsrssManualGuiCheck(LONG Check) { - NtUserManualGuiCheck(Check); + NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); } VOID Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -2503,6 +2503,7 @@ #define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005 #define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 #define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 +#define ONEPARAM_ROUTINE_CSRSS_GUICHECK 0xffff0008 #define ONEPARAM_ROUTINE_GETMENU 0xfffe0001 // usermode #define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0xfffe0002 #define ONEPARAM_ROUTINE_GETCARETINFO 0xfffe0007 @@ -2562,16 +2563,6 @@ NTAPI NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); -/* Should be done in usermode */ -BOOL -NTAPI -NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); - -/* Should be done in usermode */ -BOOL -NTAPI -NtUserGetClientRect(HWND hWnd, LPRECT Rect); - UINT NTAPI NtUserGetMenuDefaultItem( @@ -2626,20 +2617,9 @@ NTAPI NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); -/* Should be done in usermode */ -BOOL -NTAPI -NtUserGetWindowRect(HWND hWnd, LPRECT Rect); - DWORD NTAPI NtUserGetWindowThreadProcessId(HWND hWnd, LPDWORD UnsafePid); - - - -VOID -NTAPI -NtUserManualGuiCheck(LONG Check); Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -8,5 +8,6 @@ ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); DWORD STDCALL IntGetQueueStatus(BOOL ClearChanges); +VOID FASTCALL IntUserManualGuiCheck(LONG Check); #endif /* __WIN32K_MISC_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -98,13 +98,13 @@ return TRUE; } -VOID STDCALL -NtUserManualGuiCheck(LONG Check) +VOID +FASTCALL +IntUserManualGuiCheck(LONG Check) { PW32PROCESS W32Data; - DPRINT("Enter NtUserManualGuiCheck\n"); - UserEnterExclusive(); + DPRINT("Enter IntUserManualGuiCheck\n"); W32Data = PsGetCurrentProcessWin32Process(); if (0 == Check) @@ -126,8 +126,7 @@ } } - DPRINT("Leave NtUserManualGuiCheck\n"); - UserLeave(); + DPRINT("Leave IntUserManualGuiCheck\n"); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -395,6 +395,10 @@ case ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS: /* FIXME: Should use UserEnterShared */ RETURN(IntEnumClipboardFormats(Param)); + + case ONEPARAM_ROUTINE_CSRSS_GUICHECK: + IntUserManualGuiCheck(Param); + RETURN(TRUE); } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -2887,45 +2887,6 @@ END_CLEANUP; } -/*! - * Returns client window rectangle relative to the upper-left corner of client area. - * - * \param hWnd window handle. - * \param Rect pointer to the buffer where the coordinates are returned. - * -*/ -/* - * @implemented - */ -BOOL STDCALL -NtUserGetClientRect(HWND hWnd, LPRECT Rect) -{ - PWINDOW_OBJECT Window; - RECT SafeRect; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserGetClientRect\n"); - UserEnterShared(); - - if(!(Window = UserGetWindowObject(hWnd))) - { - RETURN( FALSE); - } - - IntGetClientRect(Window, &SafeRect); - - if(!NT_SUCCESS(MmCopyToCaller(Rect, &SafeRect, sizeof(RECT)))) - { - RETURN( FALSE); - } - RETURN( TRUE); - -CLEANUP: - DPRINT("Leave NtUserGetClientRect, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - BOOL STDCALL @@ -3902,44 +3863,6 @@ CLEANUP: DPRINT("Leave NtUserGetWindowPlacement, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - -/*! - * Return the dimension of the window in the screen coordinates. - * \param hWnd window handle. - * \param Rect pointer to the buffer where the coordinates are returned. -*/ -/* - * @implemented - */ -BOOL STDCALL -NtUserGetWindowRect(HWND hWnd, LPRECT Rect) -{ - PWINDOW_OBJECT Wnd; - NTSTATUS Status; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserGetWindowRect\n"); - UserEnterShared(); - - if (!(Wnd = UserGetWindowObject(hWnd))) - { - RETURN(FALSE); - } - Status = MmCopyToCaller(Rect, &Wnd->Wnd->WindowRect, sizeof(RECT)); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - RETURN( TRUE); - -CLEANUP: - DPRINT("Leave NtUserGetWindowRect, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -104,27 +104,6 @@ return Ret; } - - -BOOL STDCALL -NtUserGetClientOrigin(HWND hWnd, LPPOINT Point) -{ - DECLARE_RETURN(BOOL); - PWINDOW_OBJECT Window; - - DPRINT("Enter NtUserGetClientOrigin\n"); - UserEnterShared(); - - if (!(Window = UserGetWindowObject(hWnd))) - RETURN(FALSE); - - RETURN(UserGetClientOrigin(Window, Point)); - -CLEANUP: - DPRINT("Leave NtUserGetClientOrigin, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} /******************************************************************* Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Apr 12 18:22:58 2008 @@ -682,8 +682,6 @@ NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 NtUserGetClassLong 3 -NtUserGetClientOrigin 2 -NtUserGetClientRect 2 NtUserGetMenuDefaultItem 3 NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3 @@ -694,9 +692,7 @@ NtUserGetSystemMetrics 1 NtUserGetWindow 2 NtUserGetWindowLong 3 -NtUserGetWindowRect 2 NtUserGetWindowThreadProcessId 2 -NtUserManualGuiCheck 1 NtUserMenuInfo 3 NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3

1 0

[tkreuzer] 32934: When drawing disabled buttons, use DrawText 2 times instead of using DrawState, which creates a mono bitmap first and that looks ugly with freetype. This makes the disabled buttons look as nice as the disabled menus.
by tkreuzer＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: tkreuzer Date: Sat Apr 12 16:37:04 2008 New Revision: 32934 URL: http://svn.reactos.org/svn/reactos?rev=32934&view=rev Log: When drawing disabled buttons, use DrawText 2 times instead of using DrawState, which creates a mono bitmap first and that looks ugly with freetype. This makes the disabled buttons look as nice as the disabled menus. Modified: trunk/reactos/dll/win32/user32/controls/button.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sat Apr 12 16:37:04 2008 @@ -826,8 +826,22 @@ return; } - DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, - rc->right - rc->left, rc->bottom - rc->top, flags); + /* ROS Hack to make font look less ugly */ + if ( ((style & (BS_ICON|BS_BITMAP)) == BS_TEXT) && + (flags & DSS_DISABLED) ) + { + ++rc->left; ++rc->top; ++rc->right; ++rc->bottom; + SetTextColor(hdc, GetSysColor(COLOR_3DHILIGHT)); + DrawTextW(hdc, (LPCWSTR)lp, -1, rc, (UINT)wp); + --rc->left; --rc->top; --rc->right; --rc->bottom; + SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); + DrawTextW(hdc, (LPCWSTR)lp, -1, rc, (UINT)wp); + } + else + { + DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, + rc->right - rc->left, rc->bottom - rc->top, flags); + } HeapFree( GetProcessHeap(), 0, text ); }

1 0

[tkreuzer] 32933: syscalldump: use debghelp function to get the address inside the file image. Hopefully it supports x64 now ; -)
by tkreuzer＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: tkreuzer Date: Sat Apr 12 16:14:47 2008 New Revision: 32933 URL: http://svn.reactos.org/svn/reactos?rev=32933&view=rev Log: syscalldump: use debghelp function to get the address inside the file image. Hopefully it supports x64 now ;-) Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/syscalldump/sysca… ============================================================================== --- trunk/rosapps/devutils/syscalldump/syscalldump.c [iso-8859-1] (original) +++ trunk/rosapps/devutils/syscalldump/syscalldump.c [iso-8859-1] Sat Apr 12 16:14:47 2008 @@ -22,53 +22,11 @@ } DWORD64 -GetOffsetFromAdress64(PBYTE pModule, DWORD64 dwAdress, PBOOL pbX64) -{ - PIMAGE_DOS_HEADER pDosHdr; - PIMAGE_NT_HEADERS32 pNtHdr32; - WORD NumberOfSections; - INT i, nSection; - DWORD64 dwOffset = 0; - - pDosHdr = (PIMAGE_DOS_HEADER)pModule; - pNtHdr32 = (PIMAGE_NT_HEADERS32)((UINT_PTR)pModule + pDosHdr->e_lfanew); - - if (pNtHdr32->Signature != IMAGE_NT_SIGNATURE) - { - return 0; - } - - if (pNtHdr32->FileHeader.Machine == IMAGE_FILE_MACHINE_I386) - { - PIMAGE_SECTION_HEADER pSectionHdr; - - *pbX64 = FALSE; - NumberOfSections = pNtHdr32->FileHeader.NumberOfSections; - pSectionHdr = (PIMAGE_SECTION_HEADER)(pNtHdr32 + 1); - - nSection = 0; - for (i = 0; i < NumberOfSections; i++) - { - if (dwAdress >= pSectionHdr[i].VirtualAddress && - pSectionHdr[i].PointerToRawData > pSectionHdr[nSection].PointerToRawData) - { - nSection = i; - } - } - dwOffset = pSectionHdr[nSection].PointerToRawData + dwAdress - pSectionHdr[nSection].VirtualAddress; - return dwOffset; - } - else - { - *pbX64 = TRUE; - printf("x64 is unsupported atm\n"); - return 0; - } -} - -DWORD64 GetOffsetFromName(HANDLE hProcess, PSYMBOL_INFO pSym, PBYTE pModule, PCSTR Name, PBOOL pbX64) { + PIMAGE_NT_HEADERS NtHeaders; + PVOID p; + pSym->SizeOfStruct = sizeof(SYMBOL_INFO); pSym->MaxNameLen = MAX_SYMBOL_NAME-1; @@ -78,7 +36,13 @@ return 0; } printf("looking up adress for %s: 0x%llx\n", Name, pSym->Address); - return GetOffsetFromAdress64(pModule, pSym->Address - pSym->ModBase, pbX64); + + NtHeaders = ImageNtHeader(pModule); + *pbX64 = (NtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_I386); + + p = ImageRvaToVa(NtHeaders, pModule, pSym->Address - pSym->ModBase, NULL); + + return (DWORD64)((ULONG_PTR)p - (ULONG_PTR)pModule); } BOOL CALLBACK EnumSymbolsProc(

1 0

[jimtabor] 32932: More hook removal and cleanup.
by jimtabor＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: jimtabor Date: Sat Apr 12 16:07:40 2008 New Revision: 32932 URL: http://svn.reactos.org/svn/reactos?rev=32932&view=rev Log: More hook removal and cleanup. Modified: trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/hook.c Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Sat Apr 12 16:07:40 2008 @@ -693,7 +693,7 @@ TranslateMessageEx@8 UnhookWinEvent@4=NtUserUnhookWinEvent@4 UnhookWindowsHook@8 -UnhookWindowsHookEx@4 +UnhookWindowsHookEx@4=NtUserUnhookWindowsHookEx@4 UnionRect@12 UnloadKeyboardLayout@4=NtUserUnloadKeyboardLayout@4 UnlockWindowStation@4 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] Sat Apr 12 16:07:40 2008 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ +/* * * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c @@ -70,113 +70,6 @@ if ( Event != EVENT_OBJECT_FOCUS ) return SRV_EVENT_CREATE; } return Ret; -} - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -BOOL -STDCALL -UnhookWindowsHookEx( - HHOOK Hook) -{ - return NtUserUnhookWindowsHookEx(Hook); -} -#if 0 -BOOL -STDCALL -CallMsgFilter( - LPMSG lpMsg, - int nCode) -{ - UNIMPLEMENTED; - return FALSE; -} -#endif - - -/* - * @implemented - */ -BOOL -STDCALL -CallMsgFilterA( - LPMSG lpMsg, - int nCode) -{ - BOOL ret = FALSE; - - if (nCode != HCBT_CREATEWND) ret = NtUserCallMsgFilter((LPMSG) lpMsg, nCode); - else - { - UNICODE_STRING usBuffer; - CBT_CREATEWNDA *cbtcwA = (CBT_CREATEWNDA *)lpMsg->lParam; - CBT_CREATEWNDW cbtcwW; - CREATESTRUCTW csW; - MSG Msg; - - Msg.hwnd = lpMsg->hwnd; - Msg.message = lpMsg->message; - Msg.time = lpMsg->time; - Msg.pt = lpMsg->pt; - Msg.wParam = lpMsg->wParam; - - cbtcwW.lpcs = &csW; - cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter; - csW = *(CREATESTRUCTW *)cbtcwA->lpcs; - - if (HIWORD(cbtcwA->lpcs->lpszName)) - { - RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszName); - csW.lpszName = usBuffer.Buffer; - } - if (HIWORD(cbtcwA->lpcs->lpszClass)) - { - RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); - csW.lpszClass = usBuffer.Buffer; - } - Msg.lParam =(LPARAM) &cbtcwW; - - ret = NtUserCallMsgFilter((LPMSG)&Msg, nCode); - - lpMsg->time = Msg.time; - lpMsg->pt = Msg.pt; - - cbtcwA->hwndInsertAfter = cbtcwW.hwndInsertAfter; - if (HIWORD(csW.lpszName)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszName ); - if (HIWORD(csW.lpszClass)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszClass ); - } - return ret; -} - - -/* - * @implemented - */ -BOOL -STDCALL -CallMsgFilterW( - LPMSG lpMsg, - int nCode) -{ - return NtUserCallMsgFilter((LPMSG) lpMsg, nCode); -} - - -/* - * @unimplemented - */ -LRESULT -STDCALL -CallNextHookEx( - HHOOK Hook, - int Code, - WPARAM wParam, - LPARAM lParam) -{ - return NtUserCallNextHookEx(Hook, Code, wParam, lParam); } static @@ -206,6 +99,103 @@ } return NtUserSetWindowsHookEx(hMod, &USModuleName, dwThreadId, idHook, lpfn, bAnsi); +} + + +/* FUNCTIONS *****************************************************************/ + +#if 0 +BOOL +STDCALL +CallMsgFilter( + LPMSG lpMsg, + int nCode) +{ + UNIMPLEMENTED; + return FALSE; +} +#endif + +/* + * @implemented + */ +BOOL +STDCALL +CallMsgFilterA( + LPMSG lpMsg, + int nCode) +{ + BOOL ret = FALSE; + + if (nCode != HCBT_CREATEWND) ret = NtUserCallMsgFilter((LPMSG) lpMsg, nCode); + else + { + UNICODE_STRING usBuffer; + CBT_CREATEWNDA *cbtcwA = (CBT_CREATEWNDA *)lpMsg->lParam; + CBT_CREATEWNDW cbtcwW; + CREATESTRUCTW csW; + MSG Msg; + + Msg.hwnd = lpMsg->hwnd; + Msg.message = lpMsg->message; + Msg.time = lpMsg->time; + Msg.pt = lpMsg->pt; + Msg.wParam = lpMsg->wParam; + + cbtcwW.lpcs = &csW; + cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter; + csW = *(CREATESTRUCTW *)cbtcwA->lpcs; + + if (HIWORD(cbtcwA->lpcs->lpszName)) + { + RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszName); + csW.lpszName = usBuffer.Buffer; + } + if (HIWORD(cbtcwA->lpcs->lpszClass)) + { + RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); + csW.lpszClass = usBuffer.Buffer; + } + Msg.lParam =(LPARAM) &cbtcwW; + + ret = NtUserCallMsgFilter((LPMSG)&Msg, nCode); + + lpMsg->time = Msg.time; + lpMsg->pt = Msg.pt; + + cbtcwA->hwndInsertAfter = cbtcwW.hwndInsertAfter; + if (HIWORD(csW.lpszName)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszName ); + if (HIWORD(csW.lpszClass)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszClass ); + } + return ret; +} + + +/* + * @implemented + */ +BOOL +STDCALL +CallMsgFilterW( + LPMSG lpMsg, + int nCode) +{ + return NtUserCallMsgFilter((LPMSG) lpMsg, nCode); +} + + +/* + * @unimplemented + */ +LRESULT +STDCALL +CallNextHookEx( + HHOOK Hook, + int Code, + WPARAM wParam, + LPARAM lParam) +{ + return NtUserCallNextHookEx(Hook, Code, wParam, lParam); } /*

1 0

[jimtabor] 32931: More hook implementations.
by jimtabor＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: jimtabor Date: Sat Apr 12 15:53:08 2008 New Revision: 32931 URL: http://svn.reactos.org/svn/reactos?rev=32931&view=rev Log: More hook implementations. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/hook.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] Sat Apr 12 15:53:08 2008 @@ -34,6 +34,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); +DWORD Bogus_SrvEventActivity = 0; // Fixme, need to ref to share data. + +/* PRIVATE FUNCTIONS *********************************************************/ + +static +DWORD +FASTCALL +GetMaskFromEvent(DWORD Event) +{ + DWORD Ret = 0; + + if ( Event > EVENT_OBJECT_STATECHANGE ) + { + if ( Event == EVENT_OBJECT_LOCATIONCHANGE ) return SRV_EVENT_LOCATIONCHANGE; + if ( Event == EVENT_OBJECT_NAMECHANGE ) return SRV_EVENT_NAMECHANGE; + if ( Event == EVENT_OBJECT_VALUECHANGE ) return SRV_EVENT_VALUECHANGE; + return SRV_EVENT_CREATE; + } + + if ( Event == EVENT_OBJECT_STATECHANGE ) return SRV_EVENT_STATECHANGE; + + Ret = SRV_EVENT_RUNNING; + + if ( Event < EVENT_SYSTEM_MENUSTART ) return SRV_EVENT_CREATE; + + if ( Event <= EVENT_SYSTEM_MENUPOPUPEND ) + { + Ret = SRV_EVENT_MENU; + } + else + { + if ( Event <= EVENT_CONSOLE_CARET-1 ) return SRV_EVENT_CREATE; + if ( Event <= EVENT_CONSOLE_END_APPLICATION ) return SRV_EVENT_END_APPLICATION; + if ( Event != EVENT_OBJECT_FOCUS ) return SRV_EVENT_CREATE; + } + return Ret; +} + /* FUNCTIONS *****************************************************************/ /* @@ -221,7 +259,7 @@ } /* - * @unimplemented + * @implemented */ VOID STDCALL @@ -232,7 +270,11 @@ LONG idChild ) { - NtUserNotifyWinEvent(event, hwnd, idObject, idChild); +// "Servers call NotifyWinEvent to announce the event to the system after the +// event has occurred; they must never notify the system of an event before +// the event has occurred." msdn on NotifyWinEvent. + if (Bogus_SrvEventActivity & GetMaskFromEvent(event)) // Check to see. + NtUserNotifyWinEvent(event, hwnd, idObject, idChild); } /* @@ -277,7 +319,7 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -286,6 +328,7 @@ { if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) { + return (Bogus_SrvEventActivity & GetMaskFromEvent(event)) != 0; } return FALSE; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Apr 12 15:53:08 2008 @@ -241,6 +241,16 @@ } W32CLIENTINFO, *PW32CLIENTINFO; #define GetWin32ClientInfo() (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo) + +// Server event activity bits. +#define SRV_EVENT_MENU 0x0001 +#define SRV_EVENT_END_APPLICATION 0x0002 +#define SRV_EVENT_RUNNING 0x0004 +#define SRV_EVENT_NAMECHANGE 0x0008 +#define SRV_EVENT_VALUECHANGE 0x0010 +#define SRV_EVENT_STATECHANGE 0x0020 +#define SRV_EVENT_LOCATIONCHANGE 0x0040 +#define SRV_EVENT_CREATE 0x8000 PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); @@ -2205,12 +2215,12 @@ HRGN hRgn, BOOL bRedraw); -DWORD +HHOOK NTAPI NtUserSetWindowsHookAW( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + int idHook, + HOOKPROC lpfn, + BOOL Ansi); HHOOK NTAPI 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] Sat Apr 12 15:53:08 2008 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window hooks @@ -38,6 +37,44 @@ #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) static PHOOKTABLE GlobalHooks; +DWORD Bogus_SrvEventActivity = 0; + + +/* PRIVATE FUNCTIONS *********************************************************/ + +static +DWORD +FASTCALL +GetMaskFromEvent(DWORD Event) +{ + DWORD Ret = 0; + + if ( Event > EVENT_OBJECT_STATECHANGE ) + { + if ( Event == EVENT_OBJECT_LOCATIONCHANGE ) return SRV_EVENT_LOCATIONCHANGE; + if ( Event == EVENT_OBJECT_NAMECHANGE ) return SRV_EVENT_NAMECHANGE; + if ( Event == EVENT_OBJECT_VALUECHANGE ) return SRV_EVENT_VALUECHANGE; + return SRV_EVENT_CREATE; + } + + if ( Event == EVENT_OBJECT_STATECHANGE ) return SRV_EVENT_STATECHANGE; + + Ret = SRV_EVENT_RUNNING; + + if ( Event < EVENT_SYSTEM_MENUSTART ) return SRV_EVENT_CREATE; + + if ( Event <= EVENT_SYSTEM_MENUPOPUPEND ) + { + Ret = SRV_EVENT_MENU; + } + else + { + if ( Event <= EVENT_CONSOLE_CARET-1 ) return SRV_EVENT_CREATE; + if ( Event <= EVENT_CONSOLE_END_APPLICATION ) return SRV_EVENT_END_APPLICATION; + if ( Event != EVENT_OBJECT_FOCUS ) return SRV_EVENT_CREATE; + } + return Ret; +} /* create a new hook table */ static PHOOKTABLE @@ -485,16 +522,16 @@ END_CLEANUP; } -DWORD +HHOOK STDCALL NtUserSetWindowsHookAW( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; + int idHook, + HOOKPROC lpfn, + BOOL Ansi) +{ + UNICODE_STRING USModuleName; + RtlInitUnicodeString(&USModuleName, NULL); + return NtUserSetWindowsHookEx(NULL, &USModuleName, 0, idHook, lpfn, Ansi); } HHOOK @@ -709,6 +746,9 @@ DWORD idThread, UINT dwflags) { + + Bogus_SrvEventActivity |= GetMaskFromEvent(eventMin); // Fake it out for now. + Bogus_SrvEventActivity &= ~GetMaskFromEvent(eventMin); UNIMPLEMENTED return 0;

1 0

[greatlrd] 32930: fixed a spelling error for NtGdiSelectBitmap thx Caemyr notes it and testing on win2k3
by greatlrd＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: greatlrd Date: Sat Apr 12 14:56:09 2008 New Revision: 32930 URL: http://svn.reactos.org/svn/reactos?rev=32930&view=rev Log: fixed a spelling error for NtGdiSelectBitmap thx Caemyr notes it and testing on win2k3 Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S [iso-8859-1] Sat Apr 12 14:56:09 2008 @@ -1800,8 +1800,8 @@ call *(%ecx) ret $0x18 -.global _GreSelectBitmap@8 -_GreSelectBitmap@8: +.global _NtGdiSelectBitmap@8 +_NtGdiSelectBitmap@8: movl $0x1100, %eax movl $KUSER_SHARED_SYSCALL, %ecx call *(%ecx) Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def [iso-8859-1] Sat Apr 12 14:56:09 2008 @@ -263,7 +263,7 @@ NtGdiSaveDC@4 NtGdiScaleViewportExtEx@24 NtGdiScaleWindowExtEx@24 -GreSelectBitmap@8 +NtGdiSelectBitmap@8 NtGdiSelectBrush@8 NtGdiSelectClipPath@8 NtGdiSelectFont@8

1 0

[greatlrd] 32929: adding flag translations for allot different value for D3DNTHAL_CALLBACKS so human brain does not need doing binary calc to known which flag are set.
by greatlrd＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: greatlrd Date: Sat Apr 12 14:24:31 2008 New Revision: 32929 URL: http://svn.reactos.org/svn/reactos?rev=32929&view=rev Log: adding flag translations for allot different value for D3DNTHAL_CALLBACKS so human brain does not need doing binary calc to known which flag are set. Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/dump.c trunk/rostests/dxtest/win32kdxtest/test.h Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sat Apr 12 14:24:31 2008 @@ -285,7 +285,7 @@ dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...)"); dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...)"); dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...)"); - /* FIXME dump puD3dDriverData */ + dump_D3dDriverData(puD3dDriverData,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...)"); } /* testing OsThunkDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, NULL, */ @@ -338,7 +338,7 @@ dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); - /* FIXME dump puD3dDriverData */ + dump_D3dDriverData(puD3dDriverData, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); /* FIXME dump D3dBufferCallbacks */ } Modified: trunk/rostests/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] Sat Apr 12 14:24:31 2008 @@ -8,6 +8,12 @@ #include <d3dnthal.h> #include "test.h" + +/* this flag are only set for dx5 and lower but we need check see if we getting it back from win32k or not */ +#define D3DLIGHTCAPS_GLSPOT 0x00000010 + +/* this flag are only set for dx6 and lower but we need check see if we getting it back from win32k or not */ +#define D3DLIGHTCAPS_PARALLELPOINT 0x00000008 #define checkflag(dwflag,dwvalue,text) \ if (dwflag & dwvalue) \ @@ -191,8 +197,7 @@ int t; UINT flag; INT count=0; - // LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData; - + printf("DD_HALINFO Version NT 2000/XP/2003 found \n"); printf(" pHalInfo->dwSize : 0x%08lx\n",(long)pHalInfo->dwSize); @@ -467,41 +472,41 @@ printf("dumping the D3DNTHAL_CALLBACKS from %s\n",text); if (puD3dCallbacks->dwSize == sizeof(D3DNTHAL_CALLBACKS)) { - printf(" puD3dCallbacks->dwSize : 0x%08lx\n",(long)puD3dCallbacks->dwSize); - printf(" puD3dCallbacks->ContextCreate : 0x%08lx\n",(long)puD3dCallbacks->ContextCreate); - printf(" puD3dCallbacks->ContextDestroy : 0x%08lx\n",(long)puD3dCallbacks->ContextDestroy); - printf(" puD3dCallbacks->ContextDestroyAll : 0x%08lx\n",(long)puD3dCallbacks->ContextDestroyAll); - printf(" puD3dCallbacks->SceneCapture : 0x%08lx\n",(long)puD3dCallbacks->SceneCapture); - printf(" puD3dCallbacks->dwReserved10 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved10); - printf(" puD3dCallbacks->dwReserved11 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved11); - printf(" puD3dCallbacks->dwReserved22 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved22); - printf(" puD3dCallbacks->dwReserved23 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved23); - printf(" puD3dCallbacks->dwReserved : 0x%08lx\n",(long)puD3dCallbacks->dwReserved); - printf(" puD3dCallbacks->TextureCreate : 0x%08lx\n",(long)puD3dCallbacks->TextureCreate); - printf(" puD3dCallbacks->TextureDestroy : 0x%08lx\n",(long)puD3dCallbacks->TextureDestroy); - printf(" puD3dCallbacks->TextureSwap : 0x%08lx\n",(long)puD3dCallbacks->TextureSwap); - printf(" puD3dCallbacks->TextureGetSurf : 0x%08lx\n",(long)puD3dCallbacks->TextureGetSurf); - printf(" puD3dCallbacks->dwReserved12 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved12); - printf(" puD3dCallbacks->dwReserved13 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved13); - printf(" puD3dCallbacks->dwReserved14 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved14); - printf(" puD3dCallbacks->dwReserved15 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved15); - printf(" puD3dCallbacks->dwReserved16 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved16); - printf(" puD3dCallbacks->dwReserved17 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved17); - printf(" puD3dCallbacks->dwReserved18 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved18); - printf(" puD3dCallbacks->dwReserved19 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved19); - printf(" puD3dCallbacks->dwReserved20 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved20); - printf(" puD3dCallbacks->dwReserved21 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved21); - printf(" puD3dCallbacks->dwReserved24 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved24); - printf(" puD3dCallbacks->dwReserved0 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved0); - printf(" puD3dCallbacks->dwReserved1 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved1); - printf(" puD3dCallbacks->dwReserved2 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved2); - printf(" puD3dCallbacks->dwReserved3 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved3); - printf(" puD3dCallbacks->dwReserved4 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved4); - printf(" puD3dCallbacks->dwReserved5 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved5); - printf(" puD3dCallbacks->dwReserved6 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved6); - printf(" puD3dCallbacks->dwReserved7 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved7); - printf(" puD3dCallbacks->dwReserved8 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved8); - printf(" puD3dCallbacks->dwReserved9 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved9); + printf(" puD3dCallbacks->dwSize : 0x%08lx\n",(long)puD3dCallbacks->dwSize); + printf(" puD3dCallbacks->ContextCreate : 0x%08lx\n",(long)puD3dCallbacks->ContextCreate); + printf(" puD3dCallbacks->ContextDestroy : 0x%08lx\n",(long)puD3dCallbacks->ContextDestroy); + printf(" puD3dCallbacks->ContextDestroyAll : 0x%08lx\n",(long)puD3dCallbacks->ContextDestroyAll); + printf(" puD3dCallbacks->SceneCapture : 0x%08lx\n",(long)puD3dCallbacks->SceneCapture); + printf(" puD3dCallbacks->dwReserved10 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved10); + printf(" puD3dCallbacks->dwReserved11 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved11); + printf(" puD3dCallbacks->dwReserved22 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved22); + printf(" puD3dCallbacks->dwReserved23 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved23); + printf(" puD3dCallbacks->dwReserved : 0x%08lx\n",(long)puD3dCallbacks->dwReserved); + printf(" puD3dCallbacks->TextureCreate : 0x%08lx\n",(long)puD3dCallbacks->TextureCreate); + printf(" puD3dCallbacks->TextureDestroy : 0x%08lx\n",(long)puD3dCallbacks->TextureDestroy); + printf(" puD3dCallbacks->TextureSwap : 0x%08lx\n",(long)puD3dCallbacks->TextureSwap); + printf(" puD3dCallbacks->TextureGetSurf : 0x%08lx\n",(long)puD3dCallbacks->TextureGetSurf); + printf(" puD3dCallbacks->dwReserved12 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved12); + printf(" puD3dCallbacks->dwReserved13 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved13); + printf(" puD3dCallbacks->dwReserved14 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved14); + printf(" puD3dCallbacks->dwReserved15 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved15); + printf(" puD3dCallbacks->dwReserved16 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved16); + printf(" puD3dCallbacks->dwReserved17 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved17); + printf(" puD3dCallbacks->dwReserved18 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved18); + printf(" puD3dCallbacks->dwReserved19 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved19); + printf(" puD3dCallbacks->dwReserved20 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved20); + printf(" puD3dCallbacks->dwReserved21 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved21); + printf(" puD3dCallbacks->dwReserved24 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved24); + printf(" puD3dCallbacks->dwReserved0 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved0); + printf(" puD3dCallbacks->dwReserved1 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved1); + printf(" puD3dCallbacks->dwReserved2 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved2); + printf(" puD3dCallbacks->dwReserved3 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved3); + printf(" puD3dCallbacks->dwReserved4 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved4); + printf(" puD3dCallbacks->dwReserved5 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved5); + printf(" puD3dCallbacks->dwReserved6 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved6); + printf(" puD3dCallbacks->dwReserved7 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved7); + printf(" puD3dCallbacks->dwReserved8 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved8); + printf(" puD3dCallbacks->dwReserved9 : 0x%08lx\n",(long)puD3dCallbacks->dwReserved9); } else { @@ -510,4 +515,207 @@ } - +void +dump_D3dDriverData(D3DNTHAL_GLOBALDRIVERDATA *puD3dDriverData, char *text) +{ + UINT flag = 0; + INT count = 0; + + printf("dumping the D3DNTHAL_GLOBALDRIVERDATA from %s\n",text); + if (puD3dDriverData->dwSize == sizeof(D3DNTHAL_GLOBALDRIVERDATA)) + { + printf(" puD3dDriverData->dwSize : 0x%08lx\n",(long)puD3dDriverData->dwSize); + if (puD3dDriverData->hwCaps.dwSize == sizeof(D3DNTHALDEVICEDESC_V1)) + { + printf(" puD3dDriverData->hwCaps.dwSize : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dwSize); + printf(" puD3dDriverData->hwCaps.dwFlags : "); + + flag = puD3dDriverData->hwCaps.dwFlags; + checkflag(flag,D3DDD_BCLIPPING,"D3DDD_BCLIPPING"); + checkflag(flag,D3DDD_COLORMODEL,"D3DDD_COLORMODEL"); + checkflag(flag,D3DDD_DEVCAPS,"D3DDD_DEVCAPS"); + checkflag(flag,D3DDD_DEVICERENDERBITDEPTH,"D3DDD_DEVICERENDERBITDEPTH"); + checkflag(flag,D3DDD_DEVICEZBUFFERBITDEPTH,"D3DDD_DEVICEZBUFFERBITDEPTH"); + checkflag(flag,D3DDD_LIGHTINGCAPS,"D3DDD_LIGHTINGCAPS"); + checkflag(flag,D3DDD_LINECAPS,"D3DDD_LINECAPS"); + checkflag(flag,D3DDD_MAXBUFFERSIZE,"D3DDD_MAXBUFFERSIZE"); + checkflag(flag,D3DDD_MAXVERTEXCOUNT,"D3DDD_MAXVERTEXCOUNT"); + checkflag(flag,D3DDD_TRANSFORMCAPS,"D3DDD_TRANSFORMCAPS"); + checkflag(flag,D3DDD_TRICAPS,"D3DDD_TRICAPS"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dwFlags "); + + printf(" puD3dDriverData->hwCaps.dcmColorModel : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dcmColorModel); + printf(" puD3dDriverData->hwCaps.dwDevCaps : "); + + count = 0; + flag = puD3dDriverData->hwCaps.dwDevCaps; + checkflag(flag,D3DDEVCAPS_CANBLTSYSTONONLOCAL,"D3DDEVCAPS_CANBLTSYSTONONLOCAL"); + checkflag(flag,D3DDEVCAPS_CANRENDERAFTERFLIP,"D3DDEVCAPS_CANRENDERAFTERFLIP"); + checkflag(flag,D3DDEVCAPS_DRAWPRIMITIVES2,"D3DDEVCAPS_DRAWPRIMITIVES2"); + checkflag(flag,D3DDEVCAPS_DRAWPRIMITIVES2EX,"D3DDEVCAPS_DRAWPRIMITIVES2EX"); + checkflag(flag,D3DDEVCAPS_DRAWPRIMTLVERTEX,"D3DDEVCAPS_DRAWPRIMTLVERTEX"); + checkflag(flag,D3DDEVCAPS_EXECUTESYSTEMMEMORY,"D3DDEVCAPS_EXECUTESYSTEMMEMORY"); + checkflag(flag,D3DDEVCAPS_EXECUTEVIDEOMEMORY,"D3DDEVCAPS_EXECUTEVIDEOMEMORY"); + checkflag(flag,D3DDEVCAPS_FLOATTLVERTEX,"D3DDEVCAPS_FLOATTLVERTEX"); + checkflag(flag,D3DDEVCAPS_HWRASTERIZATION,"D3DDEVCAPS_HWRASTERIZATION"); + checkflag(flag,D3DDEVCAPS_HWTRANSFORMANDLIGHT,"D3DDEVCAPS_HWTRANSFORMANDLIGHT"); + checkflag(flag,D3DDEVCAPS_SEPARATETEXTUREMEMORIES,"D3DDEVCAPS_SEPARATETEXTUREMEMORIES"); + checkflag(flag,D3DDEVCAPS_SORTDECREASINGZ,"D3DDEVCAPS_SORTDECREASINGZ"); + checkflag(flag,D3DDEVCAPS_SORTEXACT,"D3DDEVCAPS_SORTEXACT"); + checkflag(flag,D3DDEVCAPS_SORTINCREASINGZ,"D3DDEVCAPS_SORTINCREASINGZ"); + // not in ddk or dxsdk I have but it is msdn checkflag(flag,D3DDEVCAPS_TEXTURENONLOCALVIDEOMEMORY,"D3DDEVCAPS_TEXTURENONLOCALVIDEOMEMORY"); + checkflag(flag,D3DDEVCAPS_TLVERTEXSYSTEMMEMORY,"D3DDEVCAPS_TLVERTEXSYSTEMMEMORY"); + checkflag(flag,D3DDEVCAPS_TLVERTEXVIDEOMEMORY,"D3DDEVCAPS_TLVERTEXVIDEOMEMORY"); + checkflag(flag,D3DDEVCAPS_TEXTURESYSTEMMEMORY,"D3DDEVCAPS_TEXTURESYSTEMMEMORY"); + checkflag(flag,D3DDEVCAPS_TEXTUREVIDEOMEMORY,"D3DDEVCAPS_TEXTUREVIDEOMEMORY"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dwDevCaps"); + + if (puD3dDriverData->hwCaps.dtcTransformCaps.dwSize == sizeof(D3DTRANSFORMCAPS)) + { + printf(" puD3dDriverData->hwCaps.dtcTransformCaps.dwSize : 0x%08lx\n",(long) puD3dDriverData->hwCaps.dtcTransformCaps.dwSize); + printf(" puD3dDriverData->hwCaps.dtcTransformCaps.dwCaps : "); + + count = 0; + flag = puD3dDriverData->hwCaps.dtcTransformCaps.dwCaps; + checkflag(flag,D3DTRANSFORMCAPS_CLIP,"D3DTRANSFORMCAPS_CLIP"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dtcTransformCaps.dwCaps"); + } + else + { + printf("none puD3dDriverData->hwCaps.dtcTransformCaps.dwSize from the driver 0x%08lx\n",puD3dDriverData->hwCaps.dtcTransformCaps.dwSize); + } + + if (puD3dDriverData->hwCaps.dlcLightingCaps.dwSize == sizeof(D3DLIGHTINGCAPS)) + { + printf(" puD3dDriverData->hwCaps.dlcLightingCaps.dwSize : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dlcLightingCaps.dwSize); + printf(" puD3dDriverData->hwCaps.dlcLightingCaps.dwCaps : "); + + count = 0; + flag = puD3dDriverData->hwCaps.dlcLightingCaps.dwCaps; + + checkflag(flag,D3DLIGHTCAPS_DIRECTIONAL,"D3DLIGHTCAPS_DIRECTIONAL"); + checkflag(flag,D3DLIGHTCAPS_GLSPOT,"D3DLIGHTCAPS_GLSPOT"); + checkflag(flag,D3DLIGHTCAPS_PARALLELPOINT,"D3DLIGHTCAPS_PARALLELPOINT"); + checkflag(flag,D3DLIGHTCAPS_POINT,"D3DLIGHTCAPS_POINT"); + checkflag(flag,D3DLIGHTCAPS_SPOT,"D3DLIGHTCAPS_SPOT"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dlcLightingCaps.dwCaps"); + + printf(" puD3dDriverData->hwCaps.dlcLightingCaps.dwLightingModel : "); + + count = 0; + flag = puD3dDriverData->hwCaps.dlcLightingCaps.dwLightingModel; + + checkflag(flag,D3DLIGHTINGMODEL_MONO,"D3DLIGHTINGMODEL_MONO"); + checkflag(flag,D3DLIGHTINGMODEL_RGB,"D3DLIGHTINGMODEL_RGB"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dlcLightingCaps.dwLightingModel"); + + printf(" puD3dDriverData->hwCaps.dlcLightingCaps.dwNumLights : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dlcLightingCaps.dwNumLights); + } + else + { + printf("none puD3dDriverData->hwCaps.dlcLightingCaps.dwSize from the driver 0x%08lx\n",puD3dDriverData->hwCaps.dlcLightingCaps.dwSize); + } + + + if (puD3dDriverData->hwCaps.dpcLineCaps.dwSize == sizeof(D3DPRIMCAPS)) + { + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwSize : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwSize); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwMiscCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwMiscCaps; + checkflag(flag,D3DPMISCCAPS_CONFORMANT,"D3DPMISCCAPS_CONFORMANT"); + checkflag(flag,D3DPMISCCAPS_CULLCCW,"D3DPMISCCAPS_CULLCCW"); + checkflag(flag,D3DPMISCCAPS_CULLCW,"D3DPMISCCAPS_CULLCW"); + checkflag(flag,D3DPMISCCAPS_CULLNONE,"D3DPMISCCAPS_CULLNONE"); + checkflag(flag,D3DPMISCCAPS_LINEPATTERNREP,"D3DPMISCCAPS_LINEPATTERNREP"); + checkflag(flag,D3DPMISCCAPS_MASKPLANES,"D3DPMISCCAPS_MASKPLANES"); + checkflag(flag,D3DPMISCCAPS_MASKZ,"D3DPMISCCAPS_MASKZ"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwMiscCaps"); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwRasterCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwRasterCaps; + checkflag(flag,D3DPRASTERCAPS_ANISOTROPY,"D3DPRASTERCAPS_ANISOTROPY"); + checkflag(flag,D3DPRASTERCAPS_ANTIALIASEDGES,"D3DPRASTERCAPS_ANTIALIASEDGES"); + checkflag(flag,D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT,"D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT"); + checkflag(flag,D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT,"D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT"); + checkflag(flag,D3DPRASTERCAPS_DITHER,"D3DPRASTERCAPS_DITHER"); + checkflag(flag,D3DPRASTERCAPS_FOGRANGE,"D3DPRASTERCAPS_FOGRANGE"); + checkflag(flag,D3DPRASTERCAPS_FOGTABLE,"D3DPRASTERCAPS_FOGTABLE"); + checkflag(flag,D3DPRASTERCAPS_FOGVERTEX,"D3DPRASTERCAPS_FOGVERTEX"); + checkflag(flag,D3DPRASTERCAPS_PAT,"D3DPRASTERCAPS_PAT"); + checkflag(flag,D3DPRASTERCAPS_ROP2,"D3DPRASTERCAPS_ROP2"); + checkflag(flag,D3DPRASTERCAPS_STIPPLE,"D3DPRASTERCAPS_STIPPLE"); + checkflag(flag,D3DPRASTERCAPS_SUBPIXEL,"D3DPRASTERCAPS_SUBPIXEL"); + checkflag(flag,D3DPRASTERCAPS_SUBPIXELX,"D3DPRASTERCAPS_SUBPIXELX"); + checkflag(flag,D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT,"D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT"); + checkflag(flag,D3DPRASTERCAPS_WBUFFER,"D3DPRASTERCAPS_WBUFFER"); + checkflag(flag,D3DPRASTERCAPS_WFOG,"D3DPRASTERCAPS_WFOG"); + checkflag(flag,D3DPRASTERCAPS_XOR,"D3DPRASTERCAPS_XOR"); + checkflag(flag,D3DPRASTERCAPS_ZBIAS,"D3DPRASTERCAPS_ZBIAS"); + checkflag(flag,D3DPRASTERCAPS_ZBUFFERLESSHSR,"D3DPRASTERCAPS_ZBUFFERLESSHSR"); + checkflag(flag,D3DPRASTERCAPS_ZFOG,"D3DPRASTERCAPS_ZFOG"); + checkflag(flag,D3DPRASTERCAPS_ZTEST,"D3DPRASTERCAPS_ZTEST"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwRasterCaps"); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwZCmpCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwZCmpCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwSrcBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwSrcBlendCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwDestBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwDestBlendCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwAlphaCmpCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwAlphaCmpCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwShadeCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwShadeCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwTextureCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureFilterCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwTextureFilterCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwTextureBlendCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureAddressCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwTextureAddressCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwStippleWidth : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwStippleWidth); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwStippleHeight : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwStippleHeight); + } + else + { + printf("none puD3dDriverData->hwCaps.dpcLineCaps.dwSize from the driver 0x%08lx\n",puD3dDriverData->hwCaps.dpcLineCaps.dwSize); + } + + if (puD3dDriverData->hwCaps.dpcTriCaps.dwSize == sizeof(D3DPRIMCAPS)) + { + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwSize : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwSize); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwMiscCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwMiscCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwRasterCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwRasterCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwZCmpCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwZCmpCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwSrcBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwSrcBlendCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwDestBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwDestBlendCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwAlphaCmpCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwAlphaCmpCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwShadeCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwShadeCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwTextureCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureFilterCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwTextureFilterCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwTextureBlendCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureAddressCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwTextureAddressCaps); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwStippleWidth : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwStippleWidth); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwStippleHeight : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwStippleHeight); + } + else + { + printf("none puD3dDriverData->hwCaps.dpcTriCaps.dwSize from the driver 0x%08lx\n",puD3dDriverData->hwCaps.dpcTriCaps.dwSize); + } + + printf(" puD3dDriverData->hwCaps.dwDeviceRenderBitDepth : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dwDeviceRenderBitDepth); + printf(" puD3dDriverData->hwCaps.dwDeviceZBufferBitDepth : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dwDeviceZBufferBitDepth); + printf(" puD3dDriverData->hwCaps.dwMaxBufferSize : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dwMaxBufferSize); + printf(" puD3dDriverData->hwCaps.dwMaxVertexCount : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dwMaxVertexCount); + } + else + { + printf("none puD3dDriverData->hwCaps.dwSize from the driver 0x%08lx\n",puD3dDriverData->hwCaps.dwSize); + } + + printf(" puD3dDriverData->dwNumVertices : 0x%08lx\n",(long)puD3dDriverData->dwNumVertices); + printf(" puD3dDriverData->dwNumClipVertices : 0x%08lx\n",(long)puD3dDriverData->dwNumClipVertices); + printf(" puD3dDriverData->dwNumTextureFormats : 0x%08lx\n",(long)puD3dDriverData->dwNumTextureFormats); + printf(" puD3dDriverData->lpTextureFormats : 0x%08lx\n",(long)puD3dDriverData->lpTextureFormats); + printf(" puD3dDriverData->lpTextureFormats : 0x%08lx\n",(long)puD3dDriverData->lpTextureFormats); + } + else + { + printf("none puD3dDriverData from the driver 0x%08lx\n",puD3dDriverData->dwSize); + } +} Modified: trunk/rostests/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/test.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] Sat Apr 12 14:24:31 2008 @@ -11,6 +11,7 @@ void dump_halinfo(DD_HALINFO *pHalInfo, char *text); void dump_CallBackFlags(DWORD *pCallBackFlags, char *text); void dump_D3dCallbacks(D3DNTHAL_CALLBACKS *puD3dCallbacks, char *text); +void dump_D3dDriverData(D3DNTHAL_GLOBALDRIVERDATA *puD3dDriverData, char *text);

1 0

[jimtabor] 32928: More work on hooks.
by jimtabor＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: jimtabor Date: Sat Apr 12 14:19:30 2008 New Revision: 32928 URL: http://svn.reactos.org/svn/reactos?rev=32928&view=rev Log: More work on hooks. Modified: trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Sat Apr 12 14:19:30 2008 @@ -691,7 +691,7 @@ TranslateMDISysAccel@8 TranslateMessage@4 TranslateMessageEx@8 -UnhookWinEvent@4 +UnhookWinEvent@4=NtUserUnhookWinEvent@4 UnhookWindowsHook@8 UnhookWindowsHookEx@4 UnionRect@12 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] Sat Apr 12 14:19:30 2008 @@ -211,14 +211,13 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL UnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc ) { - UNIMPLEMENTED; - return FALSE; + return NtUserCallTwoParam(nCode, (DWORD)pfnFilterProc, TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK); } /* @@ -233,11 +232,11 @@ LONG idChild ) { - UNIMPLEMENTED; -} - -/* - * @unimplemented + NtUserNotifyWinEvent(event, hwnd, idObject, idChild); +} + +/* + * @implemented */ HWINEVENTHOOK STDCALL @@ -251,19 +250,30 @@ UINT dwFlags ) { - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -UnhookWinEvent ( HWINEVENTHOOK hWinEventHook ) -{ - UNIMPLEMENTED; - return FALSE; + WCHAR ModuleName[MAX_PATH]; + UNICODE_STRING USModuleName; + + if ((hmodWinEventProc != NULL) && (dwFlags & WINEVENT_INCONTEXT)) + { + if (0 == GetModuleFileNameW(hmodWinEventProc, ModuleName, MAX_PATH)) + { + return NULL; + } + RtlInitUnicodeString(&USModuleName, ModuleName); + } + else + { + RtlInitUnicodeString(&USModuleName, NULL); + } + + return NtUserSetWinEventHook(eventMin, + eventMax, + hmodWinEventProc, + &USModuleName, + pfnWinEventProc, + idProcess, + idThread, + dwFlags); } /* @@ -274,10 +284,11 @@ IsWinEventHookInstalled( DWORD event) { - UNIMPLEMENTED; + if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) + { + } return FALSE; } - /* * @unimplemented Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Apr 12 14:19:30 2008 @@ -2233,7 +2233,7 @@ WORD NTAPI NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewVal); -DWORD +HWINEVENTHOOK NTAPI NtUserSetWinEventHook( UINT eventMin, @@ -2330,7 +2330,7 @@ DWORD NTAPI NtUserUnhookWinEvent( - DWORD Unknown0); + HWINEVENTHOOK hWinEventHook); BOOL NTAPI 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] Sat Apr 12 14:19:30 2008 @@ -697,7 +697,7 @@ END_CLEANUP; } -DWORD +HWINEVENTHOOK STDCALL NtUserSetWinEventHook( UINT eventMin, @@ -765,7 +765,7 @@ DWORD STDCALL NtUserUnhookWinEvent( - DWORD Unknown0) + HWINEVENTHOOK hWinEventHook) { UNIMPLEMENTED

1 0

[greatlrd] 32927: remove RTEST(pHalInfo->vmiData.fpPrimary != 0 ); for this test was wrong for it is can be zero cleanup some other part and adding few other as well
by greatlrd＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: greatlrd Date: Sat Apr 12 13:21:41 2008 New Revision: 32927 URL: http://svn.reactos.org/svn/reactos?rev=32927&view=rev Log: remove RTEST(pHalInfo->vmiData.fpPrimary != 0 ); for this test was wrong for it is can be zero cleanup some other part and adding few other as well Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sat Apr 12 13:21:41 2008 @@ -128,7 +128,8 @@ if (pHalInfo->dwSize == sizeof(DD_HALINFO)) { /*the offset, in bytes, to primary surface in the display memory */ - RTEST(pHalInfo->vmiData.fpPrimary != 0 ); + /* some graphic card like sis 760 GX, Nvida GF7900GS does not set any offset at all */ + // RTEST(pHalInfo->vmiData.fpPrimary != 0 ); /* unsuse always 0 */ RTEST(pHalInfo->vmiData.dwFlags == 0 ); @@ -188,6 +189,8 @@ /* Test see if we got any hardware acclartions for 2d or 3d, this always fill in * that mean we found a bugi drv and dx does not work on this drv */ + + /* the SIS 760 GX will never fill it in, it is a bugi drv */ RTEST(pHalInfo->ddCaps.dwSize == sizeof(DDCORECAPS)); /* Testing see if we got any hw support for @@ -285,7 +288,15 @@ * if it windows 2000 or windows xp/2003 */ RTEST(puD3dCallbacks->dwSize == sizeof(D3DNTHAL_CALLBACKS)); + + /* Nivda like GF7900GS will not follow ms design rule here, + * ContextDestroyAll must alwyas be NULL for it is not longer inuse in windows 2000 and higher + */ RTEST(puD3dCallbacks->ContextDestroyAll == NULL); + + /* Nivda like GF7900GS will not follow ms design rule here, + * SceneCapture must alwyas be NULL for it is not longer inuse in windows 2000 and higher + */ RTEST(puD3dCallbacks->SceneCapture == NULL); RTEST(puD3dCallbacks->dwReserved10 == 0); RTEST(puD3dCallbacks->dwReserved11 == 0); @@ -341,7 +352,7 @@ RtlCopyMemory(&oldD3dCallbacks, &D3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)); -/* Next Start 4 */ +/* testing NtGdiDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, */ pHalInfo = &HalInfo; pCallBackFlags = CallBackFlags; puD3dCallbacks = &D3dCallbacks; @@ -358,13 +369,16 @@ puvmList, puNumFourCC, puFourCC)== FALSE); RTEST(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); + RTEST(pCallBackFlags != NULL); - - if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) - { - RTEST(puD3dCallbacks != NULL); - RTEST(puD3dDriverData != NULL); - } + ASSERT(pCallBackFlags != NULL); + + RTEST(puD3dCallbacks != NULL); + ASSERT(puD3dCallbacks != NULL); + + RTEST(puD3dDriverData != NULL); + ASSERT(puD3dDriverData != NULL); RTEST(puD3dBufferCallbacks == NULL); RTEST(puD3dTextureFormats == NULL); @@ -372,15 +386,17 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[1] != 0); - - /* NT4 this will fail */ RTEST(pCallBackFlags[2] == 0); + + /* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */ + RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); + + /* start test of puD3dDriverData */ /* Next Start 5 */ pHalInfo = &HalInfo; @@ -422,9 +438,10 @@ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[1] != 0); - - /* NT4 this will fail */ RTEST(pCallBackFlags[2] == 0); + + /* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */ + RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); /* Next Start 6 */ pHalInfo = &HalInfo; @@ -466,9 +483,11 @@ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[1] != 0); - - /* NT4 this will fail */ RTEST(pCallBackFlags[2] == 0); + + /* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */ + RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); + /* Next Start 7 */ pHalInfo = &HalInfo; @@ -524,9 +543,10 @@ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[1] != 0); - - /* NT4 this will fail */ RTEST(pCallBackFlags[2] == 0); + + /* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */ + RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0);

1 0

[jimtabor] 32926: Patch by Yury Sidorov, jusid <jura@cp-lab.com>. EnumThreadWindows should enumerate all nonchild windows associated with a thread according to MSDN docs. Currently it enumerates all windows.
by jimtabor＠svn.reactos.org 12 Apr '08

12 Apr '08

Author: jimtabor Date: Sat Apr 12 13:21:00 2008 New Revision: 32926 URL: http://svn.reactos.org/svn/reactos?rev=32926&view=rev Log: Patch by Yury Sidorov, jusid <jura(a)cp-lab.com>. EnumThreadWindows should enumerate all nonchild windows associated with a thread according to MSDN docs. Currently it enumerates all windows. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Apr 12 13:21:00 2008 @@ -1336,16 +1336,19 @@ Window = CONTAINING_RECORD(Current, WINDOW_OBJECT, ThreadListEntry); ASSERT(Window); - if(dwCount < nBufSize && pWnd) + if(bChildren || Window->hOwner != NULL) { - Status = MmCopyToCaller(pWnd++, &Window->hSelf, sizeof(HWND)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - break; - } + if(dwCount < nBufSize && pWnd) + { + Status = MmCopyToCaller(pWnd++, &Window->hSelf, sizeof(HWND)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + break; + } + } + dwCount++; } - dwCount++; Current = Current->Flink; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs