Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[gadamopoulos] 50816: [win32k] - Revert r50121 and r50154
by gadamopoulos＠svn.reactos.org 19 Feb '11

19 Feb '11

Author: gadamopoulos Date: Sat Feb 19 12:22:52 2011 New Revision: 50816 URL: http://svn.reactos.org/svn/reactos?rev=50816&view=rev Log: [win32k] - Revert r50121 and r50154 Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sat Feb 19 12:22:52 2011 @@ -180,6 +180,11 @@ WPARAM wParam, LPARAM lParam); LRESULT FASTCALL +co_IntPostOrSendMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); +LRESULT FASTCALL co_IntSendMessageTimeout(HWND hWnd, UINT Msg, WPARAM wParam, @@ -187,7 +192,7 @@ UINT uFlags, UINT uTimeout, ULONG_PTR *uResult); -BOOL FASTCALL UserSendNotifyMessage( HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam ); + LRESULT FASTCALL co_IntSendMessageNoWait(HWND hWnd, UINT Msg, WPARAM wParam, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Sat Feb 19 12:22:52 2011 @@ -601,7 +601,7 @@ if (ret && ClipboardOwnerWindow) { DPRINT("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->head.h); - co_IntSendMessageNoWait( ClipboardOwnerWindow->head.h, WM_DESTROYCLIPBOARD, 0, 0); + co_IntSendMessage( ClipboardOwnerWindow->head.h, WM_DESTROYCLIPBOARD, 0, 0); } UserLeave(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Feb 19 12:22:52 2011 @@ -738,7 +738,11 @@ for (; *cursor; cursor++) { - UserPostMessage(*cursor, gpsi->uiShellMsg, Message, lParam); + DPRINT("Sending notify\n"); + co_IntPostOrSendMessage(*cursor, + gpsi->uiShellMsg, + Message, + lParam); } ExFreePool(HwndList); 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] Sat Feb 19 12:22:52 2011 @@ -77,12 +77,12 @@ if (WindowPrev) UserRefObjectCo(WindowPrev, &RefPrev); /* Send palette messages */ - if (co_IntSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) - { - UserSendNotifyMessage( HWND_BROADCAST, - WM_PALETTEISCHANGING, - (WPARAM)hWnd, - 0); + if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) + { + UserPostMessage( HWND_BROADCAST, + WM_PALETTEISCHANGING, + (WPARAM)hWnd, + 0); } if (Window->spwndPrev != NULL) @@ -166,7 +166,7 @@ if (hWndPrev) { IntNotifyWinEvent(EVENT_OBJECT_FOCUS, NULL, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntSendMessageNoWait(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); + co_IntPostOrSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); } } @@ -177,7 +177,7 @@ { PWND pWnd = UserGetWindowObject(hWnd); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, pWnd, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntSendMessageNoWait(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); + co_IntPostOrSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); } } @@ -579,7 +579,7 @@ if (Window) IntNotifyWinEvent(EVENT_SYSTEM_CAPTURESTART, Window, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); - co_IntSendMessageNoWait(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); + co_IntPostOrSendMessage(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); ThreadQueue->CaptureWindow = hWnd; RETURN( hWndPrev); 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] Sat Feb 19 12:22:52 2011 @@ -1549,6 +1549,47 @@ END_CLEANUP; } +/* This function posts a message if the destination's message queue belongs to +another thread, otherwise it sends the message. It does not support broadcast +messages! */ +LRESULT FASTCALL +co_IntPostOrSendMessage( HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam ) +{ + ULONG_PTR Result; + PTHREADINFO pti; + PWND Window; + + if ( hWnd == HWND_BROADCAST ) + { + return 0; + } + + if(!(Window = UserGetWindowObject(hWnd))) + { + return 0; + } + + pti = PsGetCurrentThreadWin32Thread(); + + if ( Window->head.pti->MessageQueue != pti->MessageQueue && + FindMsgMemory(Msg) == 0 ) + { + Result = UserPostMessage(hWnd, Msg, wParam, lParam); + } + else + { + if ( !co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result) ) + { + Result = 0; + } + } + + return (LRESULT)Result; +} + LRESULT FASTCALL co_IntDoSendMessage( HWND hWnd, UINT Msg, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat Feb 19 12:22:52 2011 @@ -564,7 +564,7 @@ } if (Ret) { - UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); + UserPostMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); } UserLeave(); return Ret; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sat Feb 19 12:22:52 2011 @@ -1957,7 +1957,7 @@ hWnd = IntWindowFromDC(hdc); if (hWnd) // Send broadcast if dc is associated with a window. { // FYI: Thread locked in CallOneParam. - UserSendNotifyMessage((HWND)HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0); + co_IntSendMessage((HWND)HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0); } } return Ret;

1 0

[akhaldi] 50815: Fix a typo.
by akhaldi＠svn.reactos.org 19 Feb '11

19 Feb '11

Author: akhaldi Date: Sat Feb 19 10:20:27 2011 New Revision: 50815 URL: http://svn.reactos.org/svn/reactos?rev=50815&view=rev Log: Fix a typo. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Feb 19 10:20:27 2011 @@ -203,7 +203,7 @@ /* Returns a string containing the requested substituted environment variable. */ ExpandEnvironmentStringsW((LPCWSTR)szModuleName, ExpandedName, MAX_PATH); - /* Succesfull */ + /* Successful */ bReturn = TRUE; } }

1 0

[gadamopoulos] 50814: - Remove a documented definition from undocuser.h
by gadamopoulos＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: gadamopoulos Date: Fri Feb 18 20:26:19 2011 New Revision: 50814 URL: http://svn.reactos.org/svn/reactos?rev=50814&view=rev Log: - Remove a documented definition from undocuser.h Modified: trunk/reactos/include/psdk/windowsx.h trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/include/psdk/windowsx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windowsx.h?re… ============================================================================== --- trunk/reactos/include/psdk/windowsx.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windowsx.h [iso-8859-1] Fri Feb 18 20:26:19 2011 @@ -1,6 +1,7 @@ #ifndef _WINDOWSX_H #define _WINDOWSX_H +#define WM_CTLCOLOR 25 #define Button_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable)) #define Button_GetCheck(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),BM_GETCHECK,0,0)) #define Button_GetState(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),BM_GETSTATE,0,0)) Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Fri Feb 18 20:26:19 2011 @@ -25,7 +25,6 @@ /* Non SDK Window Message types. */ #define WM_SETVISIBLE 0x00000009 -#define WM_CTLCOLOR 0x00000019 #define WM_ALTTABACTIVE 0x00000029 #define WM_ISACTIVEICON 0x00000035 #define WM_QUERYPARKICON 0x00000036

1 0

[gadamopoulos] 50813: [user32/win32k] - Implement MessageBeep and SetLogonNotifyWindow [winlogon] - Implement receiving notifications from win32k to play sounds of MessageBeep
by gadamopoulos＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: gadamopoulos Date: Fri Feb 18 20:16:43 2011 New Revision: 50813 URL: http://svn.reactos.org/svn/reactos?rev=50813&view=rev Log: [user32/win32k] - Implement MessageBeep and SetLogonNotifyWindow [winlogon] - Implement receiving notifications from win32k to play sounds of MessageBeep Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/messagebox.c trunk/reactos/include/reactos/undocuser.h trunk/reactos/include/reactos/winlogon.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -24,8 +24,6 @@ #define HK_CTRL_ALT_DEL 0 #define HK_CTRL_SHIFT_ESC 1 - -extern BOOL WINAPI SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta); /* FUNCTIONS ****************************************************************/ @@ -843,6 +841,40 @@ return STATUS_SUCCESS; } +BOOL +WINAPI +HandleMessageBeep(UINT uType) +{ + LPWSTR EventName; + + switch(uType) + { + case 0xFFFFFFFF: + EventName = NULL; + break; + case MB_OK: + EventName = L"SystemDefault"; + break; + case MB_ICONASTERISK: + EventName = L"SystemAsterisk"; + break; + case MB_ICONEXCLAMATION: + EventName = L"SystemExclamation"; + break; + case MB_ICONHAND: + EventName = L"SystemHand"; + break; + case MB_ICONQUESTION: + EventName = L"SystemQuestion"; + break; + default: + WARN("Unhandled type %d\n", uType); + EventName = L"SystemDefault"; + } + + return PlaySoundRoutine(EventName, FALSE, SND_ALIAS | SND_NOWAIT | SND_NOSTOP | SND_ASYNC); +} + static LRESULT CALLBACK SASWindowProc( IN HWND hwndDlg, @@ -902,6 +934,21 @@ } return TRUE; } + case WM_LOGONNOTIFY: + { + switch(wParam) + { + case LN_MESSAGE_BEEP: + { + return HandleMessageBeep(lParam); + } + default: + { + ERR("WM_LOGONNOTIFY case %d is unimplemented\n", wParam); + } + } + return 0; + } case WLX_WM_SAS: { DispatchSAS(Session, (DWORD)wParam); Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -23,6 +23,49 @@ /* FUNCTIONS *****************************************************************/ +BOOL +PlaySoundRoutine( + IN LPCWSTR FileName, + IN UINT bLogon, + IN UINT Flags) +{ + typedef BOOL (WINAPI *PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); + typedef UINT (WINAPI *WAVEOUTGETNUMDEVS)(VOID); + PLAYSOUNDW Play; + WAVEOUTGETNUMDEVS waveOutGetNumDevs; + UINT NumDevs; + HMODULE hLibrary; + BOOL Ret = FALSE; + + hLibrary = LoadLibraryW(L"winmm.dll"); + if (hLibrary) + { + waveOutGetNumDevs = (WAVEOUTGETNUMDEVS)GetProcAddress(hLibrary, "waveOutGetNumDevs"); + if (waveOutGetNumDevs) + { + NumDevs = waveOutGetNumDevs(); + if (!NumDevs) + { + if (!bLogon) + { + Beep(500, 500); + } + FreeLibrary(hLibrary); + return FALSE; + } + } + + Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); + if (Play) + { + Ret = Play(FileName, NULL, Flags); + } + FreeLibrary(hLibrary); + } + + return Ret; +} + DWORD WINAPI PlayLogonSoundThread( @@ -32,10 +75,8 @@ WCHAR szBuffer[MAX_PATH] = {0}; WCHAR szDest[MAX_PATH]; DWORD dwSize = sizeof(szBuffer); - HMODULE hLibrary; SERVICE_STATUS_PROCESS Info; - typedef BOOL (WINAPI *PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); - PLAYSOUNDW Play; + ULONG Index = 0; if (RegOpenKeyExW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps\\.Default\\WindowsLogon\\.Current", 0, KEY_READ, &hKey) != ERROR_SUCCESS) @@ -94,17 +135,7 @@ if (Info.dwCurrentState != SERVICE_RUNNING) ExitThread(0); - - hLibrary = LoadLibraryW(L"winmm.dll"); - if (hLibrary) - { - Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); - if (Play) - { - Play(szDest, NULL, SND_FILENAME); - } - FreeLibrary(hLibrary); - } + PlaySoundRoutine(szDest, TRUE, SND_FILENAME); } ExitThread(0); } Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -40,6 +40,7 @@ #include <accctrl.h> #include <aclapi.h> +#include <reactos/undocuser.h> #include <reactos/winlogon.h> #include "setup.h" @@ -203,6 +204,13 @@ IN PWLSESSION Session); /* winlogon.c */ + +BOOL +PlaySoundRoutine( + IN LPCWSTR FileName, + IN UINT Logon, + IN UINT Flags); + BOOL DisplayStatusMessage( IN PWLSESSION Session, Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -72,7 +72,7 @@ return(FALSE); } - return(TRUE); + return NtUserSetLogonNotifyWindow(Wnd); } /* Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -890,36 +890,7 @@ WINAPI MessageBeep(UINT uType) { -#if 0 - LPWSTR EventName; - - switch(uType) - { - case 0xFFFFFFFF: - if(waveOutGetNumDevs() == 0) - return Beep(500, 100); // Beep through speaker - /* fall through */ - case MB_OK: - EventName = L"SystemDefault"; - break; - case MB_ICONASTERISK: - EventName = L"SystemAsterisk"; - break; - case MB_ICONEXCLAMATION: - EventName = L"SystemExclamation"; - break; - case MB_ICONHAND: - EventName = L"SystemHand"; - break; - case MB_ICONQUESTION: - EventName = L"SystemQuestion"; - break; - } - - return PlaySoundW((LPCWSTR)EventName, NULL, SND_ALIAS | SND_NOWAIT | SND_NOSTOP | SND_ASYNC); -#else - return Beep(500, 100); // Beep through speaker -#endif + return (BOOL)NtUserCallOneParam(ONEPARAM_ROUTINE_MESSAGEBEEP, uType); } Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -92,7 +92,7 @@ #define SBRG_PAGEDOWNLEFT 4 /* the page down or page left region */ #define SBRG_BOTTOMLEFTBTN 5 /* the bottom or left button */ - +BOOL WINAPI SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD_PTR); Modified: trunk/reactos/include/reactos/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winlogon.h… ============================================================================== --- trunk/reactos/include/reactos/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winlogon.h [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -17,14 +17,6 @@ #define EWX_INTERNAL_KILL_ALL_APPS (EWX_INTERNAL_FLAG | 0x200) #define EWX_INTERNAL_FLAG_LOGOFF 0x1000 -#define WM_LOGONNOTIFY 0x0000004c - -/* WPARAM values for WM_LOGONNOTIFY */ -#define LN_START_TASK_MANAGER 0x4 -#define LN_LOCK_WORKSTATION 0x5 -#define LN_UNLOCK_WORKSTATION 0x6 -#define LN_MESSAGE_BEEP 0x9 - #endif /* REACTOS_WINLOGON_H_INCLUDED */ /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -61,6 +61,7 @@ extern WINSTATION_OBJECT *InputWindowStation; extern PPROCESSINFO LogonProcess; +extern HWND hwndSAS; INIT_FUNCTION NTSTATUS Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -1275,17 +1275,6 @@ /* * @unimplemented */ -BOOL APIENTRY -NtUserSetLogonNotifyWindow(HWND hWnd) -{ - UNIMPLEMENTED - - return 0; -} - -/* - * @unimplemented - */ BOOL APIENTRY NtUserUpdateLayeredWindow( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -341,6 +341,9 @@ } case ONEPARAM_ROUTINE_REPLYMESSAGE: RETURN (co_MsqReplyMessage((LRESULT) Param)); + case ONEPARAM_ROUTINE_MESSAGEBEEP: + RETURN ( UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_MESSAGE_BEEP, Param) ); + /* TODO: Implement sound sentry */ } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Fri Feb 18 20:16:43 2011 @@ -42,6 +42,9 @@ /* Currently active window station */ PWINSTATION_OBJECT InputWindowStation = NULL; + +/* Winlogon sas window*/ +HWND hwndSAS = NULL; /* INITALIZATION FUNCTIONS ****************************************************/ @@ -1455,4 +1458,25 @@ BuildDesktopNameList(hWindowStation, dwSize, lpBuffer, pRequiredSize); } +/* + * @implemented + */ +BOOL APIENTRY +NtUserSetLogonNotifyWindow(HWND hWnd) +{ + if(LogonProcess != PsGetCurrentProcessWin32Process()) + { + return FALSE; + } + + if(!IntIsWindow(hWnd)) + { + return FALSE; + } + + hwndSAS = hWnd; + + return TRUE; +} + /* EOF */

1 0

[akhaldi] 50812: [CMAKE] - Fix hhctrl msvc build.
by akhaldi＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: akhaldi Date: Fri Feb 18 19:48:33 2011 New Revision: 50812 URL: http://svn.reactos.org/svn/reactos?rev=50812&view=rev Log: [CMAKE] - Fix hhctrl msvc build. Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt branches/cmake-bringup/include/reactos/wine/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.… ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Fri Feb 18 19:48:33 2011 @@ -19,12 +19,11 @@ stream.c webbrowser.c hhctrl.rc - #${REACTOS_BINARY_DIR}/include/reactos/wine/itss_i.c ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) set_module_type(hhctrl win32ocx) -target_link_libraries(hhctrl uuid wine) +target_link_libraries(hhctrl uuid wine itss_guid) add_importlibs(hhctrl advapi32 Modified: branches/cmake-bringup/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] Fri Feb 18 19:48:33 2011 @@ -5,4 +5,5 @@ add_rpc_library(epmrpc epm.idl) add_rpc_library(irotrpc irot.idl) -add_iid_library(wined3d_guid wined3d.idl) +add_iid_library(wined3d_guid wined3d.idl) +add_iid_library(itss_guid itss.idl)

1 0

[akhaldi] 50811: [CMAKE] - Fix LINK (msvc) warnings.
by akhaldi＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: akhaldi Date: Fri Feb 18 19:40:51 2011 New Revision: 50811 URL: http://svn.reactos.org/svn/reactos?rev=50811&view=rev Log: [CMAKE] - Fix LINK (msvc) warnings. Modified: branches/cmake-bringup/dll/win32/cryptdlg/cryptdlg.spec Modified: branches/cmake-bringup/dll/win32/cryptdlg/cryptdlg.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] Fri Feb 18 19:40:51 2011 @@ -15,7 +15,7 @@ 15 stub CertSelectCertificateW 16 stdcall CertViewPropertiesA(ptr) 17 stdcall CertViewPropertiesW(ptr) -18 stdcall -private DllRegisterServer() -19 stdcall -private DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 20 stdcall GetFriendlyNameOfCertA(ptr ptr long) 21 stdcall GetFriendlyNameOfCertW(ptr ptr long)

1 0

[tkreuzer] 50810: [CMAKE] Add support for VS 8-10 and SDK to configure script, add error checks. Patch by Samuel Serapion with small modifications by me.
by tkreuzer＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: tkreuzer Date: Fri Feb 18 17:35:50 2011 New Revision: 50810 URL: http://svn.reactos.org/svn/reactos?rev=50810&view=rev Log: [CMAKE] Add support for VS 8-10 and SDK to configure script, add error checks. Patch by Samuel Serapion with small modifications by me. Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Fri Feb 18 17:35:50 2011 @@ -1,16 +1,14 @@ @echo off -rem Get the source root directory -set ROS_SOURCE_DIR=%~dp0 +:: Get the source root directory +set REACTOS_SOURCE_DIR=%~dp0 -rem Detect build environment (Mingw, VS, WDK, ...) -if not "%ROS_ARCH%" == "" ( +:: Detect build environment (MinGW, VS, WDK, ...) +if defined ROS_ARCH ( + set BUILD_ENVIRONMENT=MinGW + set ARCH=%ROS_ARCH% echo Detected RosBE for %ROS_ARCH% - set BUILD_ENVIRONMENT=MINGW - set ARCH=%ROS_ARCH% -) -if not "%DDK_TARGET_OS%" == "" ( - echo Detected DDK/WDK for %_BUILDARCH% +) else if defined DDK_TARGET_OS ( if "%_BUILDARCH%" == "x86" ( set ARCH=i386 ) @@ -18,43 +16,131 @@ set ARCH=amd64 ) set BUILD_ENVIRONMENT=WDK + echo Detected DDK/WDK for %DDK_TARGET_OS%-%ARCH% +)else if defined VCINSTALLDIR ( +:: VS command prompt does not put this in enviroment vars + cl 2>&1 | find "x86" > NUL && set ARCH=i386 + cl 2>&1 | find "x64" > NUL && set ARCH=amd64 + cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 + cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9 + cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 + if not defined BUILD_ENVIRONMENT ( + echo Error: Visual Studio version too old or version detection failed. + exit /b + ) + echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% +) else if defined sdkdir ( + if "%TARGET_CPU%" == "x86" ( + set ARCH=i386 + ) + if "%TARGET_CPU%" == "x64" ( + set ARCH=amd64 + ) + set BUILD_ENVIRONMENT=SDK + echo Detected Windows SDK %TARGET_PLATFORM%-%ARCH% ) +if defined ARCH if defined BUILD_ENVIRONMENT ( + goto createdirs +) -rem Create directories -echo Preparing host tools... +echo Error: Critical variable missing. Configure script failure. +exit /b + +:: Create directories +:createdirs + +set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% +if "%REACTOS_SOURCE_DIR%" == "%CD%" ( + echo test + echo Creating directories in %REACTOS_OUTPUT_PATH% + + if not exist %REACTOS_OUTPUT_PATH% ( + mkdir %REACTOS_OUTPUT_PATH% + ) + cd %REACTOS_OUTPUT_PATH% +) + if not exist host-tools ( mkdir host-tools ) +if not exist reactos ( + mkdir reactos +) + +:hostprep +echo Preparing host tools... cd host-tools if EXIST CMakeCache.txt ( del CMakeCache.txt /q ) set REACTOS_BUILD_TOOLS_DIR=%CD% -if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" -DARCH=%ARCH% %ROS_SOURCE_DIR% -) -if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DARCH=%ARCH% %ROS_SOURCE_DIR% + +if "%BUILD_ENVIRONMENT%" == "MinGW" ( + cmake -G "MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "WDK" ( + cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "SDK" ( + cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "VS8" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 8 2005 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 8 2005" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) +) else if "%BUILD_ENVIRONMENT%" == "VS9" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 9 2008 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 9 2008" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) +) else if "%BUILD_ENVIRONMENT%" == "VS10" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 10 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 10" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) ) cd.. +:reactprep echo Preparing reactos... -if not exist reactos ( - mkdir reactos -) cd reactos if EXIST CMakeCache.txt ( del CMakeCache.txt /q ) -if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% + +if "%BUILD_ENVIRONMENT%" == "MinGW" ( + cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "WDK" ( + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "SDK" ( + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "VS8" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 8 2005" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) +) else if "%BUILD_ENVIRONMENT%" == "VS9" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 9 2008 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 9 2008" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) +) else if "%BUILD_ENVIRONMENT%" == "VS10" ( + if "%ARCH%" == "amd64" ( + cmake -G "Visual Studio 10 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "Visual Studio 10" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) ) -if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% + +cd.. +if not ERRORLEVEL == 0 ( + echo Warning: errors occured. ) -cd.. -rem Create a root makefile -rem echo ... > makefile +echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, etc...). +

1 0

[akhaldi] 50809: [CMAKE] - Fix shlwapi msvc build.
by akhaldi＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: akhaldi Date: Fri Feb 18 17:34:55 2011 New Revision: 50809 URL: http://svn.reactos.org/svn/reactos?rev=50809&view=rev Log: [CMAKE] - Fix shlwapi msvc build. Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Fri Feb 18 17:34:55 2011 @@ -47,6 +47,8 @@ version shell32 kernel32 + userenv + wininet msvcrt ntdll)

1 0

[akhaldi] 50808: [CMAKE] - Fix shlwapi build. This reverts r50794.
by akhaldi＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: akhaldi Date: Fri Feb 18 17:30:19 2011 New Revision: 50808 URL: http://svn.reactos.org/svn/reactos?rev=50808&view=rev Log: [CMAKE] - Fix shlwapi build. This reverts r50794. Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Fri Feb 18 17:30:19 2011 @@ -34,7 +34,6 @@ add_importlibs(shlwapi user32 - user32env gdi32 advapi32 oleaut32

1 0

[gadamopoulos] 50807: [win32k] - Fix a bug that caused problems when the user clicks in the caption of a window to activate it
by gadamopoulos＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: gadamopoulos Date: Fri Feb 18 16:28:52 2011 New Revision: 50807 URL: http://svn.reactos.org/svn/reactos?rev=50807&view=rev Log: [win32k] - Fix a bug that caused problems when the user clicks in the caption of a window to activate it Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Feb 18 16:28:52 2011 @@ -1093,7 +1093,7 @@ /* Activate the window if needed */ - if (msg->hwnd != MessageQueue->ActiveWindow) + if (msg->hwnd != UserGetForegroundWindow()) { PWND pwndTop = pwndMsg; while (pwndTop)

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
36
Older →

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 February 2011