Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 44397: [Win32k] - Patch by Huw Davies huw@codeweavers.com : Fix incorrect initialization of path array. - Patch was modified from wine. Tested with Area.exe path test, still fails.
by jimtabor＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: jimtabor Date: Fri Dec 4 07:47:23 2009 New Revision: 44397 URL: http://svn.reactos.org/svn/reactos?rev=44397&view=rev Log: [Win32k] - Patch by Huw Davies huw(a)codeweavers.com : Fix incorrect initialization of path array. - Patch was modified from wine. Tested with Area.exe path test, still fails. Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Fri Dec 4 07:47:23 2009 @@ -1504,9 +1504,9 @@ FASTCALL PATH_WidenPath(DC *dc) { - INT i, j, numStrokes, numOldStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; + INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; BOOL ret = FALSE; - PPATH pPath, pNewPath, *pStrokes, *pOldStrokes, pUpPath, pDownPath; + PPATH pPath, pNewPath, *pStrokes = NULL, *pOldStrokes, pUpPath, pDownPath; EXTLOGPEN *elp; DWORD obj_type, joint, endcap, penType; PDC_ATTR pdcattr = dc->pdcattr; @@ -1572,14 +1572,6 @@ penWidthOut++; numStrokes = 0; - numOldStrokes = 1; - - pStrokes = ExAllocatePoolWithTag(PagedPool, sizeof(PPATH), TAG_PATH); - pStrokes[0] = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH); - PATH_InitGdiPath(pStrokes[0]); - pStrokes[0]->pFlags = ExAllocatePoolWithTag(PagedPool, pPath->numEntriesUsed * sizeof(INT), TAG_PATH); - pStrokes[0]->pPoints = ExAllocatePoolWithTag(PagedPool, pPath->numEntriesUsed * sizeof(POINT), TAG_PATH); - pStrokes[0]->numEntriesUsed = 0; for(i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++) { @@ -1601,11 +1593,17 @@ } numStrokes++; j = 0; - pOldStrokes = pStrokes; // Save old pointer. - pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(PPATH), TAG_PATH); - RtlCopyMemory(pStrokes, pOldStrokes, numOldStrokes * sizeof(PPATH)); - numOldStrokes = numStrokes; // Save orig count. - ExFreePoolWithTag(pOldStrokes, TAG_PATH); // Free old pointer. + if (numStrokes == 1) + pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(PPATH), TAG_PATH); + else + { + pOldStrokes = pStrokes; // Save old pointer. + pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(PPATH), TAG_PATH); + if (!pStrokes) return FALSE; + RtlCopyMemory(pStrokes, pOldStrokes, numStrokes * sizeof(PPATH)); + ExFreePoolWithTag(pOldStrokes, TAG_PATH); // Free old pointer. + } + if (!pStrokes) return FALSE; pStrokes[numStrokes - 1] = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH); PATH_InitGdiPath(pStrokes[numStrokes - 1]);

1 0

[sserapion] 44396: Remove broken definitions from oskit bsd headers. Fixes numerous warnings.
by sserapion＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: sserapion Date: Fri Dec 4 01:12:31 2009 New Revision: 44396 URL: http://svn.reactos.org/svn/reactos?rev=44396&view=rev Log: Remove broken definitions from oskit bsd headers. Fixes numerous warnings. Modified: branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/ansi.h branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/types.h Modified: branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/ansi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/ansi.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/ansi.h [iso-8859-1] Fri Dec 4 01:12:31 2009 @@ -36,6 +36,8 @@ #ifndef _MACHINE_ANSI_H_ #define _MACHINE_ANSI_H_ +#include <stddef.h> + /* * Types which are fundamental to the implementation and must be declared * in more than one standard header are defined here. Standard headers @@ -45,13 +47,13 @@ * #undef _BSD_SIZE_T_ * #endif */ -#define _BSD_CLOCK_T_ unsigned long /* clock() */ -#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ +#define _BSD_CLOCK_T_ clock_t /* clock() */ +#define _BSD_PTRDIFF_T_ ptrdiff_t /* ptr1 - ptr2 */ #ifndef _BSD_SIZE_T_ -#define _BSD_SIZE_T_ unsigned int /* sizeof() */ +#define _BSD_SIZE_T_ size_t /* sizeof() */ #endif -#define _BSD_SSIZE_T_ int /* byte count or error */ -#define _BSD_TIME_T_ long /* time() */ +#define _BSD_SSIZE_T_ ssize_t /* byte count or error */ +#define _BSD_TIME_T_ time_t /* time() */ /* * Types which are fundamental to the implementation and must be used @@ -59,9 +61,9 @@ * one (perhaps nonstandard) header are defined here. Standard headers * use _BSD_XXX_T_ without undef'ing it. */ -#define _BSD_OFF_T_ long long /* file offset */ -#define _BSD_PID_T_ long /* process [group] */ -#define _BSD_VA_LIST_ char * /* va_list */ +#define _BSD_OFF_T_ off_t /* file offset */ +#define _BSD_PID_T_ pid_t /* process [group] */ +#define _BSD_VA_LIST_ va_list /* va_list */ /* * Runes (wchar_t) is declared to be an ``int'' instead of the more natural @@ -77,8 +79,8 @@ * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains * defined for ctype.h. */ -#define _BSD_WCHAR_T_ int /* wchar_t */ -#define _BSD_RUNE_T_ int /* rune_t */ +#define _BSD_WCHAR_T_ wchar_t /* wchar_t */ +#define _BSD_RUNE_T_ rune_t /* rune_t */ /* * Frequencies of the clock ticks reported by clock() and times(). They Modified: branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/types.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/types.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/types.h [iso-8859-1] Fri Dec 4 01:12:31 2009 @@ -112,29 +112,6 @@ #include <machine/ansi.h> #include <machine/types.h> -#ifdef _BSD_CLOCK_T_ -#define _CLOCK_T_DEFINED -typedef _BSD_CLOCK_T_ clock_t; -#undef _BSD_CLOCK_T_ -#endif - -#ifdef _BSD_SIZE_T_ -#define _SIZE_T_DEFINED -typedef _BSD_SIZE_T_ size_t; -#undef _BSD_SIZE_T_ -#endif - -#ifdef _BSD_SSIZE_T_ -typedef _BSD_SSIZE_T_ ssize_t; -#define _SSIZE_T_DEFINED -#undef _BSD_SSIZE_T_ -#endif - -#ifdef _BSD_TIME_T_ -#define _TIME_T_DEFINED -typedef _BSD_TIME_T_ time_t; -#undef _BSD_TIME_T_ -#endif #ifndef _POSIX_SOURCE #define NBBY 8 /* number of bits in a byte */

1 0

[dgorbachev] 44395: Bitmap files for SndRec32. Marco Pagliaricci, bug #4978.
by dgorbachev＠svn.reactos.org 03 Dec '09

03 Dec '09

Author: dgorbachev Date: Thu Dec 3 23:12:29 2009 New Revision: 44395 URL: http://svn.reactos.org/svn/reactos?rev=44395&view=rev Log: Bitmap files for SndRec32. Marco Pagliaricci, bug #4978. Added: trunk/reactos/base/applications/sndrec32/but_end_dis.bmp (with props) trunk/reactos/base/applications/sndrec32/but_play_dis.bmp (with props) trunk/reactos/base/applications/sndrec32/but_rec_dis.bmp (with props) trunk/reactos/base/applications/sndrec32/but_start_dis.bmp (with props) trunk/reactos/base/applications/sndrec32/but_stop_dis.bmp (with props) Added: trunk/reactos/base/applications/sndrec32/but_end_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/but_end_dis.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/sndrec32/but_play_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/but_play_dis.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/sndrec32/but_rec_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/but_rec_dis.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/sndrec32/but_start_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/but_start_dis.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/sndrec32/but_stop_dis.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/sndrec32/but_stop_dis.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[gschneider] 44394: [kernel32] - OpenFile: set the structure size after doing basic parameter checks - Fixes two kernel32 file tests
by gschneider＠svn.reactos.org 03 Dec '09

03 Dec '09

Author: gschneider Date: Thu Dec 3 22:50:52 2009 New Revision: 44394 URL: http://svn.reactos.org/svn/reactos?rev=44394&view=rev Log: [kernel32] - OpenFile: set the structure size after doing basic parameter checks - Fixes two kernel32 file tests Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Thu Dec 3 22:50:52 2009 @@ -239,7 +239,6 @@ return HFILE_ERROR; } - lpReOpenBuff->cBytes = sizeof(OFSTRUCT); lpReOpenBuff->nErrCode = 0; if (uStyle & OF_REOPEN) lpFileName = lpReOpenBuff->szPathName; @@ -282,10 +281,11 @@ return -1; default: + lpReOpenBuff->cBytes = sizeof(OFSTRUCT); return 1; } } - + lpReOpenBuff->cBytes = sizeof(OFSTRUCT); if ((uStyle & OF_CREATE) == OF_CREATE) { DWORD Sharing;

1 0

[jimtabor] 44393: [Win32k] - Reformat message.c - [Start] Re-implement Get/PeekMessage support.
by jimtabor＠svn.reactos.org 03 Dec '09

03 Dec '09

Author: jimtabor Date: Thu Dec 3 21:09:42 2009 New Revision: 44393 URL: http://svn.reactos.org/svn/reactos?rev=44393&view=rev Log: [Win32k] - Reformat message.c - [Start] Re-implement Get/PeekMessage support. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Dec 3 21:09:42 2009 @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> + +#define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) typedef struct { @@ -421,123 +423,6 @@ return retval; } - -BOOL -APIENTRY -NtUserCallMsgFilter( - LPMSG lpmsg, - INT code) -{ - BOOL BadChk = FALSE, Ret = TRUE; - MSG Msg; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserCallMsgFilter\n"); - UserEnterExclusive(); - if (lpmsg) - { - _SEH2_TRY - { - ProbeForRead((PVOID)lpmsg, - sizeof(MSG), - 1); - RtlCopyMemory( &Msg, - (PVOID)lpmsg, - sizeof(MSG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - } - else - RETURN( FALSE); - - if (BadChk) RETURN( FALSE); - - if (!co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) - { - Ret = co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)&Msg); - } - - _SEH2_TRY - { - ProbeForWrite((PVOID)lpmsg, - sizeof(MSG), - 1); - RtlCopyMemory((PVOID)lpmsg, - &Msg, - sizeof(MSG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; - if (BadChk) RETURN( FALSE); - RETURN( Ret) - -CLEANUP: - DPRINT("Leave NtUserCallMsgFilter. ret=%i\n", _ret_); - UserLeave(); - END_CLEANUP; -} - -LRESULT APIENTRY -NtUserDispatchMessage(PMSG UnsafeMsgInfo) -{ - LRESULT Res = 0; - BOOL Hit = FALSE; - MSG SafeMsg; - - UserEnterExclusive(); - _SEH2_TRY - { - ProbeForRead(UnsafeMsgInfo, sizeof(MSG), 1); - RtlCopyMemory(&SafeMsg, UnsafeMsgInfo, sizeof(MSG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Hit = TRUE; - } - _SEH2_END; - - if (!Hit) Res = IntDispatchMessage(&SafeMsg); - - UserLeave(); - return Res; -} - - -BOOL APIENTRY -NtUserTranslateMessage(LPMSG lpMsg, - HKL dwhkl) -{ - NTSTATUS Status; - MSG SafeMsg; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserTranslateMessage\n"); - UserEnterExclusive(); - - Status = MmCopyFromCaller(&SafeMsg, lpMsg, sizeof(MSG)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - RETURN( IntTranslateKbdMessage(&SafeMsg, dwhkl)); - -CLEANUP: - DPRINT("Leave NtUserTranslateMessage: ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - VOID FASTCALL co_IntSendHitTestMessages(PUSER_MESSAGE_QUEUE ThreadQueue, LPMSG Msg) { @@ -756,7 +641,6 @@ return FALSE; } - /* * Internal version of PeekMessage() doing all the work */ @@ -992,105 +876,17 @@ return Present; } -BOOL APIENTRY -NtUserPeekMessage(PNTUSERGETMESSAGEINFO UnsafeInfo, - HWND hWnd, - UINT MsgFilterMin, - UINT MsgFilterMax, - UINT RemoveMsg) -{ - NTSTATUS Status; - BOOL Present; - NTUSERGETMESSAGEINFO Info; - PWINDOW_OBJECT Window; - PMSGMEMORY MsgMemoryEntry; - PVOID UserMem; - UINT Size; - USER_MESSAGE Msg; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserPeekMessage\n"); - UserEnterExclusive(); - - if (hWnd == (HWND)-1 || hWnd == (HWND)0x0000FFFF || hWnd == (HWND)0xFFFFFFFF) - hWnd = (HWND)1; - - /* Validate input */ - if (hWnd && hWnd != (HWND)1) - { - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN(-1); - } - } - else - { - Window = (PWINDOW_OBJECT)hWnd; - } - - if (MsgFilterMax < MsgFilterMin) - { - MsgFilterMin = 0; - MsgFilterMax = 0; - } - - Present = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, RemoveMsg); - if (Present) - { - - Info.Msg = Msg.Msg; - /* See if this message type is present in the table */ - MsgMemoryEntry = FindMsgMemory(Info.Msg.message); - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - Info.LParamSize = 0; - } - else - { - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, Info.Msg.wParam, - Info.Msg.lParam); - /* Allocate required amount of user-mode memory */ - Info.LParamSize = Size; - UserMem = NULL; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0, - &Info.LParamSize, MEM_COMMIT, PAGE_READWRITE); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( (BOOL) -1); - } - /* Transfer lParam data to user-mode mem */ - Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Size); - if (! NT_SUCCESS(Status)) - { - ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, - &Info.LParamSize, MEM_RELEASE); - SetLastNtError(Status); - RETURN( (BOOL) -1); - } - Info.Msg.lParam = (LPARAM) UserMem; - } - if (RemoveMsg && Msg.FreeLParam && 0 != Msg.Msg.lParam) - { - ExFreePool((void *) Msg.Msg.lParam); - } - Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( (BOOL) -1); - } - } - - RETURN( Present); - -CLEANUP: - DPRINT("Leave NtUserPeekMessage, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} +BOOL FASTCALL +co_IntGetPeekMessage( PMSG pMsg, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax, + UINT RemoveMsg, + BOOL bGMSG) +{ + return FALSE; +} + static BOOL FASTCALL co_IntWaitMessage(PWINDOW_OBJECT Window, @@ -1111,7 +907,6 @@ { return TRUE; } - /* Nothing found. Wait for new messages. */ Status = co_MsqWaitForNewMessages(ThreadQueue, Window, MsgFilterMin, MsgFilterMax); } @@ -1121,6 +916,814 @@ return FALSE; } + + +static NTSTATUS FASTCALL +CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry) +{ + NTSTATUS Status; + + PVOID KernelMem; + UINT Size; + + *KernelModeMsg = *UserModeMsg; + + /* See if this message type is present in the table */ + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + return STATUS_SUCCESS; + } + + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); + + if (0 != Size) + { + /* Allocate kernel mem */ + KernelMem = ExAllocatePoolWithTag(PagedPool, Size, TAG_MSG); + if (NULL == KernelMem) + { + DPRINT1("Not enough memory to copy message to kernel mem\n"); + return STATUS_NO_MEMORY; + } + KernelModeMsg->lParam = (LPARAM) KernelMem; + + /* Copy data if required */ + if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) + { + Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); + ExFreePoolWithTag(KernelMem, TAG_MSG); + return Status; + } + } + else + { + /* Make sure we don't pass any secrets to usermode */ + RtlZeroMemory(KernelMem, Size); + } + } + else + { + KernelModeMsg->lParam = 0; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS FASTCALL +CopyMsgToUserMem(MSG *UserModeMsg, MSG *KernelModeMsg) +{ + NTSTATUS Status; + PMSGMEMORY MsgMemoryEntry; + UINT Size; + + /* See if this message type is present in the table */ + MsgMemoryEntry = FindMsgMemory(UserModeMsg->message); + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + return STATUS_SUCCESS; + } + + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); + + if (0 != Size) + { + /* Copy data if required */ + if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_WRITE)) + { + Status = MmCopyToCaller((PVOID) UserModeMsg->lParam, (PVOID) KernelModeMsg->lParam, Size); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to copy message from kernel: invalid usermode buffer\n"); + ExFreePool((PVOID) KernelModeMsg->lParam); + return Status; + } + } + + ExFreePool((PVOID) KernelModeMsg->lParam); + } + + return STATUS_SUCCESS; +} + +BOOL FASTCALL +UserPostThreadMessage( DWORD idThread, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + MSG Message; + PETHREAD peThread; + PTHREADINFO pThread; + LARGE_INTEGER LargeTickCount; + NTSTATUS Status; + + DPRINT1("UserPostThreadMessage wParam 0x%x lParam 0x%x\n", wParam,lParam); + + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } + + Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); + + if( Status == STATUS_SUCCESS ) + { + pThread = (PTHREADINFO)peThread->Tcb.Win32Thread; + if( !pThread || !pThread->MessageQueue || (pThread->TIF_flags & TIF_INCLEANUP)) + { + ObDereferenceObject( peThread ); + return FALSE; + } + + Message.hwnd = NULL; + Message.message = Msg; + Message.wParam = wParam; + Message.lParam = lParam; + IntGetCursorLocation(pThread->Desktop->WindowStation, &Message.pt); + KeQueryTickCount(&LargeTickCount); + pThread->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); + MsqPostMessage(pThread->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); + ObDereferenceObject( peThread ); + return TRUE; + } + else + { + SetLastNtError( Status ); + } + return FALSE; +} + +BOOL FASTCALL +UserPostMessage(HWND Wnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + PTHREADINFO pti; + MSG Message; + LARGE_INTEGER LargeTickCount; + + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } + + if (!Wnd) + return UserPostThreadMessage( PtrToInt(PsGetCurrentThreadId()), + Msg, + wParam, + lParam); + + if (Wnd == HWND_BROADCAST) + { + HWND *List; + PWINDOW_OBJECT DesktopWindow; + ULONG i; + + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + List = IntWinListChildren(DesktopWindow); + + if (List != NULL) + { + for (i = 0; List[i]; i++) + UserPostMessage(List[i], Msg, wParam, lParam); + ExFreePool(List); + } + } + else + { + PWINDOW_OBJECT Window; + + Window = UserGetWindowObject(Wnd); + if ( !Window || !Window->Wnd ) + { + return FALSE; + } + + pti = Window->Wnd->head.pti; + if ( pti->TIF_flags & TIF_INCLEANUP ) + { + DPRINT1("Attempted to post message to window 0x%x when the thread is in cleanup!\n", Wnd); + return FALSE; + } + + if ( Window->Status & WINDOWSTATUS_DESTROYING ) + { + DPRINT1("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd); + /* FIXME - last error code? */ + return FALSE; + } + + if (WM_QUIT == Msg) + { + MsqPostQuitMessage(Window->MessageQueue, wParam); + } + else + { + Message.hwnd = Wnd; + Message.message = Msg; + Message.wParam = wParam; + Message.lParam = lParam; + IntGetCursorLocation(pti->Desktop->WindowStation, &Message.pt); + KeQueryTickCount(&LargeTickCount); + pti->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); + MsqPostMessage(Window->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); + } + } + return TRUE; +} + + +LRESULT FASTCALL +co_IntSendMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + ULONG_PTR Result = 0; + if(co_IntSendMessageTimeout(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) + { + return (LRESULT)Result; + } + return 0; +} + +static +LRESULT FASTCALL +co_IntSendMessageTimeoutSingle(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult) +{ + ULONG_PTR Result; + NTSTATUS Status; + PWINDOW_OBJECT Window = NULL; + PMSGMEMORY MsgMemoryEntry; + INT lParamBufferSize; + LPARAM lParamPacked; + PTHREADINFO Win32Thread; + DECLARE_RETURN(LRESULT); + USER_REFERENCE_ENTRY Ref; + + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN( FALSE); + } + + UserRefObjectCo(Window, &Ref); + + Win32Thread = PsGetCurrentThreadWin32Thread(); + + IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + + if (NULL != Win32Thread && + Window->MessageQueue == Win32Thread->MessageQueue) + { + if (Win32Thread->TIF_flags & TIF_INCLEANUP) + { + /* Never send messages to exiting threads */ + RETURN( FALSE); + } + + /* See if this message type is present in the table */ + MsgMemoryEntry = FindMsgMemory(Msg); + if (NULL == MsgMemoryEntry) + { + lParamBufferSize = -1; + } + else + { + lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); + } + + if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam))) + { + DPRINT1("Failed to pack message parameters\n"); + RETURN( FALSE); + } + + Result = (ULONG_PTR)co_IntCallWindowProc( Window->Wnd->lpfnWndProc, + !Window->Wnd->Unicode, + hWnd, + Msg, + wParam, + lParamPacked, + lParamBufferSize); + if(uResult) + { + *uResult = Result; + } + + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); + + if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam))) + { + DPRINT1("Failed to unpack message parameters\n"); + RETURN( TRUE); + } + + RETURN( TRUE); + } + + if (uFlags & SMTO_ABORTIFHUNG && MsqIsHung(Window->MessageQueue)) + { + /* FIXME - Set a LastError? */ + RETURN( FALSE); + } + + if (Window->Status & WINDOWSTATUS_DESTROYING) + { + /* FIXME - last error? */ + DPRINT1("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); + RETURN( FALSE); + } + + do + { + Status = co_MsqSendMessage( Window->MessageQueue, + hWnd, + Msg, + wParam, + lParam, + uTimeout, + (uFlags & SMTO_BLOCK), + MSQ_NORMAL, + uResult); + } + while ((STATUS_TIMEOUT == Status) && + (uFlags & SMTO_NOTIMEOUTIFNOTHUNG) && + !MsqIsHung(Window->MessageQueue)); + + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); + + if (STATUS_TIMEOUT == Status) + { +/* + MSDN says: + Microsoft Windows 2000: If GetLastError returns zero, then the function + timed out. + XP+ : If the function fails or times out, the return value is zero. + To get extended error information, call GetLastError. If GetLastError + returns ERROR_TIMEOUT, then the function timed out. + */ + SetLastWin32Error(ERROR_TIMEOUT); + RETURN( FALSE); + } + else if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( FALSE); + } + + RETURN( TRUE); + +CLEANUP: + if (Window) UserDerefObjectCo(Window); + END_CLEANUP; +} + +LRESULT FASTCALL +co_IntSendMessageTimeout(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult) +{ + PWINDOW_OBJECT DesktopWindow; + HWND *Children; + HWND *Child; + + if (HWND_BROADCAST != hWnd) + { + return co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, uFlags, uTimeout, uResult); + } + + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + if (NULL == DesktopWindow) + { + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return 0; + } + + Children = IntWinListChildren(DesktopWindow); + if (NULL == Children) + { + return 0; + } + + for (Child = Children; NULL != *Child; Child++) + { + co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); + } + + ExFreePool(Children); + + return (LRESULT) TRUE; +} + + +/* This function posts a message if the destination's message queue belongs to + another thread, otherwise it sends the message. It does not support broadcast + messages! */ +LRESULT FASTCALL +co_IntPostOrSendMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + ULONG_PTR Result; + PTHREADINFO pti; + PWINDOW_OBJECT Window; + + if(hWnd == HWND_BROADCAST) + { + return 0; + } + + if(!(Window = UserGetWindowObject(hWnd))) + { + return 0; + } + + pti = PsGetCurrentThreadWin32Thread(); + if(Window->MessageQueue != pti->MessageQueue && FindMsgMemory(Msg) ==0) + { + Result = UserPostMessage(hWnd, Msg, wParam, lParam); + } + else + { + if(!co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) { + Result = 0; + } + } + + return (LRESULT)Result; +} + +LRESULT FASTCALL +co_IntDoSendMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + PDOSENDMESSAGE dsm, + PNTUSERSENDMESSAGEINFO UnsafeInfo) +{ + PTHREADINFO pti; + LRESULT Result = TRUE; + NTSTATUS Status; + PWINDOW_OBJECT Window = NULL; + NTUSERSENDMESSAGEINFO Info; + MSG UserModeMsg; + MSG KernelModeMsg; + PMSGMEMORY MsgMemoryEntry; + + RtlZeroMemory(&Info, sizeof(NTUSERSENDMESSAGEINFO)); + + /* FIXME: Call hooks. */ + if (HWND_BROADCAST != hWnd) + { + Window = UserGetWindowObject(hWnd); + if (NULL == Window) + { + /* Tell usermode to not touch this one */ + Info.HandledByKernel = TRUE; + MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); + return 0; + } + if (!Window->Wnd) + return 0; + } + + /* FIXME: Check for an exiting window. */ + + /* See if the current thread can handle the message */ + pti = PsGetCurrentThreadWin32Thread(); + if (HWND_BROADCAST != hWnd && NULL != pti && + Window->MessageQueue == pti->MessageQueue) + { + /* Gather the information usermode needs to call the window proc directly */ + Info.HandledByKernel = FALSE; + + Status = MmCopyFromCaller(&(Info.Ansi), &(UnsafeInfo->Ansi), + sizeof(BOOL)); + if (! NT_SUCCESS(Status)) + { + Info.Ansi = ! Window->Wnd->Unicode; + } + + IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + + Info.Ansi = !Window->Wnd->Unicode; + Info.Proc = Window->Wnd->lpfnWndProc; + + // Make the call from here if CALLWNDPROC or CALLWNDPROCRET are hooked + // or just do it in User32! + + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, &Result); + } + else + { + /* Must be handled by other thread */ +// if (HWND_BROADCAST != hWnd) +// { +// UserDereferenceObject(Window); +// } + Info.HandledByKernel = TRUE; + UserModeMsg.hwnd = hWnd; + UserModeMsg.message = Msg; + UserModeMsg.wParam = wParam; + UserModeMsg.lParam = lParam; + MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); + Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); + if (! NT_SUCCESS(Status)) + { + MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return (dsm ? 0 : -1); + } + if(!dsm) + { + Result = co_IntSendMessage(KernelModeMsg.hwnd, KernelModeMsg.message, + KernelModeMsg.wParam, KernelModeMsg.lParam); + } + else + { + Result = co_IntSendMessageTimeout(KernelModeMsg.hwnd, KernelModeMsg.message, + KernelModeMsg.wParam, KernelModeMsg.lParam, + dsm->uFlags, dsm->uTimeout, &dsm->Result); + } + Status = CopyMsgToUserMem(&UserModeMsg, &KernelModeMsg); + if (! NT_SUCCESS(Status)) + { + MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return(dsm ? 0 : -1); + } + } + + Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + } + + return (LRESULT)Result; +} + + +BOOL FASTCALL +UserSendNotifyMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + BOOL Result = TRUE; + + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } + + // Basicly the same as IntPostOrSendMessage + if (hWnd == HWND_BROADCAST) //Handle Broadcast + { + HWND *List; + PWINDOW_OBJECT DesktopWindow; + ULONG i; + + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + List = IntWinListChildren(DesktopWindow); + + if (List != NULL) + { + for (i = 0; List[i]; i++) + { + UserSendNotifyMessage(List[i], Msg, wParam, lParam); + } + ExFreePool(List); + } + } + else + { + ULONG_PTR PResult; + PTHREADINFO pti; + PWINDOW_OBJECT Window; + MSG Message; + + if(!(Window = UserGetWindowObject(hWnd))) return FALSE; + + pti = PsGetCurrentThreadWin32Thread(); + if(Window->MessageQueue != pti->MessageQueue) + { // Send message w/o waiting for it. + Result = UserPostMessage(hWnd, Msg, wParam, lParam); + } + else + { // Handle message and callback. + Message.hwnd = hWnd; + Message.message = Msg; + Message.wParam = wParam; + Message.lParam = lParam; + + Result = co_IntSendMessageTimeoutSingle( hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &PResult); + } + } + return Result; +} + + +DWORD APIENTRY +IntGetQueueStatus(BOOL ClearChanges) +{ + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE Queue; + DWORD Result; + DECLARE_RETURN(DWORD); + + DPRINT("Enter IntGetQueueStatus\n"); + + pti = PsGetCurrentThreadWin32Thread(); + Queue = pti->MessageQueue; + + Result = MAKELONG(Queue->QueueBits, Queue->ChangedBits); + if (ClearChanges) + { + Queue->ChangedBits = 0; + } + + RETURN(Result); + +CLEANUP: + DPRINT("Leave IntGetQueueStatus, ret=%i\n",_ret_); + END_CLEANUP; +} + +BOOL APIENTRY +IntInitMessagePumpHook() +{ + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) + { + ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook++; + return TRUE; + } + return FALSE; +} + +BOOL APIENTRY +IntUninitMessagePumpHook() +{ + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) + { + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook <= 0) + { + return FALSE; + } + ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook--; + return TRUE; + } + return FALSE; +} + +/** Functions ******************************************************************/ + +BOOL APIENTRY +NtUserPostMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserPostMessage\n"); + UserEnterExclusive(); + + RETURN( UserPostMessage(hWnd, Msg, wParam, lParam)); + +CLEANUP: + DPRINT("Leave NtUserPostMessage, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +BOOL APIENTRY +NtUserPostThreadMessage(DWORD idThread, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserPostThreadMessage\n"); + UserEnterExclusive(); + + RETURN( UserPostThreadMessage( idThread, + Msg, + wParam, + lParam)); + +CLEANUP: + DPRINT("Leave NtUserPostThreadMessage, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +DWORD APIENTRY +NtUserQuerySendMessage(DWORD Unknown0) +{ + UNIMPLEMENTED; + + return 0; +} + +LRESULT APIENTRY +NtUserSendMessageTimeout(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult, + PNTUSERSENDMESSAGEINFO UnsafeInfo) +{ + DOSENDMESSAGE dsm; + LRESULT Result; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserSendMessageTimeout\n"); + UserEnterExclusive(); + + dsm.uFlags = uFlags; + dsm.uTimeout = uTimeout; + Result = co_IntDoSendMessage(hWnd, Msg, wParam, lParam, &dsm, UnsafeInfo); + if(uResult != NULL && Result != 0) + { + NTSTATUS Status; + + Status = MmCopyToCaller(uResult, &dsm.Result, sizeof(ULONG_PTR)); + if(!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( FALSE); + } + } + RETURN( Result); + +CLEANUP: + DPRINT("Leave NtUserSendMessageTimeout, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +LRESULT APIENTRY +NtUserSendMessage(HWND Wnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + PNTUSERSENDMESSAGEINFO UnsafeInfo) +{ + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserSendMessage\n"); + UserEnterExclusive(); + + RETURN(co_IntDoSendMessage(Wnd, Msg, wParam, lParam, NULL, UnsafeInfo)); + +CLEANUP: + DPRINT("Leave NtUserSendMessage, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +BOOL APIENTRY +NtUserWaitMessage(VOID) +{ + DECLARE_RETURN(BOOL); + + DPRINT("EnterNtUserWaitMessage\n"); + UserEnterExclusive(); + + RETURN(co_IntWaitMessage(NULL, 0, 0)); + +CLEANUP: + DPRINT("Leave NtUserWaitMessage, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + BOOL APIENTRY NtUserGetMessage(PNTUSERGETMESSAGEINFO UnsafeInfo, @@ -1236,812 +1839,319 @@ } -static NTSTATUS FASTCALL -CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry) -{ - NTSTATUS Status; - - PVOID KernelMem; - UINT Size; - - *KernelModeMsg = *UserModeMsg; - - /* See if this message type is present in the table */ - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - return STATUS_SUCCESS; - } - - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); - - if (0 != Size) - { - /* Allocate kernel mem */ - KernelMem = ExAllocatePoolWithTag(PagedPool, Size, TAG_MSG); - if (NULL == KernelMem) - { - DPRINT1("Not enough memory to copy message to kernel mem\n"); - return STATUS_NO_MEMORY; - } - KernelModeMsg->lParam = (LPARAM) KernelMem; - - /* Copy data if required */ - if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) - { - Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); - ExFreePoolWithTag(KernelMem, TAG_MSG); - return Status; - } - } - else - { - /* Make sure we don't pass any secrets to usermode */ - RtlZeroMemory(KernelMem, Size); - } - } - else - { - KernelModeMsg->lParam = 0; - } - - return STATUS_SUCCESS; -} - -static NTSTATUS FASTCALL -CopyMsgToUserMem(MSG *UserModeMsg, MSG *KernelModeMsg) -{ - NTSTATUS Status; - PMSGMEMORY MsgMemoryEntry; - UINT Size; - - /* See if this message type is present in the table */ - MsgMemoryEntry = FindMsgMemory(UserModeMsg->message); - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - return STATUS_SUCCESS; - } - - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); - - if (0 != Size) - { - /* Copy data if required */ - if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_WRITE)) - { - Status = MmCopyToCaller((PVOID) UserModeMsg->lParam, (PVOID) KernelModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to copy message from kernel: invalid usermode buffer\n"); - ExFreePool((PVOID) KernelModeMsg->lParam); - return Status; - } - } - - ExFreePool((PVOID) KernelModeMsg->lParam); - } - - return STATUS_SUCCESS; -} - -BOOL FASTCALL -UserPostThreadMessage( DWORD idThread, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - MSG Message; - PETHREAD peThread; - PTHREADINFO pThread; - LARGE_INTEGER LargeTickCount; - NTSTATUS Status; - - DPRINT1("UserPostThreadMessage wParam 0x%x lParam 0x%x\n", wParam,lParam); - - if (FindMsgMemory(Msg) != 0) - { - SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } - - Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); - - if( Status == STATUS_SUCCESS ) - { - pThread = (PTHREADINFO)peThread->Tcb.Win32Thread; - if( !pThread || !pThread->MessageQueue || (pThread->TIF_flags & TIF_INCLEANUP)) - { - ObDereferenceObject( peThread ); - return FALSE; - } - - Message.hwnd = NULL; - Message.message = Msg; - Message.wParam = wParam; - Message.lParam = lParam; - IntGetCursorLocation(pThread->Desktop->WindowStation, &Message.pt); - KeQueryTickCount(&LargeTickCount); - pThread->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); - MsqPostMessage(pThread->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); - ObDereferenceObject( peThread ); - return TRUE; - } - else - { - SetLastNtError( Status ); - } - return FALSE; -} - -BOOL FASTCALL -UserPostMessage(HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - PTHREADINFO pti; - MSG Message; - LARGE_INTEGER LargeTickCount; - - if (FindMsgMemory(Msg) != 0) - { - SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } - - if (!Wnd) - return UserPostThreadMessage( PtrToInt(PsGetCurrentThreadId()), - Msg, - wParam, - lParam); - - if (Wnd == HWND_BROADCAST) - { - HWND *List; - PWINDOW_OBJECT DesktopWindow; - ULONG i; - - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); - List = IntWinListChildren(DesktopWindow); - - if (List != NULL) - { - for (i = 0; List[i]; i++) - UserPostMessage(List[i], Msg, wParam, lParam); - ExFreePool(List); - } - } - else - { - PWINDOW_OBJECT Window; - - Window = UserGetWindowObject(Wnd); - if ( !Window || !Window->Wnd ) - { - return FALSE; - } - - pti = Window->Wnd->head.pti; - if ( pti->TIF_flags & TIF_INCLEANUP ) - { - DPRINT1("Attempted to post message to window 0x%x when the thread is in cleanup!\n", Wnd); - return FALSE; - } - - if ( Window->Status & WINDOWSTATUS_DESTROYING ) - { - DPRINT1("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd); - /* FIXME - last error code? */ - return FALSE; - } - - if (WM_QUIT == Msg) - { - MsqPostQuitMessage(Window->MessageQueue, wParam); - } - else - { - Message.hwnd = Wnd; - Message.message = Msg; - Message.wParam = wParam; - Message.lParam = lParam; - IntGetCursorLocation(pti->Desktop->WindowStation, &Message.pt); - KeQueryTickCount(&LargeTickCount); - pti->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); - MsqPostMessage(Window->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); - } - } - return TRUE; -} - - -BOOL APIENTRY -NtUserPostMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ +BOOL +APIENTRY +NtUserGetMessageX( + PMSG pMsg, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax) +{ + MSG Msg; + BOOL Ret = FALSE; DECLARE_RETURN(BOOL); - DPRINT("Enter NtUserPostMessage\n"); + DPRINT("Enter NtUserGetMessage\n"); UserEnterExclusive(); - RETURN( UserPostMessage(hWnd, Msg, wParam, lParam)); + if ( (MsgFilterMin|MsgFilterMax) & ~WM_MAXIMUM ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( Ret); + } + + Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, PM_REMOVE, TRUE); + + if (Ret) + { + _SEH2_TRY + { + ProbeForWrite(pMsg, sizeof(MSG), 1); + RtlCopyMemory(pMsg, &Msg, sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Ret = FALSE; + } + _SEH2_END; + } + RETURN( Ret); CLEANUP: - DPRINT("Leave NtUserPostMessage, ret=%i\n",_ret_); + DPRINT("Leave NtUserGetMessage\n"); UserLeave(); END_CLEANUP; } - - BOOL APIENTRY -NtUserPostThreadMessage(DWORD idThread, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ +NtUserPeekMessage(PNTUSERGETMESSAGEINFO UnsafeInfo, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax, + UINT RemoveMsg) +{ + NTSTATUS Status; + BOOL Present; + NTUSERGETMESSAGEINFO Info; + PWINDOW_OBJECT Window; + PMSGMEMORY MsgMemoryEntry; + PVOID UserMem; + UINT Size; + USER_MESSAGE Msg; DECLARE_RETURN(BOOL); - DPRINT("Enter NtUserPostThreadMessage\n"); + DPRINT("Enter NtUserPeekMessage\n"); UserEnterExclusive(); - RETURN( UserPostThreadMessage( idThread, - Msg, - wParam, - lParam)); + if (hWnd == (HWND)-1 || hWnd == (HWND)0x0000FFFF || hWnd == (HWND)0xFFFFFFFF) + hWnd = (HWND)1; + + /* Validate input */ + if (hWnd && hWnd != (HWND)1) + { + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN(-1); + } + } + else + { + Window = (PWINDOW_OBJECT)hWnd; + } + + if (MsgFilterMax < MsgFilterMin) + { + MsgFilterMin = 0; + MsgFilterMax = 0; + } + + Present = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, RemoveMsg); + if (Present) + { + + Info.Msg = Msg.Msg; + /* See if this message type is present in the table */ + MsgMemoryEntry = FindMsgMemory(Info.Msg.message); + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + Info.LParamSize = 0; + } + else + { + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, Info.Msg.wParam, + Info.Msg.lParam); + /* Allocate required amount of user-mode memory */ + Info.LParamSize = Size; + UserMem = NULL; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0, + &Info.LParamSize, MEM_COMMIT, PAGE_READWRITE); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( (BOOL) -1); + } + /* Transfer lParam data to user-mode mem */ + Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Size); + if (! NT_SUCCESS(Status)) + { + ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, + &Info.LParamSize, MEM_RELEASE); + SetLastNtError(Status); + RETURN( (BOOL) -1); + } + Info.Msg.lParam = (LPARAM) UserMem; + } + if (RemoveMsg && Msg.FreeLParam && 0 != Msg.Msg.lParam) + { + ExFreePool((void *) Msg.Msg.lParam); + } + Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( (BOOL) -1); + } + } + + RETURN( Present); CLEANUP: - DPRINT("Leave NtUserPostThreadMessage, ret=%i\n",_ret_); + DPRINT("Leave NtUserPeekMessage, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } -DWORD APIENTRY -NtUserQuerySendMessage(DWORD Unknown0) -{ - UNIMPLEMENTED; - - return 0; -} - -LRESULT FASTCALL -co_IntSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - ULONG_PTR Result = 0; - if(co_IntSendMessageTimeout(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) - { - return (LRESULT)Result; - } - return 0; -} - -static -LRESULT FASTCALL -co_IntSendMessageTimeoutSingle(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult) -{ - ULONG_PTR Result; +BOOL +APIENTRY +NtUserPeekMessageX( + PMSG pMsg, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax, + UINT RemoveMsg) +{ + MSG Msg; + BOOL Ret = FALSE; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserPeekMessage\n"); + UserEnterExclusive(); + + if ( RemoveMsg & PM_BADMSGFLAGS ) + { + SetLastWin32Error(ERROR_INVALID_FLAGS); + RETURN( Ret); + } + + Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg, FALSE); + + if (Ret) + { + _SEH2_TRY + { + ProbeForWrite(pMsg, sizeof(MSG), 1); + RtlCopyMemory(pMsg, &Msg, sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Ret = FALSE; + } + _SEH2_END; + } + RETURN( Ret); + +CLEANUP: + DPRINT("Leave NtUserPeekMessage, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +BOOL +APIENTRY +NtUserCallMsgFilter( + LPMSG lpmsg, + INT code) +{ + BOOL BadChk = FALSE, Ret = FALSE; + MSG Msg; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserCallMsgFilter\n"); + UserEnterExclusive(); + if (lpmsg) + { + _SEH2_TRY + { + ProbeForRead((PVOID)lpmsg, + sizeof(MSG), + 1); + RtlCopyMemory( &Msg, + (PVOID)lpmsg, + sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + } + else + RETURN( FALSE); + + if (BadChk) RETURN( FALSE); + + if ( ISITHOOKED(WH_SYSMSGFILTER) && + co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) + { + Ret = TRUE; + } + else + { + if ( ISITHOOKED(WH_MSGFILTER) ) + { + Ret = co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)&Msg); + } + } + + _SEH2_TRY + { + ProbeForWrite((PVOID)lpmsg, + sizeof(MSG), + 1); + RtlCopyMemory((PVOID)lpmsg, + &Msg, + sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BadChk = TRUE; + } + _SEH2_END; + if (BadChk) RETURN( FALSE); + RETURN( Ret) + +CLEANUP: + DPRINT("Leave NtUserCallMsgFilter. ret=%i\n", _ret_); + UserLeave(); + END_CLEANUP; +} + +LRESULT APIENTRY +NtUserDispatchMessage(PMSG UnsafeMsgInfo) +{ + LRESULT Res = 0; + BOOL Hit = FALSE; + MSG SafeMsg; + + UserEnterExclusive(); + _SEH2_TRY + { + ProbeForRead(UnsafeMsgInfo, sizeof(MSG), 1); + RtlCopyMemory(&SafeMsg, UnsafeMsgInfo, sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Hit = TRUE; + } + _SEH2_END; + + if (!Hit) Res = IntDispatchMessage(&SafeMsg); + + UserLeave(); + return Res; +} + + +BOOL APIENTRY +NtUserTranslateMessage(LPMSG lpMsg, + HKL dwhkl) +{ NTSTATUS Status; - PWINDOW_OBJECT Window = NULL; - PMSGMEMORY MsgMemoryEntry; - INT lParamBufferSize; - LPARAM lParamPacked; - PTHREADINFO Win32Thread; - DECLARE_RETURN(LRESULT); - USER_REFERENCE_ENTRY Ref; - - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN( FALSE); - } - - UserRefObjectCo(Window, &Ref); - - Win32Thread = PsGetCurrentThreadWin32Thread(); - - IntCallWndProc( Window, hWnd, Msg, wParam, lParam); - - if (NULL != Win32Thread && - Window->MessageQueue == Win32Thread->MessageQueue) - { - if (Win32Thread->TIF_flags & TIF_INCLEANUP) - { - /* Never send messages to exiting threads */ - RETURN( FALSE); - } - - /* See if this message type is present in the table */ - MsgMemoryEntry = FindMsgMemory(Msg); - if (NULL == MsgMemoryEntry) - { - lParamBufferSize = -1; - } - else - { - lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); - } - - if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam))) - { - DPRINT1("Failed to pack message parameters\n"); - RETURN( FALSE); - } - - Result = (ULONG_PTR)co_IntCallWindowProc( Window->Wnd->lpfnWndProc, - !Window->Wnd->Unicode, - hWnd, - Msg, - wParam, - lParamPacked, - lParamBufferSize); - if(uResult) - { - *uResult = Result; - } - - IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - - if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam))) - { - DPRINT1("Failed to unpack message parameters\n"); - RETURN( TRUE); - } - - RETURN( TRUE); - } - - if (uFlags & SMTO_ABORTIFHUNG && MsqIsHung(Window->MessageQueue)) - { - /* FIXME - Set a LastError? */ - RETURN( FALSE); - } - - if (Window->Status & WINDOWSTATUS_DESTROYING) - { - /* FIXME - last error? */ - DPRINT1("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); - RETURN( FALSE); - } - - do - { - Status = co_MsqSendMessage( Window->MessageQueue, - hWnd, - Msg, - wParam, - lParam, - uTimeout, - (uFlags & SMTO_BLOCK), - MSQ_NORMAL, - uResult); - } - while ((STATUS_TIMEOUT == Status) && - (uFlags & SMTO_NOTIMEOUTIFNOTHUNG) && - !MsqIsHung(Window->MessageQueue)); - - IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - - if (STATUS_TIMEOUT == Status) - { -/* - MSDN says: - Microsoft Windows 2000: If GetLastError returns zero, then the function - timed out. - XP+ : If the function fails or times out, the return value is zero. - To get extended error information, call GetLastError. If GetLastError - returns ERROR_TIMEOUT, then the function timed out. - */ - SetLastWin32Error(ERROR_TIMEOUT); - RETURN( FALSE); - } - else if (! NT_SUCCESS(Status)) + MSG SafeMsg; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserTranslateMessage\n"); + UserEnterExclusive(); + + Status = MmCopyFromCaller(&SafeMsg, lpMsg, sizeof(MSG)); + if(!NT_SUCCESS(Status)) { SetLastNtError(Status); RETURN( FALSE); } - RETURN( TRUE); + RETURN( IntTranslateKbdMessage(&SafeMsg, dwhkl)); CLEANUP: - if (Window) UserDerefObjectCo(Window); - END_CLEANUP; -} - -LRESULT FASTCALL -co_IntSendMessageTimeout(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult) -{ - PWINDOW_OBJECT DesktopWindow; - HWND *Children; - HWND *Child; - - if (HWND_BROADCAST != hWnd) - { - return co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, uFlags, uTimeout, uResult); - } - - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); - if (NULL == DesktopWindow) - { - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return 0; - } - - Children = IntWinListChildren(DesktopWindow); - if (NULL == Children) - { - return 0; - } - - for (Child = Children; NULL != *Child; Child++) - { - co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); - } - - ExFreePool(Children); - - return (LRESULT) TRUE; -} - - -/* This function posts a message if the destination's message queue belongs to - another thread, otherwise it sends the message. It does not support broadcast - messages! */ -LRESULT FASTCALL -co_IntPostOrSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - ULONG_PTR Result; - PTHREADINFO pti; - PWINDOW_OBJECT Window; - - if(hWnd == HWND_BROADCAST) - { - return 0; - } - - if(!(Window = UserGetWindowObject(hWnd))) - { - return 0; - } - - pti = PsGetCurrentThreadWin32Thread(); - if(Window->MessageQueue != pti->MessageQueue && FindMsgMemory(Msg) ==0) - { - Result = UserPostMessage(hWnd, Msg, wParam, lParam); - } - else - { - if(!co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) { - Result = 0; - } - } - - return (LRESULT)Result; -} - -LRESULT FASTCALL -co_IntDoSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - PDOSENDMESSAGE dsm, - PNTUSERSENDMESSAGEINFO UnsafeInfo) -{ - PTHREADINFO pti; - LRESULT Result = TRUE; - NTSTATUS Status; - PWINDOW_OBJECT Window = NULL; - NTUSERSENDMESSAGEINFO Info; - MSG UserModeMsg; - MSG KernelModeMsg; - PMSGMEMORY MsgMemoryEntry; - - RtlZeroMemory(&Info, sizeof(NTUSERSENDMESSAGEINFO)); - - /* FIXME: Call hooks. */ - if (HWND_BROADCAST != hWnd) - { - Window = UserGetWindowObject(hWnd); - if (NULL == Window) - { - /* Tell usermode to not touch this one */ - Info.HandledByKernel = TRUE; - MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); - return 0; - } - if (!Window->Wnd) - return 0; - } - - /* FIXME: Check for an exiting window. */ - - /* See if the current thread can handle the message */ - pti = PsGetCurrentThreadWin32Thread(); - if (HWND_BROADCAST != hWnd && NULL != pti && - Window->MessageQueue == pti->MessageQueue) - { - /* Gather the information usermode needs to call the window proc directly */ - Info.HandledByKernel = FALSE; - - Status = MmCopyFromCaller(&(Info.Ansi), &(UnsafeInfo->Ansi), - sizeof(BOOL)); - if (! NT_SUCCESS(Status)) - { - Info.Ansi = ! Window->Wnd->Unicode; - } - - IntCallWndProc( Window, hWnd, Msg, wParam, lParam); - - Info.Ansi = !Window->Wnd->Unicode; - Info.Proc = Window->Wnd->lpfnWndProc; - - // Make the call from here if CALLWNDPROC or CALLWNDPROCRET are hooked - // or just do it in User32! - - IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, &Result); - } - else - { - /* Must be handled by other thread */ -// if (HWND_BROADCAST != hWnd) -// { -// UserDereferenceObject(Window); -// } - Info.HandledByKernel = TRUE; - UserModeMsg.hwnd = hWnd; - UserModeMsg.message = Msg; - UserModeMsg.wParam = wParam; - UserModeMsg.lParam = lParam; - MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); - Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); - if (! NT_SUCCESS(Status)) - { - MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return (dsm ? 0 : -1); - } - if(!dsm) - { - Result = co_IntSendMessage(KernelModeMsg.hwnd, KernelModeMsg.message, - KernelModeMsg.wParam, KernelModeMsg.lParam); - } - else - { - Result = co_IntSendMessageTimeout(KernelModeMsg.hwnd, KernelModeMsg.message, - KernelModeMsg.wParam, KernelModeMsg.lParam, - dsm->uFlags, dsm->uTimeout, &dsm->Result); - } - Status = CopyMsgToUserMem(&UserModeMsg, &KernelModeMsg); - if (! NT_SUCCESS(Status)) - { - MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return(dsm ? 0 : -1); - } - } - - Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - } - - return (LRESULT)Result; -} - -LRESULT APIENTRY -NtUserSendMessageTimeout(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult, - PNTUSERSENDMESSAGEINFO UnsafeInfo) -{ - DOSENDMESSAGE dsm; - LRESULT Result; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserSendMessageTimeout\n"); - UserEnterExclusive(); - - dsm.uFlags = uFlags; - dsm.uTimeout = uTimeout; - Result = co_IntDoSendMessage(hWnd, Msg, wParam, lParam, &dsm, UnsafeInfo); - if(uResult != NULL && Result != 0) - { - NTSTATUS Status; - - Status = MmCopyToCaller(uResult, &dsm.Result, sizeof(ULONG_PTR)); - if(!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); - } - } - RETURN( Result); - -CLEANUP: - DPRINT("Leave NtUserSendMessageTimeout, ret=%i\n",_ret_); + DPRINT("Leave NtUserTranslateMessage: ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } - -LRESULT APIENTRY -NtUserSendMessage(HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - PNTUSERSENDMESSAGEINFO UnsafeInfo) -{ - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserSendMessage\n"); - UserEnterExclusive(); - - RETURN(co_IntDoSendMessage(Wnd, Msg, wParam, lParam, NULL, UnsafeInfo)); - -CLEANUP: - DPRINT("Leave NtUserSendMessage, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - -BOOL FASTCALL -UserSendNotifyMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - BOOL Result = TRUE; - - if (FindMsgMemory(Msg) != 0) - { - SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } - - // Basicly the same as IntPostOrSendMessage - if (hWnd == HWND_BROADCAST) //Handle Broadcast - { - HWND *List; - PWINDOW_OBJECT DesktopWindow; - ULONG i; - - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); - List = IntWinListChildren(DesktopWindow); - - if (List != NULL) - { - for (i = 0; List[i]; i++) - { - UserSendNotifyMessage(List[i], Msg, wParam, lParam); - } - ExFreePool(List); - } - } - else - { - ULONG_PTR PResult; - PTHREADINFO pti; - PWINDOW_OBJECT Window; - MSG Message; - - if(!(Window = UserGetWindowObject(hWnd))) return FALSE; - - pti = PsGetCurrentThreadWin32Thread(); - if(Window->MessageQueue != pti->MessageQueue) - { // Send message w/o waiting for it. - Result = UserPostMessage(hWnd, Msg, wParam, lParam); - } - else - { // Handle message and callback. - Message.hwnd = hWnd; - Message.message = Msg; - Message.wParam = wParam; - Message.lParam = lParam; - - Result = co_IntSendMessageTimeoutSingle( hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &PResult); - } - } - return Result; -} - - -BOOL APIENTRY -NtUserWaitMessage(VOID) -{ - DECLARE_RETURN(BOOL); - - DPRINT("EnterNtUserWaitMessage\n"); - UserEnterExclusive(); - - RETURN(co_IntWaitMessage(NULL, 0, 0)); - -CLEANUP: - DPRINT("Leave NtUserWaitMessage, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -DWORD APIENTRY -IntGetQueueStatus(BOOL ClearChanges) -{ - PTHREADINFO pti; - PUSER_MESSAGE_QUEUE Queue; - DWORD Result; - DECLARE_RETURN(DWORD); - - DPRINT("Enter IntGetQueueStatus\n"); - - pti = PsGetCurrentThreadWin32Thread(); - Queue = pti->MessageQueue; - - Result = MAKELONG(Queue->QueueBits, Queue->ChangedBits); - if (ClearChanges) - { - Queue->ChangedBits = 0; - } - - RETURN(Result); - -CLEANUP: - DPRINT("Leave IntGetQueueStatus, ret=%i\n",_ret_); - END_CLEANUP; -} - -BOOL APIENTRY -IntInitMessagePumpHook() -{ - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) - { - ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook++; - return TRUE; - } - return FALSE; -} - -BOOL APIENTRY -IntUninitMessagePumpHook() -{ - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) - { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook <= 0) - { - return FALSE; - } - ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook--; - return TRUE; - } - return FALSE; -} - BOOL APIENTRY NtUserMessageCall(

1 0

[jimtabor] 44392: - [Win32k] Create a Gre function for GetGlyphIndicesW.
by jimtabor＠svn.reactos.org 03 Dec '09

03 Dec '09

Author: jimtabor Date: Thu Dec 3 21:07:44 2009 New Revision: 44392 URL: http://svn.reactos.org/svn/reactos?rev=44392&view=rev Log: - [Win32k] Create a Gre function for GetGlyphIndicesW. Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Dec 3 21:07:44 2009 @@ -4065,6 +4065,98 @@ return TRUE; } +DWORD +FASTCALL +GreGetGlyphIndicesW( + HDC hdc, + LPWSTR pwc, + INT cwc, + LPWORD pgi, + DWORD iMode, + DWORD Unknown) +{ + PDC dc; + PDC_ATTR pdcattr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + HFONT hFont = 0; + OUTLINETEXTMETRICW *potm; + INT i; + FT_Face face; + WCHAR DefChar = 0xffff; + PWSTR Buffer = NULL; + ULONG Size; + + if ((!pwc) && (!pgi)) return cwc; + + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + pdcattr = dc->pdcattr; + hFont = pdcattr->hlfntNew; + TextObj = RealizeFontInit(hFont); + DC_UnlockDc(dc); + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + + FontGDI = ObjToGDI(TextObj->Font, FONT); + TEXTOBJ_UnlockText(TextObj); + + Buffer = ExAllocatePoolWithTag(PagedPool, cwc*sizeof(WORD), TAG_GDITEXT); + if (!Buffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return GDI_ERROR; + } + + if (iMode & GGI_MARK_NONEXISTING_GLYPHS) DefChar = 0x001f; /* Indicate non existence */ + else + { + Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); + potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (!potm) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + cwc = GDI_ERROR; + goto ErrorRet; + } + IntGetOutlineTextMetrics(FontGDI, Size, potm); + DefChar = potm->otmTextMetrics.tmDefaultChar; // May need this. + ExFreePool(potm); + } + + IntLockFreeType; + face = FontGDI->face; + + for (i = 0; i < cwc; i++) + { + Buffer[i] = FT_Get_Char_Index(face, pwc[i]); + if (Buffer[i] == 0) + { + if (DefChar == 0xffff && FT_IS_SFNT(face)) + { + TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); + DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); + } + Buffer[i] = DefChar; + } + } + + IntUnLockFreeType; + + RtlCopyMemory( pgi, Buffer, cwc*sizeof(WORD)); + +ErrorRet: + if (Buffer) ExFreePoolWithTag(Buffer, TAG_GDITEXT); + return cwc; +} + /* * @implemented

1 0

[sserapion] 44391: fix 32bit build
by sserapion＠svn.reactos.org 03 Dec '09

03 Dec '09

Author: sserapion Date: Thu Dec 3 21:02:52 2009 New Revision: 44391 URL: http://svn.reactos.org/svn/reactos?rev=44391&view=rev Log: fix 32bit build Modified: branches/ros-amd64-bringup/reactos/dll/win32/browseui/shellbrowser.cpp Modified: branches/ros-amd64-bringup/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Thu Dec 3 21:02:52 2009 @@ -282,7 +282,7 @@ LRESULT CToolbarProxy::OnAddBitmap(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - LONG result; + long int result; HRESULT hResult; result = 0;

1 0

[sserapion] 44390: Unhack bootcd file list
by sserapion＠svn.reactos.org 03 Dec '09

03 Dec '09

Author: sserapion Date: Thu Dec 3 20:51:31 2009 New Revision: 44390 URL: http://svn.reactos.org/svn/reactos?rev=44390&view=rev Log: Unhack bootcd file list Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Dec 3 20:51:31 2009 @@ -31,645 +31,642 @@ ; Base files -;base\applications\cacls\cacls.exe 1 -;base\applications\calc\calc.exe 1 -;base\applications\charmap\charmap.exe 1 -;base\applications\cmdutils\dbgprint\dbgprint.exe 1 -;base\applications\cmdutils\doskey\doskey.exe 1 -;base\applications\cmdutils\find\find.exe 1 -;base\applications\cmdutils\hostname\hostname.exe 1 -;base\applications\cmdutils\lodctr\lodctr.exe 1 -;base\applications\cmdutils\more\more.exe 1 -;base\applications\cmdutils\xcopy\xcopy.exe 1 -;base\applications\control\control.exe 1 -;base\applications\dxdiag\dxdiag.exe 1 -;base\applications\fontview\fontview.exe 1 -;base\applications\mscutils\devmgmt\devmgmt.exe 1 -;base\applications\mscutils\eventvwr\eventvwr.exe 1 -;base\applications\games\solitaire\sol.exe 1 -;base\applications\games\spider\spider.exe 1 -;base\applications\games\winemine\winemine.exe 1 -;base\applications\hh\hh.exe 4 -;base\applications\kbswitch\kbswitch.exe 1 -;base\applications\kbswitch\kbsdll\kbsdll.dll 1 -;base\applications\logoff\logoff.exe 1 -;base\applications\magnify\magnify.exe 1 -;base\applications\mplay32\mplay32.exe 1 -;base\applications\msconfig\msconfig.exe 1 -;base\applications\mstsc\mstsc.exe 1 -;base\applications\network\arp\arp.exe 1 -;base\applications\network\dwnl\dwnl.exe 1 -;base\applications\network\route\route.exe 1 -;base\applications\network\finger\finger.exe 1 -;base\applications\network\ftp\ftp.exe 1 -;base\applications\network\ipconfig\ipconfig.exe 1 -;base\applications\network\netstat\netstat.exe 1 -;base\applications\network\ping\ping.exe 1 -;base\applications\network\telnet\telnet.exe 1 -;base\applications\network\tracert\tracert.exe 1 -;base\applications\network\whois\whois.exe 1 -;base\applications\network\ftp\ftp.exe 1 -;base\applications\network\ipconfig\ipconfig.exe 1 -;base\applications\network\netstat\netstat.exe 1 -;base\applications\network\ping\ping.exe 1 -;base\applications\network\telnet\telnet.exe 1 -;base\applications\network\tracert\tracert.exe 1 -;base\applications\network\whois\whois.exe 1 -;base\applications\notepad\notepad.exe 1 -;base\applications\paint\paint.exe 1 -;base\applications\rapps\rapps.exe 1 -;base\applications\regedit\regedit.exe 4 -;base\applications\regedit\clb\clb.dll 1 -;base\applications\regedt32\regedt32.exe 1 -;base\applications\sc\sc.exe 1 -;base\applications\screensavers\3dtext\3dtext.scr 1 -;base\applications\screensavers\logon\logon.scr 1 -;base\applications\mscutils\servman\servman.exe 1 -;base\applications\shutdown\shutdown.exe 1 -;base\applications\sndvol32\sndvol32.exe 1 -;base\applications\taskmgr\taskmgr.exe 1 -;base\applications\winhlp32\winhlp32.exe 4 -;base\applications\winver\winver.exe 1 -;base\applications\wordpad\wordpad.exe 1 -;base\applications\write\write.exe 1 - -;base\services\audiosrv\audiosrv.exe 1 -;base\services\dhcp\dhcp.exe 1 -;base\services\eventlog\eventlog.exe 1 -;base\services\rpcss\rpcss.exe 1 -;base\services\spoolsv\spoolsv.exe 1 -;base\services\tcpsvcs\tcpsvcs.exe 1 -;base\services\telnetd\telnetd.exe 1 -;base\services\tcpsvcs\quotes 5 -;base\services\umpnpmgr\umpnpmgr.exe 1 -;base\services\wlansvc\wlansvc.exe 1 -;base\services\svchost\svchost.exe 1 - -;base\setup\setup\setup.exe 1 -;base\setup\vmwinst\vmwinst.exe 1 - -;base\shell\cmd\cmd.exe 1 -;base\shell\explorer\explorer.exe 4 -;base\shell\explorer\explorer-cfg-template.xml 4 -;base\shell\explorer\notifyhook\notifyhook.dll 1 -;base\shell\explorer-new\explorer_new.exe 4 optional - -;base\system\autochk\autochk.exe 1 -;base\system\bootok\bootok.exe 1 -;base\system\format\format.exe 1 -;base\system\lsass\lsass.exe 1 -;base\system\msiexec\msiexec.exe 1 -;base\system\regsvr32\regsvr32.exe 1 -;base\system\rundll32\rundll32.exe 1 -;base\system\services\services.exe 1 -;base\system\userinit\userinit.exe 1 -;base\system\winlogon\winlogon.exe 1 -;base\system\expand\expand.exe 1 -;base\system\smss\smss.exe 1 +base\applications\cacls\cacls.exe 1 +base\applications\calc\calc.exe 1 +base\applications\charmap\charmap.exe 1 +base\applications\cmdutils\dbgprint\dbgprint.exe 1 +base\applications\cmdutils\doskey\doskey.exe 1 +base\applications\cmdutils\find\find.exe 1 +base\applications\cmdutils\hostname\hostname.exe 1 +base\applications\cmdutils\lodctr\lodctr.exe 1 +base\applications\cmdutils\more\more.exe 1 +base\applications\cmdutils\reg\reg.exe 1 +base\applications\cmdutils\xcopy\xcopy.exe 1 +base\applications\control\control.exe 1 +base\applications\dxdiag\dxdiag.exe 1 +base\applications\fontview\fontview.exe 1 +base\applications\mscutils\devmgmt\devmgmt.exe 1 +base\applications\mscutils\eventvwr\eventvwr.exe 1 +base\applications\games\solitaire\sol.exe 1 +base\applications\games\spider\spider.exe 1 +base\applications\games\winemine\winemine.exe 1 +base\applications\hh\hh.exe 4 +base\applications\kbswitch\kbswitch.exe 1 +base\applications\kbswitch\kbsdll\kbsdll.dll 1 +base\applications\logoff\logoff.exe 1 +base\applications\magnify\magnify.exe 1 +base\applications\mplay32\mplay32.exe 1 +base\applications\msconfig\msconfig.exe 1 +base\applications\mstsc\mstsc.exe 1 +base\applications\network\arp\arp.exe 1 +base\applications\network\dwnl\dwnl.exe 1 +base\applications\network\route\route.exe 1 +base\applications\network\finger\finger.exe 1 +base\applications\network\ftp\ftp.exe 1 +base\applications\network\ipconfig\ipconfig.exe 1 +base\applications\network\netstat\netstat.exe 1 +base\applications\network\nslookup\nslookup.exe 1 +base\applications\network\ping\ping.exe 1 +base\applications\network\telnet\telnet.exe 1 +base\applications\network\tracert\tracert.exe 1 +base\applications\network\whois\whois.exe 1 +base\applications\notepad\notepad.exe 1 +base\applications\paint\paint.exe 1 +base\applications\rapps\rapps.exe 1 +base\applications\regedit\regedit.exe 4 +base\applications\regedit\clb\clb.dll 1 +base\applications\regedt32\regedt32.exe 1 +base\applications\sc\sc.exe 1 +base\applications\screensavers\3dtext\3dtext.scr 1 +base\applications\screensavers\logon\logon.scr 1 +base\applications\mscutils\servman\servman.exe 1 +base\applications\shutdown\shutdown.exe 1 +base\applications\sndvol32\sndvol32.exe 1 +base\applications\taskmgr\taskmgr.exe 1 +base\applications\winhlp32\winhlp32.exe 4 +base\applications\winver\winver.exe 1 +base\applications\wordpad\wordpad.exe 1 +base\applications\write\write.exe 1 + +base\services\audiosrv\audiosrv.exe 1 +base\services\dhcp\dhcp.exe 1 +base\services\eventlog\eventlog.exe 1 +base\services\rpcss\rpcss.exe 1 +base\services\spoolsv\spoolsv.exe 1 +base\services\tcpsvcs\tcpsvcs.exe 1 +base\services\telnetd\telnetd.exe 1 +base\services\tcpsvcs\quotes 5 +base\services\umpnpmgr\umpnpmgr.exe 1 +base\services\wlansvc\wlansvc.exe 1 +base\services\svchost\svchost.exe 1 + +base\setup\setup\setup.exe 1 +base\setup\vmwinst\vmwinst.exe 1 + +base\shell\cmd\cmd.exe 1 +base\shell\explorer\explorer.exe 4 +base\shell\explorer\explorer-cfg-template.xml 4 +base\shell\explorer\notifyhook\notifyhook.dll 1 +base\shell\explorer-new\explorer_new.exe 4 optional + +base\system\autochk\autochk.exe 1 +base\system\bootok\bootok.exe 1 +base\system\format\format.exe 1 +base\system\lsass\lsass.exe 1 +base\system\msiexec\msiexec.exe 1 +base\system\regsvr32\regsvr32.exe 1 +base\system\rundll32\rundll32.exe 1 +base\system\runonce\runonce.exe 1 +base\system\services\services.exe 1 +base\system\userinit\userinit.exe 1 +base\system\winlogon\winlogon.exe 1 +base\system\expand\expand.exe 1 +base\system\smss\smss.exe 1 ; Dynamic Link Libraries -;dll\3rdparty\mesa32\mesa32.dll 1 -;dll\3rdparty\libjpeg\libjpeg.dll 1 -;dll\3rdparty\libxslt\libxslt.dll 1 -;dll\3rdparty\dxtn\dxtn.dll 1 optional - -;dll\cpl\access\access.cpl 1 -;dll\cpl\appwiz\appwiz.cpl 1 -;dll\cpl\console\console.dll 1 -;dll\cpl\desk\desk.cpl 1 -;dll\cpl\hdwwiz\hdwwiz.cpl 1 -;dll\cpl\input\input.dll 1 -;dll\cpl\intl\intl.cpl 1 -;dll\cpl\joy\joy.cpl 1 +dll\3rdparty\mesa32\mesa32.dll 1 +dll\3rdparty\libjpeg\libjpeg.dll 1 +dll\3rdparty\libxslt\libxslt.dll 1 +dll\3rdparty\dxtn\dxtn.dll 1 optional + +dll\cpl\access\access.cpl 1 +dll\cpl\appwiz\appwiz.cpl 1 +dll\cpl\console\console.dll 1 +dll\cpl\desk\desk.cpl 1 +dll\cpl\hdwwiz\hdwwiz.cpl 1 +dll\cpl\input\input.dll 1 +dll\cpl\intl\intl.cpl 1 +dll\cpl\joy\joy.cpl 1 ;dll\cpl\liccpa\liccpa.cpl 1 -;dll\cpl\main\main.cpl 1 -;dll\cpl\mmsys\mmsys.cpl 1 -;dll\cpl\ncpa\ncpa.cpl 1 +dll\cpl\main\main.cpl 1 +dll\cpl\mmsys\mmsys.cpl 1 +dll\cpl\ncpa\ncpa.cpl 1 ;dll\cpl\odbccp32\odbccp32.cpl 1 -;dll\cpl\powercfg\powercfg.cpl 1 -;dll\cpl\sysdm\sysdm.cpl 1 +dll\cpl\powercfg\powercfg.cpl 1 +dll\cpl\sysdm\sysdm.cpl 1 ;dll\cpl\telephon\telephon.cpl 1 -;dll\cpl\timedate\timedate.cpl 1 +dll\cpl\timedate\timedate.cpl 1 ;dll\cpl\usrmgr\usrmgr.cpl 1 -;dll\directx\amstream\amstream.dll 1 -;dll\directx\dinput\dinput.dll 1 -;dll\directx\dinput8\dinput8.dll 1 -;dll\directx\dplay\dplay.dll 1 -;dll\directx\dplayx\dplayx.dll 1 -;dll\directx\dsound\dsound.dll 1 -;dll\directx\dxdiagn\dxdiagn.dll 1 -;dll\directx\wine\ddraw\ddraw.dll 1 -;dll\directx\d3d8thk\d3d8thk.dll 1 -;dll\directx\devenum\devenum.dll 1 -;dll\directx\ksproxy\ksproxy.ax 1 -;dll\directx\ksuser\ksuser.dll 1 -;dll\directx\msdmo\msdmo.dll 1 -;dll\directx\quartz\quartz.dll 1 -;dll\directx\qedit\qedit.dll 1 -;dll\directx\wine\d3d8\d3d8.dll 1 -;dll\directx\wine\wined3d\wined3d.dll 1 -;dll\directx\wine\d3d9\d3d9.dll 1 - -;dll\keyboard\kbda1\kbda1.dll 1 -;dll\keyboard\kbda2\kbda2.dll 1 -;dll\keyboard\kbda3\kbda3.dll 1 -;dll\keyboard\kbdal\kbdal.dll 1 -;dll\keyboard\kbdarme\kbdarme.dll 1 -;dll\keyboard\kbdarmw\kbdarmw.dll 1 -;dll\keyboard\kbdaze\kbdaze.dll 1 -;dll\keyboard\kbdazel\kbdazel.dll 1 -;dll\keyboard\kbdbgm\kbdbgm.dll 1 -;dll\keyboard\kbdbgt\kbdbgt.dll 1 -;dll\keyboard\kbdblr\kbdblr.dll 1 -;dll\keyboard\kbdbr\kbdbr.dll 1 -;dll\keyboard\kbdbga\kbdbga.dll 1 -;dll\keyboard\kbdbe\kbdbe.dll 1 -;dll\keyboard\kbdbur\kbdbur.dll 1 -;dll\keyboard\kbdcan\kbdcan.dll 1 -;dll\keyboard\kbdcr\kbdcr.dll 1 -;dll\keyboard\kbdcz\kbdcz.dll 1 -;dll\keyboard\kbdcz1\kbdcz1.dll 1 -;dll\keyboard\kbdda\kbdda.dll 1 -;dll\keyboard\kbddv\kbddv.dll 1 -;dll\keyboard\kbdes\kbdes.dll 1 -;dll\keyboard\kbdest\kbdest.dll 1 -;dll\keyboard\kbdfc\kbdfc.dll 1 -;dll\keyboard\kbdfi\kbdfi.dll 1 -;dll\keyboard\kbdfr\kbdfr.dll 1 -;dll\keyboard\kbdgeo\kbdgeo.dll 1 -;dll\keyboard\kbdgerg\kbdgerg.dll 1 -;dll\keyboard\kbdgneo\kbdgneo.dll 1 -;dll\keyboard\kbdgrist\kbdgrist.dll 1 -;dll\keyboard\kbdgr\kbdgr.dll 1 -;dll\keyboard\kbdhe\kbdhe.dll 1 -;dll\keyboard\kbdheb\kbdheb.dll 1 -;dll\keyboard\kbdhu\kbdhu.dll 1 -;dll\keyboard\kbdic\kbdic.dll 1 -;dll\keyboard\kbdinasa\kbdinasa.dll 1 -;dll\keyboard\kbdinben\kbdinben.dll 1 -;dll\keyboard\kbdindev\kbdindev.dll 1 -;dll\keyboard\kbdinguj\kbdinguj.dll 1 -;dll\keyboard\kbdinmal\kbdinmal.dll 1 -;dll\keyboard\kbdir\kbdir.dll 1 -;dll\keyboard\kbdit\kbdit.dll 1 -;dll\keyboard\kbdja\kbdja.dll 1 -;dll\keyboard\kbdkaz\kbdkaz.dll 1 -;dll\keyboard\kbdla\kbdla.dll 1 -;dll\keyboard\kbdlt1\kbdlt1.dll 1 -;dll\keyboard\kbdlv\kbdlv.dll 1 -;dll\keyboard\kbdmac\kbdmac.dll 1 -;dll\keyboard\kbdne\kbdne.dll 1 -;dll\keyboard\kbdno\kbdno.dll 1 -;dll\keyboard\kbdpl1\kbdpl1.dll 1 -;dll\keyboard\kbdpo\kbdpo.dll 1 -;dll\keyboard\kbdro\kbdro.dll 1 -;dll\keyboard\kbdru\kbdru.dll 1 -;dll\keyboard\kbdru1\kbdru1.dll 1 -;dll\keyboard\kbdsg\kbdsg.dll 1 -;dll\keyboard\kbdsk\kbdsk.dll 1 -;dll\keyboard\kbdsk1\kbdsk1.dll 1 -;dll\keyboard\kbdsw\kbdsw.dll 1 -;dll\keyboard\kbdtat\kbdtat.dll 1 -;dll\keyboard\kbdth0\kbdth0.dll 1 -;dll\keyboard\kbdth1\kbdth1.dll 1 -;dll\keyboard\kbdth2\kbdth2.dll 1 -;dll\keyboard\kbdth3\kbdth3.dll 1 -;dll\keyboard\kbdtuf\kbdtuf.dll 1 -;dll\keyboard\kbdtuq\kbdtuq.dll 1 -;dll\keyboard\kbduk\kbduk.dll 1 -;dll\keyboard\kbdur\kbdur.dll 1 -;dll\keyboard\kbdurs\kbdurs.dll 1 -;dll\keyboard\kbdus\kbdus.dll 1 -;dll\keyboard\kbdusa\kbdusa.dll 1 -;dll\keyboard\kbdusl\kbdusl.dll 1 -;dll\keyboard\kbdusr\kbdusr.dll 1 -;dll\keyboard\kbdusx\kbdusx.dll 1 -;dll\keyboard\kbduzb\kbduzb.dll 1 -;dll\keyboard\kbdvntc\kbdvntc.dll 1 -;dll\keyboard\kbdycc\kbdycc.dll 1 -;dll\keyboard\kbdycl\kbdycl.dll 1 -;dll\keyboard\kbdko\kbdko.dll 1 - -;dll\nt;dll\ntdll.dll 1 - -;dll\win32\acledit\acledit.dll 1 -;dll\win32\aclui\aclui.dll 1 -;dll\win32\activeds\activeds.dll 1 -;dll\win32\advapi32\advapi32.dll 1 -;dll\win32\advpack\advpack.dll 1 -;dll\win32\actxprxy\actxprxy.dll 1 -;dll\win32\atl\atl.dll 1 -;dll\win32\authz\authz.dll 1 -;dll\win32\avicap32\avicap32.dll 1 -;dll\win32\avifil32\avifil32.dll 1 -;dll\win32\bcrypt\bcrypt.dll 1 -;dll\win32\beepmidi\beepmidi.dll 1 -;dll\win32\browseui\browseui.dll 1 -;dll\win32\cabinet\cabinet.dll 1 -;dll\win32\cards\cards.dll 1 -;dll\win32\cfgmgr32\cfgmgr32.dll 1 -;dll\win32\clusapi\clusapi.dll 1 -;dll\win32\comcat\comcat.dll 1 -;dll\win32\comctl32\comctl32.dll 1 -;dll\win32\comdlg32\comdlg32.dll 1 -;dll\win32\compstui\compstui.dll 1 -;dll\win32\credui\credui.dll 1 -;dll\win32\crtdll\crtdll.dll 1 -;dll\win32\crypt32\crypt32.dll 1 -;dll\win32\cryptdlg\cryptdlg.dll 1 -;dll\win32\cryptdll\cryptdll.dll 1 -;dll\win32\cryptnet\cryptnet.dll 1 -;dll\win32\cryptui\cryptui.dll 1 -;dll\win32\dbghelp\dbghelp.dll 1 -;dll\win32\dciman32\dciman32.dll 1 -;dll\win32\dwmapi\dwmapi.dll 1 -;dll\win32\devmgr\devmgr.dll 1 -;dll\win32\dhcpcsvc\dhcpcsvc.dll 1 -;dll\win32\dnsapi\dnsapi.dll 1 -;dll\win32\fmifs\fmifs.dll 1 -;dll\win32\fusion\fusion.dll 1 -;dll\win32\gdi32\gdi32.dll 1 -;dll\win32\gdiplus\gdiplus.dll 1 -;dll\win32\getuname\getuname.dll 1 -;dll\win32\glu32\glu32.dll 1 -;dll\win32\hhctrl.ocx\hhctrl.ocx 1 -;dll\win32\hid\hid.dll 1 -;dll\win32\hlink\hlink.dll 1 -;dll\win32\hnetcfg\hnetcfg.dll 1 -;dll\win32\httpapi\httpapi.dll 1 -;dll\win32\iccvid\iccvid.dll 1 -;dll\win32\icmp\icmp.dll 1 -;dll\win32\imaadp32.acm\imaadp32.acm 1 -;dll\win32\imagehlp\imagehlp.dll 1 -;dll\win32\imm32\imm32.dll 1 -;dll\win32\inetcomm\inetcomm.dll 1 -;dll\win32\inetmib1\inetmib1.dll 1 -;dll\win32\initpki\initpki.dll 1 -;dll\win32\inseng\inseng.dll 1 -;dll\win32\iphlpapi\iphlpapi.dll 1 -;dll\win32\itircl\itircl.dll 1 -;dll\win32\itss\itss.dll 1 -;dll\win32\jscript\jscript.dll 1 -;dll\win32\kernel32\kernel32.dll 1 -;dll\win32\loadperf\loadperf.dll 1 -;dll\win32\localspl\localspl.dll 1 -;dll\win32\localui\localui.dll 1 -;dll\win32\lsasrv\lsasrv.dll 1 -;dll\win32\lz32\lz32.dll 1 -;dll\win32\mapi32\mapi32.dll 1 -;dll\win32\mciavi32\mciavi32.dll 1 -;dll\win32\mcicda\mcicda.dll 1 -;dll\win32\mciqtz32\mciqtz32.dll 1 -;dll\win32\mciseq\mciseq.dll 1 -;dll\win32\mciwave\mciwave.dll 1 -;dll\win32\mlang\mlang.dll 1 -;dll\win32\mmdrv\mmdrv.dll 1 -;dll\win32\modemui\modemui.dll 1 -;dll\win32\mpr\mpr.dll 1 -;dll\win32\mprapi\mprapi.dll 1 -;dll\win32\msacm32\msacm32.dll 1 -;dll\win32\msacm32\msacm32.drv\msacm32.drv 1 -;dll\win32\msadp32.acm\msadp32.acm 1 -;dll\win32\msafd\msafd.dll 1 -;dll\win32\mscat32\mscat32.dll 1 -;dll\win32\mscms\mscms.dll 1 -;dll\win32\mscoree\mscoree.dll 1 -;dll\win32\msctf\msctf.dll 1 -;dll\win32\msftedit\msftedit.dll 1 -;dll\win32\msg711.acm\msg711.acm 1 -;dll\win32\msgina\msgina.dll 1 -;dll\win32\msgsm32.acm\msgsm32.acm 1 -;dll\win32\mshtml\mshtml.dll 1 -;dll\win32\mshtml.tlb\mshtml.tlb 1 -;dll\win32\msi\msi.dll 1 -;dll\win32\msimg32\msimg32.dll 1 -;dll\win32\msimtf\msimtf.dll 1 -;dll\win32\msisip\msisip.dll 1 -;dll\win32\msisys.ocx\msisys.ocx 1 -;dll\win32\msnet32\msnet32.dll 1 -;dll\win32\msrle32\msrle32.dll 1 -;dll\win32\mssign32\mssign32.dll 1 -;dll\win32\mssip32\mssip32.dll 1 -;dll\win32\mstask\mstask.dll 1 -;dll\win32\msvcrt\msvcrt.dll 1 -;dll\win32\msvcrt20\msvcrt20.dll 1 -;dll\win32\msvcrt40\msvcrt40.dll 1 -;dll\win32\msvfw32\msvfw32.dll 1 -;dll\win32\msvidc32\msvidc32.dll 1 -;dll\win32\mswsock\mswsock.dll 1 -;dll\win32\msxml3\msxml3.dll 1 -;dll\win32\nddeapi\nddeapi.dll 1 -;dll\win32\netapi32\netapi32.dll 1 -;dll\win32\netcfgx\netcfgx.dll 1 -;dll\win32\netid\netid.dll 1 -;dll\win32\netshell\netshell.dll 1 -;dll\win32\newdev\newdev.dll 1 -;dll\win32\ntdsapi\ntdsapi.dll 1 -;dll\win32\ntlanman\ntlanman.dll 1 -;dll\win32\ntmarta\ntmarta.dll 1 -;dll\win32\ntprint\ntprint.dll 1 -;dll\win32\objsel\objsel.dll 1 -;dll\win32\odbc32\odbc32.dll 1 -;dll\win32\odbccp32\odbccp32.dll 1 -;dll\win32\ole32\ole32.dll 1 -;dll\win32\oleacc\oleacc.dll 1 -;dll\win32\oleaut32\oleaut32.dll 1 -;dll\win32\olecli32\olecli32.dll 1 -;dll\win32\oledlg\oledlg.dll 1 -;dll\win32\olepro32\olepro32.dll 1 -;dll\win32\olesvr32\olesvr32.dll 1 -;dll\win32\olethk32\olethk32.dll 1 -;dll\win32\opengl32\opengl32.dll 1 -;dll\win32\pdh\pdh.dll 1 -;dll\win32\pidgen\pidgen.dll 1 -;dll\win32\powrprof\powrprof.dll 1 -;dll\win32\printui\printui.dll 1 -;dll\win32\psapi\psapi.dll 1 -;dll\win32\pstorec\pstorec.dll 1 -;dll\win32\qmgr\qmgr.dll 1 -;dll\win32\qmgrprxy\qmgrprxy.dll 1 -;dll\win32\query\query.dll 1 -;dll\win32\rasapi32\rasapi32.dll 1 -;dll\win32\rasdlg\rasdlg.dll 1 -;dll\win32\resutils\resutils.dll 1 -;dll\win32\rasman\rasman.dll 1 -;dll\win32\riched20\riched20.dll 1 -;dll\win32\riched32\riched32.dll 1 -;dll\win32\rpcrt4\rpcrt4.dll 1 -;dll\win32\rsabase\rsabase.dll 1 -;dll\win32\rsaenh\rsaenh.dll 1 -;dll\win32\samlib\samlib.dll 1 -;dll\win32\samsrv\samsrv.dll 1 -;dll\win32\sccbase\sccbase.dll 1 -;dll\win32\schannel\schannel.dll 1 -;dll\win32\secur32\secur32.dll 1 -;dll\win32\security\security.dll 1 -;dll\win32\sensapi\sensapi.dll 1 -;dll\win32\serialui\serialui.dll 1 -;dll\win32\setupapi\setupapi.dll 1 -;dll\win32\sfc\sfc.dll 1 -;dll\win32\sfc_os\sfc_os.dll 1 -;dll\win32\shdoclc\shdoclc.dll 1 -;dll\win32\shdocvw\shdocvw.dll 1 -;dll\win32\shell32\shell32.dll 1 -;dll\win32\shfolder\shfolder.dll 1 -;dll\win32\shimgvw\shimgvw.dll 1 -;dll\win32\shlwapi\shlwapi.dll 1 -;dll\win32\slbcsp\slbcsp.dll 1 -;dll\win32\smdll\smdll.dll 1 -;dll\win32\snmpapi\snmpapi.dll 1 -;dll\win32\softpub\softpub.dll 1 -;dll\win32\spoolss\spoolss.dll 1 -;dll\win32\srclient\srclient.dll 1 -;dll\win32\stdole2.tlb\stdole2.tlb 1 -;dll\win32\stdole32.tlb\stdole32.tlb 1 -;dll\win32\sti\sti.dll 1 -;dll\win32\sxs\sxs.dll 1 -;dll\win32\syssetup\syssetup.dll 1 -;dll\win32\t2embed\t2embed.dll 1 -;dll\win32\tapi32\tapi32.dll 1 -;dll\win32\tapiui\tapiui.dll 1 -;dll\win32\traffic\traffic.dll 1 -;dll\win32\twain_32\twain_32.dll 1 -;dll\win32\uext2\uext2.dll 1 -;dll\win32\ufat\ufat.dll 1 -;dll\win32\ufatx\ufatx.dll 1 optional -;dll\win32\untfs\untfs.dll 1 -;dll\win32\updspapi\updspapi.dll 1 -;dll\win32\url\url.dll 1 -;dll\win32\urlmon\urlmon.dll 1 -;dll\win32\user32\user32.dll 1 -;dll\win32\userenv\userenv.dll 1 -;dll\win32\usp10\usp10.dll 1 -;dll\win32\uxtheme\uxtheme.dll 1 -;dll\win32\vdmdbg\vdmdbg.dll 1 -;dll\win32\version\version.dll 1 -;dll\win32\windowscodecs\windowscodecs.dll 1 -;dll\win32\winemp3.acm\winemp3.acm 1 -;dll\win32\winfax\winfax.dll 1 -;dll\win32\winhttp\winhttp.dll 1 -;dll\win32\wininet\wininet.dll 1 -;dll\win32\winmm\winmm.dll 1 -;dll\win32\winspool\winspool.drv 1 -;dll\win32\winsta\winsta.dll 1 -;dll\win32\wlanapi\wlanapi.dll 1 -;dll\win32\wintrust\wintrust.dll 1 -;dll\win32\wldap32\wldap32.dll 1 -;dll\win32\wmi\wmi.dll 1 -;dll\win32\ws2_32\ws2_32.dll 1 -;dll\win32\ws2help\ws2help.dll 1 -;dll\win32\wshirda\wshirda.dll 1 -;dll\win32\wshtcpip\wshtcpip.dll 1 -;dll\win32\wsock32\wsock32.dll 1 -;dll\win32\wtsapi32\wtsapi32.dll 1 -;dll\win32\wuapi\wuapi.dll 1 -;dll\win32\xinput1_1\xinput1_1.dll 1 -;dll\win32\xinput1_2\xinput1_2.dll 1 -;dll\win32\xinput1_3\xinput1_3.dll 1 -;dll\win32\xinput9_1_0\xinput9_1_0.dll 1 -;dll\win32\xmllite\xmllite.dll 1 -;dll\win32\winmm\midimap\midimap.dll 1 -;dll\win32\wdmaud.drv\wdmaud.drv 1 +dll\directx\amstream\amstream.dll 1 +dll\directx\dinput\dinput.dll 1 +dll\directx\dinput8\dinput8.dll 1 +dll\directx\dmusic\dmusic.dll 1 +dll\directx\dplay\dplay.dll 1 +dll\directx\dplayx\dplayx.dll 1 +dll\directx\dsound\dsound.dll 1 +dll\directx\dxdiagn\dxdiagn.dll 1 +dll\directx\wine\ddraw\ddraw.dll 1 +dll\directx\d3d8thk\d3d8thk.dll 1 +dll\directx\devenum\devenum.dll 1 +dll\directx\ksproxy\ksproxy.ax 1 +dll\directx\ksuser\ksuser.dll 1 +dll\directx\msdmo\msdmo.dll 1 +dll\directx\quartz\quartz.dll 1 +dll\directx\qedit\qedit.dll 1 +dll\directx\wine\d3d8\d3d8.dll 1 +dll\directx\wine\wined3d\wined3d.dll 1 +dll\directx\wine\d3d9\d3d9.dll 1 + +dll\keyboard\kbda1\kbda1.dll 1 +dll\keyboard\kbda2\kbda2.dll 1 +dll\keyboard\kbda3\kbda3.dll 1 +dll\keyboard\kbdal\kbdal.dll 1 +dll\keyboard\kbdarme\kbdarme.dll 1 +dll\keyboard\kbdarmw\kbdarmw.dll 1 +dll\keyboard\kbdaze\kbdaze.dll 1 +dll\keyboard\kbdazel\kbdazel.dll 1 +dll\keyboard\kbdbgm\kbdbgm.dll 1 +dll\keyboard\kbdbgt\kbdbgt.dll 1 +dll\keyboard\kbdblr\kbdblr.dll 1 +dll\keyboard\kbdbr\kbdbr.dll 1 +dll\keyboard\kbdbga\kbdbga.dll 1 +dll\keyboard\kbdbe\kbdbe.dll 1 +dll\keyboard\kbdbur\kbdbur.dll 1 +dll\keyboard\kbdcan\kbdcan.dll 1 +dll\keyboard\kbdcr\kbdcr.dll 1 +dll\keyboard\kbdcz\kbdcz.dll 1 +dll\keyboard\kbdcz1\kbdcz1.dll 1 +dll\keyboard\kbdda\kbdda.dll 1 +dll\keyboard\kbddv\kbddv.dll 1 +dll\keyboard\kbdes\kbdes.dll 1 +dll\keyboard\kbdest\kbdest.dll 1 +dll\keyboard\kbdfc\kbdfc.dll 1 +dll\keyboard\kbdfi\kbdfi.dll 1 +dll\keyboard\kbdfr\kbdfr.dll 1 +dll\keyboard\kbdgeo\kbdgeo.dll 1 +dll\keyboard\kbdgerg\kbdgerg.dll 1 +dll\keyboard\kbdgneo\kbdgneo.dll 1 +dll\keyboard\kbdgrist\kbdgrist.dll 1 +dll\keyboard\kbdgr\kbdgr.dll 1 +dll\keyboard\kbdhe\kbdhe.dll 1 +dll\keyboard\kbdheb\kbdheb.dll 1 +dll\keyboard\kbdhu\kbdhu.dll 1 +dll\keyboard\kbdic\kbdic.dll 1 +dll\keyboard\kbdinasa\kbdinasa.dll 1 +dll\keyboard\kbdinben\kbdinben.dll 1 +dll\keyboard\kbdindev\kbdindev.dll 1 +dll\keyboard\kbdinguj\kbdinguj.dll 1 +dll\keyboard\kbdinmal\kbdinmal.dll 1 +dll\keyboard\kbdir\kbdir.dll 1 +dll\keyboard\kbdit\kbdit.dll 1 +dll\keyboard\kbdja\kbdja.dll 1 +dll\keyboard\kbdkaz\kbdkaz.dll 1 +dll\keyboard\kbdla\kbdla.dll 1 +dll\keyboard\kbdlt1\kbdlt1.dll 1 +dll\keyboard\kbdlv\kbdlv.dll 1 +dll\keyboard\kbdmac\kbdmac.dll 1 +dll\keyboard\kbdne\kbdne.dll 1 +dll\keyboard\kbdno\kbdno.dll 1 +dll\keyboard\kbdpl1\kbdpl1.dll 1 +dll\keyboard\kbdpo\kbdpo.dll 1 +dll\keyboard\kbdro\kbdro.dll 1 +dll\keyboard\kbdru\kbdru.dll 1 +dll\keyboard\kbdru1\kbdru1.dll 1 +dll\keyboard\kbdsg\kbdsg.dll 1 +dll\keyboard\kbdsk\kbdsk.dll 1 +dll\keyboard\kbdsk1\kbdsk1.dll 1 +dll\keyboard\kbdsw\kbdsw.dll 1 +dll\keyboard\kbdtat\kbdtat.dll 1 +dll\keyboard\kbdth0\kbdth0.dll 1 +dll\keyboard\kbdth1\kbdth1.dll 1 +dll\keyboard\kbdth2\kbdth2.dll 1 +dll\keyboard\kbdth3\kbdth3.dll 1 +dll\keyboard\kbdtuf\kbdtuf.dll 1 +dll\keyboard\kbdtuq\kbdtuq.dll 1 +dll\keyboard\kbduk\kbduk.dll 1 +dll\keyboard\kbdur\kbdur.dll 1 +dll\keyboard\kbdurs\kbdurs.dll 1 +dll\keyboard\kbdus\kbdus.dll 1 +dll\keyboard\kbdusa\kbdusa.dll 1 +dll\keyboard\kbdusl\kbdusl.dll 1 +dll\keyboard\kbdusr\kbdusr.dll 1 +dll\keyboard\kbdusx\kbdusx.dll 1 +dll\keyboard\kbduzb\kbduzb.dll 1 +dll\keyboard\kbdvntc\kbdvntc.dll 1 +dll\keyboard\kbdycc\kbdycc.dll 1 +dll\keyboard\kbdycl\kbdycl.dll 1 +dll\keyboard\kbdko\kbdko.dll 1 + +dll\ntdll\ntdll.dll 1 + +dll\win32\acledit\acledit.dll 1 +dll\win32\aclui\aclui.dll 1 +dll\win32\activeds\activeds.dll 1 +dll\win32\advapi32\advapi32.dll 1 +dll\win32\advpack\advpack.dll 1 +dll\win32\actxprxy\actxprxy.dll 1 +dll\win32\atl\atl.dll 1 +dll\win32\authz\authz.dll 1 +dll\win32\avicap32\avicap32.dll 1 +dll\win32\avifil32\avifil32.dll 1 +dll\win32\bcrypt\bcrypt.dll 1 +dll\win32\beepmidi\beepmidi.dll 1 +dll\win32\browseui\browseui.dll 1 +dll\win32\cabinet\cabinet.dll 1 +dll\win32\cards\cards.dll 1 +dll\win32\cfgmgr32\cfgmgr32.dll 1 +dll\win32\clusapi\clusapi.dll 1 +dll\win32\comcat\comcat.dll 1 +dll\win32\comctl32\comctl32.dll 1 +dll\win32\comdlg32\comdlg32.dll 1 +dll\win32\compstui\compstui.dll 1 +dll\win32\credui\credui.dll 1 +dll\win32\crtdll\crtdll.dll 1 +dll\win32\crypt32\crypt32.dll 1 +dll\win32\cryptdlg\cryptdlg.dll 1 +dll\win32\cryptdll\cryptdll.dll 1 +dll\win32\cryptnet\cryptnet.dll 1 +dll\win32\cryptui\cryptui.dll 1 +dll\win32\dbghelp\dbghelp.dll 1 +dll\win32\dciman32\dciman32.dll 1 +dll\win32\dwmapi\dwmapi.dll 1 +dll\win32\devmgr\devmgr.dll 1 +dll\win32\dhcpcsvc\dhcpcsvc.dll 1 +dll\win32\dnsapi\dnsapi.dll 1 +dll\win32\fmifs\fmifs.dll 1 +dll\win32\fusion\fusion.dll 1 +dll\win32\gdi32\gdi32.dll 1 +dll\win32\gdiplus\gdiplus.dll 1 +dll\win32\getuname\getuname.dll 1 +dll\win32\glu32\glu32.dll 1 +dll\win32\hhctrl.ocx\hhctrl.ocx 1 +dll\win32\hid\hid.dll 1 +dll\win32\hlink\hlink.dll 1 +dll\win32\hnetcfg\hnetcfg.dll 1 +dll\win32\httpapi\httpapi.dll 1 +dll\win32\iccvid\iccvid.dll 1 +dll\win32\icmp\icmp.dll 1 +dll\win32\imaadp32.acm\imaadp32.acm 1 +dll\win32\imagehlp\imagehlp.dll 1 +dll\win32\imm32\imm32.dll 1 +dll\win32\inetcomm\inetcomm.dll 1 +dll\win32\inetmib1\inetmib1.dll 1 +dll\win32\initpki\initpki.dll 1 +dll\win32\inseng\inseng.dll 1 +dll\win32\iphlpapi\iphlpapi.dll 1 +dll\win32\itircl\itircl.dll 1 +dll\win32\itss\itss.dll 1 +dll\win32\jscript\jscript.dll 1 +dll\win32\kernel32\kernel32.dll 1 +dll\win32\loadperf\loadperf.dll 1 +dll\win32\localspl\localspl.dll 1 +dll\win32\localui\localui.dll 1 +dll\win32\lsasrv\lsasrv.dll 1 +dll\win32\lz32\lz32.dll 1 +dll\win32\mapi32\mapi32.dll 1 +dll\win32\mciavi32\mciavi32.dll 1 +dll\win32\mcicda\mcicda.dll 1 +dll\win32\mciqtz32\mciqtz32.dll 1 +dll\win32\mciseq\mciseq.dll 1 +dll\win32\mciwave\mciwave.dll 1 +dll\win32\mlang\mlang.dll 1 +dll\win32\mmdrv\mmdrv.dll 1 +dll\win32\modemui\modemui.dll 1 +dll\win32\mpr\mpr.dll 1 +dll\win32\mprapi\mprapi.dll 1 +dll\win32\msacm32\msacm32.dll 1 +dll\win32\msacm32\msacm32.drv\msacm32.drv 1 +dll\win32\msadp32.acm\msadp32.acm 1 +dll\win32\msafd\msafd.dll 1 +dll\win32\mscat32\mscat32.dll 1 +dll\win32\mscms\mscms.dll 1 +dll\win32\mscoree\mscoree.dll 1 +dll\win32\msctf\msctf.dll 1 +dll\win32\msftedit\msftedit.dll 1 +dll\win32\msg711.acm\msg711.acm 1 +dll\win32\msgina\msgina.dll 1 +dll\win32\msgsm32.acm\msgsm32.acm 1 +dll\win32\mshtml\mshtml.dll 1 +dll\win32\mshtml.tlb\mshtml.tlb 1 +dll\win32\msi\msi.dll 1 +dll\win32\msimg32\msimg32.dll 1 +dll\win32\msimtf\msimtf.dll 1 +dll\win32\msisip\msisip.dll 1 +dll\win32\msisys.ocx\msisys.ocx 1 +dll\win32\msnet32\msnet32.dll 1 +dll\win32\msrle32\msrle32.dll 1 +dll\win32\mssign32\mssign32.dll 1 +dll\win32\mssip32\mssip32.dll 1 +dll\win32\mstask\mstask.dll 1 +dll\win32\msvcrt\msvcrt.dll 1 +dll\win32\msvcrt20\msvcrt20.dll 1 +dll\win32\msvcrt40\msvcrt40.dll 1 +dll\win32\msvfw32\msvfw32.dll 1 +dll\win32\msvidc32\msvidc32.dll 1 +dll\win32\mswsock\mswsock.dll 1 +dll\win32\msxml3\msxml3.dll 1 +dll\win32\nddeapi\nddeapi.dll 1 +dll\win32\netapi32\netapi32.dll 1 +dll\win32\netcfgx\netcfgx.dll 1 +dll\win32\netid\netid.dll 1 +dll\win32\netshell\netshell.dll 1 +dll\win32\newdev\newdev.dll 1 +dll\win32\ntdsapi\ntdsapi.dll 1 +dll\win32\ntlanman\ntlanman.dll 1 +dll\win32\ntmarta\ntmarta.dll 1 +dll\win32\ntprint\ntprint.dll 1 +dll\win32\objsel\objsel.dll 1 +dll\win32\odbc32\odbc32.dll 1 +dll\win32\odbccp32\odbccp32.dll 1 +dll\win32\ole32\ole32.dll 1 +dll\win32\oleacc\oleacc.dll 1 +dll\win32\oleaut32\oleaut32.dll 1 +dll\win32\olecli32\olecli32.dll 1 +dll\win32\oledlg\oledlg.dll 1 +dll\win32\olepro32\olepro32.dll 1 +dll\win32\olesvr32\olesvr32.dll 1 +dll\win32\olethk32\olethk32.dll 1 +dll\win32\opengl32\opengl32.dll 1 +dll\win32\pdh\pdh.dll 1 +dll\win32\pidgen\pidgen.dll 1 +dll\win32\powrprof\powrprof.dll 1 +dll\win32\printui\printui.dll 1 +dll\win32\psapi\psapi.dll 1 +dll\win32\pstorec\pstorec.dll 1 +dll\win32\qmgr\qmgr.dll 1 +dll\win32\qmgrprxy\qmgrprxy.dll 1 +dll\win32\query\query.dll 1 +dll\win32\rasadhlp\rasadhlp.dll 1 +dll\win32\rasapi32\rasapi32.dll 1 +dll\win32\rasdlg\rasdlg.dll 1 +dll\win32\resutils\resutils.dll 1 +dll\win32\rasman\rasman.dll 1 +dll\win32\riched20\riched20.dll 1 +dll\win32\riched32\riched32.dll 1 +dll\win32\rpcrt4\rpcrt4.dll 1 +dll\win32\rsabase\rsabase.dll 1 +dll\win32\rsaenh\rsaenh.dll 1 +dll\win32\samlib\samlib.dll 1 +dll\win32\samsrv\samsrv.dll 1 +dll\win32\sccbase\sccbase.dll 1 +dll\win32\schannel\schannel.dll 1 +dll\win32\secur32\secur32.dll 1 +dll\win32\security\security.dll 1 +dll\win32\sensapi\sensapi.dll 1 +dll\win32\serialui\serialui.dll 1 +dll\win32\setupapi\setupapi.dll 1 +dll\win32\sfc\sfc.dll 1 +dll\win32\sfc_os\sfc_os.dll 1 +dll\win32\shdoclc\shdoclc.dll 1 +dll\win32\shdocvw\shdocvw.dll 1 +dll\win32\shell32\shell32.dll 1 +dll\win32\shfolder\shfolder.dll 1 +dll\win32\shimgvw\shimgvw.dll 1 +dll\win32\shlwapi\shlwapi.dll 1 +dll\win32\slbcsp\slbcsp.dll 1 +dll\win32\smdll\smdll.dll 1 +dll\win32\snmpapi\snmpapi.dll 1 +dll\win32\softpub\softpub.dll 1 +dll\win32\spoolss\spoolss.dll 1 +dll\win32\srclient\srclient.dll 1 +dll\win32\stdole2.tlb\stdole2.tlb 1 +dll\win32\stdole32.tlb\stdole32.tlb 1 +dll\win32\sti\sti.dll 1 +dll\win32\sxs\sxs.dll 1 +dll\win32\syssetup\syssetup.dll 1 +dll\win32\t2embed\t2embed.dll 1 +dll\win32\tapi32\tapi32.dll 1 +dll\win32\tapiui\tapiui.dll 1 +dll\win32\traffic\traffic.dll 1 +dll\win32\twain_32\twain_32.dll 1 +dll\win32\uext2\uext2.dll 1 +dll\win32\ufat\ufat.dll 1 +dll\win32\ufatx\ufatx.dll 1 optional +dll\win32\untfs\untfs.dll 1 +dll\win32\updspapi\updspapi.dll 1 +dll\win32\url\url.dll 1 +dll\win32\urlmon\urlmon.dll 1 +dll\win32\user32\user32.dll 1 +dll\win32\userenv\userenv.dll 1 +dll\win32\usp10\usp10.dll 1 +dll\win32\uxtheme\uxtheme.dll 1 +dll\win32\vdmdbg\vdmdbg.dll 1 +dll\win32\version\version.dll 1 +dll\win32\windowscodecs\windowscodecs.dll 1 +dll\win32\winemp3.acm\winemp3.acm 1 +dll\win32\winfax\winfax.dll 1 +dll\win32\winhttp\winhttp.dll 1 +dll\win32\wininet\wininet.dll 1 +dll\win32\winmm\winmm.dll 1 +dll\win32\winspool\winspool.drv 1 +dll\win32\winsta\winsta.dll 1 +dll\win32\wlanapi\wlanapi.dll 1 +dll\win32\wintrust\wintrust.dll 1 +dll\win32\wldap32\wldap32.dll 1 +dll\win32\wmi\wmi.dll 1 +dll\win32\ws2_32\ws2_32.dll 1 +dll\win32\ws2help\ws2help.dll 1 +dll\win32\wshirda\wshirda.dll 1 +dll\win32\wshtcpip\wshtcpip.dll 1 +dll\win32\wsock32\wsock32.dll 1 +dll\win32\wtsapi32\wtsapi32.dll 1 +dll\win32\wuapi\wuapi.dll 1 +dll\win32\xinput1_1\xinput1_1.dll 1 +dll\win32\xinput1_2\xinput1_2.dll 1 +dll\win32\xinput1_3\xinput1_3.dll 1 +dll\win32\xinput9_1_0\xinput9_1_0.dll 1 +dll\win32\xmllite\xmllite.dll 1 +dll\win32\winmm\midimap\midimap.dll 1 +dll\win32\wdmaud.drv\wdmaud.drv 1 ; Shell Extensions -;dll\shellext\deskadp\deskadp.dll 1 -;dll\shellext\deskmon\deskmon.dll 1 +dll\shellext\deskadp\deskadp.dll 1 +dll\shellext\deskmon\deskmon.dll 1 ; Drivers -;drivers\base\bootvid\bootvid.dll 1 -;drivers\base\beep\beep.sys 2 -;drivers\base\null\null.sys 2 - -;drivers\bus\isapnp\isapnp.sys 2 - -;drivers\directx\dxapi\dxapi.sys 2 -;drivers\directx\dxg\dxg.sys 2 -;drivers\directx\dxgthk\dxgthk.sys 2 - -;drivers\filesystems\fs_rec\fs_rec.sys 2 -;drivers\filesystems\msfs\msfs.sys 2 -;drivers\filesystems\mup\mup.sys 2 -;drivers\filesystems\npfs\npfs.sys 2 - -;drivers\input\mouclass\mouclass.sys 2 -;drivers\input\sermouse\sermouse.sys 2 - -;drivers\ksfilter\ks\ks.sys 2 - -;drivers\network\afd\afd.sys 2 -;drivers\network\ndis\ndis.sys 2 -;drivers\network\tcpip\tcpip.sys 2 -;drivers\network\tdi\tdi.sys 2 -;drivers\network\dd\ne2000\ne2000.sys 2 -;drivers\network\dd\pcnet\pcnet.sys 2 - -;drivers\serial\serenum\serenum.sys 2 -;drivers\serial\serial\serial.sys 2 - -;drivers\storage\ide\pciide\pciide.sys 2 -;drivers\storage\ide\pciidex\pciidex.sys 2 - -;drivers\usb\miniport\usbohci\usbohci.sys . 2 -;drivers\usb\miniport\usbuhci\usbuhci.sys . 2 -;drivers\usb\usbhub\usbhub.sys . 2 -;drivers\usb\usbport\usbport.sys . 2 -;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 - -;drivers\video\displays\vga\vgaddi.dll 1 -;drivers\video\displays\framebuf\framebuf.dll 1 -;drivers\video\miniport\vga\vgamp.sys 2 -;drivers\video\miniport\vbe\vbemp.sys 2 -;drivers\video\videoprt\videoprt.sys 2 -;drivers\video\font\ftfd\ftfd.dll 1 - -;drivers\wdm\audio\filters\kmixer\kmixer.sys 2 -;drivers\wdm\audio\sysaudio\sysaudio.sys 2 -;drivers\wdm\audio\legacy\wdmaud\wdmaud.sys 2 -;drivers\wdm\audio\backpln\portcls\portcls.sys 2 -;drivers\wdm\audio\drm\drmk\drmk.sys 2 -;drivers\wmi\wmilib.sys 2 +drivers\base\bootvid\bootvid.dll 1 +drivers\base\beep\beep.sys 2 +drivers\base\null\null.sys 2 + +drivers\bus\isapnp\isapnp.sys 2 + +drivers\directx\dxapi\dxapi.sys 2 +drivers\directx\dxg\dxg.sys 2 +drivers\directx\dxgthk\dxgthk.sys 2 + +drivers\filesystems\fs_rec\fs_rec.sys 2 +drivers\filesystems\msfs\msfs.sys 2 +drivers\filesystems\mup\mup.sys 2 +drivers\filesystems\npfs\npfs.sys 2 + +drivers\input\mouclass\mouclass.sys 2 +drivers\input\sermouse\sermouse.sys 2 + +drivers\ksfilter\ks\ks.sys 2 + +drivers\network\afd\afd.sys 2 +drivers\network\ndis\ndis.sys 2 +drivers\network\tcpip\tcpip.sys 2 +drivers\network\tdi\tdi.sys 2 +drivers\network\dd\ne2000\ne2000.sys 2 +drivers\network\dd\pcnet\pcnet.sys 2 + +drivers\serial\serenum\serenum.sys 2 +drivers\serial\serial\serial.sys 2 + +drivers\storage\ide\pciide\pciide.sys 2 +drivers\storage\ide\pciidex\pciidex.sys 2 + +;drivers\usb\miniport\usbohci\usbohci.sys 2 +;drivers\usb\miniport\usbuhci\usbuhci.sys 2 +;drivers\usb\usbhub\usbhub.sys 2 +;drivers\usb\usbport\usbport.sys 2 +drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 + +drivers\video\displays\vga\vgaddi.dll 1 +drivers\video\displays\framebuf\framebuf.dll 1 +drivers\video\miniport\vga\vgamp.sys 2 +drivers\video\miniport\vbe\vbemp.sys 2 +drivers\video\videoprt\videoprt.sys 2 +drivers\video\font\ftfd\ftfd.dll 1 + +drivers\wdm\audio\filters\kmixer\kmixer.sys 2 +drivers\wdm\audio\sysaudio\sysaudio.sys 2 +drivers\wdm\audio\legacy\wdmaud\wdmaud.sys 2 +drivers\wdm\audio\backpln\portcls\portcls.sys 2 +drivers\wdm\audio\drm\drmk\drmk.sys 2 +drivers\wmi\wmilib.sys 2 ; Media -;media\fonts\DejaVuSans.ttf 3 -;media\fonts\DejaVuSans-Bold.ttf 3 -;media\fonts\DejaVuSans-BoldOblique.ttf 3 -;media\fonts\DejaVuSansMono.ttf 3 -;media\fonts\DejaVuSansMono-Bold.ttf 3 -;media\fonts\DejaVuSansMono-BoldOblique.ttf 3 -;media\fonts\DejaVuSansMono-Oblique.ttf 3 -;media\fonts\DejaVuSans-Oblique.ttf 3 -;media\fonts\DejaVuSerif.ttf 3 -;media\fonts\DejaVuSerif-Bold.ttf 3 -;media\fonts\DejaVuSerif-BoldItalic.ttf 3 -;media\fonts\DejaVuSerif-Italic.ttf 3 - -;media\fonts\FreeMono.ttf 3 -;media\fonts\FreeMonoBold.ttf 3 -;media\fonts\FreeMonoBoldOblique.ttf 3 -;media\fonts\FreeMonoOblique.ttf 3 - -;media\fonts\LiberationMono-Bold.ttf 3 -;media\fonts\LiberationMono-BoldItalic.ttf 3 -;media\fonts\LiberationMono-Italic.ttf 3 -;media\fonts\LiberationMono-Regular.ttf 3 -;media\fonts\LiberationSans-Bold.ttf 3 -;media\fonts\LiberationSans-BoldItalic.ttf 3 -;media\fonts\LiberationSans-Italic.ttf 3 -;media\fonts\LiberationSans-Regular.ttf 3 -;media\fonts\LiberationSerif-Bold.ttf 3 -;media\fonts\LiberationSerif-BoldItalic.ttf 3 -;media\fonts\LiberationSerif-Italic.ttf 3 -;media\fonts\LiberationSerif-Regular.ttf 3 - -;media\fonts\Marlett.ttf 3 -;media\fonts\tahoma.ttf 3 -;media\fonts\tahomabd.ttf 3 - -;media\nls\c_037.nls 1 -;media\nls\c_424.nls 1 -;media\nls\c_500.nls 1 -;media\nls\c_737.nls 1 -;media\nls\c_775.nls 1 -;media\nls\c_850.nls 1 -;media\nls\c_852.nls 1 -;media\nls\c_855.nls 1 -;media\nls\c_856.nls 1 -;media\nls\c_857.nls 1 -;media\nls\c_860.nls 1 -;media\nls\c_861.nls 1 -;media\nls\c_862.nls 1 -;media\nls\c_863.nls 1 -;media\nls\c_864.nls 1 -;media\nls\c_865.nls 1 -;media\nls\c_866.nls 1 -;media\nls\c_869.nls 1 -;media\nls\c_874.nls 1 -;media\nls\c_875.nls 1 -;media\nls\c_878.nls 1 -;media\nls\c_932.nls 1 -;media\nls\c_936.nls 1 -;media\nls\c_949.nls 1 -;media\nls\c_950.nls 1 -;media\nls\c_1006.nls 1 -;media\nls\c_1026.nls 1 -;media\nls\c_1250.nls 1 -;media\nls\c_1251.nls 1 -;media\nls\c_1253.nls 1 -;media\nls\c_1254.nls 1 -;media\nls\c_1255.nls 1 -;media\nls\c_1256.nls 1 -;media\nls\c_1257.nls 1 -;media\nls\c_1258.nls 1 -;media\nls\c_10000.nls 1 -;media\nls\c_10006.nls 1 -;media\nls\c_10007.nls 1 -;media\nls\c_10029.nls 1 -;media\nls\c_10079.nls 1 -;media\nls\c_10081.nls 1 -;media\nls\c_20866.nls 1 -;media\nls\c_21866.nls 1 -;media\nls\c_28591.nls 1 -;media\nls\c_28592.nls 1 -;media\nls\c_28593.nls 1 -;media\nls\c_28594.nls 1 -;media\nls\c_28595.nls 1 -;media\nls\c_28596.nls 1 -;media\nls\c_28597.nls 1 -;media\nls\c_28598.nls 1 -;media\nls\c_28599.nls 1 -;media\nls\c_28600.nls 1 -;media\nls\c_28603.nls 1 -;media\nls\c_28604.nls 1 -;media\nls\c_28605.nls 1 -;media\nls\c_28606.nls 1 -;media\drivers\etc\services 5 -;media\inf\audio.inf 6 -;media\inf\acpi.inf 6 -;media\inf\cdrom.inf 6 -;media\inf\display.inf 6 -;media\inf\font.inf 6 -;media\inf\fdc.inf 6 -;media\inf\hdc.inf 6 -;media\inf\intl.inf 6 -;media\inf\layout.inf 6 -;media\inf\machine.inf 6 -;media\inf\msmouse.inf 6 -;media\inf\keyboard.inf 6 -;media\inf\ks.inf 6 -;media\inf\NET_NIC.inf 6 -;media\inf\netamd.inf 6 -;media\inf\netisa.inf 6 -;media\inf\netrtpnt.inf 6 -;media\inf\nettcpip.inf 6 -;media\inf\ports.inf 6 -;media\inf\scsi.inf 6 -;media\inf\syssetup.inf 6 -;media\inf\usbport.inf 6 -;media\inf\usb.inf 6 -;media\inf\usbstor.inf 6 -;media\inf\xboxdisp.inf 6 +media\fonts\DejaVuSans.ttf 3 +media\fonts\DejaVuSans-Bold.ttf 3 +media\fonts\DejaVuSans-BoldOblique.ttf 3 +media\fonts\DejaVuSansMono.ttf 3 +media\fonts\DejaVuSansMono-Bold.ttf 3 +media\fonts\DejaVuSansMono-BoldOblique.ttf 3 +media\fonts\DejaVuSansMono-Oblique.ttf 3 +media\fonts\DejaVuSans-Oblique.ttf 3 +media\fonts\DejaVuSerif.ttf 3 +media\fonts\DejaVuSerif-Bold.ttf 3 +media\fonts\DejaVuSerif-BoldItalic.ttf 3 +media\fonts\DejaVuSerif-Italic.ttf 3 + +media\fonts\FreeMono.ttf 3 +media\fonts\FreeMonoBold.ttf 3 +media\fonts\FreeMonoBoldOblique.ttf 3 +media\fonts\FreeMonoOblique.ttf 3 + +media\fonts\LiberationMono-Bold.ttf 3 +media\fonts\LiberationMono-BoldItalic.ttf 3 +media\fonts\LiberationMono-Italic.ttf 3 +media\fonts\LiberationMono-Regular.ttf 3 +media\fonts\LiberationSans-Bold.ttf 3 +media\fonts\LiberationSans-BoldItalic.ttf 3 +media\fonts\LiberationSans-Italic.ttf 3 +media\fonts\LiberationSans-Regular.ttf 3 +media\fonts\LiberationSerif-Bold.ttf 3 +media\fonts\LiberationSerif-BoldItalic.ttf 3 +media\fonts\LiberationSerif-Italic.ttf 3 +media\fonts\LiberationSerif-Regular.ttf 3 + +media\fonts\Marlett.ttf 3 +media\fonts\symbol.ttf 3 +media\fonts\tahoma.ttf 3 +media\fonts\tahomabd.ttf 3 + +media\nls\c_037.nls 1 +media\nls\c_424.nls 1 +media\nls\c_500.nls 1 +media\nls\c_737.nls 1 +media\nls\c_775.nls 1 +media\nls\c_850.nls 1 +media\nls\c_852.nls 1 +media\nls\c_855.nls 1 +media\nls\c_856.nls 1 +media\nls\c_857.nls 1 +media\nls\c_860.nls 1 +media\nls\c_861.nls 1 +media\nls\c_862.nls 1 +media\nls\c_863.nls 1 +media\nls\c_864.nls 1 +media\nls\c_865.nls 1 +media\nls\c_866.nls 1 +media\nls\c_869.nls 1 +media\nls\c_874.nls 1 +media\nls\c_875.nls 1 +media\nls\c_878.nls 1 +media\nls\c_932.nls 1 +media\nls\c_936.nls 1 +media\nls\c_949.nls 1 +media\nls\c_950.nls 1 +media\nls\c_1006.nls 1 +media\nls\c_1026.nls 1 +media\nls\c_1250.nls 1 +media\nls\c_1251.nls 1 +media\nls\c_1253.nls 1 +media\nls\c_1254.nls 1 +media\nls\c_1255.nls 1 +media\nls\c_1256.nls 1 +media\nls\c_1257.nls 1 +media\nls\c_1258.nls 1 +media\nls\c_10000.nls 1 +media\nls\c_10006.nls 1 +media\nls\c_10007.nls 1 +media\nls\c_10029.nls 1 +media\nls\c_10079.nls 1 +media\nls\c_10081.nls 1 +media\nls\c_20866.nls 1 +media\nls\c_21866.nls 1 +media\nls\c_28591.nls 1 +media\nls\c_28592.nls 1 +media\nls\c_28593.nls 1 +media\nls\c_28594.nls 1 +media\nls\c_28595.nls 1 +media\nls\c_28596.nls 1 +media\nls\c_28597.nls 1 +media\nls\c_28598.nls 1 +media\nls\c_28599.nls 1 +media\nls\c_28600.nls 1 +media\nls\c_28603.nls 1 +media\nls\c_28604.nls 1 +media\nls\c_28605.nls 1 +media\nls\c_28606.nls 1 +media\drivers\etc\services 5 +media\inf\audio.inf 6 +media\inf\acpi.inf 6 +media\inf\cdrom.inf 6 +media\inf\display.inf 6 +media\inf\font.inf 6 +media\inf\fdc.inf 6 +media\inf\hdc.inf 6 +media\inf\intl.inf 6 +media\inf\layout.inf 6 +media\inf\machine.inf 6 +media\inf\msmouse.inf 6 +media\inf\keyboard.inf 6 +media\inf\ks.inf 6 +media\inf\NET_NIC.inf 6 +media\inf\netamd.inf 6 +media\inf\netisa.inf 6 +media\inf\netrtpnt.inf 6 +media\inf\nettcpip.inf 6 +media\inf\ports.inf 6 +media\inf\scsi.inf 6 +media\inf\syssetup.inf 6 +media\inf\usbport.inf 6 +media\inf\usb.inf 6 +media\inf\usbstor.inf 6 +media\inf\xboxdisp.inf 6 ; Media Files media\sounds\ReactOS_LogOn.wav 8 ; Ini Files -;boot\bootdata\system.ini 4 +boot\bootdata\system.ini 4 ; Regression Testing boot\bootdata\bootcdregtest\regtest.cmd 7 optional ; Subsystems -;subsystems\win32\csrss\csrss.exe 1 -;subsystems\win32\csrss\win32csr\win32csr.dll 1 -;subsystems\ntvdm\ntvdm.exe 1 -;subsystems\win32\win32k\win32k.sys 1 +subsystems\win32\csrss\csrss.exe 1 +subsystems\win32\csrss\win32csr\win32csr.dll 1 +subsystems\ntvdm\ntvdm.exe 1 +subsystems\win32\win32k\win32k.sys 1 ; Optional/proprietary files -modules\optional\DroidSansFallback.ttf 3 optional -modules\optional\NOTICE_for_Droid_Font.txt 4 optional modules\optional\netkvm2k.inf 6 optional modules\optional\netkvm2k.cat 6 optional modules\optional\netkvm.sys 2 optional @@ -684,6 +681,7 @@ modules\optional\msvcirt.dll 1 optional modules\optional\msvcp71.dll 1 optional modules\optional\msvcr71.dll 1 optional +modules\optional\Systema.ttf 3 optional modules\optional\vmx_fb.dll 1 optional modules\optional\vmx_mode.dll 1 optional modules\optional\vmx_svga.inf 6 optional @@ -714,16 +712,6 @@ modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional modules\rosapps\applications\notevil\notevil.exe 1 optional modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional -modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional -modules\rosapps\applications\net\netreg\netreg.exe 1 optional -modules\rosapps\applications\net\niclist\niclist.exe 1 optional -modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional -modules\rosapps\applications\notevil\notevil.exe 1 optional -modules\rosapps\applications\magnify\magnify.exe 1 optional -modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional -modules\rosapps\applications\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\applications\packmgr\lib\package.dll 1 optional -modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional @@ -733,7 +721,6 @@ modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\applications\sysutils\telnetd\telnetd.exe 1 optional modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional @@ -749,13 +736,8 @@ modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional modules\rosapps\applications\winfile\winfile.exe 1 optional -modules\rosapps\applications\winver\winver.exe 1 optional -modules\rosapps\applications\write\write.exe 1 optional -modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional modules\rosapps\demos\maze\maze.exe 1 optional -modules\rosapps\dflat32\edit.exe 1 optional modules\rosapps\drivers\green\green.sys 2 optional -modules\rosapps\templates\dialog\dialog.exe 1 optional ; Rostests modules\rostests\rosautotest\rosautotest.exe 1 optional

1 0

[sserapion] 44389: Fix build and enable building usermode components, since they all build.
by sserapion＠svn.reactos.org 03 Dec '09

03 Dec '09

Author: sserapion Date: Thu Dec 3 20:40:01 2009 New Revision: 44389 URL: http://svn.reactos.org/svn/reactos?rev=44389&view=rev Log: Fix build and enable building usermode components, since they all build. Modified: branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild Modified: branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp [iso-8859-1] Thu Dec 3 20:40:01 2009 @@ -8,6 +8,7 @@ #include "stdafx.h" #include "audio_resampler_acm.hpp" +#include <stdio.h> _AUDIO_NAMESPACE_START_ Modified: branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… ============================================================================== --- branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild [iso-8859-1] Thu Dec 3 20:40:01 2009 @@ -86,7 +86,7 @@ Whether to compile any usermode parts. This is while kernel mode is under heavy development and usermode part not relevant for bootcd. --> -<property name="USERMODE" value="0" /> +<property name="USERMODE" value="1" /> </group> Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Thu Dec 3 20:40:01 2009 @@ -1,5 +1,5 @@ <group> -<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" crt="msvcrt"> +<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" crt="msvcrt" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="shell32.spec" /> <include base="shell32">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c [iso-8859-1] Thu Dec 3 20:40:01 2009 @@ -176,7 +176,7 @@ SOCKET WSPAPI WPUCreateSocketHandle(IN DWORD dwCatalogEntryId, - IN DWORD dwContext, + IN DWORD_PTR dwContext, OUT LPINT lpErrno) { UNIMPLEMENTED; @@ -277,7 +277,7 @@ INT WSPAPI WPUQuerySocketHandleContext(IN SOCKET s, - OUT LPDWORD lpContext, + OUT PDWORD_PTR lpContext, OUT LPINT lpErrno) { UNIMPLEMENTED; Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c [iso-8859-1] Thu Dec 3 20:40:01 2009 @@ -173,7 +173,7 @@ WSPAPI WPUQueueApc(IN LPWSATHREADID lpThreadId, IN LPWSAUSERAPC lpfnUserApc, - IN DWORD dwContext, + IN DWORD_PTR dwContext, OUT LPINT lpErrno) { UNIMPLEMENTED; Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] Thu Dec 3 20:40:01 2009 @@ -1,4 +1,4 @@ -<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll"> +<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll" allowwarnings="true"> <importlibrary definition="ws2_32.spec" /> <include base="ws2_32_new">inc</include> <include base="ReactOS">include/reactos/winsock</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Thu Dec 3 20:40:01 2009 @@ -1,4 +1,4 @@ -<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll"> +<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll" allowwarnings="true"> <importlibrary definition="ws2help.spec" /> <include base="ws2help">.</include> <include base="ReactOS">include/reactos/winsock</include>

1 0

[sserapion] 44388: - Allow warnings in gdi32 - Fix ntdll build - Fix mysteriously broken (in last sync) obdc32
by sserapion＠svn.reactos.org 03 Dec '09

03 Dec '09

Author: sserapion Date: Thu Dec 3 20:03:25 2009 New Revision: 44388 URL: http://svn.reactos.org/svn/reactos?rev=44388&view=rev Log: - Allow warnings in gdi32 - Fix ntdll build - Fix mysteriously broken (in last sync) obdc32 Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] Thu Dec 3 20:03:25 2009 @@ -1015,7 +1015,7 @@ RtlQueryHeapInformation RtlQueryInformationAcl RtlQueryInformationActivationContext -RtlQueryInformationActiveActivationContext +;RtlQueryInformationActiveActivationContext ;RtlQueryInterfaceMemoryStream ;RtlQueryModuleInformation ;RtlQueryProcessBackTraceInformation Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c [iso-8859-1] Thu Dec 3 20:03:25 2009 @@ -15,8 +15,8 @@ LDR_RESOURCE_INFO info; IMAGE_RESOURCE_DATA_ENTRY *entry; - info.Type = (ULONG)RT_MANIFEST; - info.Name = (ULONG)ISOLATIONAWARE_MANIFEST_RESOURCE_ID; + info.Type = (ULONG_PTR)RT_MANIFEST; + info.Name = (ULONG_PTR)ISOLATIONAWARE_MANIFEST_RESOURCE_ID; info.Language = 0; if (!(status = LdrFindResource_U( module->DllBase, &info, 3, &entry ))) { Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Thu Dec 3 20:03:25 2009 @@ -3477,7 +3477,7 @@ } /* FIXME: Cookie is based on part of the thread id */ - *Cookie = (ULONG)NtCurrentTeb()->RealClientId.UniqueThread; + *Cookie = (ULONG_PTR)NtCurrentTeb()->RealClientId.UniqueThread; return Status; } @@ -3489,7 +3489,7 @@ if (Flags != 0x01) return STATUS_INVALID_PARAMETER_1; - if (Cookie != (ULONG)NtCurrentTeb()->RealClientId.UniqueThread) + if (Cookie != (ULONG_PTR)NtCurrentTeb()->RealClientId.UniqueThread) return STATUS_INVALID_PARAMETER_2; RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Thu Dec 3 20:03:25 2009 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll" allowwarnings=true> <importlibrary definition="gdi32.spec" /> <include base="gdi32">include</include> <define name="LANGPACK" /> Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] Thu Dec 3 20:03:25 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <library>wine</library> + <library>advapi32</library> <file>proxyodbc.c</file> </module> </group>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs