Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[janderwald] 49335: - remove rtl dependency - thanks to mephisto!

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Oct 28 23:33:50 2010 New Revision: 49335 URL: http://svn.reactos.org/svn/reactos?rev=49335&view=rev Log: - remove rtl dependency - thanks to mephisto! Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild [iso-8859-1] Thu Oct 28 23:33:50 2010 @@ -7,7 +7,6 @@ <define name="_COMDDK_" /> <library>mmixer</library> <library>ntoskrnl</library> - <library>rtl</library> <library>libcntpr</library> <library>ks</library> <library>pseh</library>

13 years, 11 months

[spetreolle] 49334: [CMAKE] Add remaining base/applications modules, except sndrec32. wordpad resources fixes will be submitted upstream.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Oct 28 22:16:07 2010 New Revision: 49334 URL: http://svn.reactos.org/svn/reactos?rev=49334&view=rev Log: [CMAKE] Add remaining base/applications modules, except sndrec32. wordpad resources fixes will be submitted upstream. Added: branches/cmake-bringup/base/applications/notepad/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/rapps/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/regedit/clb/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/screensavers/3dtext/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/screensavers/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/screensavers/logon/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/applications/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt branches/cmake-bringup/base/applications/notepad/lang/bg-BG.rc branches/cmake-bringup/base/applications/notepad/lang/cs-CZ.rc branches/cmake-bringup/base/applications/notepad/lang/da-DK.rc branches/cmake-bringup/base/applications/notepad/lang/de-DE.rc branches/cmake-bringup/base/applications/notepad/lang/el-GR.rc branches/cmake-bringup/base/applications/notepad/lang/es-ES.rc branches/cmake-bringup/base/applications/notepad/lang/eu-ES.rc branches/cmake-bringup/base/applications/notepad/lang/fi-FI.rc branches/cmake-bringup/base/applications/notepad/lang/fr-FR.rc branches/cmake-bringup/base/applications/notepad/lang/hu-HU.rc branches/cmake-bringup/base/applications/notepad/lang/hy-AM.rc branches/cmake-bringup/base/applications/notepad/lang/id-ID.rc branches/cmake-bringup/base/applications/notepad/lang/it-IT.rc branches/cmake-bringup/base/applications/notepad/lang/nl-NL.rc branches/cmake-bringup/base/applications/notepad/lang/no-NO.rc branches/cmake-bringup/base/applications/notepad/lang/pl-PL.rc branches/cmake-bringup/base/applications/notepad/lang/pt-PT.rc branches/cmake-bringup/base/applications/notepad/lang/ro-RO.rc branches/cmake-bringup/base/applications/notepad/lang/ru-RU.rc branches/cmake-bringup/base/applications/notepad/lang/sk-SK.rc branches/cmake-bringup/base/applications/notepad/lang/sl-SI.rc branches/cmake-bringup/base/applications/notepad/lang/sv-SE.rc branches/cmake-bringup/base/applications/notepad/lang/th-TH.rc branches/cmake-bringup/base/applications/notepad/lang/uk-UA.rc branches/cmake-bringup/base/applications/notepad/lang/zh-CN.rc branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt branches/cmake-bringup/base/applications/wordpad/Da.rc branches/cmake-bringup/base/applications/wordpad/De.rc branches/cmake-bringup/base/applications/wordpad/En.rc branches/cmake-bringup/base/applications/wordpad/Fr.rc branches/cmake-bringup/base/applications/wordpad/Hu.rc branches/cmake-bringup/base/applications/wordpad/It.rc branches/cmake-bringup/base/applications/wordpad/Ja.rc branches/cmake-bringup/base/applications/wordpad/Ko.rc branches/cmake-bringup/base/applications/wordpad/Lt.rc branches/cmake-bringup/base/applications/wordpad/Nl.rc branches/cmake-bringup/base/applications/wordpad/No.rc branches/cmake-bringup/base/applications/wordpad/Pl.rc branches/cmake-bringup/base/applications/wordpad/Pt.rc branches/cmake-bringup/base/applications/wordpad/Ro.rc branches/cmake-bringup/base/applications/wordpad/Ru.rc branches/cmake-bringup/base/applications/wordpad/Si.rc branches/cmake-bringup/base/applications/wordpad/Sv.rc branches/cmake-bringup/base/applications/wordpad/Tr.rc branches/cmake-bringup/base/applications/wordpad/Uk.rc branches/cmake-bringup/base/applications/wordpad/Zh.rc branches/cmake-bringup/base/applications/wordpad/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Added: branches/cmake-bringup/base/applications/notepad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Added: branches/cmake-bringup/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Added: branches/cmake-bringup/base/applications/regedit/clb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Added: branches/cmake-bringup/base/applications/screensavers/3dtext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Added: branches/cmake-bringup/base/applications/screensavers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Added: branches/cmake-bringup/base/applications/screensavers/logon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Added: branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…

13 years, 11 months

[spetreolle] 49333: [CMAKE] Cant' have comments in mc files.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Oct 28 22:10:10 2010 New Revision: 49333 URL: http://svn.reactos.org/svn/reactos?rev=49333&view=rev Log: [CMAKE] Cant' have comments in mc files. Modified: branches/cmake-bringup/base/applications/rapps/rappsmsg.mc Modified: branches/cmake-bringup/base/applications/rapps/rappsmsg.mc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/rappsmsg.mc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/rappsmsg.mc [iso-8859-1] Thu Oct 28 22:10:10 2010 @@ -25,4 +25,3 @@ Removal of the program "%1" is called. . -; EOF

13 years, 11 months

[fireball] 49332: Roel Messiant: - Heap corruption fixes.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 28 22:08:18 2010 New Revision: 49332 URL: http://svn.reactos.org/svn/reactos?rev=49332&view=rev Log: Roel Messiant: - Heap corruption fixes. Modified: trunk/reactos/base/applications/network/tracert/tracert.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] Thu Oct 28 22:08:18 2010 @@ -422,7 +422,7 @@ pInfo->RecvPacket = (PIPv4_HEADER)HeapAlloc(GetProcessHeap(), 0, - sizeof(IPv4_HEADER) + PACKET_SIZE); + MAX_PING_PACKET_SIZE); if (!pInfo->RecvPacket) { HeapFree(GetProcessHeap(), Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Thu Oct 28 22:08:18 2010 @@ -256,7 +256,7 @@ /* Copy it to the heap allocd memory */ Path = RtlAllocateHeap(RtlGetProcessHeap(), 0, - wcslen(SearchPathBuffer) * sizeof(WCHAR)); + (wcslen(SearchPathBuffer) + 1) * sizeof(WCHAR)); if (!Path) { Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Thu Oct 28 22:08:18 2010 @@ -2860,7 +2860,7 @@ } pCurSettings->AutoconfigActive = pPerInfo->AutoconfigActive; } - CoTaskMemFree(pInfo); + CoTaskMemFree(pPerInfo); } }

13 years, 11 months

[gadamopoulos] 49331: [win32k] message.c: - Don't use RETURN macro - Correctly use SEH. Use _SEH2_YIELD

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 28 17:14:29 2010 New Revision: 49331 URL: http://svn.reactos.org/svn/reactos?rev=49331&view=rev Log: [win32k] message.c: - Don't use RETURN macro - Correctly use SEH. Use _SEH2_YIELD 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 Oct 28 17:14:29 2010 @@ -1868,9 +1868,6 @@ PTHREADINFO pti; PUSER_MESSAGE_QUEUE Queue; DWORD Result; - DECLARE_RETURN(DWORD); - - DPRINT("Enter IntGetQueueStatus\n"); pti = PsGetCurrentThreadWin32Thread(); Queue = pti->MessageQueue; @@ -1881,19 +1878,17 @@ Queue->ChangedBits = 0; } - RETURN(Result); - -CLEANUP: - DPRINT("Leave IntGetQueueStatus, ret=%i\n",_ret_); - END_CLEANUP; + return Result; } BOOL APIENTRY IntInitMessagePumpHook() { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) - { - ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook++; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + if (pti->pcti) + { + pti->pcti->dwcPumpHook++; return TRUE; } return FALSE; @@ -1902,13 +1897,15 @@ BOOL APIENTRY IntUninitMessagePumpHook() { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) - { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook <= 0) + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + if (pti->pcti) + { + if (pti->pcti->dwcPumpHook <= 0) { return FALSE; } - ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook--; + pti->pcti->dwcPumpHook--; return TRUE; } return FALSE; @@ -1922,17 +1919,15 @@ WPARAM wParam, LPARAM lParam) { - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserPostMessage\n"); + BOOL ret; + UserEnterExclusive(); - RETURN( UserPostMessage(hWnd, Msg, wParam, lParam)); - -CLEANUP: - DPRINT("Leave NtUserPostMessage, ret=%i\n",_ret_); + ret = UserPostMessage(hWnd, Msg, wParam, lParam); + UserLeave(); - END_CLEANUP; + + return ret; } BOOL APIENTRY @@ -1941,20 +1936,15 @@ WPARAM wParam, LPARAM lParam) { - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserPostThreadMessage\n"); + BOOL ret; + UserEnterExclusive(); - RETURN( UserPostThreadMessage( idThread, - Msg, - wParam, - lParam)); - -CLEANUP: - DPRINT("Leave NtUserPostThreadMessage, ret=%i\n",_ret_); + ret = UserPostThreadMessage( idThread, Msg, wParam, lParam); + UserLeave(); - END_CLEANUP; + + return ret; } DWORD APIENTRY @@ -1979,31 +1969,34 @@ { DOSENDMESSAGE dsm; LRESULT Result; - DECLARE_RETURN(BOOL); DPRINT("Enter NtUserSendMessageTimeout\n"); - UserEnterExclusive(); dsm.uFlags = uFlags; dsm.uTimeout = uTimeout; + + UserEnterExclusive(); + Result = co_IntDoSendMessage(hWnd, Msg, wParam, lParam, &dsm, UnsafeInfo); + + UserLeave(); + if(uResult != NULL && Result != 0) { - NTSTATUS Status; - - Status = MmCopyToCaller(uResult, &dsm.Result, sizeof(ULONG_PTR)); - if(!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); - } - } - RETURN( Result); - -CLEANUP: - DPRINT("Leave NtUserSendMessageTimeout, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + _SEH2_TRY + { + ProbeForWrite(uResult, sizeof(ULONG_PTR), 1); + RtlCopyMemory(uResult, &dsm.Result, sizeof(ULONG_PTR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER);; + Result = FALSE; + } + _SEH2_END; + } + + return Result; } LRESULT APIENTRY @@ -2013,34 +2006,30 @@ LPARAM lParam, PNTUSERSENDMESSAGEINFO UnsafeInfo ) { - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserSendMessage\n"); + BOOL ret; + UserEnterExclusive(); - RETURN(co_IntDoSendMessage(Wnd, Msg, wParam, lParam, NULL, UnsafeInfo)); - -CLEANUP: - DPRINT("Leave NtUserSendMessage, ret=%i\n",_ret_); + ret = co_IntDoSendMessage(Wnd, Msg, wParam, lParam, NULL, UnsafeInfo); + UserLeave(); - END_CLEANUP; + + return ret; } ////////// BOOL APIENTRY NtUserWaitMessage(VOID) { - DECLARE_RETURN(BOOL); - - DPRINT("EnterNtUserWaitMessage\n"); + BOOL ret; + UserEnterExclusive(); - RETURN(co_IntWaitMessage(NULL, 0, 0)); - -CLEANUP: - DPRINT("Leave NtUserWaitMessage, ret=%i\n",_ret_); + ret = co_IntWaitMessage(NULL, 0, 0); + UserLeave(); - END_CLEANUP; + + return ret; } @@ -2067,10 +2056,8 @@ PWND Window = NULL; PMSGMEMORY MsgMemoryEntry; PVOID UserMem; - UINT Size; + ULONG Size; USER_MESSAGE Msg; - DECLARE_RETURN(BOOL); - // USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetMessage\n"); UserEnterExclusive(); @@ -2078,7 +2065,8 @@ /* Validate input */ if (hWnd && !(Window = UserGetWindowObject(hWnd))) { - RETURN(-1); + UserLeave(); + return -1; } // if (Window) UserRefObjectCo(Window, &Ref); @@ -2092,65 +2080,71 @@ do { GotMessage = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, PM_REMOVE); - if (GotMessage) - { - Info.Msg = Msg.Msg; - /* See if this message type is present in the table */ - MsgMemoryEntry = FindMsgMemory(Info.Msg.message); - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - Info.LParamSize = 0; - } - else - { - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, Info.Msg.wParam, - Info.Msg.lParam); - /* Allocate required amount of user-mode memory */ - Info.LParamSize = Size; - UserMem = NULL; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0, - &Info.LParamSize, MEM_COMMIT, PAGE_READWRITE); - - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( (BOOL) -1); - } - /* Transfer lParam data to user-mode mem */ - Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Size); - if (! NT_SUCCESS(Status)) - { - ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, - &Info.LParamSize, MEM_DECOMMIT); - SetLastNtError(Status); - RETURN( (BOOL) -1); - } - Info.Msg.lParam = (LPARAM) UserMem; - } - Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); + + if (!GotMessage && !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax)) + { + UserLeave(); + return -1; + } + } + while (! GotMessage); + + UserLeave(); + + Info.Msg = Msg.Msg; + /* See if this message type is present in the table */ + MsgMemoryEntry = FindMsgMemory(Info.Msg.message); + + _SEH2_TRY + { + ProbeForWrite(UnsafeInfo, sizeof(NTUSERGETMESSAGEINFO), 1); + RtlCopyMemory(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); + + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + Info.LParamSize = 0; + } + else + { + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, Info.Msg.wParam, Info.Msg.lParam); + + /* Allocate required amount of user-mode memory */ + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &UserMem, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); if (! NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( (BOOL) -1); - } - } - else if (! co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax)) - { - RETURN( (BOOL) -1); - } - } - while (! GotMessage); - - RETURN( WM_QUIT != Info.Msg.message); - -CLEANUP: - // if (Window) UserDerefObjectCo(Window); - - DPRINT("Leave NtUserGetMessage\n"); - UserLeave(); - END_CLEANUP; + _SEH2_YIELD(return (BOOL) -1); + } + + /* Transfer lParam data to user-mode mem */ + ProbeForWrite(UserMem, Size, 1); + RtlCopyMemory(UserMem, (PVOID)Info.Msg.lParam, Size); + + Info.LParamSize = Size; + Info.Msg.lParam = (LPARAM) UserMem; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + + if(UserMem != NULL) + { + ZwFreeVirtualMemory(NtCurrentProcess(), &UserMem, &Size, MEM_RELEASE); + } + + _SEH2_YIELD(return (BOOL) -1); + } + _SEH2_END; + + return (Info.Msg.message != WM_QUIT ); } @@ -2161,21 +2155,21 @@ UINT MsgFilterMax) { MSG Msg; - BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserGetMessage\n"); + BOOL Ret; + + if ( (MsgFilterMin|MsgFilterMax) & ~WM_MAXIMUM ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + RtlZeroMemory(&Msg, sizeof(MSG)); + UserEnterExclusive(); - if ( (MsgFilterMin|MsgFilterMax) & ~WM_MAXIMUM ) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( Ret); - } - - RtlZeroMemory(&Msg, sizeof(MSG)); - Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, PM_REMOVE, TRUE); + + UserLeave(); if (Ret) { @@ -2191,12 +2185,8 @@ } _SEH2_END; } - RETURN( Ret); - -CLEANUP: - DPRINT("Leave NtUserGetMessage\n"); - UserLeave(); - END_CLEANUP; + + return Ret; } BOOL APIENTRY @@ -2207,16 +2197,14 @@ UINT RemoveMsg) { NTSTATUS Status; - BOOL Present; + BOOL Ret; NTUSERGETMESSAGEINFO Info; PWND Window; PMSGMEMORY MsgMemoryEntry; - PVOID UserMem; - UINT Size; + PVOID UserMem = NULL; + ULONG Size; USER_MESSAGE Msg; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserPeekMessage\n"); + UserEnterExclusive(); if (hWnd == (HWND)-1 || hWnd == (HWND)0x0000FFFF || hWnd == (HWND)0xFFFFFFFF) @@ -2227,7 +2215,8 @@ { if (!(Window = UserGetWindowObject(hWnd))) { - RETURN(-1); + UserLeave(); + return -1; } } else @@ -2241,58 +2230,66 @@ MsgFilterMax = 0; } - Present = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, RemoveMsg); - if (Present) - { - + Ret = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, RemoveMsg); + + UserLeave(); + + if (Ret) + { Info.Msg = Msg.Msg; /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Info.Msg.message); - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - Info.LParamSize = 0; - } - else - { - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, Info.Msg.wParam, - Info.Msg.lParam); - /* Allocate required amount of user-mode memory */ - Info.LParamSize = Size; - UserMem = NULL; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0, - &Info.LParamSize, MEM_COMMIT, PAGE_READWRITE); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( (BOOL) -1); - } - /* Transfer lParam data to user-mode mem */ - Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Size); - if (! NT_SUCCESS(Status)) - { - ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, - &Info.LParamSize, MEM_RELEASE); - SetLastNtError(Status); - RETURN( (BOOL) -1); - } - Info.Msg.lParam = (LPARAM) UserMem; - } - Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( (BOOL) -1); - } - } - - RETURN( Present); - -CLEANUP: - DPRINT("Leave NtUserPeekMessage, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + + _SEH2_TRY + { + ProbeForWrite(UnsafeInfo, sizeof(NTUSERGETMESSAGEINFO), 1); + RtlCopyMemory(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); + + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + Info.LParamSize = 0; + } + else + { + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, Info.Msg.wParam, Info.Msg.lParam); + + /* Allocate required amount of user-mode memory */ + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &UserMem, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + _SEH2_YIELD(return (BOOL) -1); + } + + /* Transfer lParam data to user-mode mem */ + ProbeForWrite(UserMem, Size, 1); + RtlCopyMemory(UserMem, (PVOID)Info.Msg.lParam, Size); + + Info.LParamSize = Size; + Info.Msg.lParam = (LPARAM) UserMem; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Ret = (BOOL) -1; + + if(UserMem != NULL) + { + ZwFreeVirtualMemory(NtCurrentProcess(), &UserMem, &Size, MEM_RELEASE); + } + } + _SEH2_END; + } + + return Ret; } BOOL APIENTRY @@ -2303,21 +2300,21 @@ UINT RemoveMsg) { MSG Msg; - BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserPeekMessage\n"); + BOOL Ret; + + if ( RemoveMsg & PM_BADMSGFLAGS ) + { + SetLastWin32Error(ERROR_INVALID_FLAGS); + return FALSE; + } + + RtlZeroMemory(&Msg, sizeof(MSG)); + UserEnterExclusive(); - if ( RemoveMsg & PM_BADMSGFLAGS ) - { - SetLastWin32Error(ERROR_INVALID_FLAGS); - RETURN( Ret); - } - - RtlZeroMemory(&Msg, sizeof(MSG)); - Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg, FALSE); + + UserLeave(); if (Ret) { @@ -2333,49 +2330,39 @@ } _SEH2_END; } - RETURN( Ret); - -CLEANUP: - DPRINT("Leave NtUserPeekMessage, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + + return Ret; } BOOL APIENTRY NtUserCallMsgFilter( LPMSG lpmsg, INT code) { - BOOL BadChk = FALSE, Ret = FALSE; + BOOL Ret = FALSE; MSG Msg; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserCallMsgFilter\n"); + + _SEH2_TRY + { + ProbeForRead(lpmsg, sizeof(MSG), 1); + RtlCopyMemory( &Msg, lpmsg, sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + UserEnterExclusive(); - if (lpmsg) - { - _SEH2_TRY - { - ProbeForRead(lpmsg, sizeof(MSG), 1); - RtlCopyMemory( &Msg, lpmsg, sizeof(MSG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - BadChk = TRUE; - } - _SEH2_END; + + if ( co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) + { + Ret = TRUE; } else - RETURN( FALSE); - - if (BadChk) RETURN( FALSE); - - if ( co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) - { - Ret = TRUE; - } - else { Ret = co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)&Msg); } + + UserLeave(); _SEH2_TRY { @@ -2384,26 +2371,19 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - BadChk = TRUE; + Ret = FALSE; } _SEH2_END; - if (BadChk) RETURN( FALSE); - RETURN( Ret) - -CLEANUP: - DPRINT("Leave NtUserCallMsgFilter. ret=%i\n", _ret_); - UserLeave(); - END_CLEANUP; + + return Ret; } LRESULT APIENTRY NtUserDispatchMessage(PMSG UnsafeMsgInfo) { LRESULT Res = 0; - BOOL Hit = FALSE; MSG SafeMsg; - UserEnterExclusive(); _SEH2_TRY { ProbeForRead(UnsafeMsgInfo, sizeof(MSG), 1); @@ -2412,11 +2392,13 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - Hit = TRUE; + _SEH2_YIELD(return FALSE); } _SEH2_END; - if (!Hit) Res = IntDispatchMessage(&SafeMsg); + UserEnterExclusive(); + + Res = IntDispatchMessage(&SafeMsg); UserLeave(); return Res; @@ -2426,26 +2408,28 @@ BOOL APIENTRY NtUserTranslateMessage(LPMSG lpMsg, UINT flags) { - NTSTATUS Status; MSG SafeMsg; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserTranslateMessage\n"); + BOOL Ret; + + _SEH2_TRY + { + ProbeForRead(lpMsg, sizeof(MSG), 1); + RtlCopyMemory(&SafeMsg, lpMsg, sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + UserEnterExclusive(); - Status = MmCopyFromCaller(&SafeMsg, lpMsg, sizeof(MSG)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - RETURN( IntTranslateKbdMessage(&SafeMsg, flags)); - -CLEANUP: - DPRINT("Leave NtUserTranslateMessage: ret=%i\n",_ret_); + Ret = IntTranslateKbdMessage(&SafeMsg, flags); + UserLeave(); - END_CLEANUP; + + return Ret; } BOOL APIENTRY @@ -2459,7 +2443,6 @@ { LRESULT lResult = 0; BOOL Ret = FALSE; - BOOL BadChk = FALSE; PWND Window = NULL; USER_REFERENCE_ENTRY Ref; @@ -2501,10 +2484,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - BadChk = TRUE; + Ret = FALSE; + _SEH2_YIELD(break); } _SEH2_END; - if (BadChk) break; } else break; @@ -2531,7 +2514,7 @@ { co_IntSendMessageTimeout( HWND_BROADCAST, Msg, - wParam, + wParam, lParam, SMTO_NOTIMEOUTIFNOTHUNG, 2000, @@ -2657,7 +2640,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - BadChk = TRUE; + Ret = FALSE; } _SEH2_END; } @@ -2668,7 +2651,7 @@ UserLeave(); - return BadChk ? FALSE : Ret; + return Ret; } #define INFINITE 0xFFFFFFFF

13 years, 11 months

[jgardou] 49330: [CMAKE] - add vgafonts cab file to build

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 28 16:36:49 2010 New Revision: 49330 URL: http://svn.reactos.org/svn/reactos?rev=49330&view=rev Log: [CMAKE] - add vgafonts cab file to build Added: branches/cmake-bringup/media/vgafonts/CMakeLists.txt (with props) Modified: branches/cmake-bringup/media/CMakeLists.txt Modified: branches/cmake-bringup/media/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/CMakeLists.… ============================================================================== --- branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] Thu Oct 28 16:36:49 2010 @@ -1,3 +1,4 @@ add_subdirectory(fonts) add_subdirectory(inf) -add_subdirectory(nls) +add_subdirectory(nls) +add_subdirectory(vgafonts) Added: branches/cmake-bringup/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/vgafonts/CM… ============================================================================== --- branches/cmake-bringup/media/vgafonts/CMakeLists.txt (added) +++ branches/cmake-bringup/media/vgafonts/CMakeLists.txt [iso-8859-1] Thu Oct 28 16:36:49 2010 @@ -1,0 +1,17 @@ + +list(APPEND SOURCE + ${CMAKE_CURRENT_SOURCE_DIR}/437-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/737-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/775-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/850-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/852-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/865-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/866-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/932-8x8.bin +) + +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab + COMMAND native-cabman -M raw -S ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab ${SOURCE} + DEPENDS ${SOURCE}) + +add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) Propchange: branches/cmake-bringup/media/vgafonts/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 11 months

[fireball] 49329: - Implement RegisterShellHookWindow/DeregisterShellHookWindow in user32. Running applications now appear in Explorer's taskbar (except for console windows and inactive windows, bu...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 28 13:50:53 2010 New Revision: 49329 URL: http://svn.reactos.org/svn/reactos?rev=49329&view=rev Log: - Implement RegisterShellHookWindow/DeregisterShellHookWindow in user32. Running applications now appear in Explorer's taskbar (except for console windows and inactive windows, bug #5206). - Thanks to Maarten Kroese, this work is partially based on his patch. Modified: branches/arwinss/reactos/dll/win32/user32/focus.c branches/arwinss/reactos/dll/win32/user32/hook.c branches/arwinss/reactos/dll/win32/user32/misc.c Modified: branches/arwinss/reactos/dll/win32/user32/focus.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/focus.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/focus.c [iso-8859-1] Thu Oct 28 13:50:53 2010 @@ -153,6 +153,9 @@ SendMessageW( hwnd, WM_ACTIVATE, MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, IsIconic(hwnd) ), (LPARAM)previous ); + + /* Call WH_SHELL hook */ + HOOK_CallHooks( WH_SHELL, HSHELL_WINDOWACTIVATED, (WPARAM)hwnd, 0, TRUE ); } /* now change focus if necessary */ Modified: branches/arwinss/reactos/dll/win32/user32/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/hook.c [iso-8859-1] Thu Oct 28 13:50:53 2010 @@ -74,6 +74,7 @@ #include "winerror.h" #include "win.h" #include "user_private.h" +#include "wine/rosuser.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -412,6 +413,21 @@ USER_CheckNotLock(); + if (id == WH_SHELL) + { + HWND *hook_windows = RosUserBuildShellHookHwndList(); + if (hook_windows) + { + INT wm_shellhook = RegisterWindowMessageW(L"SHELLHOOK"); + HWND* cursor = hook_windows; + + for (; *cursor; cursor++) + PostMessage(*cursor, wm_shellhook, code, wparam); + + HeapFree(GetProcessHeap(), 0, hook_windows); + } + } + if (!HOOK_IsHooked( id )) { TRACE( "skipping hook %s mask %x\n", hook_names[id-WH_MINHOOK], thread_info->active_hooks ); @@ -897,3 +913,20 @@ WARN("(%d)-stub!\n", dwEvent); return TRUE; } + +/*********************************************************************** + * RegisterShellHookWindow [USER32.@] + */ +BOOL WINAPI RegisterShellHookWindow ( HWND hWnd ) +{ + return RosUserRegisterShellHookWindow( hWnd ); +} + + +/*********************************************************************** + * DeregisterShellHookWindow [USER32.@] + */ +HRESULT WINAPI DeregisterShellHookWindow ( HWND hWnd ) +{ + return RosUserDeRegisterShellHookWindow( hWnd ); +} Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Thu Oct 28 13:50:53 2010 @@ -437,26 +437,6 @@ FIXME("(%08x, %08x)\n", flags, reserved); } -/*********************************************************************** - * RegisterShellHookWindow [USER32.@] - */ -BOOL WINAPI RegisterShellHookWindow ( HWND hWnd ) -{ - FIXME("(%p): stub\n", hWnd); - return 0; -} - - -/*********************************************************************** - * DeregisterShellHookWindow [USER32.@] - */ -HRESULT WINAPI DeregisterShellHookWindow ( HWND u ) -{ - FIXME("0x%08x stub\n",u); - return 0; - -} - /*********************************************************************** * RegisterTasklist [USER32.@]

13 years, 11 months

[fireball] 49328: - Add support for shell window hooks in win32k, based on trunk's code. It's not beautiful however it's well isolated and easy for future merges. - The proper code for keeping a li...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 28 13:39:49 2010 New Revision: 49328 URL: http://svn.reactos.org/svn/reactos?rev=49328&view=rev Log: - Add support for shell window hooks in win32k, based on trunk's code. It's not beautiful however it's well isolated and easy for future merges. - The proper code for keeping a list of registered windows for shell hook notifications in desktop structure is commented out for debugging purposes, and the list is global atm. - Thanks to Maarten Kroese, this work is partially based on his patch. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/user.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/user.h [iso-8859-1] Thu Oct 28 13:39:49 2010 @@ -62,6 +62,7 @@ struct hook_table *global_hooks; /* table of global hooks on this desktop */ struct timeout_user *close_timeout; /* timeout before closing the desktop */ unsigned int users; /* processes and threads using this desktop */ + struct list shell_hooks; /* list of registered shell hooks */ }; struct region Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Thu Oct 28 13:39:49 2010 @@ -82,6 +82,9 @@ RosUserToUnicodeEx 7 RosUserMapVirtualKeyEx 4 RosUserGetAsyncKeyState 1 +RosUserRegisterShellHookWindow 1 +RosUserDeRegisterShellHookWindow 1 +RosUserBuildShellHookHwndList 0 SwmAddWindow 4 SwmAddDesktopWindow 3 SwmRemoveWindow 1 Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Thu Oct 28 13:39:49 2010 @@ -11,6 +11,7 @@ #include <win32k.h> #include "object.h" +#include "user.h" #define NDEBUG #include <debug.h> @@ -19,6 +20,16 @@ int debug_level = 0; unsigned int global_error; + +typedef struct _SHELL_HOOK_WINDOW +{ + struct list ListEntry; + HWND hWnd; +} SHELL_HOOK_WINDOW, *PSHELL_HOOK_WINDOW; + +static struct list global_shell_hooks = LIST_INIT(global_shell_hooks); + +struct desktop *get_desktop_obj( PPROCESSINFO process, obj_handle_t handle, unsigned int access ); /* PRIVATE FUNCTIONS *********************************************************/ @@ -178,4 +189,141 @@ return ULargeInt.QuadPart / 10000000; } +BOOL NTAPI +RosUserRegisterShellHookWindow(HWND hWnd) +{ + //PPROCESSINFO process = PsGetCurrentProcessWin32Process(); + //struct desktop *desktop; + struct list *entry, *shell_hooks; + PSHELL_HOOK_WINDOW hook_entry; + + DPRINT("UserRegisterShellHookWindow\n"); + + UserEnterExclusive(); + + //if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) + { + shell_hooks = &global_shell_hooks; + + /* First deregister the window, so we can be sure it's never twice in the + * list. + */ + LIST_FOR_EACH(entry, shell_hooks) + { + hook_entry = LIST_ENTRY( entry, SHELL_HOOK_WINDOW, ListEntry ); + + if (hook_entry->hWnd == hWnd) + { + list_remove(&hook_entry->ListEntry); + ExFreePool(hook_entry); + //release_object( desktop ); + break; + } + } + + hook_entry = ExAllocatePool(PagedPool, sizeof(SHELL_HOOK_WINDOW)); + + if (!hook_entry) + { + //release_object( desktop ); + UserLeave(); + return FALSE; + } + + hook_entry->hWnd = hWnd; + list_add_tail(shell_hooks, &hook_entry->ListEntry); + + //release_object( desktop ); + } + + UserLeave(); + + return TRUE; +} + +BOOL NTAPI +RosUserDeRegisterShellHookWindow(HWND hWnd) +{ + //PPROCESSINFO process = PsGetCurrentProcessWin32Process(); + //struct desktop *desktop; + struct list *entry, *shell_hooks; + PSHELL_HOOK_WINDOW hook_entry; + + UserEnterExclusive(); + + //if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) + { + shell_hooks = &global_shell_hooks; + + LIST_FOR_EACH(entry, shell_hooks) + { + hook_entry = LIST_ENTRY( entry, SHELL_HOOK_WINDOW, ListEntry ); + + if (hook_entry->hWnd == hWnd) + { + list_remove(&hook_entry->ListEntry); + ExFreePool(hook_entry); + //release_object( desktop ); + UserLeave(); + return TRUE; + } + } + + //release_object( desktop ); + } + + UserLeave(); + return FALSE; +} + +HWND * NTAPI +RosUserBuildShellHookHwndList() +{ + //PPROCESSINFO process = PsGetCurrentProcessWin32Process(); + //struct desktop *desktop; + struct list *entry, *shell_hooks; + PSHELL_HOOK_WINDOW hook_entry; + ULONG entries=0; + HWND* list = NULL; + + UserEnterExclusive(); + + //if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) + { + shell_hooks = &global_shell_hooks; + + /* fixme: if we save nb elements in desktop, we dont have to loop to find nb entries */ + LIST_FOR_EACH(entry, shell_hooks) + entries++; + + if (!entries) + { + //release_object( desktop ); + UserLeave(); + return NULL; + } + + list = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(HWND) * (entries + 1)); /* alloc one extra for nullterm */ + if (list) + { + HWND* cursor = list; + + LIST_FOR_EACH(entry, shell_hooks) + { + hook_entry = LIST_ENTRY( entry, SHELL_HOOK_WINDOW, ListEntry ); + + *cursor++ = hook_entry->hWnd; + } + + *cursor = NULL; /* nullterm list */ + } + + //release_object( desktop ); + } + + UserLeave(); + + return list; +} + /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Thu Oct 28 13:39:49 2010 @@ -222,6 +222,7 @@ desktop->close_timeout = NULL; desktop->users = 0; list_add_tail( &winstation->desktops, &desktop->entry ); + list_init( &desktop->shell_hooks ); } } ExFreePool( full_name );

13 years, 11 months

[jgardou] 49327: [CMAKE] - add spider and winmine to build

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 28 12:53:07 2010 New Revision: 49327 URL: http://svn.reactos.org/svn/reactos?rev=49327&view=rev Log: [CMAKE] - add spider and winmine to build Added: branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/applications/games/CMakeLists.txt branches/cmake-bringup/base/applications/games/winmine/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/games/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/CMakeLists.txt [iso-8859-1] Thu Oct 28 12:53:07 2010 @@ -1,4 +1,4 @@ add_subdirectory(solitaire) -#add_subdirectory(spider) -#add_subdirectory(winmine) +add_subdirectory(spider) +add_subdirectory(winmine) Added: branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt [iso-8859-1] Thu Oct 28 12:53:07 2010 @@ -1,0 +1,18 @@ + +set_unicode() +set_cpp() + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib ${CMAKE_CURRENT_SOURCE_DIR}) + +set_rc_compiler() + +add_executable(spider + spider.cpp + spigame.cpp + rsrc.rc) + +target_link_libraries(spider cardlib) + +set_module_type(spider win32gui) + +add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt) Propchange: branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/base/applications/games/winmine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] Thu Oct 28 12:53:07 2010 @@ -1,5 +1,3 @@ - -set_unicode() include_directories(${CMAKE_CURRENT_SOURCE_DIR})

13 years, 11 months

[jgardou] 49326: [CMAKE] - simplify dxsdk

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 28 12:37:56 2010 New Revision: 49326 URL: http://svn.reactos.org/svn/reactos?rev=49326&view=rev Log: [CMAKE] - simplify dxsdk Modified: branches/cmake-bringup/include/dxsdk/CMakeLists.txt Modified: branches/cmake-bringup/include/dxsdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/CMa… ============================================================================== --- branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] Thu Oct 28 12:37:56 2010 @@ -1,37 +1,27 @@ -MACRO (MACRO_ADD_DXSDK_INTERFACES) - - FOREACH(_in_FILE ${ARGN}) - - GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE) - - ADD_CUSTOM_COMMAND( - OUTPUT ${REACTOS_BINARY_DIR}/include/dxsdk/${FILE}.h - COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_BINARY_DIR}/include/dxsdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/dxsdk/${FILE}.idl - DEPENDS native-widl - ) - - SET_SOURCE_FILES_PROPERTIES( - ${REACTOS_BINARY_DIR}/include/dxsdk/${FILE}.h - PROPERTIES - GENERATED TRUE - ) - - LIST(APPEND DXSDK_HEADERS ${REACTOS_BINARY_DIR}/include/dxsdk/${FILE}.h) - - ENDFOREACH(_in_FILE ${ARGN}) - -ENDMACRO (MACRO_ADD_DXSDK_INTERFACES) - -file(GLOB_RECURSE SOURCE "*.idl") - -LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/axcore.idl) -LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/axextend.idl) -LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/devenum.idl) -LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/dshowasf.idl) -LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/dyngraph.idl) -LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/dxsdk/vmrender.idl) - -MACRO_ADD_DXSDK_INTERFACES(${SOURCE}) - -ADD_CUSTOM_TARGET(dxsdk ALL DEPENDS ${DXSDK_HEADERS}) +LIST(APPEND SOURCE + amstream.idl + amvideo.idl + austream.idl + #axcore.idl + #axextend.idl + bdatif.idl + ddstream.idl + devenum.idl + dmodshow.idl + #dshowasf.idl + #dyngraph.idl + mediaobj.idl + medparam.idl + mixerocx.idl + mmstream.idl + qedit.idl + regbag.idl + strmif.idl + tvratings.idl + vidcap.idl + videoacc.idl + #vmrender.idl +) + +ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE})

13 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
44
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 October 2010