Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[nyadav] 52653: [AUDSRV] server ready to accept actual buffer from client
by nyadav＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: nyadav Date: Tue Jul 12 10:50:31 2011 New Revision: 52653 URL: http://svn.reactos.org/svn/reactos?rev=52653&view=rev Log: [AUDSRV] server ready to accept actual buffer from client Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -44,7 +44,8 @@ /*Balance from -1.0 to 1.0*/ float balance; - BOOL ready; + /*state cycle 0->buffer write -> 1 -> filtering -> 2 ->playback -> 0*/ + char state; /*This buffer is filled by the client using RPC calls*/ PVOID genuinebuf; int length_genuine; @@ -56,6 +57,7 @@ PVOID maxsamplevalue; HANDLE stream_played_event; + HANDLE buffer_write_event; HANDLE threadready; HANDLE thread; CRITICAL_SECTION CriticalSection; @@ -116,6 +118,9 @@ int mute, float balance); +long WriteBuffer(LONG streamid, + LONG length, + LPVOID buffer); /*mixer.c*/ void * MixS8(MixerEngine * mixer, int buffer); Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -4,7 +4,6 @@ * FILE: services/mixer.c * PURPOSE: Audio Server * COPYRIGHT: Copyright 2011 Neeraj Yadav - */ #include "audsrv.h" @@ -32,7 +31,7 @@ length = stream->length_filtered; while(stream->next != NULL) { - if(stream->length_filtered > length && stream->ready == TRUE ) + if(stream->length_filtered > length && stream->state == 2 ) length = stream->length_filtered; stream = stream->next; } @@ -47,11 +46,11 @@ minsamplevalue = 0; maxsamplevalue = 0; - while( stream != NULL) + while(stream != NULL) { EnterCriticalSection(&(stream->CriticalSection)); - if(stream->ready == TRUE && *(short *) stream->minsamplevalue != 0 && *(short *) stream->minsamplevalue != 0) + if(stream->state == 2 && *(short *) stream->minsamplevalue != 0 && *(short *) stream->minsamplevalue != 0) { coefficient = 1.0; @@ -78,12 +77,14 @@ localsinkbuf[i] = (short) (( (localsinkbuf[i] * streamcount) + ((short)((float) localsrcbuf[i] ) * coefficient) ) / (streamcount +1)); } + stream->state = 0; + HeapFree(GetProcessHeap(), + 0, + stream->filteredbuf); + + SetEvent(stream->stream_played_event); } - //stream->ready = 0; /*TODO Enable it when actual filter thread starts working*/ - //HeapFree(GetProcessHeap(), - // 0, - // stream->filteredbuf); - SetEvent(stream->stream_played_event); + LeaveCriticalSection(&(stream->CriticalSection)); streamcount++; Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -79,6 +79,14 @@ return stream; } +long AUDPlayBuffer( IN RPC_BINDING_HANDLE hBinding, + LONG streamid, + LONG length, + LPVOID buffer) +{ + WriteBuffer(streamid,length,NULL); + return 0; +} /*************************************************************************/ void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) { Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -4,7 +4,6 @@ * FILE: services/stream.c * PURPOSE: Audio Server * COPYRIGHT: Copyright 2011 Neeraj Yadav - */ #include "audsrv.h" @@ -15,92 +14,53 @@ pengine->streamidpool += 1; return streamid; } +BOOL FilterAudio(LPVOID param) +{ + ServerStream * localstream = (ServerStream *) param; + + EnterCriticalSection(&(localstream->CriticalSection)); + + if(localstream->state == 1) + { + /*Fake Filter,Simply gives the genuine buffer as filtered buffer*/ + /*minsamplevalue and maxsamplevalue must be calculated during filtering*/ + /*Filter must ensure that all the samples are distributed evenly about 0 in case of signed samples*/ + localstream->length_filtered = localstream->length_genuine; + localstream->filteredbuf = HeapAlloc(GetProcessHeap(), + 0, + localstream->length_filtered); + + memcpy(localstream->filteredbuf,localstream->genuinebuf,localstream->length_filtered); + + HeapFree(GetProcessHeap(), + 0, + localstream->genuinebuf); + + *((int *)localstream->minsamplevalue) = -32766; + *((int *)localstream->maxsamplevalue) = 32766; + + localstream->state = 2; + + LeaveCriticalSection(&(localstream->CriticalSection)); + return TRUE; + } + else + { + LeaveCriticalSection(&(localstream->CriticalSection)); + return FALSE; + } +} DWORD WINAPI RunStreamThread(LPVOID param) { - UINT i = 0; ServerStream * localstream = (ServerStream *) param; -/*UGLY HACK--WILL be removed soon-- fill filtered buffer (1 second duration in the master stream format) directly until we are in a condition to get buffer directly from the client*/ -/******************************************************/ - BOOL initmin=FALSE,initmax = FALSE; - short minimum=0,maximum = 0; - PSHORT tempbuf; - - - localstream->length_filtered = localstream->freq * localstream->channels * localstream->bitspersample / 8; - tempbuf = (PSHORT) HeapAlloc(GetProcessHeap(), - 0, - localstream->length_filtered); - - while (i < localstream->length_filtered / 2) - { - tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); - - if((localstream->streamid %2) == 0) - tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 24000); - - if(initmin) - { - if(tempbuf[i]<minimum) - minimum = tempbuf[i]; - }else - minimum = tempbuf[i]; - if(initmax) - { - if(tempbuf[i]>maximum) - maximum = tempbuf[i]; - }else - maximum = tempbuf[i]; - - if(initmin == FALSE || initmax == FALSE ) - { - initmin = TRUE; - initmax = TRUE; - } - i++; - - tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); - - if((localstream->streamid %2) == 0) - tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 24000); - - - if(initmin) - { - if(tempbuf[i]<minimum) - minimum = tempbuf[i]; - } - else - minimum = tempbuf[i]; - - if(initmax) - { - if(tempbuf[i]>maximum) - maximum = tempbuf[i]; - }else - maximum = tempbuf[i]; - i++; - } - - *((int *)localstream->minsamplevalue) = minimum; - *((int *)localstream->maxsamplevalue) = maximum; - localstream->filteredbuf = tempbuf; - localstream->ready =TRUE; - -/******************************************************/ -/*Do Some Initialization If needed.Only After these Initialization remaining system will be told that stream is ready*/ SetEvent(localstream->threadready); while (TRUE) { - /*Wait For Data Write Event,currently NO Wait considering Data has always been written*/ - - EnterCriticalSection(&(localstream->CriticalSection)); - - LeaveCriticalSection(&(localstream->CriticalSection)); - /*Wait For Stream Played Event*/ - WaitForSingleObject(localstream->stream_played_event,INFINITE); + if(FilterAudio(param) == TRUE ) + WaitForSingleObject(localstream->stream_played_event,INFINITE); } /*Clean Stream's data*/ } @@ -157,7 +117,7 @@ newstream->channels = channels; /*TODO validation*/ newstream->channelmask = channelmask; /*TODO validation*/ - newstream->ready = FALSE; + newstream->state = 0; newstream->length_genuine = 0; newstream->genuinebuf = NULL; newstream->length_filtered = 0; @@ -177,6 +137,11 @@ FALSE, NULL); + newstream->buffer_write_event = CreateEvent(NULL, + FALSE, + FALSE, + NULL); + newstream->threadready = CreateEvent(NULL, FALSE, FALSE, @@ -231,5 +196,43 @@ return 0; } +long WriteBuffer(LONG streamid, + LONG length, + LPVOID buffer) +{ + int i =0; + PSHORT tempbuf; + ServerStream * localstream = pengine->serverstreamlist; + while(localstream!=NULL) + { + if(localstream->streamid == streamid) break; + localstream = localstream->next; + } + + if(localstream == NULL) + return -1; + + EnterCriticalSection(&(localstream->CriticalSection)); + + if(localstream->state == 0) + { + localstream->length_genuine = localstream->freq * localstream->channels * localstream->bitspersample / 8; + localstream->genuinebuf = tempbuf = (PSHORT) HeapAlloc(GetProcessHeap(), + 0, + localstream->length_genuine); + + while (i < localstream->length_genuine / 2) + { + tempbuf[i+1] = tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); + i+=2; + } + + localstream->state = 1; + } + + LeaveCriticalSection(&(localstream->CriticalSection)); + + return 0; +} /*Dont forget to clean ServerStream's minsamplevalue and maxsamplevalue while removing the stream*/ /*Delete Critical Section while cleaning Stream*/ Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -92,7 +92,19 @@ /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ - Sleep(1000); + RpcTryExcept + { + AUDPlayBuffer (audsrv_v0_0_c_ifspec, + clientstream->stream, + 0, + NULL); + } + RpcExcept(1) + { + status = RpcExceptionCode(); + } + RpcEndExcept + clientstream->callbacks.BufferCopied(0); } clientstream->callbacks.PlayComplete(0); Modified: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] Tue Jul 12 10:50:31 2011 @@ -40,5 +40,5 @@ { long AUDInitStream([in] handle_t h1,[in]LONG frequency,[in]int channels,[in]int bitspersample,[in]int datatype,[in] ULONG channelmask,[in]int volume,[in]int mute,[in]float balance); - + long AUDPlayBuffer([in] handle_t h1,[in]LONG streamid,[in]LONG length,[in]LPVOID buffer); }

1 0

[gadamopoulos] 52652: [win32k] - Call UserUnregisterUserApiHook from the process cleanup routine if the process has registered the user api hook
by gadamopoulos＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: gadamopoulos Date: Tue Jul 12 09:24:16 2011 New Revision: 52652 URL: http://svn.reactos.org/svn/reactos?rev=52652&view=rev Log: [win32k] - Call UserUnregisterUserApiHook from the process cleanup routine if the process has registered the user api hook Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/main/dllmain.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue Jul 12 09:24:16 2011 @@ -382,6 +382,18 @@ } while (pti); } + + /* Do now some process cleanup that requires a valid win32 thread */ + if(Win32Thread->ppi->cThreads == 0) + { + /* Check if we have registered the user api hook */ + if(Win32Thread->ppi == ppiUahServer) + { + /* Unregister the api hook without blocking */ + UserUnregisterUserApiHook(FALSE); + } + } + DceFreeThreadDCE(Win32Thread); HOOK_DestroyThreadHooks(Thread); EVENT_DestroyThreadEvents(Thread);

1 0

[gadamopoulos] 52651: [user32] - Implement UnregisterUserApiHook - Fix a warning
by gadamopoulos＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: gadamopoulos Date: Tue Jul 12 09:14:24 2011 New Revision: 52651 URL: http://svn.reactos.org/svn/reactos?rev=52651&view=rev Log: [user32] - Implement UnregisterUserApiHook - Fix a warning Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c [iso-8859-1] Tue Jul 12 09:14:24 2011 @@ -259,7 +259,7 @@ RtlEnterCriticalSection(&gcsUserApiHook); - if (!pfn(uahLoadInit,(ULONG_PTR)&uah) || // Swap data, User32 to and Uxtheme from! + if (!pfn(uahLoadInit,&uah) || // Swap data, User32 to and Uxtheme from! uah.ForceResetUserApiHook != (FARPROC)ForceResetUserApiHook || uah.size <= 0 ) { @@ -391,7 +391,5 @@ */ BOOL WINAPI UnregisterUserApiHook(VOID) { - // Direct call to Win32k! Here only as a prototype..... - UNIMPLEMENTED; - return FALSE; -} + return NtUserUnregisterUserApiHook(); +}

1 0

[gadamopoulos] 52650: [win32k] - Implement NtUserRegisterUserApiHook and NtUserUnregisterUserApiHook
by gadamopoulos＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: gadamopoulos Date: Tue Jul 12 08:43:43 2011 New Revision: 52650 URL: http://svn.reactos.org/svn/reactos?rev=52650&view=rev Log: [win32k] - Implement NtUserRegisterUserApiHook and NtUserUnregisterUserApiHook Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/hook.h branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/msgqueue.h branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/win32.h branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/ntstubs.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/simplecall.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/hook.h [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -4,6 +4,13 @@ #define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) #define ISITHOOKED(HookId) (((PTHREADINFO)PsGetCurrentThreadWin32Thread())->fsHooks & HOOKID_TO_FLAG(HookId)) + +/* NOTE: the following definition is not a real hook but + a pseudo-id that will be used only for + injecting user api hook module to all processes. + It is used internally in win32k */ +#define WH_APIHOOK WH_MAX + 1 + typedef struct tagEVENTHOOK { @@ -43,4 +50,10 @@ LRESULT FASTCALL UserCallNextHookEx( PHOOK pHook, int Code, WPARAM wParam, LPARAM lParam, BOOL Ansi); BOOL FASTCALL IntUnhookWindowsHook(int,HOOKPROC); +BOOL FASTCALL UserLoadApiHook(); +BOOL IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload); +BOOL FASTCALL UserUnregisterUserApiHook(BOOL Block); + +extern PPROCESSINFO ppiUahServer; + /* EOF */ Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -7,6 +7,7 @@ #define MSQ_NORMAL 0 #define MSQ_ISHOOK 1 #define MSQ_ISEVENT 2 +#define MSQ_INJECTMODULE 3 #define QSIDCOUNTS 6 Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -30,6 +30,7 @@ #define W32PF_NOWINDOWGHOSTING (0x01000000) #define W32PF_MANUALGUICHECK (0x02000000) #define W32PF_CREATEDWINORDC (0x04000000) +#define W32PF_APIHOOKLOADED (0x08000000) extern BOOL ClientPfnInit; extern HINSTANCE hModClient; Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -24,7 +24,219 @@ PVOID pHookStructs; } HOOKPACK, *PHOOKPACK; +UNICODE_STRING strUahModule; +UNICODE_STRING strUahInitFunc; +PPROCESSINFO ppiUahServer; + /* PRIVATE FUNCTIONS *********************************************************/ + +/* Calls ClientLoadLibrary in user32 in order to load or unload a module */ +BOOL +IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload) +{ + PPROCESSINFO ppi; + HMODULE hmod; + + ppi = PsGetCurrentProcessWin32Process(); + + DPRINT("IntLoadHookModule. Client PID: %d\n", PsGetProcessId(ppi->peProcess)); + + /* Check if this is the api hook */ + if(iHookID == WH_APIHOOK) + { + if(!Unload && !(ppi->W32PF_flags & W32PF_APIHOOKLOADED)) + { + /* Call ClientLoadLibrary in user32 */ + hmod = co_IntClientLoadLibrary(&strUahModule, &strUahInitFunc, Unload, TRUE); + if(hmod != 0) + { + ppi->W32PF_flags |= W32PF_APIHOOKLOADED; + return TRUE; + } + return FALSE; + } + else if(Unload && (ppi->W32PF_flags & W32PF_APIHOOKLOADED)) + { + /* Call ClientLoadLibrary in user32 */ + hmod = co_IntClientLoadLibrary(NULL, NULL, Unload, TRUE); + if(hmod != 0) + { + ppi->W32PF_flags &= ~W32PF_APIHOOKLOADED; + return TRUE; + } + return FALSE; + } + + return TRUE; + } + + UNIMPLEMENTED; + + return FALSE; +} + +/* +IntHookModuleUnloaded: +Sends a internal message to all threads of the requested desktop +and notifies them that a global hook was destroyed +and an injected module must be unloaded. +As a result, IntLoadHookModule will be called for all the threads that +will receive the special purpose internal message. +*/ +BOOL +IntHookModuleUnloaded(PDESKTOP pdesk, int iHookID, HHOOK hHook, BOOL Block) +{ + PTHREADINFO ptiCurrent; + PLIST_ENTRY ListEntry; + ULONG_PTR Result; + PPROCESSINFO ppiCsr; + + DPRINT("IntHookModuleUnloaded: iHookID=%d\n", iHookID); + + ppiCsr = PsGetProcessWin32Process(CsrProcess); + + ListEntry = pdesk->PtiList.Flink; + while(ListEntry != &pdesk->PtiList) + { + ptiCurrent = CONTAINING_RECORD(ListEntry, THREADINFO, PtiLink); + + /* FIXME: do some more security checks here */ + + /* FIXME: the first check is a reactos specific hack for system threads */ + if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) && + ptiCurrent->ppi != ppiCsr) + { + if(ptiCurrent->ppi->W32PF_flags & W32PF_APIHOOKLOADED) + { + DPRINT("IntHookModuleUnloaded: sending message to PID %d, ppi=0x%x\n", PsGetProcessId(ptiCurrent->ppi->peProcess), ptiCurrent->ppi); + co_MsqSendMessage( ptiCurrent->MessageQueue, + 0, + iHookID, + TRUE, + (LPARAM)hHook, + 0, + Block, + MSQ_INJECTMODULE, + &Result); + } + } + ListEntry = ListEntry->Flink; + } + + return TRUE; +} + +BOOL +FASTCALL +UserLoadApiHook() +{ + return IntLoadHookModule(WH_APIHOOK, 0, FALSE); +} + +BOOL +FASTCALL +UserRegisterUserApiHook( + PUNICODE_STRING pstrDllName, + PUNICODE_STRING pstrFuncName) +{ + PTHREADINFO pti, ptiCurrent; + HWND *List; + PWND DesktopWindow, pwndCurrent; + ULONG i; + ULONG_PTR Result; + PPROCESSINFO ppiCsr; + + pti = PsGetCurrentThreadWin32Thread(); + ppiCsr = PsGetProcessWin32Process(CsrProcess); + + /* Fail if the api hook is already registered */ + if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) + { + return FALSE; + } + + DPRINT("UserRegisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); + + /* Register the api hook */ + gpsi->dwSRVIFlags |= SRVINFO_APIHOOK; + + strUahModule = *pstrDllName; + strUahInitFunc = *pstrFuncName; + ppiUahServer = pti->ppi; + + /* Broadcast an internal message to every top level window */ + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + List = IntWinListChildren(DesktopWindow); + + if (List != NULL) + { + for (i = 0; List[i]; i++) + { + pwndCurrent = UserGetWindowObject(List[i]); + if(pwndCurrent == NULL) + { + continue; + } + ptiCurrent = pwndCurrent->head.pti; + + /* FIXME: the first check is a reactos specific hack for system threads */ + if(PsIsSystemProcess(ptiCurrent->ppi->peProcess) || + ptiCurrent->ppi == ppiCsr) + { + continue; + } + + co_MsqSendMessage( ptiCurrent->MessageQueue, + 0, + WH_APIHOOK, + FALSE, /* load the module */ + 0, + 0, + TRUE, + MSQ_INJECTMODULE, + &Result); + if(Result == FALSE) + { + DPRINT1("Failed to inject module to process %d\n", PsGetProcessId(ptiCurrent->ppi->peProcess)); + } + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + + return TRUE; +} + +BOOL +FASTCALL +UserUnregisterUserApiHook(BOOL Block) +{ + PTHREADINFO pti; + + pti = PsGetCurrentThreadWin32Thread(); + + /* Fail if the api hook is not registered */ + if(!(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)) + { + return FALSE; + } + + /* Only the process that registered the api hook can uregister it */ + if(ppiUahServer != PsGetCurrentProcessWin32Process()) + { + return FALSE; + } + + DPRINT1("UserUnregisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); + + /* Unregister the api hook */ + gpsi->dwSRVIFlags &= ~SRVINFO_APIHOOK; + ppiUahServer = NULL; + ReleaseCapturedUnicodeString(&strUahModule, UserMode); + ReleaseCapturedUnicodeString(&strUahInitFunc, UserMode); + + /* Notify all applications that the api hook module must be unloaded */ + return IntHookModuleUnloaded(pti->rpdesk, WH_APIHOOK, 0, TRUE); +} static LRESULT @@ -1527,4 +1739,64 @@ END_CLEANUP; } +BOOL +APIENTRY +NtUserRegisterUserApiHook( + PUNICODE_STRING m_dllname1, + PUNICODE_STRING m_funname1, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + BOOL ret; + UNICODE_STRING strDllNameSafe; + UNICODE_STRING strFuncNameSafe; + NTSTATUS Status; + + /* Probe and capture parameters */ + Status = ProbeAndCaptureUnicodeString(&strDllNameSafe, UserMode, m_dllname1); + if(!NT_SUCCESS(Status)) + { + EngSetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + Status = ProbeAndCaptureUnicodeString(&strFuncNameSafe, UserMode, m_funname1); + if(!NT_SUCCESS(Status)) + { + ReleaseCapturedUnicodeString(&strDllNameSafe, UserMode); + EngSetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + UserEnterExclusive(); + + /* Call internal function */ + ret = UserRegisterUserApiHook(&strDllNameSafe, &strFuncNameSafe); + + UserLeave(); + + /* Cleanup only in case of failure */ + if(ret == FALSE) + { + ReleaseCapturedUnicodeString(&strDllNameSafe, UserMode); + ReleaseCapturedUnicodeString(&strFuncNameSafe, UserMode); + } + + return ret; +} + +BOOL +APIENTRY +NtUserUnregisterUserApiHook(VOID) +{ + BOOL ret; + + UserEnterExclusive(); + ret = UserUnregisterUserApiHook(TRUE); + UserLeave(); + + return ret; +} + + /* EOF */ Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -811,6 +811,12 @@ Message->Msg.wParam, Message->Msg.lParam); } + else if(Message->HookMessage == MSQ_INJECTMODULE) + { + Result = IntLoadHookModule(Message->Msg.message, + (HHOOK)Message->Msg.lParam, + Message->Msg.wParam); + } else if ((Message->CompletionCallback) && (Message->CallBackSenderQueue == MessageQueue)) { /* Call the callback routine */ Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -891,20 +891,6 @@ BOOL APIENTRY -NtUserRegisterUserApiHook( - PUNICODE_STRING m_dllname1, - PUNICODE_STRING m_funname1, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - UserEnterExclusive(); - UNIMPLEMENTED; - UserLeave(); - return 0; -} - -BOOL -APIENTRY NtUserRegisterRawInputDevices( IN PCRAWINPUTDEVICE pRawInputDevices, IN UINT uiNumDevices, @@ -1038,14 +1024,6 @@ BOOL APIENTRY -NtUserUnregisterUserApiHook(VOID) -{ - UNIMPLEMENTED; - return 0; -} - -BOOL -APIENTRY NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *pcrKey, Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Tue Jul 12 08:43:43 2011 @@ -121,6 +121,9 @@ case NOPARAM_ROUTINE_RELEASECAPTURE: RETURN( (DWORD_PTR)IntReleaseCapture()); + + case NOPARAM_ROUTINE_LOADUSERAPIHOOK: + RETURN(UserLoadApiHook()); default: DPRINT1("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine);

1 0

[gadamopoulos] 52649: [win32k] - Implement co_IntClientLoadLibrary that calls ClientLoadLibrary in user32
by gadamopoulos＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: gadamopoulos Date: Tue Jul 12 08:37:40 2011 New Revision: 52649 URL: http://svn.reactos.org/svn/reactos?rev=52649&view=rev Log: [win32k] - Implement co_IntClientLoadLibrary that calls ClientLoadLibrary in user32 Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/callback.h branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/callback.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/callback.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/callback.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/callback.h [iso-8859-1] Tue Jul 12 08:37:40 2011 @@ -56,3 +56,9 @@ HMENU APIENTRY co_IntCallLoadMenu(HINSTANCE,PUNICODE_STRING); NTSTATUS APIENTRY co_IntClientThreadSetup(VOID); + +HMODULE +co_IntClientLoadLibrary(PUNICODE_STRING strLibName, + PUNICODE_STRING strInitFunc, + BOOL Unload, + BOOL ApiHook); Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Tue Jul 12 08:37:40 2011 @@ -116,6 +116,111 @@ } /* FUNCTIONS *****************************************************************/ + +/* calls ClientLoadLibrary in user32 */ +HMODULE +co_IntClientLoadLibrary(PUNICODE_STRING pstrLibName, + PUNICODE_STRING pstrInitFunc, + BOOL Unload, + BOOL ApiHook) +{ + PVOID ResultPointer; + ULONG ResultLength; + ULONG ArgumentLength; + PCLIENT_LOAD_LIBRARY_ARGUMENTS pArguments; + NTSTATUS Status; + HMODULE Result; + ULONG_PTR pLibNameBuffer = 0, pInitFuncBuffer = 0; + + DPRINT("co_IntClientLoadLibrary: %S, %S, %d, %d\n", pstrLibName->Buffer, pstrLibName->Buffer, Unload, ApiHook); + + /* Calculate the size of the argument */ + ArgumentLength = sizeof(CLIENT_LOAD_LIBRARY_ARGUMENTS); + if(pstrLibName) + { + pLibNameBuffer = ArgumentLength; + ArgumentLength += pstrLibName->Length + sizeof(WCHAR); + } + if(pstrInitFunc) + { + pInitFuncBuffer = ArgumentLength; + ArgumentLength += pstrInitFunc->Length + sizeof(WCHAR); + } + + /* Allocate the argument*/ + pArguments = IntCbAllocateMemory(ArgumentLength); + if(pArguments == NULL) + { + return FALSE; + } + + /* Fill the argument */ + pArguments->Unload = Unload; + pArguments->ApiHook = ApiHook; + if(pstrLibName) + { + /* Copy the string to the callback memory */ + pLibNameBuffer += (ULONG_PTR)pArguments; + pArguments->strLibraryName.Buffer = (PWCHAR)pLibNameBuffer; + pArguments->strLibraryName.MaximumLength = pstrLibName->Length + sizeof(WCHAR); + RtlCopyUnicodeString(&pArguments->strLibraryName, pstrLibName); + + /* Fix argument pointer to be relative to the argument */ + pLibNameBuffer -= (ULONG_PTR)pArguments; + pArguments->strLibraryName.Buffer = (PWCHAR)(pLibNameBuffer); + } + else + { + RtlZeroMemory(&pArguments->strLibraryName, sizeof(UNICODE_STRING)); + } + + if(pstrInitFunc) + { + /* Copy the strings to the callback memory */ + pInitFuncBuffer += (ULONG_PTR)pArguments; + pArguments->strInitFuncName.Buffer = (PWCHAR)pInitFuncBuffer; + pArguments->strInitFuncName.MaximumLength = pstrInitFunc->Length + sizeof(WCHAR); + RtlCopyUnicodeString(&pArguments->strInitFuncName, pstrInitFunc); + + /* Fix argument pointers to be relative to the argument */ + pInitFuncBuffer -= (ULONG_PTR)pArguments; + pArguments->strInitFuncName.Buffer = (PWCHAR)(pInitFuncBuffer); + } + else + { + RtlZeroMemory(&pArguments->strInitFuncName, sizeof(UNICODE_STRING)); + } + + /* Do the callback */ + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_CLIENTLOADLIBRARY, + pArguments, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + if(!NT_SUCCESS(Status)) + { + return FALSE; + } + + _SEH2_TRY + { + ProbeForRead(ResultPointer, sizeof(HMODULE), 1); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(HMODULE*)ResultPointer; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Result = 0; + } + _SEH2_END; + + return Result; +} VOID APIENTRY co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,

1 0

[gadamopoulos] 52648: [user32] - Convert LOADUSERAPIHOOK macro to an inline function - Implement ClientLoadLibrary callback from win32k
by gadamopoulos＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: gadamopoulos Date: Tue Jul 12 08:34:00 2011 New Revision: 52648 URL: http://svn.reactos.org/svn/reactos?rev=52648&view=rev Log: [user32] - Convert LOADUSERAPIHOOK macro to an inline function - Implement ClientLoadLibrary callback from win32k Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/controls/scrollbar.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/include/user32.h branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/desktop.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/dllmain.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/defwnd.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/draw.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/hook.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/nonclient.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/paint.c branches/GSoC_2011/ThemesSupport/include/reactos/win32k/callback.h Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -1482,7 +1482,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -1534,7 +1534,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -1615,7 +1615,7 @@ BOOL Hook; INT Ret = 0; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/include/user32.h [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -45,6 +45,11 @@ /* SEH Support with PSEH */ #include <pseh/pseh2.h> +extern PPROCESSINFO g_ppi; +extern ULONG_PTR g_ulSharedDelta; +extern PSERVERINFO gpsi; +extern BOOL gfServerProcess; + #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) #define ISITHOOKED(HookId) (GetWin32ClientInfo()->fsHooks & HOOKID_TO_FLAG(HookId) ||\ (GetWin32ClientInfo()->pDeskInfo && GetWin32ClientInfo()->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId))) @@ -53,29 +58,37 @@ extern RTL_CRITICAL_SECTION gcsUserApiHook; extern USERAPIHOOK guah; +extern HINSTANCE ghmodUserApiHook; BOOL FASTCALL BeginIfHookedUserApiHook(VOID); BOOL FASTCALL EndUserApiHook(VOID); BOOL FASTCALL IsInsideUserApiHook(VOID); VOID FASTCALL ResetUserApiHook(PUSERAPIHOOK); BOOL FASTCALL IsMsgOverride(UINT,PUAHOWP); +BOOL WINAPI InitUserApiHook(HINSTANCE hInstance, USERAPIHOOKPROC pfn); +BOOL WINAPI ClearUserApiHook(HINSTANCE hInstance); -#define LOADUSERAPIHOOK \ - if (!gfServerProcess && \ - !IsInsideUserApiHook() && \ - (gpsi->dwSRVIFlags & SRVINFO_APIHOOK) && \ - !RtlIsThreadWithinLoaderCallout()) \ - { \ - NtUserCallNoParam(NOPARAM_ROUTINE_LOADUSERAPIHOOK); \ - } \ +static __inline void LoadUserApiHook() +{ + if(!(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)) + return; + + if(IsInsideUserApiHook()) + return; + + /* HACK! Please remove when gfServerProcess is correct */ +#if 0 + if(gfServerProcess) + return; +#endif + if(RtlIsThreadWithinLoaderCallout()) + return; + + NtUserCallNoParam(NOPARAM_ROUTINE_LOADUSERAPIHOOK); +} /* FIXME: Use ntgdi.h then cleanup... */ LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); BOOL FASTCALL IsMetaFile(HDC); - -extern PPROCESSINFO g_ppi; -extern ULONG_PTR g_ulSharedDelta; -extern PSERVERINFO gpsi; -extern BOOL gfServerProcess; static __inline PVOID SharedPtrToUser(PVOID Ptr) Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/desktop.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -113,7 +113,7 @@ return RealGetSystemMetrics(nIndex); } - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -336,7 +336,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -368,7 +368,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/dllmain.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -217,6 +217,8 @@ (PVOID)User32CallLoadMenuFromKernel; KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] = (PVOID)User32CallClientThreadSetupFromKernel; + KernelCallbackTable[USER32_CALLBACK_CLIENTLOADLIBRARY] = + (PVOID)User32CallClientLoadLibraryFromKernel; NtUserProcessConnect( NtCurrentProcess(), &UserCon, Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/usrapihk.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -318,7 +318,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -2209,7 +2209,7 @@ BOOL Hook, msgOverride = FALSE; LRESULT Result = 0; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); if (Hook) @@ -2242,7 +2242,7 @@ BOOL Hook, msgOverride = FALSE; LRESULT Result = 0; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); if (Hook) Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/draw.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -1457,7 +1457,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/hook.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -425,6 +425,111 @@ DWORD dwThreadId) { return IntSetWindowsHook(idHook, lpfn, hMod, dwThreadId, FALSE); +} + +HINSTANCE ClientLoadLibrary(PUNICODE_STRING pstrLibName, + PUNICODE_STRING pstrInitFunc, + BOOL Unload, + BOOL ApiHook) +{ + HINSTANCE hLibrary; + PVOID pInitFunction; + NTSTATUS Status; + ANSI_STRING InitFuncName; + BOOL Result = FALSE; + + /* Check if we have to load the module */ + if(Unload == FALSE) + { + ASSERT(pstrLibName->Buffer != NULL); + + /* Load it */ + hLibrary = LoadLibrary(pstrLibName->Buffer); + if(hLibrary == 0) + { + return hLibrary; + } + + if(ApiHook == FALSE) + { + /* There is nothing more to do for a global hook*/ + return hLibrary; + } + + /* Initialize the user api hook */ + ASSERT(pstrInitFunc->Buffer); + + Status = RtlUnicodeStringToAnsiString(&InitFuncName, + pstrInitFunc, + TRUE); + + /* Get the address of the initialization routine */ + pInitFunction = GetProcAddress(hLibrary, InitFuncName.Buffer); + if(pInitFunction) + { + /* Call the initialization routine */ + Result = InitUserApiHook(hLibrary, (USERAPIHOOKPROC)pInitFunction); + } + RtlFreeAnsiString(&InitFuncName); + + /* In case of error unload the library */ + if(Result == FALSE) + { + FreeLibrary(hLibrary); + hLibrary = 0; + } + } + else + { + /* Cleanup user api hook before unloading */ + if(ApiHook == TRUE) + { + Result = ClearUserApiHook(ghmodUserApiHook); + hLibrary = Result ? ghmodUserApiHook : 0; + } + else + { + hLibrary = GetModuleHandle(pstrLibName->Buffer); + Result = (hLibrary != 0); + } + + if(Result == TRUE) + { + Result = FreeLibrary(hLibrary); + if(Result == FALSE) + { + hLibrary = 0; + } + } + } + + return hLibrary; +} + +NTSTATUS WINAPI +User32CallClientLoadLibraryFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + HINSTANCE Result; + PCLIENT_LOAD_LIBRARY_ARGUMENTS Argument; + + /* Retireve the callback parameters */ + Argument = (PCLIENT_LOAD_LIBRARY_ARGUMENTS)Arguments; + if(Argument->strLibraryName.Buffer != NULL) + { + Argument->strLibraryName.Buffer = (PWCHAR)((ULONG_PTR)Argument->strLibraryName.Buffer + (ULONG_PTR)Argument); + } + if(Argument->strInitFuncName.Buffer != NULL) + { + Argument->strInitFuncName.Buffer = (PWCHAR)((ULONG_PTR)Argument->strInitFuncName.Buffer + (ULONG_PTR)Argument); + } + + /* Call the implementation of the callback */ + Result = ClientLoadLibrary(&Argument->strLibraryName, + &Argument->strInitFuncName, + Argument->Unload, + Argument->ApiHook); + + return ZwCallbackReturn(&Result, sizeof(HINSTANCE), STATUS_SUCCESS); } NTSTATUS WINAPI Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/nonclient.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -1104,7 +1104,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -1148,7 +1148,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/windows/paint.c [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -200,7 +200,7 @@ BOOL Hook; int Ret = 0; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: branches/GSoC_2011/ThemesSupport/include/reactos/win32k/callback.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/include… ============================================================================== --- branches/GSoC_2011/ThemesSupport/include/reactos/win32k/callback.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/include/reactos/win32k/callback.h [iso-8859-1] Tue Jul 12 08:34:00 2011 @@ -9,7 +9,8 @@ #define USER32_CALLBACK_EVENTPROC (5) #define USER32_CALLBACK_LOADMENU (6) #define USER32_CALLBACK_CLIENTTHREADSTARTUP (7) -#define USER32_CALLBACK_MAXIMUM (7) +#define USER32_CALLBACK_CLIENTLOADLIBRARY (8) +#define USER32_CALLBACK_MAXIMUM (8) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -76,6 +77,14 @@ WCHAR MenuName[1]; } LOADMENU_CALLBACK_ARGUMENTS, *PLOADMENU_CALLBACK_ARGUMENTS; +typedef struct _CLIENT_LOAD_LIBRARY_ARGUMENTS +{ + UNICODE_STRING strLibraryName; + UNICODE_STRING strInitFuncName; + BOOL Unload; + BOOL ApiHook; +} CLIENT_LOAD_LIBRARY_ARGUMENTS, *PCLIENT_LOAD_LIBRARY_ARGUMENTS; + NTSTATUS WINAPI User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -92,5 +101,6 @@ User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength); - +NTSTATUS WINAPI +User32CallClientLoadLibraryFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */

1 0

[tkreuzer] 52647: [NTOSKRNL] Align the idt to 16 bytes. Fixes random boot problems on MSVC builds.
by tkreuzer＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: tkreuzer Date: Tue Jul 12 01:04:20 2011 New Revision: 52647 URL: http://svn.reactos.org/svn/reactos?rev=52647&view=rev Log: [NTOSKRNL] Align the idt to 16 bytes. Fixes random boot problems on MSVC builds. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Jul 12 01:04:20 2011 @@ -31,6 +31,8 @@ .data ASSUME nothing + +.align 16 PUBLIC _KiIdt _KiIdt:

1 0

[tkreuzer] 52646: [USETUP] Do not add RosDbg section on _WINKD_ builds
by tkreuzer＠svn.reactos.org 12 Jul '11

12 Jul '11

Author: tkreuzer Date: Tue Jul 12 00:27:22 2011 New Revision: 52646 URL: http://svn.reactos.org/svn/reactos?rev=52646&view=rev Log: [USETUP] Do not add RosDbg section on _WINKD_ builds Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Tue Jul 12 00:27:22 2011 @@ -494,11 +494,13 @@ L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); #if DBG +#ifndef _WINKD_ /* ReactOS_KdSerial */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_KdSerial", L"\"ReactOS (RosDbg)\"", L"Windows2003", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); +#endif /* ReactOS_LogFile */ CreateFreeLoaderEntry(IniCache, IniSection,

1 0

[gadamopoulos] 52645: [uxtheme] - Implement drawing non client scrollbars. This code is heavily based on code from wine and modified properly to use themes
by gadamopoulos＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: gadamopoulos Date: Mon Jul 11 22:29:33 2011 New Revision: 52645 URL: http://svn.reactos.org/svn/reactos?rev=52645&view=rev Log: [uxtheme] - Implement drawing non client scrollbars. This code is heavily based on code from wine and modified properly to use themes Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncscrollbar.c (with props) Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Mon Jul 11 22:29:33 2011 @@ -11,6 +11,7 @@ main.c metric.c msstyles.c + ncscrollbar.c nonclient.c property.c stylemap.c Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncscrollbar.c (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Mon Jul 11 22:29:33 2011 @@ -1,0 +1,676 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS uxtheme.dll + * FILE: dll/win32/uxtheme/ncscrollbar.c + * PURPOSE: uxtheme scrollbar support + * PROGRAMMER: Giannis Adamopoulos + * This file is heavily based on code from the wine project: + * Copyright 1993 Martin Ayotte + * Copyright 1994, 1996 Alexandre Julliard + */ + +#include <windows.h> +#include "undocuser.h" +#include "vfwmsgs.h" +#include "uxtheme.h" +#include <tmschema.h> +#include <Windowsx.h> +#include "ncthm.h" +#include <assert.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); + +static BOOL SCROLL_trackVertical; +static enum SCROLL_HITTEST SCROLL_trackHitTest; +/* Is the moving thumb being displayed? */ +static HWND SCROLL_TrackingWin = 0; +static INT SCROLL_TrackingBar = 0; +static INT SCROLL_TrackingPos = 0; +static INT SCROLL_TrackingVal = 0; + +void static ScreenToWindow( HWND hWnd, POINT* pt) +{ + RECT rcWnd; + GetWindowRect(hWnd, &rcWnd); + pt->x -= rcWnd.left; + pt->y -= rcWnd.top; +} + +static BOOL SCROLL_IsVertical(HWND hwnd, INT nBar) +{ + switch(nBar) + { + case SB_HORZ: + return FALSE; + case SB_VERT: + return TRUE; + default: + assert(FALSE); + return FALSE; + } +} + +static LONG SCROLL_getObjectId(INT nBar) +{ + switch(nBar) + { + case SB_HORZ: + return OBJID_HSCROLL; + case SB_VERT: + return OBJID_VSCROLL; + default: + assert(FALSE); + return 0; + } +} + +/*********************************************************************** + * SCROLL_PtInRectEx + */ +static BOOL SCROLL_PtInRectEx( LPRECT lpRect, POINT pt, BOOL vertical ) +{ + RECT rect = *lpRect; + int scrollbarWidth; + + /* Pad hit rect to allow mouse to be dragged outside of scrollbar and + * still be considered in the scrollbar. */ + if (vertical) + { + scrollbarWidth = lpRect->right - lpRect->left; + rect.left -= scrollbarWidth*8; + rect.right += scrollbarWidth*8; + rect.top -= scrollbarWidth*2; + rect.bottom += scrollbarWidth*2; + } + else + { + scrollbarWidth = lpRect->bottom - lpRect->top; + rect.left -= scrollbarWidth*2; + rect.right += scrollbarWidth*2; + rect.top -= scrollbarWidth*8; + rect.bottom += scrollbarWidth*8; + } + return PtInRect( &rect, pt ); +} + + +/*********************************************************************** + * SCROLL_HitTest + * + * Scroll-bar hit testing (don't confuse this with WM_NCHITTEST!). + */ +static enum SCROLL_HITTEST SCROLL_HitTest( HWND hwnd, SCROLLBARINFO* psbi, BOOL vertical, + POINT pt, BOOL bDragging ) +{ + if ( (bDragging && !SCROLL_PtInRectEx( &psbi->rcScrollBar, pt, vertical )) || + (!PtInRect( &psbi->rcScrollBar, pt )) ) + { + return SCROLL_NOWHERE; + } + + if (vertical) + { + if (pt.y < psbi->rcScrollBar.top + psbi->dxyLineButton) + return SCROLL_TOP_ARROW; + if (pt.y >= psbi->rcScrollBar.bottom - psbi->dxyLineButton) + return SCROLL_BOTTOM_ARROW; + if (!psbi->xyThumbTop) + return SCROLL_TOP_RECT; + pt.y -= psbi->rcScrollBar.top; + if (pt.y < psbi->xyThumbTop) + return SCROLL_TOP_RECT; + if (pt.y >= psbi->xyThumbTop + psbi->dxyLineButton) + return SCROLL_BOTTOM_RECT; + } + else /* horizontal */ + { + if (pt.x < psbi->rcScrollBar.left + psbi->dxyLineButton) + return SCROLL_TOP_ARROW; + if (pt.x >= psbi->rcScrollBar.right - psbi->dxyLineButton) + return SCROLL_BOTTOM_ARROW; + if (!psbi->xyThumbTop) + return SCROLL_TOP_RECT; + pt.x -= psbi->rcScrollBar.left; + if (pt.x < psbi->xyThumbTop) + return SCROLL_TOP_RECT; + if (pt.x >= psbi->xyThumbTop + psbi->dxyLineButton) + return SCROLL_BOTTOM_RECT; + } + return SCROLL_THUMB; +} + +static void SCROLL_ThemeDrawPart(PDRAW_CONTEXT pcontext, int iPartId,int iStateId, SCROLLBARINFO* psbi, int htCurrent, int htDown, int htHot, RECT* r) +{ + if(psbi->rgstate[htCurrent] & STATE_SYSTEM_UNAVAILABLE) + iStateId += BUTTON_DISABLED - BUTTON_NORMAL; + else if (htHot == htCurrent) + iStateId += BUTTON_HOT - BUTTON_NORMAL; + else if (htDown == htCurrent) + iStateId += BUTTON_PRESSED - BUTTON_NORMAL; + + DrawThemeBackground(pcontext->scrolltheme, pcontext->hDC, iPartId, iStateId, r, NULL); +} + +/*********************************************************************** + * SCROLL_DrawArrows + * + * Draw the scroll bar arrows. + */ +static void SCROLL_DrawArrows( PDRAW_CONTEXT pcontext, SCROLLBARINFO* psbi, + BOOL vertical, int htDown, int htHot ) +{ + RECT r; + int iStateId; + + r = psbi->rcScrollBar; + if( vertical ) + { + r.bottom = r.top + psbi->dxyLineButton; + iStateId = ABS_UPNORMAL; + } + else + { + r.right = r.left + psbi->dxyLineButton; + iStateId = ABS_LEFTNORMAL; + } + + SCROLL_ThemeDrawPart(pcontext, SBP_ARROWBTN, iStateId, psbi, SCROLL_TOP_ARROW, htDown, htHot, &r); + + r = psbi->rcScrollBar; + if( vertical ) + { + r.top = r.bottom - psbi->dxyLineButton; + iStateId = ABS_DOWNNORMAL; + } + else + { + iStateId = ABS_RIGHTNORMAL; + r.left = r.right - psbi->dxyLineButton; + } + + SCROLL_ThemeDrawPart(pcontext, SBP_ARROWBTN, iStateId, psbi, SCROLL_BOTTOM_ARROW, htDown, htHot, &r); +} + +static void SCROLL_DrawInterior( PDRAW_CONTEXT pcontext, SCROLLBARINFO* psbi, + INT thumbPos, BOOL vertical, + int htDown, int htHot ) +{ + RECT r, rcPart; + + r = psbi->rcScrollBar; + if (vertical) + { + r.top += psbi->dxyLineButton; + r.bottom -= (psbi->dxyLineButton); + } + else + { + r.left += psbi->dxyLineButton; + r.right -= psbi->dxyLineButton; + } + + /* Draw the scroll rectangles and thumb */ + + if (!thumbPos) /* No thumb to draw */ + { + rcPart = r; + SCROLL_ThemeDrawPart(pcontext, vertical ? SBP_UPPERTRACKVERT: SBP_UPPERTRACKHORZ , BUTTON_NORMAL, psbi, SCROLL_THUMB, 0, 0, &rcPart); + return; + } + + if (vertical) + { + rcPart = r; + rcPart.bottom = rcPart.top + thumbPos - psbi->dxyLineButton; + SCROLL_ThemeDrawPart(pcontext, SBP_UPPERTRACKVERT, BUTTON_NORMAL, psbi, SCROLL_TOP_RECT, htDown, htHot, &rcPart); + r.top = rcPart.bottom; + + rcPart = r; + rcPart.top += psbi->dxyLineButton; + SCROLL_ThemeDrawPart(pcontext, SBP_LOWERTRACKVERT, BUTTON_NORMAL, psbi, SCROLL_BOTTOM_RECT, htDown, htHot, &rcPart); + r.bottom = rcPart.top; + + SCROLL_ThemeDrawPart(pcontext, SBP_THUMBBTNVERT, BUTTON_NORMAL, psbi, SCROLL_THUMB, htDown, htHot, &r); + SCROLL_ThemeDrawPart(pcontext, SBP_GRIPPERVERT, BUTTON_NORMAL, psbi, SCROLL_THUMB, htDown, htHot, &r); + } + else /* horizontal */ + { + rcPart = r; + rcPart.right = rcPart.left + thumbPos - psbi->dxyLineButton; + SCROLL_ThemeDrawPart(pcontext, SBP_UPPERTRACKHORZ, BUTTON_NORMAL, psbi, SCROLL_TOP_RECT, htDown, htHot, &rcPart); + r.left = rcPart.right; + + rcPart = r; + rcPart.left += psbi->dxyLineButton; + SCROLL_ThemeDrawPart(pcontext, SBP_LOWERTRACKHORZ, BUTTON_NORMAL, psbi, SCROLL_BOTTOM_RECT, htDown, htHot, &rcPart); + r.right = rcPart.left; + + SCROLL_ThemeDrawPart(pcontext, SBP_THUMBBTNHORZ, BUTTON_NORMAL, psbi, SCROLL_THUMB, htDown, htHot, &r); + SCROLL_ThemeDrawPart(pcontext, SBP_GRIPPERHORZ, BUTTON_NORMAL, psbi, SCROLL_THUMB, htDown, htHot, &r); + } +} + +static void SCROLL_DrawMovingThumb( PDRAW_CONTEXT pcontext, SCROLLBARINFO* psbi, BOOL vertical) +{ + INT pos = SCROLL_TrackingPos; + INT max_size; + + if( vertical ) + max_size = psbi->rcScrollBar.bottom - psbi->rcScrollBar.top; + else + max_size = psbi->rcScrollBar.right - psbi->rcScrollBar.left; + + max_size -= (psbi->dxyLineButton -SCROLL_ARROW_THUMB_OVERLAP) + psbi->dxyLineButton; + + if( pos < (psbi->dxyLineButton-SCROLL_ARROW_THUMB_OVERLAP) ) + pos = (psbi->dxyLineButton-SCROLL_ARROW_THUMB_OVERLAP); + else if( pos > max_size ) + pos = max_size; + + SCROLL_DrawInterior(pcontext, psbi, pos, vertical, SCROLL_THUMB, 0); + + SCROLL_MovingThumb = !SCROLL_MovingThumb; +} + + +void +ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT nBar, POINT* pt) +{ + BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb; + SCROLLINFO si; + SCROLLBARINFO sbi; + BOOL vertical; + enum SCROLL_HITTEST htHot = SCROLL_NOWHERE; + + /* Retrieve scrollbar info */ + sbi.cbSize = sizeof(sbi); + si.cbSize = sizeof(si); + si.fMask = SIF_ALL ; + GetScrollInfo(pcontext->hWnd, nBar, &si); + GetScrollBarInfo(pcontext->hWnd, SCROLL_getObjectId(nBar), &sbi); + vertical = SCROLL_IsVertical(pcontext->hWnd, nBar); + if(sbi.rgstate[SCROLL_TOP_ARROW] & STATE_SYSTEM_UNAVAILABLE && + sbi.rgstate[SCROLL_BOTTOM_ARROW] & STATE_SYSTEM_UNAVAILABLE ) + { + sbi.xyThumbTop = 0; + } + +#ifndef ROS_SUCKS + /* The scrollbar rect is in screen coordinates */ +// OffsetRect(&sbi.rcScrollBar, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); +#endif + + if(pt) + { + ScreenToWindow(pcontext->hWnd, pt); + htHot = SCROLL_HitTest(pcontext->hWnd, &sbi, vertical, *pt, FALSE); + } + + if (((nBar == SB_VERT) && !(pcontext->wi.dwStyle & WS_VSCROLL)) || + ((nBar == SB_HORZ) && !(pcontext->wi.dwStyle & WS_HSCROLL))) return; + + /* do not draw if the scrollbar rectangle is empty */ + if(IsRectEmpty(&sbi.rcScrollBar)) return; + + /* Draw the scrollbar */ + SCROLL_DrawArrows( pcontext, &sbi, vertical, 0, htHot ); + SCROLL_DrawInterior( pcontext, &sbi, sbi.xyThumbTop, vertical, 0, htHot ); +} + + + +/*********************************************************************** + * SCROLL_ClipPos + */ +static POINT SCROLL_ClipPos( LPRECT lpRect, POINT pt ) +{ + if( pt.x < lpRect->left ) + pt.x = lpRect->left; + else + if( pt.x > lpRect->right ) + pt.x = lpRect->right; + + if( pt.y < lpRect->top ) + pt.y = lpRect->top; + else + if( pt.y > lpRect->bottom ) + pt.y = lpRect->bottom; + + return pt; +} + + + +/*********************************************************************** + * SCROLL_GetThumbVal + * + * Compute the current scroll position based on the thumb position in pixels + * from the top of the scroll-bar. + */ +static UINT SCROLL_GetThumbVal( SCROLLINFO *psi, RECT *rect, + BOOL vertical, INT pos ) +{ + INT thumbSize; + INT pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left; + INT range; + + if ((pixels -= 2*(GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP)) <= 0) + return psi->nMin; + + if (psi->nPage) + { + thumbSize = MulDiv(pixels,psi->nPage,(psi->nMax-psi->nMin+1)); + if (thumbSize < SCROLL_MIN_THUMB) thumbSize = SCROLL_MIN_THUMB; + } + else thumbSize = GetSystemMetrics(SM_CXVSCROLL); + + if ((pixels -= thumbSize) <= 0) return psi->nMin; + + pos = max( 0, pos - (GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP) ); + if (pos > pixels) pos = pixels; + + if (!psi->nPage) + range = psi->nMax - psi->nMin; + else + range = psi->nMax - psi->nMin - psi->nPage + 1; + + return psi->nMin + MulDiv(pos, range, pixels); +} + +static void +SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) +{ + /* Previous mouse position for timer events */ + static POINT prevPt; + /* Thumb position when tracking started. */ + static UINT trackThumbPos; + /* Position in the scroll-bar of the last button-down event. */ + static INT lastClickPos; + /* Position in the scroll-bar of the last mouse event. */ + static INT lastMousePos; + + enum SCROLL_HITTEST hittest; + HWND hwndOwner, hwndCtl; + BOOL vertical; + SCROLLINFO si; + SCROLLBARINFO sbi; + DRAW_CONTEXT context; + + si.cbSize = sizeof(si); + sbi.cbSize = sizeof(sbi); + si.fMask = SIF_ALL; + GetScrollInfo(hwnd, nBar, &si); + GetScrollBarInfo(hwnd, SCROLL_getObjectId(nBar), &sbi); + vertical = SCROLL_IsVertical(hwnd, nBar); + if(sbi.rgstate[SCROLL_TOP_ARROW] & STATE_SYSTEM_UNAVAILABLE && + sbi.rgstate[SCROLL_BOTTOM_ARROW] & STATE_SYSTEM_UNAVAILABLE ) + { + return; + } + ThemeInitDrawContext(&context, hwnd, 0); + +#ifndef ROS_SUCKS + /* The scrollbar rect is in screen coordinates */ +// OffsetRect(&sbi.rcScrollBar, -context.wi.rcWindow.left, -context.wi.rcWindow.top); +#endif + + if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) + return; + + hwndOwner = (nBar == SB_CTL) ? GetParent(hwnd) : hwnd; + hwndCtl = (nBar == SB_CTL) ? hwnd : 0; + + switch(msg) + { + case WM_LBUTTONDOWN: /* Initialise mouse tracking */ + HideCaret(hwnd); /* hide caret while holding down LBUTTON */ + SCROLL_trackVertical = vertical; + SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd, &sbi, vertical, pt, FALSE ); + lastClickPos = vertical ? (pt.y - sbi.rcScrollBar.top) : (pt.x - sbi.rcScrollBar.left); + lastMousePos = lastClickPos; + trackThumbPos = sbi.xyThumbTop; + prevPt = pt; + SetCapture( hwnd ); + break; + + case WM_MOUSEMOVE: + hittest = SCROLL_HitTest( hwnd, &sbi, vertical, pt, TRUE ); + prevPt = pt; + break; + + case WM_LBUTTONUP: + hittest = SCROLL_NOWHERE; + ReleaseCapture(); + /* if scrollbar has focus, show back caret */ + if (hwnd==GetFocus()) + ShowCaret(hwnd); + break; + + case WM_SYSTIMER: + pt = prevPt; + hittest = SCROLL_HitTest( hwnd, &sbi, vertical, pt, FALSE ); + break; + + default: + return; /* Should never happen */ + } + + //TRACE("Event: hwnd=%p bar=%d msg=%s pt=%d,%d hit=%d\n", + // hwnd, nBar, SPY_GetMsgName(msg,hwnd), pt.x, pt.y, hittest ); + + switch(SCROLL_trackHitTest) + { + case SCROLL_NOWHERE: /* No tracking in progress */ + break; + + case SCROLL_TOP_ARROW: + if (hittest == SCROLL_trackHitTest) + { + SCROLL_DrawArrows( &context, &sbi, vertical, SCROLL_trackHitTest, 0 ); + if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) + { + SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, + SB_LINEUP, (LPARAM)hwndCtl ); + } + + SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, NULL ); + } + else + { + SCROLL_DrawArrows( &context, &sbi, vertical, 0, 0 ); + KillSystemTimer( hwnd, SCROLL_TIMER ); + } + + break; + + case SCROLL_TOP_RECT: + SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, SCROLL_trackHitTest, 0); + if (hittest == SCROLL_trackHitTest) + { + if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) + { + SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, + SB_PAGEUP, (LPARAM)hwndCtl ); + } + SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, NULL ); + } + else KillSystemTimer( hwnd, SCROLL_TIMER ); + break; + + case SCROLL_THUMB: + if (msg == WM_LBUTTONDOWN) + { + SCROLL_TrackingWin = hwnd; + SCROLL_TrackingBar = nBar; + SCROLL_TrackingPos = trackThumbPos + lastMousePos - lastClickPos; + SCROLL_TrackingVal = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar, + vertical, SCROLL_TrackingPos ); + if (!SCROLL_MovingThumb) + SCROLL_DrawMovingThumb(&context, &sbi, vertical); + } + else if (msg == WM_LBUTTONUP) + { + if (SCROLL_MovingThumb) + SCROLL_DrawMovingThumb(&context, &sbi, vertical); + + SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, 0, SCROLL_trackHitTest ); + } + else /* WM_MOUSEMOVE */ + { + INT pos; + + if (!SCROLL_PtInRectEx( &sbi.rcScrollBar, pt, vertical )) + pos = lastClickPos; + else + { + pt = SCROLL_ClipPos( &sbi.rcScrollBar, pt ); + pos = vertical ? (pt.y - sbi.rcScrollBar.top) : (pt.x - sbi.rcScrollBar.left); + } + if ( (pos != lastMousePos) || (!SCROLL_MovingThumb) ) + { + if (SCROLL_MovingThumb) + SCROLL_DrawMovingThumb( &context, &sbi, vertical); + lastMousePos = pos; + SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos; + SCROLL_TrackingVal = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar, + vertical, + SCROLL_TrackingPos ); + SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, + MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), + (LPARAM)hwndCtl ); + if (!SCROLL_MovingThumb) + SCROLL_DrawMovingThumb( &context, &sbi, vertical); + } + } + break; + + case SCROLL_BOTTOM_RECT: + if (hittest == SCROLL_trackHitTest) + { + SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, SCROLL_trackHitTest, 0 ); + if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) + { + SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, + SB_PAGEDOWN, (LPARAM)hwndCtl ); + } + SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, NULL ); + } + else + { + SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, 0, 0 ); + KillSystemTimer( hwnd, SCROLL_TIMER ); + } + break; + + case SCROLL_BOTTOM_ARROW: + if (hittest == SCROLL_trackHitTest) + { + SCROLL_DrawArrows( &context, &sbi, vertical, SCROLL_trackHitTest, 0 ); + if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) + { + SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, + SB_LINEDOWN, (LPARAM)hwndCtl ); + } + + SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, NULL ); + } + else + { + SCROLL_DrawArrows( &context, &sbi, vertical, 0, 0 ); + KillSystemTimer( hwnd, SCROLL_TIMER ); + } + break; + } + + if (msg == WM_LBUTTONDOWN) + { + + if (hittest == SCROLL_THUMB) + { + UINT val = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar, vertical, + trackThumbPos + lastMousePos - lastClickPos ); + SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, + MAKEWPARAM( SB_THUMBTRACK, val ), (LPARAM)hwndCtl ); + } + } + + if (msg == WM_LBUTTONUP) + { + hittest = SCROLL_trackHitTest; + SCROLL_trackHitTest = SCROLL_NOWHERE; /* Terminate tracking */ + + if (hittest == SCROLL_THUMB) + { + UINT val = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar, vertical, + trackThumbPos + lastMousePos - lastClickPos ); + SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, + MAKEWPARAM( SB_THUMBPOSITION, val ), (LPARAM)hwndCtl ); + } + /* SB_ENDSCROLL doesn't report thumb position */ + SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, + SB_ENDSCROLL, (LPARAM)hwndCtl ); + + /* Terminate tracking */ + SCROLL_TrackingWin = 0; + } + + ThemeCleanupDrawContext(&context); +} + +static void +SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) +{ + MSG msg; + + ScreenToWindow(hwnd, &pt); + + SCROLL_HandleScrollEvent( hwnd, scrollbar, WM_LBUTTONDOWN, pt ); + + do + { + if (!GetMessageW( &msg, 0, 0, 0 )) break; + if (CallMsgFilterW( &msg, MSGF_SCROLLBAR )) continue; + if (msg.message == WM_LBUTTONUP || + msg.message == WM_MOUSEMOVE || + (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) + { + pt.x = GET_X_LPARAM(msg.lParam); + pt.y = GET_Y_LPARAM(msg.lParam); + ClientToScreen(hwnd, &pt); + ScreenToWindow(hwnd, &pt); + SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); + } + else + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + if (!IsWindow( hwnd )) + { + ReleaseCapture(); + break; + } + } while (msg.message != WM_LBUTTONUP && GetCapture() == hwnd); +} + +void NC_TrackScrollBar( HWND hwnd, WPARAM wParam, POINT pt ) +{ + INT scrollbar; + + if ((wParam & 0xfff0) == SC_HSCROLL) + { + if ((wParam & 0x0f) != HTHSCROLL) return; + scrollbar = SB_HORZ; + } + else /* SC_VSCROLL */ + { + if ((wParam & 0x0f) != HTVSCROLL) return; + scrollbar = SB_VERT; + } + SCROLL_TrackScrollBar( hwnd, scrollbar, pt ); +} Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncscrollbar.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h [iso-8859-1] Mon Jul 11 22:29:33 2011 @@ -4,6 +4,7 @@ HWND hWnd; HDC hDC; HTHEME theme; + HTHEME scrolltheme; HTHEME hPrevTheme; WINDOWINFO wi; BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ @@ -36,6 +37,17 @@ BUTTON_INACTIVE } THEME_BUTTON_STATES; + /* Scroll-bar hit testing */ +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; + #define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ @@ -48,4 +60,36 @@ #define MENU_BAR_ITEMS_SPACE (12) +#define SCROLL_TIMER 0 /* Scroll timer id */ + + /* Overlap between arrows and thumb */ +#define SCROLL_ARROW_THUMB_OVERLAP 0 + + /* Delay (in ms) before first repetition when holding the button down */ +#define SCROLL_FIRST_DELAY 200 + + /* Delay (in ms) between scroll repetitions */ +#define SCROLL_REPEAT_DELAY 50 + +/* Minimum size of the thumb in pixels */ +#define SCROLL_MIN_THUMB 6 + +/* Minimum size of the rectangle between the arrows */ +#define SCROLL_MIN_RECT 4 + +void +ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); + +VOID +NC_TrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt); + +void +ThemeInitDrawContext(PDRAW_CONTEXT pcontext, + HWND hWnd, + HRGN hRgn); + +void +ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext); + + extern ATOM atWindowTheme; Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Jul 11 22:29:33 2011 @@ -156,7 +156,7 @@ return S_OK; } -static void +void ThemeInitDrawContext(PDRAW_CONTEXT pcontext, HWND hWnd, HRGN hRgn) @@ -167,6 +167,7 @@ pcontext->Active = IsWindowActive(hWnd, pcontext->wi.dwExStyle); pcontext->hPrevTheme = GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWindowTheme)); pcontext->theme = OpenThemeData(pcontext->hWnd, L"WINDOW"); + pcontext->scrolltheme = OpenThemeData(pcontext->hWnd, L"SCROLLBAR"); pcontext->CaptionHeight = pcontext->wi.cyWindowBorders; pcontext->CaptionHeight += GetSystemMetrics(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMCAPTION : SM_CYCAPTION ); @@ -180,12 +181,13 @@ pcontext->hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN); } -static void +void ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext) { ReleaseDC(pcontext->hWnd ,pcontext->hDC); CloseThemeData (pcontext->theme); + CloseThemeData (pcontext->scrolltheme); SetPropW(pcontext->hWnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), pcontext->hPrevTheme); @@ -629,12 +631,6 @@ } static void -ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar) -{ - -} - -static void ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent) { if(!(pcontext->wi.dwStyle & WS_VISIBLE)) @@ -662,10 +658,10 @@ ThemeDrawMenuBar(pcontext, prcCurrent); if(pcontext->wi.dwStyle & WS_HSCROLL) - ThemeDrawScrollBar(pcontext, OBJID_VSCROLL); + ThemeDrawScrollBar(pcontext, SB_HORZ , NULL); if(pcontext->wi.dwStyle & WS_VSCROLL) - ThemeDrawScrollBar(pcontext, OBJID_HSCROLL); + ThemeDrawScrollBar(pcontext, SB_VERT, NULL); } /* @@ -690,7 +686,7 @@ } static LRESULT -ThemeHandleNcMouseMove(HWND hWnd, DWORD ht) +ThemeHandleNcMouseMove(HWND hWnd, DWORD ht, POINT* pt) { DRAW_CONTEXT context; TRACKMOUSEEVENT tme; @@ -708,6 +704,13 @@ ThemeInitDrawContext(&context, hWnd, 0); ThemeDrawCaptionButtons(&context, ht, 0); + + if(context.wi.dwStyle & WS_HSCROLL) + ThemeDrawScrollBar(&context, SB_HORZ , ht == HTHSCROLL ? pt : NULL); + + if(context.wi.dwStyle & WS_VSCROLL) + ThemeDrawScrollBar(&context, SB_VERT, ht == HTVSCROLL ? pt : NULL); + ThemeCleanupDrawContext(&context); return 0; @@ -720,6 +723,13 @@ ThemeInitDrawContext(&context, hWnd, 0); ThemeDrawCaptionButtons(&context, 0, 0); + + if(context.wi.dwStyle & WS_HSCROLL) + ThemeDrawScrollBar(&context, SB_HORZ, NULL); + + if(context.wi.dwStyle & WS_VSCROLL) + ThemeDrawScrollBar(&context, SB_VERT, NULL); + ThemeCleanupDrawContext(&context); return 0; @@ -1021,7 +1031,12 @@ ThemeHandleNCPaint(hWnd, (HRGN)1); return TRUE; case WM_NCMOUSEMOVE: - return ThemeHandleNcMouseMove(hWnd, wParam); + { + POINT Point; + Point.x = GET_X_LPARAM(lParam); + Point.y = GET_Y_LPARAM(lParam); + return ThemeHandleNcMouseMove(hWnd, wParam, &Point); + } case WM_NCMOUSELEAVE: return ThemeHandleNcMouseLeave(hWnd); case WM_NCLBUTTONDOWN: @@ -1044,6 +1059,21 @@ Point.y = GET_Y_LPARAM(lParam); return DefWndNCHitTest(hWnd, Point); } + case WM_SYSCOMMAND: + { + if((wParam & 0xfff0) == SC_VSCROLL || + (wParam & 0xfff0) == SC_HSCROLL) + { + POINT Pt; + Pt.x = (short)LOWORD(lParam); + Pt.y = (short)HIWORD(lParam); + NC_TrackScrollBar(hWnd, wParam, Pt); + } + else + { + return DefWndProc(hWnd, Msg, wParam, lParam); + } + } case WM_NCUAHDRAWCAPTION: case WM_NCUAHDRAWFRAME: /* FIXME: how should these be handled? */

1 0

[arty] 52644: [CMAKE] Revert this for now.
by arty＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: arty Date: Mon Jul 11 21:46:54 2011 New Revision: 52644 URL: http://svn.reactos.org/svn/reactos?rev=52644&view=rev Log: [CMAKE] Revert this for now. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] Mon Jul 11 21:46:54 2011 @@ -17,8 +17,6 @@ #include <debug.h> /* GLOBALS ******************************************************************/ - -#define CURRENT_PROCESS ((HANDLE)~0) typedef struct _IMAGE_SYMBOL_INFO_CACHE { @@ -637,69 +635,14 @@ /* Nothing here */ } -typedef struct { - PMDL Mdl; - SIZE_T Size; - PVOID OriginalMapping; -} KdbpMallocHeader; - -static PVOID KdbpSymAllocMem(ULONG_PTR Size) -{ - KdbpMallocHeader *Hdr; - if (Size < PAGE_SIZE) - { - PVOID Result = ExAllocatePoolWithTag(NonPagedPool, Size + sizeof(KdbpMallocHeader), 'RSYM'); - if (!Result) return NULL; - Hdr = (KdbpMallocHeader*)Result; - Hdr->Mdl = NULL; - Hdr->Size = Size; - return &Hdr[1]; - } - else - { - PVOID Base = NULL; - SIZE_T RegionSize = Size + sizeof(KdbpMallocHeader); - NTSTATUS Status = NtAllocateVirtualMemory - (CURRENT_PROCESS, &Base, 0, &RegionSize, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return NULL; - Hdr = (KdbpMallocHeader*)Base; - Hdr->Mdl = IoAllocateMdl(Base, RegionSize, FALSE, FALSE, NULL); - if (!Hdr->Mdl) { - NtFreeVirtualMemory(CURRENT_PROCESS, &Base, &RegionSize, MEM_RELEASE); - return NULL; - } - Hdr->Size = RegionSize; - Hdr->OriginalMapping = Base; - MmProbeAndLockPages(Hdr->Mdl, KernelMode, IoModifyAccess); - KdbpMallocHeader *MappedHdr = (KdbpMallocHeader*)MmMapLockedPages(Hdr->Mdl, KernelMode); - if (!MappedHdr) { - MmUnlockPages(Hdr->Mdl); - IoFreeMdl(Hdr->Mdl); - NtFreeVirtualMemory(CURRENT_PROCESS, &Base, &RegionSize, MEM_RELEASE); - return NULL; - } - return &MappedHdr[1]; - } +static PVOID KdbpSymAllocMem(ULONG_PTR size) +{ + return ExAllocatePoolWithTag(NonPagedPool, size, 'RSYM'); } static VOID KdbpSymFreeMem(PVOID Area) { - PCHAR HdrPtr = ((PCHAR)Area) - sizeof(KdbpMallocHeader); - KdbpMallocHeader *Hdr = (KdbpMallocHeader*)HdrPtr; - if (Hdr->Size < PAGE_SIZE) - { - ExFreePool(Hdr); - } - else - { - PMDL Mdl = Hdr->Mdl; - PVOID BaseAddress = Hdr->OriginalMapping; - SIZE_T RegionSize = Hdr->Size; - MmUnmapLockedPages(Hdr, Mdl); - MmUnlockPages(Mdl); - NtFreeVirtualMemory(CURRENT_PROCESS, &BaseAddress, &RegionSize, MEM_RELEASE); - IoFreeMdl(Mdl); - } + return ExFreePool(Area); } static BOOLEAN KdbpSymReadMem(PVOID FileContext, PVOID TargetDebug, PVOID SourceMem, ULONG Size)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2011