Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 51256: - Revert 51255 that was committed on accident. The patch is not ready yet.
by mjmartin＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: mjmartin Date: Mon Apr 4 22:08:39 2011 New Revision: 51256 URL: http://svn.reactos.org/svn/reactos?rev=51256&view=rev Log: - Revert 51255 that was committed on accident. The patch is not ready yet. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Mon Apr 4 22:08:39 2011 @@ -115,19 +115,15 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, - pEH->head.pti->MessageQueue, + Status = co_MsqSendMessage( pEH->head.pti->MessageQueue, hwnd, event, 0, - (LPARAM)pEP, - FALSE, - NULL, - 0, + (LPARAM)pEP, 300, TRUE, MSQ_ISEVENT, - &uResult); + &uResult); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(pEP, TAG_HOOK); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Apr 4 22:08:39 2011 @@ -88,19 +88,15 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, - pti->MessageQueue, + Status = co_MsqSendMessage( pti->MessageQueue, IntToPtr(Code), // hWnd Hook->HookId, // Msg wParam, - (LPARAM)pHP, - FALSE, - NULL, - 0, + (LPARAM)pHP, uTimeout, Block, MSQ_ISHOOK, - &uResult); + &uResult); if (!NT_SUCCESS(Status)) { DPRINT1("Error Hook Call SendMsg. %d Status: 0x%x\n", Hook->HookId, Status); 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] Mon Apr 4 22:08:39 2011 @@ -1261,15 +1261,11 @@ do { - Status = co_MsqSendMessage(((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, - Window->head.pti->MessageQueue, + Status = co_MsqSendMessage( Window->head.pti->MessageQueue, hWnd, Msg, wParam, lParam, - FALSE, - NULL, - 0, uTimeout, (uFlags & SMTO_BLOCK), MSQ_NORMAL, @@ -1358,7 +1354,6 @@ LPARAM lParam) { ULONG_PTR Result = 0; - /* Piggyback off CallBack */ co_IntSendMessageWithCallBack(hWnd, Msg, wParam, @@ -1377,12 +1372,12 @@ */ LRESULT FASTCALL co_IntSendMessageWithCallBack( HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC CompletionCallback, - ULONG_PTR CompletionCallbackContext, - ULONG_PTR *uResult) + UINT Msg, + WPARAM wParam, + LPARAM lParam, + SENDASYNCPROC CompletionCallback, + ULONG_PTR CompletionCallbackContext, + ULONG_PTR *uResult) { ULONG_PTR Result; PWND Window = NULL; @@ -1442,7 +1437,7 @@ } /* If this is not a callback and it can be sent now, then send it. */ - if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) + if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) { ObReferenceObject(Win32Thread->pEThread); Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, @@ -1457,20 +1452,11 @@ *uResult = Result; } ObDereferenceObject(Win32Thread->pEThread); - - if (CompletionCallback) - { - co_IntCallSentMessageCallback(CompletionCallback, - hWnd, - Msg, - CompletionCallbackContext, - Result); - } } IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) + if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) { if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { @@ -1494,21 +1480,18 @@ Message->lResult = 0; Message->QS_Flags = 0; Message->SenderQueue = NULL; // mjmartin, you are right! This is null. - if (CompletionCallback) - Message->CallBackSenderQueue = Win32Thread->MessageQueue; - else - Message->CallBackSenderQueue = NULL; + Message->CallBackSenderQueue = Win32Thread->MessageQueue; + IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; - Message->HookMessage = MSQ_NORMAL; - Message->HasPackedLParam = (lParamBufferSize > -1); + Message->HookMessage = MSQ_NORMAL | MSQ_SENTNOWAIT; + Message->HasPackedLParam = (lParamBufferSize > 0); Message->QS_Flags = QS_SENDMESSAGE; - if (CompletionCallback) - InsertTailList(&Win32Thread->MessageQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); + InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); - MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); IntDereferenceMessageQueue(Window->head.pti->MessageQueue); RETURN(TRUE); @@ -2129,7 +2112,7 @@ { co_IntSendMessageTimeout( HWND_BROADCAST, Msg, - wParam, + wParam, lParam, SMTO_NORMAL, 2000, 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] Mon Apr 4 22:08:39 2011 @@ -423,7 +423,7 @@ PLIST_ENTRY Entry; LRESULT Result; PTHREADINFO pti; - + if (IsListEmpty(&MessageQueue->SentMessagesListHead)) { return(FALSE); @@ -466,18 +466,6 @@ Message->Msg.wParam, Message->Msg.lParam); } - else if ((Message->CompletionCallback) - && (Message->CallBackSenderQueue == MessageQueue)) - { /* Call the callback routine */ - ASSERT(Message->QS_Flags & QS_SMRESULT); - co_IntCallSentMessageCallback(Message->CompletionCallback, - Message->Msg.hwnd, - Message->Msg.message, - Message->CompletionCallbackContext, - Message->lResult); - /* Set callback to NULL to prevent reentry */ - Message->CompletionCallback = NULL; - } else { /* Call the window procedure. */ Result = co_IntSendMessage( Message->Msg.hwnd, @@ -490,23 +478,8 @@ to be cleaned up on thread termination anymore */ RemoveEntryList(&Message->ListEntry); - if (Message->CompletionCallback) - { - if (Message->CallBackSenderQueue) - { - Message->lResult = Result; - Message->QS_Flags |= QS_SMRESULT; - - /* queue it in the callers message queue */ - InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); - MsqWakeQueue(Message->CallBackSenderQueue, QS_SENDMESSAGE, TRUE); - IntDereferenceMessageQueue(Message->CallBackSenderQueue); - } - return (TRUE); - } - - /* remove the message from the dispatching list if there is a SenderQueue, so lock the sender's message queue */ - if ((Message->SenderQueue) || (Message->CallBackSenderQueue)) + /* remove the message from the dispatching list if needed, so lock the sender's message queue */ + if (!(Message->HookMessage & MSQ_SENTNOWAIT)) { if (Message->DispatchingListEntry.Flink != NULL) { @@ -540,8 +513,18 @@ KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ - if (Message->SenderQueue) + /* Call the callback if the message was sent with SendMessageCallback */ + if (Message->CompletionCallback != NULL) + { + co_IntCallSentMessageCallback(Message->CompletionCallback, + Message->Msg.hwnd, + Message->Msg.message, + Message->CompletionCallbackContext, + Result); + } + + /* Only if it is not a no wait message */ + if (!(Message->HookMessage & MSQ_SENTNOWAIT)) { IntDereferenceMessageQueue(Message->SenderQueue); IntDereferenceMessageQueue(MessageQueue); @@ -605,11 +588,10 @@ RemoveEntryList(&SentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, SentMessage->QS_Flags); - /* If there was a SenderQueue then remove the message from this threads dispatching list */ - if (((SentMessage->SenderQueue) || (SentMessage->CallBackSenderQueue)) + /* remove the message from the dispatching list if neede */ + if ((!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) && (SentMessage->DispatchingListEntry.Flink != NULL)) { - SentMessage->CallBackSenderQueue = NULL; RemoveEntryList(&SentMessage->DispatchingListEntry); } @@ -625,8 +607,8 @@ ExFreePool((PVOID)SentMessage->Msg.lParam); } - /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ - if (SentMessage->SenderQueue) + /* Only if it is not a no wait message */ + if (!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -646,9 +628,8 @@ } NTSTATUS FASTCALL -co_MsqSendMessage(PUSER_MESSAGE_QUEUE ThreadQueue, PUSER_MESSAGE_QUEUE MessageQueue, - HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL HasPackedLParam, - SENDASYNCPROC CompletionCallback, ULONG_PTR CompletionCallbackContext, +co_MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, + HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult) { @@ -656,100 +637,55 @@ PUSER_SENT_MESSAGE Message; KEVENT CompletionEvent; NTSTATUS WaitStatus; + PUSER_MESSAGE_QUEUE ThreadQueue; LARGE_INTEGER Timeout; PLIST_ENTRY Entry; - BOOL WaitForCompletion; LRESULT Result = 0; //// Result could be trashed. //// - /* Notification messages and some internal messages sent from the subsystem must not block current - thread and therefore pass NULL as ThreadQueue. Callbacks also do not block */ - WaitForCompletion = ((ThreadQueue) && (!CompletionCallback)); - if(!(Message = ExAllocatePoolWithTag(PagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) { DPRINT1("MsqSendMessage(): Not enough memory to allocate a message"); return STATUS_INSUFFICIENT_RESOURCES; } - /* Initialize event if calling thread will wait on completion */ - if (WaitForCompletion) - KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); + KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; ptirec = MessageQueue->Thread->Tcb.Win32Thread; ASSERT(ThreadQueue != MessageQueue); ASSERT(ptirec->pcti); // Send must have a client side to receive it!!!! Timeout.QuadPart = (LONGLONG) uTimeout * (LONGLONG) -10000; + /* FIXME - increase reference counter of sender's message queue here */ + Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; Message->Msg.wParam = wParam; Message->Msg.lParam = lParam; + Message->CompletionEvent = &CompletionEvent; + Message->Result = &Result; Message->lResult = 0; Message->QS_Flags = 0; - - if (WaitForCompletion) - { - /* Normal SendMessage that will block until the Windows Procedure handles the message */ - Message->SenderQueue = ThreadQueue; - Message->CompletionEvent = &CompletionEvent; - Message->Result = &Result; - } - else - { - /* Either a SendMessageCallback, Notify Message or Internal Message from Win32k */ - Message->SenderQueue = NULL; - Message->CompletionEvent = NULL; - Message->Result = NULL; - } - - if (CompletionCallback) - { - Message->CallBackSenderQueue = ThreadQueue; - } - else - { - Message->CallBackSenderQueue = NULL; - } - - /* Reference the ThreadQueue if there was one. For normal messages - the thread is dereferenced when the messages is processed by windows procedure. - For callbacks it dereferenced once the callback message is processed and placed back - into the sending message queue */ - if (ThreadQueue != NULL) - IntReferenceMessageQueue(ThreadQueue); - - Message->CompletionCallback = CompletionCallback; - Message->CompletionCallbackContext = CompletionCallbackContext; + Message->SenderQueue = ThreadQueue; + Message->CallBackSenderQueue = NULL; + IntReferenceMessageQueue(ThreadQueue); + Message->CompletionCallback = NULL; + Message->CompletionCallbackContext = 0; Message->HookMessage = HookMessage; - Message->HasPackedLParam = HasPackedLParam; - - if (HasPackedLParam) - { - ASSERT(Message->SenderQueue == NULL); - } - + Message->HasPackedLParam = FALSE; + IntReferenceMessageQueue(MessageQueue); - /* Add it to the list of pending messages if waiting on completion or if message is callback. - This is done for callbacks as if the Sender terminates it will set the CallBackSenderQueue member to NULL, - informing the windows procedure handling the message to discard the callback procedure */ - if (ThreadQueue != NULL) - InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + /* add it to the list of pending messages */ + InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); /* queue it in the destination's message queue */ InsertTailList(&MessageQueue->SentMessagesListHead, &Message->ListEntry); Message->QS_Flags = QS_SENDMESSAGE; MsqWakeQueue(MessageQueue, QS_SENDMESSAGE, TRUE); - - /* If not waiting on completion, dereference the MessageQueue and return */ - if (!WaitForCompletion) - { - IntDereferenceMessageQueue(MessageQueue); - return STATUS_SUCCESS; - } /* we can't access the Message anymore since it could have already been deleted! */ @@ -918,7 +854,7 @@ * Send a WM_PARENTNOTIFY to all ancestors of the given window, unless * the window has the WS_EX_NOPARENTNOTIFY style. */ -void MsqSendParentNotify( PWND pwnd, WORD event, WORD idChild, POINT pt ) +static void MsqSendParentNotify( PWND pwnd, WORD event, WORD idChild, POINT pt ) { PWND pwndDesktop = UserGetWindowObject(IntGetDesktopWindow()); @@ -1530,8 +1466,8 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); - /* remove the message from the dispatching list if there was a SenderQueue */ - if (((CurrentSentMessage->SenderQueue) || (CurrentSentMessage->CallBackSenderQueue)) + /* remove the message from the dispatching list if needed */ + if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); @@ -1549,8 +1485,8 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ - if (CurrentSentMessage->SenderQueue) + /* Only if it is not a no wait message */ + if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -1589,8 +1525,8 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ - if (CurrentSentMessage->SenderQueue) + /* Only if it is not a no wait message */ + if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue);

1 0

[mjmartin] 51255: [Win32k] - co_MsqDispatchOneSentMessage: After calling the windows procedure check if the message was a callback. If so place the message into the calling MessageQueue. Also check...
by mjmartin＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: mjmartin Date: Mon Apr 4 21:50:24 2011 New Revision: 51255 URL: http://svn.reactos.org/svn/reactos?rev=51255&view=rev Log: [Win32k] - co_MsqDispatchOneSentMessage: After calling the windows procedure check if the message was a callback. If so place the message into the calling MessageQueue. Also check if the current MessageQueue is the calling MessageQueue in which case dont call the Windows procedure but call the callback routine. SendMessageCallback is now properly implemented. - Remove the use of MSQ_SENTNOWAIT and instead use the SenderQueue and CallBackSenderQueue members to determine if the MessageQueues need to be dereferenced. - Modify co_MsqSendMessage to accept more parameters so that it can handle Notification, Callback and Internal messages. These changes make this function more complex but removes duplicate code in messages.c and move the handling for all queued messages in one location. - co_IntSendMessageWithCallBack: If the callback is for the same Message Queue, call it vice queuing it. Insert the message into the MessageQueue before waking the thread to handle the message. Should fix bug 5580. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Mon Apr 4 21:50:24 2011 @@ -115,15 +115,19 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( pEH->head.pti->MessageQueue, + Status = co_MsqSendMessage( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, + pEH->head.pti->MessageQueue, hwnd, event, 0, - (LPARAM)pEP, + (LPARAM)pEP, + FALSE, + NULL, + 0, 300, TRUE, MSQ_ISEVENT, - &uResult); + &uResult); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(pEP, TAG_HOOK); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Apr 4 21:50:24 2011 @@ -88,15 +88,19 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( pti->MessageQueue, + Status = co_MsqSendMessage( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, + pti->MessageQueue, IntToPtr(Code), // hWnd Hook->HookId, // Msg wParam, - (LPARAM)pHP, + (LPARAM)pHP, + FALSE, + NULL, + 0, uTimeout, Block, MSQ_ISHOOK, - &uResult); + &uResult); if (!NT_SUCCESS(Status)) { DPRINT1("Error Hook Call SendMsg. %d Status: 0x%x\n", Hook->HookId, Status); 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] Mon Apr 4 21:50:24 2011 @@ -1261,11 +1261,15 @@ do { - Status = co_MsqSendMessage( Window->head.pti->MessageQueue, + Status = co_MsqSendMessage(((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, + Window->head.pti->MessageQueue, hWnd, Msg, wParam, lParam, + FALSE, + NULL, + 0, uTimeout, (uFlags & SMTO_BLOCK), MSQ_NORMAL, @@ -1354,6 +1358,7 @@ LPARAM lParam) { ULONG_PTR Result = 0; + /* Piggyback off CallBack */ co_IntSendMessageWithCallBack(hWnd, Msg, wParam, @@ -1372,12 +1377,12 @@ */ LRESULT FASTCALL co_IntSendMessageWithCallBack( HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC CompletionCallback, - ULONG_PTR CompletionCallbackContext, - ULONG_PTR *uResult) + UINT Msg, + WPARAM wParam, + LPARAM lParam, + SENDASYNCPROC CompletionCallback, + ULONG_PTR CompletionCallbackContext, + ULONG_PTR *uResult) { ULONG_PTR Result; PWND Window = NULL; @@ -1437,7 +1442,7 @@ } /* If this is not a callback and it can be sent now, then send it. */ - if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { ObReferenceObject(Win32Thread->pEThread); Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, @@ -1452,11 +1457,20 @@ *uResult = Result; } ObDereferenceObject(Win32Thread->pEThread); + + if (CompletionCallback) + { + co_IntCallSentMessageCallback(CompletionCallback, + hWnd, + Msg, + CompletionCallbackContext, + Result); + } } IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { @@ -1480,18 +1494,21 @@ Message->lResult = 0; Message->QS_Flags = 0; Message->SenderQueue = NULL; // mjmartin, you are right! This is null. - Message->CallBackSenderQueue = Win32Thread->MessageQueue; - + if (CompletionCallback) + Message->CallBackSenderQueue = Win32Thread->MessageQueue; + else + Message->CallBackSenderQueue = NULL; IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; - Message->HookMessage = MSQ_NORMAL | MSQ_SENTNOWAIT; - Message->HasPackedLParam = (lParamBufferSize > 0); + Message->HookMessage = MSQ_NORMAL; + Message->HasPackedLParam = (lParamBufferSize > -1); Message->QS_Flags = QS_SENDMESSAGE; + if (CompletionCallback) + InsertTailList(&Win32Thread->MessageQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); - - InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); IntDereferenceMessageQueue(Window->head.pti->MessageQueue); RETURN(TRUE); @@ -2112,7 +2129,7 @@ { co_IntSendMessageTimeout( HWND_BROADCAST, Msg, - wParam, + wParam, lParam, SMTO_NORMAL, 2000, 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] Mon Apr 4 21:50:24 2011 @@ -423,7 +423,7 @@ PLIST_ENTRY Entry; LRESULT Result; PTHREADINFO pti; - + if (IsListEmpty(&MessageQueue->SentMessagesListHead)) { return(FALSE); @@ -466,6 +466,18 @@ Message->Msg.wParam, Message->Msg.lParam); } + else if ((Message->CompletionCallback) + && (Message->CallBackSenderQueue == MessageQueue)) + { /* Call the callback routine */ + ASSERT(Message->QS_Flags & QS_SMRESULT); + co_IntCallSentMessageCallback(Message->CompletionCallback, + Message->Msg.hwnd, + Message->Msg.message, + Message->CompletionCallbackContext, + Message->lResult); + /* Set callback to NULL to prevent reentry */ + Message->CompletionCallback = NULL; + } else { /* Call the window procedure. */ Result = co_IntSendMessage( Message->Msg.hwnd, @@ -478,8 +490,23 @@ to be cleaned up on thread termination anymore */ RemoveEntryList(&Message->ListEntry); - /* remove the message from the dispatching list if needed, so lock the sender's message queue */ - if (!(Message->HookMessage & MSQ_SENTNOWAIT)) + if (Message->CompletionCallback) + { + if (Message->CallBackSenderQueue) + { + Message->lResult = Result; + Message->QS_Flags |= QS_SMRESULT; + + /* queue it in the callers message queue */ + InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); + MsqWakeQueue(Message->CallBackSenderQueue, QS_SENDMESSAGE, TRUE); + IntDereferenceMessageQueue(Message->CallBackSenderQueue); + } + return (TRUE); + } + + /* remove the message from the dispatching list if there is a SenderQueue, so lock the sender's message queue */ + if ((Message->SenderQueue) || (Message->CallBackSenderQueue)) { if (Message->DispatchingListEntry.Flink != NULL) { @@ -513,18 +540,8 @@ KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* Call the callback if the message was sent with SendMessageCallback */ - if (Message->CompletionCallback != NULL) - { - co_IntCallSentMessageCallback(Message->CompletionCallback, - Message->Msg.hwnd, - Message->Msg.message, - Message->CompletionCallbackContext, - Result); - } - - /* Only if it is not a no wait message */ - if (!(Message->HookMessage & MSQ_SENTNOWAIT)) + /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ + if (Message->SenderQueue) { IntDereferenceMessageQueue(Message->SenderQueue); IntDereferenceMessageQueue(MessageQueue); @@ -588,10 +605,11 @@ RemoveEntryList(&SentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, SentMessage->QS_Flags); - /* remove the message from the dispatching list if neede */ - if ((!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* If there was a SenderQueue then remove the message from this threads dispatching list */ + if (((SentMessage->SenderQueue) || (SentMessage->CallBackSenderQueue)) && (SentMessage->DispatchingListEntry.Flink != NULL)) { + SentMessage->CallBackSenderQueue = NULL; RemoveEntryList(&SentMessage->DispatchingListEntry); } @@ -607,8 +625,8 @@ ExFreePool((PVOID)SentMessage->Msg.lParam); } - /* Only if it is not a no wait message */ - if (!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ + if (SentMessage->SenderQueue) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -628,8 +646,9 @@ } NTSTATUS FASTCALL -co_MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, - HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, +co_MsqSendMessage(PUSER_MESSAGE_QUEUE ThreadQueue, PUSER_MESSAGE_QUEUE MessageQueue, + HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL HasPackedLParam, + SENDASYNCPROC CompletionCallback, ULONG_PTR CompletionCallbackContext, UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult) { @@ -637,55 +656,100 @@ PUSER_SENT_MESSAGE Message; KEVENT CompletionEvent; NTSTATUS WaitStatus; - PUSER_MESSAGE_QUEUE ThreadQueue; LARGE_INTEGER Timeout; PLIST_ENTRY Entry; + BOOL WaitForCompletion; LRESULT Result = 0; //// Result could be trashed. //// + /* Notification messages and some internal messages sent from the subsystem must not block current + thread and therefore pass NULL as ThreadQueue. Callbacks also do not block */ + WaitForCompletion = ((ThreadQueue) && (!CompletionCallback)); + if(!(Message = ExAllocatePoolWithTag(PagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) { DPRINT1("MsqSendMessage(): Not enough memory to allocate a message"); return STATUS_INSUFFICIENT_RESOURCES; } - KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); + /* Initialize event if calling thread will wait on completion */ + if (WaitForCompletion) + KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; ptirec = MessageQueue->Thread->Tcb.Win32Thread; ASSERT(ThreadQueue != MessageQueue); ASSERT(ptirec->pcti); // Send must have a client side to receive it!!!! Timeout.QuadPart = (LONGLONG) uTimeout * (LONGLONG) -10000; - /* FIXME - increase reference counter of sender's message queue here */ - Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; Message->Msg.wParam = wParam; Message->Msg.lParam = lParam; - Message->CompletionEvent = &CompletionEvent; - Message->Result = &Result; Message->lResult = 0; Message->QS_Flags = 0; - Message->SenderQueue = ThreadQueue; - Message->CallBackSenderQueue = NULL; - IntReferenceMessageQueue(ThreadQueue); - Message->CompletionCallback = NULL; - Message->CompletionCallbackContext = 0; + + if (WaitForCompletion) + { + /* Normal SendMessage that will block until the Windows Procedure handles the message */ + Message->SenderQueue = ThreadQueue; + Message->CompletionEvent = &CompletionEvent; + Message->Result = &Result; + } + else + { + /* Either a SendMessageCallback, Notify Message or Internal Message from Win32k */ + Message->SenderQueue = NULL; + Message->CompletionEvent = NULL; + Message->Result = NULL; + } + + if (CompletionCallback) + { + Message->CallBackSenderQueue = ThreadQueue; + } + else + { + Message->CallBackSenderQueue = NULL; + } + + /* Reference the ThreadQueue if there was one. For normal messages + the thread is dereferenced when the messages is processed by windows procedure. + For callbacks it dereferenced once the callback message is processed and placed back + into the sending message queue */ + if (ThreadQueue != NULL) + IntReferenceMessageQueue(ThreadQueue); + + Message->CompletionCallback = CompletionCallback; + Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = HookMessage; - Message->HasPackedLParam = FALSE; - + Message->HasPackedLParam = HasPackedLParam; + + if (HasPackedLParam) + { + ASSERT(Message->SenderQueue == NULL); + } + IntReferenceMessageQueue(MessageQueue); - /* add it to the list of pending messages */ - InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + /* Add it to the list of pending messages if waiting on completion or if message is callback. + This is done for callbacks as if the Sender terminates it will set the CallBackSenderQueue member to NULL, + informing the windows procedure handling the message to discard the callback procedure */ + if (ThreadQueue != NULL) + InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); /* queue it in the destination's message queue */ InsertTailList(&MessageQueue->SentMessagesListHead, &Message->ListEntry); Message->QS_Flags = QS_SENDMESSAGE; MsqWakeQueue(MessageQueue, QS_SENDMESSAGE, TRUE); + + /* If not waiting on completion, dereference the MessageQueue and return */ + if (!WaitForCompletion) + { + IntDereferenceMessageQueue(MessageQueue); + return STATUS_SUCCESS; + } /* we can't access the Message anymore since it could have already been deleted! */ @@ -854,7 +918,7 @@ * Send a WM_PARENTNOTIFY to all ancestors of the given window, unless * the window has the WS_EX_NOPARENTNOTIFY style. */ -static void MsqSendParentNotify( PWND pwnd, WORD event, WORD idChild, POINT pt ) +void MsqSendParentNotify( PWND pwnd, WORD event, WORD idChild, POINT pt ) { PWND pwndDesktop = UserGetWindowObject(IntGetDesktopWindow()); @@ -1466,8 +1530,8 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); - /* remove the message from the dispatching list if needed */ - if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* remove the message from the dispatching list if there was a SenderQueue */ + if (((CurrentSentMessage->SenderQueue) || (CurrentSentMessage->CallBackSenderQueue)) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); @@ -1485,8 +1549,8 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* Only if it is not a no wait message */ - if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ + if (CurrentSentMessage->SenderQueue) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -1525,8 +1589,8 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* Only if it is not a no wait message */ - if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ + if (CurrentSentMessage->SenderQueue) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue);

1 0

[mjmartin] 51254: [Win32k] - Do not block calling thread when sending WM_PARENTNOTIFY messages. Fixes hang at end of user32 winetest for msg.
by mjmartin＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: mjmartin Date: Mon Apr 4 21:15:07 2011 New Revision: 51254 URL: http://svn.reactos.org/svn/reactos?rev=51254&view=rev Log: [Win32k] - Do not block calling thread when sending WM_PARENTNOTIFY messages. Fixes hang at end of user32 winetest for msg. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Apr 4 21:15:07 2011 @@ -1529,10 +1529,10 @@ { if (pWindow->spwndParent && pWindow->spwndParent != UserGetDesktopWindow()) { - co_IntSendMessage( pWindow->spwndParent->head.h, - WM_PARENTNOTIFY, - MAKEWPARAM( msg, pWindow->IDMenu), - (LPARAM)pWindow->head.h ); + co_IntSendMessageNoWait( pWindow->spwndParent->head.h, + WM_PARENTNOTIFY, + MAKEWPARAM( msg, pWindow->IDMenu), + (LPARAM)pWindow->head.h ); } } }

1 0

[fireball] 51253: [KERNEL32] - Minor cleanup, better flag names (thanks to ProcessHacker team for the good names and values). - Return error in failure path of BasepGetModuleHandleExW. - Optimize G...
by fireball＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: fireball Date: Mon Apr 4 19:35:24 2011 New Revision: 51253 URL: http://svn.reactos.org/svn/reactos?rev=51253&view=rev Log: [KERNEL32] - Minor cleanup, better flag names (thanks to ProcessHacker team for the good names and values). - Return error in failure path of BasepGetModuleHandleExW. - Optimize GetModuleHandleExA so that it calls the internal routine directly, without going through GetModuleHandleExW first and thus validating parameters second time. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/win32/kernel32/misc/ldr.c trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Mon Apr 4 19:35:24 2011 @@ -15,9 +15,6 @@ /* GLOBALS *******************************************************************/ -#define LDR_LOCK_HELD 0x2 -#define LDR_LOCK_FREE 0x1 - LONG LdrpLoaderLockAcquisitonCount; /* FUNCTIONS *****************************************************************/ @@ -38,7 +35,7 @@ if (Flags & ~1) { /* Flags are invalid, check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_1); @@ -60,7 +57,7 @@ DPRINT1("LdrUnlockLoaderLock() called with an invalid cookie!\n"); /* Invalid cookie, check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_2); @@ -73,7 +70,7 @@ } /* Ready to release the lock */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* Do a direct leave */ RtlLeaveCriticalSection(&LdrpLoaderLock); @@ -118,11 +115,11 @@ if (Cookie) *Cookie = 0; /* Validate the flags */ - if (Flags & ~(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS | + if (Flags & ~(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS | LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY)) { /* Flags are invalid, check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_1); @@ -136,7 +133,7 @@ if (!Cookie) { /* No cookie check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_3); @@ -150,7 +147,7 @@ if ((Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) && !(Result)) { /* No pointer to return the data to */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_2); @@ -164,7 +161,7 @@ if (InInit) return STATUS_SUCCESS; /* Check what locking semantic to use */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* Check if we should enter or simply try */ if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) @@ -173,13 +170,13 @@ if (!RtlTryEnterCriticalSection(&LdrpLoaderLock)) { /* It's locked */ - *Result = LDR_LOCK_HELD; + *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED; goto Quickie; } else { /* It worked */ - *Result = LDR_LOCK_FREE; + *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; } } else @@ -188,7 +185,7 @@ RtlEnterCriticalSection(&LdrpLoaderLock); /* See if result was requested */ - if (Result) *Result = LDR_LOCK_FREE; + if (Result) *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; } /* Increase the acquisition count */ @@ -209,13 +206,13 @@ if (!RtlTryEnterCriticalSection(&LdrpLoaderLock)) { /* It's locked */ - *Result = LDR_LOCK_HELD; + *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED; _SEH2_YIELD(return STATUS_SUCCESS); } else { /* It worked */ - *Result = LDR_LOCK_FREE; + *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; } } else @@ -224,7 +221,7 @@ RtlEnterCriticalSection(&LdrpLoaderLock); /* See if result was requested */ - if (Result) *Result = LDR_LOCK_FREE; + if (Result) *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; } /* Increase the acquisition count */ Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Mon Apr 4 19:35:24 2011 @@ -22,7 +22,7 @@ extern BOOLEAN InWindows; extern WaitForInputIdleType lpfnGlobalRegisterWaitForInputIdle; -#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL 1 +#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR 1 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 @@ -47,14 +47,14 @@ ) { BaseSetLastNTError(STATUS_INVALID_PARAMETER_1); - return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL; + return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR; } /* Check 2nd parameter */ if (!phModule) { BaseSetLastNTError(STATUS_INVALID_PARAMETER_2); - return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL; + return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR; } /* Return what we have according to the module name */ @@ -578,7 +578,7 @@ Peb = NtCurrentPeb (); /* Acquire a loader lock */ - LdrLockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS, NULL, &Cookie); + LdrLockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, NULL, &Cookie); /* Traverse the module list */ ModuleListHead = &Peb->Ldr->InLoadOrderModuleList; @@ -615,7 +615,7 @@ } _SEH2_END /* Release the loader lock */ - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS, Cookie); + LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); return Length / sizeof(WCHAR); } @@ -709,7 +709,8 @@ hModule = GetModuleHandleForUnicodeString(&ModuleNameU); if (!hModule) { - // FIXME: Status?! + /* Last error is already set, so just return failure by setting status */ + Status = STATUS_DLL_NOT_FOUND; goto quickie; } } @@ -737,6 +738,10 @@ hModule); } + /* Set last error in case of failure */ + if (!NT_SUCCESS(Status)) + SetLastErrorByStatus(Status); + quickie: /* Unlock loader lock if it was acquired */ if (!NoLock) @@ -744,10 +749,6 @@ Status2 = LdrUnlockLoaderLock(0, Cookie); ASSERT(NT_SUCCESS(Status2)); } - - /* Set last error in case of failure */ - if (!NT_SUCCESS(Status)) - SetLastErrorByStatus(Status); /* Set the module handle to the caller */ if (phModule) *phModule = hModule; @@ -827,7 +828,7 @@ dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, lpwModuleName, phModule); /* If result is invalid parameter - return failure */ - if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL) return FALSE; + if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR) return FALSE; /* If result is 2, there is no need to do anything - return success. */ if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS) return TRUE; @@ -855,13 +856,14 @@ { PUNICODE_STRING lpModuleNameW; DWORD dwValid; - BOOL Ret; + BOOL Ret = FALSE; + NTSTATUS Status; /* Validate parameters */ dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, (LPCWSTR)lpModuleName, phModule); /* If result is invalid parameter - return failure */ - if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL) return FALSE; + if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR) return FALSE; /* If result is 2, there is no need to do anything - return success. */ if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS) return TRUE; @@ -869,10 +871,11 @@ /* Check if we don't need to convert the name */ if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) { - /* Call the W version of the API without conversion */ - Ret = GetModuleHandleExW(dwFlags, - (LPCWSTR)lpModuleName, - phModule); + /* Call the extended version of the API without conversion */ + Status = BasepGetModuleHandleExW(FALSE, + dwFlags, + (LPCWSTR)lpModuleName, + phModule); } else { @@ -882,11 +885,16 @@ /* Return FALSE if conversion failed */ if (!lpModuleNameW) return FALSE; - /* Call the W version of the API */ - Ret = GetModuleHandleExW(dwFlags, - lpModuleNameW->Buffer, - phModule); - } + /* Call the extended version of the API */ + Status = BasepGetModuleHandleExW(FALSE, + dwFlags, + lpModuleNameW->Buffer, + phModule); + } + + /* If result was successful - return true */ + if (NT_SUCCESS(Status)) + Ret = TRUE; /* Return result */ return Ret; Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Mon Apr 4 19:35:24 2011 @@ -71,8 +71,12 @@ // // LdrLockLoaderLock Flags // -#define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS 0x00000001 -#define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 +#define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 +#define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 + +#define LDR_LOCK_LOADER_LOCK_DISPOSITION_INVALID 0 +#define LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED 1 +#define LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED 2 // // FIXME: THIS SHOULD *NOT* BE USED!

1 0

[janderwald] 51252: [SNDVOL32] - Set Control variable to null, which prevents that mixer controls being assigned to another line when the current line does not have any controls. Bug was highlighte...
by janderwald＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: janderwald Date: Mon Apr 4 14:27:29 2011 New Revision: 51252 URL: http://svn.reactos.org/svn/reactos?rev=51252&view=rev Log: [SNDVOL32] - Set Control variable to null, which prevents that mixer controls being assigned to another line when the current line does not have any controls. Bug was highlighted when opening the property window. In that case sndvol32 frees the previous setting, so all mixer lines are also getting freed including their controls, which caused a double free in the case the line did not have any controls assigned. Modified: trunk/reactos/base/applications/sndvol32/mixer.c Modified: trunk/reactos/base/applications/sndvol32/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] Mon Apr 4 14:27:29 2011 @@ -189,7 +189,7 @@ MIXER_GETLINEINFOF_SOURCE); if (Result == MMSYSERR_NOERROR) { - LPMIXERCONTROL Controls; + LPMIXERCONTROL Controls = NULL; PSND_MIXER_CONNECTION Con; DPRINT("++ Source: %ws\n", LineInfo.szName);

1 0

[nyadav] 51251: Fix headers for audio_test
by nyadav＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: nyadav Date: Mon Apr 4 13:21:25 2011 New Revision: 51251 URL: http://svn.reactos.org/svn/reactos?rev=51251&view=rev Log: Fix headers for audio_test Modified: branches/nyadav-audio-branch/include/psdk/ksmedia.h Modified: branches/nyadav-audio-branch/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/psd… ============================================================================== --- branches/nyadav-audio-branch/include/psdk/ksmedia.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/psdk/ksmedia.h [iso-8859-1] Mon Apr 4 13:21:25 2011 @@ -347,6 +347,25 @@ KSDATAFORMAT DataFormat; WAVEFORMATEX WaveFormatEx; } KSDATAFORMAT_WAVEFORMATEX, *PKSDATAFORMAT_WAVEFORMATEX; + +#ifndef _WAVEFORMATEXTENSIBLE_ +#define _WAVEFORMATEXTENSIBLE_ +typedef struct { + WAVEFORMATEX Format; + union + { + WORD wValidBitsPerSample; + WORD wSamplesPerBlock; + WORD wReserved; + }Samples; + DWORD dwChannelMask; + GUID SubFormat; +} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; +#endif + +#if !defined(WAVE_FORMAT_EXTENSIBLE) +#define WAVE_FORMAT_EXTENSIBLE 0xFFFE +#endif typedef struct { ULONG Flags; @@ -734,4 +753,50 @@ ULONG ChannelMask; } KSDATARANGE_MUSIC, *PKSDATARANGE_MUSIC; -#endif +#ifndef _SPEAKER_POSITIONS_ +#define _SPEAKER_POSITIONS_ + + +#define SPEAKER_FRONT_LEFT 0x1 +#define SPEAKER_FRONT_RIGHT 0x2 +#define SPEAKER_FRONT_CENTER 0x4 +#define SPEAKER_LOW_FREQUENCY 0x8 +#define SPEAKER_BACK_LEFT 0x10 +#define SPEAKER_BACK_RIGHT 0x20 +#define SPEAKER_FRONT_LEFT_OF_CENTER 0x40 +#define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80 +#define SPEAKER_BACK_CENTER 0x100 +#define SPEAKER_SIDE_LEFT 0x200 +#define SPEAKER_SIDE_RIGHT 0x400 +#define SPEAKER_TOP_CENTER 0x800 +#define SPEAKER_TOP_FRONT_LEFT 0x1000 +#define SPEAKER_TOP_FRONT_CENTER 0x2000 +#define SPEAKER_TOP_FRONT_RIGHT 0x4000 +#define SPEAKER_TOP_BACK_LEFT 0x8000 +#define SPEAKER_TOP_BACK_CENTER 0x10000 +#define SPEAKER_TOP_BACK_RIGHT 0x20000 + +#define SPEAKER_RESERVED 0x7FFC0000 +#define SPEAKER_ALL 0x80000000 + +#endif + +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define KSAUDIO_SPEAKER_DIRECTOUT 0 +#endif + +#define KSAUDIO_SPEAKER_MONO (SPEAKER_FRONT_CENTER) +#define KSAUDIO_SPEAKER_STEREO (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT) +#define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) +#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_7POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | \ + SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) + +#endif

1 0

[nyadav] 51250: fix audio_test
by nyadav＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: nyadav Date: Mon Apr 4 13:18:52 2011 New Revision: 51250 URL: http://svn.reactos.org/svn/reactos?rev=51250&view=rev Log: fix audio_test Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audio_test/audio_test.c Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Mon Apr 4 13:18:52 2011 @@ -42,7 +42,8 @@ SP_DEVINFO_DATA DeviceData; PSP_DEVICE_INTERFACE_DETAIL_DATA DetailData; HDEVINFO DeviceHandle; - PKSDATAFORMAT_WAVEFORMATEX DataFormat; + PKSDATAFORMAT DataFormat; + PWAVEFORMATEXTENSIBLE WaveFormat; PKSPIN_CONNECT PinConnect; PKSSTREAM_HEADER Packet; PKSPROPERTY Property; @@ -61,7 +62,7 @@ DeviceHandle = SetupDiGetClassDevs(&CategoryGuid, NULL, NULL, - DIGCF_DEVICEINTERFACE); //DIGCF_PRESENT + DIGCF_DEVICEINTERFACE |DIGCF_PRESENT); printf("DeviceHandle %p\n", DeviceHandle); @@ -83,7 +84,7 @@ // Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + MAX_PATH * sizeof(WCHAR); DetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA)HeapAlloc(GetProcessHeap(), - 0, + HEAP_ZERO_MEMORY, Length); DetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); DeviceData.cbSize = sizeof(DeviceData); @@ -118,14 +119,15 @@ // // Allocate a KS Pin Connection Request Structure // - Length = sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX); - printf("Length %ld KSPIN %u DATAFORMAT %u\n", Length, sizeof(KSPIN_CONNECT), sizeof(KSDATAFORMAT_WAVEFORMATEX)); - PinConnect = (PKSPIN_CONNECT)HeapAlloc(GetProcessHeap(), 0, Length); - DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)(PinConnect + 1); + Length = sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX) + sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX); + PinConnect = (PKSPIN_CONNECT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length); + DataFormat = (PKSDATAFORMAT)(PinConnect + 1); + WaveFormat = (PWAVEFORMATEXTENSIBLE)(DataFormat + 1); // // Setup the KS Pin Data // + PinConnect->Interface.Set = KSINTERFACESETID_Standard; PinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; PinConnect->Interface.Flags = 0; @@ -140,23 +142,30 @@ // // Setup the KS Data Format Information // - DataFormat->WaveFormatEx.wFormatTag = WAVE_FORMAT_PCM; - DataFormat->WaveFormatEx.nChannels = 2; - DataFormat->WaveFormatEx.nSamplesPerSec = 48000; - DataFormat->WaveFormatEx.nBlockAlign = 4; - DataFormat->WaveFormatEx.nAvgBytesPerSec = 48000 * 4; - DataFormat->WaveFormatEx.wBitsPerSample = 16; - DataFormat->WaveFormatEx.cbSize = 0; - DataFormat->DataFormat.FormatSize = sizeof(KSDATAFORMAT) + - sizeof(WAVEFORMATEX); - DataFormat->DataFormat.Flags = KSDATAFORMAT_ATTRIBUTES; - DataFormat->DataFormat.Reserved = 0; - DataFormat->DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO; - DataFormat->DataFormat.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - DataFormat->DataFormat.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; - DataFormat->DataFormat.SampleSize = 4; - - // + printf("DataFormat %p %p\n", DataFormat,(PVOID)((((ULONG_PTR)DataFormat + 7)) & ~7)); + + DataFormat->Flags = 0; + DataFormat->Reserved = 0; + DataFormat->MajorFormat = KSDATAFORMAT_TYPE_AUDIO; + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + DataFormat->Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; + DataFormat->SampleSize = 4; + DataFormat->FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEXTENSIBLE); + + WaveFormat->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + WaveFormat->Format.nChannels = 2; + WaveFormat->Format.nSamplesPerSec = 48000; + WaveFormat->Format.nBlockAlign = 4; + WaveFormat->Format.nAvgBytesPerSec = WaveFormat->Format.nSamplesPerSec * WaveFormat->Format.nBlockAlign; + WaveFormat->Format.wBitsPerSample = 16; + WaveFormat->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + WaveFormat->dwChannelMask = KSAUDIO_SPEAKER_STEREO; + WaveFormat->Samples.wValidBitsPerSample = 16; + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + + printf("Creating pin\n"); + + // // Create the pin // Status = KsCreatePin(FilterHandle, PinConnect, GENERIC_WRITE, &PinHandle);

1 0

[jimtabor] 51249: - Fix build.
by jimtabor＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: jimtabor Date: Mon Apr 4 07:22:41 2011 New Revision: 51249 URL: http://svn.reactos.org/svn/reactos?rev=51249&view=rev Log: - Fix build. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Mon Apr 4 07:22:41 2011 @@ -3174,6 +3174,7 @@ BOOL fRemove; INT executedMenuId = -1; MTRACKER mt; + HWND capture_win; BOOL enterIdleSent = FALSE; mt.TrackFlags = 0;

1 0

[jimtabor] 51248: [User32|Win32k] - Working on wine win test_capture_4, pass all the tests in test_capture_4_proc but still waiting forever in MenuTrackMenu:WaitMessage!
by jimtabor＠svn.reactos.org 04 Apr '11

04 Apr '11

Author: jimtabor Date: Mon Apr 4 07:18:54 2011 New Revision: 51248 URL: http://svn.reactos.org/svn/reactos?rev=51248&view=rev Log: [User32|Win32k] - Working on wine win test_capture_4, pass all the tests in test_capture_4_proc but still waiting forever in MenuTrackMenu:WaitMessage! Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Mon Apr 4 07:18:54 2011 @@ -3207,8 +3207,10 @@ fEndMenu = !fRemove; } - SetCapture(mt.OwnerWnd); - (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, mt.OwnerWnd); + /* owner may not be visible when tracking a popup, so use the menu itself */ + capture_win = (wFlags & TPM_POPUPMENU) ? MenuInfo.Wnd : mt.OwnerWnd; + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, capture_win); // 1 + SetCapture(capture_win); // 2 FIXME("MenuTrackMenu 1\n"); while (! fEndMenu) 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] Mon Apr 4 07:18:54 2011 @@ -2380,8 +2380,9 @@ BOOL WINAPI ReleaseCapture(VOID) { - NtUserSetCapture(NULL); - return(TRUE); + HWND hwndPrev = NtUserSetCapture(NULL); + return(hwndPrev ? TRUE : FALSE); +// return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_RELEASECAPTURE); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Apr 4 07:18:54 2011 @@ -546,6 +546,9 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; + if (ThreadQueue->QF_flags & QF_CAPTURELOCKED) + return NULL; + if ((Window = UserGetWindowObject(hWnd))) { if (Window->head.pti->MessageQueue != ThreadQueue) @@ -553,7 +556,7 @@ return NULL; } } - + hWndPrev = MsqSetStateWindow(ThreadQueue, MSQ_STATE_CAPTURE, hWnd); if (hWndPrev) @@ -563,19 +566,28 @@ IntNotifyWinEvent(EVENT_SYSTEM_CAPTUREEND, pWnd, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); } + if (Window) + IntNotifyWinEvent(EVENT_SYSTEM_CAPTURESTART, Window, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); + + if (hWndPrev && hWndPrev != hWnd) + { + if (ThreadQueue->MenuOwner && Window) ThreadQueue->QF_flags |= QF_CAPTURELOCKED; + + co_IntPostOrSendMessage(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); + + ThreadQueue->QF_flags &= ~QF_CAPTURELOCKED; + } + + ThreadQueue->CaptureWindow = hWnd; + + /// These are hacks! /* also remove other windows if not capturing anymore */ if (hWnd == NULL) { MsqSetStateWindow(ThreadQueue, MSQ_STATE_MENUOWNER, NULL); MsqSetStateWindow(ThreadQueue, MSQ_STATE_MOVESIZE, NULL); } - - if (Window) - IntNotifyWinEvent(EVENT_SYSTEM_CAPTURESTART, Window, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); - - co_IntPostOrSendMessage(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); - ThreadQueue->CaptureWindow = hWnd; - + /// return hWndPrev; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Apr 4 07:18:54 2011 @@ -179,7 +179,9 @@ GUITHREADINFO SafeGui; PDESKTOP Desktop; PUSER_MESSAGE_QUEUE MsgQueue; + PTHREADINFO W32Thread; PETHREAD Thread = NULL; + DECLARE_RETURN(BOOLEAN); DPRINT("Enter NtUserGetGUIThreadInfo\n"); @@ -198,7 +200,7 @@ RETURN( FALSE); } - if(idThread) + if (idThread) { Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)idThread, &Thread); if(!NT_SUCCESS(Status)) @@ -206,24 +208,17 @@ EngSetLastError(ERROR_ACCESS_DENIED); RETURN( FALSE); } - Desktop = ((PTHREADINFO)Thread->Tcb.Win32Thread)->rpdesk; + W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread; + Desktop = W32Thread->rpdesk; } else - { - /* get the foreground thread */ - PTHREADINFO W32Thread = (PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread; + { /* get the foreground thread */ + Thread = PsGetCurrentThread(); + W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread; Desktop = W32Thread->rpdesk; - if(Desktop) - { - MsgQueue = Desktop->ActiveMessageQueue; - if(MsgQueue) - { - Thread = MsgQueue->Thread; - } - } - } - - if(!Thread || !Desktop) + } + + if (!Thread || !Desktop ) { if(idThread && Thread) ObDereferenceObject(Thread); @@ -231,13 +226,21 @@ RETURN( FALSE); } - MsgQueue = (PUSER_MESSAGE_QUEUE)Desktop->ActiveMessageQueue; + if ( W32Thread->MessageQueue ) + MsgQueue = W32Thread->MessageQueue; + else + { + if ( Desktop ) MsgQueue = Desktop->ActiveMessageQueue; + } + CaretInfo = MsgQueue->CaretInfo; SafeGui.flags = (CaretInfo->Visible ? GUI_CARETBLINKING : 0); - if(MsgQueue->MenuOwner) + + if (MsgQueue->MenuOwner) SafeGui.flags |= GUI_INMENUMODE | MsgQueue->MenuState; - if(MsgQueue->MoveSize) + + if (MsgQueue->MoveSize) SafeGui.flags |= GUI_INMOVESIZE; /* FIXME add flag GUI_16BITTASK */ @@ -254,7 +257,7 @@ SafeGui.rcCaret.right = SafeGui.rcCaret.left + CaretInfo->Size.cx; SafeGui.rcCaret.bottom = SafeGui.rcCaret.top + CaretInfo->Size.cy; - if(idThread) + if (idThread) ObDereferenceObject(Thread); Status = MmCopyToCaller(lpgui, &SafeGui, sizeof(GUITHREADINFO));

1 0

[spetreolle] 51247: [RBUILD] Use msvcrt as default crt for DLLs/OCX modules.
by spetreolle＠svn.reactos.org 03 Apr '11

03 Apr '11

Author: spetreolle Date: Sun Apr 3 22:09:07 2011 New Revision: 51247 URL: http://svn.reactos.org/svn/reactos?rev=51247&view=rev Log: [RBUILD] Use msvcrt as default crt for DLLs/OCX modules. Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Sun Apr 3 22:09:07 2011 @@ -1226,7 +1226,7 @@ return "static"; case Win32DLL: case Win32OCX: - return "ntdll"; + return "msvcrt"; case NativeDLL: case NativeCUI: return "ntdll";

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