Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[tkreuzer] 41047: Get rid of deprectaed LargeInteger functions and use native int64 math instead.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 23 03:52:52 2009 New Revision: 41047 URL: http://svn.reactos.org/svn/reactos?rev=41047&view=rev Log: Get rid of deprectaed LargeInteger functions and use native int64 math instead. Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat May 23 03:52:52 2009 @@ -17,12 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define LARGEINT_PROTOS -#define LargeIntegerDivide RtlLargeIntegerDivide -#define ExtendedIntegerMultiply RtlExtendedIntegerMultiply -#define ConvertUlongToLargeInteger RtlConvertUlongToLargeInteger -#define LargeIntegerSubtract RtlLargeIntegerSubtract #define MAX_PROPERTY_SHEET_PAGE 32 #define WIN32_NO_STATUS @@ -33,7 +27,6 @@ #include <windows.h> #include <ndk/ntndk.h> #include <fmifs/fmifs.h> -#include <largeint.h> #include <precomp.h> @@ -294,20 +287,21 @@ LARGE_INTEGER GetFreeBytesShare(LARGE_INTEGER TotalNumberOfFreeBytes, LARGE_INTEGER TotalNumberOfBytes) { - LARGE_INTEGER Temp, Result, Remainder; + LARGE_INTEGER Temp, Result; if (TotalNumberOfFreeBytes.QuadPart == 0LL) { - return ConvertUlongToLargeInteger(0); + Result.QuadPart = 1; + return Result; } - Temp = LargeIntegerDivide(TotalNumberOfBytes, ConvertUlongToLargeInteger(100), &Remainder); + Temp.QuadPart = TotalNumberOfBytes.QuadPart / 100; if (Temp.QuadPart >= TotalNumberOfFreeBytes.QuadPart) { - Result = ConvertUlongToLargeInteger(1); + Result.QuadPart = 1; }else { - Result = LargeIntegerDivide(TotalNumberOfFreeBytes, Temp, &Remainder); + Result.QuadPart = TotalNumberOfFreeBytes.QuadPart / Temp.QuadPart; } return Result; @@ -431,7 +425,7 @@ swprintf(szResult, L"%02d%%", Result.QuadPart); SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); /* store used share amount */ - Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result); + Result.QuadPart = 100 - Result.QuadPart; swprintf(szResult, L"%02d%%", Result.QuadPart); SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)))

15 years, 7 months

[tkreuzer] 41046: #if out an unused static funtion. Don't know if it's still useful. Ged?

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 23 02:17:55 2009 New Revision: 41046 URL: http://svn.reactos.org/svn/reactos?rev=41046&view=rev Log: #if out an unused static funtion. Don't know if it's still useful. Ged? Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Sat May 23 02:17:55 2009 @@ -50,6 +50,7 @@ return TreeView_InsertItem(hTreeView, &tvins); } +#if 0 // FIXME: What is this good for? static VOID AddServiceDependency(PSERVICEPROPSHEET dlgInfo, HWND hTreeView, @@ -123,6 +124,7 @@ } } +#endif static VOID AddServiceDependent(HWND hTreeView,

15 years, 7 months

[tkreuzer] 41045: commdlg.h: fix and update definition of OPENFILENAMEAW

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 23 02:04:18 2009 New Revision: 41045 URL: http://svn.reactos.org/svn/reactos?rev=41045&view=rev Log: commdlg.h: fix and update definition of OPENFILENAMEAW Modified: branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] Sat May 23 02:04:18 2009 @@ -334,9 +334,18 @@ WORD nFileOffset; WORD nFileExtension; LPCSTR lpstrDefExt; - DWORD lCustData; + LPARAM lCustData; LPOFNHOOKPROC lpfnHook; LPCSTR lpTemplateName; +#ifdef _MAC + LPEDITMENU lpEditInfo; + LPCSTR lpstrPrompt; +#endif +#if (_WIN32_WINNT >= 0x0500) + void *pvReserved; + DWORD dwReserved; + DWORD FlagsEx; +#endif } OPENFILENAMEA,*LPOPENFILENAMEA; typedef struct tagOFNW { DWORD lStructSize; @@ -356,9 +365,18 @@ WORD nFileOffset; WORD nFileExtension; LPCWSTR lpstrDefExt; - DWORD lCustData; + LPARAM lCustData; LPOFNHOOKPROC lpfnHook; LPCWSTR lpTemplateName; +#ifdef _MAC + LPEDITMENU lpEditInfo; + LPCSTR lpstrPrompt; +#endif +#if (_WIN32_WINNT >= 0x0500) + void *pvReserved; + DWORD dwReserved; + DWORD FlagsEx; +#endif } OPENFILENAMEW,*LPOPENFILENAMEW; typedef struct _OFNOTIFYA { NMHDR hdr;

15 years, 7 months

[tkreuzer] 41044: Cast NULL to DWORD?

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 23 01:52:28 2009 New Revision: 41044 URL: http://svn.reactos.org/svn/reactos?rev=41044&view=rev Log: Cast NULL to DWORD? Modified: branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sat May 23 01:52:28 2009 @@ -633,7 +633,7 @@ &hKey)) return FALSE; - if (RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&gupp,sizeof(GLOBAL_USER_POWER_POLICY)) == ERROR_SUCCESS) + if (RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&gupp,sizeof(GLOBAL_USER_POWER_POLICY)) == ERROR_SUCCESS) { RegCloseKey(hKey); @@ -644,7 +644,7 @@ &hKey)) return FALSE; - if (RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&gmpp,sizeof(GLOBAL_MACHINE_POWER_POLICY)) == ERROR_SUCCESS) + if (RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&gmpp,sizeof(GLOBAL_MACHINE_POWER_POLICY)) == ERROR_SUCCESS) { RegCloseKey(hKey); return TRUE;

15 years, 7 months

[fireball] 41043: - Make ObReferenceObjectEx return the new ref count instead of old ref count. - Fix same bug ObDereferenceObjectEx. - Fix a typo in ObDereferenceObjectEx which resulted in ObpDeferObjectDeletion not being called when needed. Fixes missing object deletions in ObDereferenceObjectEx-using code (e.g. executive timers in reactos kernel). - Original problem found by http://www.reactos.org/forum/viewtopic.php?f=14&t=6969&p=59669, fixes inspired by the discussion too.

by fireball＠svn.reactos.org

Author: fireball Date: Fri May 22 21:19:27 2009 New Revision: 41043 URL: http://svn.reactos.org/svn/reactos?rev=41043&view=rev Log: - Make ObReferenceObjectEx return the new ref count instead of old ref count. - Fix same bug ObDereferenceObjectEx. - Fix a typo in ObDereferenceObjectEx which resulted in ObpDeferObjectDeletion not being called when needed. Fixes missing object deletions in ObDereferenceObjectEx-using code (e.g. executive timers in reactos kernel). - Original problem found by http://www.reactos.org/forum/viewtopic.php?f=14&t=6969&p=59669, fixes inspired by the discussion too. Modified: trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] Fri May 22 21:19:27 2009 @@ -80,7 +80,7 @@ /* Increment the reference count and return the count now */ return InterlockedExchangeAdd(&OBJECT_TO_OBJECT_HEADER(Object)-> PointerCount, - Count); + Count) + Count; } LONG @@ -95,8 +95,8 @@ Header = OBJECT_TO_OBJECT_HEADER(Object); /* Check whether the object can now be deleted. */ - NewCount = InterlockedExchangeAdd(&Header->PointerCount, -Count); - if (!Count) ObpDeferObjectDeletion(Header); + NewCount = InterlockedExchangeAdd(&Header->PointerCount, -Count) - Count; + if (!NewCount) ObpDeferObjectDeletion(Header); /* Return the current count */ return NewCount;

15 years, 7 months

[dgoette] 421: fix row colors for translations

by dgoette＠svn.reactos.org

Author: dgoette Date: Fri May 22 19:04:47 2009 New Revision: 421 URL: http://svn.reactos.org/svn/reactos?rev=421&view=rev Log: fix row colors for translations Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEntry… Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEntry… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEntry… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEntry… [iso-8859-1] Fri May 22 19:04:47 2009 @@ -108,7 +108,7 @@ echo '<view curpos="'.$page_offset.'" pagelimit="'.$this->page_limit.'" pagemax="'.$ptm_entries.'" tblcols="'.($this->column_list !== false ? '|'.$this->column_list.'|' : '').'" />'; // prepare for usage in loop - $stmt_trans=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, r.lang_id, r.datetime, r.user_id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id WHERE d.id = :data_id AND r.version > 0 AND r.lang_id = :lang AND r.archive = :archive LIMIT 1"); + $stmt_trans=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, r.lang_id, r.datetime, r.user_id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id WHERE d.id = :data_id AND r.status = 'stable' AND r.lang_id = :lang AND r.archive = :archive LIMIT 1"); $stmt_trans->bindParam('archive',$this->archive_mode,PDO::PARAM_BOOL); $stmt_trans->bindParam('lang',$this->translation_lang,PDO::PARAM_INT); $stmt_stext=&DBConnection::getInstance()->prepare("SELECT content FROM ".ROSCMST_STEXT." WHERE rev_id = :rev_id AND name = 'title' LIMIT 1"); @@ -185,7 +185,7 @@ } // translation already exists else { - if ($row['datetime'] > $translated_entry['datetime']) { + if (strtotime($row['datetime']) < strtotime($translated_entry['datetime'])) { $line_status = 'transg'; } else {

15 years, 7 months

[dchapyshev] 41042: - Formatting fix. No code change

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri May 22 16:50:31 2009 New Revision: 41042 URL: http://svn.reactos.org/svn/reactos?rev=41042&view=rev Log: - Formatting fix. No code change 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] Fri May 22 16:50:31 2009 @@ -22,145 +22,157 @@ /* create a new hook table */ -static PHOOKTABLE +static +PHOOKTABLE IntAllocHookTable(void) { - PHOOKTABLE Table; - UINT i; - - Table = ExAllocatePoolWithTag(PagedPool, sizeof(HOOKTABLE), TAG_HOOK); - if (NULL != Table) - { - for (i = 0; i < NB_HOOKS; i++) - { - InitializeListHead(&Table->Hooks[i]); - Table->Counts[i] = 0; - } - } - - return Table; -} - - -PHOOK FASTCALL IntGetHookObject(HHOOK hHook) -{ - PHOOK Hook; - - if (!hHook) - { - SetLastWin32Error(ERROR_INVALID_HOOK_HANDLE); - return NULL; - } - - Hook = (PHOOK)UserGetObject(gHandleTable, hHook, otHook); - if (!Hook) - { - SetLastWin32Error(ERROR_INVALID_HOOK_HANDLE); - return NULL; - } - - ASSERT(USER_BODY_TO_HEADER(Hook)->RefCount >= 0); - - USER_BODY_TO_HEADER(Hook)->RefCount++; - - return Hook; + PHOOKTABLE Table; + UINT i; + + Table = ExAllocatePoolWithTag(PagedPool, sizeof(HOOKTABLE), TAG_HOOK); + if (NULL != Table) + { + for (i = 0; i < NB_HOOKS; i++) + { + InitializeListHead(&Table->Hooks[i]); + Table->Counts[i] = 0; + } + } + + return Table; +} + + +PHOOK +FASTCALL +IntGetHookObject(HHOOK hHook) +{ + PHOOK Hook; + + if (!hHook) + { + SetLastWin32Error(ERROR_INVALID_HOOK_HANDLE); + return NULL; + } + + Hook = (PHOOK)UserGetObject(gHandleTable, hHook, otHook); + if (!Hook) + { + SetLastWin32Error(ERROR_INVALID_HOOK_HANDLE); + return NULL; + } + + ASSERT(USER_BODY_TO_HEADER(Hook)->RefCount >= 0); + + USER_BODY_TO_HEADER(Hook)->RefCount++; + + return Hook; } /* create a new hook and add it to the specified table */ -static PHOOK +static +PHOOK IntAddHook(PETHREAD Thread, int HookId, BOOLEAN Global, PWINSTATION_OBJECT WinStaObj) { - PTHREADINFO W32Thread; - PHOOK Hook; - PHOOKTABLE Table = Global ? GlobalHooks : MsqGetHooks(((PTHREADINFO)Thread->Tcb.Win32Thread)->MessageQueue); - HANDLE Handle; - - if (NULL == Table) - { - Table = IntAllocHookTable(); - if (NULL == Table) - { - return NULL; - } - if (Global) - { - GlobalHooks = Table; - } - else - { - MsqSetHooks(((PTHREADINFO)Thread->Tcb.Win32Thread)->MessageQueue, Table); - } - } - - Hook = UserCreateObject(gHandleTable, &Handle, otHook, sizeof(HOOK)); - if (NULL == Hook) - { - return NULL; - } - - Hook->Self = Handle; - Hook->Thread = Thread; - Hook->HookId = HookId; - - if (Thread) - { - W32Thread = ((PTHREADINFO)Thread->Tcb.Win32Thread); - ASSERT(W32Thread != NULL); - W32Thread->fsHooks |= HOOKID_TO_FLAG(HookId); - - GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; - - if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; - } - - RtlInitUnicodeString(&Hook->ModuleName, NULL); - - InsertHeadList(&Table->Hooks[HOOKID_TO_INDEX(HookId)], &Hook->Chain); - - return Hook; + PTHREADINFO W32Thread; + PHOOK Hook; + PHOOKTABLE Table = Global ? GlobalHooks : MsqGetHooks(((PTHREADINFO)Thread->Tcb.Win32Thread)->MessageQueue); + HANDLE Handle; + + if (NULL == Table) + { + Table = IntAllocHookTable(); + if (NULL == Table) + { + return NULL; + } + if (Global) + { + GlobalHooks = Table; + } + else + { + MsqSetHooks(((PTHREADINFO)Thread->Tcb.Win32Thread)->MessageQueue, Table); + } + } + + Hook = UserCreateObject(gHandleTable, &Handle, otHook, sizeof(HOOK)); + if (NULL == Hook) + { + return NULL; + } + + Hook->Self = Handle; + Hook->Thread = Thread; + Hook->HookId = HookId; + + if (Thread) + { + W32Thread = ((PTHREADINFO)Thread->Tcb.Win32Thread); + ASSERT(W32Thread != NULL); + W32Thread->fsHooks |= HOOKID_TO_FLAG(HookId); + + GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; + + if (W32Thread->ThreadInfo != NULL) + W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; + } + + RtlInitUnicodeString(&Hook->ModuleName, NULL); + + InsertHeadList(&Table->Hooks[HOOKID_TO_INDEX(HookId)], &Hook->Chain); + + return Hook; } /* get the hook table that a given hook belongs to */ -static PHOOKTABLE FASTCALL +static +PHOOKTABLE +FASTCALL IntGetTable(PHOOK Hook) { - if (NULL == Hook->Thread || WH_KEYBOARD_LL == Hook->HookId || - WH_MOUSE_LL == Hook->HookId) - { - return GlobalHooks; - } - - return MsqGetHooks(((PTHREADINFO)Hook->Thread->Tcb.Win32Thread)->MessageQueue); + if (NULL == Hook->Thread || WH_KEYBOARD_LL == Hook->HookId || + WH_MOUSE_LL == Hook->HookId) + { + return GlobalHooks; + } + + return MsqGetHooks(((PTHREADINFO)Hook->Thread->Tcb.Win32Thread)->MessageQueue); } /* get the first hook in the chain */ -static PHOOK FASTCALL +static +PHOOK +FASTCALL IntGetFirstHook(PHOOKTABLE Table, int HookId) { - PLIST_ENTRY Elem = Table->Hooks[HOOKID_TO_INDEX(HookId)].Flink; - return Elem == &Table->Hooks[HOOKID_TO_INDEX(HookId)] - ? NULL : CONTAINING_RECORD(Elem, HOOK, Chain); + PLIST_ENTRY Elem = Table->Hooks[HOOKID_TO_INDEX(HookId)].Flink; + + return Elem == &Table->Hooks[HOOKID_TO_INDEX(HookId)] + ? NULL : CONTAINING_RECORD(Elem, HOOK, Chain); } /* find the first non-deleted hook in the chain */ -static PHOOK FASTCALL +static +PHOOK +FASTCALL IntGetFirstValidHook(PHOOKTABLE Table, int HookId) { - PHOOK Hook; - PLIST_ENTRY Elem; - - Hook = IntGetFirstHook(Table, HookId); - while (NULL != Hook && NULL == Hook->Proc) - { - Elem = Hook->Chain.Flink; - Hook = (Elem == &Table->Hooks[HOOKID_TO_INDEX(HookId)] - ? NULL : CONTAINING_RECORD(Elem, HOOK, Chain)); - } - - return Hook; + PHOOK Hook; + PLIST_ENTRY Elem; + + Hook = IntGetFirstHook(Table, HookId); + + while (NULL != Hook && NULL == Hook->Proc) + { + Elem = Hook->Chain.Flink; + Hook = (Elem == &Table->Hooks[HOOKID_TO_INDEX(HookId)] + ? NULL : CONTAINING_RECORD(Elem, HOOK, Chain)); + } + + return Hook; } /* find the next hook in the chain, skipping the deleted ones */ @@ -168,129 +180,140 @@ FASTCALL IntGetNextHook(PHOOK Hook) { - PHOOKTABLE Table = IntGetTable(Hook); - int HookId = Hook->HookId; - PLIST_ENTRY Elem; - - Elem = Hook->Chain.Flink; - while (Elem != &Table->Hooks[HOOKID_TO_INDEX(HookId)]) - { - Hook = CONTAINING_RECORD(Elem, HOOK, Chain); - if (NULL != Hook->Proc) - { - return Hook; - } - } - - if (NULL != GlobalHooks && Table != GlobalHooks) /* now search through the global table */ - { - return IntGetFirstValidHook(GlobalHooks, HookId); - } - - return NULL; + PHOOKTABLE Table = IntGetTable(Hook); + int HookId = Hook->HookId; + PLIST_ENTRY Elem; + + Elem = Hook->Chain.Flink; + while (Elem != &Table->Hooks[HOOKID_TO_INDEX(HookId)]) + { + Hook = CONTAINING_RECORD(Elem, HOOK, Chain); + if (NULL != Hook->Proc) + { + return Hook; + } + } + + if (NULL != GlobalHooks && Table != GlobalHooks) /* now search through the global table */ + { + return IntGetFirstValidHook(GlobalHooks, HookId); + } + + return NULL; } /* free a hook, removing it from its chain */ -static VOID FASTCALL +static +VOID +FASTCALL IntFreeHook(PHOOKTABLE Table, PHOOK Hook, PWINSTATION_OBJECT WinStaObj) { - RemoveEntryList(&Hook->Chain); - RtlFreeUnicodeString(&Hook->ModuleName); - - /* Dereference thread if required */ - if (Hook->Flags & HOOK_THREAD_REFERENCED) - { - ObDereferenceObject(Hook->Thread); - } - - /* Close handle */ - UserDeleteObject(Hook->Self, otHook); + RemoveEntryList(&Hook->Chain); + RtlFreeUnicodeString(&Hook->ModuleName); + + /* Dereference thread if required */ + if (Hook->Flags & HOOK_THREAD_REFERENCED) + { + ObDereferenceObject(Hook->Thread); + } + + /* Close handle */ + UserDeleteObject(Hook->Self, otHook); } /* remove a hook, freeing it if the chain is not in use */ -static VOID +static +VOID IntRemoveHook(PHOOK Hook, PWINSTATION_OBJECT WinStaObj, BOOL TableAlreadyLocked) { - PTHREADINFO W32Thread; - PHOOKTABLE Table = IntGetTable(Hook); - - ASSERT(NULL != Table); - if (NULL == Table) - { - return; - } - - W32Thread = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); - ASSERT(W32Thread != NULL); - W32Thread->fsHooks &= ~HOOKID_TO_FLAG(Hook->HookId); - - GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; - - if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; - - if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) - { - Hook->Proc = NULL; /* chain is in use, just mark it and return */ - } - else - { - IntFreeHook(Table, Hook, WinStaObj); - } + PTHREADINFO W32Thread; + PHOOKTABLE Table = IntGetTable(Hook); + + ASSERT(NULL != Table); + if (NULL == Table) + { + return; + } + + W32Thread = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); + ASSERT(W32Thread != NULL); + W32Thread->fsHooks &= ~HOOKID_TO_FLAG(Hook->HookId); + + GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; + + if (W32Thread->ThreadInfo != NULL) + W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; + + if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) + { + Hook->Proc = NULL; /* chain is in use, just mark it and return */ + } + else + { + IntFreeHook(Table, Hook, WinStaObj); + } } /* release a hook chain, removing deleted hooks if the use count drops to 0 */ -static VOID FASTCALL +static +VOID +FASTCALL IntReleaseHookChain(PHOOKTABLE Table, int HookId, PWINSTATION_OBJECT WinStaObj) { - PLIST_ENTRY Elem; - PHOOK HookObj; - - if (NULL == Table) - { - return; - } - - /* use count shouldn't already be 0 */ - ASSERT(0 != Table->Counts[HOOKID_TO_INDEX(HookId)]); - if (0 == Table->Counts[HOOKID_TO_INDEX(HookId)]) - { - return; - } - if (0 == --Table->Counts[HOOKID_TO_INDEX(HookId)]) - { - Elem = Table->Hooks[HOOKID_TO_INDEX(HookId)].Flink; - while (Elem != &Table->Hooks[HOOKID_TO_INDEX(HookId)]) - { - HookObj = CONTAINING_RECORD(Elem, HOOK, Chain); - Elem = Elem->Flink; - if (NULL == HookObj->Proc) - { - IntFreeHook(Table, HookObj, WinStaObj); - } - } - } -} - -static LRESULT FASTCALL + PLIST_ENTRY Elem; + PHOOK HookObj; + + if (NULL == Table) + { + return; + } + + /* use count shouldn't already be 0 */ + ASSERT(0 != Table->Counts[HOOKID_TO_INDEX(HookId)]); + + if (0 == Table->Counts[HOOKID_TO_INDEX(HookId)]) + { + return; + } + + if (0 == --Table->Counts[HOOKID_TO_INDEX(HookId)]) + { + Elem = Table->Hooks[HOOKID_TO_INDEX(HookId)].Flink; + + while (Elem != &Table->Hooks[HOOKID_TO_INDEX(HookId)]) + { + HookObj = CONTAINING_RECORD(Elem, HOOK, Chain); + Elem = Elem->Flink; + + if (NULL == HookObj->Proc) + { + IntFreeHook(Table, HookObj, WinStaObj); + } + } + } +} + +static +LRESULT +FASTCALL IntCallLowLevelHook(PHOOK Hook, INT Code, WPARAM wParam, LPARAM lParam) { - NTSTATUS Status; - ULONG_PTR uResult; - - /* FIXME should get timeout from - * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage(((PTHREADINFO)Hook->Thread->Tcb.Win32Thread)->MessageQueue, - (HWND) Code, - Hook->HookId, - wParam, - lParam, - 5000, - TRUE, - MSQ_ISHOOK, - &uResult); - - return NT_SUCCESS(Status) ? uResult : 0; + NTSTATUS Status; + ULONG_PTR uResult; + + /* FIXME should get timeout from + * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ + Status = co_MsqSendMessage(((PTHREADINFO)Hook->Thread->Tcb.Win32Thread)->MessageQueue, + (HWND)Code, + Hook->HookId, + wParam, + lParam, + 5000, + TRUE, + MSQ_ISHOOK, + &uResult); + + return NT_SUCCESS(Status) ? uResult : 0; } /* @@ -300,267 +323,281 @@ FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam) { - PHOOK Hook, SaveHook; - PTHREADINFO pti; - PCLIENTINFO ClientInfo; - PHOOKTABLE Table; - LRESULT Result; - PWINSTATION_OBJECT WinStaObj; - NTSTATUS Status; - - ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); - - pti = PsGetCurrentThreadWin32Thread(); - if (!pti) - { - Table = NULL; - } - else - { - Table = MsqGetHooks(pti->MessageQueue); - } - - if (NULL == Table || ! (Hook = IntGetFirstValidHook(Table, HookId))) - { - /* try global table */ - Table = GlobalHooks; - if (NULL == Table || ! (Hook = IntGetFirstValidHook(Table, HookId))) - { - return 0; /* no hook set */ - } - } - - if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) - { - // Post it in message queue. - return IntCallLowLevelHook(Hook, Code, wParam, lParam); - } - - Table->Counts[HOOKID_TO_INDEX(HookId)]++; - if (Table != GlobalHooks && GlobalHooks != NULL) - { - GlobalHooks->Counts[HOOKID_TO_INDEX(HookId)]++; - } - - ClientInfo = GetWin32ClientInfo(); - SaveHook = ClientInfo->phkCurrent; - ClientInfo->phkCurrent = Hook; // Load the call. - - Result = co_IntCallHookProc( HookId, - Code, + PHOOK Hook, SaveHook; + PTHREADINFO pti; + PCLIENTINFO ClientInfo; + PHOOKTABLE Table; + LRESULT Result; + PWINSTATION_OBJECT WinStaObj; + NTSTATUS Status; + + ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); + + pti = PsGetCurrentThreadWin32Thread(); + if (!pti) + { + Table = NULL; + } + else + { + Table = MsqGetHooks(pti->MessageQueue); + } + + if (NULL == Table || ! (Hook = IntGetFirstValidHook(Table, HookId))) + { + /* try global table */ + Table = GlobalHooks; + if (NULL == Table || ! (Hook = IntGetFirstValidHook(Table, HookId))) + { + return 0; /* no hook set */ + } + } + + if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) + { + /* Post it in message queue. */ + return IntCallLowLevelHook(Hook, Code, wParam, lParam); + } + + Table->Counts[HOOKID_TO_INDEX(HookId)]++; + if (Table != GlobalHooks && GlobalHooks != NULL) + { + GlobalHooks->Counts[HOOKID_TO_INDEX(HookId)]++; + } + + ClientInfo = GetWin32ClientInfo(); + SaveHook = ClientInfo->phkCurrent; + ClientInfo->phkCurrent = Hook; /* Load the call. */ + + Result = co_IntCallHookProc(HookId, + Code, wParam, lParam, - Hook->Proc, - Hook->Ansi, - &Hook->ModuleName); - - ClientInfo->phkCurrent = SaveHook; - - Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, - 0, - &WinStaObj); - - if (! NT_SUCCESS(Status)) - { - DPRINT1("Invalid window station????\n"); - } - else - { - IntReleaseHookChain(MsqGetHooks(pti->MessageQueue), HookId, WinStaObj); - IntReleaseHookChain(GlobalHooks, HookId, WinStaObj); - ObDereferenceObject(WinStaObj); - } - - return Result; -} - -VOID FASTCALL + Hook->Proc, + Hook->Ansi, + &Hook->ModuleName); + + ClientInfo->phkCurrent = SaveHook; + + Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, + KernelMode, + 0, + &WinStaObj); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid window station????\n"); + } + else + { + IntReleaseHookChain(MsqGetHooks(pti->MessageQueue), HookId, WinStaObj); + IntReleaseHookChain(GlobalHooks, HookId, WinStaObj); + ObDereferenceObject(WinStaObj); + } + + return Result; +} + +VOID +FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread) { - int HookId; - PLIST_ENTRY Elem; - PHOOK HookObj; - PWINSTATION_OBJECT WinStaObj; - NTSTATUS Status; - - if (NULL != GlobalHooks) - { - Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, - 0, - &WinStaObj); - - if (! NT_SUCCESS(Status)) - { - DPRINT1("Invalid window station????\n"); - return; - } - - for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) - { - /* only low-level keyboard/mouse global hooks can be owned by a thread */ - switch(HookId) - { - case WH_KEYBOARD_LL: - case WH_MOUSE_LL: - Elem = GlobalHooks->Hooks[HOOKID_TO_INDEX(HookId)].Flink; - while (Elem != &GlobalHooks->Hooks[HOOKID_TO_INDEX(HookId)]) - { - HookObj = CONTAINING_RECORD(Elem, HOOK, Chain); - Elem = Elem->Flink; - if (HookObj->Thread == Thread) - { - IntRemoveHook(HookObj, WinStaObj, TRUE); - } - } - break; - } - } - } -} - -static LRESULT + int HookId; + PLIST_ENTRY Elem; + PHOOK HookObj; + PWINSTATION_OBJECT WinStaObj; + NTSTATUS Status; + + if (NULL != GlobalHooks) + { + Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, + KernelMode, + 0, + &WinStaObj); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid window station????\n"); + return; + } + + for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) + { + /* only low-level keyboard/mouse global hooks can be owned by a thread */ + switch(HookId) + { + case WH_KEYBOARD_LL: + case WH_MOUSE_LL: + Elem = GlobalHooks->Hooks[HOOKID_TO_INDEX(HookId)].Flink; + + while (Elem != &GlobalHooks->Hooks[HOOKID_TO_INDEX(HookId)]) + { + HookObj = CONTAINING_RECORD(Elem, HOOK, Chain); + Elem = Elem->Flink; + + if (HookObj->Thread == Thread) + { + IntRemoveHook(HookObj, WinStaObj, TRUE); + } + } + break; + } + } + } +} + +static +LRESULT FASTCALL co_HOOK_CallHookNext(PHOOK Hook, INT Code, WPARAM wParam, LPARAM lParam) { - if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) - { - DPRINT1("CALLING HOOK from another Thread. %d\n",Hook->HookId); - return IntCallLowLevelHook(Hook, Code, wParam, lParam); - } - DPRINT("CALLING HOOK %d\n",Hook->HookId); - return co_IntCallHookProc(Hook->HookId, - Code, - wParam, - lParam, - Hook->Proc, - Hook->Ansi, - &Hook->ModuleName); + if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) + { + DPRINT1("CALLING HOOK from another Thread. %d\n", Hook->HookId); + return IntCallLowLevelHook(Hook, Code, wParam, lParam); + } + + DPRINT("CALLING HOOK %d\n", Hook->HookId); + + return co_IntCallHookProc(Hook->HookId, + Code, + wParam, + lParam, + Hook->Proc, + Hook->Ansi, + &Hook->ModuleName); } LRESULT FASTCALL -IntCallDebugHook( - PHOOK Hook, - int Code, - WPARAM wParam, - LPARAM lParam) -{ - LRESULT lResult = 0; - ULONG Size; - DEBUGHOOKINFO Debug; - PVOID HooklParam = NULL; - BOOL BadChk = FALSE; - - if (lParam) - { - _SEH2_TRY - { - ProbeForRead((PVOID)lParam, - sizeof(DEBUGHOOKINFO), - 1); - RtlCopyMemory( &Debug, - (PVOID)lParam, - sizeof(DEBUGHOOKINFO)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_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) - { - _SEH2_TRY - { - ProbeForRead((PVOID)Debug.lParam, - Size, - 1); - RtlCopyMemory( HooklParam, - (PVOID)Debug.lParam, - Size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_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_CallHookNext(Hook, Code, wParam, (LPARAM)&Debug); - if (HooklParam) ExFreePoolWithTag(HooklParam, TAG_HOOK); - return lResult; +IntCallDebugHook(PHOOK Hook, + int Code, + WPARAM wParam, + LPARAM lParam) +{ + LRESULT lResult = 0; + ULONG Size; + DEBUGHOOKINFO Debug; + PVOID HooklParam = NULL; + BOOL BadChk = FALSE; + + if (lParam) + { + _SEH2_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(DEBUGHOOKINFO), + 1); + + RtlCopyMemory(&Debug, + (PVOID)lParam, + sizeof(DEBUGHOOKINFO)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_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) + { + _SEH2_TRY + { + ProbeForRead((PVOID)Debug.lParam, + Size, + 1); + + RtlCopyMemory(HooklParam, + (PVOID)Debug.lParam, + Size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_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_CallHookNext(Hook, Code, wParam, (LPARAM)&Debug); + if (HooklParam) ExFreePoolWithTag(HooklParam, TAG_HOOK); + + return lResult; } /* @@ -568,647 +605,688 @@ */ LRESULT FASTCALL -UserCallNextHookEx( - PHOOK Hook, - int Code, - WPARAM wParam, - LPARAM lParam, - BOOL Ansi) -{ - LRESULT lResult = 0; - BOOL BadChk = FALSE; - -// Handle this one first. - if ((Hook->HookId == WH_MOUSE) || - (Hook->HookId == WH_CBT && Code == HCBT_CLICKSKIPPED)) - { - MOUSEHOOKSTRUCTEX Mouse; - if (lParam) - { - _SEH2_TRY - { - ProbeForRead((PVOID)lParam, - sizeof(MOUSEHOOKSTRUCTEX), - 1); - RtlCopyMemory( &Mouse, - (PVOID)lParam, - sizeof(MOUSEHOOKSTRUCTEX)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK WH_MOUSE read from lParam ERROR!\n"); - } - } - if (!BadChk) - { - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Mouse); - } - return lResult; - } - - switch(Hook->HookId) - { - case WH_MOUSE_LL: - { - MSLLHOOKSTRUCT Mouse; - if (lParam) - { +UserCallNextHookEx(PHOOK Hook, + int Code, + WPARAM wParam, + LPARAM lParam, + BOOL Ansi) +{ + LRESULT lResult = 0; + BOOL BadChk = FALSE; + + /* Handle this one first. */ + if ((Hook->HookId == WH_MOUSE) || + (Hook->HookId == WH_CBT && Code == HCBT_CLICKSKIPPED)) + { + MOUSEHOOKSTRUCTEX Mouse; + if (lParam) + { _SEH2_TRY { ProbeForRead((PVOID)lParam, - sizeof(MSLLHOOKSTRUCT), + sizeof(MOUSEHOOKSTRUCTEX), + 1); + + RtlCopyMemory(&Mouse, + (PVOID)lParam, + sizeof(MOUSEHOOKSTRUCTEX)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK WH_MOUSE read from lParam ERROR!\n"); + } + } + + if (!BadChk) + { + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Mouse); + } + + return lResult; + } + + switch(Hook->HookId) + { + case WH_MOUSE_LL: + { + MSLLHOOKSTRUCT Mouse; + + if (lParam) + { + _SEH2_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(MSLLHOOKSTRUCT), + 1); + + RtlCopyMemory(&Mouse, + (PVOID)lParam, + sizeof(MSLLHOOKSTRUCT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK WH_MOUSE_LL read from lParam ERROR!\n"); + } + } + + if (!BadChk) + { + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Mouse); + } + break; + } + + case WH_KEYBOARD_LL: + { + KBDLLHOOKSTRUCT Keyboard; + + if (lParam) + { + _SEH2_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(KBDLLHOOKSTRUCT), + 1); + + RtlCopyMemory(&Keyboard, + (PVOID)lParam, + sizeof(KBDLLHOOKSTRUCT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK WH_KEYBORD_LL read from lParam ERROR!\n"); + } + } + + if (!BadChk) + { + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Keyboard); + } + break; + } + + case WH_MSGFILTER: + case WH_SYSMSGFILTER: + case WH_GETMESSAGE: + { + MSG Msg; + + if (lParam) + { + _SEH2_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(MSG), + 1); + + RtlCopyMemory(&Msg, + (PVOID)lParam, + sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK WH_XMESSAGEX read from lParam ERROR!\n"); + } + } + + if (!BadChk) + { + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Msg); + + if (lParam && (Hook->HookId == WH_GETMESSAGE)) + { + _SEH2_TRY + { + ProbeForWrite((PVOID)lParam, + sizeof(MSG), + 1); + + RtlCopyMemory((PVOID)lParam, + &Msg, + sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK WH_GETMESSAGE write to lParam ERROR!\n"); + } + } + } + break; + } + + case WH_CBT: + DPRINT1("HOOK WH_CBT!\n"); + switch (Code) + { + case HCBT_CREATEWND: /* Use Ansi. */ + DPRINT1("HOOK HCBT_CREATEWND\n"); + /* lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); */ + break; + + case HCBT_MOVESIZE: + { + RECTL rt; + + DPRINT1("HOOK HCBT_MOVESIZE\n"); + + if (lParam) + { + _SEH2_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(RECT), 1); - RtlCopyMemory( &Mouse, - (PVOID)lParam, - sizeof(MSLLHOOKSTRUCT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK WH_MOUSE_LL read from lParam ERROR!\n"); - } - } - if (!BadChk) - { - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Mouse); - } - break; - } - - case WH_KEYBOARD_LL: - { - KBDLLHOOKSTRUCT Keyboard; - if (lParam) - { - _SEH2_TRY - { - ProbeForRead((PVOID)lParam, - sizeof(KBDLLHOOKSTRUCT), + + RtlCopyMemory(&rt, + (PVOID)lParam, + sizeof(RECT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK HCBT_MOVESIZE read from lParam ERROR!\n"); + } + } + + if (!BadChk) + { + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&rt); + } + break; + } + + case HCBT_ACTIVATE: + { + CBTACTIVATESTRUCT CbAs; + + DPRINT1("HOOK HCBT_ACTIVATE\n"); + if (lParam) + { + _SEH2_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(CBTACTIVATESTRUCT), 1); - RtlCopyMemory( &Keyboard, - (PVOID)lParam, - sizeof(KBDLLHOOKSTRUCT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK WH_KEYBORD_LL read from lParam ERROR!\n"); - } - } - if (!BadChk) - { - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Keyboard); - } - break; - } - - case WH_MSGFILTER: - case WH_SYSMSGFILTER: - case WH_GETMESSAGE: - { - MSG Msg; - if (lParam) - { - _SEH2_TRY - { - ProbeForRead((PVOID)lParam, - sizeof(MSG), - 1); - RtlCopyMemory( &Msg, - (PVOID)lParam, - sizeof(MSG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK WH_XMESSAGEX read from lParam ERROR!\n"); - } - } - if (!BadChk) - { - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Msg); - if (lParam && (Hook->HookId == WH_GETMESSAGE)) - { - _SEH2_TRY - { - ProbeForWrite((PVOID)lParam, - sizeof(MSG), - 1); - RtlCopyMemory((PVOID)lParam, - &Msg, - sizeof(MSG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK WH_GETMESSAGE write to lParam ERROR!\n"); - } - } - } - break; - } - - case WH_CBT: - DPRINT1("HOOK WH_CBT!\n"); - switch (Code) - { - case HCBT_CREATEWND: // Use Ansi. - DPRINT1("HOOK HCBT_CREATEWND\n"); -// lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); - break; - - case HCBT_MOVESIZE: - { - RECTL rt; - DPRINT1("HOOK HCBT_MOVESIZE\n"); - if (lParam) - { - _SEH2_TRY - { - ProbeForRead((PVOID)lParam, - sizeof(RECT), - 1); - RtlCopyMemory( &rt, - (PVOID)lParam, - sizeof(RECT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK HCBT_MOVESIZE read from lParam ERROR!\n"); - } - } - if (!BadChk) - { - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&rt); - } - break; - } - - case HCBT_ACTIVATE: - { - CBTACTIVATESTRUCT CbAs; - DPRINT1("HOOK HCBT_ACTIVATE\n"); - if (lParam) - { - _SEH2_TRY - { - ProbeForRead((PVOID)lParam, - sizeof(CBTACTIVATESTRUCT), - 1); - RtlCopyMemory( &CbAs, - (PVOID)lParam, - sizeof(CBTACTIVATESTRUCT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK HCBT_ACTIVATE read from lParam ERROR!\n"); - } - } - if (!BadChk) - { - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&CbAs); - } - break; - } - /* - The rest just use default. - */ - default: - DPRINT1("HOOK HCBT_ %d\n",Code); - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); - break; - } - break; - - case WH_JOURNALPLAYBACK: - case WH_JOURNALRECORD: - { - EVENTMSG EventMsg; - if (lParam) - { - _SEH2_TRY - { - ProbeForRead((PVOID)lParam, - sizeof(EVENTMSG), - 1); - RtlCopyMemory( &EventMsg, - (PVOID)lParam, - sizeof(EVENTMSG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK WH_JOURNAL read from lParam ERROR!\n"); - } - } - if (!BadChk) - { - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)(lParam ? &EventMsg : NULL)); + + RtlCopyMemory(&CbAs, + (PVOID)lParam, + sizeof(CBTACTIVATESTRUCT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK HCBT_ACTIVATE read from lParam ERROR!\n"); + } + } + + if (!BadChk) + { + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&CbAs); + } + break; + } + + /* The rest just use default. */ + default: + DPRINT1("HOOK HCBT_ %d\n",Code); + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); + break; + } + break; + + case WH_JOURNALPLAYBACK: + case WH_JOURNALRECORD: + { + EVENTMSG EventMsg; + if (lParam) { - _SEH2_TRY - { - ProbeForWrite((PVOID)lParam, - sizeof(EVENTMSG), - 1); - RtlCopyMemory((PVOID)lParam, - &EventMsg, + _SEH2_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(EVENTMSG), + 1); + + RtlCopyMemory(&EventMsg, + (PVOID)lParam, sizeof(EVENTMSG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) - { - DPRINT1("HOOK WH_JOURNAL write to lParam ERROR!\n"); - } - } - } - break; - } - - case WH_DEBUG: - lResult = IntCallDebugHook(Hook, Code, wParam, lParam); - break; -/* - Default the rest like, WH_FOREGROUNDIDLE, WH_KEYBOARD and WH_SHELL. - */ - case WH_FOREGROUNDIDLE: - case WH_KEYBOARD: - case WH_SHELL: - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); - break; - - default: - DPRINT1("Unsupported HOOK Id -> %d\n",Hook->HookId); - break; - } - return lResult; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK WH_JOURNAL read from lParam ERROR!\n"); + } + } + + if (!BadChk) + { + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)(lParam ? &EventMsg : NULL)); + + if (lParam) + { + _SEH2_TRY + { + ProbeForWrite((PVOID)lParam, + sizeof(EVENTMSG), + 1); + + RtlCopyMemory((PVOID)lParam, + &EventMsg, + sizeof(EVENTMSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + + if (BadChk) + { + DPRINT1("HOOK WH_JOURNAL write to lParam ERROR!\n"); + } + } + } + break; + } + + case WH_DEBUG: + lResult = IntCallDebugHook(Hook, Code, wParam, lParam); + break; + + /* + * Default the rest like, WH_FOREGROUNDIDLE, WH_KEYBOARD and WH_SHELL. + */ + case WH_FOREGROUNDIDLE: + case WH_KEYBOARD: + case WH_SHELL: + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); + break; + + default: + DPRINT1("Unsupported HOOK Id -> %d\n",Hook->HookId); + break; + } + + return lResult; } LRESULT APIENTRY -NtUserCallNextHookEx( - int Code, - WPARAM wParam, - LPARAM lParam, - BOOL Ansi) -{ - PHOOK HookObj, NextObj; - PCLIENTINFO ClientInfo; - PWINSTATION_OBJECT WinStaObj; - NTSTATUS Status; - DECLARE_RETURN(LRESULT); - - DPRINT("Enter NtUserCallNextHookEx\n"); - UserEnterExclusive(); - - Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, - 0, - &WinStaObj); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( 0); - } - - ObDereferenceObject(WinStaObj); - - ClientInfo = GetWin32ClientInfo(); - - if (!ClientInfo) RETURN( 0); - - HookObj = ClientInfo->phkCurrent; - - if (!HookObj) RETURN( 0); - - UserReferenceObject(HookObj); - - Ansi = HookObj->Ansi; - - if (NULL != HookObj->Thread && (HookObj->Thread != PsGetCurrentThread())) - { - DPRINT1("Thread mismatch\n"); - UserDereferenceObject(HookObj); - SetLastWin32Error(ERROR_INVALID_HANDLE); - RETURN( 0); - } +NtUserCallNextHookEx(int Code, + WPARAM wParam, + LPARAM lParam, + BOOL Ansi) +{ + PHOOK HookObj, NextObj; + PCLIENTINFO ClientInfo; + PWINSTATION_OBJECT WinStaObj; + NTSTATUS Status; + DECLARE_RETURN(LRESULT); + + DPRINT("Enter NtUserCallNextHookEx\n"); + UserEnterExclusive(); + + Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, + KernelMode, + 0, + &WinStaObj); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( 0); + } + + ObDereferenceObject(WinStaObj); + + ClientInfo = GetWin32ClientInfo(); + + if (!ClientInfo) RETURN( 0); + + HookObj = ClientInfo->phkCurrent; + + if (!HookObj) RETURN( 0); + + UserReferenceObject(HookObj); + + Ansi = HookObj->Ansi; + + if (NULL != HookObj->Thread && (HookObj->Thread != PsGetCurrentThread())) + { + DPRINT1("Thread mismatch\n"); + UserDereferenceObject(HookObj); + SetLastWin32Error(ERROR_INVALID_HANDLE); + RETURN( 0); + } - NextObj = IntGetNextHook(HookObj); - ClientInfo->phkCurrent = NextObj; // Preset next hook from list. - UserCallNextHookEx( HookObj, Code, wParam, lParam, Ansi); - UserDereferenceObject(HookObj); - - RETURN( (LRESULT)NextObj); + NextObj = IntGetNextHook(HookObj); + ClientInfo->phkCurrent = NextObj; /* Preset next hook from list. */ + UserCallNextHookEx( HookObj, Code, wParam, lParam, Ansi); + UserDereferenceObject(HookObj); + + RETURN( (LRESULT)NextObj); CLEANUP: - DPRINT("Leave NtUserCallNextHookEx, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserCallNextHookEx, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } HHOOK APIENTRY -NtUserSetWindowsHookAW( - int idHook, - HOOKPROC lpfn, - BOOL Ansi) -{ - UNICODE_STRING USModuleName; - RtlInitUnicodeString(&USModuleName, NULL); - return NtUserSetWindowsHookEx(NULL, &USModuleName, 0, idHook, lpfn, Ansi); +NtUserSetWindowsHookAW(int idHook, + HOOKPROC lpfn, + BOOL Ansi) +{ + UNICODE_STRING USModuleName; + + RtlInitUnicodeString(&USModuleName, NULL); + + return NtUserSetWindowsHookEx(NULL, &USModuleName, 0, idHook, lpfn, Ansi); } HHOOK APIENTRY -NtUserSetWindowsHookEx( - HINSTANCE Mod, - PUNICODE_STRING UnsafeModuleName, - DWORD ThreadId, - int HookId, - HOOKPROC HookProc, - BOOL Ansi) -{ - PWINSTATION_OBJECT WinStaObj; - PCLIENTINFO ClientInfo; - BOOLEAN Global; - PETHREAD Thread; - PHOOK Hook; - UNICODE_STRING ModuleName; - NTSTATUS Status; - HHOOK Handle; - BOOLEAN ThreadReferenced = FALSE; - DECLARE_RETURN(HHOOK); - - DPRINT("Enter NtUserSetWindowsHookEx\n"); - UserEnterExclusive(); - - if (HookId < WH_MINHOOK || WH_MAXHOOK < HookId ) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( NULL); - } - - if (!HookProc) - { - SetLastWin32Error(ERROR_INVALID_FILTER_PROC); - RETURN( NULL); - } - - ClientInfo = GetWin32ClientInfo(); - - if (ThreadId) /* thread-local hook */ - { - if (HookId == WH_JOURNALRECORD || +NtUserSetWindowsHookEx(HINSTANCE Mod, + PUNICODE_STRING UnsafeModuleName, + DWORD ThreadId, + int HookId, + HOOKPROC HookProc, + BOOL Ansi) +{ + PWINSTATION_OBJECT WinStaObj; + PCLIENTINFO ClientInfo; + BOOLEAN Global; + PETHREAD Thread; + PHOOK Hook; + UNICODE_STRING ModuleName; + NTSTATUS Status; + HHOOK Handle; + BOOLEAN ThreadReferenced = FALSE; + DECLARE_RETURN(HHOOK); + + DPRINT("Enter NtUserSetWindowsHookEx\n"); + UserEnterExclusive(); + + if (HookId < WH_MINHOOK || WH_MAXHOOK < HookId ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( NULL); + } + + if (!HookProc) + { + SetLastWin32Error(ERROR_INVALID_FILTER_PROC); + RETURN( NULL); + } + + ClientInfo = GetWin32ClientInfo(); + + if (ThreadId) /* thread-local hook */ + { + if (HookId == WH_JOURNALRECORD || HookId == WH_JOURNALPLAYBACK || HookId == WH_KEYBOARD_LL || HookId == WH_MOUSE_LL || HookId == WH_SYSMSGFILTER) - { - /* these can only be global */ - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( NULL); - } - Mod = NULL; - Global = FALSE; - if (! NT_SUCCESS(PsLookupThreadByThreadId((HANDLE) ThreadId, &Thread))) - { - DPRINT1("Invalid thread id 0x%x\n", ThreadId); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( NULL); - } - /* Thread was referenced */ - ThreadReferenced = TRUE; - if (Thread->ThreadsProcess != PsGetCurrentProcess()) - { - ObDereferenceObject(Thread); - DPRINT1("Can't specify thread belonging to another process\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( NULL); - } - } - else /* system-global hook */ - { - if (HookId == WH_KEYBOARD_LL || HookId == WH_MOUSE_LL) - { - Mod = NULL; - Thread = PsGetCurrentThread(); - Status = ObReferenceObjectByPointer(Thread, - THREAD_ALL_ACCESS, - PsThreadType, - KernelMode); - - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( (HANDLE) NULL); - } - - /* Thread was referenced */ - ThreadReferenced = TRUE; - } - else if (NULL == Mod) - { - SetLastWin32Error(ERROR_HOOK_NEEDS_HMOD); - RETURN( NULL); - } - else - { - Thread = NULL; - } - Global = TRUE; - } - - if ( ( Global && (HookId != WH_KEYBOARD_LL && HookId != WH_MOUSE_LL) ) || + { + /* these can only be global */ + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( NULL); + } + + Mod = NULL; + Global = FALSE; + + if (!NT_SUCCESS(PsLookupThreadByThreadId((HANDLE) ThreadId, &Thread))) + { + DPRINT1("Invalid thread id 0x%x\n", ThreadId); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( NULL); + } + + /* Thread was referenced */ + ThreadReferenced = TRUE; + if (Thread->ThreadsProcess != PsGetCurrentProcess()) + { + ObDereferenceObject(Thread); + DPRINT1("Can't specify thread belonging to another process\n"); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( NULL); + } + } + else /* system-global hook */ + { + if (HookId == WH_KEYBOARD_LL || HookId == WH_MOUSE_LL) + { + Mod = NULL; + Thread = PsGetCurrentThread(); + + Status = ObReferenceObjectByPointer(Thread, + THREAD_ALL_ACCESS, + PsThreadType, + KernelMode); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( (HANDLE) NULL); + } + + /* Thread was referenced */ + ThreadReferenced = TRUE; + } + else if (NULL == Mod) + { + SetLastWin32Error(ERROR_HOOK_NEEDS_HMOD); + RETURN( NULL); + } + else + { + Thread = NULL; + } + Global = TRUE; + } + + if ((Global && (HookId != WH_KEYBOARD_LL && HookId != WH_MOUSE_LL)) || WH_DEBUG == HookId || WH_JOURNALPLAYBACK == HookId || WH_JOURNALRECORD == HookId) - { + { #if 0 /* Removed to get winEmbed working again */ - UNIMPLEMENTED + UNIMPLEMENTED #else - DPRINT1("Not implemented: HookId %d Global %s\n", HookId, Global ? "TRUE" : "FALSE"); + DPRINT1("Not implemented: HookId %d Global %s\n", HookId, Global ? "TRUE" : "FALSE"); #endif - /* Dereference thread if needed */ - if (ThreadReferenced) ObDereferenceObject(Thread); - SetLastWin32Error(ERROR_NOT_SUPPORTED); - RETURN( NULL); - } - - Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, - 0, - &WinStaObj); - - if (! NT_SUCCESS(Status)) - { - /* Dereference thread if needed */ - if (ThreadReferenced) ObDereferenceObject(Thread); - SetLastNtError(Status); - RETURN( (HANDLE) NULL); - } - - Hook = IntAddHook(Thread, HookId, Global, WinStaObj); - if (NULL == Hook) - { - /* Dereference thread if needed */ - if (ThreadReferenced) ObDereferenceObject(Thread); - ObDereferenceObject(WinStaObj); - RETURN( NULL); - } - - /* Let IntFreeHook now that this thread needs a dereference */ - if (ThreadReferenced) - { - Hook->Flags |= HOOK_THREAD_REFERENCED; - } - - if (NULL != Mod) - { - Status = MmCopyFromCaller(&ModuleName, UnsafeModuleName, sizeof(UNICODE_STRING)); - if (! NT_SUCCESS(Status)) - { - UserDereferenceObject(Hook); - IntRemoveHook(Hook, WinStaObj, FALSE); - ObDereferenceObject(WinStaObj); - SetLastNtError(Status); - RETURN( NULL); - } - Hook->ModuleName.Buffer = ExAllocatePoolWithTag(PagedPool, - ModuleName.MaximumLength, - TAG_HOOK); - if (NULL == Hook->ModuleName.Buffer) - { - UserDereferenceObject(Hook); - IntRemoveHook(Hook, WinStaObj, FALSE); - ObDereferenceObject(WinStaObj); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - RETURN( NULL); - } - Hook->ModuleName.MaximumLength = ModuleName.MaximumLength; - Status = MmCopyFromCaller(Hook->ModuleName.Buffer, - ModuleName.Buffer, - ModuleName.MaximumLength); - if (! NT_SUCCESS(Status)) - { - ExFreePoolWithTag(Hook->ModuleName.Buffer, TAG_HOOK); - UserDereferenceObject(Hook); - IntRemoveHook(Hook, WinStaObj, FALSE); - ObDereferenceObject(WinStaObj); - SetLastNtError(Status); - RETURN( NULL); - } - Hook->ModuleName.Length = ModuleName.Length; - /* make proc relative to the module base */ - Hook->Proc = (void *)((char *)HookProc - (char *)Mod); - } - else - Hook->Proc = HookProc; - - Hook->Ansi = Ansi; - Handle = Hook->Self; - -// Clear the client threads next hook. - ClientInfo->phkCurrent = 0; - - UserDereferenceObject(Hook); - - ObDereferenceObject(WinStaObj); - - RETURN( Handle); + /* Dereference thread if needed */ + if (ThreadReferenced) ObDereferenceObject(Thread); + SetLastWin32Error(ERROR_NOT_SUPPORTED); + RETURN( NULL); + } + + Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, + KernelMode, + 0, + &WinStaObj); + + if (!NT_SUCCESS(Status)) + { + /* Dereference thread if needed */ + if (ThreadReferenced) ObDereferenceObject(Thread); + SetLastNtError(Status); + RETURN( (HANDLE) NULL); + } + + Hook = IntAddHook(Thread, HookId, Global, WinStaObj); + if (NULL == Hook) + { + /* Dereference thread if needed */ + if (ThreadReferenced) ObDereferenceObject(Thread); + ObDereferenceObject(WinStaObj); + RETURN( NULL); + } + + /* Let IntFreeHook now that this thread needs a dereference */ + if (ThreadReferenced) + { + Hook->Flags |= HOOK_THREAD_REFERENCED; + } + + if (NULL != Mod) + { + Status = MmCopyFromCaller(&ModuleName, UnsafeModuleName, sizeof(UNICODE_STRING)); + if (!NT_SUCCESS(Status)) + { + UserDereferenceObject(Hook); + IntRemoveHook(Hook, WinStaObj, FALSE); + ObDereferenceObject(WinStaObj); + SetLastNtError(Status); + RETURN( NULL); + } + + Hook->ModuleName.Buffer = ExAllocatePoolWithTag(PagedPool, + ModuleName.MaximumLength, + TAG_HOOK); + if (NULL == Hook->ModuleName.Buffer) + { + UserDereferenceObject(Hook); + IntRemoveHook(Hook, WinStaObj, FALSE); + ObDereferenceObject(WinStaObj); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + RETURN( NULL); + } + + Hook->ModuleName.MaximumLength = ModuleName.MaximumLength; + Status = MmCopyFromCaller(Hook->ModuleName.Buffer, + ModuleName.Buffer, + ModuleName.MaximumLength); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Hook->ModuleName.Buffer, TAG_HOOK); + UserDereferenceObject(Hook); + IntRemoveHook(Hook, WinStaObj, FALSE); + ObDereferenceObject(WinStaObj); + SetLastNtError(Status); + RETURN( NULL); + } + + Hook->ModuleName.Length = ModuleName.Length; + /* make proc relative to the module base */ + Hook->Proc = (void *)((char *)HookProc - (char *)Mod); + } + else + Hook->Proc = HookProc; + + Hook->Ansi = Ansi; + Handle = Hook->Self; + + /* Clear the client threads next hook. */ + ClientInfo->phkCurrent = 0; + + UserDereferenceObject(Hook); + + ObDereferenceObject(WinStaObj); + + RETURN( Handle); CLEANUP: - DPRINT("Leave NtUserSetWindowsHookEx, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserSetWindowsHookEx, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } BOOL APIENTRY -NtUserUnhookWindowsHookEx( - HHOOK Hook) -{ - PWINSTATION_OBJECT WinStaObj; - PHOOK HookObj; - NTSTATUS Status; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserUnhookWindowsHookEx\n"); - UserEnterExclusive(); - - Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, - 0, - &WinStaObj); - - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - // Status = UserReferenceObjectByHandle(gHandleTable, Hook, - // otHookProc, (PVOID *) &HookObj); - if (!(HookObj = IntGetHookObject(Hook))) - { - DPRINT1("Invalid handle passed to NtUserUnhookWindowsHookEx\n"); - ObDereferenceObject(WinStaObj); - // SetLastNtError(Status); - RETURN( FALSE); - } - ASSERT(Hook == HookObj->Self); - - IntRemoveHook(HookObj, WinStaObj, FALSE); - - UserDereferenceObject(HookObj); - ObDereferenceObject(WinStaObj); - - RETURN( TRUE); +NtUserUnhookWindowsHookEx(HHOOK Hook) +{ + PWINSTATION_OBJECT WinStaObj; + PHOOK HookObj; + NTSTATUS Status; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserUnhookWindowsHookEx\n"); + UserEnterExclusive(); + + Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, + KernelMode, + 0, + &WinStaObj); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( FALSE); + } + + /* Status = UserReferenceObjectByHandle(gHandleTable, Hook, + otHookProc, (PVOID *) &HookObj); */ + if (!(HookObj = IntGetHookObject(Hook))) + { + DPRINT1("Invalid handle passed to NtUserUnhookWindowsHookEx\n"); + ObDereferenceObject(WinStaObj); + /* SetLastNtError(Status); */ + RETURN( FALSE); + } + + ASSERT(Hook == HookObj->Self); + + IntRemoveHook(HookObj, WinStaObj, FALSE); + + UserDereferenceObject(HookObj); + ObDereferenceObject(WinStaObj); + + RETURN( TRUE); CLEANUP: - DPRINT("Leave NtUserUnhookWindowsHookEx, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserUnhookWindowsHookEx, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } /* EOF */

15 years, 7 months

[mjmartin] 41041: - Implement internal function LogfDeleteOffsetInformation. - LogfWriteData: Fix record overwriting when the log file has reached MaxSize. Previous implementation was incorrect. - LogfInitializeExisting: Add support for log files that have had old records overwritten with new records.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri May 22 14:47:25 2009 New Revision: 41041 URL: http://svn.reactos.org/svn/reactos?rev=41041&view=rev Log: - Implement internal function LogfDeleteOffsetInformation. - LogfWriteData: Fix record overwriting when the log file has reached MaxSize. Previous implementation was incorrect. - LogfInitializeExisting: Add support for log files that have had old records overwritten with new records. Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Fri May 22 14:47:25 2009 @@ -149,6 +149,9 @@ ULONG ulNumber, ULONG ulOffset); +BOOL LogfDeleteOffsetInformation(PLOGFILE LogFile, + ULONG ulNumber); + PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, WORD wType, Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Fri May 22 14:47:25 2009 @@ -4,6 +4,7 @@ * FILE: services/eventlog/file.c * PURPOSE: Event logging service * COPYRIGHT: Copyright 2005 Saveliy Tretiakov + Michael Martin */ /* INCLUDES *****************************************************************/ @@ -33,7 +34,7 @@ LogFile->Header.MajorVersion = MAJORVER; LogFile->Header.MinorVersion = MINORVER; LogFile->Header.CurrentRecordNumber = 1; - /* FIXME: Read MaxSize from registry for this LogFile. + /* FIXME: Read MaxSize from registry for this LogFile. But for now limit EventLog size to just under 5K. */ LogFile->Header.MaxSize = 5000; LogFile->Header.Signature = LOGFILE_SIGNATURE; @@ -84,6 +85,9 @@ DWORD dwRecSize, dwRecSign, dwFilePointer; PDWORD pdwRecSize2; PEVENTLOGRECORD RecBuf; + BOOL OvewrWrittenRecords = FALSE; + + DPRINT("Initializing LogFile %S\n",LogFile->LogName); if (SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) @@ -129,6 +133,14 @@ return LogfInitializeNew(LogFile); } + /* Set the read location to the oldest record */ + dwFilePointer = SetFilePointer(LogFile->hFile, LogFile->Header.StartOffset, NULL, FILE_BEGIN); + if (dwFilePointer == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer failed! %d\n", GetLastError()); + return FALSE; + } + for (;;) { dwFilePointer = SetFilePointer(LogFile->hFile, 0, NULL, FILE_CURRENT); @@ -137,6 +149,14 @@ { DPRINT1("SetFilePointer failed! %d\n", GetLastError()); return FALSE; + } + + /* If the EVENTLOGEOF info has been reached and the oldest record was not immediately after the Header */ + if ((dwFilePointer == LogFile->Header.EndOffset) && (LogFile->Header.StartOffset != sizeof(EVENTLOGHEADER))) + { + OvewrWrittenRecords = TRUE; + /* The file has records that overwrote old ones so read them */ + dwFilePointer = SetFilePointer(LogFile->hFile, sizeof(EVENTLOGHEADER), NULL, FILE_BEGIN); } if (!ReadFile(LogFile->hFile, @@ -202,6 +222,13 @@ break; } + /* if OvewrWrittenRecords is TRUE and this record has already been read */ + if ((OvewrWrittenRecords == TRUE) && (RecBuf->RecordNumber == LogFile->Header.OldestRecordNumber)) + { + HeapFree(MyHeap, 0, RecBuf); + break; + } + pdwRecSize2 = (PDWORD) (((PBYTE) RecBuf) + dwRecSize - 4); if (*pdwRecSize2 != dwRecSize) @@ -224,16 +251,17 @@ } HeapFree(MyHeap, 0, RecBuf); - } // for(;;) - - LogFile->Header.CurrentRecordNumber = dwRecordsNumber + 1; - LogFile->Header.OldestRecordNumber = dwRecordsNumber ? 1 : 0; // FIXME - - /* FIXME: Read MaxSize from registry for this LogFile. + } + + LogFile->Header.CurrentRecordNumber = dwRecordsNumber + LogFile->Header.OldestRecordNumber; + if (LogFile->Header.CurrentRecordNumber == 0) + LogFile->Header.CurrentRecordNumber = 1; + + /* FIXME: Read MaxSize from registry for this LogFile. But for now limit EventLog size to just under 5K. */ LogFile->Header.MaxSize = 5000; - if (!SetFilePointer(LogFile->hFile, 0, NULL, FILE_CURRENT) == + if (!SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); @@ -664,6 +692,8 @@ PEVENTLOGRECORD RecBuf; LARGE_INTEGER logFileSize; ULONG RecOffSet; + ULONG WriteOffSet; + if (!Buffer) return FALSE; @@ -680,11 +710,13 @@ /* If the size of the file is over MaxSize */ if ((logFileSize.QuadPart + BufSize)> LogFile->Header.MaxSize) { + ULONG OverWriteLength = 0; + WriteOffSet = LogfOffsetByNumber(LogFile, LogFile->Header.OldestRecordNumber); RecBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(EVENTLOGRECORD)); /* Determine how many records need to be overwritten */ while (TRUE) { - DPRINT("EventLogFile has reached maximume size\n"); + DPRINT1("EventLogFile has reached maximume size\n"); if (!RecBuf) { @@ -696,6 +728,7 @@ /* Get the oldest record data */ RecOffSet = LogfOffsetByNumber(LogFile, LogFile->Header.OldestRecordNumber); + if (SetFilePointer(LogFile->hFile, RecOffSet, NULL, @@ -721,12 +754,15 @@ return FALSE; } + LogfDeleteOffsetInformation(LogFile,LogFile->Header.OldestRecordNumber); + LogFile->Header.OldestRecordNumber++; + OverWriteLength += RecBuf->Length; /* Check the size of the record as the record adding may be larger */ - if (RecBuf->Length >= BufSize) + if (OverWriteLength >= BufSize) { - DPRINT1("Record will fit\n"); + DPRINT1("Record will fit. Lenght %d, BufSize %d\n", OverWriteLength, BufSize); LogFile->Header.StartOffset = LogfOffsetByNumber(LogFile, LogFile->Header.OldestRecordNumber); break; } @@ -737,7 +773,43 @@ } HeapFree(GetProcessHeap(), 0, RecBuf); } - + else + WriteOffSet = LogFile->Header.EndOffset; + + if (SetFilePointer(LogFile->hFile, + WriteOffSet, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if (!WriteFile(LogFile->hFile, Buffer, BufSize, &dwWritten, NULL)) + { + DPRINT1("WriteFile() failed! %d\n", GetLastError()); + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + if (!LogfAddOffsetInformation(LogFile, + LogFile->Header.CurrentRecordNumber, + WriteOffSet)) + { + LeaveCriticalSection(&LogFile->cs); + return FALSE; + } + + LogFile->Header.CurrentRecordNumber++; + + if (LogFile->Header.OldestRecordNumber == 0) + LogFile->Header.OldestRecordNumber = 1; + + if (WriteOffSet == LogFile->Header.EndOffset) + { + LogFile->Header.EndOffset += dwWritten; + } if (SetFilePointer(LogFile->hFile, LogFile->Header.EndOffset, NULL, @@ -747,27 +819,6 @@ LeaveCriticalSection(&LogFile->cs); return FALSE; } - - if (!WriteFile(LogFile->hFile, Buffer, BufSize, &dwWritten, NULL)) - { - DPRINT1("WriteFile() failed! %d\n", GetLastError()); - LeaveCriticalSection(&LogFile->cs); - return FALSE; - } - - if (!LogfAddOffsetInformation(LogFile, - LogFile->Header.CurrentRecordNumber, - LogFile->Header.EndOffset)) - { - LeaveCriticalSection(&LogFile->cs); - return FALSE; - } - - LogFile->Header.CurrentRecordNumber++; - LogFile->Header.EndOffset += dwWritten; - - if (LogFile->Header.OldestRecordNumber == 0) - LogFile->Header.OldestRecordNumber = 1; EofRec.Ones = 0x11111111; EofRec.Twos = 0x22222222; @@ -843,6 +894,24 @@ DWORD LogfGetCurrentRecord(PLOGFILE LogFile) { return LogFile->Header.CurrentRecordNumber; +} + +BOOL LogfDeleteOffsetInformation(PLOGFILE LogFile, ULONG ulNumber) +{ + int i; + + if (ulNumber != LogFile->OffsetInfo[0].EventNumber) + { + return FALSE; + } + + for (i=0;i<LogFile->OffsetInfoNext-1; i++) + { + LogFile->OffsetInfo[i].EventNumber = LogFile->OffsetInfo[i+1].EventNumber; + LogFile->OffsetInfo[i].EventOffset = LogFile->OffsetInfo[i+1].EventOffset; + } + LogFile->OffsetInfoNext--; + return TRUE; } BOOL LogfAddOffsetInformation(PLOGFILE LogFile, ULONG ulNumber, ULONG ulOffset)

15 years, 7 months

[jimtabor] 41040: - Fix NtUserVkKeyScanEx to support current thread keyboard layout or use the one provided by handle. See bug report 4269 and the related bug report 4272.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri May 22 05:35:48 2009 New Revision: 41040 URL: http://svn.reactos.org/svn/reactos?rev=41040&view=rev Log: - Fix NtUserVkKeyScanEx to support current thread keyboard layout or use the one provided by handle. See bug report 4269 and the related bug report 4272. Modified: trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Fri May 22 05:35:48 2009 @@ -492,7 +492,7 @@ VkKeyScanExW(WCHAR ch, HKL dwhkl) { - return (SHORT) NtUserVkKeyScanEx(ch, dwhkl, 0); + return (SHORT) NtUserVkKeyScanEx(ch, dwhkl, TRUE); } @@ -502,7 +502,7 @@ SHORT WINAPI VkKeyScanW(WCHAR ch) { - return VkKeyScanExW(ch, GetKeyboardLayout(0)); + return (SHORT) NtUserVkKeyScanEx(ch, 0, 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] Fri May 22 05:35:48 2009 @@ -2697,7 +2697,7 @@ NtUserVkKeyScanEx( WCHAR wChar, HKL KeyboardLayout, - DWORD Unknown2); + BOOL bUsehHK); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Fri May 22 05:35:48 2009 @@ -1000,22 +1000,31 @@ APIENTRY NtUserVkKeyScanEx( WCHAR wChar, - HKL KeyboardLayout, - DWORD Unknown2) -{ -/* FIXME: currently, this routine doesnt seem to need any locking */ + HKL hKeyboardLayout, + BOOL UsehKL ) // TRUE from KeyboardLayout, FALSE from pkbl = (THREADINFO)->KeyboardLayout +{ PKBDTABLES KeyLayout; PVK_TO_WCHAR_TABLE vtwTbl; PVK_TO_WCHARS10 vkPtr; size_t size_this_entry; int nMod; - DWORD CapsMod = 0, CapsState = 0; - - DPRINT("NtUserVkKeyScanEx() wChar %d, KbdLayout 0x%p\n", wChar, KeyboardLayout); - - if(!KeyboardLayout) - return -1; - KeyLayout = UserHklToKbl(KeyboardLayout)->KBTables; + PKBL pkbl = NULL; + DWORD CapsMod = 0, CapsState = 0, Ret = -1; + + DPRINT("NtUserVkKeyScanEx() wChar %d, KbdLayout 0x%p\n", wChar, hKeyboardLayout); + UserEnterShared(); + + if (UsehKL) + { + if ( !hKeyboardLayout || !(pkbl = UserHklToKbl(hKeyboardLayout))) + goto Exit; + } + else // From VkKeyScanAW it is FALSE so KeyboardLayout is white noise. + { + pkbl = ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->KeyboardLayout; + } + + KeyLayout = pkbl->KBTables; for (nMod = 0; KeyLayout->pVkToWcharTable[nMod].nModifications; nMod++) { @@ -1038,13 +1047,16 @@ CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState]; DPRINT("nMod %d wC %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n", nMod, wChar, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits); - return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff)); + Ret = ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff)); + goto Exit; } } vkPtr = (PVK_TO_WCHARS10)(((BYTE *)vkPtr) + size_this_entry); } } - return -1; +Exit: + UserLeave(); + return Ret; }

15 years, 7 months

[cgutman] 41039: - Fix our DMA implementation to use documented structs

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri May 22 05:26:18 2009 New Revision: 41039 URL: http://svn.reactos.org/svn/reactos?rev=41039&view=rev Log: - Fix our DMA implementation to use documented structs Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Fri May 22 05:26:18 2009 @@ -503,14 +503,17 @@ VOID EXPORT NdisMDeregisterDmaChannel( - IN PNDIS_HANDLE MiniportDmaHandle) -{ - PNDIS_MINIPORT_BLOCK NdisMiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportDmaHandle; - PDMA_ADAPTER AdapterObject = NdisMiniportBlock->SystemAdapterObject; + IN NDIS_HANDLE MiniportDmaHandle) +{ + PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; + PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + + if (AdapterObject == ((PLOGICAL_ADAPTER)DmaBlock->Miniport)->NdisMiniportBlock.SystemAdapterObject) + ((PLOGICAL_ADAPTER)DmaBlock->Miniport)->NdisMiniportBlock.SystemAdapterObject = NULL; AdapterObject->DmaOperations->PutDmaAdapter(AdapterObject); - NdisMiniportBlock->SystemAdapterObject = NULL; + ExFreePool(DmaBlock); } @@ -650,13 +653,10 @@ NdisMReadDmaCounter( IN NDIS_HANDLE MiniportDmaHandle) { - PNDIS_MINIPORT_BLOCK MiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportDmaHandle; - PDMA_ADAPTER AdapterObject = MiniportBlock->SystemAdapterObject; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - if (AdapterObject == NULL) - return 0; + PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; + PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); return AdapterObject->DmaOperations->ReadDmaCounter(AdapterObject); } @@ -670,13 +670,10 @@ NdisMGetDmaAlignment( IN NDIS_HANDLE MiniportDmaHandle) { - PNDIS_MINIPORT_BLOCK MiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportDmaHandle; - PDMA_ADAPTER AdapterObject = MiniportBlock->SystemAdapterObject; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - if (AdapterObject == NULL) - return 0; + PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; + PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); return AdapterObject->DmaOperations->GetDmaAlignment(AdapterObject); } @@ -698,15 +695,9 @@ PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; DEVICE_DESCRIPTION DeviceDesc; ULONG MapRegisters; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - if (Adapter->NdisMiniportBlock.SystemAdapterObject) - { - NDIS_DbgPrint(MIN_TRACE,("Using existing DMA adapter\n")); - *MiniportDmaHandle = &Adapter->NdisMiniportBlock; - return NDIS_STATUS_SUCCESS; - } + PNDIS_DMA_BLOCK DmaBlock; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); RtlZeroMemory(&DeviceDesc, sizeof(DEVICE_DESCRIPTION)); @@ -724,13 +715,23 @@ DeviceDesc.DmaSpeed = DmaDescription->DmaSpeed; DeviceDesc.MaximumLength = MaximumLength; - Adapter->NdisMiniportBlock.SystemAdapterObject = - IoGetDmaAdapter(Adapter->NdisMiniportBlock.PhysicalDeviceObject, &DeviceDesc, &MapRegisters); - - if (!Adapter->NdisMiniportBlock.SystemAdapterObject) + + DmaBlock = ExAllocatePool(NonPagedPool, sizeof(NDIS_DMA_BLOCK)); + if (!DmaBlock) return NDIS_STATUS_RESOURCES; - *MiniportDmaHandle = &Adapter->NdisMiniportBlock; + DmaBlock->SystemAdapterObject = (PVOID)IoGetDmaAdapter(Adapter->NdisMiniportBlock.PhysicalDeviceObject, &DeviceDesc, &MapRegisters); + + if (!DmaBlock->SystemAdapterObject) { + ExFreePool(DmaBlock); + return NDIS_STATUS_RESOURCES; + } + + Adapter->NdisMiniportBlock.SystemAdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + + DmaBlock->Miniport = Adapter; + + *MiniportDmaHandle = DmaBlock; return NDIS_STATUS_SUCCESS; }

15 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
51
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009