Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[jimtabor] 50047: [Win32k|User32] - Finish 50030 (work by Giannis), Now PostMessage passes all the correct data based on Get/PeekMessage. Example: Post A, Get/Peek A, Translate A, Dispatch A, shoul...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 17 01:09:42 2010 New Revision: 50047 URL: http://svn.reactos.org/svn/reactos?rev=50047&view=rev Log: [Win32k|User32] - Finish 50030 (work by Giannis), Now PostMessage passes all the correct data based on Get/PeekMessage. Example: Post A, Get/Peek A, Translate A, Dispatch A, should be that simple. FYI: DDE memory handling should be in win32k not user32 and why,,,,, ~see next point~ - Patch up problems (at a minimum) going into the SendMessage/Timeout A2U U2A support in win32k and fixed SMTO callback if local. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Fri Dec 17 01:09:42 2010 @@ -116,7 +116,6 @@ typedef struct _USER32_THREAD_DATA { - MSG LastMessage; USER32_TRACKINGLIST tracking_info; /* TrackMouseEvent stuff */ } USER32_THREAD_DATA, *PUSER32_THREAD_DATA; Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Fri Dec 17 01:09:42 2010 @@ -145,7 +145,8 @@ return Ret; } -static BOOL FASTCALL +static +BOOL FASTCALL MsgiUMToKMMessage(PMSG UMMsg, PMSG KMMsg, BOOL Posted) { *KMMsg = *UMMsg; @@ -249,7 +250,8 @@ return TRUE; } -static VOID FASTCALL +static +VOID FASTCALL MsgiUMToKMCleanup(PMSG UMMsg, PMSG KMMsg) { switch (KMMsg->message) @@ -949,9 +951,7 @@ WINAPI GetMessagePos(VOID) { - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); - return(MAKELONG(ThreadData->LastMessage.pt.x, ThreadData->LastMessage.pt.y)); - //return NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS); + return NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS); } @@ -961,9 +961,7 @@ LONG WINAPI GetMessageTime(VOID) { - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); - return(ThreadData->LastMessage.time); -// return NtUserGetThreadState(THREADSTATE_GETMESSAGETIME); + return NtUserGetThreadState(THREADSTATE_GETMESSAGETIME); } @@ -1602,17 +1600,17 @@ UINT wMsgFilterMax) { BOOL Res; - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); + + if ( (wMsgFilterMin|wMsgFilterMax) & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } Res = NtUserGetMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); if (-1 == (int) Res) { return Res; - } - - if (Res && lpMsg->message != WM_PAINT && lpMsg->message != WM_QUIT) - { - ThreadData->LastMessage = *lpMsg; } return Res; @@ -1628,7 +1626,12 @@ UINT wMsgFilterMax) { BOOL Res; - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); + + if ( (wMsgFilterMin|wMsgFilterMax) & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } Res = NtUserGetMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); if (-1 == (int) Res) @@ -1636,20 +1639,15 @@ return Res; } - if (Res && lpMsg->message != WM_PAINT && lpMsg->message != WM_QUIT) - { - ThreadData->LastMessage = *lpMsg; - } - return Res; } BOOL WINAPI -PeekMessageWorker(PMSG pMsg, - HWND hWnd, - UINT wMsgFilterMin, - UINT wMsgFilterMax, - UINT wRemoveMsg) +PeekMessageWorker( PMSG pMsg, + HWND hWnd, + UINT wMsgFilterMin, + UINT wMsgFilterMax, + UINT wRemoveMsg) { PCLIENTINFO pci; PCLIENTTHREADINFO pcti; @@ -1692,17 +1690,11 @@ UINT wRemoveMsg) { BOOL Res; - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); Res = PeekMessageWorker(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); if (-1 == (int) Res || !Res) { return FALSE; - } - - if (Res && lpMsg->message != WM_PAINT && lpMsg->message != WM_QUIT) - { - ThreadData->LastMessage = *lpMsg; } return Res; @@ -1722,7 +1714,6 @@ UINT wRemoveMsg) { BOOL Res; - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); Res = PeekMessageWorker(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); if (-1 == (int) Res || !Res) @@ -1730,44 +1721,7 @@ return FALSE; } - if (Res && lpMsg->message != WM_PAINT && lpMsg->message != WM_QUIT) - { - ThreadData->LastMessage = *lpMsg; - } - return Res; -} - -// -// Worker function for post message. -// -BOOL -FASTCALL -PostMessageWorker( - HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - MSG UMMsg, KMMsg; - LRESULT Result; - - UMMsg.hwnd = Wnd; - UMMsg.message = Msg; - UMMsg.wParam = wParam; - UMMsg.lParam = lParam; - if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) - { - return FALSE; - } - Result = NtUserPostMessage( Wnd, - KMMsg.message, - KMMsg.wParam, - KMMsg.lParam); - - MsgiUMToKMCleanup(&UMMsg, &KMMsg); - - return Result; } /* @@ -1781,24 +1735,38 @@ WPARAM wParam, LPARAM lParam) { - MSG AnsiMsg, UcMsg; - BOOL Ret; - - AnsiMsg.hwnd = hWnd; - AnsiMsg.message = Msg; - AnsiMsg.wParam = wParam; - AnsiMsg.lParam = lParam; - - if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) - { - return FALSE; - } - - Ret = PostMessageW( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam); - - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - - return Ret; + LRESULT Ret; + + /* Check for combo box or a list box to send names. */ + if (Msg == CB_DIR || Msg == LB_DIR) + { + /* + Set DDL_POSTMSGS, so use the PostMessage function to send messages to the + combo/list box. Forces a call like DlgDirListComboBox. + */ + //wParam |= DDL_POSTMSGS; + return NtUserPostMessage(hWnd, Msg, wParam, lParam); + } + + /* No drop files or current Process, just post message. */ + if ( (Msg != WM_DROPFILES) || + ( NtUserQueryWindow( hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID) == + PtrToUint(NtCurrentTeb()->ClientId.UniqueProcess) ) ) + { + return NtUserPostMessage(hWnd, Msg, wParam, lParam); + } + + /* We have drop files and this is not the same process for this window. */ + + /* Just incase, check wParam for Global memory handle and send size. */ + Ret = SendMessageA( hWnd, + WM_COPYGLOBALDATA, + (WPARAM)GlobalSize((HGLOBAL)wParam), // Zero if not a handle. + (LPARAM)wParam); // Send wParam as lParam. + + if ( Ret ) return NtUserPostMessage(hWnd, Msg, (WPARAM)Ret, lParam); + + return FALSE; } /* @@ -1821,8 +1789,8 @@ Set DDL_POSTMSGS, so use the PostMessage function to send messages to the combo/list box. Forces a call like DlgDirListComboBox. */ - wParam |= DDL_POSTMSGS; - return PostMessageWorker(hWnd, Msg, wParam, lParam); + //wParam |= DDL_POSTMSGS; + return NtUserPostMessage(hWnd, Msg, wParam, lParam); } /* No drop files or current Process, just post message. */ @@ -1830,7 +1798,7 @@ ( NtUserQueryWindow( hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID) == PtrToUint(NtCurrentTeb()->ClientId.UniqueProcess) ) ) { - return PostMessageWorker(hWnd, Msg, wParam, lParam); + return NtUserPostMessage(hWnd, Msg, wParam, lParam); } /* We have drop files and this is not the same process for this window. */ @@ -1841,7 +1809,7 @@ (WPARAM)GlobalSize((HGLOBAL)wParam), // Zero if not a handle. (LPARAM)wParam); // Send wParam as lParam. - if ( Ret ) return PostMessageWorker(hWnd, Msg, (WPARAM)Ret, lParam); + if ( Ret ) return NtUserPostMessage(hWnd, Msg, (WPARAM)Ret, lParam); return FALSE; } @@ -1902,11 +1870,16 @@ PWND Window; PTHREADINFO ti = GetW32ThreadInfo(); - Window = ValidateHwnd(Wnd); - if (!Window) return FALSE; + if ( Msg & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { + Window = ValidateHwnd(Wnd); + if ( Window != NULL && Window->head.pti == ti && // !IsThreadHooked(GetWin32ClientInfo()) && // Enable to test message system bug. @@ -1937,7 +1910,7 @@ return FALSE; } - Result = NtUserMessageCall( KMMsg.hwnd, + Result = NtUserMessageCall( Wnd, KMMsg.message, KMMsg.wParam, KMMsg.lParam, @@ -1962,11 +1935,16 @@ PWND Window; PTHREADINFO ti = GetW32ThreadInfo(); - Window = ValidateHwnd(Wnd); - if (!Window) return FALSE; + if ( Msg & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { + Window = ValidateHwnd(Wnd); + if ( Window != NULL && Window->head.pti == ti && // !IsThreadHooked(GetWin32ClientInfo()) && // Enable to test message system bug. @@ -2003,7 +1981,7 @@ return FALSE; } - Result = NtUserMessageCall( KMMsg.hwnd, + Result = NtUserMessageCall( Wnd, KMMsg.message, KMMsg.wParam, KMMsg.lParam, @@ -2047,7 +2025,7 @@ return FALSE; } - Result = NtUserMessageCall( UcMsg.hwnd, + Result = NtUserMessageCall( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam, @@ -2104,8 +2082,8 @@ MSG AnsiMsg, UcMsg; LRESULT Result; DOSENDMESSAGE dsm; - - SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); + PWND Window; + PTHREADINFO ti = GetW32ThreadInfo(); if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) { @@ -2114,6 +2092,23 @@ } if (lpdwResult) *lpdwResult = 0; + + if (hWnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) + { + Window = ValidateHwnd(hWnd); + + if ( Window != NULL && + Window->head.pti == ti && + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && + !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) + { + Result = IntCallMessageProc(Window, hWnd, Msg, wParam, lParam, TRUE); + if (lpdwResult) *lpdwResult = Result; + return TRUE; + } + } + SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); dsm.uFlags = fuFlags; dsm.uTimeout = uTimeout; @@ -2128,7 +2123,7 @@ return FALSE; } - Result = NtUserMessageCall( UcMsg.hwnd, + Result = NtUserMessageCall( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam, @@ -2162,8 +2157,8 @@ { LRESULT Result; DOSENDMESSAGE dsm; - - SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); + PWND Window; + PTHREADINFO ti = GetW32ThreadInfo(); if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) { @@ -2172,6 +2167,23 @@ } if (lpdwResult) *lpdwResult = 0; + + if (hWnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) + { + Window = ValidateHwnd(hWnd); + + if ( Window != NULL && + Window->head.pti == ti && + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && + !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) + { + Result = IntCallMessageProc(Window, hWnd, Msg, wParam, lParam, FALSE); + if (lpdwResult) *lpdwResult = Result; + return TRUE; + } + } + SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); dsm.uFlags = fuFlags; dsm.uTimeout = uTimeout; 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] Fri Dec 17 01:09:42 2010 @@ -61,6 +61,7 @@ { WM_STYLECHANGED, sizeof(STYLESTRUCT), MMS_FLAG_READ }, { WM_STYLECHANGING, sizeof(STYLESTRUCT), MMS_FLAG_READWRITE }, { WM_COPYDATA, MMS_SIZE_SPECIAL, MMS_FLAG_READ }, + { WM_COPYGLOBALDATA, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_WINDOWPOSCHANGED, sizeof(WINDOWPOS), MMS_FLAG_READ }, { WM_WINDOWPOSCHANGING, sizeof(WINDOWPOS), MMS_FLAG_READWRITE }, }; @@ -134,10 +135,6 @@ Size = sizeof(COPYDATASTRUCT) + ((PCOPYDATASTRUCT)lParam)->cbData; break; - case WM_COPYGLOBALDATA: - Size = wParam; - break; - default: ASSERT(FALSE); Size = 0; @@ -243,7 +240,6 @@ ASSERT(CsData == (PCHAR) PackedCs + Size); *lParamPacked = (LPARAM) PackedCs; } - else if (PoolType == NonPagedPool) { PMSGMEMORY MsgMemoryEntry; @@ -315,6 +311,100 @@ ASSERT(FALSE); return STATUS_INVALID_PARAMETER; +} + +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; } // @@ -654,100 +744,6 @@ return TRUE; } -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; -} - static BOOL FASTCALL co_IntWaitMessage( PWND Window, UINT MsgFilterMin, @@ -775,9 +771,9 @@ /* Nothing found. Wait for new messages. */ Status = co_MsqWaitForNewMessages( ThreadQueue, - Window, - MsgFilterMin, - MsgFilterMax); + Window, + MsgFilterMin, + MsgFilterMax); } while ( (STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || STATUS_TIMEOUT == Status ); @@ -834,6 +830,7 @@ } pti = PsGetCurrentThreadWin32Thread(); + pti->pClientInfo->cSpins++; // Bump up the spin count. do { @@ -848,8 +845,11 @@ /* GetMessage or PostMessage must never get messages that contain pointers */ ASSERT(FindMsgMemory(pMsg->message) == NULL); - pti->timeLast = pMsg->time; - pti->ptLast = pMsg->pt; + if (pMsg->message != WM_PAINT && pMsg->message != WM_QUIT) + { + pti->timeLast = pMsg->time; + pti->ptLast = pMsg->pt; + } // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. @@ -984,7 +984,7 @@ KernelModeMsg.wParam, KernelModeMsg.lParam); - if(MsgMemoryEntry) + if (MsgMemoryEntry && KernelModeMsg.lParam) ExFreePool((PVOID) KernelModeMsg.lParam); return TRUE; @@ -1019,7 +1019,7 @@ { UserPostMessage(List[i], Msg, wParam, lParam); } - ExFreePool(List); + ExFreePoolWithTag(List,TAG_WINLIST);//ExFreePool(List); } } else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Dec 17 01:09:42 2010 @@ -1624,7 +1624,7 @@ pti = PsGetCurrentThreadWin32Thread(); Message = pti->pusmCurrent; - if(!Message) return FALSE; + if (!Message) return FALSE; if (Message->QS_Flags & QS_SMRESULT) return FALSE;

13 years, 10 months

[greatlrd] 50046: [dxg.sys] add stub not with right protoype

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 16 22:13:35 2010 New Revision: 50046 URL: http://svn.reactos.org/svn/reactos?rev=50046&view=rev Log: [dxg.sys] add stub not with right protoype Modified: branches/reactx/reactos/drivers/directx/dxg/stub.c Modified: branches/reactx/reactos/drivers/directx/dxg/stub.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/stub.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/stub.c [iso-8859-1] Thu Dec 16 22:13:35 2010 @@ -12,3 +12,628 @@ #include <dxg_int.h> #include "dxg_driver.h" +#define stub DPRINT1("UNIMPLEMENT"); / + return DDERR_UNSUPPORTED; + + +NTSTATUS +NTAPI +DxD3dContextCreate(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + stub; +} + +NTSTATUS +NTAPI +DxD3dContextDestroy(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxD3dContextDestroyAll(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxD3dValidateTextureStageState(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxD3dDrawPrimitives2(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDriverState(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdAddAttachedSurface(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdAlphaBlt(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdAttachSurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdBeginMoCompFrame)(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdBlt(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCanCreateSurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCanCreateD3DBuffer)( +{ + stub; +} + +NTSTATUS +NTAPI +DxDdColorControl(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateDirectDrawObject(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateSurface(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7, DWORD x8) +{ + /* NOTE : DxDdCreateD3DBuffer and DxDdCreateSurface are same */ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateMoComp(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateSurfaceObject(DWORD x1, DWORD x2, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDeleteDirectDrawObject(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDeleteSurfaceObject(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDestroyMoComp)(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDestroySurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDestroyD3DBuffer(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdEndMoCompFrame(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdFlip(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdFlipToGDISurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetAvailDriverMemory(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetBltStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDC(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDriverInfo(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDxHandle(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetFlipStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetInternalMoCompInfo(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetMoCompBuffInfo(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetMoCompGuids(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetMoCompFormats(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetScanLine(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdLock(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdLockD3D(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdQueryDirectDrawObject(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7, DWORD x8, DWORD x9 , DWORD x10 , DWORD x11) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdQueryMoCompStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdReenableDirectDrawObject(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdReleaseDC(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdRenderMoComp(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdResetVisrgn(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetColorKey(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetExclusiveMode(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetGammaRamp(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateSurfaceEx(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetOverlayPosition(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdUnattachSurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdUnlock(DWORD x1, DWORD x2) +{ + /* NOTE : DxDdUnlockD3D and DxDdUnlock are same */ + stub; +} + +NTSTATUS +NTAPI +DxDdUpdateOverlay(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdWaitForVerticalBlank(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpCanCreateVideoPort(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpColorControl(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpCreateVideoPort(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpDestroyVideoPort(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpFlipVideoPort(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortBandwidth(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortField(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortFlipStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortInputFormats(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortLine(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortOutputFormats(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortConnectInfo(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoSignalStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpUpdateVideoPort(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpWaitForVideoPortSync(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpAcquireNotification(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpReleaseNotification(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdHeapVidMemAllocAligned(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdHeapVidMemFree(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDisableDirectDraw(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSuspendDirectDraw(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdResumeDirectDraw(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDynamicModeChange(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCloseProcess(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDirectDrawBound(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdEnableDirectDrawRedirection(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdAllocPrivateUserMem(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdFreePrivateUserMem(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetAccelLevel(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetSurfaceLock(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdEnumLockedSurfaceRect(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdEnableDirectDraw(PVOID pDev, BOOLEAN Enable) +{ + + /* NOTE not finsh yet + PGD_DXENGGETHDEVDATA pfDxEngGetHdevData; + PEDD_DIRECTDRAW_GLOBAL pEDDgpl; + + pfDxEngGetHdevData = (PGD_DXENGGETHDEVDATA)gpEngFuncs[DXENG_INDEX_DxEngGetHdevData].pfn; + + if ( pfDxEngGetHdevData(pDev, DxEGShDevData_display) ) + { + pEDDgpl = (PEDD_DIRECTDRAW_GLOBAL) pfDxEngGetHdevData(pDev,DxEGShDevData_eddg); + pEDDgpl->hDev = (HDEV) pDev; + pEDDgpl->dhpdev = (PVOID) pfDxEngGetHdevData(pDev, DxEGShDevData_dhpdev); + } + + return 1; + */ + stub; +} + +

13 years, 10 months

[gadamopoulos] 50045: remove some more unnecessary debug output

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Dec 16 21:42:28 2010 New Revision: 50045 URL: http://svn.reactos.org/svn/reactos?rev=50045&view=rev Log: remove some more unnecessary debug output Modified: trunk/reactos/base/services/svchost/svchost.c trunk/reactos/dll/win32/user32/windows/cursoricon.c trunk/reactos/subsystems/win32/win32k/eng/device.c trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -104,7 +104,7 @@ HeapFree(GetProcessHeap(), 0, Buffer); /* Load the service dll */ - DPRINT1("Trying to load dll\n"); + DPRINT("Trying to load dll\n"); hServiceDll = LoadLibrary(DllPath); if (NULL == hServiceDll) @@ -226,7 +226,7 @@ NrOfServices = LoadServiceCategory(argv[2]); - DPRINT1("NrOfServices: %lu\n", NrOfServices); + DPRINT("NrOfServices: %lu\n", NrOfServices); if (0 == NrOfServices) return 0; @@ -240,7 +240,7 @@ /* Fill the service table */ for (i = 0; i < NrOfServices; ++i) { - DPRINT1("Loading service: %s\n", Service->Name); + DPRINT("Loading service: %s\n", Service->Name); ServiceTable[i].lpServiceName = Service->Name; ServiceTable[i].lpServiceProc = Service->ServiceMainFunc; Service = Service->Next; Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -1005,7 +1005,7 @@ && (iDesiredCX > 0 || iDesiredCY > 0)) || nFlags & LR_MONOCHROME) { - FIXME("Copying from resource isn't implemented yet\n"); + TRACE("Copying from resource isn't implemented yet\n"); hNew = CopyIcon(hIcon); #if 0 Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -124,7 +124,7 @@ * This is a REG_MULTI_SZ string */ for (; *pwsz; pwsz += wcslen(pwsz) + 1) { - DPRINT1("trying driver: %ls\n", pwsz); + DPRINT("trying driver: %ls\n", pwsz); /* Try to load the display driver */ pldev = EngLoadImageEx(pwsz, LDEV_DEVICE_DISPLAY); if (!pldev) @@ -197,7 +197,7 @@ { pGraphicsDevice->iDefaultMode = i; pGraphicsDevice->iCurrentMode = i; - DPRINT1("Found default entry: %ld '%ls'\n", i, pdm->dmDeviceName); + DPRINT("Found default entry: %ld '%ls'\n", i, pdm->dmDeviceName); } /* Initialize the entry */ @@ -221,7 +221,7 @@ /* Unlock loader */ EngReleaseSemaphore(ghsemGraphicsDeviceList); - DPRINT1("Prepared %ld modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); + DPRINT("Prepared %ld modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); return pGraphicsDevice; } Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -117,7 +117,7 @@ { PFN_DrvEnablePDEV pfnEnablePDEV; - DPRINT1("PDEVOBJ_bEnablePDEV()\n"); + DPRINT("PDEVOBJ_bEnablePDEV()\n"); /* Get the DrvEnablePDEV function */ pfnEnablePDEV = ppdev->pldev->pfn.EnablePDEV; @@ -146,7 +146,7 @@ GDIOBJ_SetOwnership(ppdev->devinfo.hpalDefault, NULL); ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); - DPRINT1("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); + DPRINT("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); return TRUE; } @@ -266,7 +266,7 @@ { /* ... use the device's default one */ pdm = pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; - DPRINT1("Using iDefaultMode = %ld\n", pGraphicsDevice->iDefaultMode); + DPRINT("Using iDefaultMode = %ld\n", pGraphicsDevice->iDefaultMode); } /* Try to get a diplay driver */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -572,7 +572,7 @@ QueryTable, NULL, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlQueryRegistryValues failed for PaintDesktopVersion (%x)\n", + DPRINT("RtlQueryRegistryValues failed for PaintDesktopVersion (%x)\n", Status); g_PaintDesktopVersion = FALSE; return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -551,7 +551,7 @@ ULONG cbSize, cbExtra; DEVMODEW dmReg, *pdm; - DPRINT1("Enter NtUserEnumDisplaySettings(%ls, %ld)\n", + DPRINT("Enter NtUserEnumDisplaySettings(%ls, %ld)\n", pustrDevice ? pustrDevice->Buffer : 0, iModeNum); if (pustrDevice) Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -41,7 +41,7 @@ /* attach monitor */ IntAttachMonitor(gppdevPrimary, 0); - DPRINT1("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", + DPRINT("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", pPrimarySurface, pPrimarySurface->pSurface); /* Create surface */

13 years, 10 months

[greatlrd] 50044: update the dxg header that are share betwin win32k and dxg

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 16 21:06:33 2010 New Revision: 50044 URL: http://svn.reactos.org/svn/reactos?rev=50044&view=rev Log: update the dxg header that are share betwin win32k and dxg Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h [iso-8859-1] Thu Dec 16 21:06:33 2010 @@ -47,7 +47,6 @@ #define DXG_INDEX_DxDdGetMoCompGuids 0x24 #define DXG_INDEX_DxDdGetMoCompFormats 0x25 #define DXG_INDEX_DxDdGetScanLine 0x26 -/* DXG_INDEX_DxDdLock and DXG_INDEX_DxDdLockD3D are same */ #define DXG_INDEX_DxDdLock 0x27 #define DXG_INDEX_DxDdLockD3D 0x28 #define DXG_INDEX_DxDdQueryDirectDrawObject 0x29 @@ -115,6 +114,8 @@ #define DXG_INDEX_DxDdSetAccelLevel 0x58 #define DXG_INDEX_DxDdGetSurfaceLock 0x59 #define DXG_INDEX_DxDdEnumLockedSurfaceRect 0x5A +#define DXG_INDEX_DxDdIoctl 0x5B +#define DXG_INDEX_DxDdSwitchToGDI 0x5C /***********************************************************************************/

13 years, 10 months

[gadamopoulos] 50043: [win32k] -Remove an unneeded debug message

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Dec 16 20:41:25 2010 New Revision: 50043 URL: http://svn.reactos.org/svn/reactos?rev=50043&view=rev Log: [win32k] -Remove an unneeded debug message 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 16 20:41:25 2010 @@ -909,8 +909,6 @@ PTHREADINFO pThread; LARGE_INTEGER LargeTickCount; NTSTATUS Status; - - DPRINT1("UserPostThreadMessage wParam 0x%x lParam 0x%x\n", wParam,lParam); if (FindMsgMemory(Msg) != 0) {

13 years, 10 months

[gadamopoulos] 50042: [user32_winetest] -revert the previous commit

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Dec 16 19:11:13 2010 New Revision: 50042 URL: http://svn.reactos.org/svn/reactos?rev=50042&view=rev Log: [user32_winetest] -revert the previous commit Modified: trunk/rostests/winetests/user32/menu.c Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Thu Dec 16 19:11:13 2010 @@ -3067,9 +3067,6 @@ ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); } ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); - - skip("skipping TrackPopupMenu, that hangs on reactos\n"); -#if 0 /* menu owner is child window */ g_hwndtosend = hwndchild; ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); @@ -3082,7 +3079,6 @@ g_hwndtosend = hwnd; ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); -#endif /* cleanup */ DestroyMenu( menu); DestroyWindow( hwndchild);

13 years, 10 months

[gadamopoulos] 50041: [user32_winetest] -deactivate some tests that hang in reactos that have already been deactived and reactivded by mistake twice

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Dec 16 18:49:10 2010 New Revision: 50041 URL: http://svn.reactos.org/svn/reactos?rev=50041&view=rev Log: [user32_winetest] -deactivate some tests that hang in reactos that have already been deactived and reactivded by mistake twice Modified: trunk/rostests/winetests/user32/menu.c Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Thu Dec 16 18:49:10 2010 @@ -3067,6 +3067,9 @@ ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); } ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); + + skip("skipping TrackPopupMenu, that hangs on reactos\n"); +#if 0 /* menu owner is child window */ g_hwndtosend = hwndchild; ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); @@ -3079,6 +3082,7 @@ g_hwndtosend = hwnd; ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); +#endif /* cleanup */ DestroyMenu( menu); DestroyWindow( hwndchild);

13 years, 10 months

[greatlrd] 50040: [dxg.sys] add stub.c not yet in use

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 16 18:49:05 2010 New Revision: 50040 URL: http://svn.reactos.org/svn/reactos?rev=50040&view=rev Log: [dxg.sys] add stub.c not yet in use Added: branches/reactx/reactos/drivers/directx/dxg/stub.c (with props) Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] Thu Dec 16 18:49:05 2010 @@ -10,5 +10,6 @@ <file>ddhmg.c</file> <file>eng.c</file> <file>historic.c</file> + <file>stub.c</file> <file>dxg.rc</file> </module> Added: branches/reactx/reactos/drivers/directx/dxg/stub.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/stub.c (added) +++ branches/reactx/reactos/drivers/directx/dxg/stub.c [iso-8859-1] Thu Dec 16 18:49:05 2010 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver for dxg implementation + * FILE: drivers/directx/dxg/stub.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 16/12-2010 Magnus Olsen + */ + + +#include <dxg_int.h> +#include "dxg_driver.h" + Propchange: branches/reactx/reactos/drivers/directx/dxg/stub.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 10 months

[akhaldi] 50039: [CMAKE] - Update some more base addresses. Thanks to Roel for his help.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 16 15:42:17 2010 New Revision: 50039 URL: http://svn.reactos.org/svn/reactos?rev=50039&view=rev Log: [CMAKE] - Update some more base addresses. Thanks to Roel for his help. Modified: branches/cmake-bringup/baseaddress.cmake Modified: branches/cmake-bringup/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/baseaddress.cmake… ============================================================================== --- branches/cmake-bringup/baseaddress.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/baseaddress.cmake [iso-8859-1] Thu Dec 16 15:42:17 2010 @@ -84,7 +84,7 @@ set(baseaddress_oleacc 0x69640000) set(baseaddress_winmm 0x697d0000) set(baseaddress_msimg32 0x69cc0000) -set(baseaddress_browseui 0x69cd0000) + set(baseaddress_netplwiz 0x6a240000) set(baseaddress_shell32 0x6a360000) set(baseaddress_unicode 0x6b200000) @@ -94,7 +94,6 @@ set(baseaddress_dbghelp 0x6b330000) set(baseaddress_dinput8 0x6b340000) set(baseaddress_dxdiagn 0x6b350000) -set(baseaddress_dsound 0x6b360000) set(baseaddress_glu32 0x6b370000) set(baseaddress_mesa32 0x6b380000) set(baseaddress_opengl32 0x6b390000) @@ -162,7 +161,6 @@ set(baseaddress_msimtf 0x746b0000) set(baseaddress_msctf 0x746e0000) set(baseaddress_kbsdll 0x74720000) -set(baseaddress_quartz 0x747d0000) set(baseaddress_userenv 0x74850000) set(baseaddress_powrprof 0x74ad0000) set(baseaddress_msxml3 0x74ae0000) @@ -194,13 +192,11 @@ set(baseaddress_midimap 0x76600000) set(baseaddress_wavemap 0x76610000) set(baseaddress_mpr 0x76620000) -set(baseaddress_mshtml 0x76650000) set(baseaddress_odbc32 0x76710000) set(baseaddress_setupapi 0x76730000) set(baseaddress_cryptdll 0x768f0000) set(baseaddress_shfolder 0x76900000) set(baseaddress_ntdsapi 0x76910000) -set(baseaddress_ntmarta 0x76920000) set(baseaddress_rasdlg 0x76930000) set(baseaddress_gdiplus 0x76a70000) set(baseaddress_atl 0x76ac0000) @@ -218,7 +214,6 @@ set(baseaddress_rasman 0x76e90000) set(baseaddress_rasapi32 0x76ee0000) set(baseaddress_wtsapi32 0x76f50000) -set(baseaddress_msvfw32 0x76f60000) set(baseaddress_msacm32 0x77400000) set(baseaddress_crtdll 0x77630000) set(baseaddress_authz 0x77690000) @@ -253,8 +248,14 @@ set(baseaddress_urlmon 0x7d1e0000) set(baseaddress_ws2_32 0x7d2f0000) set(baseaddress_syssetup 0x7d340000) -set(baseaddress_query 0x7d9a0000) -set(baseaddress_hhctrl 0x7e410000) -set(baseaddress_sxs 0x7e690000) -set(baseaddress_beepmidi 0x7ef00000) +set(baseaddress_browseui 0x7d410000) +set(baseaddress_dsound 0x7d530000) +set(baseaddress_quartz 0x7d5e0000) +set(baseaddress_msvfw32 0x7d7a0000) +set(baseaddress_mshtml 0x7d7f0000) +set(baseaddress_query 0x7da30000) +set(baseaddress_hhctrl 0x7da60000) +set(baseaddress_sxs 0x7dad0000) +set(baseaddress_beepmidi 0x7db00000) +set(baseaddress_ntmarta 0x7db20000) set(baseaddress_ftfd 0x7f000000)

13 years, 10 months

[akhaldi] 50038: [CMAKE] - Assign a base address to ftfd.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 16 15:03:13 2010 New Revision: 50038 URL: http://svn.reactos.org/svn/reactos?rev=50038&view=rev Log: [CMAKE] - Assign a base address to ftfd. Modified: branches/cmake-bringup/baseaddress.cmake branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt Modified: branches/cmake-bringup/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/baseaddress.cmake… ============================================================================== --- branches/cmake-bringup/baseaddress.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/baseaddress.cmake [iso-8859-1] Thu Dec 16 15:03:13 2010 @@ -257,3 +257,4 @@ set(baseaddress_hhctrl 0x7e410000) set(baseaddress_sxs 0x7e690000) set(baseaddress_beepmidi 0x7ef00000) +set(baseaddress_ftfd 0x7f000000) Modified: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Thu Dec 16 15:03:13 2010 @@ -13,6 +13,7 @@ set_entrypoint(ftfd FtfdEnableDriver@12) set_subsystem(ftfd native) +set_image_base(ftfd ${baseaddress_ftfd}) target_link_libraries(ftfd freetype

13 years, 10 months

← Newer
1
...
18
19
20
21
22
23
24
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010